mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-21 07:26:15 +08:00
Fix merge conflicts
This commit is contained in:
parent
7233f4c8ab
commit
5eaae54e77
|
@ -107,11 +107,11 @@
|
|||
.dp__input_icon {
|
||||
display: flex;
|
||||
height: 1.5rem;
|
||||
left: .75rem;
|
||||
}
|
||||
left: .5rem;
|
||||
|
||||
.dp__clear_icon {
|
||||
width: 1.375rem;
|
||||
img {
|
||||
width: 1rem;
|
||||
}
|
||||
}
|
||||
|
||||
.dp__input {
|
||||
|
|
|
@ -125,10 +125,10 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import SelectSearch from '../shared/select_search.vue';
|
||||
import ChecklistSearch from '../shared/checklist_search.vue';
|
||||
import Select from '../shared/select.vue';
|
||||
import ChecklistSelect from '../shared/checklist_select.vue';
|
||||
import SelectSearch from '../shared/legacy/select_search.vue';
|
||||
import ChecklistSearch from '../shared/legacy/checklist_search.vue';
|
||||
import Select from '../shared/legacy/select.vue';
|
||||
import ChecklistSelect from '../shared/legacy/checklist_select.vue';
|
||||
|
||||
export default {
|
||||
name: 'RepositoryItemRelationshipsModal',
|
||||
|
|
|
@ -58,9 +58,10 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
/* global HelperModule */
|
||||
import NotificationsFlyout from './notifications/notifications_flyout.vue';
|
||||
import DropdownSelector from '../shared/legacy/dropdown_selector.vue';
|
||||
import Select from '../shared/select.vue';
|
||||
import SelectDropdown from '../shared/select_dropdown.vue';
|
||||
import MenuDropdown from '../shared/menu_dropdown.vue';
|
||||
|
||||
export default {
|
||||
|
@ -68,7 +69,7 @@ export default {
|
|||
components: {
|
||||
DropdownSelector,
|
||||
NotificationsFlyout,
|
||||
Select,
|
||||
SelectDropdown,
|
||||
MenuDropdown
|
||||
},
|
||||
props: {
|
||||
|
@ -142,15 +143,14 @@ export default {
|
|||
});
|
||||
},
|
||||
switchTeam(team) {
|
||||
if (this.currentTeam == team) return;
|
||||
if (this.currentTeam === team) return;
|
||||
|
||||
const newTeam = this.teams.find((e) => e[0] == team);
|
||||
const newTeam = this.teams.find((e) => e[0] === team);
|
||||
|
||||
if (!newTeam) return;
|
||||
|
||||
$.post(this.teamSwitchUrl, { team_id: team }, (result) => {
|
||||
this.currentTeam = result.current_team;
|
||||
dropdownSelector.selectValues('#sciNavigationTeamSelector', this.currentTeam);
|
||||
$('body').attr('data-current-team-id', this.currentTeam);
|
||||
window.open(this.rootUrl, '_self');
|
||||
}).fail((msg) => {
|
||||
|
@ -168,10 +168,9 @@ export default {
|
|||
});
|
||||
},
|
||||
refreshCurrentTeam() {
|
||||
const newTeam = parseInt($('body').attr('data-current-team-id'));
|
||||
const newTeam = parseInt($('body').attr('data-current-team-id'), 10);
|
||||
if (newTeam !== this.currentTeam) {
|
||||
this.currentTeam = newTeam;
|
||||
dropdownSelector.selectValues('#sciNavigationTeamSelector', this.currentTeam);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,26 +19,6 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
<<<<<<< HEAD
|
||||
// filter types
|
||||
import RepositoryNonEmptyTextValue from './filters/repositoryNonEmptyTextValue.vue'
|
||||
import RepositoryAssetValue from './filters/repositoryAssetValue.vue'
|
||||
import RepositoryTextValue from './filters/repositoryTextValue.vue'
|
||||
import RepositoryNumberValue from './filters/repositoryNumberValue.vue'
|
||||
import RepositoryMyModuleValue from './filters/repositoryMyModuleValue.vue'
|
||||
import RepositoryDateValue from './filters/repositoryDateValue.vue'
|
||||
import RepositoryDateRangeValue from './filters/repositoryDateRangeValue.vue'
|
||||
import RepositoryDateTimeValue from './filters/repositoryDateTimeValue.vue'
|
||||
import RepositoryDateTimeRangeValue from './filters/repositoryDateTimeRangeValue.vue'
|
||||
import RepositoryTimeValue from './filters/repositoryTimeValue.vue'
|
||||
import RepositoryTimeRangeValue from './filters/repositoryTimeRangeValue.vue'
|
||||
import RepositoryListValue from './filters/repositoryListValue.vue'
|
||||
import RepositoryStatusValue from './filters/repositoryStatusValue.vue'
|
||||
import RepositoryChecklistValue from './filters/repositoryChecklistValue.vue'
|
||||
import RepositoryUserValue from './filters/repositoryUserValue.vue'
|
||||
import RepositoryStockValue from './filters/repositoryStockValue.vue'
|
||||
import DropdownSelector from '../shared/legacy/dropdown_selector.vue'
|
||||
=======
|
||||
// filter types
|
||||
import RepositoryNonEmptyTextValue from './filters/repositoryNonEmptyTextValue.vue';
|
||||
import RepositoryAssetValue from './filters/repositoryAssetValue.vue';
|
||||
|
@ -56,8 +36,7 @@ import RepositoryStatusValue from './filters/repositoryStatusValue.vue';
|
|||
import RepositoryChecklistValue from './filters/repositoryChecklistValue.vue';
|
||||
import RepositoryUserValue from './filters/repositoryUserValue.vue';
|
||||
import RepositoryStockValue from './filters/repositoryStockValue.vue';
|
||||
import DropdownSelector from '../shared/dropdown_selector.vue';
|
||||
>>>>>>> develop
|
||||
import DropdownSelector from '../shared/legacy/dropdown_selector.vue';
|
||||
|
||||
export default {
|
||||
name: 'FilterElement',
|
||||
|
|
|
@ -56,13 +56,8 @@
|
|||
<label :class="`text-sm font-normal ${errors.unit ? 'text-sn-delete-red' : 'text-sn-grey'}`" for="stock-unit">
|
||||
{{ i18n.t('repository_stock_values.manage_modal.unit') }}
|
||||
</label>
|
||||
<<<<<<< HEAD
|
||||
<SelectDropdown
|
||||
:disabled="[2, 3].includes(operation)"
|
||||
=======
|
||||
<Select
|
||||
:disabled="['add', 'remove'].includes(operation)"
|
||||
>>>>>>> develop
|
||||
:value="unit"
|
||||
:options="units"
|
||||
:placeholder="i18n.t('repository_stock_values.manage_modal.unit_prompt')"
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
<script>
|
||||
import checklistSelect from './checklist_select.vue';
|
||||
import { debounce } from './debounce';
|
||||
import { debounce } from '../debounce';
|
||||
|
||||
export default {
|
||||
name: 'ChecklistSearch',
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
<script>
|
||||
import Select from './select.vue';
|
||||
import { debounce } from './debounce';
|
||||
import { debounce } from '../debounce';
|
||||
|
||||
export default {
|
||||
name: 'SelectSearch',
|
||||
|
|
|
@ -37,12 +37,10 @@
|
|||
<i class="sn-icon sn-icon-right ml-auto"></i>
|
||||
</span>
|
||||
<div
|
||||
class="absolute bg-sn-white rounded p-2.5 sn-shadow-menu-sm flex flex-col gap-[1px] tw-hidden group-hover:block"
|
||||
class="absolute bg-sn-white top-0 rounded p-2.5 sn-shadow-menu-sm flex flex-col gap-[1px] tw-hidden group-hover:block"
|
||||
:class="{
|
||||
'left-0 ml-[100%]': item.position === 'right',
|
||||
'right-0 mr-[100%]': item.position === 'left',
|
||||
'bottom-0': openUp,
|
||||
'top-0': !openUp,
|
||||
'right-0 mr-[100%]': item.position === 'left'
|
||||
}"
|
||||
>
|
||||
<a v-for="(sub_item, si) in item.submenu" :key="si"
|
||||
|
@ -64,8 +62,8 @@
|
|||
|
||||
<script>
|
||||
|
||||
import { vOnClickOutside } from '@vueuse/components';
|
||||
import FixedFlyoutMixin from './mixins/fixed_flyout.js';
|
||||
import { vOnClickOutside } from '@vueuse/components'
|
||||
|
||||
export default {
|
||||
name: 'DropdownMenu',
|
||||
|
@ -87,16 +85,6 @@ export default {
|
|||
'click-outside': vOnClickOutside
|
||||
},
|
||||
mixins: [FixedFlyoutMixin],
|
||||
watch: {
|
||||
isOpen() {
|
||||
if (this.isOpen) {
|
||||
this.$emit('open');
|
||||
this.$nextTick(() => {
|
||||
this.setPosition();
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
closeMenu() {
|
||||
this.isOpen = false;
|
||||
|
|
Loading…
Reference in a new issue