From 25edea06ba090c0ca93404e3863c8145120c2808 Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 20 May 2021 14:33:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E9=9D=9Eapi=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E6=A0=87=E9=A2=98=E5=8F=AF=E9=80=89=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=88=E7=A6=81=E7=94=A8=E4=BA=86=E9=80=89=E9=A1=B9=E7=9A=84?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E6=A0=87=E9=A2=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/iamResourcePermission/form.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/system/iamResourcePermission/form.vue b/src/views/system/iamResourcePermission/form.vue
index d81da3d..dd26660 100644
--- a/src/views/system/iamResourcePermission/form.vue
+++ b/src/views/system/iamResourcePermission/form.vue
@@ -57,6 +57,7 @@
             :key="i"
             :label="item.label"
             :value="item.value"
+            :disabled="item.value == null || item.value === ''"
           />
         </el-select>
       </el-form-item>
@@ -128,6 +129,7 @@
                   :key="i"
                   :label="item.label"
                   :value="item.value"
+                  :disabled="item.value == null || item.value === ''"
                 />
               </el-select>
             </el-form-item>
-- 
Gitee


From 3789dc70b1eef17b2794d65d78193d92eb2157ab Mon Sep 17 00:00:00 2001
From: wind <1103642893@qq.com>
Date: Thu, 20 May 2021 16:03:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E8=B5=84=E6=BA=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20from=E5=BC=B9=E7=AA=97=20=E4=B8=8A=E7=BA=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=20=E5=80=BC=E8=A2=AB=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/iamResourcePermission/form.vue | 15 ++++++++-------
 src/views/system/iamResourcePermission/list.vue |  3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/system/iamResourcePermission/form.vue b/src/views/system/iamResourcePermission/form.vue
index dd26660..209fc51 100644
--- a/src/views/system/iamResourcePermission/form.vue
+++ b/src/views/system/iamResourcePermission/form.vue
@@ -166,12 +166,7 @@ export default {
   name: 'IamResourcePermissionForm',
   mixins: [form],
   props: {
-    initParentId: {
-      type: String,
-      default: () => {
-        return '0'
-      }
-    }
+    initParentId: String
   },
   data() {
     return {
@@ -195,7 +190,13 @@ export default {
       isSelect: true
     }
   },
-
+  watch:{
+    'state.visible'(v){
+      if (!v) {
+        this.$emit('close')
+      }
+    }
+  },
   computed: {
     ...mapState({
       addRoutes: state => state.permission.addRoutes
diff --git a/src/views/system/iamResourcePermission/list.vue b/src/views/system/iamResourcePermission/list.vue
index cc28c78..b818b53 100644
--- a/src/views/system/iamResourcePermission/list.vue
+++ b/src/views/system/iamResourcePermission/list.vue
@@ -122,6 +122,7 @@
       ref="form"
       :init-parent-id="formParentId"
       @complete="getList"
+      @close="formParentId = null"
     />
     <permission-tree-sort ref="sort" @complete="getList" />
     <correct-permission ref="correct"  @complete="getList"></correct-permission>
@@ -151,7 +152,7 @@ export default {
     return {
       baseApi: '/iam/resourcePermission',
       customQueryParam: { displayType: 'MENU' },
-      formParentId: '0',
+      formParentId: null,
       listFormatter: false,
       canCorrectPermission: process.env.ENV !== 'production'
     }
-- 
Gitee