agilebuilder-ui 1.0.91 → 1.0.93-temp2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.91",
+  "version": "1.0.93-temp2",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -6,8 +6,7 @@ const departmentTreeService = {
   filterAppendNodes(value) {
     this.$http
       .post(
-        window.$vueApp.config.globalProperties.baseAPI +
-          '/component/organization-trees/search-pc-depts',
+        window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/search-pc-depts',
         this.searchParam
       )
       .then((result) => {
@@ -17,7 +16,7 @@ const departmentTreeService = {
             this.$message({
               showClose: true,
               type: 'error',
-              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty'),
+              message: getI18n().t('imatrixUIMessage.queryResultIsEmpty')
             })
             return
           }
@@ -35,7 +34,7 @@ const departmentTreeService = {
           this.$message({
             showClose: true,
             type: 'error',
-            message: getI18n().t('imatrixUIMessage.queryResultIsEmpty'),
+            message: getI18n().t('imatrixUIMessage.queryResultIsEmpty')
           })
         }
       })
@@ -55,11 +54,7 @@ const departmentTreeService = {
     // this.handleSelectUtil(item, localStorage)
     // 查询最新部门信息替换,缓存为历史数据 数据库可能发生变化
     this.$http
-      .get(
-        window.$vueApp.config.globalProperties.baseAPI +
-          '/api/departments?departmentCode=' +
-          item.code
-      )
+      .get(window.$vueApp.config.globalProperties.baseAPI + '/api/departments?departmentCode=' + item.code)
       .then((departmentDTO) => {
         if (departmentDTO !== null) {
           for (const dtoKey in departmentDTO) {
@@ -72,9 +67,7 @@ const departmentTreeService = {
         this.searchValue = ''
         this.setMemoryCacheData(item, 'department')
         if (this.multiple) {
-          const index = this.selectResult.findIndex(
-            (selectEntity) => selectEntity.code === item.code
-          )
+          const index = this.selectResult.findIndex((selectEntity) => selectEntity.code === item.code)
           if (index < 0) {
             this.selectResult.push(item)
           }
@@ -144,9 +137,7 @@ const departmentTreeService = {
           // 不是叶子节点，并且没有加载过该父节点的子节点时，需要走后台展开子节点
           this.$http
             .get(
-              window.$vueApp.config.globalProperties.baseAPI +
-                '/component/organization-trees/departments/' +
-                data.id
+              window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/departments/' + data.id
             )
             .then((result) => {
               // 更新当前点击的节点的子节点
@@ -193,21 +184,22 @@ const departmentTreeService = {
     if (this.$refs.deparmentTree) {
       checkedKeys = this.$refs.deparmentTree.getCheckedKeys()
     }
+    if (parentId === -1 && node.data.childDepartments && node.data.childDepartments.length > 0) {
+      // 表示初始化树时，展开公司节点
+      resolve(node.data.childDepartments)
+      return
+    }
     // 初始化部门树
     this.initLoadDepartment(parentId, node, resolve, checkedKeys)
   },
   // 初始化部门树
   initLoadDepartment(parentId, node, resolve, checkedKeys) {
     this.$http
-      .get(
-        window.$vueApp.config.globalProperties.baseAPI +
-          '/component/organization-trees/departments/' +
-          parentId
-      )
+      .get(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/departments/' + parentId)
       .then((data) => {
         resolve(data)
         // 更新当前点击的节点的子节点
-        this.$refs.deparmentTree.updateKeyChildren(parentId, data)
+        // this.$refs.deparmentTree.updateKeyChildren(parentId, data)
         if (parentId === 0) {
           // 初始化树时，展开公司节点
           const tenantData = data[0].data
@@ -242,11 +234,7 @@ const departmentTreeService = {
   loadDepartment(parentId, isSearch, searchValue) {
     return new Promise((resolve, reject) => {
       this.$http
-        .get(
-          window.$vueApp.config.globalProperties.baseAPI +
-            '/component/organization-trees/departments/' +
-            parentId
-        )
+        .get(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/departments/' + parentId)
         .then((children) => {
           this.$refs.deparmentTree.updateKeyChildren(parentId, children)
           if (this.$refs.deparmentTree.store.nodesMap[parentId]) {
@@ -263,15 +251,13 @@ const departmentTreeService = {
   loadPointDepartments() {
     this.$http
       .post(
-        window.$vueApp.config.globalProperties.baseAPI +
-          '/component/organization-trees/point-departments',
+        window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/point-departments',
         this.departmentInfo
       )
       .then((children) => {
         this.$refs.deparmentTree.updateKeyChildren(this.tenantNodeId, children)
         if (this.$refs.deparmentTree.store.nodesMap[this.tenantNodeId]) {
-          this.$refs.deparmentTree.store.nodesMap[this.tenantNodeId].expanded =
-            true
+          this.$refs.deparmentTree.store.nodesMap[this.tenantNodeId].expanded = true
         }
       })
   },
@@ -306,7 +292,7 @@ const departmentTreeService = {
     // 表示集合中不存在该用户，则封装该用户
     var allDept = {
       id: this.tenantNodeId,
-      name: '所有部门',
+      name: '所有部门'
     }
     return allDept
   },
@@ -314,20 +300,13 @@ const departmentTreeService = {
     return new Promise((resolve, reject) => {
       const selectDepts = []
       if (this.selectDepartmentInfo) {
-        if (
-          this.selectDepartmentInfo === this.tenantNodeId ||
-          this.selectDepartmentInfo === '所有部门'
-        ) {
+        if (this.selectDepartmentInfo === this.tenantNodeId || this.selectDepartmentInfo === '所有部门') {
           // 表示已选择所有用户
           selectDepts.push(this.packageAllDept())
           resolve(selectDepts)
         } else {
           // 表示不是选择的所有用户
-          this.getSelectDepts(
-            this.searchField,
-            this.selectDepartmentInfo,
-            this.separator
-          )
+          this.getSelectDepts(this.searchField, this.selectDepartmentInfo, this.separator)
             .then((departments) => {
               resolve(departments)
             })
@@ -339,6 +318,6 @@ const departmentTreeService = {
         resolve(selectDepts)
       }
     })
-  },
+  }
 }
 export default departmentTreeService