diff --git a/README/1.2/1.2.5.md b/README/1.2/1.2.5.md
new file mode 100644
index 0000000000000000000000000000000000000000..b3da7a04aa264f6a7f9b35c5c80645b12f8f9e9c
--- /dev/null
+++ b/README/1.2/1.2.5.md
@@ -0,0 +1,10 @@
+### vk-unicloud-admin 框架研究Q群:`22466457` 如有问题或建议可以在群内讨论。
+### 更新内容
+#### 1、【升级】`vk-unicloud-admin-ui` 包升级至 `1.2.15`
+#### 2、【调整】去除系统内置的`初级管理员`、`中级管理员`、`高级管理员`角色
+#### 3、【优化】权限管理页面逻辑
+
+#### 框架更新步骤指南 [点击查看](https://gitee.com/vk-uni/vk-uni-cloud-router/wikis/pages?sort_id=4023455&doc_id=975983)
+##### 框架学习Q群:`22466457` 欢迎萌新和大佬来使用和共同改进框架
+
+### 如果你觉得框架对你有用,可以在下方进行评论,也可以进行赞赏。
diff --git a/changelog.md b/changelog.md
index a34dddfce3f0471b4ac4029d411d9639de58c5c3..31dc8513be1b069035705cfd4558a0f66d7c85f1 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,15 @@
+## 1.2.5(2021-07-03)
+### vk-unicloud-admin 框架研究Q群:`22466457` 如有问题或建议可以在群内讨论。
+### 更新内容
+#### 1、【升级】`vk-unicloud-admin-ui` 包升级至 `1.2.15`
+#### 2、【调整】去除系统内置的`初级管理员`、`中级管理员`、`高级管理员`角色
+#### 3、【优化】权限管理页面逻辑
+
+#### 框架更新步骤指南 [点击查看](https://gitee.com/vk-uni/vk-uni-cloud-router/wikis/pages?sort_id=4023455&doc_id=975983)
+##### 框架学习Q群:`22466457` 欢迎萌新和大佬来使用和共同改进框架
+
+### 如果你觉得框架对你有用,可以在下方进行评论,也可以进行赞赏。
+
## 1.2.4(2021-07-03)
### vk-unicloud-admin 框架研究Q群:`22466457` 如有问题或建议可以在群内讨论。
### 更新内容
diff --git a/package.json b/package.json
index 9631f67d3207e81ddbca811c407335a7f3d9ab7c..1815e3074abe588c0a862eb3db098a57dd150843 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"id": "vk-unicloud-admin",
"name": "vk-unicloud-admin",
- "version": "1.2.4",
+ "version": "1.2.5",
"displayName": "【开箱即用】vk-unicloud-admin - 快速开发框架 - 几分钟即可完成一个页面CRUD",
"description": "vk-unicloud-admin是基于unicloud+uni-id+element+vk-unicloud-router的一套快速PC admin完整开发框架。丰富的API可以让你开发事半功倍。",
"keywords": [
diff --git a/pages_plugs/system/permission/form/updateLevel.vue b/pages_plugs/system/permission/form/updateLevel.vue
new file mode 100644
index 0000000000000000000000000000000000000000..4c8afe0d97fcb7a0b257aa83fc18902b1fde0c9a
--- /dev/null
+++ b/pages_plugs/system/permission/form/updateLevel.vue
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_plugs/system/permission/list.vue b/pages_plugs/system/permission/list.vue
index 56ac964ebc682fc83ff4b465cc9e799536e6efbc..f4853de2c7742daa7e22dce25a674fbba9b2b7ce 100644
--- a/pages_plugs/system/permission/list.vue
+++ b/pages_plugs/system/permission/list.vue
@@ -44,6 +44,8 @@
+
+
@@ -58,27 +60,14 @@
{ value:1, label:"通配符" },
{ value:2, label:"正则表达式" }
];
- const curdCategoryData = [
- { value:1, label:"增", tagType:"success" },
- { value:2, label:"删", tagType:"danger" },
- { value:3, label:"改", tagType:"" },
- { value:4, label:"查", tagType:"info" },
- { value:5, label:"特", tagType:"warning" },
- //{ value:0, label:"其他", tagType:"warning" },
- ];
- const levelDate = [
- { value:1, label:"子弹级", tagType:"success" },
- { value:2, label:"炸弹级", tagType:"" },
- { value:3, label:"榴弹级", tagType:"warning" },
- { value:4, label:"核弹级", tagType:"danger" },
- { value:0, label:"其他", tagType:"info" },
- ];
import updateCategory from './form/updateCategory'
+ import updateLevel from './form/updateLevel'
export default {
components:{
updateCategory,
+ updateLevel
},
data() {
// 页面数据变量
@@ -108,10 +97,22 @@
}
},
{ key:"curd_category", title:"权限分类", type:"tag", width:100,
- data: curdCategoryData
+ data: [
+ { value:1, label:"增", tagType:"success" },
+ { value:2, label:"删", tagType:"danger" },
+ { value:3, label:"改", tagType:"" },
+ { value:4, label:"查", tagType:"info" },
+ { value:5, label:"特", tagType:"warning" },
+ //{ value:0, label:"其他", tagType:"warning" },
+ ]
},
{ key:"level", title:"权限级别", type:"tag", width:100,
- data: levelDate
+ data: [
+ { value:1, label:"子弹级", tagType:"success" },
+ { value:2, label:"炸弹级", tagType:"" },
+ { value:3, label:"榴弹级", tagType:"warning" },
+ { value:4, label:"核弹级", tagType:"danger" },
+ ]
},
{ key:"sort", title:"排序值", type:"number", width:80 },
// 对应的权限是否启用
@@ -182,11 +183,24 @@
},
{ key:"", title:"高级属性", type:"bar-title" },
{ key:"curd_category", title:"权限分类", type:"radio", width:100,
- data:curdCategoryData,
+ data:[
+ { value:1, label:"增", tagType:"success" },
+ { value:2, label:"删", tagType:"danger" },
+ { value:3, label:"改", tagType:"" },
+ { value:4, label:"查", tagType:"info" },
+ { value:5, label:"特", tagType:"warning" },
+ { value:0, label:"其他", tagType:"warning" },
+ ],
tips:"给权限分一个类,方便查询和表达含义"
},
{ key:"level", title:"权限级别", type:"radio", width:100,
- data:levelDate,
+ data:[
+ { value:1, label:"子弹级", tagType:"success" },
+ { value:2, label:"炸弹级", tagType:"" },
+ { value:3, label:"榴弹级", tagType:"warning" },
+ { value:4, label:"核弹级", tagType:"danger" },
+ { value:0, label:"其他", tagType:"info" },
+ ],
tips:"给权限(菜单)一个级别,方便查询和表达重要程度"
},
],
@@ -298,6 +312,10 @@
// 修改分类
let item = that.getCurrentRow(true);
vk.pubfn.openForm('updateCategory', { item });
+ }else if(key === "level"){
+ // 修改等级
+ let item = that.getCurrentRow(true);
+ vk.pubfn.openForm('updateLevel', { item });
}
}
},
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/update.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/update.js
index 903d883e5e4b9dfe6ff4086cd336690175dd274a..2f151f6a54b0882b638463826010b47fa76a7a8a 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/update.js
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/update.js
@@ -12,9 +12,9 @@ module.exports = {
* @params {Number} sort 排序(越大越在前面)
* @params {String} parent_id 父级id
* @params {Boolean} enable 是否启用
- * @params {Boolean} match_mode 0:完整路径 1:通配符 2:正则表达式
- * @params {Boolean} curd_category 0:未分类 1:增 2:删 3:改 4:查 5:特殊
- * @params {Boolean} level 0:未分类 1:子弹级 2:炸弹级 3:榴弹级 4:核弹级
+ * @params {Number} match_mode 0:完整路径 1:通配符 2:正则表达式
+ * @params {Number} curd_category 0:未分类 1:增 2:删 3:改 4:查 5:特殊
+ * @params {Number} level 0:未分类 1:子弹级 2:炸弹级 3:榴弹级 4:核弹级
* res 返回参数说明
* @params {Number} code 错误码,0表示成功
* @params {String} msg 详细信息
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/updateCategory.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/updateCategory.js
index bf7e1d58482134480fd81553f8483cc3d1074a7a..983aa7f531407b4948df46cbbe9e447cbdca72a7 100644
--- a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/updateCategory.js
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/updateCategory.js
@@ -4,7 +4,7 @@ module.exports = {
* @url admin/system/permission/sys/updateCategory 前端调用的url参数地址
* data 请求参数 说明
* @params {String} _id 权限Id
- * @params {Boolean} curd_category 0:未分类 1:增 2:删 3:改 4:查 5:特殊
+ * @params {Number} curd_category 0:未分类 1:增 2:删 3:改 4:查 5:特殊
* res 返回参数说明
* @params {Number} code 错误码,0表示成功
* @params {String} msg 详细信息
diff --git a/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/updateLevel.js b/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/updateLevel.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1a322dfbf311d03ffea2f379ccba438ab92d344
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/router/service/admin/system/permission/sys/updateLevel.js
@@ -0,0 +1,34 @@
+module.exports = {
+ /**
+ * 修改权限等级
+ * @url admin/system/permission/sys/updateLevel 前端调用的url参数地址
+ * data 请求参数 说明
+ * @params {String} _id 权限Id
+ * @params {Number} level 0:未分类 1:子弹级 2:炸弹级 3:榴弹级 4:核弹级
+ * res 返回参数说明
+ * @params {Number} code 错误码,0表示成功
+ * @params {String} msg 详细信息
+ */
+ main: async (event) => {
+ let { data = {}, userInfo, util, filterResponse, originalParam } = event;
+ let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
+ let { uid } = data;
+ let res = { code: 0, msg: '' };
+ // 业务逻辑开始-----------------------------------------------------------
+ let {
+ _id,
+ level=0,
+ } = data;
+ let dbName = "uni-id-permissions";
+ // 执行数据库API请求
+ res.num = await vk.baseDao.updateById({
+ dbName,
+ id:_id,
+ dataJson:{
+ level
+ }
+ });
+ return res;
+ }
+
+}
diff --git a/uniCloud-aliyun/database/db_init.json b/uniCloud-aliyun/database/db_init.json
index 437727dab1f33411e9627100f07bb82dbde02b01..7457eedd550f4c90c72c934b51936e91d51e3ef1 100644
--- a/uniCloud-aliyun/database/db_init.json
+++ b/uniCloud-aliyun/database/db_init.json
@@ -163,33 +163,6 @@
"comment":"系统内置角色 - 请勿修改",
"permission": []
},
- {
- "_id": "002",
- "_add_time": 1596416400000,
- "enable":true,
- "role_id":"admin-lv3",
- "role_name": "高级管理员",
- "comment":"系统内置角色 - 请勿修改",
- "permission": []
- },
- {
- "_id": "003",
- "_add_time": 1596416400000,
- "enable":true,
- "role_id":"admin-lv2",
- "role_name": "中级管理员",
- "comment":"系统内置角色 - 请勿修改",
- "permission": []
- },
- {
- "_id": "004",
- "_add_time": 1596416400000,
- "enable":true,
- "role_id":"admin-lv1",
- "role_name": "初级管理员",
- "comment":"系统内置角色 - 请勿修改",
- "permission": []
- },
{
"_id": "005",
"_add_time": 1596416400000,
diff --git a/uniCloud-aliyun/database/db_init/uni-id-roles.json b/uniCloud-aliyun/database/db_init/uni-id-roles.json
index 885270ff886af3ecac7193e0f7b372771c8af52c..2b965adf1bacf26b690055c861469a7359366889 100644
--- a/uniCloud-aliyun/database/db_init/uni-id-roles.json
+++ b/uniCloud-aliyun/database/db_init/uni-id-roles.json
@@ -1,6 +1,5 @@
-{"_id":"006","_add_time":1596416400000,"comment":"更细粒化的自定义角色权限示例","enable":true,"permission":[],"role_id":"custom-role-1","role_name":"自定义角色-1"}
-{"_id":"004","_add_time":1596416400000,"comment":"系统内置角色 - 请勿修改","enable":true,"permission":[],"role_id":"admin-lv1","role_name":"初级管理员"}
-{"_id":"003","_add_time":1596416400000,"comment":"系统内置角色 - 请勿修改","enable":true,"permission":[],"role_id":"admin-lv2","role_name":"中级管理员"}
-{"_id":"005","_add_time":1596416400000,"comment":"系统内置角色 - 请勿修改","enable":true,"permission":[],"role_id":"query-all","role_name":"boss"}
{"_id":"001","_add_time":1596416400000,"comment":"系统内置角色 - 请勿修改","enable":true,"permission":[],"role_id":"admin","role_name":"超级管理员"}
-{"_id":"002","_add_time":1596416400000,"comment":"系统内置角色 - 请勿修改","enable":true,"permission":[],"role_id":"admin-lv3","role_name":"高级管理员"}
+{"_id":"005","_add_time":1596416400000,"comment":"系统内置角色 - 请勿修改","enable":true,"permission":[],"role_id":"query-all","role_name":"boss"}
+{"_id":"006","_add_time":1596416400000,"comment":"更细粒化的自定义角色权限示例","enable":true,"permission":[],"role_id":"custom-role-1","role_name":"自定义角色-1"}
+
+