three-trees-ui 1.0.60 → 1.0.61

package/package.json

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

package/src/mixins/querySqlPreview.js

@@ -554,19 +554,11 @@ export default {
                 ? operationType[operation]
                 : operation
           } else if (
-            typeof $(searchItems[i])
-              .children()
-              .attr('ht-query') != 'undefined'
+            typeof $(searchItems[i]).children().attr('ht-query') != 'undefined'
           ) {
             //查询条件类型
-            operation = $(searchItems[i])
-              .children()
-              .attr('operation')
-            operationMap[
-              $(searchItems[i])
-                .children()
-                .attr('ht-query')
-            ] =
+            operation = $(searchItems[i]).children().attr('operation')
+            operationMap[$(searchItems[i]).children().attr('ht-query')] =
               typeof operationType[operation] != 'undefined'
                 ? operationType[operation]
                 : operation
@@ -588,16 +580,12 @@ export default {
               searchItems[i]
             ).attr('field-query')
           } else if (
-            typeof $(searchItems[i])
-              .children()
-              .attr('ht-query') != 'undefined'
+            typeof $(searchItems[i]).children().attr('ht-query') != 'undefined'
           ) {
             //查询条件字段
-            fieldQueryMap[
-              $(searchItems[i])
-                .children()
-                .attr('ht-query')
-            ] = $(searchItems[i])
+            fieldQueryMap[$(searchItems[i]).children().attr('ht-query')] = $(
+              searchItems[i]
+            )
               .children()
               .attr('field-query')
           }
@@ -619,19 +607,12 @@ export default {
                 ? true
                 : false
           } else if (
-            typeof $(searchItems[i])
-              .children()
-              .attr('ht-query') != 'undefined'
+            typeof $(searchItems[i]).children().attr('ht-query') != 'undefined'
           ) {
             //查询条件字段
-            fieldQueryMap[
-              $(searchItems[i])
-                .children()
-                .attr('ht-query')
-            ] =
-              typeof $(searchItems[i])
-                .children()
-                .attr('special-query') != 'undefined'
+            fieldQueryMap[$(searchItems[i]).children().attr('ht-query')] =
+              typeof $(searchItems[i]).children().attr('special-query') !=
+              'undefined'
                 ? true
                 : false
           }
@@ -727,7 +708,7 @@ export default {
     punchOrder() {
       this.$store
         .dispatch('storeProcess/downLoadToFile', 'Batchkeijyo')
-        .then(() => { })
+        .then(() => {})
     },
     beforeAvatarUpload(file) {
       var fileName = new Array()
@@ -754,7 +735,7 @@ export default {
       this.$message.success('送付状成功')
       window.location.reload()
     },
-    handlePreview() { },
+    handlePreview() {},
     //确定导出
     submitExport() {
       if (!this.exportData || this.exportData.expField.length < 1) {
@@ -772,17 +753,28 @@ export default {
         expField += this.exportData.expField[i].fieldName
       }
       expField = Base64.encode(expField).replace(/\+/g, '%2B')
-      // let params = {
-      //   sqlAlias: this.sqlAlias || this.queryView.sqlAlias,
-      //   alias: this.alias || this.queryView.alias,
-      // }
+      const dataTemplateQueryVo = {
+        queryFilter: this.queryParam,
+      }
+      //保存查询参数，用于作为导出的查询参数
+      if (this.queryViewOptions) {
+        //关联查询字段
+        if (
+          this.queryViewOptions.selectList &&
+          this.queryViewOptions.selectList.length > 0
+        ) {
+          dataTemplateQueryVo.selectList = this.queryViewOptions.selectList
+        }
+      }
+
       let data = {
         sqlAlias: this.sqlAlias || this.queryView.sqlAlias,
         alias: this.alias || this.queryView.alias,
         getType: this.exportData.getType,
         expField: expField,
+        query: dataTemplateQueryVo,
       }
-      data.query = this.queryParam
+
       let loadingInstance = Loading.service({ fullscreen: true }) //开始
       this.$requestConfig
         .querySqlViewExport(data)
@@ -1029,9 +1021,9 @@ export default {
       )
       return checkField.length
         ? checkField.filter(
-          (field) =>
-            field.checked && ['序号', '操作'].indexOf(field.value) == -1
-        )
+            (field) =>
+              field.checked && ['序号', '操作'].indexOf(field.value) == -1
+          )
         : customColumns
     },
     ChangeRecordDialogsShow(FormDataid, templateKey) {