Merge branch 'master' into test-dev

src/views/codeRule/ConditionsSet.vue

@@ -384,10 +384,10 @@ export default {
         }
       });
        const selectedOption = this.sampleOptions.find(option => option.value === value);
-       this.basicOptions = selectedOption ? selectedOption.info.map(item => ({
-         value: item.id,
-         label: item.name
-       })) : [];
+      this.basicOptions = selectedOption ? selectedOption.info.filter(item => item.name !== '').map(item => ({
+        value: item.id,
+        label: item.name
+      })) : [];
        
     },
     handleDeleteItem(item, index) {

src/views/system/user.vue

@@ -297,6 +297,7 @@
           append-to-body
           :visible.sync="roleBox"
           width="345px"
+        
         >
 
           <el-tree
@@ -308,6 +309,7 @@
             ref="treeRole"
             :default-checked-keys="roleTreeObj"
             :props="props"
+            style="max-height: 400px; overflow-y: auto;"
           >
           </el-tree>