From 005a3e6ab0a9a3a710aca08b0cb7daf6b6205063 Mon Sep 17 00:00:00 2001 From: xingyu Date: Mon, 28 Nov 2022 16:50:53 +0800 Subject: [PATCH] fix: bugs --- README.md | 4 +- yudao-dependencies/pom.xml | 2 +- yudao-ui-admin-vue3/package.json | 12 +-- yudao-ui-admin-vue3/pnpm-lock.yaml | 96 +++++++++---------- .../Descriptions/src/Descriptions.vue | 4 +- .../src/hooks/web/useVxeCrudSchemas.ts | 14 ++- .../src/plugins/vxeTable/index.ts | 6 +- .../src/views/infra/codegen/index.vue | 7 +- .../src/views/infra/fileList/index.vue | 1 - .../src/views/system/dept/dept.data.ts | 4 +- .../src/views/system/dict/dict.data.ts | 1 + .../src/views/system/dict/dict.type.ts | 4 +- .../src/views/system/dict/index.vue | 5 +- .../src/views/system/sensitiveWord/index.vue | 13 ++- .../sensitiveWord/sensitiveWord.data.ts | 4 +- .../src/views/system/tenant/tenant.data.ts | 2 +- .../src/views/system/tenantPackage/index.vue | 2 +- .../tenantPackage/tenantPackage.data.ts | 2 +- .../src/views/system/user/index.vue | 15 +-- .../src/views/system/user/user.data.ts | 10 +- 20 files changed, 113 insertions(+), 95 deletions(-) diff --git a/README.md b/README.md index 934dcf16e..bb1286b66 100644 --- a/README.md +++ b/README.md @@ -223,9 +223,9 @@ ps：核心功能已经实现，正在对接微信小程序中... |----------------------------------------------------------------------|:------------:|:------:| | [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.45 | | [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.2.3 | -| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.23 | +| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.25 | | [TypeScript](https://www.typescriptlang.org/docs/) | TypeScript | 4.9.3 | -| [pinia](https://pinia.vuejs.org/) | vuex5 | 2.0.26 | +| [pinia](https://pinia.vuejs.org/) | vuex5 | 2.0.27 | | [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 | | [vxe-table](https://vxetable.cn/) | vue最强表单 | 4.5.6 | diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 2f3757b2e..ee437cff8 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -60,7 +60,7 @@ 8.2.2 4.6.2 2.2.1 - 3.1.634 + 3.1.561 1.4.0 1.5.3 2.12.2 diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index b79f4bc35..04027ad38 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi-vue-pro-vue3", - "version": "1.6.4.1862", + "version": "1.6.4.1863", "description": "基于vue3、vite3、element-plus、typesScript", "author": "xingyu", "private": false, @@ -36,14 +36,14 @@ "dayjs": "^1.11.6", "echarts": "^5.4.0", "echarts-wordcloud": "^2.1.0", - "element-plus": "2.2.23", + "element-plus": "2.2.25", "intro.js": "^6.0.0", "js-cookie": "^3.0.1", "jsencrypt": "^3.3.1", "lodash-es": "^4.17.21", "mitt": "^3.0.0", "nprogress": "^0.2.0", - "pinia": "^2.0.26", + "pinia": "^2.0.27", "qrcode": "^1.5.1", "qs": "^6.11.0", "url": "^0.11.0", @@ -59,7 +59,7 @@ "devDependencies": { "@commitlint/cli": "^17.3.0", "@commitlint/config-conventional": "^17.3.0", - "@iconify/json": "^2.1.143", + "@iconify/json": "^2.1.144", "@intlify/vite-plugin-vue-i18n": "^6.0.3", "@purge-icons/generated": "^0.9.0", "@types/intro.js": "^5.1.0", @@ -82,10 +82,10 @@ "plop": "^3.1.1", "postcss": "^8.4.19", "postcss-html": "^1.5.0", - "postcss-scss": "^4.0.5", + "postcss-scss": "^4.0.6", "prettier": "^2.8.0", "rimraf": "^3.0.2", - "rollup": "^3.4.0", + "rollup": "^3.5.0", "sass": "^1.56.1", "stylelint": "^14.15.0", "stylelint-config-html": "^1.1.0", diff --git a/yudao-ui-admin-vue3/pnpm-lock.yaml b/yudao-ui-admin-vue3/pnpm-lock.yaml index 7bcf13a05..d9a28cc75 100644 --- a/yudao-ui-admin-vue3/pnpm-lock.yaml +++ b/yudao-ui-admin-vue3/pnpm-lock.yaml @@ -4,7 +4,7 @@ specifiers: '@commitlint/cli': ^17.3.0 '@commitlint/config-conventional': ^17.3.0 '@iconify/iconify': ^3.0.0 - '@iconify/json': ^2.1.143 + '@iconify/json': ^2.1.144 '@intlify/vite-plugin-vue-i18n': ^6.0.3 '@purge-icons/generated': ^0.9.0 '@types/intro.js': ^5.1.0 @@ -28,7 +28,7 @@ specifiers: dayjs: ^1.11.6 echarts: ^5.4.0 echarts-wordcloud: ^2.1.0 - element-plus: 2.2.23 + element-plus: 2.2.25 eslint: ^8.28.0 eslint-config-prettier: ^8.5.0 eslint-define-config: ^1.12.0 @@ -41,16 +41,16 @@ specifiers: lodash-es: ^4.17.21 mitt: ^3.0.0 nprogress: ^0.2.0 - pinia: ^2.0.26 + pinia: ^2.0.27 plop: ^3.1.1 postcss: ^8.4.19 postcss-html: ^1.5.0 - postcss-scss: ^4.0.5 + postcss-scss: ^4.0.6 prettier: ^2.8.0 qrcode: ^1.5.1 qs: ^6.11.0 rimraf: ^3.0.2 - rollup: ^3.4.0 + rollup: ^3.5.0 sass: ^1.56.1 stylelint: ^14.15.0 stylelint-config-html: ^1.1.0 @@ -93,14 +93,14 @@ dependencies: dayjs: registry.npmmirror.com/dayjs/1.11.6 echarts: registry.npmmirror.com/echarts/5.4.0 echarts-wordcloud: 2.1.0_echarts@5.4.0 - element-plus: 2.2.23_vue@3.2.45 + element-plus: 2.2.25_vue@3.2.45 intro.js: registry.npmmirror.com/intro.js/6.0.0 js-cookie: registry.npmmirror.com/js-cookie/3.0.1 jsencrypt: registry.npmmirror.com/jsencrypt/3.3.1 lodash-es: registry.npmmirror.com/lodash-es/4.17.21 mitt: registry.npmmirror.com/mitt/3.0.0 nprogress: registry.npmmirror.com/nprogress/0.2.0 - pinia: 2.0.26_mgnvym7yiazkylwwogi5r767ue + pinia: 2.0.27_mgnvym7yiazkylwwogi5r767ue qrcode: registry.npmmirror.com/qrcode/1.5.1 qs: registry.npmmirror.com/qs/6.11.0 url: registry.npmmirror.com/url/0.11.0 @@ -116,7 +116,7 @@ dependencies: devDependencies: '@commitlint/cli': registry.npmmirror.com/@commitlint/cli/17.3.0 '@commitlint/config-conventional': registry.npmmirror.com/@commitlint/config-conventional/17.3.0 - '@iconify/json': 2.1.143 + '@iconify/json': 2.1.144 '@intlify/vite-plugin-vue-i18n': registry.npmmirror.com/@intlify/vite-plugin-vue-i18n/6.0.3_vite@3.2.4+vue-i18n@9.2.2 '@purge-icons/generated': registry.npmmirror.com/@purge-icons/generated/0.9.0 '@types/intro.js': registry.npmmirror.com/@types/intro.js/5.1.0 @@ -139,10 +139,10 @@ devDependencies: plop: registry.npmmirror.com/plop/3.1.1 postcss: registry.npmmirror.com/postcss/8.4.19 postcss-html: registry.npmmirror.com/postcss-html/1.5.0 - postcss-scss: registry.npmmirror.com/postcss-scss/4.0.5_postcss@8.4.19 + postcss-scss: 4.0.6_postcss@8.4.19 prettier: registry.npmmirror.com/prettier/2.8.0 rimraf: registry.npmmirror.com/rimraf/3.0.2 - rollup: registry.npmmirror.com/rollup/3.4.0 + rollup: 3.5.0 sass: registry.npmmirror.com/sass/1.56.1 stylelint: registry.npmmirror.com/stylelint/14.15.0 stylelint-config-html: registry.npmmirror.com/stylelint-config-html/1.1.0_qendsqix7hqecpnpx4fjs6qry4 @@ -207,8 +207,8 @@ packages: '@floating-ui/core': 1.0.2 dev: false - /@iconify/json/2.1.143: - resolution: {integrity: sha512-atN7UAsuRgXkXE9MiOh59T2hIkN3ulE6GVbfZjKeYPYdyRpsAgFsLOAMjJ+u6jIzaiZn+rSVwx7m2gQG47sN0A==} + /@iconify/json/2.1.144: + resolution: {integrity: sha512-U4W9EHgDVKk/ll8fJ8J6atgtYj9MjPUiKtVlMlyz+SO90lI34QbgVJZOP/DEezLP/HcAIDLS2pgX+x+kFIkeWg==} dependencies: '@iconify/types': 2.0.0 pathe: 0.3.9 @@ -440,8 +440,8 @@ packages: echarts: registry.npmmirror.com/echarts/5.4.0 dev: false - /element-plus/2.2.23_vue@3.2.45: - resolution: {integrity: sha512-/7BtebETiknsW2TpSwt5RIpXxFQ1sbYoRelJqeiB1K9LcL0MwyQJ1rZSuWHBCHduMvfpogNZ66dwp2Giv9lYbg==} + /element-plus/2.2.25_vue@3.2.45: + resolution: {integrity: sha512-HC8CWY31e6pPyBpgqI0QnWkBgs0vRzdYnEw3mpdM/NlKfp0PtNFX7NESQLomqoIulH5ftL09hjQmJNvZBQpthQ==} peerDependencies: vue: ^3.2.0 dependencies: @@ -780,6 +780,7 @@ packages: /graceful-fs/4.2.10: resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==} + requiresBuild: true dev: true optional: true @@ -1006,8 +1007,8 @@ packages: hasBin: true dev: true - /pinia/2.0.26_mgnvym7yiazkylwwogi5r767ue: - resolution: {integrity: sha512-tSxZNUcMGxQOvKZRjPKXxd2+/2NZhRF/CoYVE/+K6uE/Z3v1Oi4fcQFpxu5nMB1dCchjXUZ+lz0tBxV5ntwmQQ==} + /pinia/2.0.27_mgnvym7yiazkylwwogi5r767ue: + resolution: {integrity: sha512-nOnXP0OFeL8R4WjAHsterU+11vptda643gH02xKNtSCDPiRzVfRYodOLihLDoa0gL1KKuQKV+KOzEgdt3YvqEw==} peerDependencies: '@vue/composition-api': ^1.4.0 typescript: '>=4.4.4' @@ -1024,6 +1025,15 @@ packages: vue-demi: 0.13.11_vue@3.2.45 dev: false + /postcss-scss/4.0.6_postcss@8.4.19: + resolution: {integrity: sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==} + engines: {node: '>=12.0'} + peerDependencies: + postcss: ^8.4.19 + dependencies: + postcss: registry.npmmirror.com/postcss/8.4.19 + dev: true + /postcss-selector-parser/6.0.10: resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==} engines: {node: '>=4'} @@ -1044,6 +1054,22 @@ packages: resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==} dev: true + /rollup/2.79.1: + resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==} + engines: {node: '>=10.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.2 + dev: true + + /rollup/3.5.0: + resolution: {integrity: sha512-TYu2L+TGhmNsXCtByont89u+ATQLcDy6A+++PwLXYunRtOm7XnaD+65s1pvewaOxMYR0eOkMXn9/i0saBxxpnQ==} + engines: {node: '>=14.18.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.2 + dev: true + /rxjs/7.5.7: resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==} dependencies: @@ -7243,18 +7269,6 @@ packages: postcss: registry.npmmirror.com/postcss/8.4.19 dev: true - registry.npmmirror.com/postcss-scss/4.0.5_postcss@8.4.19: - resolution: {integrity: sha512-F7xpB6TrXyqUh3GKdyB4Gkp3QL3DDW1+uI+gxx/oJnUt/qXI4trj5OGlp9rOKdoABGULuqtqeG+3HEVQk4DjmA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/postcss-scss/-/postcss-scss-4.0.5.tgz} - id: registry.npmmirror.com/postcss-scss/4.0.5 - name: postcss-scss - version: 4.0.5 - engines: {node: '>=12.0'} - peerDependencies: - postcss: ^8.3.3 - dependencies: - postcss: registry.npmmirror.com/postcss/8.4.19 - dev: true - registry.npmmirror.com/postcss-selector-parser/6.0.10: resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz} name: postcss-selector-parser @@ -7712,26 +7726,6 @@ packages: - supports-color dev: true - registry.npmmirror.com/rollup/2.79.1: - resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/rollup/-/rollup-2.79.1.tgz} - name: rollup - version: 2.79.1 - engines: {node: '>=10.0.0'} - hasBin: true - optionalDependencies: - fsevents: 2.3.2 - dev: true - - registry.npmmirror.com/rollup/3.4.0: - resolution: {integrity: sha512-4g8ZrEFK7UbDvy3JF+d5bLiC8UKkS3n/27/cnVeESwB1LVPl6MoPL32/6+SCQ1vHTp6Mvp2veIHtwELhi+uXEw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/rollup/-/rollup-3.4.0.tgz} - name: rollup - version: 3.4.0 - engines: {node: '>=14.18.0', npm: '>=8.0.0'} - hasBin: true - optionalDependencies: - fsevents: 2.3.2 - dev: true - registry.npmmirror.com/run-async/2.4.1: resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/run-async/-/run-async-2.4.1.tgz} name: run-async @@ -8835,7 +8829,7 @@ packages: '@rollup/pluginutils': registry.npmmirror.com/@rollup/pluginutils/4.2.1 '@types/eslint': registry.npmmirror.com/@types/eslint/8.4.10 eslint: registry.npmmirror.com/eslint/8.28.0 - rollup: registry.npmmirror.com/rollup/2.79.1 + rollup: 2.79.1 vite: registry.npmmirror.com/vite/3.2.4_ajklay5k626t46b6fyghkbup3i dev: true @@ -8996,7 +8990,7 @@ packages: esbuild: registry.npmmirror.com/esbuild/0.15.14 postcss: registry.npmmirror.com/postcss/8.4.19 resolve: registry.npmmirror.com/resolve/1.22.1 - rollup: registry.npmmirror.com/rollup/2.79.1 + rollup: 2.79.1 sass: registry.npmmirror.com/sass/1.56.1 optionalDependencies: fsevents: 2.3.2 @@ -9253,7 +9247,7 @@ packages: version: 0.3.2 dependencies: eslint-visitor-keys: 1.3.0 - lodash: registry.npmmirror.com/lodash/4.17.21 + lodash: 4.17.21 yaml: 1.10.2 dev: true diff --git a/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue b/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue index a0075c2e7..ac395de47 100644 --- a/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue +++ b/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue @@ -115,7 +115,9 @@ const toggleClick = () => { @@ -86,7 +86,6 @@ const openImportTable = () => { importRef.value.show() } // 预览操作 -// TODO 星语：点击后报错 const previewRef = ref() const handlePreview = (row: CodegenTableVO) => { previewRef.value.show(row) diff --git a/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue b/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue index 37ccb0907..6b1296486 100644 --- a/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue +++ b/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue @@ -85,7 +85,6 @@ import { useVxeGrid } from '@/hooks/web/useVxeGrid' import { VxeGridInstance } from 'vxe-table' import { ElUpload, ElImage, UploadInstance, UploadRawFile } from 'element-plus' // 业务相关的 import -// TODO 星语：貌似这个界面打开 404 import { allSchemas } from './fileList.data' import * as FileApi from '@/api/infra/fileList' import { getAccessToken, getTenantId } from '@/utils/auth' diff --git a/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts b/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts index 757958524..86e4f5d11 100644 --- a/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts @@ -12,8 +12,8 @@ export const rules = reactive({ email: [required], phone: [ { - pattern: - /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/, // TODO @星语：前端只校验长度，格式交给后端；因为号码格式不断在变的 + min: 11, + max: 11, trigger: 'blur', message: '请输入正确的手机号码' } diff --git a/yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts b/yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts index 935644c4d..c022612b3 100644 --- a/yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts @@ -17,6 +17,7 @@ export const crudSchemas = reactive({ primaryType: null, action: true, actionWidth: '140px', + searchSpan: 12, columns: [ { title: '字典类型', diff --git a/yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts b/yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts index e57b91e00..f0071b04c 100644 --- a/yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts +++ b/yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts @@ -7,8 +7,7 @@ const { t } = useI18n() // 国际化 // 表单校验 export const dictTypeRules = reactive({ - name: [required], - type: [required] + name: [required] }) // 新增 + 修改 const crudSchemas = reactive({ @@ -16,6 +15,7 @@ const crudSchemas = reactive({ primaryType: null, action: true, actionWidth: '140px', + searchSpan: 12, columns: [ { title: '字典名称', diff --git a/yudao-ui-admin-vue3/src/views/system/dict/index.vue b/yudao-ui-admin-vue3/src/views/system/dict/index.vue index a72b93ccc..2f0a83243 100644 --- a/yudao-ui-admin-vue3/src/views/system/dict/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/dict/index.vue @@ -1,7 +1,6 @@