升级ant-design-vue到3.2.12、升级vite

2022-09-22 14:04:09 +08:00 · 2022-09-22 14:04:09 +08:00 · b94028de4d
parent a0d590c2e7
commit b94028de4d
22 changed files with 51612 additions and 9886 deletions
--- a/build/generate/icon/index.ts
+++ b/build/generate/icon/index.ts
@ -1,7 +1,7 @@
 import path from 'path';
 import fs from 'fs-extra';
 import inquirer from 'inquirer';
-import chalk from 'chalk';
+import colors from 'picocolors';
 import pkg from '../../../package.json';

 async function generateIcon() {
@ -53,12 +53,15 @@ async function generateIcon() {
          const isLocal = useType === 'local';
          const icons = Object.keys(data.icons).map((item) => `${isLocal ? prefix + ':' : ''}${item}`);

-          await fs.writeFileSync(path.join(output, `icons.data.ts`), `export default ${isLocal ? JSON.stringify(icons) : JSON.stringify({ prefix, icons })}`);
+          await fs.writeFileSync(
+            path.join(output, `icons.data.ts`),
+            `export default ${isLocal ? JSON.stringify(icons) : JSON.stringify({ prefix, icons })}`
+          );
          prefixSet.push(prefix);
        }
      }
      fs.emptyDir(path.join(process.cwd(), 'node_modules/.vite'));
-      console.log(`✨ ${chalk.cyan(`[${pkg.name}]`)}` + ' - Icon generated successfully:' + `[${prefixSet}]`);
+      console.log(`✨ ${colors.cyan(`[${pkg.name}]`)}` + ' - Icon generated successfully:' + `[${prefixSet}]`);
    });
 }

--- a/build/script/buildConf.ts
+++ b/build/script/buildConf.ts
@ -3,7 +3,7 @@
 */
 import { GLOB_CONFIG_FILE_NAME, OUTPUT_DIR } from '../constant';
 import fs, { writeFileSync } from 'fs-extra';
-import chalk from 'chalk';
+import colors from 'picocolors';

 import { getEnvConfig, getRootPath } from '../utils';
 import { getConfigFileName } from '../getConfigFileName';
@ -21,20 +21,22 @@ function createConfig(params: CreateConfigParams) {
  try {
    const windowConf = `window.${configName}`;
    // Ensure that the variable will not be modified
-    const configStr = `${windowConf}=${JSON.stringify(config)};
+    let configStr = `${windowConf}=${JSON.stringify(config)};`;
+    configStr += `
      Object.freeze(${windowConf});
      Object.defineProperty(window, "${configName}", {
        configurable: false,
        writable: false,
      });
    `.replace(/\s/g, '');
+
    fs.mkdirp(getRootPath(OUTPUT_DIR));
    writeFileSync(getRootPath(`${OUTPUT_DIR}/${configFileName}`), configStr);

-    console.log(chalk.cyan(`✨ [${pkg.name}]`) + ` - configuration file is build successfully:`);
-    console.log(chalk.gray(OUTPUT_DIR + '/' + chalk.green(configFileName)) + '\n');
+    console.log(colors.cyan(`✨ [${pkg.name}]`) + ` - configuration file is build successfully:`);
+    console.log(colors.gray(OUTPUT_DIR + '/' + colors.green(configFileName)) + '\n');
  } catch (error) {
-    console.log(chalk.red('configuration file configuration file failed to package:\n' + error));
+    console.log(colors.red('configuration file configuration file failed to package:\n' + error));
  }
 }

--- a/build/script/postBuild.ts
+++ b/build/script/postBuild.ts
@ -1,7 +1,7 @@
 // #!/usr/bin/env node

 import { runBuildConfig } from './buildConf';
-import chalk from 'chalk';
+import colors from 'picocolors';

 import pkg from '../../package.json';

@ -14,9 +14,9 @@ export const runBuild = async () => {
      runBuildConfig();
    }

-    console.log(`✨ ${chalk.cyan(`[${pkg.name}]`)}` + ' - build successfully!');
+    console.log(`✨ ${colors.cyan(`[${pkg.name}]`)}` + ' - build successfully!');
  } catch (error) {
-    console.log(chalk.red('vite build error:\n' + error));
+    console.log(colors.red('vite build error:\n' + error));
    process.exit(1);
  }
 };
--- a/build/vite/plugin/compress.ts
+++ b/build/vite/plugin/compress.ts
@ -2,13 +2,13 @@
 * Used to package and output gzip. Note that this does not work properly in Vite, the specific reason is still being investigated
 * https://github.com/anncwb/vite-plugin-compression
 */
-import type { Plugin } from 'vite';
+import type { PluginOption } from 'vite';
 import compressPlugin from 'vite-plugin-compression';

-export function configCompressPlugin(compress: 'gzip' | 'brotli' | 'none', deleteOriginFile = false): Plugin | Plugin[] {
+export function configCompressPlugin(compress: 'gzip' | 'brotli' | 'none', deleteOriginFile = false): PluginOption | PluginOption[] {
  const compressList = compress.split(',');

-  const plugins: Plugin[] = [];
+  const plugins: PluginOption[] = [];

  if (compressList.includes('gzip')) {
    plugins.push(
--- a/build/vite/plugin/html.ts
+++ b/build/vite/plugin/html.ts
@ -2,8 +2,8 @@
 * Plugin to minimize and use ejs template syntax in index.html.
 * https://github.com/anncwb/vite-plugin-html
 */
-import type { Plugin } from 'vite';
-import html from 'vite-plugin-html';
+import type { PluginOption } from 'vite';
+import { createHtmlPlugin } from 'vite-plugin-html';
 import pkg from '../../../package.json';
 import { GLOB_CONFIG_FILE_NAME } from '../../constant';

@ -16,7 +16,7 @@ export function configHtmlPlugin(env: ViteEnv, isBuild: boolean) {
    return `${path || '/'}${GLOB_CONFIG_FILE_NAME}?v=${pkg.version}-${new Date().getTime()}`;
  };

-  const htmlPlugin: Plugin[] = html({
+  const htmlPlugin: PluginOption[] = createHtmlPlugin({
    minify: isBuild,
    inject: {
      // Inject data into ejs template
--- a/build/vite/plugin/index.ts
+++ b/build/vite/plugin/index.ts
@ -1,9 +1,10 @@
-import type { Plugin } from 'vite';
+import { PluginOption } from 'vite';
 import vue from '@vitejs/plugin-vue';
 import vueJsx from '@vitejs/plugin-vue-jsx';
 import legacy from '@vitejs/plugin-legacy';
 import purgeIcons from 'vite-plugin-purge-icons';
 import windiCSS from 'vite-plugin-windicss';
+import VitePluginCertificate from 'vite-plugin-mkcert';
 import vueSetupExtend from 'vite-plugin-vue-setup-extend';
 import { configHtmlPlugin } from './html';
 import { configPwaConfig } from './pwa';
@ -14,28 +15,26 @@ import { configVisualizerConfig } from './visualizer';
 import { configThemePlugin } from './theme';
 import { configImageminPlugin } from './imagemin';
 import { configSvgIconsPlugin } from './svgSprite';
-import { configHmrPlugin } from './hmr';
-import OptimizationPersist from 'vite-plugin-optimize-persist';
-import PkgConfig from 'vite-plugin-package-config';

 export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
  const { VITE_USE_IMAGEMIN, VITE_USE_MOCK, VITE_LEGACY, VITE_BUILD_COMPRESS, VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE } = viteEnv;

-  const vitePlugins: (Plugin | Plugin[])[] = [
+  const vitePlugins: (PluginOption | PluginOption[])[] = [
    // have to
    vue(),
    // have to
    vueJsx(),
    // support name
    vueSetupExtend(),
+    // @ts-ignore
+    VitePluginCertificate({
+      source: 'coding',
+    }),
  ];

  // vite-plugin-windicss
  vitePlugins.push(windiCSS());

-  // TODO
-  !isBuild && vitePlugins.push(configHmrPlugin());
-
  // @vitejs/plugin-legacy
  VITE_LEGACY && isBuild && vitePlugins.push(legacy());

@ -57,12 +56,12 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
  // rollup-plugin-visualizer
  vitePlugins.push(configVisualizerConfig());

-  //vite-plugin-theme
+  // vite-plugin-theme
  vitePlugins.push(configThemePlugin(isBuild));

  // The following plugins only work in the production environment
  if (isBuild) {
-    //vite-plugin-imagemin
+    // vite-plugin-imagemin
    VITE_USE_IMAGEMIN && vitePlugins.push(configImageminPlugin());

    // rollup-plugin-gzip
@ -72,9 +71,5 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
    vitePlugins.push(configPwaConfig(viteEnv));
  }

-  //vite-plugin-theme【解决vite首次打开界面加载慢问题】
-  vitePlugins.push(PkgConfig());
-  vitePlugins.push(OptimizationPersist());
-
  return vitePlugins;
 }
--- a/build/vite/plugin/styleImport.ts
+++ b/build/vite/plugin/styleImport.ts
@ -2,41 +2,28 @@
 *  Introduces component library styles on demand.
 * https://github.com/anncwb/vite-plugin-style-import
 */
-import styleImport from 'vite-plugin-style-import';
+import { createStyleImportPlugin } from 'vite-plugin-style-import';

-export function configStyleImportPlugin(isBuild: boolean) {
-  if (!isBuild) {
-    return [];
-  }
-  const styleImportPlugin = styleImport({
+export function configStyleImportPlugin(_isBuild: boolean) {
+  // if (!isBuild) {
+  //   return [];
+  // }
+  const styleImportPlugin = createStyleImportPlugin({
    libs: [
      {
        libraryName: 'ant-design-vue',
        esModule: true,
        resolveStyle: (name) => {
-          // 这里是“子组件”列表，无需额外引入样式文件
+          // 这里是无需额外引入样式文件的“子组件”列表
          const ignoreList = [
-            'typography-text',
-            'typography-title',
-            'typography-paragraph',
-            'typography-link',
            'anchor-link',
            'sub-menu',
            'menu-item',
+            'menu-divider',
            'menu-item-group',
-            'dropdown-button',
            'breadcrumb-item',
            'breadcrumb-separator',
-            'input-password',
-            'input-search',
-            'input-group',
            'form-item',
-            'radio-group',
-            'checkbox-group',
-            'layout-sider',
-            'layout-content',
-            'layout-footer',
-            'layout-header',
            'step',
            'select-option',
            'select-opt-group',
@ -59,7 +46,33 @@ export function configStyleImportPlugin(isBuild: boolean) {
            'skeleton-image',
            'skeleton-button',
          ];
-          return ignoreList.includes(name) ? '' : `ant-design-vue/es/${name}/style/index`;
+          // 这里是需要额外引入样式的子组件列表
+          // 单独引入子组件时需引入组件样式，否则会在打包后导致子组件样式丢失
+          const replaceList = {
+            'typography-text': 'typography',
+            'typography-title': 'typography',
+            'typography-paragraph': 'typography',
+            'typography-link': 'typography',
+            'dropdown-button': 'dropdown',
+            'input-password': 'input',
+            'input-search': 'input',
+            'input-group': 'input',
+            'radio-group': 'radio',
+            'checkbox-group': 'checkbox',
+            'layout-sider': 'layout',
+            'layout-content': 'layout',
+            'layout-footer': 'layout',
+            'layout-header': 'layout',
+            'month-picker': 'date-picker',
+            'range-picker': 'date-picker',
+            'image-preview-group': 'image',
+          };
+
+          return ignoreList.includes(name)
+            ? ''
+            : replaceList.hasOwnProperty(name)
+            ? `ant-design-vue/es/${replaceList[name]}/style/index`
+            : `ant-design-vue/es/${name}/style/index`;
        },
      },
    ],
--- a/build/vite/plugin/svgSprite.ts
+++ b/build/vite/plugin/svgSprite.ts
@ -3,11 +3,11 @@
 * https://github.com/anncwb/vite-plugin-svg-icons
 */

-import SvgIconsPlugin from 'vite-plugin-svg-icons';
+import { createSvgIconsPlugin } from 'vite-plugin-svg-icons';
 import path from 'path';

 export function configSvgIconsPlugin(isBuild: boolean) {
-  const svgIconsPlugin = SvgIconsPlugin({
+  const svgIconsPlugin = createSvgIconsPlugin({
    iconDirs: [path.resolve(process.cwd(), 'src/assets/icons')],
    svgoOptions: isBuild,
    // default
--- a/build/vite/plugin/theme.ts
+++ b/build/vite/plugin/theme.ts
@ -2,13 +2,13 @@
 * Vite plugin for website theme color switching
 * https://github.com/anncwb/vite-plugin-theme
 */
-import type { Plugin } from 'vite';
+import type { PluginOption } from 'vite';
 import path from 'path';
 import { viteThemePlugin, antdDarkThemePlugin, mixLighten, mixDarken, tinycolor } from 'vite-plugin-theme';
 import { getThemeColors, generateColors } from '../../config/themeConfig';
 import { generateModifyVars } from '../../generate/generateModifyVars';

-export function configThemePlugin(isBuild: boolean): Plugin[] {
+export function configThemePlugin(isBuild: boolean): PluginOption[] {
  const colors = generateColors({
    mixDarken,
    mixLighten,
@ -79,5 +79,5 @@ export function configThemePlugin(isBuild: boolean): Plugin[] {
    }),
  ];

-  return plugin as unknown as Plugin[];
+  return plugin as unknown as PluginOption[];
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "jeecgboot-vue3",
-  "version": "3.4.0",
+  "version": "3.4.2",
  "author": {
    "name": "jeecg",
    "email": "jeecgos@163.com",
@ -11,10 +11,9 @@
    "serve": "npm run dev",
    "dev": "vite",
    "clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite",
-    "build": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=4096 vite build && esno ./build/script/postBuild.ts",
+    "build": "cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=8192 vite build && esno ./build/script/postBuild.ts",
    "build:test": "cross-env vite build --mode test && esno ./build/script/postBuild.ts",
    "build:no-cache": "yarn clean:cache && npm run build",
-    "gen:icon": "esno ./build/generate/icon/index.ts",
    "report": "cross-env REPORT=true npm run build",
    "type:check": "vue-tsc --noEmit --skipLibCheck",
    "preview": "npm run build && vite preview",
@ -31,130 +30,152 @@
    "test:gzip": "http-server dist --cors --gzip -c-1",
    "test:br": "http-server dist --cors --brotli -c-1",
    "reinstall": "rimraf yarn.lock && rimraf package.lock.json && rimraf node_modules && npm run bootstrap",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "gen:icon": "esno ./build/generate/icon/index.ts"
  },
  "dependencies": {
    "@jeecg/online": "1.0.1",
-    "@iconify/iconify": "^2.0.4",
-    "@vueuse/core": "^6.6.2",
-    "@zxcvbn-ts/core": "^1.0.0-beta.0",
-    "ant-design-vue": "2.2.8",
-    "axios": "^0.23.0",
+    "@iconify/iconify": "^2.2.1",
+    "@ant-design/colors": "^6.0.0",
+    "@ant-design/icons-vue": "^6.1.0",
+    "@logicflow/core": "^1.1.13",
+    "@logicflow/extension": "^1.1.13",
+    "@vue/shared": "^3.2.33",
+    "@vue/runtime-core": "^3.2.33",
+    "@vueuse/shared": "^8.3.0",
+    "@vueuse/core": "^8.3.0",
+    "@zxcvbn-ts/core": "^2.0.1",
+    "ant-design-vue": "3.2.12",
+    "axios": "^0.26.1",
    "china-area-data": "^5.0.1",
    "clipboard": "^2.0.8",
-    "codemirror": "^5.63.3",
+    "codemirror": "^5.65.3",
    "cron-parser": "^3.5.0",
    "cropperjs": "^1.5.12",
    "crypto-js": "^4.1.1",
-    "dayjs": "^1.10.6",
+    "dayjs": "^1.11.1",
    "dom-align": "^1.12.2",
-    "echarts": "^5.2.1",
+    "echarts": "^5.3.2",
+    "emoji-mart-vue-fast": "^11.1.1",
    "enquire.js": "^2.1.6",
-    "intro.js": "^4.2.2",
+    "intro.js": "^5.1.0",
+    "js-cookie": "^2.2.1",
    "lodash-es": "^4.17.21",
+    "lodash.get": "^4.4.2",
+    "lodash.pick": "^4.4.0",
    "md5": "^2.3.0",
    "mockjs": "^1.1.0",
    "nprogress": "^0.2.0",
    "path-to-regexp": "^6.2.0",
-    "pinia": "2.0.0-rc.14",
+    "pinia": "2.0.12",
    "print-js": "^1.6.0",
-    "qrcode": "^1.4.4",
+    "qs": "^6.10.3",
+    "qrcode": "^1.5.0",
    "qrcodejs2": "0.0.2",
    "resize-observer-polyfill": "^1.5.1",
-    "showdown": "^1.9.1",
-    "sortablejs": "^1.14.0",
+    "showdown": "^2.1.0",
+    "sortablejs": "^1.15.0",
    "tinymce": "^5.10.3",
    "vditor": "^3.8.13",
-    "vue": "^3.2.20",
+    "vue": "^3.2.33",
    "vue-cropper": "^0.5.6",
    "vue-cropperjs": "^5.0.0",
    "vue-i18n": "^9.1.9",
    "vue-infinite-scroll": "^2.0.2",
-    "vue-print-nb-jeecg": "^1.0.11",
-    "vue-router": "^4.0.12",
+    "vue-print-nb-jeecg": "^1.0.10",
+    "vue-router": "^4.0.14",
    "vue-types": "^4.1.1",
    "vuedraggable": "^4.1.0",
    "vxe-table": "4.1.0",
-    "vxe-table-plugin-antd": "^3.0.3",
+    "vxe-table-plugin-antd": "^3.0.5",
    "xe-utils": "^3.3.1",
-    "vue-json-pretty": "^2.0.4",
+    "vue-json-pretty": "^2.0.6",
    "xss": "^1.0.13"
  },
  "devDependencies": {
-    "@commitlint/cli": "^13.2.1",
-    "@commitlint/config-conventional": "^13.2.0",
-    "@iconify/json": "^1.1.399",
-    "@purge-icons/generated": "^0.7.0",
+    "@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.0.2",
+    "@types/crypto-js": "^4.1.1",
    "@types/fs-extra": "^9.0.13",
-    "@types/inquirer": "^8.1.3",
+    "@types/inquirer": "^8.2.1",
    "@types/intro.js": "^3.0.2",
    "@types/jest": "^27.0.2",
-    "@types/lodash-es": "^4.17.5",
-    "@types/mockjs": "^1.0.4",
-    "@types/node": "^16.11.1",
+    "@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.1",
+    "@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.1.0",
-    "@typescript-eslint/parser": "^5.1.0",
-    "@vitejs/plugin-legacy": "^1.6.2",
-    "@vitejs/plugin-vue": "^1.9.3",
-    "@vitejs/plugin-vue-jsx": "^1.2.0",
-    "@vue/compiler-sfc": "3.2.20",
-    "@vue/test-utils": "^2.0.0-rc.16",
-    "autoprefixer": "^10.3.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",
    "commitizen": "^4.2.4",
-    "conventional-changelog-cli": "^2.1.1",
+    "conventional-changelog-cli": "^2.2.2",
    "cross-env": "^7.0.3",
-    "dotenv": "^10.0.0",
-    "eslint": "^8.0.1",
-    "eslint-config-prettier": "^8.3.0",
+    "cz-git": "^1.3.9",
+    "czg": "^1.3.9",
+    "dotenv": "^16.0.0",
+    "eslint": "^8.13.0",
+    "eslint-config-prettier": "^8.5.0",
    "eslint-define-config": "^1.1.1",
    "eslint-plugin-jest": "^25.2.2",
    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-vue": "^7.19.1",
-    "esno": "^0.10.1",
-    "fs-extra": "^10.0.0",
+    "eslint-plugin-vue": "^8.6.0",
+    "esno": "^0.14.1",
+    "fs-extra": "^10.1.0",
    "http-server": "^14.0.0",
-    "husky": "^7.0.2",
-    "inquirer": "^8.2.0",
+    "husky": "^7.0.4",
+    "inquirer": "^8.2.2",
    "is-ci": "^3.0.0",
    "jest": "^27.3.1",
    "less": "^4.1.2",
-    "lint-staged": "^11.2.3",
+    "lint-staged": "12.3.7",
    "npm-run-all": "^4.1.5",
-    "postcss": "^8.3.9",
-    "prettier": "^2.4.1",
+    "picocolors": "^1.0.0",
+    "postcss": "^8.4.12",
+    "postcss-html": "^1.4.1",
+    "postcss-less": "^6.0.0",
+    "prettier": "^2.6.2",
    "pretty-quick": "^3.1.1",
    "rimraf": "^3.0.2",
-    "rollup-plugin-visualizer": "5.5.2",
-    "stylelint": "^13.13.1",
+    "rollup": "^2.70.2",
+    "rollup-plugin-visualizer": "^5.6.0",
+    "stylelint": "^14.7.1",
    "stylelint-config-prettier": "^9.0.3",
-    "stylelint-config-standard": "^22.0.0",
-    "stylelint-order": "^4.1.0",
+    "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-jest": "^27.0.7",
-    "ts-node": "^10.3.0",
-    "typescript": "^4.4.4",
-    "vite": "^2.6.10",
-    "vite-plugin-compression": "^0.3.5",
-    "vite-plugin-html": "^2.1.0",
-    "vite-plugin-imagemin": "^0.4.6",
+    "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-optimize-persist": "^0.1.2",
    "vite-plugin-package-config": "^0.1.1",
-    "vite-plugin-purge-icons": "^0.7.0",
-    "vite-plugin-pwa": "^0.11.3",
-    "vite-plugin-style-import": "^1.2.1",
-    "vite-plugin-svg-icons": "^1.0.5",
-    "vite-plugin-theme": "^0.8.1",
-    "vite-plugin-vue-setup-extend": "^0.1.0",
-    "vite-plugin-windicss": "^1.4.12",
-    "vue-eslint-parser": "^8.0.0",
-    "vue-tsc": "^0.28.7"
+    "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": "^0.33.9"
  },
  "resolutions": {
    "//": "Used to install imagemin dependencies, because imagemin may not be installed in China. If it is abroad, you can delete it",
--- a/src/components/Basic/src/BasicTitle.vue
+++ b/src/components/Basic/src/BasicTitle.vue
@ -33,7 +33,11 @@

  const { prefixCls } = useDesign('basic-title');
  const slots = useSlots();
-  const getClass = computed(() => [prefixCls, { [`${prefixCls}-show-span`]: props.span && slots.default }, { [`${prefixCls}-normal`]: props.normal }]);
+  const getClass = computed(() => [
+    prefixCls,
+    { [`${prefixCls}-show-span`]: props.span && slots.default },
+    { [`${prefixCls}-normal`]: props.normal },
+  ]);
 </script>
 <style lang="less" scoped>
  @prefix-cls: ~'@{namespace}-basic-title';
@ -46,7 +50,7 @@
    font-weight: 500;
    line-height: 24px;
    color: @text-color-base;
-    cursor: pointer;
+    cursor: move;
    user-select: none;

    &-normal {
--- a/src/components/Button/src/BasicButton.vue
+++ b/src/components/Button/src/BasicButton.vue
@ -1,7 +1,9 @@
 <template>
  <Button v-bind="getBindValue" :class="getButtonClass" @click="onClick">
+    <template v-if="preIcon" #icon>
+      <Icon :icon="preIcon" :size="iconSize" />
+    </template>
    <template #default="data">
-      <Icon :icon="preIcon" v-if="preIcon" :size="iconSize" />
      <slot v-bind="data || {}"></slot>
      <Icon :icon="postIcon" v-if="postIcon" :size="iconSize" />
    </template>
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@ -52,6 +52,7 @@

  import { basicProps } from './props';
  import { useDesign } from '/@/hooks/web/useDesign';
+  import dayjs from 'dayjs';

  export default defineComponent({
    name: 'BasicForm',
@ -112,7 +113,7 @@
            if (!Array.isArray(defaultValue)) {
              schema.defaultValue = dateUtil(defaultValue);
            } else {
-              const def: moment.Moment[] = [];
+              const def: dayjs.Dayjs[] = [];
              defaultValue.forEach((item) => {
                def.push(dateUtil(item));
              });
@ -150,17 +151,29 @@
        formElRef: formElRef as Ref<FormActionType>,
      });

-      const { handleSubmit, setFieldsValue, clearValidate, validate, validateFields, getFieldsValue, updateSchema, resetSchema, appendSchemaByField, removeSchemaByFiled, resetFields, scrollToField } =
-        useFormEvents({
-          emit,
-          getProps,
-          formModel,
-          getSchema,
-          defaultValueRef,
-          formElRef: formElRef as Ref<FormActionType>,
-          schemaRef: schemaRef as Ref<FormSchema[]>,
-          handleFormValues,
-        });
+      const {
+        handleSubmit,
+        setFieldsValue,
+        clearValidate,
+        validate,
+        validateFields,
+        getFieldsValue,
+        updateSchema,
+        resetSchema,
+        appendSchemaByField,
+        removeSchemaByFiled,
+        resetFields,
+        scrollToField,
+      } = useFormEvents({
+        emit,
+        getProps,
+        formModel,
+        getSchema,
+        defaultValueRef,
+        formElRef: formElRef as Ref<FormActionType>,
+        schemaRef: schemaRef as Ref<FormSchema[]>,
+        handleFormValues,
+      });

      createFormContext({
        resetAction: resetFields,
--- a/src/components/Form/src/jeecg/hooks/useTreeBiz.ts
+++ b/src/components/Form/src/jeecg/hooks/useTreeBiz.ts
@ -73,7 +73,7 @@ export function useTreeBiz(treeRef, getList, props) {
      const { selectedNodes } = info;
      let rows = <any[]>[];
      selectedNodes.forEach((item) => {
-        rows.push(item.props.node);
+        rows.push(item);
      });
      selectRows.value = rows;
    }
@ -90,7 +90,7 @@ export function useTreeBiz(treeRef, getList, props) {
          //update-begin-author:taoyan date:20220408 for: 单选模式下，设定rowKey，无法选中数据-
          checkedKeys.value = [info.node.eventKey];
          let temp = info.checkedNodes.find((n) => n.key === info.node.eventKey);
-          selectRows.value = [temp.props.node];
+          selectRows.value = [temp];
          //update-end-author:taoyan date:20220408 for: 单选模式下，设定rowKey，无法选中数据-
        } else {
          checkedKeys.value = [];
@ -102,7 +102,7 @@ export function useTreeBiz(treeRef, getList, props) {
      const { checkedNodes } = info;
      let rows = <any[]>[];
      checkedNodes.forEach((item) => {
-        rows.push(item.props.node);
+        rows.push(item);
      });
      selectRows.value = rows;
    }
--- a/src/components/Form/src/props.ts
+++ b/src/components/Form/src/props.ts
@ -4,8 +4,10 @@ import type { ColEx } from './types';
 import type { TableActionType } from '/@/components/Table';
 import type { ButtonProps } from 'ant-design-vue/es/button/buttonTypes';
 import type { RowProps } from 'ant-design-vue/lib/grid/Row';
+import dayjs from "dayjs";
 import { propTypes } from '/@/utils/propTypes';
 import componentSetting from '/@/settings/componentSetting';
+
 const { form } = componentSetting;
 export const basicProps = {
  model: {
@ -58,7 +60,8 @@ export const basicProps = {
  transformDateFunc: {
    type: Function as PropType<Fn>,
    default: (date: any) => {
-      return date._isAMomentObject ? date?.format('YYYY-MM-DD HH:mm:ss') : date;
+      // 判断是否是dayjs实例
+      return dayjs.isDayjs(date) ? date?.format('YYYY-MM-DD HH:mm:ss') : date;
    },
  },
  rulesMessageJoinLabel: propTypes.bool.def(true),
--- a/src/design/ant/table.less
+++ b/src/design/ant/table.less
@ -12,7 +12,7 @@
                overflow-y: auto !important;
              }

-              .ant-table-body {
+              .ant-table-content {
                overflow-y: auto !important;
              }
            }
@ -48,7 +48,7 @@
                //overflow-x: auto !important;
              }

-              .ant-table-body {
+              .ant-table-content {
                overflow: auto !important;
              }
            }
--- a/src/utils/bem.ts
+++ b/src/utils/bem.ts
@ -0,0 +1,52 @@
+import { prefixCls } from '/@/settings/designSetting';
+
+type Mod = string | { [key: string]: any };
+type Mods = Mod | Mod[];
+
+export type BEM = ReturnType<typeof createBEM>;
+
+function genBem(name: string, mods?: Mods): string {
+  if (!mods) {
+    return '';
+  }
+
+  if (typeof mods === 'string') {
+    return ` ${name}--${mods}`;
+  }
+
+  if (Array.isArray(mods)) {
+    return mods.reduce<string>((ret, item) => ret + genBem(name, item), '');
+  }
+
+  return Object.keys(mods).reduce((ret, key) => ret + (mods[key] ? genBem(name, key) : ''), '');
+}
+
+/**
+ * bem helper
+ * b() // 'button'
+ * b('text') // 'button__text'
+ * b({ disabled }) // 'button button--disabled'
+ * b('text', { disabled }) // 'button__text button__text--disabled'
+ * b(['disabled', 'primary']) // 'button button--disabled button--primary'
+ */
+export function buildBEM(name: string) {
+  return (el?: Mods, mods?: Mods): Mods => {
+    if (el && typeof el !== 'string') {
+      mods = el;
+      el = '';
+    }
+
+    el = el ? `${name}__${el}` : name;
+
+    return `${el}${genBem(el, mods)}`;
+  };
+}
+
+export function createBEM(name: string) {
+  return [buildBEM(`${prefixCls}-${name}`)];
+}
+
+export function createNamespace(name: string) {
+  const prefixedName = `${prefixCls}-${name}`;
+  return [prefixedName, buildBEM(prefixedName)] as const;
+}
--- a/src/utils/helper/treeHelper.ts
+++ b/src/utils/helper/treeHelper.ts
@ -3,15 +3,19 @@ interface TreeHelperConfig {
  children: string;
  pid: string;
 }
+
+// 默认配置
 const DEFAULT_CONFIG: TreeHelperConfig = {
  id: 'id',
  children: 'children',
  pid: 'pid',
 };

+// 获取配置。  Object.assign 从一个或多个源对象复制到目标对象
 const getConfig = (config: Partial<TreeHelperConfig>) => Object.assign({}, DEFAULT_CONFIG, config);

 // tree from list
+// 列表中的树
 export function listToTree<T = any>(list: any[], config: Partial<TreeHelperConfig> = {}): T[] {
  const conf = getConfig(config) as TreeHelperConfig;
  const nodeMap = new Map();
@ -24,7 +28,7 @@ export function listToTree<T = any>(list: any[], config: Partial<TreeHelperConfi
  }
  for (const node of list) {
    const parent = nodeMap.get(node[pid]);
-    (parent ? parent.children : result).push(node);
+    (parent ? parent[children] : result).push(node);
  }
  return result;
 }
@ -108,17 +112,27 @@ export function findPathAll(tree: any, func: Fn, config: Partial<TreeHelperConfi
  return result;
 }

-export function filter<T = any>(tree: T[], func: (n: T) => boolean, config: Partial<TreeHelperConfig> = {}): T[] {
+export function filter<T = any>(
+  tree: T[],
+  func: (n: T) => boolean,
+  // Partial 将 T 中的所有属性设为可选
+  config: Partial<TreeHelperConfig> = {}
+): T[] {
+  // 获取配置
  config = getConfig(config);
  const children = config.children as string;
+
  function listFilter(list: T[]) {
    return list
      .map((node: any) => ({ ...node }))
      .filter((node) => {
+        // 递归调用 对含有children项  进行再次调用自身函数 listFilter
        node[children] = node[children] && listFilter(node[children]);
+        // 执行传入的回调 func 进行过滤
        return func(node) || (node[children] && node[children].length);
      });
  }
+
  return listFilter(tree);
 }

@ -137,6 +151,7 @@ export function forEach<T = any>(tree: T[], func: (n: T) => any, config: Partial

 /**
 * @description: Extract tree specified structure
+ * @description: 提取树指定结构
 */
 export function treeMap<T = any>(treeData: T[], opt: { children?: string; conversion: Fn }): T[] {
  return treeData.map((item) => treeMapEach(item, opt));
@ -144,6 +159,7 @@ export function treeMap<T = any>(treeData: T[], opt: { children?: string; conver

 /**
 * @description: Extract tree specified structure
+ * @description: 提取树指定结构
 */
 export function treeMapEach(data: any, { children = 'children', conversion }: { children?: string; conversion: Fn }) {
  const haveChildren = Array.isArray(data[children]) && data[children].length > 0;
@ -164,3 +180,18 @@ export function treeMapEach(data: any, { children = 'children', conversion }: {
    };
  }
 }
+
+/**
+ * 递归遍历树结构
+ * @param treeDatas 树
+ * @param callBack 回调
+ * @param parentNode 父节点
+ */
+export function eachTree(treeDatas: any[], callBack: Fn, parentNode = {}) {
+  treeDatas.forEach((element) => {
+    const newNode = callBack(element, parentNode) || element;
+    if (element.children) {
+      eachTree(element.children, callBack, newNode);
+    }
+  });
+}
--- a/src/utils/props.ts
+++ b/src/utils/props.ts
@ -0,0 +1,185 @@
+// copy from element-plus
+
+import { warn } from 'vue';
+import { isObject } from '@vue/shared';
+import { fromPairs } from 'lodash-es';
+import type { ExtractPropTypes, PropType } from '@vue/runtime-core';
+import type { Mutable } from './types';
+
+const wrapperKey = Symbol();
+export type PropWrapper<T> = { [wrapperKey]: T };
+
+export const propKey = Symbol();
+
+type ResolveProp<T> = ExtractPropTypes<{
+  key: { type: T; required: true };
+}>['key'];
+type ResolvePropType<T> = ResolveProp<T> extends { type: infer V } ? V : ResolveProp<T>;
+type ResolvePropTypeWithReadonly<T> = Readonly<T> extends Readonly<Array<infer A>>
+  ? ResolvePropType<A[]>
+  : ResolvePropType<T>;
+
+type IfUnknown<T, V> = [unknown] extends [T] ? V : T;
+
+export type BuildPropOption<T, D extends BuildPropType<T, V, C>, R, V, C> = {
+  type?: T;
+  values?: readonly V[];
+  required?: R;
+  default?: R extends true
+    ? never
+    : D extends Record<string, unknown> | Array<any>
+    ? () => D
+    : (() => D) | D;
+  validator?: ((val: any) => val is C) | ((val: any) => boolean);
+};
+
+type _BuildPropType<T, V, C> =
+  | (T extends PropWrapper<unknown>
+      ? T[typeof wrapperKey]
+      : [V] extends [never]
+      ? ResolvePropTypeWithReadonly<T>
+      : never)
+  | V
+  | C;
+export type BuildPropType<T, V, C> = _BuildPropType<
+  IfUnknown<T, never>,
+  IfUnknown<V, never>,
+  IfUnknown<C, never>
+>;
+
+type _BuildPropDefault<T, D> = [T] extends [
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  Record<string, unknown> | Array<any> | Function,
+]
+  ? D
+  : D extends () => T
+  ? ReturnType<D>
+  : D;
+
+export type BuildPropDefault<T, D, R> = R extends true
+  ? { readonly default?: undefined }
+  : {
+      readonly default: Exclude<D, undefined> extends never
+        ? undefined
+        : Exclude<_BuildPropDefault<T, D>, undefined>;
+    };
+export type BuildPropReturn<T, D, R, V, C> = {
+  readonly type: PropType<BuildPropType<T, V, C>>;
+  readonly required: IfUnknown<R, false>;
+  readonly validator: ((val: unknown) => boolean) | undefined;
+  [propKey]: true;
+} & BuildPropDefault<BuildPropType<T, V, C>, IfUnknown<D, never>, IfUnknown<R, false>>;
+
+/**
+ * @description Build prop. It can better optimize prop types
+ * @description 生成 prop，能更好地优化类型
+ * @example
+  // limited options
+  // the type will be PropType<'light' | 'dark'>
+  buildProp({
+    type: String,
+    values: ['light', 'dark'],
+  } as const)
+  * @example
+  // limited options and other types
+  // the type will be PropType<'small' | 'medium' | number>
+  buildProp({
+    type: [String, Number],
+    values: ['small', 'medium'],
+    validator: (val: unknown): val is number => typeof val === 'number',
+  } as const)
+  @link see more: https://github.com/element-plus/element-plus/pull/3341
+ */
+export function buildProp<
+  T = never,
+  D extends BuildPropType<T, V, C> = never,
+  R extends boolean = false,
+  V = never,
+  C = never,
+>(option: BuildPropOption<T, D, R, V, C>, key?: string): BuildPropReturn<T, D, R, V, C> {
+  // filter native prop type and nested prop, e.g `null`, `undefined` (from `buildProps`)
+  if (!isObject(option) || !!option[propKey]) return option as any;
+
+  const { values, required, default: defaultValue, type, validator } = option;
+
+  const _validator =
+    values || validator
+      ? (val: unknown) => {
+          let valid = false;
+          let allowedValues: unknown[] = [];
+
+          if (values) {
+            allowedValues = [...values, defaultValue];
+            valid ||= allowedValues.includes(val);
+          }
+          if (validator) valid ||= validator(val);
+
+          if (!valid && allowedValues.length > 0) {
+            const allowValuesText = [...new Set(allowedValues)]
+              .map((value) => JSON.stringify(value))
+              .join(', ');
+            warn(
+              `Invalid prop: validation failed${
+                key ? ` for prop "${key}"` : ''
+              }. Expected one of [${allowValuesText}], got value ${JSON.stringify(val)}.`,
+            );
+          }
+          return valid;
+        }
+      : undefined;
+
+  return {
+    type:
+      typeof type === 'object' && Object.getOwnPropertySymbols(type).includes(wrapperKey)
+        ? type[wrapperKey]
+        : type,
+    required: !!required,
+    default: defaultValue,
+    validator: _validator,
+    [propKey]: true,
+  } as unknown as BuildPropReturn<T, D, R, V, C>;
+}
+
+type NativePropType = [((...args: any) => any) | { new (...args: any): any } | undefined | null];
+
+export const buildProps = <
+  O extends {
+    [K in keyof O]: O[K] extends BuildPropReturn<any, any, any, any, any>
+      ? O[K]
+      : [O[K]] extends NativePropType
+      ? O[K]
+      : O[K] extends BuildPropOption<infer T, infer D, infer R, infer V, infer C>
+      ? D extends BuildPropType<T, V, C>
+        ? BuildPropOption<T, D, R, V, C>
+        : never
+      : never;
+  },
+>(
+  props: O,
+) =>
+  fromPairs(
+    Object.entries(props).map(([key, option]) => [key, buildProp(option as any, key)]),
+  ) as unknown as {
+    [K in keyof O]: O[K] extends { [propKey]: boolean }
+      ? O[K]
+      : [O[K]] extends NativePropType
+      ? O[K]
+      : O[K] extends BuildPropOption<
+          infer T,
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
+          infer _D,
+          infer R,
+          infer V,
+          infer C
+        >
+      ? BuildPropReturn<T, O[K]['default'], R, V, C>
+      : never;
+  };
+
+export const definePropType = <T>(val: any) => ({ [wrapperKey]: val } as PropWrapper<T>);
+
+export const keyOf = <T>(arr: T) => Object.keys(arr) as Array<keyof T>;
+export const mutable = <T extends readonly any[] | Record<string, unknown>>(val: T) =>
+  val as Mutable<typeof val>;
+
+export const componentSize = ['large', 'medium', 'small', 'mini'] as const;
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@ -0,0 +1,42 @@
+// copy from element-plus
+
+import type { CSSProperties, Plugin } from 'vue';
+
+type OptionalKeys<T extends Record<string, unknown>> = {
+  [K in keyof T]: T extends Record<K, T[K]> ? never : K;
+}[keyof T];
+
+type RequiredKeys<T extends Record<string, unknown>> = Exclude<keyof T, OptionalKeys<T>>;
+
+type MonoArgEmitter<T, Keys extends keyof T> = <K extends Keys>(evt: K, arg?: T[K]) => void;
+
+type BiArgEmitter<T, Keys extends keyof T> = <K extends Keys>(evt: K, arg: T[K]) => void;
+
+export type EventEmitter<T extends Record<string, unknown>> = MonoArgEmitter<T, OptionalKeys<T>> &
+  BiArgEmitter<T, RequiredKeys<T>>;
+
+export type AnyFunction<T> = (...args: any[]) => T;
+
+export type PartialReturnType<T extends (...args: unknown[]) => unknown> = Partial<ReturnType<T>>;
+
+export type SFCWithInstall<T> = T & Plugin;
+
+export type Nullable<T> = T | null;
+
+export type RefElement = Nullable<HTMLElement>;
+
+export type CustomizedHTMLElement<T> = HTMLElement & T;
+
+export type Indexable<T> = {
+  [key: string]: T;
+};
+
+export type Hash<T> = Indexable<T>;
+
+export type TimeoutHandle = ReturnType<typeof global.setTimeout>;
+
+export type ComponentSize = 'large' | 'medium' | 'small' | 'mini';
+
+export type StyleValue = string | CSSProperties | Array<StyleValue>;
+
+export type Mutable<T> = { -readonly [P in keyof T]: T[P] };
--- a/yarn.lock
+++ b/yarn.lock