three-trees-ui 1.0.23 → 1.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,

package/packages/CustomDialog/src/customDialog.vue

@@ -525,6 +525,8 @@
         writeable: true,
         fixedParams: {}, // 传过来的固定值
         executeScriptResult: null,
+        customDialogParams: {},
+        treeDialogConfig: null,
       }
     },
     computed: {
@@ -863,7 +865,7 @@
             ? customDialog.requestType
             : 'POST'
         var url =
-          '${form}/form/customDialog/v1/getTreeData?alias=' +
+          '${form}/form/customDialog/v1/getTreeDataByPid?alias=' +
           pageParam.alias +
           '&mapParam=' +
           mapParam
@@ -924,6 +926,7 @@
         requestParams.requestType = requestType
         requestParams.url = url
         requestParams.paramsObj = paramsObj
+        this.customDialogParams = requestParams
         this.searchTree(requestParams, defaultPValue)
         this.customDialogShowTree = true
       },
@@ -946,13 +949,18 @@
           if (defaultPValue) {
             displayfield.pvalue = defaultPValue
           }
-          this_.props1 = this_.toTreeData(
-            response,
-            displayfield.id,
-            displayfield.pid,
-            displayfield.displayName,
-            displayfield.pvalue ? displayfield.pvalue : 0
-          )
+          // restful 接口不懒加载
+          if (this_.customDialog.dsType != 'dataSource') {
+            this_.props1 = this_.toTreeData(
+              response,
+              displayfield.id,
+              displayfield.pid,
+              displayfield.displayName,
+              displayfield.pvalue ? displayfield.pvalue : 0
+            )
+          } else {
+            this_.props1 = response
+          }
         })
       },
       dialogTreeConfirm() {
@@ -1843,11 +1851,40 @@
             this_.customDialog.style == 2
               ? this_.combiTreeDisplayField
               : this_.displayField
-          resolve(
-            this.treeList.filter(
-              (value) => value[displayField.pid] === node.data[displayField.id]
+          // restful 接口不懒加载
+          if (
+            (this.customDialog.style == 2 &&
+              this.treeDialogConfig &&
+              this.treeDialogConfig.dsType != 'dataSource') ||
+            (this.customDialog.style != 2 &&
+              this.customDialog.dsType != 'dataSource')
+          ) {
+            resolve(
+              this.treeList.filter(
+                (value) =>
+                  value[displayField.pid] === node.data[displayField.id]
+              )
             )
-          )
+          } else {
+            const nodeDataId = node.data[displayField.id]
+            if (nodeDataId) {
+              let { url } = this_.customDialogParams
+              let ljChar = url.indexOf('?') == -1 ? '?' : '&'
+              url = url + ljChar + '&pidValue=' + nodeDataId
+              let query = this.$requestConfig.request({
+                url: url,
+                method:
+                  this_.customDialogParams.requestType == 'POST'
+                    ? 'post'
+                    : 'get',
+                data: this_.customDialogParams.paramsObj,
+              })
+              query.then(function(response) {
+                resolve(response)
+              })
+            }
+          }
+
           if (this.showData && this.showData.length > 0) {
             setTimeout(() => {
               this.showData.forEach((v) => {
@@ -1936,6 +1973,7 @@
         //获取对话框数据
         this.$requestConfig.getCustomDialogByAlias(treeAlias).then((resp) => {
           let treeDialog = resp
+          this.treeDialogConfig = resp
           this.leftTreeTitle = treeDialog.name
           let requestType =
             treeDialog.dsType == 'dataSource'
@@ -1944,7 +1982,7 @@
               ? treeDialog.requestType
               : 'post'
           let url =
-            '${form}/form/customDialog/v1/getTreeData?alias=' +
+            '${form}/form/customDialog/v1/getTreeDataByPid?alias=' +
             treeAlias +
             '&mapParam='
           let paramsObj = {}
@@ -1978,6 +2016,7 @@
           requestParams.requestType = requestType
           requestParams.url = url
           requestParams.paramsObj = paramsObj
+          this.customDialogParams = requestParams
 
           this.$requestConfig
             .request({
@@ -1991,14 +2030,19 @@
                 this.defaultProps.label = displayField.displayName
                 this.treeList = resp
                 this.combiTreeDisplayField = displayField
-                this.combinationTreeData = this.toTreeData(
-                  resp,
-                  displayField.id,
-                  displayField.pid,
-                  displayField.displayName,
-                  displayField.pvalue ? displayField.pvalue : '0',
-                  resultfield
-                )
+                // restful 接口不懒加载
+                if (treeDialog.dsType != 'dataSource') {
+                  this.combinationTreeData = this.toTreeData(
+                    resp,
+                    displayField.id,
+                    displayField.pid,
+                    displayField.displayName,
+                    displayField.pvalue ? displayField.pvalue : '0',
+                    resultfield
+                  )
+                } else {
+                  this.combinationTreeData = resp
+                }
               }
             })
         })

package/packages/CustomDialog/src/customMobileDialog.vue

@@ -438,6 +438,8 @@
         combinationRule: {},
         leftTreeTitle: '',
         fixedParams: {}, // 传过来的固定值
+        customDialogParams: {},
+        treeDialogConfig: null,
       }
     },
     computed: {
@@ -786,7 +788,7 @@
             ? customDialog.requestType
             : 'POST'
         var url =
-          '${form}/form/customDialog/v1/getTreeData?alias=' +
+          '${form}/form/customDialog/v1/getTreeDataByPid?alias=' +
           pageParam.alias +
           '&mapParam=' +
           mapParam
@@ -847,6 +849,7 @@
         requestParams.requestType = requestType
         requestParams.url = url
         requestParams.paramsObj = paramsObj
+        this.customDialogParams = requestParams
         this.searchTree(requestParams, defaultPValue)
         this.customDialogShowTree = true
       },
@@ -869,13 +872,18 @@
           if (defaultPValue) {
             displayfield.pvalue = defaultPValue
           }
-          this_.props1 = this_.toTreeData(
-            response,
-            displayfield.id,
-            displayfield.pid,
-            displayfield.displayName,
-            displayfield.pvalue ? displayfield.pvalue : 0
-          )
+          // restful 接口不懒加载
+          if (this_.customDialog.dsType != 'dataSource') {
+            this_.props1 = this_.toTreeData(
+              response,
+              displayfield.id,
+              displayfield.pid,
+              displayfield.displayName,
+              displayfield.pvalue ? displayfield.pvalue : 0
+            )
+          } else {
+            this_.props1 = response
+          }
         })
       },
       dialogTreeConfirm() {
@@ -1628,11 +1636,39 @@
             this_.customDialog.style == 2
               ? this_.combiTreeDisplayField
               : this_.displayField
-          resolve(
-            this.treeList.filter(
-              (value) => value[displayField.pid] === node.data[displayField.id]
+          // restful 接口不懒加载
+          if (
+            (this.customDialog.style == 2 &&
+              this.treeDialogConfig &&
+              this.treeDialogConfig.dsType != 'dataSource') ||
+            (this.customDialog.style != 2 &&
+              this.customDialog.dsType != 'dataSource')
+          ) {
+            resolve(
+              this.treeList.filter(
+                (value) =>
+                  value[displayField.pid] === node.data[displayField.id]
+              )
             )
-          )
+          } else {
+            const nodeDataId = node.data[displayField.id]
+            if (nodeDataId) {
+              let { url } = this_.customDialogParams
+              let ljChar = url.indexOf('?') == -1 ? '?' : '&'
+              url = url + ljChar + '&pidValue=' + nodeDataId
+              let query = this.$requestConfig.request({
+                url: url,
+                method:
+                  this_.customDialogParams.requestType == 'POST'
+                    ? 'post'
+                    : 'get',
+                data: this_.customDialogParams.paramsObj,
+              })
+              query.then(function(response) {
+                resolve(response)
+              })
+            }
+          }
           if (this.showData && this.showData.length > 0) {
             setTimeout(() => {
               this.showData.forEach((v) => {
@@ -1712,6 +1748,7 @@
         //获取对话框数据
         this.$requestConfig.getCustomDialogByAlias(treeAlias).then((resp) => {
           let treeDialog = resp
+          this.treeDialogConfig = resp
           this.leftTreeTitle = treeDialog.name
           let requestType =
             treeDialog.dsType == 'dataSource'
@@ -1720,7 +1757,7 @@
               ? treeDialog.requestType
               : 'post'
           let url =
-            '${form}/form/customDialog/v1/getTreeData?alias=' +
+            '${form}/form/customDialog/v1/getTreeDataByPid?alias=' +
             treeAlias +
             '&mapParam='
           let paramsObj = {}
@@ -1754,6 +1791,7 @@
           requestParams.requestType = requestType
           requestParams.url = url
           requestParams.paramsObj = paramsObj
+          this.customDialogParams = requestParams
 
           this.$requestConfig
             .request({
@@ -1767,14 +1805,19 @@
                 this.defaultProps.label = displayField.displayName
                 this.treeList = resp
                 this.combiTreeDisplayField = displayField
-                this.combinationTreeData = this.toTreeData(
-                  resp,
-                  displayField.id,
-                  displayField.pid,
-                  displayField.displayName,
-                  displayField.pvalue ? displayField.pvalue : '0',
-                  resultfield
-                )
+                // restful 接口不懒加载
+                if (treeDialog.dsType != 'dataSource') {
+                  this.combinationTreeData = this.toTreeData(
+                    resp,
+                    displayField.id,
+                    displayField.pid,
+                    displayField.displayName,
+                    displayField.pvalue ? displayField.pvalue : '0',
+                    resultfield
+                  )
+                } else {
+                  this.combinationTreeData = resp
+                }
               }
             })
         })

package/packages/DimensionSelector/src/main.vue

@@ -106,6 +106,7 @@
           @reset="reset"
           @row-click="(row) => $emit('row-click', row)"
           @page-change="(page) => $emit('page-change', page)"
+          @size-change="(size) => $emit('size-change', size)"
         >
           <template #detail="{ item }">
             <ht-icon

package/packages/DimensionSelectorInput/src/main.vue

@@ -28,6 +28,7 @@
       @search="handleSearch"
       @reset="handleReset"
       @page-change="handlePageChange"
+      @size-change="handleSizeChange"
       @row-click="(row) => $emit('row-click', row)"
       @select-data="(data) => $emit('select-data', data)"
     ></ht-dimension-selector>
@@ -150,6 +151,10 @@
         // 搜索模式下或者未进行过滤时，查询所有数据
         this.handleLoad(page)
       },
+      handleSizeChange(size) {
+        this.pagination.pageSize = size
+        this.handlePageChange(this.pagination.page)
+      },
       // 获取查询参数中的分页信息(不传page时默认查询第一页)
       getPageBean(page) {
         const pageBean = { ...this.pagination }

package/packages/JobSelector/src/JobSelectorDialog.vue

@@ -41,6 +41,7 @@
         @reset="reset"
         @row-click="(row) => $emit('row-click', row)"
         @page-change="(page) => $emit('page-change', page)"
+        @size-change="(size) => $emit('size-change', size)"
       >
         <template #detail="{ item }">
           <ht-icon

package/packages/JobSelector/src/main.vue

@@ -103,6 +103,7 @@
       @row-click="(row) => $emit('row-click', row)"
       @select-data="(data) => $emit('select-data', data)"
       @page-change="(page) => $emit('page-change', page)"
+      @size-change="(size) => $emit('size-change', size)"
     />
   </div>
 </template>

package/packages/JobSelectorInput/src/main.vue

@@ -30,6 +30,7 @@
       @search="handleSearch"
       @reset="handleReset"
       @page-change="handlePageChange"
+      @size-change="handleSizeChange"
       @row-click="(row) => $emit('row-click', row)"
       @select-data="(data) => $emit('select-data', data)"
     ></ht-job-selector>
@@ -155,6 +156,10 @@
         // 搜索模式下或者未进行过滤时，查询所有数据
         this.handleLoad(page)
       },
+      handleSizeChange(size) {
+        this.pagination.pageSize = size
+        this.handlePageChange(this.pagination.page)
+      },
       // 获取查询参数中的分页信息(不传page时默认查询第一页)
       getPageBean(page) {
         const pageBean = { ...this.pagination }

package/packages/ListSelector/src/ListSelector.vue

@@ -53,7 +53,7 @@
           </div>
           <div v-if="data.length > 0" class="selector-main__pager">
             <el-pagination
-              layout="prev, pager, next"
+              layout="sizes,prev, pager, next"
               :disabled="loading"
               :page-sizes="pageSizeArr"
               :page-size="pagination.pageSize"
@@ -61,6 +61,7 @@
               :total="pagination.total"
               :current-page="pagination.page"
               @current-change="handleCurrentChange"
+              @size-change="handleSizeChange"
             ></el-pagination>
           </div>
         </div>
@@ -181,7 +182,7 @@
         selects: [],
         currentSelectData: [],
         noDataImg: require('@/assets/no-data.png'),
-        pageSizeArr: [10, 50, 100, 200, 300],
+        pageSizeArr: [10, 20, 50, 100, 200, 300],
         checkAll: false,
         isIndeterminate: false,
       }
@@ -216,10 +217,10 @@
         }
       },
       rangeSpan() {
-        return this.isSearchMode ? 0 : 7
+        return this.isSearchMode ? 0 : 6
       },
       mainSpan() {
-        return this.isSearchMode ? 17 : 10
+        return this.isSearchMode ? 17 : 11
       },
       currentPageSelectedCount() {
         return this.single
@@ -255,6 +256,15 @@
         this.checkAll = val === this.data.length
         this.isIndeterminate = val > 0 && val < this.data.length
       },
+      data: {
+        handler(val) {
+          this.checkAll = this.currentPageSelectedCount === val.length
+          this.isIndeterminate =
+            this.currentPageSelectedCount > 0 &&
+            this.currentPageSelectedCount < val.length
+        },
+        deep: true,
+      },
     },
     methods: {
       getSelectedData() {
@@ -304,6 +314,9 @@
       handleCurrentChange(currentPage) {
         this.$emit('page-change', currentPage)
       },
+      handleSizeChange(size) {
+        this.$emit('size-change', size)
+      },
       removeSelected(item) {
         this.selects.remove(item)
       },
@@ -316,7 +329,7 @@
           this.selects = this.selects.length
             ? utils.uniqueArrayObject(
                 [...this.selects, ...currentPageData],
-                'id'
+                this.primaryFieldProp
               )
             : currentPageData
         } else {
@@ -463,6 +476,27 @@
               .el-pager {
                 line-height: 25px;
               }
+              .el-select .el-input {
+                width: 86px;
+
+                .el-input__inner {
+                  text-align: left;
+                  padding-left: 10px;
+                  padding-right: 0;
+                  border-radius: 2px;
+                  color: #333;
+                  background: #f4f4f5;
+                  border: none;
+                }
+                .el-select__caret {
+                  color: #333;
+                }
+              }
+              .el-pagination__sizes {
+                .el-icon-arrow-up:before {
+                  content: '\e78f';
+                }
+              }
             }
           }
         }

package/packages/OrgSelector/src/OrgSelectorDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    width="900px"
+    width="1060px"
     :title="title"
     class="orgdialog-selector__wrapper"
     :visible.sync="dialogVisible"
@@ -41,6 +41,7 @@
         @reset="reset"
         @row-click="(row) => $emit('row-click', row)"
         @page-change="(page) => $emit('page-change', page)"
+        @size-change="(size) => $emit('size-change', size)"
       >
         <el-card slot="range" class="selector-range__card" shadow="hover">
           <el-tabs v-model="activeRange">

package/packages/OrgSelector/src/main.vue

@@ -86,6 +86,7 @@
       @row-click="(row) => $emit('row-click', row)"
       @select-data="(data) => $emit('select-data', data)"
       @page-change="(page) => $emit('page-change', page)"
+      @size-change="(size) => $emit('size-change', size)"
       @contact-group-change="(group) => $emit('contact-group-change', group)"
       @load-org="(org) => $emit('load-org', org)"
       @load-policy-org="(policy) => $emit('load-policy-org', policy)"

package/packages/OrgSelectorInput/src/OrgSelectorInput.vue

@@ -32,6 +32,7 @@
       @search="handleSearch"
       @reset="handleReset"
       @page-change="handlePageChange"
+      @size-change="handleSizeChange"
       @load-org="loadOrg"
       @load-policy-org="loadPolicyOrg"
       @row-click="(row) => $emit('row-click', row)"
@@ -146,6 +147,10 @@
           }
         }
       },
+      handleSizeChange(size) {
+        this.pagination.pageSize = size
+        this.handlePageChange(this.pagination.page)
+      },
       // 处理过滤类型变化的事件
       handleFilterTypeChange(type) {
         this.filterType = type

package/packages/PostSelector/src/PostSelectorDialog.vue

@@ -41,6 +41,7 @@
         @reset="reset"
         @row-click="(row) => $emit('row-click', row)"
         @page-change="(page) => $emit('page-change', page)"
+        @size-change="(size) => $emit('size-change', size)"
       >
         <el-card slot="range" class="selector-range__card" shadow="hover">
           <el-tabs v-model="activeRange">

package/packages/PostSelector/src/main.vue

@@ -84,6 +84,7 @@
       @row-click="(row) => $emit('row-click', row)"
       @select-data="(data) => $emit('select-data', data)"
       @page-change="(page) => $emit('page-change', page)"
+      @size-change="(size) => $emit('size-change', size)"
       @load-org-post="(org) => $emit('load-org-post', org)"
       @load-policy-post="(policy) => $emit('load-policy-post', policy)"
     />

package/packages/PostSelectorInput/src/PostSelectorInput.vue

@@ -35,6 +35,7 @@
       @search="handleSearch"
       @reset="handleReset"
       @page-change="handlePageChange"
+      @size-change="handleSizeChange"
       @load-org-post="loadOrgPost"
       @load-policy-post="loadPolicyPost"
       @change="handleChange"
@@ -174,6 +175,10 @@
           }
         }
       },
+      handleSizeChange(size) {
+        this.pagination.pageSize = size
+        this.handlePageChange(this.pagination.page)
+      },
       // 处理过滤类型变化的事件
       handleFilterTypeChange(type) {
         this.filterType = type

package/packages/RoleSelector/src/RoleSelectorDialog.vue

@@ -41,6 +41,7 @@
         @reset="reset"
         @row-click="(row) => $emit('row-click', row)"
         @page-change="(page) => $emit('page-change', page)"
+        @size-change="(size) => $emit('size-change', size)"
       >
         <template #detail="{ item }">
           <ht-icon

package/packages/RoleSelector/src/main.vue

@@ -104,6 +104,7 @@
       @row-click="(row) => $emit('row-click', row)"
       @select-data="(data) => $emit('select-data', data)"
       @page-change="(page) => $emit('page-change', page)"
+      @size-change="(size) => $emit('size-change', size)"
     />
   </div>
 </template>

package/packages/RoleSelectorInput/src/main.vue

@@ -30,6 +30,7 @@
       @search="handleSearch"
       @reset="handleReset"
       @page-change="handlePageChange"
+      @size-change="handleSizeChange"
       @row-click="(row) => $emit('row-click', row)"
       @select-data="(data) => $emit('select-data', data)"
     ></ht-role-selector>
@@ -155,6 +156,10 @@
         // 搜索模式下或者未进行过滤时，查询所有数据
         this.handleLoad(page)
       },
+      handleSizeChange(size) {
+        this.pagination.pageSize = size
+        this.handlePageChange(this.pagination.page)
+      },
       // 获取查询参数中的分页信息(不传page时默认查询第一页)
       getPageBean(page) {
         const pageBean = { ...this.pagination }

package/packages/UserSelector/src/UserSelectorDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    width="900px"
+    width="1060px"
     :title="title"
     class="userdialog-selector__wrapper"
     :visible.sync="dialogVisible"
@@ -41,6 +41,7 @@
         @reset="reset"
         @row-click="(row) => $emit('row-click', row)"
         @page-change="(page) => $emit('page-change', page)"
+        @size-change="(size) => $emit('size-change', size)"
       >
         <el-card slot="range" class="selector-range__card" shadow="hover">
           <el-tabs v-model="activeRange">

package/packages/UserSelector/src/main.vue

@@ -99,6 +99,7 @@
       @row-click="(row) => $emit('row-click', row)"
       @select-data="(data) => $emit('select-data', data)"
       @page-change="(page) => $emit('page-change', page)"
+      @size-change="(size) => $emit('size-change', size)"
       @contact-group-change="(group) => $emit('contact-group-change', group)"
       @load-org-user="(org) => $emit('load-org-user', org)"
       @load-policy-user="(policy) => $emit('load-policy-user', policy)"

package/packages/UserSelectorInput/src/main.vue

@@ -31,6 +31,7 @@
       @search="handleSearch"
       @reset="handleReset"
       @page-change="handlePageChange"
+      @size-change="handleSizeChange"
       @contact-group-change="loadContactUser"
       @load-org-user="loadOrgUser"
       @load-policy-user="loadPolicyUser"
@@ -145,6 +146,10 @@
           }
         }
       },
+      handleSizeChange(size) {
+        this.pagination.pageSize = size
+        this.handlePageChange(this.pagination.page)
+      },
       // 处理过滤类型变化的事件
       handleFilterTypeChange(type) {
         this.filterType = type