diff --git a/packages/nc-gui/assets/nc-icons/credit-card.svg b/packages/nc-gui/assets/nc-icons/credit-card.svg index 06b6025ea3..213df64d29 100644 --- a/packages/nc-gui/assets/nc-icons/credit-card.svg +++ b/packages/nc-gui/assets/nc-icons/credit-card.svg @@ -1,4 +1,4 @@ - - + + diff --git a/packages/nc-gui/assets/nc-icons/layers.svg b/packages/nc-gui/assets/nc-icons/layers.svg index 1d23789b83..82faffa520 100644 --- a/packages/nc-gui/assets/nc-icons/layers.svg +++ b/packages/nc-gui/assets/nc-icons/layers.svg @@ -1,8 +1,8 @@ - - - + + + diff --git a/packages/nc-gui/components/cell/DatePicker.vue b/packages/nc-gui/components/cell/DatePicker.vue index abf01f6584..fc0c16ea25 100644 --- a/packages/nc-gui/components/cell/DatePicker.vue +++ b/packages/nc-gui/components/cell/DatePicker.vue @@ -32,8 +32,6 @@ const columnMeta = inject(ColumnInj, null)! const readOnly = inject(ReadonlyInj, ref(false)) -const isLockedMode = inject(IsLockedInj, ref(false)) - const isEditColumn = inject(EditColumnInj, ref(false)) const active = inject(ActiveCellInj, ref(false)) @@ -188,9 +186,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => { const isOpen = computed(() => { if (readOnly.value) return false - return ((readOnly.value || (localState.value && isPk)) && !active.value && !editable.value) || isLockedMode.value - ? false - : open.value + return (readOnly.value || (localState.value && isPk)) && !active.value && !editable.value ? false : open.value }) // use the default date picker open sync only to close the picker diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue index 11ccba81b6..fa8a588a4b 100644 --- a/packages/nc-gui/components/cell/DateTimePicker.vue +++ b/packages/nc-gui/components/cell/DateTimePicker.vue @@ -37,8 +37,6 @@ const active = inject(ActiveCellInj, ref(false)) const editable = inject(EditModeInj, ref(false)) -const isLockedMode = inject(IsLockedInj, ref(false)) - const { t } = useI18n() const isEditColumn = inject(EditColumnInj, ref(false)) @@ -126,9 +124,7 @@ const open = ref(false) const isOpen = computed(() => { if (readOnly.value) return false - return readOnly.value || (localState.value && isPk) || isLockedMode.value - ? false - : open.value && (active.value || editable.value) + return readOnly.value || (localState.value && isPk) ? false : open.value && (active.value || editable.value) }) const randomClass = `picker_${Math.floor(Math.random() * 99999)}` diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue index d8fe577a99..508cb7509e 100644 --- a/packages/nc-gui/components/cell/MultiSelect.vue +++ b/packages/nc-gui/components/cell/MultiSelect.vue @@ -49,8 +49,6 @@ const column = inject(ColumnInj)! const readOnly = inject(ReadonlyInj)! -const isLockedMode = inject(IsLockedInj, ref(false)) - const isEditable = inject(EditModeInj, ref(false)) const activeCell = inject(ActiveCellInj, ref(false)) @@ -343,11 +341,7 @@ const selectedOpts = computed(() => {
+
{ :bordered="false" clear-icon :show-search="!isMobileMode" - :show-arrow="editAllowed && !(readOnly || isLockedMode)" + :show-arrow="editAllowed && !readOnly" :open="isOpen && editAllowed" - :disabled="readOnly || !editAllowed || isLockedMode" + :disabled="readOnly || !editAllowed" :class="{ 'caret-transparent': !hasEditRoles }" :dropdown-class-name="`nc-dropdown-multi-select-cell ${isOpen ? 'active' : ''}`" @search="search" diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue index 0afc0e4c4b..9acccd11e2 100644 --- a/packages/nc-gui/components/cell/SingleSelect.vue +++ b/packages/nc-gui/components/cell/SingleSelect.vue @@ -43,8 +43,6 @@ const column = inject(ColumnInj)! const readOnly = inject(ReadonlyInj)! -const isLockedMode = inject(IsLockedInj, ref(false)) - const isEditable = inject(EditModeInj, ref(false)) const activeCell = inject(ActiveCellInj, ref(false)) @@ -264,11 +262,7 @@ const selectedOpt = computed(() => {