diff --git a/.eslintignore b/.eslintignore index 42b6fc48..eb45021a 100644 --- a/.eslintignore +++ b/.eslintignore @@ -11,4 +11,5 @@ dist .husky /bin *html -Dockerfile \ No newline at end of file +Dockerfile +/discard \ No newline at end of file diff --git a/.eslintrc.js b/.eslintrc.js index 6680c5d5..edcf727b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -50,7 +50,7 @@ module.exports = { ], // 是否要求组件名称始终为多字 'vue/multi-word-component-names': [ - 'error', + 'off', { ignores: ['index', '404'], }, diff --git a/package.json b/package.json index fdd2a053..de1fe258 100644 --- a/package.json +++ b/package.json @@ -25,28 +25,28 @@ }, "dependencies": { "@element-plus/icons-vue": "^2.0.6", - "@logicflow/core": "^1.1.21", - "@logicflow/extension": "^1.1.21", + "@logicflow/core": "^1.1.22", + "@logicflow/extension": "^1.1.22", "axios": "^0.27.2", "echarts": "^5.3.3", - "element-plus": "^2.2.8", + "element-plus": "^2.2.10", "es6-promise": "^4.2.8", - "i18next": "^21.8.11", + "i18next": "^21.8.14", "image-conversion": "^2.1.1", - "intro.js": "^5.1.0", + "intro.js": "^6.0.0", "lodash-es": "^4.17.21", - "marked": "^4.0.17", + "marked": "^4.0.18", "mitt": "^3.0.0", "mockjs": "^1.1.0", "nprogress": "^0.2.0", "path": "^0.12.7", - "pinia": "^2.0.14", + "pinia": "^2.0.16", "qs": "^6.11.0", "sortablejs": "^1.15.0", "vue": "^3.2.37", "vue-i18n": "^9.1.10", - "vue-router": "^4.0.16", - "vue-types": "^4.1.1", + "vue-router": "^4.1.2", + "vue-types": "^4.2.0", "vuex": "^4.0.2", "wangeditor": "^4.7.15" }, @@ -55,55 +55,56 @@ "@commitlint/config-conventional": "^17.0.3", "@ehutch79/vite-eslint": "^0.0.1", "@types/core-js": "^2.5.5", - "@types/intro.js": "^3.0.2", + "@types/intro.js": "^5.1.0", "@types/lodash-es": "^4.17.6", "@types/marked": "^4.0.3", - "@types/node": "^18.0.0", + "@types/node": "^18.0.6", "@types/nprogress": "^0.2.0", "@types/qs": "^6.9.7", "@types/sortablejs": "^1.13.0", - "@typescript-eslint/eslint-plugin": "^5.30.3", - "@typescript-eslint/parser": "^5.30.3", - "@vitejs/plugin-vue": "^2.3.3", - "@vitejs/plugin-vue-jsx": "^1.3.10", + "@typescript-eslint/eslint-plugin": "^5.30.7", + "@typescript-eslint/parser": "^5.30.7", + "@vitejs/plugin-vue": "^3.0.1", + "@vitejs/plugin-vue-jsx": "^2.0.0", "@vue/compiler-sfc": "^3.2.37", "autoprefixer": "^10.4.7", "babel-eslint": "^10.1.0", - "commitizen": "^4.2.4", + "commitizen": "^4.2.5", "cz-conventional-changelog": "^3.3.0", - "cz-customizable": "^6.9.0", - "eslint": "^8.19.0", + "cz-customizable": "^6.9.1", + "eslint": "^8.20.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-promise": "^6.0.0", - "eslint-plugin-vue": "^9.1.1", + "eslint-plugin-vue": "^9.2.0", "http-server": "^14.1.1", "husky": "^8.0.1", "lint-staged": "^13.0.3", - "postcss-html": "^1.4.1", + "postcss-html": "^1.5.0", "postcss-import": "^14.1.0", "prettier": "2.7.1", "pretty-quick": "^3.1.3", - "sass": "^1.53.0", + "sass": "^1.54.0", "stylelint": "^14.9.1", "stylelint-config-prettier": "^9.0.3", "stylelint-config-recess-order": "^3.0.0", "stylelint-config-standard": "^26.0.0", "stylelint-order": "^5.0.0", - "stylelint-scss": "^4.2.0", + "stylelint-scss": "^4.3.0", "typescript": "^4.7.4", "unplugin-element-plus": "^0.4.1", - "unplugin-vue-define-options": "^0.6.1", - "vite": "^2.9.13", + "unplugin-vue-define-options": "^0.6.2", + "vite": "^3.0.2", "vite-plugin-compression": "^0.5.1", "vite-plugin-linter": "^1.2.0", "vite-plugin-mock": "^2.9.6", - "vite-plugin-pwa": "^0.12.2", + "vite-plugin-pwa": "^0.12.3", "vite-plugin-style-import": "^2.0.0", "vite-plugin-svg-icons": "^2.0.1", - "vue-tsc": "^0.38.2" + "vue-eslint-parser": "^9.0.3", + "vue-tsc": "^0.39.0" }, "license": "MIT", "config": { diff --git a/src/router/utils.ts b/src/router/utils.ts index d52622e1..4719a3fb 100644 --- a/src/router/utils.ts +++ b/src/router/utils.ts @@ -123,7 +123,6 @@ function setUpRoutePath(routeList: AppRouteRecordRaw[], pathName = '', pathList: for (const [key, node] of routeList.entries()) { node.meta = { ...(node.meta as Menu), pathList: [...pathList, key] }; if (pathName && !isExternal(node.path)) { - // nodePath 被静态提升?????? node.path = pathResolve(pathName, node.path || ''); } if (node.children && node.children.length) { diff --git a/tsconfig.json b/tsconfig.json index 8021df57..c0fdb4a3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -43,5 +43,5 @@ "build/**/*.ts", "vite.config.ts" ], - "exclude": ["node_modules", "dist", "**/*.js", "discard"] + "exclude": ["node_modules", "dist", "**/*.js", "discard/"] }