agilebuilder-ui 1.1.36-sit5 → 1.1.36-tmp2

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

@@ -1,124 +1,101 @@
-export function getTenant() {
+export function getTenant () {
   const parentId = 0
-  return window['$vueApp'].config.globalProperties.$http.get(
-    window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/departments/' + parentId
-  )
+  return window['$vueApp'].config.globalProperties.$http.get(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/departments/' + parentId)
 }
 
 // 获得公司节点的孩子节点
-export function getTenantChildren(departmentInfo, tenantNodeId, limitFilterColumn) {
-  if (departmentInfo && departmentInfo.length > 0) {
-    // 加载指定部门时，展开公司节点
-    return loadPointDepartments(departmentInfo, limitFilterColumn)
-  } else {
-    // 加载整个组织结构树时，展开公司节点
-    return loadDepartment(tenantNodeId)
-  }
+export function getTenantChildren (departmentInfo, tenantNodeId) {
+    if (departmentInfo && departmentInfo.length > 0) {
+      // 加载指定部门时，展开公司节点
+      return loadPointDepartments(departmentInfo)
+    } else {
+      // 加载整个组织结构树时，展开公司节点
+      return loadDepartment(tenantNodeId)
+    }
+  
 }
 
-// 加载指定部门节点
-export function loadPointDepartments(departmentInfo, limitFilterColumn) {
-  let url = window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/point-departments'
-  if (limitFilterColumn) {
-    url += '/' + limitFilterColumn
-  }
-  return new Promise((resolve, reject) => {
-    window['$vueApp'].config.globalProperties.$http.post(url, departmentInfo).then((children) => {
+
+  // 加载指定部门节点
+export function loadPointDepartments (departmentInfo) {
+  return new Promise((resolve,reject)=>{
+    window['$vueApp'].config.globalProperties.$http.post(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/point-departments', departmentInfo).then(children => {
       resolve(children)
     })
   })
 }
 
-// 加载当前节点的子节点
-export function loadDepartment(parentId) {
-  return new Promise((resolve, reject) => {
-    window['$vueApp'].config.globalProperties.$http
-      .get(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/departments/' + parentId)
-      .then((children) => {
+
+  // 加载当前节点的子节点
+  export function loadDepartment (parentId) {
+    return new Promise((resolve,reject)=>{
+       window['$vueApp'].config.globalProperties.$http.get(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/departments/' + parentId)
+      .then(children => {
         resolve(children)
       })
-  })
-}
-export function checkedDeptDefault(selectDepts, defaultCheckedKeys) {
-  defaultCheckedKeys = []
-  selectDepts.forEach((dept) => {
-    defaultCheckedKeys.push(dept.nodeId)
-  })
-}
+    })
+  }
+  export function checkedDeptDefault (selectDepts, defaultCheckedKeys) {
+    defaultCheckedKeys = []
+    selectDepts.forEach(dept => {
+      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) => {
+  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) => {
+      }).catch(error => {
         reject(error)
       })
-  })
-}
-function getSelectDepts(searchField, selectDeptInfo, separator) {
-  return new Promise((resolve, reject) => {
-    if (!searchField) {
-      resolve([])
-    } else if (!selectDeptInfo) {
-      resolve([])
-    } else {
-      window['$vueApp'].config.globalProperties.$http
-        .get(
-          window['$vueApp'].config.globalProperties.baseAPI +
-            '/component/organization-trees/select-departments?searchField=' +
-            searchField +
-            '&selectDeptInfo=' +
-            selectDeptInfo +
-            '&separator=' +
-            separator
-        )
-        .then((departments) => {
+    })
+  }
+  function  getSelectDepts (searchField, selectDeptInfo, separator) {
+    return new Promise((resolve, reject) => {
+      if (!searchField) {
+        resolve([])
+      } else if (!selectDeptInfo) {
+        resolve([])
+      } else {
+        window['$vueApp'].config.globalProperties.$http.get(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/select-departments?searchField=' + searchField + '&selectDeptInfo=' + selectDeptInfo + '&separator=' + separator).then(departments => {
           resolve(departments)
-        })
-        .catch((error) => {
+        }).catch(error => {
           reject(error)
         })
-    }
-  })
-}
-
-export function initSelectDepts(selectDepartmentInfo, tenantNodeId, searchField, separator) {
-  return new Promise((resolve, reject) => {
-    const selectDepts = []
-    if (selectDepartmentInfo) {
-      if (selectDepartmentInfo === tenantNodeId || selectDepartmentInfo === '所有部门') {
-        // 表示已选择所有用户
-        selectDepts.push(packageAllDept(tenantNodeId))
-        resolve(selectDepts)
-      } else {
-        // 表示不是选择的所有用户
-        getSelectDepts(searchField, selectDepartmentInfo, separator)
-          .then((departments) => {
+      }
+    })
+  }
+  
+  export function initSelectDepts (selectDepartmentInfo, tenantNodeId, searchField, separator) {
+    return new Promise((resolve, reject) => {
+      const selectDepts = []
+      if (selectDepartmentInfo) {
+        if (selectDepartmentInfo === tenantNodeId || selectDepartmentInfo === '所有部门') {
+          // 表示已选择所有用户
+          selectDepts.push(packageAllDept(tenantNodeId))
+          resolve(selectDepts)
+        } else {
+          // 表示不是选择的所有用户
+          getSelectDepts(searchField, selectDepartmentInfo, separator).then(departments => {
             resolve(departments)
-          })
-          .catch((error) => {
+          }).catch(error => {
             reject(error)
           })
+        }
+      } else {
+        resolve(selectDepts)
       }
-    } else {
-      resolve(selectDepts)
-    }
-  })
-}
+    })
+  }
 
-// 选中了组织结构树的根节点
-function packageAllDept(tenantNodeId) {
-  // 表示集合中不存在该用户，则封装该用户
-  var allDept = {
-    id: tenantNodeId,
-    name: '所有部门'
+   // 选中了组织结构树的根节点
+function packageAllDept (tenantNodeId) {
+    // 表示集合中不存在该用户，则封装该用户
+    var allDept = {
+      id: tenantNodeId,
+      name: '所有部门'
+    }
+    return allDept
   }
-  return allDept
-}

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

@@ -1,131 +1,134 @@
 <template>
-  <div>
-    <el-dialog
-      ref="userDialog"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="myTitle"
-      :width="width"
-      append-to-body
-      class="user-tree"
-      model-value
-      @close="$emit('closeDialog')"
-      @closed="$emit('closedDialog')"
-      @open="$emit('openDialog')"
-      @opend="$emit('opendDialog')"
-    >
-      <inline-department-user-multi-tree
-        ref="inlineDepartmentUser"
-        :department-info="departmentInfo"
-        :height="height"
-        :is-need-virtual-user="isNeedVirtualUser"
-        :limit-filter-column="limitFilterColumn"
-        :search-field="searchField"
-        :select-user-info="selectUserInfo"
-        :separator="separator"
-        @result="result"
-      />
-      <template v-slot:footer>
-        <div class="dialog-footer">
-          <el-button size="default" @click="$emit('closeDialog')">
-            {{ $t('imatrixUIPublicModel.cancel') }}
-          </el-button>
-          <el-button size="default" type="primary" @click="confirmSelectUser">
-            {{ $t('imatrixUIPublicModel.sure') }}
-          </el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
+	<div>
+		<el-dialog
+				ref="userDialog"
+				:close-on-click-modal="false"
+				:close-on-press-escape="false"
+				:title="myTitle"
+				:width="width"
+				append-to-body
+				class="user-tree"
+				model-value
+				@close="$emit('closeDialog')"
+				@closed="$emit('closedDialog')"
+				@open="$emit('openDialog')"
+				@opend="$emit('opendDialog')"
+		>
+			<inline-department-user-multi-tree
+					ref="inlineDepartmentUser"
+					:department-info="departmentInfo"
+					:height="height"
+					:is-need-virtual-user="isNeedVirtualUser"
+					:search-field="searchField"
+					:select-user-info="selectUserInfo"
+					:separator="separator"
+					@result="result"
+			/>
+			<template v-slot:footer>
+				<div class="dialog-footer">
+					<el-button size="default" @click="$emit('closeDialog')">
+						{{ $t('imatrixUIPublicModel.cancel') }}
+					</el-button>
+					<el-button size="default" type="primary" @click="confirmSelectUser">
+						{{ $t('imatrixUIPublicModel.sure') }}
+					</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import { $emit } from '../../utils/gogocodeTransfer'
-import InlineDepartmentUserMultiTree from '../../department-user-tree-inline/src/department-user-multiple-tree-inline.vue'
+import {$emit} from '../../utils/gogocodeTransfer'
+import InlineDepartmentUserMultiTree
+	from '../../department-user-tree-inline/src/department-user-multiple-tree-inline.vue'
 
 export default {
-  name: 'DepartmentUserMultiTree',
-  components: {
-    InlineDepartmentUserMultiTree
-  },
-  props: {
-    // 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
-    departmentInfo: {
-      type: Array,
-      default: null
-    },
-    // 弹框的标题
-    title: {
-      type: String,
-      default: null
-    },
-    // 弹框的宽度
-    width: {
-      type: String,
-      default: '920px'
-    },
-    // 弹框的高度
-    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() {
-    let myTitle = this.$t('imatrixUIMessage.pleaseSelectPersonnel')
-    if (this.title) {
-      myTitle = this.title
-    }
-    return {
-      myTitle
-    }
-  },
-  methods: {
-    result(selectNodeInfo) {
-      $emit(this, 'closeDialog', selectNodeInfo)
-    },
-    confirmSelectUser() {
-      this.$refs.inlineDepartmentUser.confirmSelectUser()
-    }
-  },
-  emits: ['openDialog', 'opendDialog', 'closeDialog', 'closedDialog', 'opendDialog', 'closeDialog', 'closedDialog']
+	name: 'DepartmentUserMultiTree',
+	components: {
+		InlineDepartmentUserMultiTree,
+	},
+	props: {
+		// 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
+		departmentInfo: {
+			type: Array,
+			default: null,
+		},
+		// 弹框的标题
+		title: {
+			type: String,
+			default: null,
+		},
+		// 弹框的宽度
+		width: {
+			type: String,
+			default: '920px',
+		},
+		// 弹框的高度
+		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() {
+		let myTitle = this.$t('imatrixUIMessage.pleaseSelectPersonnel')
+		if (this.title) {
+			myTitle = this.title
+		}
+		return {
+			myTitle,
+		}
+	},
+	methods: {
+		result(selectNodeInfo) {
+			$emit(this, 'closeDialog', selectNodeInfo)
+		},
+		confirmSelectUser() {
+			this.$refs.inlineDepartmentUser.confirmSelectUser()
+		},
+	},
+	emits: [
+		'openDialog',
+		'opendDialog',
+		'closeDialog',
+		'closedDialog',
+		'opendDialog',
+		'closeDialog',
+		'closedDialog',
+	],
 }
 </script>
 
 <style>
 .searchResult {
-  color: red;
+	color: red;
 }
 
 .inline-select-custom {
-  width: 100px;
+	width: 100px;
 }
 
 .inline-input-custom {
-  width: 98%;
+	width: 98%;
 }
 </style>

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

@@ -1,93 +1,96 @@
 <template>
-  <div>
-    <el-dialog
-      :close-on-click-modal="false"
-      :title="myTitle"
-      :width="width"
-      append-to-body
-      class="user-tree"
-      model-value
-      @close="$emit('closeDialog')"
-      @closed="$emit('closedDialog')"
-      @open="$emit('openDialog')"
-      @opend="$emit('opendDialog')"
-    >
-      <inline-department-user-single-tree
-        ref="inlineDepartmentUser"
-        :department-info="departmentInfo"
-        :is-need-virtual-user="isNeedVirtualUser"
-        :limit-filter-column="limitFilterColumn"
-        @result="result"
-      />
-      <template v-slot:footer>
-        <div class="dialog-footer">
-          <el-button size="default" @click="$emit('closeDialog')">
-            {{ $t('imatrixUIPublicModel.cancel') }}
-          </el-button>
-          <el-button size="default" type="primary" @click="confirmSelectUser">
-            {{ $t('imatrixUIPublicModel.sure') }}
-          </el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
+	<div>
+		<el-dialog
+				:close-on-click-modal="false"
+				:title="myTitle"
+				:width="width"
+				append-to-body
+				class="user-tree"
+				model-value
+				@close="$emit('closeDialog')"
+				@closed="$emit('closedDialog')"
+				@open="$emit('openDialog')"
+				@opend="$emit('opendDialog')"
+		>
+			<inline-department-user-single-tree
+					ref="inlineDepartmentUser"
+					:department-info="departmentInfo"
+					:is-need-virtual-user="isNeedVirtualUser"
+					@result="result"
+			/>
+			<template v-slot:footer>
+				<div class="dialog-footer">
+					<el-button size="default" @click="$emit('closeDialog')">
+						{{ $t('imatrixUIPublicModel.cancel') }}
+					</el-button>
+					<el-button size="default" type="primary" @click="confirmSelectUser">
+						{{ $t('imatrixUIPublicModel.sure') }}
+					</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import { $emit } from '../../utils/gogocodeTransfer'
-import InlineDepartmentUserSingleTree from '../../department-user-tree-inline/src/department-user-single-tree-inline.vue'
+import {$emit} from '../../utils/gogocodeTransfer'
+import InlineDepartmentUserSingleTree
+	from '../../department-user-tree-inline/src/department-user-single-tree-inline.vue'
 
 export default {
-  name: 'DepartmentUserSingleTree',
-  components: {
-    InlineDepartmentUserSingleTree
-  },
-  props: {
-    // 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
-    departmentInfo: {
-      type: Array,
-      default: null
-    },
-    // 弹框的标题
-    title: {
-      type: String,
-      default: null
-    },
-    // 弹框的宽度
-    width: {
-      type: String,
-      default: '30%'
-    },
-    // 是否需要显示虚拟用户
-    isNeedVirtualUser: {
-      type: Boolean,
-      default: false
-    },
-    // 根据变量限制部门时，根据部门表的哪个字段进行过滤，默认是code
-    limitFilterColumn: {
-      type: String,
-      default: 'code'
-    }
-  },
-  data() {
-    let myTitle = this.$t('imatrixUIMessage.pleaseSelectPersonnel')
-    if (this.title) {
-      myTitle = this.title
-    }
-    return {
-      myTitle
-    }
-  },
-  methods: {
-    result(selectNodeInfo) {
-      $emit(this, 'closeDialog', selectNodeInfo)
-    },
-    confirmSelectUser() {
-      // this.$refs.inlineDepartmentUser.confirmSelectUser()
-      // selectNodeInfo
-      $emit(this, 'closeDialog', this.$refs.inlineDepartmentUser.selectNodeInfo)
-    }
-  },
-  emits: ['openDialog', 'opendDialog', 'closeDialog', 'closedDialog', 'opendDialog', 'closeDialog', 'closedDialog']
+	name: 'DepartmentUserSingleTree',
+	components: {
+		InlineDepartmentUserSingleTree,
+	},
+	props: {
+		// 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
+		departmentInfo: {
+			type: Array,
+			default: null,
+		},
+		// 弹框的标题
+		title: {
+			type: String,
+			default: null,
+		},
+		// 弹框的宽度
+		width: {
+			type: String,
+			default: '30%',
+		},
+		// 是否需要显示虚拟用户
+		isNeedVirtualUser: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	data() {
+		let myTitle = this.$t('imatrixUIMessage.pleaseSelectPersonnel')
+		if (this.title) {
+			myTitle = this.title
+		}
+		return {
+			myTitle,
+		}
+	},
+	methods: {
+		result(selectNodeInfo) {
+			$emit(this, 'closeDialog', selectNodeInfo)
+		},
+		confirmSelectUser() {
+			// this.$refs.inlineDepartmentUser.confirmSelectUser()
+			// selectNodeInfo
+			$emit(this, 'closeDialog', this.$refs.inlineDepartmentUser.selectNodeInfo)
+		},
+	},
+	emits: [
+		'openDialog',
+		'opendDialog',
+		'closeDialog',
+		'closedDialog',
+		'opendDialog',
+		'closeDialog',
+		'closedDialog',
+	],
 }
 </script>