Browse Source

chore: update dir

vben 10 months ago
parent
commit
20af961f09

+ 1 - 2
apps/antd-view/package.json

@@ -24,8 +24,6 @@
     "typecheck": "vue-tsc --noEmit --skipLibCheck"
   },
   "dependencies": {
-    "@vben-core/design": "workspace:*",
-    "@vben-core/design-tokens": "workspace:*",
     "@vben/common-ui": "workspace:*",
     "@vben/constants": "workspace:*",
     "@vben/hooks": "workspace:*",
@@ -34,6 +32,7 @@
     "@vben/locales": "workspace:*",
     "@vben/preference": "workspace:*",
     "@vben/stores": "workspace:*",
+    "@vben/styles": "workspace:*",
     "@vben/types": "workspace:*",
     "@vben/utils": "workspace:*",
     "ant-design-vue": "^4.2.1",

+ 0 - 0
apps/antd-view/src/layout.vue → apps/antd-view/src/layouts/basic.vue


+ 2 - 2
apps/antd-view/src/router/routes/layout.ts → apps/antd-view/src/layouts/index.ts

@@ -1,8 +1,8 @@
-const Layout = () => import('@/layout.vue');
+const BasicLayout = () => import('./basic.vue');
 
 const IFrameView = () => import('@vben/layouts').then((m) => m.IFrameView);
 
 const AuthPageLayout = () =>
   import('@vben/layouts').then((m) => m.AuthPageLayout);
 
-export { AuthPageLayout, IFrameView, Layout };
+export { AuthPageLayout, BasicLayout, IFrameView };

+ 1 - 4
apps/antd-view/src/main.ts

@@ -1,7 +1,4 @@
-import '@vben-core/design/tailwind';
-
-import '@vben-core/design';
-import '@vben-core/design-tokens';
+import '@vben/styles';
 
 import { setupI18n } from '@vben/locales';
 import { preference, setupPreference } from '@vben/preference';

+ 1 - 2
apps/antd-view/src/router/routes/builtin.ts

@@ -1,9 +1,8 @@
 import type { RouteRecordRaw } from 'vue-router';
 
+import { AuthPageLayout } from '@/layouts';
 import { Fallback } from '@vben/common-ui';
 
-import { AuthPageLayout } from './layout';
-
 /** 静态路由列表,访问这些页面可以不需要权限 */
 const builtinRoutes: RouteRecordRaw[] = [
   {

+ 3 - 2
apps/antd-view/src/router/routes/index.ts

@@ -1,7 +1,8 @@
 import type { RouteRecordRaw } from 'vue-router';
 
+import { BasicLayout } from '@/layouts';
+
 import { builtinRoutes } from './builtin';
-import { Layout } from './layout';
 import { nestedRoutes } from './modules/nested';
 import { outsideRoutes } from './modules/outside';
 import { vbenRoutes } from './modules/vben';
@@ -10,7 +11,7 @@ import { vbenRoutes } from './modules/vben';
 const dynamicRoutes: RouteRecordRaw[] = [
   // 根路由
   {
-    component: Layout,
+    component: BasicLayout,
     meta: {
       hideChildrenInMenu: true,
       title: '首页',

+ 2 - 2
apps/antd-view/src/router/routes/modules/nested.ts

@@ -1,10 +1,10 @@
 import type { RouteRecordRaw } from 'vue-router';
 
-import { Layout } from '../layout';
+import { BasicLayout } from '@/layouts';
 
 export const nestedRoutes: RouteRecordRaw[] = [
   {
-    component: Layout,
+    component: BasicLayout,
     meta: {
       keepAlive: true,
       title: '多级菜单',

+ 2 - 2
apps/antd-view/src/router/routes/modules/outside.ts

@@ -1,10 +1,10 @@
 import type { RouteRecordRaw } from 'vue-router';
 
-import { IFrameView, Layout } from '../layout';
+import { BasicLayout, IFrameView } from '@/layouts';
 
 export const outsideRoutes: RouteRecordRaw[] = [
   {
-    component: Layout,
+    component: BasicLayout,
     meta: {
       title: '外部页面',
     },

+ 2 - 3
apps/antd-view/src/router/routes/modules/vben.ts

@@ -1,14 +1,13 @@
 import type { RouteRecordRaw } from 'vue-router';
 
+import { BasicLayout, IFrameView } from '@/layouts';
 import { VBEN_GITHUB_URL } from '@vben/constants';
 import { $t } from '@vben/locales/helper';
 import { preference } from '@vben/preference';
 
-import { IFrameView, Layout } from '@/router/routes/layout';
-
 export const vbenRoutes: RouteRecordRaw[] = [
   {
-    component: Layout,
+    component: BasicLayout,
     meta: {
       icon: preference.logo,
       title: 'Vben Admin',

+ 1 - 1
apps/antd-view/vite.config.mts

@@ -18,7 +18,7 @@ export default defineConfig({
         { name: 'vue-demi' },
       ],
     },
-    visualizer: false,
+    visualizer: true,
   },
   vite: {
     server: {

+ 0 - 7
packages/@vben-core/shared/design/src/scss/common/base.scss

@@ -77,13 +77,6 @@ textarea::placeholder {
   opacity: 1;
 }
 
-// .collapse-transition {
-//   transition:
-//     height 0.2s ease-in-out,
-//     padding-top 0.2s ease-in-out,
-//     padding-bottom 0.2s ease-in-out;
-// }
-
 input:-webkit-autofill {
   border: none;
   box-shadow: 0 0 0 1000px transparent inset;

+ 1 - 1
packages/@vben-core/shared/toolkit/src/window.test.ts

@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { openWindow } from './window'; // 假设你的函数在 'openWindow' 文件中
 
-describe('generateUUID', () => {
+describe('openWindow', () => {
   // 保存原始的 window.open 函数
   let originalOpen: typeof window.open;
 

+ 1 - 0
packages/business/common-ui/src/authentication/login.vue

@@ -56,6 +56,7 @@ const passwordStatus = computed(() => {
 
 function handleSubmit() {
   formState.submitted = true;
+
   if (
     usernameStatus.value !== 'default' ||
     passwordStatus.value !== 'default'

+ 0 - 2
packages/hooks/src/index.ts

@@ -1,3 +1 @@
-// export { useNProgress } from '@vueuse/integrations/useNProgress';
-
 export * from './use-request';

+ 49 - 0
packages/styles/package.json

@@ -0,0 +1,49 @@
+{
+  "name": "@vben/styles",
+  "version": "1.0.0",
+  "type": "module",
+  "license": "MIT",
+  "homepage": "https://github.com/vbenjs/vue-vben-admin",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vbenjs/vue-vben-admin.git",
+    "directory": "packages/styles"
+  },
+  "bugs": {
+    "url": "https://github.com/vbenjs/vue-vben-admin/issues"
+  },
+  "scripts": {
+    "build": "pnpm vite build",
+    "prepublishOnly": "npm run build"
+  },
+  "files": [
+    "dist"
+  ],
+  "sideEffects": [
+    "**/*.css"
+  ],
+  "main": "./dist/index.mjs",
+  "module": "./dist/index.mjs",
+  "imports": {
+    "#*": "./src/*"
+  },
+  "exports": {
+    ".": {
+      "development": "./src/index.ts",
+      "types": "./src/index.ts",
+      "default": "./dist/index.mjs"
+    }
+  },
+  "publishConfig": {
+    "exports": {
+      ".": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.mjs"
+      }
+    }
+  },
+  "dependencies": {
+    "@vben-core/design": "workspace:*",
+    "@vben-core/design-tokens": "workspace:*"
+  }
+}

+ 4 - 0
packages/styles/src/index.ts

@@ -0,0 +1,4 @@
+import '@vben-core/design/tailwind';
+
+import '@vben-core/design';
+import '@vben-core/design-tokens';

+ 5 - 0
packages/styles/tsconfig.json

@@ -0,0 +1,5 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "@vben/tsconfig/web.json",
+  "include": ["src"]
+}

+ 3 - 0
packages/styles/vite.config.mts

@@ -0,0 +1,3 @@
+import { defineConfig } from '@vben/vite-config';
+
+export default defineConfig();

+ 12 - 6
pnpm-lock.yaml

@@ -93,12 +93,6 @@ importers:
 
   apps/antd-view:
     dependencies:
-      '@vben-core/design':
-        specifier: workspace:*
-        version: link:../../packages/@vben-core/shared/design
-      '@vben-core/design-tokens':
-        specifier: workspace:*
-        version: link:../../packages/@vben-core/shared/design-tokens
       '@vben/common-ui':
         specifier: workspace:*
         version: link:../../packages/business/common-ui
@@ -123,6 +117,9 @@ importers:
       '@vben/stores':
         specifier: workspace:*
         version: link:../../packages/stores
+      '@vben/styles':
+        specifier: workspace:*
+        version: link:../../packages/styles
       '@vben/types':
         specifier: workspace:*
         version: link:../../packages/types
@@ -748,6 +745,15 @@ importers:
         specifier: ^4.3.2
         version: 4.3.2(vue@3.4.27(typescript@5.4.5))
 
+  packages/styles:
+    dependencies:
+      '@vben-core/design':
+        specifier: workspace:*
+        version: link:../@vben-core/shared/design
+      '@vben-core/design-tokens':
+        specifier: workspace:*
+        version: link:../@vben-core/shared/design-tokens
+
   packages/types:
     dependencies:
       '@vben-core/typings':

+ 4 - 0
vben-admin.code-workspace

@@ -108,6 +108,10 @@
       "name": "@vben/stores",
       "path": "packages/stores",
     },
+    {
+      "name": "@vben/styles",
+      "path": "packages/styles",
+    },
     {
       "name": "@vben/types",
       "path": "packages/types",