agilebuilder-ui 1.1.46 → 1.1.48-rc1

package/packages/department-user-tree-inline/src/department-user-multiple-tree-inline.vue

@@ -19,49 +19,52 @@
             </el-autocomplete>
           </el-header>
           <el-main style="padding: 10px">
-            <div
-              v-if="!searchValue"
-              style="padding-top: 5px; overflow: auto; width: auto; display: inline-block !important"
-            >
-              <el-tabs v-model="activeTab" class="boe">
-                <el-tab-pane :label="$t('departmentUserTreeInline.orgTree')" name="orgTree">
-                  <el-tree
-                    ref="deparmentUserTree"
-                    :props="defaultProps"
-                    :load="loadNode"
-                    :check-on-click-node="true"
-                    lazy
-                    show-checkbox
-                    node-key="nodeId"
-                    @check="handleCheckNode"
-                    @check-change="handleCheckChange"
-                  >
-                    <template #default="{ node, data }">
-                      <span>
-                        <el-icon>
-                          <Menu v-if="node.data.id === -1 || node.data.branch" />
-                          <Tickets v-else-if="node.data.id === -2 || node.data.id === -3" />
-                          <User v-else-if="node.data.nodeType === 'USER'" />
-                          <Calendar v-else />
-                        </el-icon>
-                        <span :title="node.label">
-                          {{ node.label }}
+            <template v-if="!searchValue">
+              <div
+                v-if="canShowOrgTree"
+                style="padding-top: 5px; overflow: auto; width: auto; display: inline-block !important"
+              >
+                <el-tabs v-model="activeTab" class="boe">
+                  <el-tab-pane :label="$t('departmentUserTreeInline.orgTree')" name="orgTree">
+                    <el-tree
+                      ref="deparmentUserTree"
+                      :props="defaultProps"
+                      :load="loadNode"
+                      :check-on-click-node="true"
+                      lazy
+                      show-checkbox
+                      node-key="nodeId"
+                      @check="handleCheckNode"
+                      @check-change="handleCheckChange"
+                    >
+                      <template #default="{ node, data }">
+                        <span>
+                          <el-icon>
+                            <Menu v-if="node.data.id === -1 || node.data.branch" />
+                            <Tickets v-else-if="node.data.id === -2 || node.data.id === -3" />
+                            <User v-else-if="node.data.nodeType === 'USER'" />
+                            <Calendar v-else />
+                          </el-icon>
+                          <span :title="node.label">
+                            {{ node.label }}
+                          </span>
                         </span>
-                      </span>
+                      </template>
+                    </el-tree>
+                  </el-tab-pane>
+                  <el-tab-pane name="groupTree">
+                    <template v-slot:label>
+                      <span>{{ $t('departmentUserTreeInline.group') }}</span>
+                      <span><GroupUser :active-tab="activeTab" @update-group-tree="updateGroupTree" /></span>
                     </template>
-                  </el-tree>
-                </el-tab-pane>
-                <el-tab-pane name="groupTree">
-                  <template v-slot:label>
-                    <span>{{ $t('departmentUserTreeInline.group') }}</span>
-                    <span><GroupUser :active-tab="activeTab" @update-group-tree="updateGroupTree" /></span>
-                  </template>
-                  <GroupUserMultipleTree v-if="isShowGroupTree" @result="getGroupUserResult" />
-                </el-tab-pane>
-              </el-tabs>
-              <!-- @node-click="handleNodeClick" 移除节点点击，不然会造成节点不可选择时，点击也会选择节点 -->
-            </div>
-
+                    <GroupUserMultipleTree v-if="isShowGroupTree" @result="getGroupUserResult" />
+                  </el-tab-pane>
+                </el-tabs>
+                <!-- @node-click="handleNodeClick" 移除节点点击，不然会造成节点不可选择时，点击也会选择节点 -->
+              </div>
+              <!-- 暂无信息 -->
+              <EmptyState v-else style="width: 100%; height: 100%" />
+            </template>
             <div v-if="searchValue && searchValue.length > 0" style="height: 100%; overflow: hidden">
               <user-result
                 :contain-branch="containBranch"
@@ -120,6 +123,7 @@ import departmentUserTreeMultiService from './department-user-tree-multi-service
 import memoryCacheUtils from '../../utils/memory-cache-utils'
 import GroupUserMultipleTree from './group-user-multiple-tree.vue'
 import GroupUser from './group-user/group-user.vue'
+import EmptyState from '../../empty-state/index.vue'
 
 export default {
   data() {
@@ -164,7 +168,8 @@ export default {
       memoryCacheKey: 'DEPARTMENT_USER_MEMORY_KEY',
       // 记忆选择数据, 搜索框获得焦点后，下拉显示最近选中的10个人，倒序排列，最后选中的在最上面显示。
       memoryCacheData: [],
-      ElIconSearch
+      ElIconSearch,
+      canShowOrgTree: false
     }
   },
   name: 'InlineDepartmentUserMultiTree',
@@ -175,7 +180,8 @@ export default {
     User,
     Calendar,
     GroupUserMultipleTree,
-    GroupUser
+    GroupUser,
+    EmptyState
   },
   props: {
     // 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
@@ -231,6 +237,9 @@ export default {
     }
   },
   created() {
+    utils.canShowOrgTree().then((showOrgTree) => {
+      this.canShowOrgTree = showOrgTree
+    })
     this.initSelectUsers(this.searchField, this.selectUserInfo, this.separator).then((selectUsers) => {
       if (selectUsers) {
         this.selectResult = selectUsers

package/packages/department-user-tree-inline/src/department-user-single-tree-inline.vue

@@ -18,48 +18,52 @@
         </el-autocomplete>
       </el-header>
       <el-main style="padding: 10px; width: 100%">
-        <div
-          v-if="!searchValue || searchResult.length === 0"
-          style="padding-top: 5px; overflow: auto; width: auto; display: inline-block !important"
-        >
-          <el-tabs v-model="activeTab" class="boe">
-            <el-tab-pane :label="$t('departmentUserTreeInline.orgTree')" name="orgTree">
-              <el-tree
-                ref="deparmentUserTree"
-                :load="loadNode"
-                :props="defaultProps"
-                lazy
-                node-key="nodeId"
-                @node-click="handleNodeClick"
-              >
-                <template #default="{ node, data }">
-                  <span>
-                    <el-icon>
-                      <Menu v-if="node.data.id === -1 || node.data.branch" />
-                      <Tickets v-else-if="node.data.id === -2 || node.data.id === -3" />
-                      <User v-else-if="node.data.nodeType === 'USER'" />
-                      <Calendar v-else />
-                    </el-icon>
-                    <span :title="node.label">
-                      {{ node.label }}
+        <template v-if="!searchValue || searchResult.length === 0">
+          <div
+            v-if="canShowOrgTree"
+            style="padding-top: 5px; overflow: auto; width: auto; display: inline-block !important"
+          >
+            <el-tabs v-model="activeTab" class="boe">
+              <el-tab-pane :label="$t('departmentUserTreeInline.orgTree')" name="orgTree">
+                <el-tree
+                  ref="deparmentUserTree"
+                  :load="loadNode"
+                  :props="defaultProps"
+                  lazy
+                  node-key="nodeId"
+                  @node-click="handleNodeClick"
+                >
+                  <template #default="{ node, data }">
+                    <span>
+                      <el-icon>
+                        <Menu v-if="node.data.id === -1 || node.data.branch" />
+                        <Tickets v-else-if="node.data.id === -2 || node.data.id === -3" />
+                        <User v-else-if="node.data.nodeType === 'USER'" />
+                        <Calendar v-else />
+                      </el-icon>
+                      <span :title="node.label">
+                        {{ node.label }}
+                      </span>
                     </span>
-                  </span>
+                  </template>
+                </el-tree>
+              </el-tab-pane>
+              <el-tab-pane name="groupTree">
+                <template v-slot:label>
+                  <span>{{ $t('departmentUserTreeInline.group') }}</span>
+                  <span><GroupUser :active-tab="activeTab" @update-group-tree="updateGroupTree" /></span>
                 </template>
-              </el-tree>
-            </el-tab-pane>
-            <el-tab-pane name="groupTree">
-              <template v-slot:label>
-                <span>{{ $t('departmentUserTreeInline.group') }}</span>
-                <span><GroupUser :active-tab="activeTab" @update-group-tree="updateGroupTree" /></span>
-              </template>
-              <GroupUserSingleTree
-                v-if="isShowGroupTree"
-                @singleClick="getGroupUserResult"
-                @dblClick="dblClickGroupUserResult"
-              />
-            </el-tab-pane>
-          </el-tabs>
-        </div>
+                <GroupUserSingleTree
+                  v-if="isShowGroupTree"
+                  @singleClick="getGroupUserResult"
+                  @dblClick="dblClickGroupUserResult"
+                />
+              </el-tab-pane>
+            </el-tabs>
+          </div>
+          <!-- 暂无信息 -->
+          <EmptyState v-else style="width: 100%; height: 100%" />
+        </template>
         <div
           v-if="searchValue && searchValue.length > 0 && searchResult.length > 0"
           style="height: 100%; overflow: hidden"
@@ -89,6 +93,7 @@ import departmentUserTreeSingleService from './department-user-tree-single-servi
 import memoryCacheUtils from '../../utils/memory-cache-utils'
 import GroupUserSingleTree from './group-user-single-tree.vue'
 import GroupUser from './group-user/group-user.vue'
+import EmptyState from '../../empty-state/index.vue'
 
 export default {
   data() {
@@ -136,14 +141,16 @@ export default {
       memoryCacheData: [],
       ElIconSearch,
       activeTab: 'orgTree', // 当前页签
-      isShowGroupTree: true
+      isShowGroupTree: true,
+      canShowOrgTree: false
     }
   },
   name: 'InlineDepartmentUserSingleTree',
   components: {
     UserResult,
     GroupUserSingleTree,
-    GroupUser
+    GroupUser,
+    EmptyState
   },
   props: {
     // 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
@@ -184,6 +191,9 @@ export default {
     }
   },
   created() {
+    utils.canShowOrgTree().then((showOrgTree) => {
+      this.canShowOrgTree = showOrgTree
+    })
     this.searchFields = this.getSearchUserFields()
   },
   mounted() {

package/packages/department-user-tree-inline/src/department-user-tree-multi-service.js

@@ -89,9 +89,11 @@ const departmentUserTreeMultiService = {
       .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/department-users', param)
       .then((result) => {
         // 更新当前点击的节点的子节点
-        this.$refs.deparmentUserTree.updateKeyChildren(data.nodeId, result)
-        this.$refs.deparmentUserTree.store.nodesMap[data.nodeId].expanded = true
-        this.staticCheckedUserNodes(data)
+          if(this.$refs.deparmentUserTree){
+            this.$refs.deparmentUserTree.updateKeyChildren(data.nodeId, result)
+            this.$refs.deparmentUserTree.store.nodesMap[data.nodeId].expanded = true
+            this.staticCheckedUserNodes(data)
+          }
       })
   },
   // 初始化部门人员树
@@ -123,7 +125,9 @@ const departmentUserTreeMultiService = {
         .then((data) => {
           resolve(data)
           // 更新当前点击的节点的子节点，必须加该方法，否则会导致子节点无法选中
-          this.$refs.deparmentUserTree.updateKeyChildren(parentNodeId, data)
+          if(this.$refs.deparmentUserTree){
+            this.$refs.deparmentUserTree.updateKeyChildren(parentNodeId, data)
+          }
           if (parentId === 0) {
             // 初始化树时，展开公司节点
             const tenantData = data[0].data
@@ -162,10 +166,12 @@ const departmentUserTreeMultiService = {
     this.$http
       .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/department-users', param)
       .then((children) => {
-        this.$refs.deparmentUserTree.updateKeyChildren(parentNodeId, children)
-        if (this.$refs.deparmentUserTree.store.nodesMap[parentNodeId]) {
-          this.$refs.deparmentUserTree.store.nodesMap[parentNodeId].expanded = true
-        }
+          if(this.$refs.deparmentUserTree){
+            this.$refs.deparmentUserTree.updateKeyChildren(parentNodeId, children)
+            if (this.$refs.deparmentUserTree.store.nodesMap[parentNodeId]) {
+              this.$refs.deparmentUserTree.store.nodesMap[parentNodeId].expanded = true
+            }
+          }
         if (isSearch) {
           // 查询时处理
           if (this.allExpandNodeIds.indexOf(parentNodeId) === -1) {
@@ -174,7 +180,9 @@ const departmentUserTreeMultiService = {
           }
           if (this.allExpandNodeIds.length === this.allSearchNodeIds.length) {
             // 表示所有节点已展开，执行树的过滤方法
-            this.$refs.deparmentUserTree.filter(searchValue)
+            if(this.$refs.deparmentUserTree){
+              this.$refs.deparmentUserTree.filter(searchValue)
+            }
             this.allExpandNodeIds = []
             this.allSearchNodeIds = []
           }
@@ -188,10 +196,12 @@ const departmentUserTreeMultiService = {
       url += '/' + this.limitFilterColumn
     }
     this.$http.post(url, this.departmentInfo).then((children) => {
-      this.$refs.deparmentUserTree.updateKeyChildren(this.tenantNodeId, children)
-      if (this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId]) {
-        this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId].expanded = true
-      }
+          if(this.$refs.deparmentUserTree){
+            this.$refs.deparmentUserTree.updateKeyChildren(this.tenantNodeId, children)
+            if (this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId]) {
+              this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId].expanded = true
+            }
+          }
     })
   },
   getChildrenDepartmentUsers(childrenDepartmentIds) {

package/packages/department-user-tree-inline/src/department-user-tree-single-service.js

@@ -105,7 +105,9 @@ const departmentUserTreeSingleService = {
         .then((data) => {
           resolve(data)
           // 更新当前点击的节点的子节点，必须加该方法，否则会导致子节点无法选中
-          this.$refs.deparmentUserTree.updateKeyChildren(parentNodeId, data)
+          if(this.$refs.deparmentUserTree){
+            this.$refs.deparmentUserTree.updateKeyChildren(parentNodeId, data)
+          }
           if (parentId === 0) {
             // 初始化树时，展开公司节点
             const tenantData = data[0].data
@@ -144,10 +146,12 @@ const departmentUserTreeSingleService = {
       url += '/' + this.limitFilterColumn
     }
     this.$http.post(url, this.departmentInfo).then((children) => {
-      this.$refs.deparmentUserTree.updateKeyChildren(this.tenantNodeId, children)
-      if (this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId]) {
-        this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId].expanded = true
-      }
+          if(this.$refs.deparmentUserTree){
+            this.$refs.deparmentUserTree.updateKeyChildren(this.tenantNodeId, children)
+            if (this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId]) {
+              this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId].expanded = true
+            }
+          }
     })
   }
 }

package/packages/department-user-tree-inline/src/group-user-tree-service.js

@@ -4,9 +4,11 @@ const groupUserTreeService = {
 		const parentId = data.id
 		this.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-group-trees/' + parentId).then(result => {
 			// 更新当前点击的节点的子节点
-			this.$refs.groupUserTree.updateKeyChildren(data.nodeId, result)
-			this.$refs.groupUserTree.store.nodesMap[data.nodeId].expanded = true
-			this.staticCheckedUserNodes(data)
+			if(this.$refs.groupUserTree){
+				this.$refs.groupUserTree.updateKeyChildren(data.nodeId, result)
+				this.$refs.groupUserTree.store.nodesMap[data.nodeId].expanded = true
+				this.staticCheckedUserNodes(data)
+			}
 		})
 	},
 	// 初始化部门人员树
@@ -29,20 +31,24 @@ const groupUserTreeService = {
 			this.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-group-trees/' + parentId).then(data => {
 				resolve(data)
 				// 更新当前点击的节点的子节点，必须加该方法，否则会导致子节点无法选中
-				this.$refs.groupUserTree.updateKeyChildren(parentNodeId, data)
-				if (parentId === 0) {
-					// 初始化树时，展开公司节点
-					// 加载整个组织结构树时，展开公司节点
-					this.loadDepartment(this.tenantNodeId, this.tenantNodeId + '')
+				if(this.$refs.groupUserTree){
+					this.$refs.groupUserTree.updateKeyChildren(parentNodeId, data)
+					if (parentId === 0) {
+						// 初始化树时，展开公司节点
+						// 加载整个组织结构树时，展开公司节点
+						this.loadDepartment(this.tenantNodeId, this.tenantNodeId + '')
+					}
 				}
 			})
 		}
 	},
 	loadDepartment(parentId, parentNodeId, isSearch, searchValue) {
 		this.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-group-trees/' + parentId).then(children => {
-			this.$refs.groupUserTree.updateKeyChildren(parentNodeId, children)
-			if (this.$refs.groupUserTree.store.nodesMap[parentNodeId]) {
-				this.$refs.groupUserTree.store.nodesMap[parentNodeId].expanded = true
+			if(this.$refs.groupUserTree){
+				this.$refs.groupUserTree.updateKeyChildren(parentNodeId, children)
+				if (this.$refs.groupUserTree.store.nodesMap[parentNodeId]) {
+					this.$refs.groupUserTree.store.nodesMap[parentNodeId].expanded = true
+				}
 			}
 		})
 	},