From e3a5893411ee31f8bd34b337055b09cdd656d8f4 Mon Sep 17 00:00:00 2001 From: bqy_fe <1743369777@qq.com> Date: Wed, 15 Dec 2021 10:22:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=E4=BF=AE=E5=A4=8D=E6=9F=90?= =?UTF-8?q?=E4=BA=9B=E6=9D=83=E9=99=90=E7=A0=81=E4=BC=A0=E5=8F=82=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 +- package.json | 2 +- src/core/permission/utils.ts | 2 +- src/views/system/permission/menu/columns.tsx | 2 +- src/views/system/permission/menu/index.vue | 4 +- src/views/system/permission/role/index.vue | 4 +- src/views/system/permission/user/columns.tsx | 4 +- src/views/system/permission/user/index.vue | 30 +- yarn.lock | 1085 +++++++++--------- 9 files changed, 580 insertions(+), 565 deletions(-) diff --git a/README.md b/README.md index 64a7a039d..41475d923 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ - [swagger 文档](http://buqiyuan.site:7001/swagger-api/static/index.html#/) - [后台地址](https://github.com/buqiyuan/nest-admin) - [react 版 coding](https://github.com/buqiyuan/react-antd-admin) -- [vite 踩坑版](https://github.com/buqiyuan/vite-vue3-admin) +- [vite 版](https://github.com/buqiyuan/vite-vue3-admin) - [gitee 地址](https://gitee.com/buqiyuan/vue3-antd-admin) ## vscode 配置 @@ -22,6 +22,14 @@ `rootadmin` 默认开放多点登录，其他新建的账号默认都是单点登录。建议自己拉后端代码到本地跑，避免多人同时操作时产生冲突和误解。 +### todolist + +- [x] 动态表格(完善中) +- [x] 动态表单(完善中) +- [ ] 电商 SKU 功能演示 +- [ ] 纯前端导出 PDF 动态分页 +- [ ] 其他... + ## Project setup ```shell @@ -30,7 +38,7 @@ yarn install yarn --frozen-lockfile ``` -## 捐赠 +## 赞赏 如果你觉得这个项目对你有帮助，你可以帮作者买一杯咖啡表示支持! diff --git a/package.json b/package.json index 95a153ac6..5264b516f 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@commitlint/cli": "^15.0.0", "@commitlint/config-conventional": "^15.0.0", "@types/lodash": "^4.14.178", - "@types/node": "^16.11.12", + "@types/node": "^16.11.13", "@types/webpack-env": "^1.16.3", "@typescript-eslint/eslint-plugin": "^5.7.0", "@typescript-eslint/parser": "^5.7.0", diff --git a/src/core/permission/utils.ts b/src/core/permission/utils.ts index 7cbcae996..55aa32476 100644 --- a/src/core/permission/utils.ts +++ b/src/core/permission/utils.ts @@ -1,6 +1,6 @@ import type { TreeDataItem as ATreeDataItem } from 'ant-design-vue/lib/tree/Tree'; -interface TreeDataItem extends ATreeDataItem { +export interface TreeDataItem extends ATreeDataItem { children: any; } diff --git a/src/views/system/permission/menu/columns.tsx b/src/views/system/permission/menu/columns.tsx index 8ac28edea..424be8333 100644 --- a/src/views/system/permission/menu/columns.tsx +++ b/src/views/system/permission/menu/columns.tsx @@ -92,7 +92,7 @@ export const getColumns = (columnParams: ColumnsParams): TableColumn openMenuModal(record), diff --git a/src/views/system/permission/menu/index.vue b/src/views/system/permission/menu/index.vue index 6feefcc5d..4d1eb25a3 100644 --- a/src/views/system/permission/menu/index.vue +++ b/src/views/system/permission/menu/index.vue @@ -13,7 +13,9 @@ :scroll="{ x: 2000 }" > diff --git a/src/views/system/permission/role/index.vue b/src/views/system/permission/role/index.vue index de8b52a1d..51399aee7 100644 --- a/src/views/system/permission/role/index.vue +++ b/src/views/system/permission/role/index.vue @@ -10,7 +10,9 @@ size="small" > diff --git a/src/views/system/permission/user/columns.tsx b/src/views/system/permission/user/columns.tsx index df0b23f99..ce0d2bb9b 100644 --- a/src/views/system/permission/user/columns.tsx +++ b/src/views/system/permission/user/columns.tsx @@ -113,14 +113,14 @@ export const getColumns = (columnParams: ColumnsParams): TableColumn openUserModal(record), }, { label: '改密', - auth: 'sys/user/update', + auth: 'sys/user/password', onClick: () => openUpdatePasswordModal(record), }, { diff --git a/src/views/system/permission/user/index.vue b/src/views/system/permission/user/index.vue index 311295828..b1274b995 100644 --- a/src/views/system/permission/user/index.vue +++ b/src/views/system/permission/user/index.vue @@ -4,7 +4,7 @@
组织架构
- + @@ -24,12 +24,18 @@ {{ title }} @@ -53,13 +59,19 @@