Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix(frontend): some issues in prod (#19261)

ecmadao061572a972e2
diff --git a/frontend/package.json b/frontend/package.json
index af16b3cf3e..b762fd5dc4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -74,7 +74,7 @@
"vscode-languageclient": "9.0.1",
"vscode-ws-jsonrpc": "3.5.0",
"vue": "3.5.27",
- "vuedraggable": "^4.1.0",
+ "vue-draggable-plus": "^0.6.0",
"vueuc": "0.4.65"
},
"devDependencies": {
diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
index a424f7e30d..5f3ef17d89 100644
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -186,9 +186,9 @@ importers:
vue:
specifier: 3.5.27
version: 3.5.27([email protected])
- vuedraggable:
- specifier: ^4.1.0
+ vue-draggable-plus:
+ specifier: ^0.6.0
+ version: 0.6.1(@types/[email protected])
vueuc:
specifier: 0.4.65
@@ -932,28 +932,24 @@ packages:
engines: {node: '>=14.21.3'}
cpu: [arm64]
os: [linux]
- libc: [musl]
'@biomejs/[email protected]':
resolution: {integrity: sha512-xvOiFkrDNu607MPMBUQ6huHmBG1PZLOrqhtK6pXJW3GjfVqJg0Z/qpTdhXfcqWdSZHcT+Nct2fOgewZvytESkw==}
engines: {node: '>=14.21.3'}
cpu: [arm64]
os: [linux]
- libc: [glibc]
'@biomejs/[email protected]':
resolution: {integrity: sha512-0bdwFVSbbM//Sds6OjtnmQGp4eUjOTt6kHvR/1P0ieR9GcTUAlPNvPC3DiavTqq302W34Ae2T6u5VVNGuQtGlQ==}
engines: {node: '>=14.21.3'}
cpu: [x64]
os: [linux]
- libc: [musl]
'@biomejs/[email protected]':
resolution: {integrity: sha512-s+YsZlgiXNq8XkgHs6xdvKDFOj/bwTEevqEY6rC2I3cBHbxXYU1LOZstH3Ffw9hE5tE1sqT7U23C00MzkXztMw==}
engines: {node: '>=14.21.3'}
cpu: [x64]
os: [linux]
- libc: [glibc]
'@biomejs/[email protected]':
resolution: {integrity: sha512-QweDxY89fq0VvrxME+wS/BXKmqMrOTZlN9SqQ79kQSIc3FrEwvW/PvUegQF6XIVaekncDykB5dzPqjbwSKs9DA==}
@@ -1837,79 +1833,66 @@ packages:
resolution: {integrity: sha512-E8jKK87uOvLrrLN28jnAAAChNq5LeCd2mGgZF+fGF5D507WlG/Noct3lP/QzQ6MrqJ5BCKNwI9ipADB6jyiq2A==}
cpu: [arm]
os: [linux]
- libc: [glibc]
'@rollup/[email protected]':
resolution: {integrity: sha512-jQosa5FMYF5Z6prEpTCCmzCXz6eKr/tCBssSmQGEeozA9tkRUty/5Vx06ibaOP9RCrW1Pvb8yp3gvZhHwTDsJw==}
cpu: [arm]
os: [linux]
- libc: [musl]
'@rollup/[email protected]':
resolution: {integrity: sha512-uQVoKkrC1KGEV6udrdVahASIsaF8h7iLG0U0W+Xn14ucFwi6uS539PsAr24IEF9/FoDtzMeeJXJIBo5RkbNWvQ==}
cpu: [arm64]
os: [linux]
- libc: [glibc]
'@rollup/[email protected]':
resolution: {integrity: sha512-vLZ1yJKLxhQLFKTs42RwTwa6zkGln+bnXc8ueFGMYmBTLfNu58sl5/eXyxRa2RarTkJbXl8TKPgfS6V5ijNqEA==}
cpu: [arm64]
os: [linux]
- libc: [musl]
'@rollup/[email protected]':
resolution: {integrity: sha512-FWfHOCub564kSE3xJQLLIC/hbKqHSVxy8vY75/YHHzWvbJL7aYJkdgwD/xGfUlL5UV2SB7otapLrcCj2xnF1dg==}
cpu: [loong64]
os: [linux]
- libc: [glibc]
'@rollup/[email protected]':
resolution: {integrity: sha512-z1EkujxIh7nbrKL1lmIpqFTc/sr0u8Uk0zK/qIEFldbt6EDKWFk/pxFq3gYj4Bjn3aa9eEhYRlL3H8ZbPT1xvA==}
cpu: [loong64]
os: [linux]
- libc: [musl]
'@rollup/[email protected]':
resolution: {integrity: sha512-iNFTluqgdoQC7AIE8Q34R3AuPrJGJirj5wMUErxj22deOcY7XwZRaqYmB6ZKFHoVGqRcRd0mqO+845jAibKCkw==}
cpu: [ppc64]
os: [linux]
- libc: [glibc]
'@rollup/[email protected]':
resolution: {integrity: sha512-MtMeFVlD2LIKjp2sE2xM2slq3Zxf9zwVuw0jemsxvh1QOpHSsSzfNOTH9uYW9i1MXFxUSMmLpeVeUzoNOKBaWg==}
cpu: [ppc64]
os: [linux]
- libc: [musl]
'@rollup/[email protected]':
resolution: {integrity: sha512-in+v6wiHdzzVhYKXIk5U74dEZHdKN9KH0Q4ANHOTvyXPG41bajYRsy7a8TPKbYPl34hU7PP7hMVHRvv/5aCSew==}
cpu: [riscv64]
os: [linux]
- libc: [glibc]
'@rollup/[email protected]':
resolution: {integrity: sha512-yni2raKHB8m9NQpI9fPVwN754mn6dHQSbDTwxdr9SE0ks38DTjLMMBjrwvB5+mXrX+C0npX0CVeCUcvvvD8CNQ==}
cpu: [riscv64]
os: [linux]
- libc: [musl]
'@rollup/[email protected]':
resolution: {integrity: sha512-zhLLJx9nQPu7wezbxt2ut+CI4YlXi68ndEve16tPc/iwoylWS9B3FxpLS2PkmfYgDQtosah07Mj9E0khc3Y+vQ==}
cpu: [s390x]
os: [linux]
- libc: [glibc]
'@rollup/[email protected]':
resolution: {integrity: sha512-MVC6UDp16ZSH7x4rtuJPAEoE1RwS8N4oK9DLHy3FTEdFoUTCFVzMfJl/BVJ330C+hx8FfprA5Wqx4FhZXkj2Kw==}
cpu: [x64]
os: [linux]
- libc: [glibc]
'@rollup/[email protected]':
resolution: {integrity: sha512-ZhGH1eA4Qv0lxaV00azCIS1ChedK0V32952Md3FtnxSqZTBTd6tgil4nZT5cU8B+SIw3PFYkvyR4FKo2oyZIHA==}
cpu: [x64]
os: [linux]
- libc: [musl]
'@rollup/[email protected]':
resolution: {integrity: sha512-O16XcmyDeFI9879pEcmtWvD/2nyxR9mF7Gs44lf1vGGx8Vg2DRNx11aVXBEqOQhWb92WN4z7fW/q4+2NYzCbBA==}
@@ -1987,28 +1970,24 @@ packages:
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
- libc: [glibc]
'@tailwindcss/[email protected]':
resolution: {integrity: sha512-1px92582HkPQlaaCkdRcio71p8bc8i/ap5807tPRDK/uw953cauQBT8c5tVGkOwrHMfc2Yh6UuxaH4vtTjGvHg==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
- libc: [musl]
'@tailwindcss/[email protected]':
resolution: {integrity: sha512-v3gyT0ivkfBLoZGF9LyHmts0Isc8jHZyVcbzio6Wpzifg/+5ZJpDiRiUhDLkcr7f/r38SWNe7ucxmGW3j3Kb/g==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
- libc: [glibc]
'@tailwindcss/[email protected]':
resolution: {integrity: sha512-bhJ2y2OQNlcRwwgOAGMY0xTFStt4/wyU6pvI6LSuZpRgKQwxTec0/3Scu91O8ir7qCR3AuepQKLU/kX99FouqQ==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
- libc: [musl]
'@tailwindcss/[email protected]':
resolution: {integrity: sha512-LffYTvPjODiP6PT16oNeUQJzNVyJl1cjIebq/rWWBF+3eDst5JGEFSc5cWxyRCJ0Mxl+KyIkqRxk1XPEs9x8TA==}
@@ -2198,6 +2177,9 @@ packages:
resolution: {integrity: sha512-6Yp8BSplP35Esa/wOG1wLNKiqXevpQTEF/RcL/NV6BBQaMmZh4YlDwCgrrFSoUE4xAGvnKd5c+lkQJmPrBAzfQ==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-7HP+rZGE2p886PKV9c9OJzLBI6BBJu1O7lJGYnPyG3fS4/duUCcngkNCjsLwIMV+WMqANe3tt4irrXHSIe68OQ==}
+
resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==}
@@ -3580,28 +3562,24 @@ packages:
engines: {node: '>= 12.0.0'}
cpu: [arm64]
os: [linux]
- libc: [glibc]
resolution: {integrity: sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==}
engines: {node: '>= 12.0.0'}
cpu: [arm64]
os: [linux]
- libc: [musl]
resolution: {integrity: sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==}
engines: {node: '>= 12.0.0'}
cpu: [x64]
os: [linux]
- libc: [glibc]
resolution: {integrity: sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==}
engines: {node: '>= 12.0.0'}
cpu: [x64]
os: [linux]
- libc: [musl]
resolution: {integrity: sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==}
@@ -4316,9 +4294,6 @@ packages:
resolution: {integrity: sha512-VrM060OM/E7rdLQSnp6JHrzFfJFmqQBp0+TMhZStnEB8PfNliaZ9UWYjTHGHLUFVJorZ8TjVd/aKvIxHWU2O7g==}
hasBin: true
- resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==}
-
resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
engines: {node: '>=0.10.0'}
@@ -4765,6 +4740,15 @@ packages:
resolution: {integrity: sha512-05lR16HeZDcDpB23ku5b5f1fBOoHqFnMiKRr2CiEvbG5Ux4Yi0McmQBOET0dR0nxDXosxyVqv67q6CzS3AK8rw==}
+ resolution: {integrity: sha512-FbtQ/fuoixiOfTZzG3yoPl4JAo9HJXRHmBQZFB9x2NYCh6pq0TomHf7g5MUmpaDYv+LU2n6BPq2YN9sBO+FbIg==}
+ peerDependencies:
+ '@types/sortablejs': ^1.15.0
+ '@vue/composition-api': '*'
+ peerDependenciesMeta:
+ '@vue/composition-api':
+ optional: true
+
resolution: {integrity: sha512-CydUvFOQKD928UzZhTp4pr2vWz1L+H99t7Pkln2QSPdvmURT0MoC4wUccfCnuEaihNsu9aYYyk+bep8rlfkUXw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -4801,11 +4785,6 @@ packages:
typescript:
optional: true
- resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}
- peerDependencies:
- vue: ^3.0.1
-
resolution: {integrity: sha512-lXuMl+8gsBmruudfxnMF9HW4be8rFziylXFu1VHVNbLVhRTXXV4njvpRuJapD/8q+oFEMSfQMH16E/85VoWRyQ==}
peerDependencies:
@@ -6817,6 +6796,8 @@ snapshots:
'@types/[email protected]': {}
+ '@types/[email protected]': {}
+
'@types/[email protected]': {}
@@ -9334,8 +9315,6 @@ snapshots:
-
@@ -9752,6 +9731,10 @@ snapshots:
+ dependencies:
+ '@types/sortablejs': 1.15.9
+
dependencies:
debug: 4.4.3
@@ -9797,11 +9780,6 @@ snapshots:
optionalDependencies:
typescript: 5.9.3
- dependencies:
- sortablejs: 1.14.0
- vue: 3.5.27([email protected])
-
dependencies:
'@css-render/vue3-ssr': 0.15.14([email protected]([email protected]))
diff --git a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vue b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vue
index 938a6795d6..52bd65ba78 100644
--- a/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vue
+++ b/frontend/src/components/CustomApproval/Settings/components/CustomApproval/RulesPanel/RulesSection.vue
@@ -30,58 +30,57 @@
</div>
<!-- Draggable Body -->
- <Draggable
+ <VueDraggable
v-model="localRules"
- item-key="uid"
handle=".drag-handle"
- animation="150"
+ :animation="150"
ghost-class="rules-row-ghost"
@end="handleDragEnd"
>
- <template #item="{ element: rule, index }">
- <div
- class="rules-table-row grid border-b border-gray-100 last:border-b-0 hover:bg-gray-50"
- :class="{ 'bg-gray-50/50': index % 2 === 1 }"
- >
- <div class="px-2 py-2 w-10 flex items-center justify-center">
- <GripVerticalIcon
- class="drag-handle w-4 h-4 text-gray-400 cursor-grab active:cursor-grabbing"
- />
- </div>
- <div class="px-3 py-2 truncate" :title="rule.title">
- {{ rule.title || "-" }}
- </div>
- <div class="px-3 py-2 truncate">
- <EllipsisText>
- <code class="text-xs">{{ rule.condition || "true" }}</code>
- </EllipsisText>
- </div>
- <div class="px-3 py-2 truncate">
- <EllipsisText>
- {{ formatApprovalFlow(rule.flow) }}
- </EllipsisText>
- </div>
- <div class="px-3 py-2 w-24 flex items-center gap-x-1">
- <MiniActionButton @click="handleEditRule(rule)">
- <PencilIcon class="w-3" />
- </MiniActionButton>
- <NPopconfirm
- v-if="allowAdmin"
- :positive-text="$t('common.confirm')"
- :negative-text="$t('common.cancel')"
- @positive-click="handleDeleteRule(rule)"
- >
- <template #trigger>
- <MiniActionButton>
- <TrashIcon class="w-3" />
- </MiniActionButton>
- </template>
- {{ $t("common.confirm") }}?
- </NPopconfirm>
- </div>
+ <div
+ v-for="(rule, index) in localRules"
+ :key="rule.uid"
+ class="rules-table-row grid border-b border-gray-100 last:border-b-0 hover:bg-gray-50"
+ :class="{ 'bg-gray-50/50': index % 2 === 1 }"
+ >
+ <div class="px-2 py-2 w-10 flex items-center justify-center">
+ <GripVerticalIcon
+ class="drag-handle w-4 h-4 text-gray-400 cursor-grab active:cursor-grabbing"
+ />
</div>
- </template>
- </Draggable>
+ <div class="px-3 py-2 truncate" :title="rule.title">
+ {{ rule.title || "-" }}
+ </div>
+ <div class="px-3 py-2 truncate">
+ <EllipsisText>
+ <code class="text-xs">{{ rule.condition || "true" }}</code>
+ </EllipsisText>
+ </div>
+ <div class="px-3 py-2 truncate">
+ <EllipsisText>
+ {{ formatApprovalFlow(rule.flow) }}
+ </EllipsisText>
+ </div>
+ <div class="px-3 py-2 w-24 flex items-center gap-x-1">
+ <MiniActionButton @click="handleEditRule(rule)">
+ <PencilIcon class="w-3" />
+ </MiniActionButton>
+ <NPopconfirm
+ v-if="allowAdmin"
+ :positive-text="$t('common.confirm')"
+ :negative-text="$t('common.cancel')"
+ @positive-click="handleDeleteRule(rule)"
+ >
+ <template #trigger>
+ <MiniActionButton>
+ <TrashIcon class="w-3" />
+ </MiniActionButton>
+ </template>
+ {{ $t("common.confirm") }}?
+ </NPopconfirm>
+ </div>
+ </div>
+ </VueDraggable>
<!-- Empty State -->
<div
@@ -112,8 +111,8 @@ import {
} from "lucide-vue-next";
import { NButton, NPopconfirm } from "naive-ui";
import { computed, ref, watch } from "vue";
+import { VueDraggable } from "vue-draggable-plus";
import { useI18n } from "vue-i18n";
-import Draggable from "vuedraggable";
import EllipsisText from "@/components/EllipsisText.vue";
import PermissionGuardWrapper from "@/components/Permission/PermissionGuardWrapper.vue";
import { MiniActionButton } from "@/components/v2";
@@ -157,9 +156,12 @@ watch(
const sourceDisplayText = computed(() => approvalSourceText(props.source));
-const handleDragEnd = async (event: { oldIndex: number; newIndex: number }) => {
+const handleDragEnd = async (event: {
+ oldIndex?: number;
+ newIndex?: number;
+}) => {
const { oldIndex, newIndex } = event;
- if (oldIndex === newIndex) return;
+ if (oldIndex == null || newIndex == null || oldIndex === newIndex) return;
if (!context.hasFeature.value) {
context.showFeatureModal.value = true;
diff --git a/frontend/src/components/misc/DroppableTextarea.vue b/frontend/src/components/misc/DroppableTextarea.vue
index 298bd614ad..9720992c6c 100644
--- a/frontend/src/components/misc/DroppableTextarea.vue
+++ b/frontend/src/components/misc/DroppableTextarea.vue
@@ -123,7 +123,7 @@ const onDrop = async (files: File[] | FileList | null) => {
const { arrayBuffer } = await readFileAsArrayBuffer(file);
const decoder = new TextDecoder("utf-8");
const statement = decoder.decode(arrayBuffer);
- emit("update:value", statement);
+ state.value = statement;
} catch (error) {
pushNotification({
module: "bytebase",
diff --git a/frontend/src/views/DashboardLanding.vue b/frontend/src/views/DashboardLanding.vue
index a9245d6167..ebe46a0a6b 100644
--- a/frontend/src/views/DashboardLanding.vue
+++ b/frontend/src/views/DashboardLanding.vue
@@ -89,24 +89,24 @@
style="max-width: calc(100vw - 8rem)"
>
<div>
- <Draggable v-model="quickLinkList" item-key="id" animation="300">
- <template #item="{ element }: { element: QuickLink }">
- <div
- class="flex items-center justify-between p-2 hover:bg-gray-100 rounded-xs cursor-grab"
- >
- <div :key="element.id" class="flex items-center gap-x-2">
- <NCheckbox
- :disabled="quickLinkList.length <= 1"
- :checked="true"
- @update:checked="() => uncheckAccessItem(element)"
- />
- <component :is="element.icon" class="w-5 h-5 text-gray-500" />
- {{ element.title }}
- </div>
- <GripVerticalIcon class="w-5 h-5 text-gray-500" />
+ <VueDraggable v-model="quickLinkList" :animation="300">
+ <div
+ v-for="element in quickLinkList"
+ :key="element.id"
+ class="flex items-center justify-between p-2 hover:bg-gray-100 rounded-xs cursor-grab"
+ >
+ <div class="flex items-center gap-x-2">
+ <NCheckbox
+ :disabled="quickLinkList.length <= 1"
+ :checked="true"
+ @update:checked="() => uncheckAccessItem(element)"
+ />
+ <component :is="element.icon" class="w-5 h-5 text-gray-500" />
+ {{ element.title }}
</div>
- </template>
- </Draggable>
+ <GripVerticalIcon class="w-5 h-5 text-gray-500" />
+ </div>
+ </VueDraggable>
<NDivider />
<div
@@ -132,8 +132,8 @@ import { computedAsync } from "@vueuse/core";
import { GripVerticalIcon, SettingsIcon, Volume2Icon } from "lucide-vue-next";
import { NButton, NCheckbox, NDivider } from "naive-ui";
import { computed, reactive } from "vue";
+import { VueDraggable } from "vue-draggable-plus";
import { useRouter } from "vue-router";
-import Draggable from "vuedraggable";
import ProjectSwitchModal from "@/components/Project/ProjectSwitch/ProjectSwitchModal.vue";
import { Drawer, DrawerContent } from "@/components/v2";
import { WORKSPACE_ROUTE_MY_ISSUES } from "@/router/dashboard/workspaceRoutes";
diff --git a/frontend/src/views/EnvironmentDashboard.vue b/frontend/src/views/EnvironmentDashboard.vue
index 8a48cec0ef..8000d24cc0 100644
--- a/frontend/src/views/EnvironmentDashboard.vue
+++ b/frontend/src/views/EnvironmentDashboard.vue
@@ -78,24 +78,22 @@
<Drawer v-model:show="state.reorder" :close-on-esc="true">
<DrawerContent :title="t('environment.reorder')" class="w-120 max-w-[90vw]">
<div>
- <Draggable
+ <VueDraggable
v-model="state.reorderedEnvironmentList"
- item-key="id"
- animation="300"
+ :animation="300"
>
- <template #item="{ element, index }">
- <div
- :key="(element as Environment).id"
- class="flex items-center justify-between p-2 hover:bg-gray-100 rounded-xs cursor-grab"
- >
- <div class="flex items-center gap-x-2">
- <span class="textinfo"> {{ index + 1 }}.</span>
- <EnvironmentV1Name :environment="(element as Environment)" :link="false" />
- </div>
- <GripVerticalIcon class="w-5 h-5 text-gray-500" />
+ <div
+ v-for="(element, index) in state.reorderedEnvironmentList"
+ :key="(element as Environment).id"
+ class="flex items-center justify-between p-2 hover:bg-gray-100 rounded-xs cursor-grab"
+ >
+ <div class="flex items-center gap-x-2">
+ <span class="textinfo"> {{ index + 1 }}.</span>
+ <EnvironmentV1Name :environment="(element as Environment)" :link="false" />
</div>
- </template>
- </Draggable>
+ <GripVerticalIcon class="w-5 h-5 text-gray-500" />
+ </div>
+ </VueDraggable>
</div>
<template #footer>
<div class="flex items-center justify-end gap-x-2">
@@ -115,9 +113,9 @@ import { isEqual } from "lodash-es";
import { GripVerticalIcon, ListOrderedIcon, PlusIcon } from "lucide-vue-next";
import { NButton, NTabPane, NTabs } from "naive-ui";
import { computed, h, onMounted, reactive, ref, watch } from "vue";
+import { VueDraggable } from "vue-draggable-plus";
import { useI18n } from "vue-i18n";
import { useRouter } from "vue-router";
-import Draggable from "vuedraggable";
import {
EnvironmentForm,
Form as EnvironmentFormBody,
diff --git a/frontend/src/views/sql-editor/TabList/TabList.vue b/frontend/src/views/sql-editor/TabList/TabList.vue
index c90ba5b447..0901f0edb9 100644
--- a/frontend/src/views/sql-editor/TabList/TabList.vue
+++ b/frontend/src/views/sql-editor/TabList/TabList.vue
@@ -10,12 +10,11 @@
content-class="flex gap-x-1"
@scroll="recalculateScrollState"
>
- <Draggable
+ <VueDraggable
id="tab-list"
ref="tabListRef"
v-model="tabStore.openTabList"
- item-key="id"
- animation="300"
+ :animation="300"
class="relative flex flex-nowrap overflow-hidden h-9 pt-0.5 hide-scrollbar"
:class="{
'more-left': scrollState.moreLeft,
@@ -23,21 +22,19 @@
}"
ghost-class="ghost"
>
- <template
- #item="{ element: tab, index }: { element: SQLEditorTab; index: number }"
- >
- <TabItem
- :tab="tab"
- :index="index"
- :data-tab-id="tab.id"
- @select="(tab) => tabStore.setCurrentTabId(tab.id)"
- @close="(tab) => handleRemoveTab(tab)"
- @contextmenu.stop.prevent="
- contextMenuRef?.show(tab, index, $event)
- "
- />
- </template>
- </Draggable>
+ <TabItem
+ v-for="(tab, index) in tabStore.openTabList"
+ :key="tab.id"
+ :tab="tab"
+ :index="index"
+ :data-tab-id="tab.id"
+ @select="(tab) => tabStore.setCurrentTabId(tab.id)"
+ @close="(tab) => handleRemoveTab(tab)"
+ @contextmenu.stop.prevent="
+ contextMenuRef?.show(tab, index, $event)
+ "
+ />
+ </VueDraggable>
<div
class="shrink-0 sticky right-0 bg-white flex items-stretch justify-end"
@@ -68,8 +65,8 @@ import { PlusIcon } from "lucide-vue-next";
import { NScrollbar, useDialog } from "naive-ui";
import scrollIntoView from "scroll-into-view-if-needed";
import { computed, nextTick, onMounted, reactive, ref, watch } from "vue";
+import { VueDraggable } from "vue-draggable-plus";
import { useI18n } from "vue-i18n";
-import Draggable from "vuedraggable";
import ProfileDropdown from "@/components/ProfileDropdown.vue";
import { useEmitteryEventListener } from "@/composables/useEmitteryEventListener";
import { useSQLEditorTabStore } from "@/store";
@@ -98,7 +95,7 @@ const state = reactive<LocalState>({
loading: false,
});
const scrollbarRef = ref<InstanceType<typeof NScrollbar>>();
-const tabListRef = ref<InstanceType<typeof Draggable>>();
+const tabListRef = ref<InstanceType<typeof VueDraggable>>();
const contextMenuRef = ref<InstanceType<typeof ContextMenu>>();
const scrollState = reactive({