agilebuilder-ui 1.1.41 → 1.1.42-sit1

package/packages/workgroup-user-tree-inline/src/workgroup-tree-inline-service.js

@@ -5,18 +5,14 @@ const workgroupTreeInlineService = {
   // 后台查询部门，并拼接树节点
   filterAppendNodes(value) {
     this.$http
-      .post(
-        window.$vueApp.config.globalProperties.baseAPI +
-          '/component/organization-trees/searches',
-        this.searchParam
-      )
+      .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/searches', this.searchParam)
       .then((result) => {
         if (result) {
           if (result.length === 0) {
             this.$message({
               showClose: true,
               type: 'error',
-              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty'),
+              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty')
             })
             return
           }
@@ -39,7 +35,7 @@ const workgroupTreeInlineService = {
           this.$message({
             showClose: true,
             type: 'error',
-            message: getI18n().t('imatrixUIMessage.queryResultIsEmpty'),
+            message: getI18n().t('imatrixUIMessage.queryResultIsEmpty')
           })
         }
       })
@@ -58,24 +54,18 @@ const workgroupTreeInlineService = {
         if (!isClickNode) {
           var param = {
             parentId: data.id,
-            departmentInfo: this.branchInfo,
+            departmentInfo: this.branchInfo
           }
           this.$http
             .post(
-              window.$vueApp.config.globalProperties.baseAPI +
-                '/component/organization-trees/workgroup-users',
+              window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/workgroup-users',
               param
             )
             .then((result) => {
               // 更新当前点击的节点的子节点
-              this.$refs.workgroupUserTree.updateKeyChildren(
-                data.nodeId,
-                result
-              )
+              this.$refs.workgroupUserTree.updateKeyChildren(data.nodeId, result)
               // 展开当前选中的节点
-              this.$refs.workgroupUserTree.store.nodesMap[
-                data.nodeId
-              ].expanded = true
+              this.$refs.workgroupUserTree.store.nodesMap[data.nodeId].expanded = true
               // 获得所有应该选中的节点
               this.checkedNodeAndChildren(data)
             })
@@ -91,8 +81,7 @@ const workgroupTreeInlineService = {
   getAllSelectedWorkgroupUsers(parentIds, selectNodeInfo) {
     this.$http
       .post(
-        window.$vueApp.config.globalProperties.baseAPI +
-          '/component/organization-trees/user-in-workgroups',
+        window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/user-in-workgroups',
         parentIds
       )
       .then((users) => {
@@ -102,13 +91,9 @@ const workgroupTreeInlineService = {
         if (selectNodeInfo.userIds.length > 0) {
           $emit(this, 'result', selectNodeInfo)
         } else {
-          this.$alert(
-            getI18n().t('imatrixUIMessage.pleaseSelectPersonnel'),
-            getI18n().t('imatrixUIMessage.tips'),
-            {
-              confirmButtonText: getI18n().t('imatrixUIPublicModel.sure'),
-            }
-          )
+          this.$alert(getI18n().t('imatrixUIMessage.pleaseSelectPersonnel'), getI18n().t('imatrixUIMessage.tips'), {
+            confirmButtonText: getI18n().t('imatrixUIPublicModel.sure')
+          })
         }
       })
   },
@@ -128,6 +113,11 @@ const workgroupTreeInlineService = {
     if (this.$refs.workgroupUserTree) {
       checkedKeys = this.$refs.workgroupUserTree.getCheckedKeys()
     }
+    if (parentId === -1 && node.data.children && node.data.children.length > 0) {
+      // 表示初始化树时，已经加载过子节点了，如果子节点为空就再查下
+      resolve(node.data.children)
+      return
+    }
     // 初始化部门树
     this.initLoad(parentId, parentNodeId, node, resolve, checkedKeys)
   },
@@ -135,14 +125,10 @@ const workgroupTreeInlineService = {
   initLoad(parentId, parentNodeId, node, resolve, checkedKeys) {
     const param = {
       parentId: parentId,
-      departmentInfo: this.branchInfo,
+      departmentInfo: this.branchInfo
     }
     this.$http
-      .post(
-        window.$vueApp.config.globalProperties.baseAPI +
-          '/component/organization-trees/workgroup-users',
-        param
-      )
+      .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/workgroup-users', param)
       .then((data) => {
         resolve(data)
         // 更新当前点击的节点的子节点
@@ -173,19 +159,14 @@ const workgroupTreeInlineService = {
   loadWorkgroup(parentId, parentNodeId, isSearch, searchValue) {
     const param = {
       parentId: parentId,
-      departmentInfo: this.branchInfo,
+      departmentInfo: this.branchInfo
     }
     this.$http
-      .post(
-        window.$vueApp.config.globalProperties.baseAPI +
-          '/component/organization-trees/workgroup-users',
-        param
-      )
+      .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/workgroup-users', param)
       .then((children) => {
         this.$refs.workgroupUserTree.updateKeyChildren(parentNodeId, children)
         if (this.$refs.workgroupUserTree.store.nodesMap[parentNodeId]) {
-          this.$refs.workgroupUserTree.store.nodesMap[parentNodeId].expanded =
-            true
+          this.$refs.workgroupUserTree.store.nodesMap[parentNodeId].expanded = true
         }
         if (isSearch) {
           // 查询时处理
@@ -215,12 +196,11 @@ const workgroupTreeInlineService = {
   },
   searchWorkgroupUsers(value) {
     const param = {
-      searchValue: value,
+      searchValue: value
     }
     this.$http
       .post(
-        window.$vueApp.config.globalProperties.baseAPI +
-          '/component/organization-trees/search-workgroup-users',
+        window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/search-workgroup-users',
         param
       )
       .then((result) => {
@@ -229,7 +209,7 @@ const workgroupTreeInlineService = {
           this.$message({
             showClose: true,
             type: 'error',
-            message: getI18n().t('imatrixUIMessage.queryResultIsEmpty'),
+            message: getI18n().t('imatrixUIMessage.queryResultIsEmpty')
           })
           return
         }