diff --git a/src/views/system/iamResourcePermission/form.vue b/src/views/system/iamResourcePermission/form.vue index d81da3db23a6a4a37e490483fbe80fa4ca925944..209fc510ba602142055bce80dc6fbf34eeec3342 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 === ''" /> @@ -128,6 +129,7 @@ :key="i" :label="item.label" :value="item.value" + :disabled="item.value == null || item.value === ''" /> @@ -164,12 +166,7 @@ export default { name: 'IamResourcePermissionForm', mixins: [form], props: { - initParentId: { - type: String, - default: () => { - return '0' - } - } + initParentId: String }, data() { return { @@ -193,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 cc28c78d3126f557d82152a66493e5e22bef24bb..b818b5302979f6380a0cab6c57f7fac19fd3946c 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" /> @@ -151,7 +152,7 @@ export default { return { baseApi: '/iam/resourcePermission', customQueryParam: { displayType: 'MENU' }, - formParentId: '0', + formParentId: null, listFormatter: false, canCorrectPermission: process.env.ENV !== 'production' }