fetch: Fix ICON configuration wansenai#22

Jzow · Dec 20, 2023 · 5468c5e · 5468c5e
1 parent 71b339f
commit 5468c5e
Show file tree

Hide file tree

Showing 7 changed files with 165 additions and 309 deletions.
diff --git a/flow-admin-ui/package.json b/flow-admin-ui/package.json
@@ -1,169 +1,40 @@
 {
-  "name": "flow_admin",
-  "version": "2.8.0",
+  "name": "eairp-web",
+  "version": "1.0.1",
+  "homepage": "https://github.com/wansenai/wansen-erp-ui",
+  "bugs": {
+    "url": "https://github.com/wansenai/wansen-erp-ui/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/wansenai/wansen-erp-ui.git"
+  },
+  "license": "MIT And Apache-2.0",
   "author": {
-    "name": "xietongjian",
-    "email": "583110978@qq.com",
-    "url": "https://gitee.com/lwj/flow"
+    "name": "Wansen AI Team",
+    "email": "hi@wansenai.com",
+    "url": "https://github.com/wansenai"
   },
   "scripts": {
     "bootstrap": "pnpm install",
-    "serve": "npm run dev",
-    "dev": "vite",
-    "build": "cross-env NODE_ENV=production vite build && esno ./build/script/postBuild.ts",
-    "build:test": "cross-env vite build --mode test && esno ./build/script/postBuild.ts",
-    "build:no-cache": "pnpm clean:cache && npm run build",
-    "report": "cross-env REPORT=true npm run build",
-    "type:check": "vue-tsc --noEmit --skipLibCheck",
-    "preview": "npm run build && vite preview",
-    "preview:dist": "vite preview",
-    "log": "conventional-changelog -p angular -i CHANGELOG.md -s",
-    "clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite",
-    "clean:lib": "rimraf node_modules",
+    "build": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=8192 pnpm vite build",
+    "build:analyze": "cross-env NODE_OPTIONS=--max-old-space-size=8192 pnpm vite build --mode analyze",
+    "build:no-cache": "pnpm store prune && npm run build",
+    "build:test": "cross-env NODE_OPTIONS=--max-old-space-size=8192 pnpm vite build --mode test",
+    "build:docker": "vite build --mode docker",
+    "commit": "czg",
+    "dev": "pnpm vite",
+    "preinstall": "npx only-allow pnpm",
+    "postinstall": "turbo run stub",
+    "lint": "turbo run lint",
     "lint:eslint": "eslint --cache --max-warnings 0  \"{src,mock}/**/*.{vue,ts,tsx}\" --fix",
-    "lint:prettier": "prettier --write  \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"",
-    "lint:stylelint": "stylelint --cache --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
-    "lint:lint-staged": "lint-staged",
-    "test:unit": "jest",
-    "test:gzip": "npx http-server dist --cors --gzip -c-1",
-    "test:br": "npx http-server dist --cors --brotli -c-1",
+    "lint:prettier": "prettier --write .",
+    "lint:stylelint": "stylelint \"**/*.{vue,css,less.scss}\" --fix --cache --cache-location node_modules/.cache/stylelint/",
+    "preview": "npm run build && vite preview",
     "reinstall": "rimraf pnpm-lock.yaml && rimraf package.lock.json && rimraf node_modules && npm run bootstrap",
-    "gen:icon": "esno ./build/generate/icon/index.ts"
-  },
-  "dependencies": {
-    "@ant-design/colors": "^6.0.0",
-    "@ant-design/icons-vue": "^6.1.0",
-    "@iconify/iconify": "^2.2.1",
-    "@logicflow/core": "^1.1.13",
-    "@logicflow/extension": "^1.1.13",
-    "@vue/runtime-core": "^3.2.33",
-    "@vue/shared": "^3.2.33",
-    "@vueuse/core": "^8.3.0",
-    "@vueuse/shared": "^8.3.0",
-    "@zxcvbn-ts/core": "^2.0.1",
-    "ant-design-vue": "^3.2.0",
-    "axios": "^0.26.1",
-    "codemirror": "^5.65.3",
-    "cropperjs": "^1.5.12",
-    "crypto-js": "^4.1.1",
-    "dayjs": "^1.11.1",
-    "echarts": "^5.3.2",
-    "exceljs": "^4.3.0",
-    "intro.js": "^5.1.0",
-    "lodash-es": "^4.17.21",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "path-to-regexp": "^6.2.0",
-    "pinia": "2.0.12",
-    "print-js": "^1.6.0",
-    "qrcode": "^1.5.0",
-    "qs": "^6.10.3",
-    "resize-observer-polyfill": "^1.5.1",
-    "showdown": "^2.1.0",
-    "sortablejs": "^1.15.0",
-    "tinymce": "^5.10.7",
-    "vditor": "^3.8.13",
-    "vue": "^3.2.45",
-    "vue-i18n": "^9.1.9",
-    "vue-json-pretty": "^2.0.6",
-    "vue-router": "^4.0.14",
-    "vue-types": "^4.1.1",
-    "xlsx": "^0.18.5",
-    "bpmn-js": "^9.0.3",
-    "diagram-js": "^8.2.0",
-    "camunda-bpmn-moddle": "^6.1.2"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^16.2.3",
-    "@commitlint/config-conventional": "^16.2.1",
-    "@iconify/json": "^2.1.30",
-    "@purge-icons/generated": "^0.8.1",
-    "@types/codemirror": "^5.60.5",
-    "@types/crypto-js": "^4.1.1",
-    "@types/fs-extra": "^9.0.13",
-    "@types/inquirer": "^8.2.1",
-    "@types/intro.js": "^3.0.2",
-    "@types/lodash-es": "^4.17.6",
-    "@types/mockjs": "^1.0.6",
-    "@types/node": "^17.0.25",
-    "@types/nprogress": "^0.2.0",
-    "@types/qrcode": "^1.4.2",
-    "@types/qs": "^6.9.7",
-    "@types/showdown": "^1.9.4",
-    "@types/sortablejs": "^1.10.7",
-    "@typescript-eslint/eslint-plugin": "^5.20.0",
-    "@typescript-eslint/parser": "^5.20.0",
-    "@vitejs/plugin-legacy": "^1.8.1",
-    "@vitejs/plugin-vue": "^2.3.1",
-    "@vitejs/plugin-vue-jsx": "^1.3.10",
-    "@vue/compiler-sfc": "^3.2.33",
-    "@vue/test-utils": "^2.0.0-rc.21",
-    "autoprefixer": "^10.4.4",
-    "conventional-changelog-cli": "^2.2.2",
-    "cross-env": "^7.0.3",
-    "cz-git": "^1.3.9",
-    "czg": "^1.3.9",
-    "dotenv": "^16.0.0",
-    "eslint": "^8.13.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-vue": "^8.6.0",
-    "esno": "^0.14.1",
-    "fs-extra": "^10.1.0",
-    "husky": "^7.0.4",
-    "inquirer": "^8.2.2",
-    "less": "^4.1.2",
-    "lint-staged": "12.3.7",
-    "npm-run-all": "^4.1.5",
-    "picocolors": "^1.0.0",
-    "postcss": "^8.4.12",
-    "postcss-html": "^1.4.1",
-    "postcss-less": "^6.0.0",
-    "prettier": "^2.6.2",
-    "rimraf": "^3.0.2",
-    "rollup": "^2.70.2",
-    "rollup-plugin-visualizer": "^5.6.0",
-    "sass": "^1.57.1",
-    "stylelint": "^14.7.1",
-    "stylelint-config-prettier": "^9.0.3",
-    "stylelint-config-recommended": "^7.0.0",
-    "stylelint-config-recommended-vue": "^1.4.0",
-    "stylelint-config-standard": "^25.0.0",
-    "stylelint-order": "^5.0.0",
-    "ts-node": "^10.7.0",
-    "typescript": "^4.6.3",
-    "vite": "^2.9.5",
-    "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-html": "^3.2.0",
-    "vite-plugin-imagemin": "^0.6.1",
-    "vite-plugin-mkcert": "^1.6.0",
-    "vite-plugin-mock": "^2.9.6",
-    "vite-plugin-purge-icons": "^0.8.1",
-    "vite-plugin-pwa": "^0.11.13",
-    "vite-plugin-style-import": "^2.0.0",
-    "vite-plugin-svg-icons": "^2.0.1",
-    "vite-plugin-theme": "^0.8.6",
-    "vite-plugin-vue-setup-extend": "^0.4.0",
-    "vite-plugin-windicss": "^1.8.4",
-    "vue-eslint-parser": "^8.3.0",
-    "vue-tsc": "^1.0.9"
-  },
-  "resolutions": {
-    "bin-wrapper": "npm:bin-wrapper-china",
-    "rollup": "^2.56.3",
-    "gifsicle": "5.2.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/lwj/flow.git"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://gitee.com/lwj/flow/issues"
-  },
-  "homepage": "https://gitee.com/lwj/flow",
-  "engines": {
-    "node": "^12 || >=14"
+    "serve": "npm run dev",
+    "test:gzip": "npx http-server dist --cors --gzip -c-1",
+    "type:check": "vue-tsc --noEmit --skipLibCheck"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
@@ -193,5 +64,93 @@
     "commitizen": {
       "path": "node_modules/cz-git"
     }
+  },
+  "dependencies": {
+    "@ant-design/colors": "^6.0.0",
+    "@ant-design/icons-vue": "^6.1.0",
+    "@axolo/tree-array": "^0.1.0",
+    "@iconify/iconify": "^3.1.1",
+    "@logicflow/core": "^1.2.9",
+    "@logicflow/extension": "^1.2.9",
+    "@vben/hooks": "workspace:*",
+    "@vue/shared": "^3.3.4",
+    "@vueuse/core": "^10.2.1",
+    "@vueuse/shared": "^10.2.1",
+    "@zxcvbn-ts/core": "^3.0.2",
+    "ant-design-vue": "^4.0.6",
+    "axios": "^1.4.0",
+    "codemirror": "^5.65.12",
+    "cropperjs": "^1.5.13",
+    "crypto-js": "^4.1.1",
+    "dayjs": "^1.11.9",
+    "echarts": "^5.4.2",
+    "exceljs": "^4.3.0",
+    "intro.js": "^7.0.1",
+    "lodash-es": "^4.17.21",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "path-to-regexp": "^6.2.1",
+    "pinia": "2.1.4",
+    "print-js": "^1.6.0",
+    "qrcode": "^1.5.3",
+    "qs": "^6.11.2",
+    "resize-observer-polyfill": "^1.5.1",
+    "showdown": "^2.1.0",
+    "sortablejs": "^1.15.0",
+    "tinymce": "^5.10.7",
+    "vditor": "^3.9.4",
+    "vue": "^3.3.4",
+    "vue-i18n": "^9.2.2",
+    "vue-json-pretty": "^2.2.4",
+    "vue-router": "^4.2.3",
+    "vue-types": "^5.1.0",
+    "vuedraggable": "^4.1.0",
+    "vxe-table": "^4.5.14",
+    "vxe-table-plugin-export-xlsx": "3.1.0",
+    "xe-utils": "^3.5.11",
+    "xlsx": "^0.18.5",
+    "bpmn-js": "^16.1.0",
+    "diagram-js": "^8.2.0",
+    "camunda-bpmn-moddle": "^7.0.1"
+  },
+  "devDependencies": {
+    "@commitlint/cli": "^17.6.6",
+    "@commitlint/config-conventional": "^17.6.6",
+    "@iconify/json": "^2.2.87",
+    "@purge-icons/generated": "^0.9.0",
+    "@types/codemirror": "^5.60.8",
+    "@types/crypto-js": "^4.1.1",
+    "@types/intro.js": "^5.1.1",
+    "@types/lodash-es": "^4.17.7",
+    "@types/mockjs": "^1.0.7",
+    "@types/nprogress": "^0.2.0",
+    "@types/qrcode": "^1.5.1",
+    "@types/qs": "^6.9.7",
+    "@types/showdown": "^2.0.1",
+    "@types/sortablejs": "^1.15.1",
+    "@vben/stylelint-config": "workspace:*",
+    "@vben/ts-config": "workspace:*",
+    "@vben/types": "workspace:*",
+    "@vben/vite-config": "workspace:*",
+    "@vue/compiler-sfc": "^3.3.4",
+    "@vue/test-utils": "^2.4.0",
+    "cross-env": "^7.0.3",
+    "cz-git": "^1.6.1",
+    "czg": "^1.6.1",
+    "lint-staged": "13.2.3",
+    "prettier": "^2.8.8",
+    "prettier-plugin-packagejson": "^2.4.4",
+    "rimraf": "^5.0.1",
+    "turbo": "^1.10.7",
+    "typescript": "^5.1.6",
+    "unbuild": "^1.2.1",
+    "vite": "^4.4.0",
+    "vite-plugin-mock": "^2.9.6",
+    "vue-tsc": "^1.8.4"
+  },
+  "packageManager": "pnpm@8.1.0",
+  "engines": {
+    "node": ">=16.15.1",
+    "pnpm": ">=8.1.0"
   }
 }
diff --git a/flow-admin-ui/src/components/Tree/src/TreeIcon.ts b/flow-admin-ui/src/components/Tree/src/TreeIcon.ts
@@ -2,7 +2,7 @@ import type { VNode, FunctionalComponent } from 'vue';
 
 import { h } from 'vue';
 import { isString } from '@vue/shared';
-import { Icon } from '/@/components/Icon';
+import Icon from '/@/components/Icon/Icon.vue';
 
 export const TreeIcon: FunctionalComponent = ({ icon }: { icon: VNode | string }) => {
   if (!icon) return null;

diff --git a/flow-admin-ui/src/main.ts b/flow-admin-ui/src/main.ts
@@ -1,25 +1,21 @@
-import 'virtual:windi-base.css';
-import 'virtual:windi-components.css';
-import '/@/design/index.less';
-import 'virtual:windi-utilities.css';
+import 'uno.css';
+import '@/design/index.less';
+import 'ant-design-vue/dist/reset.css';
 // Register icon sprite
 import 'virtual:svg-icons-register';
-import App from './App.vue';
+
 import { createApp } from 'vue';
-import { initAppConfigStore } from '/@/logics/initAppConfig';
-import { setupErrorHandle } from '/@/logics/error-handle';
-import { router, setupRouter } from '/@/router';
-import { setupRouterGuard } from '/@/router/guard';
-import { setupStore } from '/@/store';
-import { setupGlobDirectives } from '/@/directives';
-import { setupI18n } from '/@/locales/setupI18n';
-import { registerGlobComp } from '/@/components/registerGlobComp';
 
-import { isDevMode } from './utils/env';
+import { registerGlobComp } from '@/components/registerGlobComp';
+import { setupGlobDirectives } from '@/directives';
+import { setupI18n } from '@/locales/setupI18n';
+import { setupErrorHandle } from '@/logics/error-handle';
+import { initAppConfigStore } from '@/logics/initAppConfig';
+import { router, setupRouter } from '@/router';
+import { setupRouterGuard } from '@/router/guard';
+import { setupStore } from '@/store';
 
-if (isDevMode()) {
-  import('ant-design-vue/es/style');
-}
+import App from './App.vue';
 
 async function bootstrap() {
   const app = createApp(App);

diff --git a/flow-admin-ui/src/views/demo/system/menu/menu.data.ts b/flow-admin-ui/src/views/demo/system/menu/menu.data.ts
@@ -2,7 +2,7 @@ import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
-import { Icon } from '/@/components/Icon';
+import Icon from '/@/components/Icon/Icon.vue';
 
 export const columns: BasicColumn[] = [
   {

diff --git a/flow-admin-ui/src/views/privilege/module/module.data.ts b/flow-admin-ui/src/views/privilege/module/module.data.ts
@@ -2,7 +2,7 @@ import {BasicColumn} from '/@/components/Table';
 import {FormSchema} from '/@/components/Table';
 import {h} from 'vue';
 import {Tag} from 'ant-design-vue';
-import {Icon} from "/@/components/Icon";
+import Icon from "/@/components/Icon/Icon.vue";
 
 export const columns: BasicColumn[] = [
   {

diff --git a/flow-admin-ui/tsconfig.json b/flow-admin-ui/tsconfig.json
@@ -1,31 +1,16 @@
 {
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "@vben/ts-config/vue-app.json",
   "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "moduleResolution": "node",
-    "strict": true,
-    "noLib": false,
-    "forceConsistentCasingInFileNames": true,
-    "allowSyntheticDefaultImports": true,
-    "strictFunctionTypes": false,
-    "jsx": "preserve",
     "baseUrl": ".",
-    "allowJs": true,
-    "sourceMap": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "experimentalDecorators": true,
-    "lib": ["dom", "esnext"],
-    "noImplicitAny": false,
-    "skipLibCheck": true,
-    "types": ["vite/client"],
-    "removeComments": true,
+    "types": ["vite/client", "unplugin-vue-define-options/macros-global"],
     "paths": {
       "/@/*": ["src/*"],
-      "/#/*": ["types/*"]
-    }
+      "/#/*": ["types/*"],
+      "@/*": ["src/*"],
+      "#/*": ["types/*"]
+    },
+    "declaration": false
   },
   "include": [
     "tests/**/*.ts",