This is an automated email from the ASF dual-hosted git repository.
jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new 77e071594 [AMORO-2729]: Introduce v4.x version and keep old version
(#2732)
77e071594 is described below
commit 77e071594478eb8813c18e115e52389d2a846229
Author: xiaomo <[email protected]>
AuthorDate: Wed Apr 17 22:00:27 2024 +0800
[AMORO-2729]: Introduce v4.x version and keep old version (#2732)
* [AMORO-2729]: Upgrade antd-vue version Introduce v4.x version and keep
v3.x version
* [AMORO-2729]: remove the auto import for migrate & Import global styles
---------
Co-authored-by: ZhouJinsong <[email protected]>
---
ams/dashboard/package.json | 3 +-
ams/dashboard/pnpm-lock.yaml | 69 ++++++++++++++++++++--
ams/dashboard/src/App.vue | 4 +-
ams/dashboard/src/components/Topbar.vue | 2 +-
.../src/components/VirtualRecycleScroller.vue | 2 +-
ams/dashboard/src/components/ant-design/index.ts | 2 +-
.../src/components/tables-sub-menu/TablesMenu.vue | 10 ++--
ams/dashboard/src/main.ts | 7 +--
ams/dashboard/src/utils/request.ts | 2 +-
ams/dashboard/src/views/catalogs/Detail.vue | 2 +-
ams/dashboard/src/views/catalogs/index.vue | 2 +-
ams/dashboard/src/views/login/index.vue | 2 +-
.../src/views/optimize/components/List.vue | 2 +-
.../src/views/optimize/components/ScaleOut.vue | 3 +-
.../src/views/resource/components/GroupModal.vue | 2 +-
.../src/views/resource/components/List.vue | 2 +-
.../src/views/resource/components/ScaleOut.vue | 1 -
.../src/views/tables/components/Operations.vue | 2 +-
.../src/views/tables/components/Optimizing.vue | 2 +-
ams/dashboard/src/views/tables/create.vue | 2 +-
ams/dashboard/src/views/terminal/index.vue | 2 +-
ams/dashboard/vite.config.ts | 5 +-
22 files changed, 93 insertions(+), 37 deletions(-)
diff --git a/ams/dashboard/package.json b/ams/dashboard/package.json
index 896416fe3..6da9b93f5 100644
--- a/ams/dashboard/package.json
+++ b/ams/dashboard/package.json
@@ -12,7 +12,8 @@
"dependencies": {
"@ant-design/icons-vue": "6.1.0",
"@antfu/eslint-config": "^2.4.6",
- "ant-design-vue": "3.2.13",
+ "ant-design-vue": "^4.1.2",
+ "ant-design-vue-v3": "npm:[email protected]",
"axios": "^1.6.2",
"dayjs": "^1.11.10",
"echarts": "^5.4.3",
diff --git a/ams/dashboard/pnpm-lock.yaml b/ams/dashboard/pnpm-lock.yaml
index be7bbf035..61e1655cb 100644
--- a/ams/dashboard/pnpm-lock.yaml
+++ b/ams/dashboard/pnpm-lock.yaml
@@ -12,8 +12,11 @@ dependencies:
specifier: ^2.4.6
version: 2.4.6(@vue/[email protected])([email protected])([email protected])
ant-design-vue:
- specifier: 3.2.13
- version: 3.2.13([email protected])
+ specifier: ^4.1.2
+ version: 4.1.2([email protected])
+ ant-design-vue-v3:
+ specifier: npm:[email protected]
+ version: /[email protected]([email protected])
axios:
specifier: ^1.6.2
version: 1.6.2
@@ -134,6 +137,16 @@ packages:
vue: 3.3.11([email protected])
dev: false
+ /@ant-design/[email protected]([email protected]):
+ resolution: {integrity:
sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==}
+ peerDependencies:
+ vue: '>=3.0.3'
+ dependencies:
+ '@ant-design/colors': 6.0.0
+ '@ant-design/icons-svg': 4.3.1
+ vue: 3.3.11([email protected])
+ dev: false
+
/@antfu/[email protected](@vue/[email protected])([email protected])([email protected]):
resolution: {integrity:
sha512-dwRlY//llv3xnzLdSJzjEQQ/uS9p5rdNh7m4k2sqUlo4PsJ9EXBTWnZl6BPJZIGoVZGpDiGBpyO8hG/5I7yLrQ==}
hasBin: true
@@ -642,6 +655,14 @@ packages:
engines: {node: '>=10'}
dev: false
+ /@emotion/[email protected]:
+ resolution: {integrity:
sha512-gJB6HLm5rYwSLI6PQa+X1t5CFGrv1J1TWG+sOyMCeKz2ojaj6Fnl/rZEspogG+cvqbt4AE/2eIyD2QfLKTBNlQ==}
+ dev: false
+
+ /@emotion/[email protected]:
+ resolution: {integrity:
sha512-KOEGMu6dmJZtpadb476IsZBclKvILjopjUii3V+7MnXIQCYh8W3NgNcgwo21n9LXZX6EDIKvqfjYxXebDwxKmQ==}
+ dev: false
+
/@es-joy/[email protected]:
resolution: {integrity:
sha512-aKUhyn1QI5Ksbqcr3fFJj16p99QdjUxXAEuFst1Z47DRyoiMwivIH9MV/ARcJOCXVjPfjITciej8ZD2O/6qUmw==}
engines: {node: '>=16'}
@@ -1798,8 +1819,8 @@ packages:
dependencies:
color-convert: 2.0.1
- /[email protected]([email protected]):
- resolution: {integrity:
sha512-zO+0hhu5LN+UQOL9L+7Wlpj3WZcG6DT41OyuMJNS6Ja3impLNR2d1UwAVXr+eRdMd3TKd6dRc+KYn5/XTS9K8Q==}
+ /[email protected]([email protected]):
+ resolution: {integrity:
sha512-YWpMfGaGoRastIXEYfCoJiaRiDHk4chqtYhlKQM5GqPt6NfvrM1Vg2e60yHtjxlZjed91wCMm0rAmyUr7Hwzdg==}
engines: {node: '>=12.22.0'}
peerDependencies:
vue: '>=3.2.0'
@@ -1824,6 +1845,37 @@ packages:
warning: 4.0.3
dev: false
+ /[email protected]([email protected]):
+ resolution: {integrity:
sha512-ynFkDJLlHgumeK6Hr1UZ7PvQNZ1uBcri/pmejBdS3kRqHeA5VRsxneYDwa8YxA+uYB5YfT2jpYsSHsiMiCjRGg==}
+ engines: {node: '>=12.22.0'}
+ peerDependencies:
+ vue: '>=3.2.0'
+ dependencies:
+ '@ant-design/colors': 6.0.0
+ '@ant-design/icons-vue': 7.0.1([email protected])
+ '@babel/runtime': 7.23.6
+ '@ctrl/tinycolor': 3.6.1
+ '@emotion/hash': 0.9.1
+ '@emotion/unitless': 0.8.1
+ '@simonwep/pickr': 1.8.2
+ array-tree-filter: 2.1.0
+ async-validator: 4.2.5
+ csstype: 3.1.3
+ dayjs: 1.11.10
+ dom-align: 1.12.4
+ dom-scroll-into-view: 2.0.1
+ lodash: 4.17.21
+ lodash-es: 4.17.21
+ resize-observer-polyfill: 1.5.1
+ scroll-into-view-if-needed: 2.2.31
+ shallow-equal: 1.2.1
+ stylis: 4.3.1
+ throttle-debounce: 5.0.0
+ vue: 3.3.11([email protected])
+ vue-types: 3.0.2([email protected])
+ warning: 4.0.3
+ dev: false
+
/[email protected]([email protected]):
resolution: {integrity:
sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==}
engines: {node: '>=6'}
@@ -6993,6 +7045,10 @@ packages:
resolution: {integrity:
sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
engines: {node: '>=8'}
+ /[email protected]:
+ resolution: {integrity:
sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==}
+ dev: false
+
/[email protected]:
resolution: {integrity:
sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==}
engines: {node: '>=0.8.0'}
@@ -7111,6 +7167,11 @@ packages:
/[email protected]:
resolution: {integrity:
sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
+ /[email protected]:
+ resolution: {integrity:
sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==}
+ engines: {node: '>=12.22'}
+ dev: false
+
/[email protected]:
resolution: {integrity:
sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
dependencies:
diff --git a/ams/dashboard/src/App.vue b/ams/dashboard/src/App.vue
index 3ddf3b20e..de2413a54 100644
--- a/ams/dashboard/src/App.vue
+++ b/ams/dashboard/src/App.vue
@@ -23,8 +23,8 @@
</template>
<script lang="ts" setup>
-import enUS from 'ant-design-vue/es/locale/en_US'
-import zhCN from 'ant-design-vue/es/locale/zh_CN'
+import enUS from 'ant-design-vue-v3/es/locale/en_US'
+import zhCN from 'ant-design-vue-v3/es/locale/zh_CN'
import { ref } from 'vue'
const locale = ref(enUS.locale)
diff --git a/ams/dashboard/src/components/Topbar.vue
b/ams/dashboard/src/components/Topbar.vue
index 5c8849e6f..be8036352 100644
--- a/ams/dashboard/src/components/Topbar.vue
+++ b/ams/dashboard/src/components/Topbar.vue
@@ -39,7 +39,7 @@
import { defineComponent, onMounted, reactive } from 'vue'
import { QuestionCircleOutlined, LogoutOutlined } from '@ant-design/icons-vue'
-import { Modal } from 'ant-design-vue'
+import { Modal } from 'ant-design-vue-v3'
import { useI18n } from 'vue-i18n'
import useStore from '@/store'
import { getVersionInfo } from '@/services/global.service'
diff --git a/ams/dashboard/src/components/VirtualRecycleScroller.vue
b/ams/dashboard/src/components/VirtualRecycleScroller.vue
index 74f433cc9..4e6eb8dcd 100644
--- a/ams/dashboard/src/components/VirtualRecycleScroller.vue
+++ b/ams/dashboard/src/components/VirtualRecycleScroller.vue
@@ -41,7 +41,7 @@ import { defineComponent } from 'vue'
import { RecycleScroller } from 'vue-virtual-scroller'
import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
import { IMap, tableTypeIconMap } from '@/types/common.type'
-import { Empty } from 'ant-design-vue'
+import { Empty } from 'ant-design-vue-v3'
export default defineComponent ({
components: {
diff --git a/ams/dashboard/src/components/ant-design/index.ts
b/ams/dashboard/src/components/ant-design/index.ts
index f4cd91754..7db9074e0 100644
--- a/ams/dashboard/src/components/ant-design/index.ts
+++ b/ams/dashboard/src/components/ant-design/index.ts
@@ -43,7 +43,7 @@ import {
Row,
Col,
Dropdown
-} from 'ant-design-vue'
+} from 'ant-design-vue-v3'
const compontens = [
ConfigProvider,
diff --git a/ams/dashboard/src/components/tables-sub-menu/TablesMenu.vue
b/ams/dashboard/src/components/tables-sub-menu/TablesMenu.vue
index ce27755a8..82acf24bc 100644
--- a/ams/dashboard/src/components/tables-sub-menu/TablesMenu.vue
+++ b/ams/dashboard/src/components/tables-sub-menu/TablesMenu.vue
@@ -40,7 +40,7 @@
<a-input-search
v-model:value="DBSearchInput"
:placeholder="placeholder.filterDBPh"
- @change="(val) => handleSearch('db',val)"
+ @change="() => handleSearch('db')"
class="theme-dark"
>
<template #prefix>
@@ -65,7 +65,7 @@
<a-input-search
v-model:value="tableSearchInput"
:placeholder="placeholder.filterTablePh"
- @change="(val) => handleSearch('table', val)"
+ @change="() => handleSearch('table')"
class="theme-dark"
>
<template #prefix>
@@ -120,7 +120,7 @@ export default defineComponent({
virtualRecycleScroller
},
emits: ['goCreatePage'],
- setup(props, { emit }) {
+ setup(_, { emit }) {
const router = useRouter()
const route = useRoute()
const store = useStore()
@@ -271,7 +271,7 @@ export default defineComponent({
return
}
if (state.allDatabaseListLoaded.length) {
- state.databaseList = filteredDatabases
+ state.databaseList = filteredDatabases.value
return
}
@@ -303,7 +303,7 @@ export default defineComponent({
return
}
if (state.allTableListLoaded.length) {
- state.tableList = filteredTables
+ state.tableList = filteredTables.value
return
}
diff --git a/ams/dashboard/src/main.ts b/ams/dashboard/src/main.ts
index d4809d69a..2396edd32 100644
--- a/ams/dashboard/src/main.ts
+++ b/ams/dashboard/src/main.ts
@@ -24,10 +24,10 @@ import router from './router'
import useStore from './store'
import VueI18n from './language/i18n'
+// TODOļ¼ import the global style for v3. Will be removed after migrate to the
ant-design-vue-v4
+import 'ant-design-vue-v3/dist/antd.css';
+
import RegisterComponents from './components/register'
-import 'ant-design-vue/es/message/style/css'
-import 'ant-design-vue/es/modal/style/index.css'
-import 'ant-design-vue/es/notification/style/index.css'
import './styles/index.less'
import './utils/editor'
@@ -39,7 +39,6 @@ import { getQueryString } from './utils'
import 'virtual:svg-icons-register'
-
const app = createApp(App).use(createPinia())
app.component('svg-icon', SvgIcon)
app.use(VueI18n)
diff --git a/ams/dashboard/src/utils/request.ts
b/ams/dashboard/src/utils/request.ts
index c7017300c..8ed7873e8 100644
--- a/ams/dashboard/src/utils/request.ts
+++ b/ams/dashboard/src/utils/request.ts
@@ -17,7 +17,7 @@
*/
import axios, { AxiosRequestConfig, AxiosResponse } from 'axios'
-import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue-v3'
import useStore from '@/store'
import router from '@/router'
diff --git a/ams/dashboard/src/views/catalogs/Detail.vue
b/ams/dashboard/src/views/catalogs/Detail.vue
index c6cfdf911..7576e084e 100644
--- a/ams/dashboard/src/views/catalogs/Detail.vue
+++ b/ams/dashboard/src/views/catalogs/Detail.vue
@@ -184,7 +184,7 @@ limitations under the License.
import { computed, onMounted, reactive, ref, watch } from 'vue'
import { getCatalogsTypes, getCatalogsSetting, saveCatalogsSetting,
checkCatalogStatus, delCatalog } from '@/services/setting.services'
import { ILableAndValue, ICatalogItem, IMap, IIOptimizeGroupItem } from
'@/types/common.type'
-import { Modal, message, UploadChangeParam } from 'ant-design-vue'
+import { Modal, message, UploadChangeParam } from 'ant-design-vue-v3'
import { useI18n } from 'vue-i18n'
import Properties from './Properties.vue'
import { usePlaceholder } from '@/hooks/usePlaceholder'
diff --git a/ams/dashboard/src/views/catalogs/index.vue
b/ams/dashboard/src/views/catalogs/index.vue
index 8510d13fe..f77489020 100644
--- a/ams/dashboard/src/views/catalogs/index.vue
+++ b/ams/dashboard/src/views/catalogs/index.vue
@@ -40,7 +40,7 @@ import { onMounted, reactive, ref } from 'vue'
import { ICatalogItem } from '@/types/common.type'
import { getCatalogList } from '@/services/table.service'
import Detail from './Detail.vue'
-import { Modal, Empty } from 'ant-design-vue'
+import { Modal, Empty } from 'ant-design-vue-v3'
import { useI18n } from 'vue-i18n'
import { onBeforeRouteLeave, useRoute, useRouter } from 'vue-router'
diff --git a/ams/dashboard/src/views/login/index.vue
b/ams/dashboard/src/views/login/index.vue
index 9d33d8574..a291c3deb 100644
--- a/ams/dashboard/src/views/login/index.vue
+++ b/ams/dashboard/src/views/login/index.vue
@@ -80,7 +80,7 @@ limitations under the License.
import { computed, defineComponent, onMounted, reactive } from 'vue'
import { UserOutlined, LockOutlined } from '@ant-design/icons-vue'
import loginService from '@/services/login.service'
-import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue-v3'
import { useRouter } from 'vue-router'
import { usePlaceholder } from '@/hooks/usePlaceholder'
import useStore from '@/store'
diff --git a/ams/dashboard/src/views/optimize/components/List.vue
b/ams/dashboard/src/views/optimize/components/List.vue
index 216f4898c..1d756e5a1 100644
--- a/ams/dashboard/src/views/optimize/components/List.vue
+++ b/ams/dashboard/src/views/optimize/components/List.vue
@@ -58,7 +58,7 @@ import { getOptimizerTableList, getResourceGroupsListAPI,
releaseResource } from
import { useI18n } from 'vue-i18n'
import { usePagination } from '@/hooks/usePagination'
import { bytesToSize, formatMS2Time, formatMS2DisplayTime } from '@/utils'
-import { Modal } from 'ant-design-vue'
+import { Modal } from 'ant-design-vue-v3'
import { useRouter } from 'vue-router'
const { t } = useI18n()
diff --git a/ams/dashboard/src/views/optimize/components/ScaleOut.vue
b/ams/dashboard/src/views/optimize/components/ScaleOut.vue
index e12a6b899..f0f406b77 100644
--- a/ams/dashboard/src/views/optimize/components/ScaleOut.vue
+++ b/ams/dashboard/src/views/optimize/components/ScaleOut.vue
@@ -35,11 +35,10 @@ limitations under the License.
</a-modal>
</template>
<script lang="ts" setup>
-import { nextTick, onMounted, reactive, ref } from 'vue'
+import { onMounted, reactive, ref } from 'vue'
import { usePlaceholder } from '@/hooks/usePlaceholder'
import { IGroupItem } from '@/types/common.type'
import { getOptimizerGroups, scaleoutResource } from
'@/services/optimize.service'
-import { message } from 'ant-design-vue'
interface FormState {
resourceGroup: undefined | string
diff --git a/ams/dashboard/src/views/resource/components/GroupModal.vue
b/ams/dashboard/src/views/resource/components/GroupModal.vue
index 71563fae8..84f4571d5 100644
--- a/ams/dashboard/src/views/resource/components/GroupModal.vue
+++ b/ams/dashboard/src/views/resource/components/GroupModal.vue
@@ -73,7 +73,7 @@ import {
updateResourceGroupsAPI
} from '@/services/optimize.service'
import Properties from '@/views/catalogs/Properties.vue'
-import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue-v3'
import { useI18n } from 'vue-i18n'
diff --git a/ams/dashboard/src/views/resource/components/List.vue
b/ams/dashboard/src/views/resource/components/List.vue
index 3587ec694..b9f3418ad 100644
--- a/ams/dashboard/src/views/resource/components/List.vue
+++ b/ams/dashboard/src/views/resource/components/List.vue
@@ -66,7 +66,7 @@ import { getOptimizerResourceList, getResourceGroupsListAPI,
groupDeleteCheckAPI
import { useI18n } from 'vue-i18n'
import { usePagination } from '@/hooks/usePagination'
import { mbToSize } from '@/utils'
-import { Modal, message } from 'ant-design-vue'
+import { Modal, message } from 'ant-design-vue-v3'
import { useRouter } from 'vue-router'
import ScaleOut from '@/views/resource/components/ScaleOut.vue'
diff --git a/ams/dashboard/src/views/resource/components/ScaleOut.vue
b/ams/dashboard/src/views/resource/components/ScaleOut.vue
index 614c049c3..9876af5d5 100644
--- a/ams/dashboard/src/views/resource/components/ScaleOut.vue
+++ b/ams/dashboard/src/views/resource/components/ScaleOut.vue
@@ -49,7 +49,6 @@ import { onMounted, reactive, ref } from 'vue'
import { usePlaceholder } from '@/hooks/usePlaceholder'
import { IIOptimizeGroupItem } from '@/types/common.type'
import { scaleoutResource } from '@/services/optimize.service'
-// import { message } from 'ant-design-vue'
interface FormState {
resourceGroup: undefined | string;
diff --git a/ams/dashboard/src/views/tables/components/Operations.vue
b/ams/dashboard/src/views/tables/components/Operations.vue
index 6f187c57f..89db217ae 100644
--- a/ams/dashboard/src/views/tables/components/Operations.vue
+++ b/ams/dashboard/src/views/tables/components/Operations.vue
@@ -59,7 +59,7 @@ import { getOperations } from '@/services/table.service'
import { useRoute } from 'vue-router'
import { dateFormat } from '@/utils'
import useClipboard from 'vue-clipboard3'
-import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue-v3'
const { toClipboard } = useClipboard()
const { t } = useI18n()
diff --git a/ams/dashboard/src/views/tables/components/Optimizing.vue
b/ams/dashboard/src/views/tables/components/Optimizing.vue
index 39009917b..6f6c845a6 100644
--- a/ams/dashboard/src/views/tables/components/Optimizing.vue
+++ b/ams/dashboard/src/views/tables/components/Optimizing.vue
@@ -133,7 +133,7 @@ import { useI18n } from 'vue-i18n'
import { usePagination } from '@/hooks/usePagination'
import { IColumns, BreadcrumbOptimizingItem } from '@/types/common.type'
import { getOptimizingProcesses, getTasksByOptimizingProcessId,
cancelOptimizingProcess } from '@/services/table.service'
-import { Modal, message } from 'ant-design-vue'
+import { Modal, message } from 'ant-design-vue-v3'
import { useRoute } from 'vue-router'
import { QuestionCircleOutlined } from '@ant-design/icons-vue'
import { bytesToSize, dateFormat, formatMS2Time } from '@/utils/index'
diff --git a/ams/dashboard/src/views/tables/create.vue
b/ams/dashboard/src/views/tables/create.vue
index ba28cc999..9aba0ae50 100644
--- a/ams/dashboard/src/views/tables/create.vue
+++ b/ams/dashboard/src/views/tables/create.vue
@@ -56,7 +56,7 @@ limitations under the License.
<script lang="ts" setup>
import { reactive, ref } from 'vue'
-import type { SelectProps } from 'ant-design-vue'
+import type { SelectProps } from 'ant-design-vue-v3'
import { LeftOutlined } from '@ant-design/icons-vue'
import { TableBasicInfo } from '@/types/common.type'
import { usePlaceholder } from '@/hooks/usePlaceholder'
diff --git a/ams/dashboard/src/views/terminal/index.vue
b/ams/dashboard/src/views/terminal/index.vue
index dcba4104c..7121d4578 100644
--- a/ams/dashboard/src/views/terminal/index.vue
+++ b/ams/dashboard/src/views/terminal/index.vue
@@ -119,7 +119,7 @@ import SqlLog from './components/sql-log.vue'
import { ICatalogItem, IDebugResult, ILableAndValue, IMap, debugResultBgcMap }
from '@/types/common.type'
import { executeSql, getExampleSqlCode, getJobDebugResult, getLogsResult,
getShortcutsList, stopSql, getLastDebugInfo } from '@/services/terminal.service'
import { CheckCircleOutlined, CloseCircleOutlined, LoadingOutlined } from
'@ant-design/icons-vue'
-import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue-v3'
import { getCatalogList } from '@/services/table.service'
import { usePlaceholder } from '@/hooks/usePlaceholder'
diff --git a/ams/dashboard/vite.config.ts b/ams/dashboard/vite.config.ts
index 1313d78cd..89289d9c1 100644
--- a/ams/dashboard/vite.config.ts
+++ b/ams/dashboard/vite.config.ts
@@ -22,7 +22,6 @@ import { vitePluginFakeServer } from 'vite-plugin-fake-server'
import path from 'node:path'
import {createSvgIconsPlugin} from 'vite-plugin-svg-icons'
import ViteComponents from 'unplugin-vue-components/vite'
-import {AntDesignVueResolver} from 'unplugin-vue-components/resolvers'
const css = {
preprocessorOptions: {
@@ -64,9 +63,7 @@ export default defineConfig({
createSvgIconsPlugin({
iconDirs: [path.resolve(process.cwd(), 'src/assets/icons/svg')],
}),
- ViteComponents({
- resolvers: [AntDesignVueResolver()],
- })
+ ViteComponents()
],
server: {
port: 8080,
