Browse Source

Merge branch 'bugFix' into 'master'

Bug fix(角色管理添加用户角色树状选择的bug修复)

See merge request tian-group/skyeye-admin-fe!81
楼航飞 2 years ago
parent
commit
8d88d762af

+ 1 - 0
src/views/map-config/mini-map/MiniMapConfig.vue

@@ -14,6 +14,7 @@
             :teleported="false"
             placeholder="请选择相关场景"
             @change="changeShop"
+            style="width: 200px"
           />
         </div>
         <div v-if="shopCameraList.length === 1" class="upload-option">

+ 8 - 4
src/views/system/role/CreateUserDrawer.vue

@@ -82,7 +82,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, onMounted, nextTick, computed } from 'vue';
+  import { ref, onMounted, computed } from 'vue';
   import { ElMessage } from 'element-plus';
   import type { userFormParamsType } from './types';
 
@@ -202,7 +202,7 @@
   function clickNode(tree, nodeInfo, _, __) {
     console.log('tree', tree);
     console.log('nodeInfo', nodeInfo.data.isShop);
-
+    featurePermissionMap[selectedNodeKey.value] = [];
     if (nodeInfo.data.isShop) {
       selectedNodeKey.value = tree.code;
       const checkedNodes = featurePermissionMap[selectedNodeKey.value] || [];
@@ -353,9 +353,13 @@
 
   function handleReset() {
     formRef.value.resetFields();
+    featurePermissionMap[selectedNodeKey.value] = [];
+
     formParams.value = Object.assign(formParams.value, defaultValueRef());
-    treeRef.value!.setCheckedKeys([]);
-    // isAll.value = false;
+    treeRef.value!.setCurrentKey(null);
+    modeTreeRef.value!.setCheckedNodes([]);
+    isAll.value = false;
+    selectedNodeKey.value = '';
   }
   function setFeaturePermission(permissionList) {
     for (const item of permissionList) {