From af583c71b0d1760ba4ed4cfa12458820c3f4db52 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Sun, 22 Oct 2023 09:41:43 +0300 Subject: [PATCH 1/9] Fix: Default currentSize --- src/store/modules/app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts index 3247708..8e7858c 100644 --- a/src/store/modules/app.ts +++ b/src/store/modules/app.ts @@ -63,7 +63,7 @@ export const useAppStore = defineStore('app', { layout: getStorage('layout') || 'classic', // layout布局 isDark: getStorage('isDark'), // 是否是暗黑模式 - currentSize: getStorage('default') || 'default', // 组件尺寸 + currentSize: getStorage('currentSize') || 'default', // 组件尺寸 theme: getStorage('theme') || { // 主题色 elColorPrimary: '#409eff', From 2e7797be68b2469d979231e6588b43d0b5bdb88b Mon Sep 17 00:00:00 2001 From: kailong321200875 <321200875@qq.com> Date: Fri, 27 Oct 2023 11:21:03 +0800 Subject: [PATCH 2/9] fix: #361 --- .eslintrc.js | 3 ++- package.json | 54 ++++++++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 4cad823..8068163 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -65,6 +65,7 @@ module.exports = defineConfig({ } ], 'vue/multi-word-component-names': 'off', - 'vue/no-v-html': 'off' + 'vue/no-v-html': 'off', + 'vue/require-toggle-inside-transition': 'off' } }) diff --git a/package.json b/package.json index d860047..05f9ec5 100644 --- a/package.json +++ b/package.json @@ -34,12 +34,12 @@ "@wangeditor/editor-for-vue": "^5.1.10", "@zxcvbn-ts/core": "^3.0.4", "animate.css": "^4.1.1", - "axios": "^1.5.1", + "axios": "^1.6.0", "dayjs": "^1.11.10", "driver.js": "^1.3.0", "echarts": "^5.4.3", "echarts-wordcloud": "^2.1.0", - "element-plus": "^2.4.0", + "element-plus": "^2.4.1", "lodash-es": "^4.17.21", "mitt": "^3.0.1", "mockjs": "^1.1.0", @@ -49,62 +49,62 @@ "qrcode": "^1.5.3", "qs": "^6.11.2", "url": "^0.11.3", - "vue": "3.3.4", - "vue-i18n": "9.5.0", + "vue": "3.3.7", + "vue-i18n": "9.6.0", "vue-json-pretty": "^2.2.4", "vue-router": "^4.2.5", "vue-types": "^5.1.1" }, "devDependencies": { - "@commitlint/cli": "^17.7.2", - "@commitlint/config-conventional": "^17.7.0", - "@iconify/json": "^2.2.128", + "@commitlint/cli": "^18.2.0", + "@commitlint/config-conventional": "^18.1.0", + "@iconify/json": "^2.2.133", "@intlify/unplugin-vue-i18n": "^1.4.0", "@purge-icons/generated": "^0.9.0", - "@types/fs-extra": "^11.0.2", - "@types/inquirer": "^9.0.4", - "@types/lodash-es": "^4.17.9", - "@types/node": "^20.8.6", - "@types/nprogress": "^0.2.1", - "@types/qrcode": "^1.5.2", - "@types/qs": "^6.9.8", - "@types/sortablejs": "^1.15.3", - "@typescript-eslint/eslint-plugin": "^6.7.5", - "@typescript-eslint/parser": "^6.7.5", - "@unocss/transformer-variant-group": "^0.56.5", + "@types/fs-extra": "^11.0.3", + "@types/inquirer": "^9.0.6", + "@types/lodash-es": "^4.17.10", + "@types/node": "^20.8.9", + "@types/nprogress": "^0.2.2", + "@types/qrcode": "^1.5.4", + "@types/qs": "^6.9.9", + "@types/sortablejs": "^1.15.4", + "@typescript-eslint/eslint-plugin": "^6.9.0", + "@typescript-eslint/parser": "^6.9.0", + "@unocss/transformer-variant-group": "^0.57.1", "@vitejs/plugin-legacy": "^4.1.1", "@vitejs/plugin-vue": "^4.4.0", "@vitejs/plugin-vue-jsx": "^3.0.2", "autoprefixer": "^10.4.16", "chalk": "^5.3.0", "consola": "^3.2.3", - "eslint": "^8.51.0", + "eslint": "^8.52.0", "eslint-config-prettier": "^9.0.0", "eslint-define-config": "^1.24.1", "eslint-plugin-prettier": "^5.0.1", - "eslint-plugin-vue": "^9.17.0", + "eslint-plugin-vue": "^9.18.0", "esno": "^0.17.0", "fs-extra": "^11.1.1", "husky": "^8.0.3", "inquirer": "^9.2.11", "less": "^4.2.0", - "lint-staged": "^14.0.1", + "lint-staged": "^15.0.2", "plop": "^4.0.0", "postcss": "^8.4.31", "postcss-html": "^1.5.0", "postcss-less": "^6.0.0", "prettier": "^3.0.3", "rimraf": "^5.0.5", - "rollup": "^4.0.2", - "stylelint": "^15.10.3", + "rollup": "^4.1.4", + "stylelint": "^15.11.0", "stylelint-config-html": "^1.1.0", "stylelint-config-recommended": "^13.0.0", "stylelint-config-standard": "^34.0.0", "stylelint-order": "^6.0.3", - "terser": "^5.21.0", + "terser": "^5.22.0", "typescript": "5.2.2", - "unocss": "^0.56.5", - "vite": "4.4.11", + "unocss": "^0.57.1", + "vite": "4.5.0", "vite-plugin-ejs": "^1.6.4", "vite-plugin-eslint": "^1.8.1", "vite-plugin-mock": "2.9.6", @@ -112,7 +112,7 @@ "vite-plugin-purge-icons": "^0.9.2", "vite-plugin-style-import": "2.0.0", "vite-plugin-svg-icons": "^2.0.1", - "vue-tsc": "^1.8.19" + "vue-tsc": "^1.8.22" }, "engines": { "node": ">= 16.13.0" From 7c1dee1bf6c47edaf81fd313d6232ddba90b5936 Mon Sep 17 00:00:00 2001 From: kailong321200875 <321200875@qq.com> Date: Fri, 27 Oct 2023 13:54:01 +0800 Subject: [PATCH 3/9] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.base | 4 ++-- .env.dev | 2 +- .env.gitee | 2 +- .env.pro | 2 +- .env.test | 2 +- src/config/axios/config.ts | 17 ----------------- src/config/axios/service.ts | 4 ++-- src/config/axios/types/index.ts | 6 ------ 8 files changed, 8 insertions(+), 31 deletions(-) diff --git a/.env.base b/.env.base index 799b9e1..e499588 100644 --- a/.env.base +++ b/.env.base @@ -2,10 +2,10 @@ NODE_ENV=development # 接口前缀 -VITE_API_BASE_PATH=base +VITE_API_BASE_PATH= # 打包路径 VITE_BASE_PATH=/ # 标题 -VITE_APP_TITLE=ElementAdmin +VITE_APP_TITLE=ElementAdmin \ No newline at end of file diff --git a/.env.dev b/.env.dev index b5b794e..afc3cee 100644 --- a/.env.dev +++ b/.env.dev @@ -2,7 +2,7 @@ NODE_ENV=production # 接口前缀 -VITE_API_BASE_PATH=dev +VITE_API_BASE_PATH= # 打包路径 VITE_BASE_PATH=/dist-dev/ diff --git a/.env.gitee b/.env.gitee index 412f1c4..9ac2a52 100644 --- a/.env.gitee +++ b/.env.gitee @@ -2,7 +2,7 @@ NODE_ENV=production # 接口前缀 -VITE_API_BASE_PATH=pro +VITE_API_BASE_PATH= # 打包路径 VITE_BASE_PATH=/vue-element-plus-admin/ diff --git a/.env.pro b/.env.pro index d21f25c..432fc46 100644 --- a/.env.pro +++ b/.env.pro @@ -2,7 +2,7 @@ NODE_ENV=production # 接口前缀 -VITE_API_BASE_PATH=pro +VITE_API_BASE_PATH= # 打包路径 VITE_BASE_PATH=/ diff --git a/.env.test b/.env.test index 00d8f8a..b6eb7d9 100644 --- a/.env.test +++ b/.env.test @@ -2,7 +2,7 @@ NODE_ENV=production # 接口前缀 -VITE_API_BASE_PATH=test +VITE_API_BASE_PATH= # 打包路径 VITE_BASE_PATH=/dist-test/ diff --git a/src/config/axios/config.ts b/src/config/axios/config.ts index fd75447..d0c1f0d 100644 --- a/src/config/axios/config.ts +++ b/src/config/axios/config.ts @@ -8,23 +8,6 @@ import { ElMessage } from 'element-plus' import qs from 'qs' const config: AxiosConfig = { - /** - * api请求基础路径 - */ - baseUrl: { - // 开发环境接口前缀 - base: '', - - // 打包开发环境接口前缀 - dev: '', - - // 打包生产环境接口前缀 - pro: '', - - // 打包测试环境接口前缀 - test: '' - }, - /** * 接口成功返回状态码 */ diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts index 01f31e3..b68fa70 100644 --- a/src/config/axios/service.ts +++ b/src/config/axios/service.ts @@ -4,8 +4,8 @@ import config, { defaultRequestInterceptors, defaultResponseInterceptors } from import { AxiosInstance, InternalAxiosRequestConfig, RequestConfig, AxiosResponse } from './types' import { ElMessage } from 'element-plus' -const { interceptors, baseUrl } = config -export const PATH_URL = baseUrl[import.meta.env.VITE_API_BASE_PATH] +const { interceptors } = config +export const PATH_URL = import.meta.env.VITE_API_BASE_PATH const { requestInterceptors, responseInterceptors } = interceptors diff --git a/src/config/axios/types/index.ts b/src/config/axios/types/index.ts index b900c17..471ce4e 100644 --- a/src/config/axios/types/index.ts +++ b/src/config/axios/types/index.ts @@ -16,12 +16,6 @@ interface RequestInterceptors { responseInterceptorsCatch?: (err: any) => any } interface AxiosConfig { - baseUrl: { - base: string - dev: string - pro: string - test: string - } code: number defaultHeaders: AxiosHeaders timeout: number From bd8210858126f945bad31b3f1e0416aa178afef1 Mon Sep 17 00:00:00 2001 From: kailong321200875 <321200875@qq.com> Date: Sat, 4 Nov 2023 09:50:29 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 2 +- src/styles/index.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 8bafd70..63f2f0d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "typescript.tsdk": "node_modules/typescript/lib", - "prettier.enable": false, + "prettier.enable": true, "editor.codeActionsOnSave": { "source.fixAll.eslint": true }, diff --git a/src/styles/index.less b/src/styles/index.less index cebb2c7..6825d70 100644 --- a/src/styles/index.less +++ b/src/styles/index.less @@ -4,4 +4,4 @@ // 解决抽屉弹出时，body宽度变化的问题 .el-popup-parent--hidden { width: 100% !important; -} \ No newline at end of file +} From 3477173b7649eb43a1e64c91135b0e657a3c7888 Mon Sep 17 00:00:00 2001 From: kailong321200875 <321200875@qq.com> Date: Sat, 4 Nov 2023 09:52:00 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=80=91=E5=B8=83?= =?UTF-8?q?=E6=B5=81=E7=A4=BA=E4=BE=8B=E5=9B=BE=E7=89=87=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Components/Waterfall.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/Components/Waterfall.vue b/src/views/Components/Waterfall.vue index 33b6d7e..c56f8f8 100644 --- a/src/views/Components/Waterfall.vue +++ b/src/views/Components/Waterfall.vue @@ -19,7 +19,8 @@ const getList = () => { width, height, id: toAnyString(), - image_uri: Mock.Random.image(`${width}x${height}`) + // http更换为https + image_uri: Mock.Random.image(`${width}x${height}`).replace('http://', 'https://') }) ) } From 82eb7f16ad3f663be602a747b55a78f6b986da30 Mon Sep 17 00:00:00 2001 From: kailong321200875 <321200875@qq.com> Date: Sun, 5 Nov 2023 09:07:15 +0800 Subject: [PATCH 6/9] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=80=91?= =?UTF-8?q?=E5=B8=83=E6=B5=81=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Waterfall/src/Waterfall.vue | 153 ++++++++++++++++----- 1 file changed, 115 insertions(+), 38 deletions(-) diff --git a/src/components/Waterfall/src/Waterfall.vue b/src/components/Waterfall/src/Waterfall.vue index ae648c1..32a0aa7 100644 --- a/src/components/Waterfall/src/Waterfall.vue +++ b/src/components/Waterfall/src/Waterfall.vue @@ -20,10 +20,13 @@ const prop = defineProps({ src: 'src', height: 'height' }), + cols: propTypes.number.def(undefined), loadingText: propTypes.string.def('加载中...'), loading: propTypes.bool.def(false), end: propTypes.bool.def(false), - endText: propTypes.string.def('没有更多了') + endText: propTypes.string.def('没有更多了'), + autoCenter: propTypes.bool.def(true), + layout: propTypes.oneOf(['javascript', 'flex']).def('flex') }) const wrapEl = ref() @@ -37,7 +40,7 @@ const wrapWidth = ref(0) const loadMore = ref() // 首先确定列数 = 页面宽度 / 图片宽度 -const cols = ref(0) +const innerCols = ref(0) const filterData = ref([]) @@ -49,11 +52,11 @@ const filterWaterfall = async () => { const container = unref(wrapEl) as HTMLElement if (!container) return - cols.value = Math.floor(container.clientWidth / (width + gap)) + innerCols.value = prop.cols ?? Math.floor(container.clientWidth / (width + gap)) const length = data.length for (let i = 0; i < length; i++) { - if (i < unref(cols)) { + if (i < unref(innerCols)) { heights.value[i] = data[i][props.height as string] filterData.value.push({ ...data[i], @@ -66,7 +69,7 @@ const filterWaterfall = async () => { let minHeight = heights.value[0] let index = 0 // 找出最小高度 - for (let j = 1; j < unref(cols); j++) { + for (let j = 1; j < unref(innerCols); j++) { if (unref(heights)[j] < minHeight) { minHeight = unref(heights)[j] index = j @@ -83,14 +86,42 @@ const filterWaterfall = async () => { } } wrapHeight.value = Math.max(...unref(heights)) - wrapWidth.value = unref(cols) * (width + gap) - gap + wrapWidth.value = unref(innerCols) * (width + gap) - gap +} + +const flexWaterfall = async () => { + const { width, gap } = prop + const data = prop.data as any[] + await nextTick() + + const container = unref(wrapEl) as HTMLElement + if (!container) return + innerCols.value = prop.cols ?? Math.floor(container.clientWidth / (width + gap)) + + const length = data.length + // 根据列数，创建数组 + const arr = new Array(unref(innerCols)).fill([]) + // 循环data，依次插入到arr中 + for (let i = 0; i < length; i++) { + const index = i % unref(innerCols) + arr[index] = [...arr[index], data[i]] + } + filterData.value = arr +} + +const initLayout = () => { + const { layout } = prop + if (layout === 'javascript') { + filterWaterfall() + } else if (layout === 'flex') { + flexWaterfall() + } } watch( - () => prop.data, - async () => { - await nextTick() - filterWaterfall() + () => [prop.data, prop.cols], + () => { + initLayout() }, { immediate: true @@ -99,7 +130,7 @@ watch( onMounted(() => { if (unref(prop.reset)) { - useEventListener(window, 'resize', debounce(filterWaterfall, 300)) + useEventListener(window, 'resize', debounce(initLayout, 300)) } useIntersectionObserver( unref(loadMore), @@ -117,41 +148,87 @@ onMounted(() => { From 2772613748399b88abf875d8f2295c1e6b7b92fe Mon Sep 17 00:00:00 2001 From: kailong321200875 <321200875@qq.com> Date: Wed, 8 Nov 2023 15:03:46 +0800 Subject: [PATCH 7/9] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 05f9ec5..27aab3b 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "driver.js": "^1.3.0", "echarts": "^5.4.3", "echarts-wordcloud": "^2.1.0", - "element-plus": "^2.4.1", + "element-plus": "^2.4.2", "lodash-es": "^4.17.21", "mitt": "^3.0.1", "mockjs": "^1.1.0", @@ -49,8 +49,8 @@ "qrcode": "^1.5.3", "qs": "^6.11.2", "url": "^0.11.3", - "vue": "3.3.7", - "vue-i18n": "9.6.0", + "vue": "3.3.8", + "vue-i18n": "9.6.5", "vue-json-pretty": "^2.2.4", "vue-router": "^4.2.5", "vue-types": "^5.1.1" @@ -58,35 +58,35 @@ "devDependencies": { "@commitlint/cli": "^18.2.0", "@commitlint/config-conventional": "^18.1.0", - "@iconify/json": "^2.2.133", - "@intlify/unplugin-vue-i18n": "^1.4.0", + "@iconify/json": "^2.2.138", + "@intlify/unplugin-vue-i18n": "^1.5.0", "@purge-icons/generated": "^0.9.0", - "@types/fs-extra": "^11.0.3", - "@types/inquirer": "^9.0.6", - "@types/lodash-es": "^4.17.10", - "@types/node": "^20.8.9", - "@types/nprogress": "^0.2.2", - "@types/qrcode": "^1.5.4", - "@types/qs": "^6.9.9", - "@types/sortablejs": "^1.15.4", - "@typescript-eslint/eslint-plugin": "^6.9.0", - "@typescript-eslint/parser": "^6.9.0", - "@unocss/transformer-variant-group": "^0.57.1", + "@types/fs-extra": "^11.0.4", + "@types/inquirer": "^9.0.7", + "@types/lodash-es": "^4.17.11", + "@types/node": "^20.9.0", + "@types/nprogress": "^0.2.3", + "@types/qrcode": "^1.5.5", + "@types/qs": "^6.9.10", + "@types/sortablejs": "^1.15.5", + "@typescript-eslint/eslint-plugin": "^6.10.0", + "@typescript-eslint/parser": "^6.10.0", + "@unocss/transformer-variant-group": "^0.57.2", "@vitejs/plugin-legacy": "^4.1.1", "@vitejs/plugin-vue": "^4.4.0", "@vitejs/plugin-vue-jsx": "^3.0.2", "autoprefixer": "^10.4.16", "chalk": "^5.3.0", "consola": "^3.2.3", - "eslint": "^8.52.0", + "eslint": "^8.53.0", "eslint-config-prettier": "^9.0.0", "eslint-define-config": "^1.24.1", "eslint-plugin-prettier": "^5.0.1", - "eslint-plugin-vue": "^9.18.0", + "eslint-plugin-vue": "^9.18.1", "esno": "^0.17.0", "fs-extra": "^11.1.1", "husky": "^8.0.3", - "inquirer": "^9.2.11", + "inquirer": "^9.2.12", "less": "^4.2.0", "lint-staged": "^15.0.2", "plop": "^4.0.0", @@ -95,15 +95,15 @@ "postcss-less": "^6.0.0", "prettier": "^3.0.3", "rimraf": "^5.0.5", - "rollup": "^4.1.4", + "rollup": "^4.3.0", "stylelint": "^15.11.0", "stylelint-config-html": "^1.1.0", "stylelint-config-recommended": "^13.0.0", "stylelint-config-standard": "^34.0.0", "stylelint-order": "^6.0.3", - "terser": "^5.22.0", + "terser": "^5.24.0", "typescript": "5.2.2", - "unocss": "^0.57.1", + "unocss": "^0.57.2", "vite": "4.5.0", "vite-plugin-ejs": "^1.6.4", "vite-plugin-eslint": "^1.8.1", From 92d436b8bb95c94831fcfe30678d384c3debc052 Mon Sep 17 00:00:00 2001 From: kailong321200875 <321200875@qq.com> Date: Wed, 8 Nov 2023 15:24:56 +0800 Subject: [PATCH 8/9] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 2 +- src/views/Authorization/Department/Department.vue | 6 +----- .../Authorization/Department/components/Write.vue | 4 +--- src/views/Authorization/Role/Role.vue | 4 ---- src/views/Authorization/Role/components/Write.vue | 5 ----- src/views/Authorization/User/User.vue | 13 +++++++++++-- src/views/Authorization/User/components/Write.vue | 5 +---- uno.config.ts | 11 +++++++++++ 8 files changed, 26 insertions(+), 24 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 63f2f0d..f0e4b08 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,7 +5,7 @@ "source.fixAll.eslint": true }, "[vue]": { - "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" + "editor.defaultFormatter": "esbenp.prettier-vscode" }, "i18n-ally.localesPaths": ["src/locales"], "i18n-ally.keystyle": "nested", diff --git a/src/views/Authorization/Department/Department.vue b/src/views/Authorization/Department/Department.vue index 6d52381..4d15138 100644 --- a/src/views/Authorization/Department/Department.vue +++ b/src/views/Authorization/Department/Department.vue @@ -166,11 +166,7 @@ const crudSchemas = reactive([ hidden: true }, form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'YYYY-MM-DD HH:mm:ss' - } + hidden: true } }, { diff --git a/src/views/Authorization/Department/components/Write.vue b/src/views/Authorization/Department/components/Write.vue index 512e651..2c3c527 100644 --- a/src/views/Authorization/Department/components/Write.vue +++ b/src/views/Authorization/Department/components/Write.vue @@ -20,9 +20,7 @@ const props = defineProps({ const rules = reactive({ id: [required()], - status: [required()], - createTime: [required()], - remark: [required()] + status: [required()] }) const { formRegister, formMethods } = useForm() diff --git a/src/views/Authorization/Role/Role.vue b/src/views/Authorization/Role/Role.vue index 42a7923..a3c974f 100644 --- a/src/views/Authorization/Role/Role.vue +++ b/src/views/Authorization/Role/Role.vue @@ -36,10 +36,6 @@ const tableColumns = reactive([ field: 'roleName', label: t('role.roleName') }, - { - field: 'role', - label: t('role.role') - }, { field: 'status', label: t('menu.status'), diff --git a/src/views/Authorization/Role/components/Write.vue b/src/views/Authorization/Role/components/Write.vue index fddd811..8550fc0 100644 --- a/src/views/Authorization/Role/components/Write.vue +++ b/src/views/Authorization/Role/components/Write.vue @@ -28,11 +28,6 @@ const formSchema = ref([ label: t('role.roleName'), component: 'Input' }, - { - field: 'role', - label: t('role.role'), - component: 'Input' - }, { field: 'status', label: t('menu.status'), diff --git a/src/views/Authorization/User/User.vue b/src/views/Authorization/User/User.vue index 1077fe0..e512114 100644 --- a/src/views/Authorization/User/User.vue +++ b/src/views/Authorization/User/User.vue @@ -276,7 +276,7 @@ const save = async () => {