From 83953c07c471d1ad5bb2bfc110e856e72335b1b2 Mon Sep 17 00:00:00 2001 From: vertoryao <673441990@qq.com> Date: Mon, 5 May 2025 16:33:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor(@vben/web-antd):=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=88=AC=E5=8F=96=E9=A1=B5=E9=9D=A2=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/core/server.ts | 8 +- apps/web-antd/src/store/auth.ts | 5 +- apps/web-antd/src/views/spider/index.vue | 227 +++--------------- apps/web-antd/src/views/spider/index2.vue | 210 ++++++++++++++++ packages/effects/common-ui/package.json | 1 + .../common-ui/src/ui/home/workflows-view.vue | 1 - packages/effects/common-ui/src/ui/index.ts | 1 + .../effects/common-ui/src/ui/spider/index.ts | 3 + .../src/ui/spider/spider-list-view.vue | 49 ++++ .../src/ui/spider/spider-work-view.vue | 139 +++++++++++ .../effects/common-ui/src/ui/spider/typing.ts | 9 + pnpm-lock.yaml | 3 + 12 files changed, 456 insertions(+), 200 deletions(-) create mode 100644 apps/web-antd/src/views/spider/index2.vue create mode 100644 packages/effects/common-ui/src/ui/spider/index.ts create mode 100644 packages/effects/common-ui/src/ui/spider/spider-list-view.vue create mode 100644 packages/effects/common-ui/src/ui/spider/spider-work-view.vue create mode 100644 packages/effects/common-ui/src/ui/spider/typing.ts diff --git a/apps/web-antd/src/api/core/server.ts b/apps/web-antd/src/api/core/server.ts index 7d7520c..162b14a 100644 --- a/apps/web-antd/src/api/core/server.ts +++ b/apps/web-antd/src/api/core/server.ts @@ -1,3 +1,5 @@ +import type { SpiderItem } from '@vben/common-ui'; + import { requestClient } from '#/api/request'; export namespace RepositoryApi { @@ -7,9 +9,9 @@ export namespace RepositoryApi { } } -export const getAppList = (params: RepositoryApi.AppListParams) => { - return requestClient.get(`/v1/server/apps`, { params }); -}; +export async function getAppList(params: RepositoryApi.AppListParams) { + return requestClient.get(`/v1/server/apps`, { params }); +} // export const getAppDetail = (id) => { // return requestClient.get(`/v1/server/${id}`) diff --git a/apps/web-antd/src/store/auth.ts b/apps/web-antd/src/store/auth.ts index 95a0ce3..116d6b1 100644 --- a/apps/web-antd/src/store/auth.ts +++ b/apps/web-antd/src/store/auth.ts @@ -51,14 +51,13 @@ export const useAuthStore = defineStore('auth', () => { realName: user.username, username: user.username, roles: [user.role.name], - homePath: '/analytics', + homePath: '/home', token: csrf.token, }; accessStore.setAccessToken(csrf.token); userStore.setUserInfo(userInfo); accessStore.setAccessCodes(user.permissions); - console.log(userStore.userInfo); if (accessStore.loginExpired) { accessStore.setLoginExpired(false); @@ -115,7 +114,7 @@ export const useAuthStore = defineStore('auth', () => { realName: user.username, username: user.username, roles: [user.role.name], - homePath: '/analytics', + homePath: '/home', token: csrf.token, }; userStore.setUserInfo(userInfo); diff --git a/apps/web-antd/src/views/spider/index.vue b/apps/web-antd/src/views/spider/index.vue index fb723e2..6c2533e 100644 --- a/apps/web-antd/src/views/spider/index.vue +++ b/apps/web-antd/src/views/spider/index.vue @@ -1,114 +1,27 @@ - diff --git a/apps/web-antd/src/views/spider/index2.vue b/apps/web-antd/src/views/spider/index2.vue new file mode 100644 index 0000000..fb723e2 --- /dev/null +++ b/apps/web-antd/src/views/spider/index2.vue @@ -0,0 +1,210 @@ + + + diff --git a/packages/effects/common-ui/package.json b/packages/effects/common-ui/package.json index bfbcfdb..325c619 100644 --- a/packages/effects/common-ui/package.json +++ b/packages/effects/common-ui/package.json @@ -40,6 +40,7 @@ "@vben/types": "workspace:*", "@vueuse/core": "catalog:", "@vueuse/integrations": "catalog:", + "ant-design-vue": "catalog:", "qrcode": "catalog:", "tippy.js": "catalog:", "vue": "catalog:", diff --git a/packages/effects/common-ui/src/ui/home/workflows-view.vue b/packages/effects/common-ui/src/ui/home/workflows-view.vue index 5d83c17..81c059b 100644 --- a/packages/effects/common-ui/src/ui/home/workflows-view.vue +++ b/packages/effects/common-ui/src/ui/home/workflows-view.vue @@ -21,7 +21,6 @@ defineOptions({ withDefaults(defineProps(), { items: () => [], }); -// const emit = defineEmits<{ (e: 'go', path: string): void }>(); defineEmits(['click']); diff --git a/packages/effects/common-ui/src/ui/index.ts b/packages/effects/common-ui/src/ui/index.ts index 925ca97..1f8bc38 100644 --- a/packages/effects/common-ui/src/ui/index.ts +++ b/packages/effects/common-ui/src/ui/index.ts @@ -3,3 +3,4 @@ export * from './authentication'; export * from './dashboard'; export * from './fallback'; export * from './home'; +export * from './spider'; diff --git a/packages/effects/common-ui/src/ui/spider/index.ts b/packages/effects/common-ui/src/ui/spider/index.ts new file mode 100644 index 0000000..0566302 --- /dev/null +++ b/packages/effects/common-ui/src/ui/spider/index.ts @@ -0,0 +1,3 @@ +export { default as SpiderListView } from './spider-list-view.vue'; +export { default as SpiderWorkView } from './spider-work-view.vue'; +export type * from './typing'; diff --git a/packages/effects/common-ui/src/ui/spider/spider-list-view.vue b/packages/effects/common-ui/src/ui/spider/spider-list-view.vue new file mode 100644 index 0000000..6a429c5 --- /dev/null +++ b/packages/effects/common-ui/src/ui/spider/spider-list-view.vue @@ -0,0 +1,49 @@ + + + diff --git a/packages/effects/common-ui/src/ui/spider/spider-work-view.vue b/packages/effects/common-ui/src/ui/spider/spider-work-view.vue new file mode 100644 index 0000000..43b5161 --- /dev/null +++ b/packages/effects/common-ui/src/ui/spider/spider-work-view.vue @@ -0,0 +1,139 @@ + + + diff --git a/packages/effects/common-ui/src/ui/spider/typing.ts b/packages/effects/common-ui/src/ui/spider/typing.ts new file mode 100644 index 0000000..ef08602 --- /dev/null +++ b/packages/effects/common-ui/src/ui/spider/typing.ts @@ -0,0 +1,9 @@ +interface SpiderItem { + id: number; + name: string; + description: string; + content: string; + path: string; +} + +export type { SpiderItem }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 960d53f..a03de33 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1329,6 +1329,9 @@ importers: '@vueuse/integrations': specifier: 'catalog:' version: 13.1.0(async-validator@4.2.5)(axios@1.9.0)(focus-trap@7.6.4)(jwt-decode@4.0.0)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(vue@3.5.13(typescript@5.8.3)) + ant-design-vue: + specifier: 'catalog:' + version: 4.2.6(vue@3.5.13(typescript@5.8.3)) qrcode: specifier: 'catalog:' version: 1.5.4