agilebuilder-ui 1.0.621 → 1.0.962

package/packages/department-user-tree-mobile/src/department-user-tree-inline-app.vue

@@ -18,7 +18,7 @@
           </el-col>
       </el-row>
     </el-card>
-    <el-card  v-if="tenantName" class="card-content"  style="height: 40px">
+    <el-card  v-if="tenantName" class="card-content">
       <el-row class="item-row item-row-all">
         <el-col class="item-label dept-path"><deptPath :tenantName="tenantName" :clickDepts="clickDepts" @clickBreadcrumb="clickBreadcrumb"/></el-col>
       </el-row>
@@ -47,7 +47,7 @@
       </template>
     </el-tree>
     </el-card>
-    <el-card  class="card-footer" style="height: 40px">
+    <el-card  class="card-footer">
     <div  style="display: flex;">
       <div  class="select-result" >
         <!-- 已选择:{useNum}个用户,{deptNum}个部门(含子部门) -->
@@ -177,30 +177,31 @@ function  resizeScrollTargetHeight () {
 }
 // 点击复选框时处理
 function handleCheckNode(data, check, isChildrenCheck) {
-  debugger
-    if(check) {
-      // 表示选择节点时
-      if(props.multiple) {
-        // 表示是复选组织树
-        addToSelectDept(data)
-      }
-    } else {
-      // 表示取消选择
-      if(props.multiple || (data.nodeType && data.nodeType === 'USER')) {
-        removeSelectDept(data)
+    if(props.multiple) {
+      if(check) {
+        // 表示选择节点时
+        if(props.multiple) {
+          // 表示是复选组织树
+          addToSelectDept(data)
+        }
+      } else {
+        // 表示取消选择
+        if(props.multiple || (data.nodeType && data.nodeType === 'USER')) {
+          removeSelectDept(data)
+        }
       }
     }
 }
 
 function handleClickNode(data, node, treenode, events) {
-  if(data.nodeType && data.nodeType === 'USER') {
+  if(!props.multiple && data.nodeType && data.nodeType === 'USER') {
     selectUsers.value = [data]
   }
 }
 function addToSelectDept(dept) {
   if(dept.nodeType && dept.nodeType === 'USER') {
     // 表示是用户
-    const filterValue = selectUsers.value.filter(item=> item.nodeId === dept.nodeId)
+    const filterValue = selectUsers.value.filter(item=> item.nodeId === dept.nodeId )
     if(!filterValue || filterValue.length === 0) {
       // 表示集合中没有该记录，需要记录到结果集合中
       selectUsers.value.push(JSON.parse(JSON.stringify(dept)))
@@ -216,7 +217,6 @@ function addToSelectDept(dept) {
 }
 
 function removeSelectDept(dept) {
-  debugger
   if(dept.nodeType && dept.nodeType === 'USER') {
     const index = selectUsers.value.findIndex(selectItem=> selectItem.nodeId === dept.nodeId)
     // 删除指定元素
@@ -296,10 +296,8 @@ function removeResultDept(dept) {
       }
     })
     orgTreeRef.value.setCheckedKeys(selectNodeIds, true)
-  } else {
-    // departments结果不存在当前移除的节点时
-    removeSelectDept(dept)
   }
+  removeSelectDept(dept)
 }
 
 function saveDept () {

package/packages/department-user-tree-mobile/src/department-user-tree-service.ts

@@ -49,17 +49,6 @@ export function loadPointDepartments (departmentInfo) {
       defaultCheckedKeys.push(dept.nodeId)
     })
   }
-// 获得所有指定父部门的子部门信息
-  export  function getChildDepts (parentDept) {
-    return new Promise((resolve, reject) => {
-      const parentIds = [parentDept.id]
-      window['$vueApp'].config.globalProperties.$http.post(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/department-children', parentIds).then(departments => {
-        resolve(departments)
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  }
   // ,
   // isDeptOrUser (item, dept) {
   //   return item.id === dept.id && item.nodeType && dept.nodeType && item.nodeType === dept.nodeType