zhengnaiwen_citu 4 months ago
parent
commit
f9fde29784
2 changed files with 9 additions and 6 deletions
  1. 1 1
      .env.development
  2. 8 5
      src/views/system/role/roleData.vue

+ 1 - 1
.env.development

@@ -3,7 +3,7 @@ NODE_ENV = 'development'
 
 VUE_APP_MODE = 'development'
 
-# VUE_APP_BASE_API = 'http://192.168.3.149:7654'
+# VUE_APP_BASE_API = 'http://[240e:3b4:2f0:f074:b140:2d89:fe86:a6f3]:7654'
 VUE_APP_BASE_API = '/op/base'
 
 VUE_APP_DATA_OPS = 'https://company.citupro.com:18183'

+ 8 - 5
src/views/system/role/roleData.vue

@@ -38,14 +38,14 @@
                   :data="data.showPanel.items"
                   :ref="`tree-${index}`"
                   show-checkbox
-                  check-strictly
+                  :check-strictly="data.showPanel.checkStrictly"
                   node-key="value"
                   :default-checked-keys="data.showPanel.props?.defaultCheckedKeys ?? []"
                   @check="(_, treeObj) => onCheck(data, treeObj)"
                 >
-                  <span class="custom-tree-node" slot-scope="{ node, data: _data }" >
+                  <span slot-scope="{ node, data: _data }" >
                     <span>{{ node.label }}</span>
-                    <template v-if="_data.children?.length">
+                    <template v-if="_data.children?.length && data.showPanel.checkStrictly">
                       <m-button text size="mini" type="primary" class="ml-3" @click.stop="onSelectAll($refs[`tree-${index}`], _data, data)">全选</m-button>
                       <m-button text size="mini" type="primary" @click.stop="onSelectNone($refs[`tree-${index}`], _data, data)">全不选</m-button>
                     </template>
@@ -126,7 +126,11 @@ export default {
       }
     },
     onCheck ({ showPanel }, treeObj) {
-      this.setProps(showPanel, treeObj.checkedNodes.map(e => e.tag))
+      if (showPanel.checkStrictly) {
+        this.setProps(showPanel, treeObj.checkedNodes.map(e => e.tag))
+        return
+      }
+      this.setProps(showPanel, treeObj.checkedNodes.filter(e => !e.children).map(e => e.tag))
     },
     // 选中当前节点及子节点
     onSelectAll (ref, data, { showPanel }) {
@@ -144,7 +148,6 @@ export default {
       this.setProps(showPanel, ref[0].getCheckedNodes().map(e => e.tag))
     },
     setProps (showPanel, values) {
-      console.log(values)
       if (showPanel) {
         showPanel.props = {
           ...showPanel.props,