Merge pull request #8517 from nocodb/develop

nocodb · May 18, 2024 · 03d79fc · 03d79fc
2 parents 41a57a7 + 86e7f49
commit 03d79fc
Show file tree

Hide file tree

Showing 103 changed files with 3,704 additions and 2,727 deletions.
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
   },
   "pnpm": {
     "overrides": {
-      "vue": "3.3.13",
+      "vue": "latest",
       "typescript": "latest",
       "ajv@<6.12.3": ">=6.12.3",
       "node.extend@<1.1.7": ">=1.1.7",
@@ -56,7 +56,8 @@
       "axios@>=0.8.1 <0.28.0": ">=0.28.0",
       "ip@<1.1.9": ">=1.1.9",
       "ip@=2.0.0": ">=2.0.1",
-      "xml2js@<0.5.0": ">=0.5.0"
+      "xml2js@<0.5.0": ">=0.5.0",
+      "ufo": ">=1.5.3"
     }
   }
 }
diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
@@ -19,6 +19,10 @@ body {
   --navbar-bg: #fafafa;
   --navbar-border: #e0e0e0;
   --nc-grid-bg: #fdfdfd;
+
+  --ant-primary-color-hover: #5c85ff !important;
+  --ant-primary-color-active: #3366ff !important;
+  --ant-primary-color-outline: rgba(51, 102, 255, 0.24) !important;
 }
 
 ::-moz-selection {
@@ -810,6 +814,6 @@ svg.nc-virtual-cell-icon {
   box-shadow: 0 0 0 2px #fff, 0 0 0 4px #3366ff;
 }
 
-.text-nowrap{
+.text-nowrap {
   text-wrap: nowrap;
-}
+}
diff --git a/packages/nc-gui/components/cell/DatePicker.vue b/packages/nc-gui/components/cell/DatePicker.vue
@@ -205,7 +205,18 @@ useEventListener(document, 'keydown', (e: KeyboardEvent) => {
   // To prevent event listener on non active cell
   if (!active.value) return
 
-  if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey || !isGrid.value || isExpandedForm.value || isEditColumn.value) return
+  if (
+    e.altKey ||
+    e.ctrlKey ||
+    e.shiftKey ||
+    e.metaKey ||
+    !isGrid.value ||
+    isExpandedForm.value ||
+    isEditColumn.value ||
+    isExpandedFormOpen()
+  ) {
+    return
+  }
 
   switch (e.key) {
     case ';':

diff --git a/packages/nc-gui/components/cell/DateTimePicker.vue b/packages/nc-gui/components/cell/DateTimePicker.vue
@@ -269,7 +269,18 @@ useEventListener(document, 'keydown', (e: KeyboardEvent) => {
   // To prevent event listener on non active cell
   if (!active.value) return
 
-  if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey || !isGrid.value || isExpandedForm.value || isEditColumn.value) return
+  if (
+    e.altKey ||
+    e.ctrlKey ||
+    e.shiftKey ||
+    e.metaKey ||
+    !isGrid.value ||
+    isExpandedForm.value ||
+    isEditColumn.value ||
+    isExpandedFormOpen()
+  ) {
+    return
+  }
 
   switch (e.key) {
     case ';':

diff --git a/packages/nc-gui/components/cell/TimePicker.vue b/packages/nc-gui/components/cell/TimePicker.vue
@@ -185,7 +185,18 @@ useEventListener(document, 'keydown', (e: KeyboardEvent) => {
   // To prevent event listener on non active cell
   if (!active.value) return
 
-  if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey || !isGrid.value || isExpandedForm.value || isEditColumn.value) return
+  if (
+    e.altKey ||
+    e.ctrlKey ||
+    e.shiftKey ||
+    e.metaKey ||
+    !isGrid.value ||
+    isExpandedForm.value ||
+    isEditColumn.value ||
+    isExpandedFormOpen()
+  ) {
+    return
+  }
 
   switch (e.key) {
     case ';':

diff --git a/packages/nc-gui/components/cell/YearPicker.vue b/packages/nc-gui/components/cell/YearPicker.vue
@@ -176,7 +176,18 @@ useEventListener(document, 'keydown', (e: KeyboardEvent) => {
   // To prevent event listener on non active cell
   if (!active.value) return
 
-  if (e.altKey || e.ctrlKey || e.shiftKey || e.metaKey || !isGrid.value || isExpandedForm.value || isEditColumn.value) return
+  if (
+    e.altKey ||
+    e.ctrlKey ||
+    e.shiftKey ||
+    e.metaKey ||
+    !isGrid.value ||
+    isExpandedForm.value ||
+    isEditColumn.value ||
+    isExpandedFormOpen()
+  ) {
+    return
+  }
 
   switch (e.key) {
     case ';':

diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
@@ -331,6 +331,7 @@ const deleteTable = () => {
                 <NcMenuItem
                   v-if="isUIAllowed('tableRename', { roles: baseRole })"
                   :data-testid="`sidebar-table-rename-${table.title}`"
+                  class="nc-table-rename"
                   @click="openRenameTableDialog(table, base.sources[sourceIndex].id)"
                 >
                   <div v-e="['c:table:rename']" class="flex gap-2 items-center">
@@ -358,7 +359,7 @@ const deleteTable = () => {
                 <NcMenuItem
                   v-if="isUIAllowed('tableDelete', { roles: baseRole })"
                   :data-testid="`sidebar-table-delete-${table.title}`"
-                  class="!text-red-500 !hover:bg-red-50"
+                  class="!text-red-500 !hover:bg-red-50 nc-table-delete"
                   @click="deleteTable"
                 >
                   <div v-e="['c:table:delete']" class="flex gap-2 items-center">