Merge branch 'main' into gitee

2025-06-06 16:37:18 +08:00 · 2024-04-13 11:24:57 +08:00 · 2024-04-13 11:24:57 +08:00 · 0f35e7e0c5
commit 0f35e7e0c5
parent 733cb795fa 0934c97413
17 changed files with 446 additions and 469 deletions
--- a/.eslintignore
+++ b/.eslintignore
@ -1,13 +0,0 @@
-public
-dist
-*.d.ts
-/src/assets
-package.json
-eslint.config.js 
-.prettierrc.js
-commitlint.config.js
-postcss.config.js
-tailwind.config.ts
-stylelint.config.js
-src/components/ReSplitPane/iconfont
-src/components/ReFlowChart/src/assets/iconfont
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-v20.12.0
+v20.12.2
--- a/README.en-US.md
+++ b/README.en-US.md
@ -176,13 +176,14 @@ Thank you very much for your in-depth understanding of the source code and your

 |                 **Contributor**                 |                                 **SpecificCode**                                 |
 | :---------------------------------------------: | :------------------------------------------------------------------------------: |
-|       [hb0730](https://github.com/hb0730)       |    [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=hb0730)    |
-|         [o-cc](https://github.com/o-cc)         |     [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=o-cc)     |
-| [yj-liuzepeng](https://github.com/yj-liuzepeng) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=yj-liuzepeng) |
-|   [skyline523](https://github.com/skyline523)   |  [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=skyline523)  |
-| [shark-lajiao](https://github.com/shark-lajiao) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=shark-lajiao) |
-|      [WitMiao](https://github.com/WitMiao)      |   [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=WitMiao)    |
-|     [QFifteen](https://github.com/QFifteen)     |   [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=QFifteen)   |
+|       [hb0730](https://github.com/hb0730)       |    [code](https://github.com/pure-admin/vue-pure-admin/commits?author=hb0730)    |
+|         [o-cc](https://github.com/o-cc)         |     [code](https://github.com/pure-admin/vue-pure-admin/commits?author=o-cc)     |
+| [yj-liuzepeng](https://github.com/yj-liuzepeng) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=yj-liuzepeng) |
+|   [skyline523](https://github.com/skyline523)   |  [code](https://github.com/pure-admin/vue-pure-admin/commits?author=skyline523)  |
+| [shark-lajiao](https://github.com/shark-lajiao) | [code](https://github.com/pure-admin/vue-pure-admin/commits?author=shark-lajiao) |
+|      [WitMiao](https://github.com/WitMiao)      |   [code](https://github.com/pure-admin/vue-pure-admin/commits?author=WitMiao)    |
+|     [QFifteen](https://github.com/QFifteen)     |   [code](https://github.com/pure-admin/vue-pure-admin/commits?author=QFifteen)   |
+|     [edgexie](https://github.com/edgexie)     |   [code](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie)   |

 ## Git Contribution submission specification

--- a/README.md
+++ b/README.md
@ -184,6 +184,7 @@ docker run -dp 8080:80  --name pure-admin vue-pure-admin
 | [shark-lajiao](https://github.com/shark-lajiao) | [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=shark-lajiao) |
 |      [WitMiao](https://github.com/WitMiao)      |   [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=WitMiao)    |
 |     [QFifteen](https://github.com/QFifteen)     |   [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=QFifteen)   |
+|     [edgexie](https://github.com/edgexie)     |   [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie)   |

 ## `Git` 贡献提交规范

--- a/eslint.config.js
+++ b/eslint.config.js
@ -10,7 +10,14 @@ import pluginTypeScript from "@typescript-eslint/eslint-plugin";
 export default defineFlatConfig([
  {
    ...js.configs.recommended,
-    ignores: ["src/assets/**", "src/**/iconfont/**"],
+    ignores: [
+      "**/.*",
+      "dist/*",
+      "*.d.ts",
+      "public/*",
+      "src/assets/**",
+      "src/**/iconfont/**"
+    ],
    languageOptions: {
      globals: {
        // index.d.ts
--- a/locales/en.yaml
+++ b/locales/en.yaml
@ -1,5 +1,5 @@
 buttons:
-  pureAccountSettings: Account Settings
+  pureAccountSettings: Account
  pureLoginOut: LoginOut
  pureLogin: Login
  pureSystemSet: Open ProjectConfig
--- a/package.json
+++ b/package.json
@ -51,8 +51,8 @@
    "@amap/amap-jsapi-loader": "^1.0.1",
    "@howdyjs/mouse-menu": "^2.1.3",
    "@infectoone/vue-ganttastic": "^2.3.2",
-    "@logicflow/core": "^1.2.25",
-    "@logicflow/extension": "^1.2.25",
+    "@logicflow/core": "^1.2.26",
+    "@logicflow/extension": "^1.2.26",
    "@pureadmin/descriptions": "^1.2.1",
    "@pureadmin/table": "^3.1.2",
    "@pureadmin/utils": "^2.4.7",
@ -72,7 +72,7 @@
    "dayjs": "^1.11.10",
    "echarts": "^5.5.0",
    "el-table-infinite-scroll": "^3.0.3",
-    "element-plus": "^2.6.3",
+    "element-plus": "2.6.3",
    "intro.js": "^7.2.0",
    "js-cookie": "^3.0.5",
    "jsbarcode": "^3.11.6",
@ -83,19 +83,19 @@
    "nprogress": "^0.2.0",
    "path": "^0.12.7",
    "pinia": "^2.1.7",
-    "pinyin-pro": "^3.19.6",
-    "plus-pro-components": "^0.0.7",
+    "pinyin-pro": "^3.20.0",
+    "plus-pro-components": "^0.0.10",
    "qrcode": "^1.5.3",
    "qs": "^6.12.0",
    "responsive-storage": "^2.2.0",
    "sortablejs": "^1.15.2",
-    "swiper": "^11.1.0",
+    "swiper": "^11.1.1",
    "typeit": "^8.8.3",
    "v-contextmenu": "^3.2.0",
    "v3-infinite-loading": "^1.3.1",
    "version-rocket": "^1.7.1",
    "vue": "^3.4.21",
-    "vue-i18n": "^9.11.0",
+    "vue-i18n": "^9.12.0",
    "vue-json-pretty": "^2.4.0",
    "vue-pdf-embed": "^2.0.3",
    "vue-router": "^4.3.0",
@ -106,8 +106,8 @@
    "vue3-danmaku": "^1.6.0",
    "vue3-puzzle-vcode": "^1.1.7",
    "vuedraggable": "^4.1.0",
-    "vxe-table": "^4.5.21",
-    "wavesurfer.js": "^7.7.8",
+    "vxe-table": "^4.5.22",
+    "wavesurfer.js": "^7.7.10",
    "xgplayer": "^3.0.16",
    "xlsx": "^0.18.5"
  },
@ -115,7 +115,7 @@
    "@commitlint/cli": "^19.2.1",
    "@commitlint/config-conventional": "^19.1.0",
    "@commitlint/types": "^19.0.3",
-    "@eslint/js": "^8.57.0",
+    "@eslint/js": "^9.0.0",
    "@faker-js/faker": "^8.4.1",
    "@iconify-icons/ep": "^1.2.12",
    "@iconify-icons/ri": "^1.2.10",
@ -126,13 +126,13 @@
    "@types/gradient-string": "^1.1.6",
    "@types/intro.js": "^5.1.5",
    "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.12.5",
+    "@types/node": "^20.12.7",
    "@types/nprogress": "^0.2.3",
    "@types/qrcode": "^1.5.5",
    "@types/qs": "^6.9.14",
    "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^7.5.0",
-    "@typescript-eslint/parser": "^7.5.0",
+    "@typescript-eslint/eslint-plugin": "^7.6.0",
+    "@typescript-eslint/parser": "^7.6.0",
    "@vitejs/plugin-vue": "^5.0.4",
    "@vitejs/plugin-vue-jsx": "^3.1.0",
    "autoprefixer": "^10.4.19",
@ -140,11 +140,11 @@
    "cloc": "^2.11.0",
    "cssnano": "^6.1.2",
    "dagre": "^0.8.5",
-    "eslint": "^8.57.0",
+    "eslint": "^9.0.0",
    "eslint-config-prettier": "^9.1.0",
    "eslint-define-config": "^2.1.0",
    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-vue": "^9.24.0",
+    "eslint-plugin-vue": "^9.24.1",
    "gradient-string": "^2.0.2",
    "husky": "^9.0.11",
    "lint-staged": "^15.2.2",
@ -155,7 +155,7 @@
    "prettier": "^3.2.5",
    "rimraf": "^5.0.5",
    "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "^1.74.1",
+    "sass": "^1.75.0",
    "stylelint": "^16.3.1",
    "stylelint-config-recess-order": "^5.0.0",
    "stylelint-config-recommended-vue": "^1.5.0",
@ -163,7 +163,7 @@
    "stylelint-prettier": "^5.0.0",
    "svgo": "^3.2.0",
    "tailwindcss": "^3.4.3",
-    "typescript": "^5.4.4",
+    "typescript": "^5.4.5",
    "vite": "^5.2.8",
    "vite-plugin-cdn-import": "^0.3.5",
    "vite-plugin-compression": "^0.5.1",
@ -186,6 +186,11 @@
      "w3c-hr-time": "*",
      "stable": "*",
      "abab": "*"
+    },
+    "peerDependencyRules": {
+      "allowedVersions": {
+        "eslint": "9"
+      }
    }
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/App.vue
+++ b/src/App.vue
@ -10,10 +10,10 @@ import { defineComponent, h } from "vue";
 import { checkVersion } from "version-rocket";
 import { ElConfigProvider, ElNotification } from "element-plus";
 import { ReDialog } from "@/components/ReDialog";
-import en from "element-plus/dist/locale/en.mjs";
-import zhCn from "element-plus/dist/locale/zh-cn.mjs";
-import plusEn from "plus-pro-components/locale/en.mjs";
-import plusZhCn from "plus-pro-components/locale/zh-cn.mjs";
+import en from "element-plus/es/locale/lang/en";
+import zhCn from "element-plus/es/locale/lang/zh-cn";
+import plusEn from "plus-pro-components/es/locale/lang/en";
+import plusZhCn from "plus-pro-components/es/locale/lang/zh-cn";

 export default defineComponent({
  name: "app",
--- a/src/components/ReCountTo/src/normal/index.tsx
+++ b/src/components/ReCountTo/src/normal/index.tsx
@ -61,7 +61,7 @@ export default defineComponent({
      state.rAF = requestAnimationFrame(count);
    }

-    // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
    function pauseResume() {
      if (state.paused) {
        resume();
@ -83,7 +83,7 @@ export default defineComponent({
      requestAnimationFrame(count);
    }

-    // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-unused-vars
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
    function reset() {
      state.startTime = null;
      cancelAnimationFrame(state.rAF);
--- a/src/components/ReSeamlessScroll/src/index.vue
+++ b/src/components/ReSeamlessScroll/src/index.vue
@ -307,7 +307,7 @@ function touchMove(e) {

 function touchEnd() {
  if (!unref(canTouchScroll)) return;
-  // eslint-disable-next-line prefer-const
+
  let timer: any;
  const direction = unref(options).direction;
  delay.value = 50;
--- a/src/components/ReSeamlessScroll/src/utils.ts
+++ b/src/components/ReSeamlessScroll/src/utils.ts
@ -60,14 +60,12 @@ export function copyObj() {
    copyIsArray,
    clone,
    i = 1,
-    // eslint-disable-next-line prefer-rest-params
    target = arguments[0] || {}, // 使用||运算符，排除隐式强制类型转换为false的数据类型
    deep = false,
-    // eslint-disable-next-line prefer-const
    len = arguments.length;
  if (typeof target === "boolean") {
    deep = target;
-    // eslint-disable-next-line prefer-rest-params
+
    target = arguments[1] || {};
    i++;
  }
@ -80,7 +78,7 @@ export function copyObj() {
  }
  for (; i < len; i++) {
    //所以如果源对象中数据类型为Undefined或Null那么就会跳过本次循环，接着循环下一个源对象
-    // eslint-disable-next-line prefer-rest-params
+
    if ((options = arguments[i]) != null) {
      // 如果遇到源对象的数据类型为Boolean, Number for in循环会被跳过，不执行for in循环// src用于判断target对象是否存在name属性
      for (name in options) {
--- a/src/components/ReSplitPane/iconfont/iconfont.js
+++ b/src/components/ReSplitPane/iconfont/iconfont.js
@ -44,7 +44,6 @@
        (t.style.width = 0),
        (t.style.height = 0),
        (t.style.overflow = "hidden"),
-        // eslint-disable-next-line no-self-assign
        (t = t),
        (e = document.body).firstChild ? m(t, e.firstChild) : e.appendChild(t));
  }),
--- a/src/layout/components/tag/index.vue
+++ b/src/layout/components/tag/index.vue
@ -461,11 +461,7 @@ function openMenu(tag, e) {
    // 右键菜单不匹配当前路由，隐藏刷新
    tagsViews[0].show = false;
    showMenuModel(tag.path, tag.query);
-  } else if (
-    // eslint-disable-next-line no-dupe-else-if
-    multiTags.value.length === 2 &&
-    route.path !== tag.path
-  ) {
+  } else if (multiTags.value.length === 2 && route.path !== tag.path) {
    showMenus(true);
    // 只有两个标签时不显示关闭其他标签页
    tagsViews[4].show = false;
--- a/src/plugins/i18n.ts
+++ b/src/plugins/i18n.ts
@ -5,8 +5,8 @@ import { responsiveStorageNameSpace } from "@/config";
 import { storageLocal, isObject } from "@pureadmin/utils";

 // element-plus国际化
-import enLocale from "element-plus/dist/locale/en.mjs";
-import zhLocale from "element-plus/dist/locale/zh-cn.mjs";
+import enLocale from "element-plus/es/locale/lang/en";
+import zhLocale from "element-plus/es/locale/lang/zh-cn";

 const siphonI18n = (function () {
  // 仅初始化一次国际化配置
--- a/src/utils/print.ts
+++ b/src/utils/print.ts
@ -19,7 +19,6 @@ const Print = function (dom, options?: object): PrintFunction {
    printDoneCallBack: null
  };
  for (const key in this.conf) {
-    // eslint-disable-next-line no-prototype-builtins
    if (key && options.hasOwnProperty(key)) {
      this.conf[key] = options[key];
    }
@ -132,9 +131,9 @@ Print.prototype = {
      "style",
      "position:absolute;width:0;height:0;top:-10px;left:-10px;"
    );
-    // eslint-disable-next-line prefer-const
+
    w = f.contentWindow || f.contentDocument;
-    // eslint-disable-next-line prefer-const
+
    doc = f.contentDocument || f.contentWindow.document;
    doc.open();
    doc.write(content);
--- a/types/shims-vue.d.ts
+++ b/types/shims-vue.d.ts
@ -12,7 +12,3 @@ declare module "*.scss" {
 declare module "vue3-puzzle-vcode";
 declare module "vue-virtual-scroller";
 declare module "vuedraggable/src/vuedraggable";
-declare module "element-plus/dist/locale/en.mjs";
-declare module "element-plus/dist/locale/zh-cn.mjs";
-declare module "plus-pro-components/locale/en.mjs";
-declare module "plus-pro-components/locale/zh-cn.mjs";