From b683825beba646b21a56bbedc9e6424de2e224af Mon Sep 17 00:00:00 2001 From: zsen hu Date: Sun, 26 Sep 2021 12:16:46 +0800 Subject: [PATCH 1/3] V2 --- package-lock.json | 39 ++-- package.json | 4 +- src/App.vue | 24 ++- src/assets/style/element-variables.scss | 12 +- src/components/SelectTree/Select.vue | 202 ++++++++++++++++++ src/components/SelectTree/Tree.vue | 130 +++++++++++ src/components/SelectTree/index.vue | 145 +++++++++++++ ...defaultSettings.js => default-settings.js} | 4 +- src/global-components.js | 38 ++-- src/hooks/useCloseTag.js | 69 ++++++ src/layout/components/Tagsbar/index.vue | 8 +- src/layout/components/Topbar/Userinfo.vue | 4 +- src/layout/index.vue | 8 +- src/permission.js | 23 +- src/router/modules/error.js | 12 +- src/store/modules/app.js | 6 +- src/store/modules/layoutSettings.js | 4 +- src/store/modules/tags.js | 9 +- src/utils/request.js | 20 +- src/views/test/Add.vue | 109 +++++++++- src/views/test/Edit.vue | 22 +- vite.config.js | 3 +- 升级.txt | 12 ++ 23 files changed, 831 insertions(+), 76 deletions(-) create mode 100644 src/components/SelectTree/Select.vue create mode 100644 src/components/SelectTree/Tree.vue create mode 100644 src/components/SelectTree/index.vue rename src/{defaultSettings.js => default-settings.js} (96%) create mode 100644 src/hooks/useCloseTag.js create mode 100644 升级.txt diff --git a/package-lock.json b/package-lock.json index 530b0bf..78cd1c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -553,6 +553,12 @@ } } }, + "@element-plus/icons": { + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/@element-plus/icons/-/icons-0.0.11.tgz", + "integrity": "sha512-iKQXSxXu131Ai+I9Ymtcof9WId7kaXvB1+WRfAfpQCW7UiAMYgdNDqb/u0hgTo2Yq3MwC4MWJnNuTBEpG8r7+A==", + "dev": true + }, "@eslint/eslintrc": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz", @@ -610,9 +616,9 @@ } }, "@popperjs/core": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.1.tgz", - "integrity": "sha512-DvJbbn3dUgMxDnJLH+RZQPnXak1h4ZVYQ7CWiFWjQwBFkVajT4rfw2PdpHLTSTwxrYfnoEXkuBiwkDm6tPMQeA==", + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.1.tgz", + "integrity": "sha512-HnUhk1Sy9IuKrxEMdIRCxpIqPw6BFsbYSEUO9p/hNw5sMld/+3OLMWQP80F8/db9qsv3qUjs7ZR5bS/R+iinXw==", "dev": true }, "@rollup/plugin-node-resolve": { @@ -954,9 +960,9 @@ "dev": true }, "async-validator": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-3.5.1.tgz", - "integrity": "sha512-DDmKA7sdSAJtTVeNZHrnr2yojfFaoeW8MfQN8CeuXg8DDQHTqKk9Fdv38dSvnesHoO8MUwMI2HphOeSyIF+wmQ==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-3.5.2.tgz", + "integrity": "sha512-8eLCg00W9pIRZSB781UUX/H6Oskmm8xloZfr09lz5bikRpBVDlJ3hRVuxxP1SxcwsEYfJ4IU8Q19Y8/893r3rQ==", "dev": true }, "at-least-node": { @@ -1540,9 +1546,9 @@ "dev": true }, "dayjs": { - "version": "1.10.4", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz", - "integrity": "sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw==", + "version": "1.10.7", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz", + "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==", "dev": true }, "debug": { @@ -1751,11 +1757,12 @@ "dev": true }, "element-plus": { - "version": "1.0.2-beta.35", - "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.0.2-beta.35.tgz", - "integrity": "sha512-T12EfxbWoNOrWE2bzXFPJdOU3cl4YWuLwxE5QKM40oPw1VYPMRrRB8Uy5TwF8h3itxzsJQ5iFj2rdDO+q3Jcdg==", + "version": "1.0.2-beta.71", + "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.0.2-beta.71.tgz", + "integrity": "sha512-tlfbRORIav8gJcIpjZI5F6aJIVHIaDuGO6/vKu43lgYq4JS2JPNRTjvrSE2p4f5xLfaFNfOWjCS3sybXLfMg8g==", "dev": true, "requires": { + "@element-plus/icons": "^0.0.11", "@popperjs/core": "^2.4.4", "async-validator": "^3.4.0", "dayjs": "1.x", @@ -4773,12 +4780,12 @@ "dev": true }, "sass": { - "version": "1.32.8", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz", - "integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==", + "version": "1.41.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.41.1.tgz", + "integrity": "sha512-vIjX7izRxw3Wsiez7SX7D+j76v7tenfO18P59nonjr/nzCkZuoHuF7I/Fo0ZRZPKr88v29ivIdE9BqGDgQD/Nw==", "dev": true, "requires": { - "chokidar": ">=2.0.0 <4.0.0" + "chokidar": ">=3.0.0 <4.0.0" } }, "semver": { diff --git a/package.json b/package.json index 9e2626e..0788945 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "autoprefixer": "^10.2.5", "babel-eslint": "^10.1.0", "crypto-js": "^4.0.0", - "element-plus": "^1.0.2-beta.35", + "element-plus": "^1.0.2-beta.71", "eslint": "^6.7.2", "eslint-plugin-prettier": "^3.1.3", "eslint-plugin-vue": "^7.0.0-0", @@ -41,7 +41,7 @@ "lint-staged": "^9.5.0", "mockjs": "^1.1.0", "prettier": "^1.19.1", - "sass": "^1.32.8", + "sass": "^1.41.1", "vite": "^2.1.0", "vite-plugin-mock": "^2.3.0", "vite-plugin-svg-icons": "^0.4.0" diff --git a/src/App.vue b/src/App.vue index 58957bb..24635d0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -24,7 +24,7 @@ * @version: * @Date: 2021-04-20 11:06:21 * @LastEditors: huzhushan@126.com - * @LastEditTime: 2021-07-23 17:26:35 + * @LastEditTime: 2021-09-18 13:17:44 * @Author: huzhushan@126.com * @HomePage: https://huzhushan.gitee.io/vue3-element-admin * @Github: https://github.com/huzhushan/vue3-element-admin @@ -32,9 +32,29 @@ --> + + diff --git a/src/components/SelectTree/Tree.vue b/src/components/SelectTree/Tree.vue new file mode 100644 index 0000000..fa88791 --- /dev/null +++ b/src/components/SelectTree/Tree.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue new file mode 100644 index 0000000..07360c3 --- /dev/null +++ b/src/components/SelectTree/index.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/defaultSettings.js b/src/default-settings.js similarity index 96% rename from src/defaultSettings.js rename to src/default-settings.js index 069b484..a2d173c 100644 --- a/src/defaultSettings.js +++ b/src/default-settings.js @@ -44,7 +44,7 @@ * @version: * @Date: 2021-07-22 17:22:14 * @LastEditors: huzhushan@126.com - * @LastEditTime: 2021-07-23 14:44:42 + * @LastEditTime: 2021-09-18 15:02:01 * @Author: huzhushan@126.com * @HomePage: https://huzhushan.gitee.io/vue3-element-admin * @Github: https://github.com/huzhushan/vue3-element-admin @@ -53,6 +53,8 @@ export default { menus: { + // 菜单栏是否显示 + isShow: true, // 菜单栏排列方式 mode: 'vertical', // horizontal: 水平排列 vertical: 垂直排列 }, diff --git a/src/global-components.js b/src/global-components.js index 7c94d14..0418288 100644 --- a/src/global-components.js +++ b/src/global-components.js @@ -1,33 +1,20 @@ /* - * _______________#########_______________________ - * ______________############_____________________ - * ______________#############____________________ - * _____________##__###########___________________ - * ____________###__######_#####__________________ - * ____________###_#######___####_________________ - * ___________###__##########_####________________ - * __________####__###########_####_______________ - * ________#####___###########__#####_____________ - * _______######___###_########___#####___________ - * _______#####___###___########___######_________ - * ______######___###__###########___######_______ - * _____######___####_##############__######______ - * ____#######__#####################_#######_____ - * ____#######__##############################____ - * ___#######__######_#################_#######___ - * ___#######__######_######_#########___######___ - * ___#######____##__######___######_____######___ - * ___#######________######____#####_____#####____ - * ____######________#####_____#####_____####_____ - * _____#####________####______#####_____###______ - * ______#####______;###________###______#________ - * ________##_______####________####______________ + * 江城子 . 程序员之歌 + * + * 十年生死两茫茫，写程序，到天亮。 + * 千行代码，Bug何处藏。 + * 纵使上线又怎样，朝令改，夕断肠。 + * + * 领导每天新想法，天天改，日日忙。 + * 相顾无言，惟有泪千行。 + * 每晚灯火阑珊处，夜难寐，加班狂。 + * * * @Descripttion: * @version: - * @Date: 2021-04-20 11:06:21 + * @Date: 2021-09-18 09:32:01 * @LastEditors: huzhushan@126.com - * @LastEditTime: 2021-04-21 12:48:53 + * @LastEditTime: 2021-09-18 17:54:29 * @Author: huzhushan@126.com * @HomePage: https://huzhushan.gitee.io/vue3-element-admin * @Github: https://github.com/huzhushan/vue3-element-admin @@ -36,3 +23,4 @@ export { default as SvgIcon } from '@/components/SvgIcon/index.vue' export { default as ProTable } from '@/components/ProTable/index.vue' +export { default as ElSelectTree } from '@/components/SelectTree/index.vue' diff --git a/src/hooks/useCloseTag.js b/src/hooks/useCloseTag.js new file mode 100644 index 0000000..46158bc --- /dev/null +++ b/src/hooks/useCloseTag.js @@ -0,0 +1,69 @@ +/* + * + * 　　┏┓　　　┏┓+ + + * 　┏┛┻━━━┛┻┓ + + + * 　┃　　　　　　　┃ + * 　┃　　　━　　　┃ ++ + + + + * ████━████ ┃+ + * 　┃　　　　　　　┃ + + * 　┃　　　┻　　　┃ + * 　┃　　　　　　　┃ + + + * 　┗━┓　　　┏━┛ + * 　　　┃　　　┃ + * 　　　┃　　　┃ + + + + + * 　　　┃　　　┃ + * 　　　┃　　　┃ + 神兽保佑 + * 　　　┃　　　┃ 代码无bug + * 　　　┃　　　┃　　+ + * 　　　┃　 　　┗━━━┓ + + + * 　　　┃ 　　　　　　　┣┓ + * 　　　┃ 　　　　　　　┏┛ + * 　　　┗┓┓┏━┳┓┏┛ + + + + + * 　　　　┃┫┫　┃┫┫ + * 　　　　┗┻┛　┗┻┛+ + + + + * + * + * @Descripttion: + * @version: + * @Date: 2021-08-20 11:15:27 + * @LastEditors: huzhushan@126.com + * @LastEditTime: 2021-09-18 17:25:32 + * @Author: huzhushan@126.com + * @HomePage: https://huzhushan.gitee.io/vue3-element-admin + * @Github: https://github.com/huzhushan/vue3-element-admin + * @Donate: https://huzhushan.gitee.io/vue3-element-admin/donate/ + */ + +import { reactive, toRefs, getCurrentInstance } from 'vue' +import { useRoute, useRouter } from 'vue-router' +import { useStore } from 'vuex' + +// 关闭当前标签 +export default () => { + const instance = getCurrentInstance() + const store = useStore() + const router = useRouter() + const route = useRoute() + const state = reactive({ + /** + * @param {String} fullPath 要跳转到那个页面的地址 + * @param {Boolean} reload 是否在跳转后重新渲染页面组件 + * @param {Boolean} f5 是否在跳转后刷新页面 + * @return {*} + */ + closeTag({ fullPath, reload, f5 } = {}) { + store.dispatch('tags/delTag', route) + fullPath ? router.push(fullPath) : router.back() + reload && + setTimeout(() => { + instance.appContext.config.globalProperties.$tagsbar.refreshSelectedTag( + route + ) + }, 500) + + f5 && setTimeout(() => window.location.reload(), 500) + }, + }) + + return toRefs(state) +} diff --git a/src/layout/components/Tagsbar/index.vue b/src/layout/components/Tagsbar/index.vue index 4dc8720..1227be0 100644 --- a/src/layout/components/Tagsbar/index.vue +++ b/src/layout/components/Tagsbar/index.vue @@ -13,7 +13,7 @@ * @version: * @Date: 2021-04-20 11:06:21 * @LastEditors: huzhushan@126.com - * @LastEditTime: 2021-07-23 16:48:37 + * @LastEditTime: 2021-09-18 17:50:46 * @Author: huzhushan@126.com * @HomePage: https://huzhushan.gitee.io/vue3-element-admin * @Github: https://github.com/huzhushan/vue3-element-admin @@ -68,13 +68,17 @@ diff --git a/src/views/test/Edit.vue b/src/views/test/Edit.vue index cc559d8..47026bd 100644 --- a/src/views/test/Edit.vue +++ b/src/views/test/Edit.vue @@ -27,7 +27,7 @@ * @version: * @Date: 2021-04-28 16:50:05 * @LastEditors: huzhushan@126.com - * @LastEditTime: 2021-04-28 16:50:41 + * @LastEditTime: 2021-09-18 17:51:25 * @Author: huzhushan@126.com * @HomePage: https://huzhushan.gitee.io/vue3-element-admin * @Github: https://github.com/huzhushan/vue3-element-admin @@ -36,4 +36,24 @@ + diff --git a/vite.config.js b/vite.config.js index cc1ef9d..bd064c8 100644 --- a/vite.config.js +++ b/vite.config.js @@ -14,7 +14,7 @@ * @version: * @Date: 2021-04-20 11:06:21 * @LastEditors: huzhushan@126.com - * @LastEditTime: 2021-04-22 09:28:15 + * @LastEditTime: 2021-09-18 15:09:15 * @Author: huzhushan@126.com * @HomePage: https://huzhushan.gitee.io/vue3-element-admin * @Github: https://github.com/huzhushan/vue3-element-admin @@ -76,6 +76,7 @@ export default env => { '/api': { target: 'http://dev.api.xxx.com', // 后端接口的域名 changeOrigin: true, + rewrite: path => path.replace(/^\/api/, ''), }, }, }, diff --git a/升级.txt b/升级.txt new file mode 100644 index 0000000..ab5f997 --- /dev/null +++ b/升级.txt @@ -0,0 +1,12 @@ +升级element-plus +升级sass +更新App.vue国际化配置 +defaultSettings：重命名、增加menus.isShow +permission.js增加loading +permission.js增加404页面白名单 +permission.js删除所有动态路由 +退出的时候清空标签栏和menus +tags增加清空标签栏的mutations +404页面路由修改 +增加公共hooks +增加树形下拉组件 \ No newline at end of file From f08fac197af35261e6a8ca09cb75bd0a66697761 Mon Sep 17 00:00:00 2001 From: zsen hu Date: Wed, 29 Sep 2021 10:35:07 +0800 Subject: [PATCH 2/3] update --- jsconfig.json | 10 +++++++ src/directive/index.js | 53 ++++++++++++++++++++++++++++++++++++ src/main.js | 6 +++- src/permission.js | 24 ++++++++-------- src/store/modules/account.js | 3 +- 升级.txt | 4 +-- 6 files changed, 85 insertions(+), 15 deletions(-) create mode 100644 jsconfig.json create mode 100644 src/directive/index.js diff --git a/jsconfig.json b/jsconfig.json new file mode 100644 index 0000000..e3bd4a8 --- /dev/null +++ b/jsconfig.json @@ -0,0 +1,10 @@ +{ + "compilerOptions": { + "baseUrl": "./", + "paths": { + "@/*": ["src/*"], + } + }, + "exclude": ["node_modules", "dist"], + "include": ["src/**/*"] +} \ No newline at end of file diff --git a/src/directive/index.js b/src/directive/index.js new file mode 100644 index 0000000..21b54e2 --- /dev/null +++ b/src/directive/index.js @@ -0,0 +1,53 @@ +/* + * + * 　　┏┓　　　┏┓+ + + * 　┏┛┻━━━┛┻┓ + + + * 　┃　　　　　　　┃ + * 　┃　　　━　　　┃ ++ + + + + * ████━████ ┃+ + * 　┃　　　　　　　┃ + + * 　┃　　　┻　　　┃ + * 　┃　　　　　　　┃ + + + * 　┗━┓　　　┏━┛ + * 　　　┃　　　┃ + * 　　　┃　　　┃ + + + + + * 　　　┃　　　┃ + * 　　　┃　　　┃ + 神兽保佑 + * 　　　┃　　　┃ 代码无bug + * 　　　┃　　　┃　　+ + * 　　　┃　 　　┗━━━┓ + + + * 　　　┃ 　　　　　　　┣┓ + * 　　　┃ 　　　　　　　┏┛ + * 　　　┗┓┓┏━┳┓┏┛ + + + + + * 　　　　┃┫┫　┃┫┫ + * 　　　　┗┻┛　┗┻┛+ + + + + * + * + * @Descripttion: + * @version: + * @Date: 2021-09-01 13:58:08 + * @LastEditors: huzhushan@126.com + * @LastEditTime: 2021-09-29 10:10:32 + * @Author: huzhushan@126.com + * @HomePage: https://huzhushan.gitee.io/vue3-element-admin + * @Github: https://github.com/huzhushan/vue3-element-admin + * @Donate: https://huzhushan.gitee.io/vue3-element-admin/donate/ + */ + +import store from '@/store' + +export const Permission = app => { + app.directive('permission', { + mounted: function(el, binding) { + const permissionList = store.state.account.permissionList || [] + + if ( + binding.value && + permissionList.every(item => item !== binding.value) + ) { + // 移除组件 + el.parentNode.removeChild(el) + } + }, + }) +} diff --git a/src/main.js b/src/main.js index 5bc5ebd..8cc2ba0 100644 --- a/src/main.js +++ b/src/main.js @@ -27,7 +27,7 @@ * @version: * @Date: 2021-04-20 11:06:21 * @LastEditors: huzhushan@126.com - * @LastEditTime: 2021-07-23 16:50:08 + * @LastEditTime: 2021-09-29 10:08:00 * @Author: huzhushan@126.com * @HomePage: https://huzhushan.gitee.io/vue3-element-admin * @Github: https://github.com/huzhushan/vue3-element-admin @@ -64,6 +64,10 @@ Object.entries(Components).forEach(([key, component]) => { app.component(key, component) }) +// 注册自定义指令 +import * as Directives from '@/directive' +Object.values(Directives).forEach(fn => fn(app)) + // 错误日志 import useErrorHandler from './error-log' useErrorHandler(app) diff --git a/src/permission.js b/src/permission.js index e0f0b06..b5e80ea 100644 --- a/src/permission.js +++ b/src/permission.js @@ -26,7 +26,7 @@ * @version: * @Date: 2021-04-20 11:06:21 * @LastEditors: huzhushan@126.com - * @LastEditTime: 2021-09-18 17:43:01 + * @LastEditTime: 2021-09-29 09:47:46 * @Author: huzhushan@126.com * @HomePage: https://huzhushan.gitee.io/vue3-element-admin * @Github: https://github.com/huzhushan/vue3-element-admin @@ -68,16 +68,17 @@ router.beforeEach(async to => { // 获取用户角色信息，根据角色判断权限 let userinfo = store.state.account.userinfo if (!userinfo) { + const loadingInstance = ElLoading.service({ + lock: true, + text: '正在加载数据，请稍候~', + background: 'rgba(0, 0, 0, 0.7)', + }) try { - const loadingInstance = ElLoading.service({ - lock: true, - text: '正在加载数据，请稍候~', - background: 'rgba(0, 0, 0, 0.7)', - }) // 获取用户信息 userinfo = await store.dispatch('account/getUserinfo') loadingInstance.close() } catch (err) { + loadingInstance.close() return false } @@ -90,16 +91,17 @@ router.beforeEach(async to => { // 生成菜单（如果你的项目有动态菜单，在此处会添加动态路由） if (store.state.menu.menus.length <= 0) { + const loadingInstance = ElLoading.service({ + lock: true, + text: '正在加载数据，请稍候~', + background: 'rgba(0, 0, 0, 0.7)', + }) try { - const loadingInstance = ElLoading.service({ - lock: true, - text: '正在加载数据，请稍候~', - background: 'rgba(0, 0, 0, 0.7)', - }) await store.dispatch('menu/generateMenus', userinfo) loadingInstance.close() return to.fullPath // 添加动态路由后，必须加这一句触发重定向，否则会404 } catch (err) { + loadingInstance.close() return false } } diff --git a/src/store/modules/account.js b/src/store/modules/account.js index d536e76..da20159 100644 --- a/src/store/modules/account.js +++ b/src/store/modules/account.js @@ -3,7 +3,7 @@ * @version: * @Date: 2021-04-20 11:06:21 * @LastEditors: huzhushan@126.com - * @LastEditTime: 2021-04-21 09:34:04 + * @LastEditTime: 2021-09-29 10:10:14 * @Author: huzhushan@126.com * @HomePage: https://huzhushan.gitee.io/vue3-element-admin * @Github: https://github.com/huzhushan/vue3-element-admin @@ -15,6 +15,7 @@ export default { namespaced: true, state: { userinfo: null, + permissionList: [], }, mutations: { // 保存用户信息 diff --git a/升级.txt b/升级.txt index ab5f997..e30810e 100644 --- a/升级.txt +++ b/升级.txt @@ -3,10 +3,10 @@ 更新App.vue国际化配置 defaultSettings：重命名、增加menus.isShow permission.js增加loading -permission.js增加404页面白名单 permission.js删除所有动态路由 退出的时候清空标签栏和menus tags增加清空标签栏的mutations 404页面路由修改 增加公共hooks -增加树形下拉组件 \ No newline at end of file +增加树形下拉组件 +增加(按钮、组件等)权限控制自定义指令 \ No newline at end of file From 094899bc128164781e3e3f7d5214336f892ac2e9 Mon Sep 17 00:00:00 2001 From: zsen hu Date: Wed, 29 Sep 2021 15:09:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ProTable=E7=BB=84=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=E6=90=9C=E7=B4=A2=E8=A1=A8?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ProTable/index.vue | 49 +++++++++++++++++++------------ 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/src/components/ProTable/index.vue b/src/components/ProTable/index.vue index 57acf89..8186039 100644 --- a/src/components/ProTable/index.vue +++ b/src/components/ProTable/index.vue @@ -22,7 +22,7 @@ * @version: * @Date: 2021-04-20 11:06:21 * @LastEditors: huzhushan@126.com - * @LastEditTime: 2021-04-21 12:45:46 + * @LastEditTime: 2021-09-29 15:04:03 * @Author: huzhushan@126.com * @HomePage: https://huzhushan.gitee.io/vue3-element-admin * @Github: https://github.com/huzhushan/vue3-element-admin @@ -38,7 +38,7 @@ class="search" :model="searchModel" :inline="true" - label-position="left" + label-position="right" :label-width="search.labelWidth" ref="searchForm" > @@ -48,8 +48,9 @@ :label="item.label" :prop="item.name" > +