Переглянути джерело

chore: all packages update latest version

xiaoxian521 3 роки тому
батько
коміт
03955f7470

+ 2 - 1
.gitignore

@@ -3,6 +3,7 @@ node_modules
 dist
 dist-ssr
 *.local
+.eslintcache
 
 npm-debug.log*
 yarn-debug.log*
@@ -15,4 +16,4 @@ tests/**/coverage/
 *.suo
 *.ntvs*
 *.njsproj
-*.sln
+*.sln

+ 6 - 0
.husky/commit-msg

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# shellcheck source=./_/husky.sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no-install commitlint --edit "$1"

+ 9 - 0
.husky/common.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+command_exists () {
+  command -v "$1" >/dev/null 2>&1
+}
+
+# Workaround for Windows 10, Git Bash and Yarn
+if command_exists winpty && test -t 1; then
+  exec < /dev/tty
+fi

+ 10 - 0
.husky/lintstagedrc.js

@@ -0,0 +1,10 @@
+module.exports = {
+  "*.{js,jsx,ts,tsx}": ["eslint --fix", "prettier --write"],
+  "{!(package)*.json,*.code-snippets,.!(browserslist)*rc}": [
+    "prettier --write--parser json"
+  ],
+  "package.json": ["prettier --write"],
+  "*.vue": ["eslint --fix", "prettier --write", "stylelint --fix"],
+  "*.{vue,css,scss,postcss,less}": ["stylelint --fix", "prettier --write"],
+  "*.md": ["prettier --write"]
+};

+ 10 - 0
.husky/pre-commit

@@ -0,0 +1,10 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+. "$(dirname "$0")/common.sh"
+
+[ -n "$CI" ] && exit 0
+
+# Format and submit code according to lintstagedrc.js configuration
+npm run lint:lint-staged
+
+npm run lint:pretty

+ 32 - 0
commitlint.config.js

@@ -0,0 +1,32 @@
+module.exports = {
+  ignores: [commit => commit.includes("init")],
+  extends: ["@commitlint/config-conventional"],
+  rules: {
+    "body-leading-blank": [2, "always"],
+    "footer-leading-blank": [1, "always"],
+    "header-max-length": [2, "always", 108],
+    "subject-empty": [2, "never"],
+    "type-empty": [2, "never"],
+    "type-enum": [
+      2,
+      "always",
+      [
+        "feat",
+        "fix",
+        "perf",
+        "style",
+        "docs",
+        "test",
+        "refactor",
+        "build",
+        "ci",
+        "chore",
+        "revert",
+        "wip",
+        "workflow",
+        "types",
+        "release"
+      ]
+    ]
+  }
+};

Різницю між файлами не показано, бо вона завелика
+ 1392 - 1613
package-lock.json


+ 16 - 21
package.json

@@ -8,15 +8,13 @@
     "build": "rimraf dist && cross-env vite build",
     "preview": "vite preview",
     "preview:build": "npm run build && vite preview",
-    "lint": "eslint --ext .js,.jsx,.vue,.ts,.tsx src",
+    "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,css,scss,postcss,less}\" --cache --cache-location node_modules/.cache/stylelint/",
-    "lint-staged": "lint-staged"
-  },
-  "husky": {
-    "hooks": {
-      "commit-msg": "node scripts/verify-commit.js",
-      "pre-commit": "npm run lint-staged"
-    }
+    "lint:lint-staged": "lint-staged -c ./.husky/lintstagedrc.js",
+    "lint:pretty": "pretty-quick --staged",
+    "lint:all": "npm run lint:eslint && npm run lint:prettier && npm run lint:stylelint && npm run lint:pretty",
+    "prepare": "husky install"
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
@@ -43,7 +41,7 @@
     "resize-observer-polyfill": "^1.5.1",
     "responsive-storage": "^1.0.4",
     "v-contextmenu": "^3.0.0",
-    "vue": "^3.2.8",
+    "vue": "^3.2.11",
     "vue-i18n": "^9.2.0-beta.3",
     "vue-json-pretty": "^2.0.2",
     "vue-router": "^4.0.11",
@@ -56,15 +54,17 @@
     "xgplayer": "^2.28.0"
   },
   "devDependencies": {
+    "@commitlint/cli": "^13.1.0",
+    "@commitlint/config-conventional": "^13.1.0",
     "@types/element-resize-detector": "^1.1.3",
     "@types/mockjs": "^1.0.3",
     "@types/node": "^14.14.14",
     "@types/nprogress": "^0.2.0",
-    "@typescript-eslint/eslint-plugin": "^4.30.0",
-    "@typescript-eslint/parser": "^4.30.0",
+    "@typescript-eslint/eslint-plugin": "^4.31.0",
+    "@typescript-eslint/parser": "^4.31.0",
     "@vitejs/plugin-vue": "^1.6.0",
     "@vitejs/plugin-vue-jsx": "^1.1.7",
-    "@vue/compiler-sfc": "^3.2.8",
+    "@vue/compiler-sfc": "^3.2.11",
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-typescript": "^7.0.0",
     "autoprefixer": "^10.2.4",
@@ -74,11 +74,12 @@
     "eslint": "^7.30.0",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-vue": "^7.17.0",
-    "husky": "^6.0.0",
-    "lint-staged": "^11.0.0",
+    "husky": "^7.0.2",
+    "lint-staged": "^11.1.2",
     "postcss": "^8.2.6",
     "postcss-import": "^14.0.0",
     "prettier": "^2.3.2",
+    "pretty-quick": "^3.1.1",
     "rimraf": "^3.0.2",
     "sass": "^1.38.0",
     "sass-loader": "^12.1.0",
@@ -87,17 +88,11 @@
     "stylelint-config-standard": "^22.0.0",
     "stylelint-order": "^4.1.0",
     "typescript": "^4.4.2",
-    "vite": "^2.5.3",
+    "vite": "^2.5.6",
     "vite-plugin-element-plus": "^0.0.12",
     "vite-plugin-mock": "^2.9.6",
     "vite-plugin-style-import": "^1.2.1",
     "vite-svg-loader": "^2.2.0",
     "vue-eslint-parser": "^7.10.0"
-  },
-  "lint-staged": {
-    "*.{js,jsx,vue,ts,tsx}": [
-      "npm run lint",
-      "git add"
-    ]
   }
 }

+ 0 - 25
scripts/verify-commit.js

@@ -1,25 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const chalk = require("chalk");
-
-const msgPath = process.env.HUSKY_GIT_PARAMS;
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const msg = require("fs").readFileSync(msgPath, "utf-8").trim();
-
-const commitRE =
-  /^(revert: )?(feat|fix|polish|docs|style|refactor|perf|test|workflow|ci|chore|types)(\(.+\))?: .{1,50}/;
-
-if (!commitRE.test(msg)) {
-  console.error(
-    `  ${chalk.bgRed.white(" ERROR ")} ${chalk.red(
-      "不合法的 commit 消息格式"
-    )}\n\n` +
-      chalk.red("  请使用正确的提交格式:\n\n") +
-      `    ${chalk.green("feat: add 'comments' option")}\n` +
-      `    ${chalk.green("fix: handle events on blur (close #28)")}\n\n` +
-      chalk.red(
-        "  请查看 git commit 提交规范:https://github.com/vuejs/vue/blob/dev/.github/COMMIT_CONVENTION.md \n"
-      )
-  );
-
-  process.exit(1);
-}

+ 11 - 8
src/assets/iconfont/iconfont.css

@@ -1,10 +1,14 @@
-@font-face {font-family: "iconfont";
-  src: url('iconfont.eot?t=1619360751585'); /* IE9 */
-  src: url('iconfont.eot?t=1619360751585#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAARMAAsAAAAACbwAAAP9AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDQAqGEIRiATYCJAMYCw4ABCAFhG0Hfhs2CMgOJS2d2ECiAwlgBN+vlf0+zE5mg6wAXeJZIjpmuSejwkZFpjyxij57rCLU/p9b+c8NWt6VZsJElIM/LOtvdta6uELEuI1RpSiTq877eC1W5aXc/38/V+f5b2lrettv68Xkvj8zA0+cJTJJQyKSxKSSKBWPlNixsM5M+mTE89a4m0BnrRop+8ZmViBbIQ4KxE1DVyC7cisjwtDamp4zi3ihatOz9BfAc//xMQNNkU1SM3Hk4cujGgyMi5MjaYPhCecti35/94OKjG1AIR72hm9Li+Vt0nSLYro9YHl8K0nj4vjWyaffTiaTMMEW0xUVO53ZUn8t//CqJBMNgbPB31+pjC/TNMH4FprC+FaayuRTmsTkiFuGvdnj1KXAOIiV4K+OJFWaiyg0Ta9XlNpZFnNMMU87Fu6JpEd7eVb2opxYflpfv3a6POca5EdfirMurHNGCE8kd+I1Aga56YZpli8QTd2pkM13zTZ3LWH/yp07FYsroO6K+8wWApapQmIJS/sos3zFfAfHn7h7YNkyBXLpDpx4e1dclrGWJZBjHTZlH7GTZu5+x+JBl122Uu7Dnneswsb7GzdAYdAeAQNsuPCgpUXf26No0Vtakrt6EdLv73FsGfVc+stJczdJknB3izcB36+MxPaRNRuxkhDbHm3uWlgXdtH0nPRZONzVMmLbhDTJuGaPNCfq0vWC2f87RVXNo+ZKmG1whgeqbK2MNlctwFnlMtis7d3MsMNhGBuNtnQt7IjdW4k7NbE3+trR+Ch7WcWwpjkOHUkI4nbFjG3xcHdz1HEIabtS38eCpsmEOO2WrO1tMUMd5tprJzKSyJyclDN2xNNTI/96bFx+DY/OZ1M/Agzf5q9pwwDDd2mR2fk3+hv//gtHjxX1/Gv7BYy+e/TXTxieKPKA/wJB1v9p9MQFZWkUnqbM59f7CDSOyHhvg3RyEX+W+EJf98UsIXcTWksyJD1rIGutYxf+Nqj6dmQarevsprPVOM7vW4RJE2UWtjjLIMz3BpK5PkA23x678L9AtdRvaMyPNOicjLIr9m0II3eYocJRk1bjkqEG/FT5eG7oXUI97FVYafRSgixk5KTGuoZmbRz9yPZxTCiiN3FOJcoCPmmM3Q+93oAUZAE3qrzOxXmwq76e9r1SnRrwQa69GKTgkEayKk5iUAX4Ubs0l9t6/yVIF+alYCPzLlQJxIQYG5c0qtNAYI+jnzTvuWwfEqFrwnF0th/FBPhIxhBEXlkOkAT7d3NDKq6Oa4tiUJd6Po5Sse74jO9VXgcdcdUmUuQoUaOJnt4Dl+JXXeEyPxSI1voUw1/7MCwcm0NW4TI0Df09vyvCmMFradjrDakM0Z+bXAAAAAA=') format('woff2'),
-  url('iconfont.woff?t=1619360751585') format('woff'),
-  url('iconfont.ttf?t=1619360751585') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-  url('iconfont.svg?t=1619360751585#iconfont') format('svg'); /* iOS 4.1- */
+@font-face {
+  font-family: "iconfont";
+  src: url("iconfont.eot?t=1619360751585"); /* IE9 */
+  src: url("iconfont.eot?t=1619360751585#iefix") format("embedded-opentype"),
+    /* IE6-IE8 */
+      url("data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAARMAAsAAAAACbwAAAP9AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDQAqGEIRiATYCJAMYCw4ABCAFhG0Hfhs2CMgOJS2d2ECiAwlgBN+vlf0+zE5mg6wAXeJZIjpmuSejwkZFpjyxij57rCLU/p9b+c8NWt6VZsJElIM/LOtvdta6uELEuI1RpSiTq877eC1W5aXc/38/V+f5b2lrettv68Xkvj8zA0+cJTJJQyKSxKSSKBWPlNixsM5M+mTE89a4m0BnrRop+8ZmViBbIQ4KxE1DVyC7cisjwtDamp4zi3ihatOz9BfAc//xMQNNkU1SM3Hk4cujGgyMi5MjaYPhCecti35/94OKjG1AIR72hm9Li+Vt0nSLYro9YHl8K0nj4vjWyaffTiaTMMEW0xUVO53ZUn8t//CqJBMNgbPB31+pjC/TNMH4FprC+FaayuRTmsTkiFuGvdnj1KXAOIiV4K+OJFWaiyg0Ta9XlNpZFnNMMU87Fu6JpEd7eVb2opxYflpfv3a6POca5EdfirMurHNGCE8kd+I1Aga56YZpli8QTd2pkM13zTZ3LWH/yp07FYsroO6K+8wWApapQmIJS/sos3zFfAfHn7h7YNkyBXLpDpx4e1dclrGWJZBjHTZlH7GTZu5+x+JBl122Uu7Dnneswsb7GzdAYdAeAQNsuPCgpUXf26No0Vtakrt6EdLv73FsGfVc+stJczdJknB3izcB36+MxPaRNRuxkhDbHm3uWlgXdtH0nPRZONzVMmLbhDTJuGaPNCfq0vWC2f87RVXNo+ZKmG1whgeqbK2MNlctwFnlMtis7d3MsMNhGBuNtnQt7IjdW4k7NbE3+trR+Ch7WcWwpjkOHUkI4nbFjG3xcHdz1HEIabtS38eCpsmEOO2WrO1tMUMd5tprJzKSyJyclDN2xNNTI/96bFx+DY/OZ1M/Agzf5q9pwwDDd2mR2fk3+hv//gtHjxX1/Gv7BYy+e/TXTxieKPKA/wJB1v9p9MQFZWkUnqbM59f7CDSOyHhvg3RyEX+W+EJf98UsIXcTWksyJD1rIGutYxf+Nqj6dmQarevsprPVOM7vW4RJE2UWtjjLIMz3BpK5PkA23x678L9AtdRvaMyPNOicjLIr9m0II3eYocJRk1bjkqEG/FT5eG7oXUI97FVYafRSgixk5KTGuoZmbRz9yPZxTCiiN3FOJcoCPmmM3Q+93oAUZAE3qrzOxXmwq76e9r1SnRrwQa69GKTgkEayKk5iUAX4Ubs0l9t6/yVIF+alYCPzLlQJxIQYG5c0qtNAYI+jnzTvuWwfEqFrwnF0th/FBPhIxhBEXlkOkAT7d3NDKq6Oa4tiUJd6Po5Sse74jO9VXgcdcdUmUuQoUaOJnt4Dl+JXXeEyPxSI1voUw1/7MCwcm0NW4TI0Df09vyvCmMFradjrDakM0Z+bXAAAAAA=")
+      format("woff2"),
+    url("iconfont.woff?t=1619360751585") format("woff"),
+    url("iconfont.ttf?t=1619360751585") format("truetype"),
+    /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+      url("iconfont.svg?t=1619360751585#iconfont") format("svg"); /* iOS 4.1- */
 }
 
 .iconfont {
@@ -34,4 +38,3 @@
 .team-iconfullscreen::before {
   content: "\e62b";
 }
-

+ 1 - 1
src/components/ReCountTo/README.md

@@ -1,2 +1,2 @@
 normal 普通数字动画组件  
-rebound 回弹式数字动画组件  
+rebound 回弹式数字动画组件

Різницю між файлами не показано, бо вона завелика
+ 0 - 3
src/components/ReFlowChart/src/assets/iconfont/iconfont.css


+ 1 - 1
src/components/ReSelector/src/index.css

@@ -25,4 +25,4 @@
 
 .both-right-sides {
   border-radius: 0 50% 50% 0;
-}
+}

+ 1 - 1
src/style/sidebar.scss

@@ -81,7 +81,7 @@
     .el-sub-menu__title {
       color: $menuText;
     }
-    
+
     // menu hover
     .submenu-title-noDropdown,
     .el-sub-menu__title {

+ 3 - 3
src/style/transition.scss

@@ -14,7 +14,7 @@
 /* fade-transform */
 .fade-transform-leave-active,
 .fade-transform-enter-active {
-  transition: all .5s;
+  transition: all 0.5s;
 }
 
 .fade-transform-enter-from {
@@ -30,7 +30,7 @@
 /* breadcrumb transition */
 .breadcrumb-enter-active,
 .breadcrumb-leave-active {
-  transition: all .5s;
+  transition: all 0.5s;
 }
 
 .breadcrumb-enter-from,
@@ -41,4 +41,4 @@
 
 .breadcrumb-leave-active {
   position: absolute;
-}
+}

+ 17 - 49
src/views/flow-chart/dataTurbo.json

@@ -2,9 +2,7 @@
   "flowElementList": [
     {
       "incoming": [],
-      "outgoing": [
-        "Flow_33inf2k"
-      ],
+      "outgoing": ["Flow_33inf2k"],
       "dockers": [],
       "type": 2,
       "properties": {
@@ -23,9 +21,7 @@
       "key": "Event_1d42u4p"
     },
     {
-      "incoming": [
-        "Flow_379e0o9"
-      ],
+      "incoming": ["Flow_379e0o9"],
       "outgoing": [],
       "dockers": [],
       "type": 3,
@@ -45,12 +41,8 @@
       "key": "Event_08p8i6q"
     },
     {
-      "incoming": [
-        "Flow_0pfouf0"
-      ],
-      "outgoing": [
-        "Flow_3918lhh"
-      ],
+      "incoming": ["Flow_0pfouf0"],
+      "outgoing": ["Flow_3918lhh"],
       "dockers": [],
       "type": 6,
       "properties": {
@@ -69,12 +61,8 @@
       "key": "Gateway_1fngqgj"
     },
     {
-      "incoming": [
-        "Flow_33inf2k"
-      ],
-      "outgoing": [
-        "Flow_0pfouf0"
-      ],
+      "incoming": ["Flow_33inf2k"],
+      "outgoing": ["Flow_0pfouf0"],
       "dockers": [],
       "type": 4,
       "properties": {
@@ -93,12 +81,8 @@
       "key": "Activity_2mgtaia"
     },
     {
-      "incoming": [
-        "Flow_3918lhh"
-      ],
-      "outgoing": [
-        "Flow_379e0o9"
-      ],
+      "incoming": ["Flow_3918lhh"],
+      "outgoing": ["Flow_379e0o9"],
       "dockers": [],
       "type": 5,
       "properties": {
@@ -117,12 +101,8 @@
       "key": "Activity_1sp8qc8"
     },
     {
-      "incoming": [
-        "Event_1d42u4p"
-      ],
-      "outgoing": [
-        "Activity_2mgtaia"
-      ],
+      "incoming": ["Event_1d42u4p"],
+      "outgoing": ["Activity_2mgtaia"],
       "type": 1,
       "dockers": [],
       "properties": {
@@ -155,12 +135,8 @@
       "key": "Flow_33inf2k"
     },
     {
-      "incoming": [
-        "Activity_2mgtaia"
-      ],
-      "outgoing": [
-        "Gateway_1fngqgj"
-      ],
+      "incoming": ["Activity_2mgtaia"],
+      "outgoing": ["Gateway_1fngqgj"],
       "type": 1,
       "dockers": [],
       "properties": {
@@ -193,12 +169,8 @@
       "key": "Flow_0pfouf0"
     },
     {
-      "incoming": [
-        "Gateway_1fngqgj"
-      ],
-      "outgoing": [
-        "Activity_1sp8qc8"
-      ],
+      "incoming": ["Gateway_1fngqgj"],
+      "outgoing": ["Activity_1sp8qc8"],
       "type": 1,
       "dockers": [],
       "properties": {
@@ -231,12 +203,8 @@
       "key": "Flow_3918lhh"
     },
     {
-      "incoming": [
-        "Activity_1sp8qc8"
-      ],
-      "outgoing": [
-        "Event_08p8i6q"
-      ],
+      "incoming": ["Activity_1sp8qc8"],
+      "outgoing": ["Event_08p8i6q"],
       "type": 1,
       "dockers": [],
       "properties": {
@@ -269,4 +237,4 @@
       "key": "Flow_379e0o9"
     }
   ]
-}
+}

Деякі файли не було показано, через те що забагато файлів було змінено