Merge pull request #7089 from nocodb/nc-fix/misc-3

Nc fix/misc 3

packages/nc-gui/components/smartsheet/Toolbar.vue

@@ -39,7 +39,7 @@ const { allowCSVDownload } = useSharedView()
 
         <!-- <LazySmartsheetToolbarQrScannerButton v-if="isMobileMode && (isGrid || isKanban || isGallery)" /> -->
 
-        <LazySmartsheetToolbarExport v-if="(!isPublic && !isUIAllowed('dataInsert')) || (isPublic && allowCSVDownload)" />
+        <LazySmartsheetToolbarExport v-if="isPublic && allowCSVDownload" />
 
         <div class="flex-1" />
       </template>

packages/nc-gui/components/smartsheet/VirtualCell.vue

@@ -31,6 +31,7 @@ const props = defineProps<{
   modelValue: any
   row?: Row
   active?: boolean
+  readOnly?: boolean
 }>()
 
 const emit = defineEmits(['update:modelValue', 'navigate', 'save'])
@@ -38,12 +39,14 @@ const emit = defineEmits(['update:modelValue', 'navigate', 'save'])
 const column = toRef(props, 'column')
 const active = toRef(props, 'active', false)
 const row = toRef(props, 'row')
+const readOnly = toRef(props, 'readOnly', false)
 
 provide(ColumnInj, column)
 provide(ActiveCellInj, active)
 provide(RowInj, row)
 provide(CellValueInj, toRef(props, 'modelValue'))
 provide(SaveRowInj, () => emit('save'))
+provide(ReadonlyInj, readOnly)
 
 const isGrid = inject(IsGridInj, ref(false))
 
@@ -94,7 +97,9 @@ onUnmounted(() => {
   <div
     ref="elementToObserve"
     class="nc-virtual-cell w-full flex items-center"
-    :class="{ 'text-right justify-end': isGrid && !isForm && isRollup(column) && !isExpandedForm }"
+    :class="{
+      'text-right justify-end': isGrid && !isForm && isRollup(column) && !isExpandedForm,
+    }"
     @keydown.enter.exact="onNavigate(NavigateDir.NEXT, $event)"
     @keydown.shift.enter.exact="onNavigate(NavigateDir.PREV, $event)"
   >

packages/nc-gui/components/smartsheet/column/EditOrAdd.vue

@@ -223,7 +223,7 @@ if (props.fromTableExplorer) {
       '!w-146': isTextArea(formState) && formState.meta.richMode,
       '!w-[600px]': formState.uidt === UITypes.Formula && !props.embedMode,
       '!w-[500px]': formState.uidt === UITypes.Attachment && !props.embedMode && !appInfo.ee,
-      'shadow-lg border-1 border-gray-50 shadow-gray-100 rounded-md p-6': !embedMode,
+      'shadow-lg border-1 border-gray-100 shadow-gray-300 rounded-xl p-6': !embedMode,
     }"
     @keydown="handleEscape"
     @click.stop

packages/nc-gui/components/smartsheet/expanded-form/index.vue

@@ -88,6 +88,8 @@ const isRecordLinkCopied = ref(false)
 
 const { isUIAllowed } = useRoles()
 
+const readOnly = computed(() => !isUIAllowed('dataEdit') || isPublic.value)
+
 const reloadTrigger = inject(ReloadRowDataHookInj, createEventHook())
 
 const { addOrEditStackRow } = useKanbanViewStoreOrThrow()
@@ -669,6 +671,7 @@ export default {
                       :class="{
                         'px-1': isReadOnlyVirtualCell(col),
                       }"
+                      :read-only="readOnly"
                     />
 
                     <LazySmartsheetCell
@@ -677,7 +680,7 @@ export default {
                       :column="col"
                       :edit-enabled="true"
                       :active="true"
-                      :read-only="isPublic"
+                      :read-only="readOnly"
                       @update:model-value="changedColumns.add(col.title)"
                     />
                   </SmartsheetDivDataCell>
@@ -737,6 +740,7 @@ export default {
                         v-model="_row.row[col.title]"
                         :row="_row"
                         :column="col"
+                        :read-only="readOnly"
                       />
 
                       <LazySmartsheetCell
@@ -745,7 +749,7 @@ export default {
                         :column="col"
                         :edit-enabled="true"
                         :active="true"
-                        :read-only="isPublic"
+                        :read-only="readOnly"
                         @update:model-value="changedColumns.add(col.title)"
                       />
                     </LazySmartsheetDivDataCell>

packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue

@@ -239,10 +239,12 @@ const onDelete = async () => {
 
         <LazySmartsheetToolbarExportSubActions />
       </NcSubMenu>
-      <NcDivider />
     </template>
 
-    <NcSubMenu v-if="isUIAllowed('viewCreateOrEdit')" key="lock-type" class="scrollbar-thin-dull max-h-90vh overflow-auto !py-0">
+    <template v-if="isUIAllowed('viewCreateOrEdit')">
+      <NcDivider />
+
+      <NcSubMenu key="lock-type" class="scrollbar-thin-dull max-h-90vh overflow-auto !py-0">
         <template #title>
           <div
             v-e="[
@@ -277,6 +279,8 @@ const onDelete = async () => {
           <LazySmartsheetToolbarLockType :type="LockType.Locked" @click="changeLockType(LockType.Locked)" />
         </a-menu-item>
       </NcSubMenu>
+    </template>
+
     <template v-if="!view.is_default">
       <NcDivider />
       <NcTooltip v-if="lockType === LockType.Locked">

packages/nc-gui/components/virtual-cell/Links.vue

@@ -127,7 +127,6 @@ const openListDlg = () => {
         @click.stop="openListDlg"
       />
     </div>
-
     <LazyVirtualCellComponentsListItems
       v-if="listItemsDlg || childListDlg"
       v-model="listItemsDlg"

packages/nc-gui/components/virtual-cell/components/ListChildItems.vue

@@ -166,6 +166,7 @@ const isDataExist = computed<boolean>(() => {
 
 const linkOrUnLink = (rowRef: Record<string, string>, id: string) => {
   if (isSharedBase.value) return
+  if (readonly.value) return
 
   if (isPublic.value && !isForm.value) return
   if (isNew.value || isChildrenListLinked.value[parseInt(id)]) {

packages/nc-gui/components/virtual-cell/components/ListItem.vue

@@ -77,6 +77,7 @@ const attachments: ComputedRef<Attachment[]> = computed(() => {
       '!bg-white': isLoading,
       '!border-1': isLinked && !isLoading,
       '!hover:border-gray-400': !isLinked,
+      '!cursor-auto !hover:bg-white': readonly,
     }"
     :body-style="{ padding: 0 }"
     :hoverable="false"
@@ -109,7 +110,7 @@ const attachments: ComputedRef<Attachment[]> = computed(() => {
             v-if="isLinked && !isLoading"
             class="text-brand-500 text-0.875"
             :class="{
-              '!group-hover:mr-12': fields.length === 0,
+              '!group-hover:mr-12': fields.length === 0 && !readonly,
             }"
           >
             <LinkIcon class="w-4 h-4" />
@@ -118,7 +119,7 @@ const attachments: ComputedRef<Attachment[]> = computed(() => {
           <MdiLoading
             v-else-if="isLoading"
             :class="{
-              '!group-hover:mr-8': fields.length === 0,
+              '!group-hover:mr-8': fields.length === 0 && !readonly,
             }"
             class="w-6 h-6 !text-brand-500 animate-spin"
           />