From 009b81a31cb2bd1bba1726067a04d760eb8456fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Sat, 3 Dec 2022 21:13:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=BD=AF=E5=88=A0=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/install.js | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/web/src/install.js b/web/src/install.js
index 429982e..b20fa54 100644
--- a/web/src/install.js
+++ b/web/src/install.js
@@ -259,10 +259,6 @@ Vue.prototype.commonEndColumns = function (param = {}) {
     create_datetime: {
       showForm: (param.create_datetime && param.create_datetime.showForm) !== undefined ? param.create_datetime.showForm : false,
       showTable: (param.create_datetime && param.create_datetime.showTable) !== undefined ? param.create_datetime.showTable : true
-    },
-    is_deleted: {
-      showForm: (param.is_deleted && param.is_deleted.showForm) !== undefined ? param.is_deleted.showForm : false,
-      showTable: (param.is_deleted && param.is_deleted.showTable) !== undefined ? param.is_deleted.showTable : false
     }
   }
   return [
@@ -381,23 +377,6 @@ Vue.prototype.commonEndColumns = function (param = {}) {
       form: {
         disabled: !showData.create_datetime.showForm
       }
-    },
-    {
-      title: '是否软删除',
-      key: 'is_deleted',
-      width: 160,
-      search: {
-        disabled: !showData.is_deleted.showForm
-      },
-      show: showData.is_deleted.showTable,
-      type: 'radio',
-      dict: {
-        data: [{ label: '是', value: true }, { label: '否', value: false }]
-      },
-      form: {
-        disabled: !showData.is_deleted.showForm
-
-      }
     }
   ]
 }

From 4e7119a90e9bea3a516f9529b88fee0fd4c6893d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Sat, 3 Dec 2022 22:22:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG:=20=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=BC=96=E8=BE=91=E6=97=B6,=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=E7=88=B6=E5=AD=90=E7=BA=A7=E4=B8=A5=E6=A0=BC?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/system/rolePermission/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/src/views/system/rolePermission/index.vue b/web/src/views/system/rolePermission/index.vue
index eceb086..e47e53d 100644
--- a/web/src/views/system/rolePermission/index.vue
+++ b/web/src/views/system/rolePermission/index.vue
@@ -93,7 +93,7 @@
               :default-checked-keys="menuCheckedKeys"
               :check-on-click-node="false"
               empty-text="请先选择角色"
-              :check-strictly="false"
+              :check-strictly="menuCheckStrictly"
               @check-change="handleCheckClick"
             >
               <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -142,6 +142,7 @@ export default {
       menuOptions: [],
       permissionData: [],
       menuCheckedKeys: [], // 菜单默认选中的节点
+      menuCheckStrictly: false,
       deptOptions: [],
       deptCheckedKeys: [],
       dataScopeOptions: [
@@ -199,6 +200,7 @@ export default {
       this.getDeptData()
       this.getMenuData(this.roleObj)
       this.menuCheckedKeys = this.roleObj.menu // 加载已勾选的菜单
+      this.menuCheckStrictly = true // 父子不相互关联
       this.deptCheckedKeys = this.roleObj.dept
     },
     addRequest (row) {
@@ -292,6 +294,7 @@ export default {
         children,
         parent
       } = data
+      this.menuCheckStrictly = false
       for (const item of menuPermission) {
         this.$set(item, 'checked', checked)
       }