diff --git a/apps/web-tdesign/src/adapter/component/index.ts b/apps/web-tdesign/src/adapter/component/index.ts index b4562d3a..b7fc0547 100644 --- a/apps/web-tdesign/src/adapter/component/index.ts +++ b/apps/web-tdesign/src/adapter/component/index.ts @@ -187,7 +187,7 @@ async function initComponentAdapter() { } return h( Button, - { ...props, ghost, variant, attrs, theme: 'default' }, + { ...props, ghost, variant, attrs, theme: 'primary' }, slots, ); }, diff --git a/apps/web-tdesign/src/router/routes/modules/demos.ts b/apps/web-tdesign/src/router/routes/modules/demos.ts index 55ade09c..c8a24b84 100644 --- a/apps/web-tdesign/src/router/routes/modules/demos.ts +++ b/apps/web-tdesign/src/router/routes/modules/demos.ts @@ -19,7 +19,7 @@ const routes: RouteRecordRaw[] = [ }, name: 'AntDesignDemos', path: '/demos/ant-design', - component: () => import('#/views/demos/antd/index.vue'), + component: () => import('#/views/demos/tdesign/index.vue'), }, ], }, diff --git a/apps/web-tdesign/src/store/auth.ts b/apps/web-tdesign/src/store/auth.ts index 38c74e32..b3b4b749 100644 --- a/apps/web-tdesign/src/store/auth.ts +++ b/apps/web-tdesign/src/store/auth.ts @@ -7,9 +7,9 @@ import { LOGIN_PATH } from '@vben/constants'; import { preferences } from '@vben/preferences'; import { resetAllStores, useAccessStore, useUserStore } from '@vben/stores'; -import { notification } from '#/adapter/tdesign'; import { defineStore } from 'pinia'; +import { notification } from '#/adapter/tdesign'; import { getAccessCodesApi, getUserInfoApi, loginApi, logoutApi } from '#/api'; import { $t } from '#/locales'; @@ -30,7 +30,7 @@ export const useAuthStore = defineStore('auth', () => { onSuccess?: () => Promise | void, ) { // 异步处理用户登录操作并获取 accessToken - const userInfo: null | UserInfo = null; + let userInfo: null | UserInfo = null; try { loginLoading.value = true; const { accessToken } = await loginApi(params); diff --git a/apps/web-tdesign/src/views/demos/antd/index.vue b/apps/web-tdesign/src/views/demos/tdesign/index.vue similarity index 100% rename from apps/web-tdesign/src/views/demos/antd/index.vue rename to apps/web-tdesign/src/views/demos/tdesign/index.vue diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 13d9cb3e..68f5f534 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -841,6 +841,69 @@ importers: specifier: 'catalog:' version: 4.5.1(vue@3.5.17(typescript@5.8.3)) + apps/web-tdesign: + dependencies: + '@vben/access': + specifier: workspace:* + version: link:../../packages/effects/access + '@vben/common-ui': + specifier: workspace:* + version: link:../../packages/effects/common-ui + '@vben/constants': + specifier: workspace:* + version: link:../../packages/constants + '@vben/hooks': + specifier: workspace:* + version: link:../../packages/effects/hooks + '@vben/icons': + specifier: workspace:* + version: link:../../packages/icons + '@vben/layouts': + specifier: workspace:* + version: link:../../packages/effects/layouts + '@vben/locales': + specifier: workspace:* + version: link:../../packages/locales + '@vben/plugins': + specifier: workspace:* + version: link:../../packages/effects/plugins + '@vben/preferences': + specifier: workspace:* + version: link:../../packages/preferences + '@vben/request': + specifier: workspace:* + version: link:../../packages/effects/request + '@vben/stores': + specifier: workspace:* + version: link:../../packages/stores + '@vben/styles': + specifier: workspace:* + version: link:../../packages/styles + '@vben/types': + specifier: workspace:* + version: link:../../packages/types + '@vben/utils': + specifier: workspace:* + version: link:../../packages/utils + '@vueuse/core': + specifier: 'catalog:' + version: 13.4.0(vue@3.5.17(typescript@5.8.3)) + dayjs: + specifier: 'catalog:' + version: 1.11.13 + pinia: + specifier: ^3.0.3 + version: 3.0.3(typescript@5.8.3)(vue@3.5.17(typescript@5.8.3)) + tdesign-vue-next: + specifier: ^1.17.1 + version: 1.17.2(vue@3.5.17(typescript@5.8.3)) + vue: + specifier: ^3.5.17 + version: 3.5.17(typescript@5.8.3) + vue-router: + specifier: 'catalog:' + version: 4.5.1(vue@3.5.17(typescript@5.8.3)) + docs: dependencies: '@vben-core/shadcn-ui': @@ -4866,6 +4929,9 @@ packages: '@types/sortablejs@1.15.8': resolution: {integrity: sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg==} + '@types/tinycolor2@1.4.6': + resolution: {integrity: sha512-iEN8J0BoMnsWBqjVbWH/c0G0Hh7O21lpR2/+PrvAVgWdzL7eexIFm4JN/Wn10PTcmNdtS6U67r499mlWMXOxNw==} + '@types/triple-beam@1.3.5': resolution: {integrity: sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==} @@ -4875,6 +4941,9 @@ packages: '@types/unist@3.0.3': resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==} + '@types/validator@13.15.4': + resolution: {integrity: sha512-LSFfpSnJJY9wbC0LQxgvfb+ynbHftFo0tMsFOl/J4wexLnYMmDSPaj2ZyDv3TkfL1UePxPrxOWJfbiRS8mQv7A==} + '@types/web-bluetooth@0.0.16': resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==} @@ -10735,6 +10804,17 @@ packages: resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==} engines: {node: '>=18'} + tdesign-icons-vue-next@0.4.1: + resolution: {integrity: sha512-uDPuTLRORnGcTyVGNoentNaK4V+ZcBmhYwcY3KqDaQQ5rrPeLMxu0ZVmgOEf0JtF2QZiqAxY7vodNEiLUdoRKA==} + peerDependencies: + vue: ^3.5.17 + + tdesign-vue-next@1.17.2: + resolution: {integrity: sha512-nTofPSKGQguOS+Lb62fDiLS1Rs3Ngzb8rE8sPEjfMdDjdFZ5kEUgvVp+J+8GKfgwVRAZRjv//qSzZVt6cqgXxA==} + engines: {node: '>= 18'} + peerDependencies: + vue: ^3.5.17 + temp-dir@2.0.0: resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==} engines: {node: '>=8'} @@ -10785,6 +10865,9 @@ packages: tinybench@2.9.0: resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} + tinycolor2@1.6.0: + resolution: {integrity: sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==} + tinyexec@0.3.2: resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} @@ -11196,6 +11279,10 @@ packages: validate-npm-package-license@3.0.4: resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} + validator@13.15.20: + resolution: {integrity: sha512-KxPOq3V2LmfQPP4eqf3Mq/zrT0Dqp2Vmx2Bn285LwVahLc+CsxOM0crBHczm8ijlcjZ0Q5Xd6LW3z3odTPnlrw==} + engines: {node: '>= 0.10'} + vdirs@0.1.8: resolution: {integrity: sha512-H9V1zGRLQZg9b+GdMk8MXDN2Lva0zx72MPahDKc30v+DtwKjfyOSXWRIX4t2mhDubM1H09gPhWeth/BJWPHGUw==} peerDependencies: @@ -15070,12 +15157,16 @@ snapshots: '@types/sortablejs@1.15.8': {} + '@types/tinycolor2@1.4.6': {} + '@types/triple-beam@1.3.5': {} '@types/trusted-types@2.0.7': {} '@types/unist@3.0.3': {} + '@types/validator@13.15.4': {} + '@types/web-bluetooth@0.0.16': {} '@types/web-bluetooth@0.0.20': {} @@ -21614,6 +21705,28 @@ snapshots: mkdirp: 3.0.1 yallist: 5.0.0 + tdesign-icons-vue-next@0.4.1(vue@3.5.17(typescript@5.8.3)): + dependencies: + '@babel/runtime': 7.27.6 + vue: 3.5.17(typescript@5.8.3) + + tdesign-vue-next@1.17.2(vue@3.5.17(typescript@5.8.3)): + dependencies: + '@babel/runtime': 7.27.6 + '@popperjs/core': 2.11.8 + '@types/lodash-es': 4.17.12 + '@types/sortablejs': 1.15.8 + '@types/tinycolor2': 1.4.6 + '@types/validator': 13.15.4 + dayjs: 1.11.13 + lodash-es: 4.17.21 + mitt: 3.0.1 + sortablejs: 1.15.6 + tdesign-icons-vue-next: 0.4.1(vue@3.5.17(typescript@5.8.3)) + tinycolor2: 1.6.0 + validator: 13.15.20 + vue: 3.5.17(typescript@5.8.3) + temp-dir@2.0.0: {} tempy@0.6.0: @@ -21658,6 +21771,8 @@ snapshots: tinybench@2.9.0: {} + tinycolor2@1.6.0: {} + tinyexec@0.3.2: {} tinyexec@1.0.1: {} @@ -22101,6 +22216,8 @@ snapshots: spdx-correct: 3.2.0 spdx-expression-parse: 3.0.1 + validator@13.15.20: {} + vdirs@0.1.8(vue@3.5.17(typescript@5.8.3)): dependencies: evtd: 0.2.4 diff --git a/vben-admin.code-workspace b/vben-admin.code-workspace index aa8205bd..33df5a75 100644 --- a/vben-admin.code-workspace +++ b/vben-admin.code-workspace @@ -16,6 +16,10 @@ "name": "@vben/web-naive", "path": "apps/web-naive", }, + { + "name": "@vben/web-tdesign", + "path": "apps/web-tdesign", + }, { "name": "@vben/docs", "path": "docs",