agilebuilder-ui 1.1.36-sit4 → 1.1.36-tmp1

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

@@ -1,138 +1,130 @@
 <template>
-  <div>
-    <department-user-multi-tree
-      v-if="!isMobile && multiple"
-      :department-info="departmentInfo"
-      :limit-filter-column="limitFilterColumn"
-      :height="height"
-      :is-need-virtual-user="isNeedVirtualUser"
-      :search-field="searchField"
-      :select-user-info="selectUserInfo"
-      :separator="separator"
-      :title="title"
-      :width="width ? width : '920px'"
-      @closeDialog="closeDialog"
-      @closedDialog="closedDialog"
-      @openDialog="openDialog"
-      @opendDialog="opendDialog"
-    />
-    <department-user-single-tree
-      v-if="!isMobile && !multiple"
-      :department-info="departmentInfo"
-      :limit-filter-column="limitFilterColumn"
-      :is-need-virtual-user="isNeedVirtualUser"
-      :title="title"
-      :width="width ? width : '509px'"
-      @closeDialog="closeDialog"
-      @closedDialog="closedDialog"
-      @openDialog="openDialog"
-      @opendDialog="opendDialog"
-    />
-    <DepartmentUserMobileTree
-      v-if="isMobile"
-      :multiple="multiple"
-      :department-info="departmentInfo"
-      :limit-filter-column="limitFilterColumn"
-      :search-field="searchField"
-      :select-user-info="selectUserInfo"
-      :separator="separator"
-      @close="closeDialog"
-    />
-  </div>
+	<div>
+		<department-user-multi-tree
+				v-if="!isMobile && multiple"
+				:department-info="departmentInfo"
+				:height="height"
+				:is-need-virtual-user="isNeedVirtualUser"
+				:search-field="searchField"
+				:select-user-info="selectUserInfo"
+				:separator="separator"
+				:title="title"
+				:width="width ? width : '920px'"
+				@closeDialog="closeDialog"
+				@closedDialog="closedDialog"
+				@openDialog="openDialog"
+				@opendDialog="opendDialog"
+		/>
+		<department-user-single-tree
+				v-if="!isMobile && !multiple"
+				:department-info="departmentInfo"
+				:is-need-virtual-user="isNeedVirtualUser"
+				:title="title"
+				:width="width ? width : '509px'"
+				@closeDialog="closeDialog"
+				@closedDialog="closedDialog"
+				@openDialog="openDialog"
+				@opendDialog="opendDialog"
+		/>
+		<DepartmentUserMobileTree
+			v-if="isMobile"
+			:multiple="multiple"
+			:department-info="departmentInfo"
+			:search-field="searchField"
+			:select-user-info="selectUserInfo"
+			:separator="separator"
+			@close="closeDialog"
+		/>
+	</div>
 </template>
 
 <script>
-import { $emit } from '../../utils/gogocodeTransfer'
+import {$emit} from '../../utils/gogocodeTransfer'
 import DepartmentUserSingleTree from './department-user-single-tree.vue'
 import DepartmentUserMultiTree from './department-user-multiple-tree.vue'
 import DepartmentUserMobileTree from '../../department-user-tree-mobile/src/department-user-tree-app.vue'
-import { isMobileBrowser } from '../../../src/utils/common-util'
+import {isMobileBrowser} from '../../../src/utils/common-util'
 
 export default {
-  name: 'DepartmentUserTree',
-  components: {
-    DepartmentUserSingleTree,
-    DepartmentUserMultiTree,
-    DepartmentUserMobileTree
-  },
-  props: {
-    // 是否是多选树，默认是true
-    multiple: {
-      type: Boolean,
-      default: true
-    },
-    // 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
-    departmentInfo: {
-      type: Array,
-      default: null
-    },
-    // 弹框的标题
-    title: {
-      type: String,
-      default: null
-    },
-    // 弹框的宽度
-    width: {
-      type: String,
-      default: null
-    },
-    // 弹框的高度
-    height: {
-      type: String,
-      default: '300px'
-    },
-    // 是否需要显示虚拟用户
-    isNeedVirtualUser: {
-      type: Boolean,
-      default: false
-    },
-    // 多选用户树时，已选择用户id或登录名集合，多个之间以逗号隔开
-    selectUserInfo: {
-      type: [String, Number],
-      default: null
-    },
-    // 移除用户时，用户属性名称：id、loginName、email、telephone，默认是loginName
-    searchField: {
-      type: String,
-      default: 'loginName'
-    },
-    // 多选树时结果之间的分隔符，默认是逗号分隔
-    separator: {
-      type: String,
-      default: ','
-    },
-    // 根据变量限制部门时，根据部门表的哪个字段进行过滤，默认是code
-    limitFilterColumn: {
-      type: String,
-      default: 'code'
-    }
-  },
-  data() {
-    const isMobile = isMobileBrowser()
-    console.log('部门人员树---isMobile=', isMobile)
-    let myTitle = this.$t('imatrixUIMessage.pleaseSelectPersonnel')
-    if (this.title) {
-      myTitle = this.title
-    }
-    return {
-      myTitle,
-      isMobile
-    }
-  },
-  methods: {
-    closeDialog(selectNodeInfo) {
-      $emit(this, 'close', selectNodeInfo)
-    },
-    closedDialog() {
-      $emit(this, 'closed')
-    },
-    openDialog() {
-      $emit(this, 'open')
-    },
-    opendDialog() {
-      $emit(this, 'opend')
-    }
-  },
-  emits: ['close', 'closed', 'open', 'opend']
+	name: 'DepartmentUserTree',
+	components: {
+		DepartmentUserSingleTree,
+		DepartmentUserMultiTree,
+		DepartmentUserMobileTree
+	},
+	props: {
+		// 是否是多选树，默认是true
+		multiple: {
+			type: Boolean,
+			default: true,
+		},
+		// 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
+		departmentInfo: {
+			type: Array,
+			default: null,
+		},
+		// 弹框的标题
+		title: {
+			type: String,
+			default: null,
+		},
+		// 弹框的宽度
+		width: {
+			type: String,
+			default: null,
+		},
+		// 弹框的高度
+		height: {
+			type: String,
+			default: '300px',
+		},
+		// 是否需要显示虚拟用户
+		isNeedVirtualUser: {
+			type: Boolean,
+			default: false,
+		},
+		// 多选用户树时，已选择用户id或登录名集合，多个之间以逗号隔开
+		selectUserInfo: {
+			type: [String, Number],
+			default: null,
+		},
+		// 移除用户时，用户属性名称：id、loginName、email、telephone，默认是loginName
+		searchField: {
+			type: String,
+			default: 'loginName',
+		},
+		// 多选树时结果之间的分隔符，默认是逗号分隔
+		separator: {
+			type: String,
+			default: ',',
+		}
+	},
+	data() {
+    	const isMobile = isMobileBrowser()
+		console.log('部门人员树---isMobile=', isMobile)
+		let myTitle = this.$t('imatrixUIMessage.pleaseSelectPersonnel')
+		if (this.title) {
+			myTitle = this.title
+		}
+		return {
+			myTitle,
+			isMobile
+		}
+	},
+	methods: {
+		closeDialog(selectNodeInfo) {
+			$emit(this, 'close', selectNodeInfo)
+		},
+		closedDialog() {
+			$emit(this, 'closed')
+		},
+		openDialog() {
+			$emit(this, 'open')
+		},
+		opendDialog() {
+			$emit(this, 'opend')
+		},
+	},
+	emits: ['close', 'closed', 'open', 'opend'],
 }
 </script>

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

@@ -118,7 +118,7 @@ import UserResult from './search-result.vue'
 import utils from '../../utils/utils'
 import departmentUserTreeMultiService from './department-user-tree-multi-service'
 import memoryCacheUtils from '../../utils/memory-cache-utils'
-import GroupUserMultipleTree from './group-user-multiple-tree.vue'
+import GroupUserMultipleTree from './group-user-multiple-tree'
 import GroupUser from './group-user/group-user.vue'
 
 export default {
@@ -207,11 +207,6 @@ export default {
     separator: {
       type: String,
       default: ','
-    },
-    // 根据变量限制部门时，根据部门表的哪个字段进行过滤，默认是code
-    limitFilterColumn: {
-      type: String,
-      default: 'code'
     }
   },
   computed: {},

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

@@ -160,11 +160,6 @@ export default {
     isNeedVirtualUser: {
       type: Boolean,
       default: false
-    },
-    // 根据变量限制部门时，根据部门表的哪个字段进行过滤，默认是code
-    limitFilterColumn: {
-      type: String,
-      default: 'code'
     }
   },
   computed: {},

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

@@ -5,7 +5,6 @@
       ref="userTree"
       :height="height"
       :department-info="departmentInfo"
-      :limit-filter-column="limitFilterColumn"
       :select-user-info="selectUserInfo"
       :search-field="searchField"
       :separator="separator"
@@ -15,7 +14,6 @@
       v-if="!multiple"
       ref="userTree"
       :height="height"
-      :limit-filter-column="limitFilterColumn"
       :department-info="departmentInfo"
       @result="result"
     />
@@ -30,53 +28,48 @@ export default {
   name: 'InlineDepartmentUserTree',
   components: {
     InlineDepartmentUserSingleTree,
-    InlineDepartmentUserMultiTree
+    InlineDepartmentUserMultiTree,
   },
   props: {
     // 是否是多选树，默认是true
     multiple: {
       type: Boolean,
-      default: true
+      default: true,
     },
     // 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
     departmentInfo: {
       type: Array,
-      default: null
+      default: null,
     },
     // 弹框的高度
     height: {
       type: String,
-      default: '300px'
+      default: '300px',
     },
     // 是否需要显示虚拟用户
     isNeedVirtualUser: {
       type: Boolean,
-      default: false
+      default: false,
     },
     // 多选用户树时，已选择用户id或登录名集合，多个之间以逗号隔开
     selectUserInfo: {
       type: [String, Number],
-      default: null
+      default: null,
     },
     // 移除用户时，用户属性名称：id、loginName、email、telephone，默认是loginName
     searchField: {
       type: String,
-      default: 'loginName'
+      default: 'loginName',
     },
     // 多选树时结果之间的分隔符，默认是逗号分隔
     separator: {
       type: String,
-      default: ','
+      default: ',',
     },
-    // 根据变量限制部门时，根据部门表的哪个字段进行过滤，默认是code
-    limitFilterColumn: {
-      type: String,
-      default: 'code'
-    }
   },
   data() {
     return {
-      selectNodeInfo: null // 单选时，选择的用户信息
+      selectNodeInfo: null, // 单选时，选择的用户信息
     }
   },
   methods: {
@@ -87,8 +80,8 @@ export default {
     // 嵌入树，多选时，点击确定时调用的方法
     confirmSelectUser() {
       this.$refs.userTree.confirmSelectUser()
-    }
+    },
   },
-  emits: ['result']
+  emits: ['result'],
 }
 </script>

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

@@ -6,7 +6,8 @@ const departmentUserTreeMultiService = {
   filterAppendNodes(value) {
     this.$http
       .post(
-        window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/search-users',
+        window.$vueApp.config.globalProperties.baseAPI +
+          '/component/organization-trees/search-users',
         this.searchParam
       )
       .then((result) => {
@@ -16,7 +17,7 @@ const departmentUserTreeMultiService = {
             this.$message({
               showClose: true,
               type: 'error',
-              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty')
+              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty'),
             })
             return
           }
@@ -26,7 +27,7 @@ const departmentUserTreeMultiService = {
             this.$message({
               showClose: true,
               type: 'error',
-              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty')
+              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty'),
             })
             return
           }
@@ -45,7 +46,11 @@ const departmentUserTreeMultiService = {
     // this.handleSelectUtil(item, localStorage)
     // 查询最新用户信息替换,缓存为历史数据 数据库可能发生变化
     this.$http
-      .get(window.$vueApp.config.globalProperties.baseAPI + '/api/users?loginName=' + item.loginName)
+      .get(
+        window.$vueApp.config.globalProperties.baseAPI +
+          '/api/users?loginName=' +
+          item.loginName
+      )
       .then((userDTO) => {
         if (userDTO !== null) {
           for (const dtoKey in userDTO) {
@@ -83,10 +88,14 @@ const departmentUserTreeMultiService = {
     var param = {
       parentId: data.id,
       branchId: data.branchId,
-      needVirtualUser: this.isNeedVirtualUser
+      needVirtualUser: this.isNeedVirtualUser,
     }
     this.$http
-      .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/department-users', param)
+      .post(
+        window.$vueApp.config.globalProperties.baseAPI +
+          '/component/organization-trees/department-users',
+        param
+      )
       .then((result) => {
         // 更新当前点击的节点的子节点
         this.$refs.deparmentUserTree.updateKeyChildren(data.nodeId, result)
@@ -113,13 +122,17 @@ const departmentUserTreeMultiService = {
       // 表示没有加载过该父节点的子节点集合时
       const param = {
         parentId: parentId,
-        needVirtualUser: this.isNeedVirtualUser
+        needVirtualUser: this.isNeedVirtualUser,
       }
       if (node.data) {
         param.branchId = node.data.branchId
       }
       this.$http
-        .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/department-users', param)
+        .post(
+          window.$vueApp.config.globalProperties.baseAPI +
+            '/component/organization-trees/department-users',
+          param
+        )
         .then((data) => {
           resolve(data)
           // 更新当前点击的节点的子节点，必须加该方法，否则会导致子节点无法选中
@@ -157,14 +170,19 @@ const departmentUserTreeMultiService = {
   loadDepartment(parentId, parentNodeId, isSearch, searchValue) {
     const param = {
       parentId: parentId,
-      needVirtualUser: this.isNeedVirtualUser
+      needVirtualUser: this.isNeedVirtualUser,
     }
     this.$http
-      .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/department-users', param)
+      .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
+          this.$refs.deparmentUserTree.store.nodesMap[parentNodeId].expanded =
+            true
         }
         if (isSearch) {
           // 查询时处理
@@ -183,23 +201,30 @@ const departmentUserTreeMultiService = {
   },
   // 加载指定部门节点
   loadPointDepartments() {
-    debugger
-    let url = window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/point-department-users'
-    if (this.limitFilterColumn) {
-      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
-      }
-    })
+    this.$http
+      .post(
+        window.$vueApp.config.globalProperties.baseAPI +
+          '/component/organization-trees/point-department-users',
+        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
+        }
+      })
   },
   getChildrenDepartmentUsers(childrenDepartmentIds) {
     return new Promise((resolve, reject) => {
       this.$http
         .post(
-          window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/user-in-departments',
+          window.$vueApp.config.globalProperties.baseAPI +
+            '/component/organization-trees/user-in-departments',
           childrenDepartmentIds
         )
         .then((users) => {
@@ -240,7 +265,7 @@ const departmentUserTreeMultiService = {
     const tenantNodeId = -1
     var allUser = {
       id: tenantNodeId,
-      name: '所有用户'
+      name: '所有用户',
     }
     return allUser
   },
@@ -250,7 +275,7 @@ const departmentUserTreeMultiService = {
     const tenantNodeId = -1
     var allUser = {
       id: tenantNodeId,
-      name: '所有工作组人员'
+      name: '所有工作组人员',
     }
     return allUser
   },
@@ -279,6 +304,6 @@ const departmentUserTreeMultiService = {
         resolve(selectDepts)
       }
     })
-  }
+  },
 }
 export default departmentUserTreeMultiService

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

@@ -7,7 +7,8 @@ const departmentUserTreeSingleService = {
   filterAppendNodes(value) {
     this.$http
       .post(
-        window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/search-users',
+        window.$vueApp.config.globalProperties.baseAPI +
+          '/component/organization-trees/search-users',
         this.searchParam
       )
       .then((result) => {
@@ -18,7 +19,7 @@ const departmentUserTreeSingleService = {
             this.$message({
               showClose: true,
               type: 'error',
-              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty')
+              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty'),
             })
             return
           }
@@ -28,7 +29,7 @@ const departmentUserTreeSingleService = {
             this.$message({
               showClose: true,
               type: 'error',
-              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty')
+              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty'),
             })
             return
           }
@@ -47,7 +48,11 @@ const departmentUserTreeSingleService = {
     // this.handleSelectUtil(item, localStorage)
     // 查询最新用户信息替换,缓存为历史数据 数据库可能发生变化
     this.$http
-      .get(window.$vueApp.config.globalProperties.baseAPI + '/api/users?loginName=' + item.loginName)
+      .get(
+        window.$vueApp.config.globalProperties.baseAPI +
+          '/api/users?loginName=' +
+          item.loginName
+      )
       .then((userDTO) => {
         if (userDTO !== null) {
           for (const dtoKey in userDTO) {
@@ -95,13 +100,17 @@ const departmentUserTreeSingleService = {
       // 表示没有加载过该父节点的子节点集合时
       const param = {
         parentId: parentId,
-        needVirtualUser: this.isNeedVirtualUser
+        needVirtualUser: this.isNeedVirtualUser,
       }
       if (node.data) {
         param.branchId = node.data.branchId
       }
       this.$http
-        .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/department-users', param)
+        .post(
+          window.$vueApp.config.globalProperties.baseAPI +
+            '/component/organization-trees/department-users',
+          param
+        )
         .then((data) => {
           resolve(data)
           // 更新当前点击的节点的子节点，必须加该方法，否则会导致子节点无法选中
@@ -125,30 +134,41 @@ const departmentUserTreeSingleService = {
   loadDepartment(parentId, parentNodeId, isSearch, searchValue) {
     const param = {
       parentId: parentId,
-      needVirtualUser: this.isNeedVirtualUser
+      needVirtualUser: this.isNeedVirtualUser,
     }
     this.$http
-      .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/department-users', param)
-      .then((children) => {
-        if (this.$refs.deparmentUserTree) {
-          this.$refs.deparmentUserTree.updateKeyChildren(parentNodeId, children)
-          if (this.$refs.deparmentUserTree.store.nodesMap[parentNodeId]) {
+      .post(
+        window.$vueApp.config.globalProperties.baseAPI +
+          '/component/organization-trees/department-users',
+        param
+      )
+			.then((children) => {
+				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
-          }
-        }
+					}
+				}
       })
   },
   loadPointDepartments() {
-    let url = window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/point-department-users'
-    if (this.limitFilterColumn) {
-      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
-      }
-    })
-  }
+    this.$http
+      .post(
+        window.$vueApp.config.globalProperties.baseAPI +
+          '/component/organization-trees/point-department-users',
+        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
+        }
+      })
+  },
 }
 export default departmentUserTreeSingleService