three-trees-ui 1.0.30 → 1.0.32

package/package.json

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

package/src/mixins/querySqlPreview.js

@@ -2,6 +2,8 @@ import { Loading } from 'element-ui'
 import utils from 'three-trees-ui/src/utils.js'
 const { Base64 } = require('js-base64')
 const { saveAs } = require('file-saver')
+import { decode } from '@/util/base64'
+
 import Vue from 'vue'
 import $ from 'jquery'
 import _ from 'lodash'
@@ -49,12 +51,12 @@ export default {
     }
   },
   watch: {
-    formKey: function (newVal) {
+    formKey: function(newVal) {
       if (newVal) {
         this.init()
       }
     },
-    'tableData.selectRows': function (newVal) {
+    'tableData.selectRows': function(newVal) {
       if (newVal.length > 0) {
         let me_ = this
         me_.uploadParams.id = []
@@ -83,10 +85,10 @@ export default {
       handler(newVal) {
         if (newVal.shows) {
           let displayField = utils.parseToJson(newVal.shows)
-          let buttonsts = utils.parseToJson(newVal.buttons);
+          let buttonsts = utils.parseToJson(newVal.buttons)
           console.log(buttonsts)
-          if(buttonsts[0].isdefault == "1"){
-              this.isdefaultQuery = false
+          if (buttonsts[0].isdefault == '1') {
+            this.isdefaultQuery = false
           }
           for (var i = 0; i < displayField.length; i++) {
             if (displayField[i].hidden == 0) {
@@ -247,7 +249,7 @@ export default {
       this.$router.push(url)
     },
 
-    handleSizeChange: function (size) {
+    handleSizeChange: function(size) {
       //每页下拉显示数据
       this.pagination.pageSize = size
       if (this.$refs.queryViewList) {
@@ -256,7 +258,7 @@ export default {
         this.search()
       }
     },
-    handleCurrentChange: function (currentPage) {
+    handleCurrentChange: function(currentPage) {
       //点击第几页
       this.pagination.page = currentPage
       if (this.$refs.queryViewList) {
@@ -266,7 +268,7 @@ export default {
       }
     },
     //回车查询
-    searchEnterFun: function (e) {
+    searchEnterFun: function(e) {
       let keyCode = window.event ? e.keyCode : e.which
       if (keyCode == 13) {
         this.pagination.page = 1
@@ -419,11 +421,19 @@ 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
@@ -445,12 +455,16 @@ 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')
           }
@@ -472,12 +486,19 @@ 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
           }
@@ -559,14 +580,16 @@ export default {
     },
     //点击导出按钮
     exports() {
-      if(this.isdefaultQuery){
+      if (this.isdefaultQuery) {
         this.dialogExportVisible = true
-      }else{
-        this.exportData.expField= JSON.parse(JSON.stringify(this.displayFields))
-        console.log(this.exportData)
+      } else {
+        // 增加导出字段限制
+        const checkField = this.getCheckField().map((item) => item.value)
+        this.exportData.expField = this.displayFields.filter((item) =>
+          checkField.includes(item.fieldName)
+        )
         this.submitExport()
       }
-      
     },
     punchOrder() {
       this.$store
@@ -861,5 +884,19 @@ export default {
     showSearchPane() {
       return true
     },
+    getCheckField() {
+      let customColumns = this.$refs.queryViewList.customColumns || []
+      let customColumnSetting = JSON.parse(
+        localStorage.getItem('customColumnSetting') || '{}'
+      )
+      const keys = customColumns.reduce((m, n) => m.concat(n.key), [])
+      const customColumnsHashCode = utils.hashCode(keys.join(','))
+      const checkField = JSON.parse(
+        decode(customColumnSetting[customColumnsHashCode]) || '[]'
+      )
+      return checkField.filter(
+        (field) => field.checked && ['序号', '操作'].indexOf(field.value) == -1
+      )
+    },
   },
 }

package/src/mixins/templatePreview.js

@@ -9,6 +9,7 @@ import $ from 'jquery'
 const axios = require('axios')
 const { saveAs } = require('file-saver')
 import _ from 'lodash'
+import { decode } from '@/util/base64'
 
 const req = function(url, data = {}, option = {}) {
   const requestData = {
@@ -464,9 +465,13 @@ export default {
       return list
     },
     tableHeight() {
+      const currentHeight = 0.85 * window.innerHeight
+      const tableHeight = this.currentTableHeight
+        ? this.currentTableHeight
+        : currentHeight
       return this.summaryFields && this.summaryFields.length > 0
-        ? this.defaultCurrentInnerHeight - this.summaryTableHeight
-        : this.defaultCurrentInnerHeight
+        ? tableHeight - this.summaryTableHeight
+        : tableHeight
     },
   },
   mounted() {
@@ -2417,6 +2422,15 @@ export default {
       if (type === 'searchResult') {
         this.curSelectParams.queryFilter.querys = this.templateSearchQuery
       }
+      // 增加导出字段限制
+      const checkField = this.getCheckField()
+      if (checkField && checkField.length) {
+        let fieldExport = {}
+        checkField.forEach((item) => {
+          fieldExport[item.key] = item.value
+        })
+        this.curSelectParams.fieldExport = fieldExport
+      }
       this.$requestConfig
         .exportByBtnSetting({
           id: this.templateInfo.id,
@@ -4518,6 +4532,20 @@ export default {
         return strData
       }
     },
+    getCheckField() {
+      let customColumns = this.$refs.multipleTemplateTable.customColumns || []
+      let customColumnSetting = JSON.parse(
+        localStorage.getItem('customColumnSetting') || '{}'
+      )
+      const keys = customColumns.reduce((m, n) => m.concat(n.key), [])
+      const customColumnsHashCode = utils.hashCode(keys.join(','))
+      const checkField = JSON.parse(
+        decode(customColumnSetting[customColumnsHashCode]) || '[]'
+      )
+      return checkField.filter(
+        (field) => field.checked && ['序号', '操作'].indexOf(field.value) == -1
+      )
+    },
   },
   // asyncComputed: {
   //   showDraftList() {