three-trees-ui 1.0.24 → 1.0.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "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/UserDialog/src/main.vue

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

package/packages/UserSelector/src/UserSelectorDialog.vue

@@ -10,21 +10,27 @@
     top="3vh"
   >
     <div class="dialog-selector__body">
-      <el-input
-        v-model="searchWord"
-        size="small"
-        clearable
-        :placeholder="searchPlaceholder"
-        @clear="reset"
-        @keyup.enter.native="search"
-      >
-        <i
-          slot="prefix"
-          :title="t('ht.common.search')"
-          class="el-input__icon el-icon-search"
-          @click="search"
-        />
-      </el-input>
+      <div class="search-main">
+        <el-input
+          v-model="searchWord"
+          size="small"
+          clearable
+          :placeholder="searchPlaceholder"
+          @clear="reset"
+          @keyup.enter.native="search"
+        >
+          <i
+            slot="prefix"
+            :title="t('ht.common.search')"
+            class="el-input__icon el-icon-search"
+            @click="search"
+          />
+        </el-input>
+        <div class="right">
+          <el-button type="primary" size="mini" @click="search">搜索</el-button>
+          <el-button size="mini" @click="reset">重置</el-button>
+        </div>
+      </div>
       <ht-list-selector
         ref="selector"
         v-model="selectors"
@@ -290,6 +296,13 @@
       }
     }
     .dialog-selector__body {
+      .search-main {
+        display: flex;
+        .right {
+          display: flex;
+          margin-left: 15px;
+        }
+      }
       .el-icon-search {
         cursor: pointer;
       }

package/src/mixins/querySqlPreview.js

@@ -12,6 +12,7 @@ export default {
       fileList: [],
       tableData: { selectRows: [], querys: '' },
       dialogExportVisible: false,
+      isdefaultQuery: true,
       exportData: { getType: 'all', expField: [] },
       exportSellection: [],
       searchForm: {},
@@ -82,6 +83,11 @@ export default {
       handler(newVal) {
         if (newVal.shows) {
           let displayField = utils.parseToJson(newVal.shows)
+          let buttonsts = utils.parseToJson(newVal.buttons);
+          console.log(buttonsts)
+          if(buttonsts[0].isdefault == "1"){
+              this.isdefaultQuery = false
+          }
           for (var i = 0; i < displayField.length; i++) {
             if (displayField[i].hidden == 0) {
               this.displayFields.push(displayField[i])
@@ -553,7 +559,14 @@ export default {
     },
     //点击导出按钮
     exports() {
-      this.dialogExportVisible = true
+      if(this.isdefaultQuery){
+        this.dialogExportVisible = true
+      }else{
+        this.exportData.expField= JSON.parse(JSON.stringify(this.displayFields))
+        console.log(this.exportData)
+        this.submitExport()
+      }
+      
     },
     punchOrder() {
       this.$store