three-trees-ui 1.0.59 → 1.0.61

package/package.json

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

package/packages/Table/src/Table.vue

@@ -112,7 +112,7 @@
       :highlight-current-row="highlightCurrentRow"
       :row-class-name="rowClassName"
       :cell-class-name="cellClassName"
-      :height="`${tableMaxHeight ? tableMaxHeight : 400}`"
+      :style="{ height: `${tableMaxHeight ? tableMaxHeight : 400}` + 'px' }"
       :row-key="rowKey"
       :show-summary="showSummary"
       :summary-method="getSummaries"

package/src/mixins/onlineSubtable.js

@@ -1,10 +1,8 @@
 import SubPagination from '../services/SubPagination.js'
-import utils from '../utils.js'
 
 export default {
   data() {
     return {
-      searchVal: '', //搜索关键字
       fillOrg: {},
       fillOrgConfMap: {},
       transitionIndex: -1,
@@ -54,287 +52,6 @@ export default {
     }
   },
   methods: {
-    //合计计算
-    getSummaries(param, list) {
-      let CancelTheCalculation = sessionStorage.getItem(
-        'Cancel_The_Calculation'
-      )
-        ? JSON.parse(sessionStorage.getItem('Cancel_The_Calculation'))
-        : {}
-      //
-      let listChange = JSON.parse(Base64.decode(list, 'utf-8'))
-
-      //
-
-      if (listChange.length < 1) {
-        return
-      }
-      const { columns, data } = param
-      this.tableData = data
-      const sums = []
-      let calcProp = []
-      let columnsDep = _.cloneDeep(columns)
-      listChange.forEach((item, idex) => {
-        if (item.addFunc == 'calcFunc') {
-          columnsDep.forEach((column, index) => {
-            if (
-              item.mathExp &&
-              item.mathExp.indexOf('.' + column.property) > -1
-            ) {
-              calcProp.push(column.property)
-            }
-          })
-        }
-
-        columnsDep.forEach((column, index) => {
-          if (item.columnField == column.property) {
-            column.combinedOption = item
-          }
-        })
-      })
-
-      columnsDep.forEach((column, index) => {
-        if (index === 0 && columnsDep[0].type == 'index') {
-          sums[index] = ''
-          return
-        }
-        //当有需要才合计
-        if (column.combinedOption) {
-          let {
-            addFunc,
-            columnField,
-            name,
-            unit,
-            showType,
-            num,
-            tag,
-            mainTarget,
-          } = column.combinedOption
-
-          let Bol =
-            tag &&
-            CancelTheCalculation &&
-            CancelTheCalculation[tag] &&
-            CancelTheCalculation[tag].length > 0
-          const values = data.map((item) => Number(item[column.property]))
-          let depValues = _.cloneDeep(values)
-          if (Bol) {
-            let delMin = []
-            depValues.forEach((item, i) => {
-              if (!CancelTheCalculation[tag].includes(i)) {
-                delMin.push(item)
-              }
-            })
-
-            depValues = delMin
-          }
-          let units = unit ? unit : ''
-          //求和
-          if (addFunc === 'add') {
-            if (!depValues.every((value) => isNaN(value))) {
-              sums[index] = depValues.reduce((prev, curr) => {
-                const value = Number(curr)
-                if (!isNaN(value)) {
-                  return prev + curr
-                } else {
-                  return prev
-                }
-              }, 0)
-
-              sums[index] = this.dealWithDataHtml(
-                name,
-                sums[index],
-                showType,
-                num,
-                units,
-                mainTarget
-              )
-            } else {
-              sums[index] = this.dealWithDataHtml(
-                name,
-                0,
-                showType,
-                num,
-                units,
-                mainTarget
-              )
-            }
-          }
-          //计数
-          if (addFunc === 'count') {
-            let numCount = values.length
-
-            if (Bol) {
-              numCount = values.length - CancelTheCalculation[tag].length
-            }
-            sums[index] = this.dealWithDataHtml(
-              name,
-              numCount,
-              showType,
-              num,
-              units,
-              mainTarget
-            )
-          }
-          //平均值
-          if (addFunc === 'average') {
-            let sum = 0
-            var average = 0
-
-            for (var i = 0; i < depValues.length; i++) {
-              sum += depValues[i]
-            }
-
-            depValues.length > 0
-              ? (average = sum / depValues.length)
-              : (average = 0)
-
-            sums[index] = this.dealWithDataHtml(
-              name,
-              average,
-              showType,
-              num,
-              units,
-              mainTarget
-            )
-          }
-          //最大值
-          if (addFunc === 'max') {
-            let maxNum = Math.max.apply(
-              null,
-              depValues.length > 0 ? depValues : [0]
-            )
-
-            sums[index] = this.dealWithDataHtml(
-              name,
-              maxNum,
-              showType,
-              num,
-              units,
-              mainTarget
-            )
-          }
-          //最小值
-          if (addFunc === 'min') {
-            let minNum = Math.min.apply(
-              null,
-              depValues.length > 0 ? depValues : [0]
-            )
-            sums[index] = this.dealWithDataHtml(
-              name,
-              minNum,
-              showType,
-              num,
-              units,
-              mainTarget
-            )
-          }
-
-          //公式计算
-          if (addFunc === 'calcFunc') {
-            const calcVal = this.dealCustomCalc(data, column.combinedOption)
-            sums[index] = this.dealWithDataHtml(
-              name,
-              calcVal,
-              showType,
-              num,
-              units,
-              mainTarget
-            )
-          }
-        } else if (calcProp.indexOf(column.property) > -1) {
-          const values = data.map((item) => Number(item[column.property]))
-        }
-      })
-
-      return sums
-    },
-    //合计行
-    handleSummary(summary) {
-      return summary && !this.searchVal ? true : false
-    },
-    dealWithDataHtml(name, type, showType, num, units, mainTarget) {
-      let { data, monCap } = this.dealWithData(type, showType, num, mainTarget)
-      if (monCap) {
-        return name + ':' + data + units + '\n' + monCap
-      }
-      return name + ':' + data + units
-    },
-    //处理数据
-    dealWithData(data, showType, numfix = 0, mainTarget) {
-      data = Number(data)
-
-      let list = showType
-      let num = {
-        data: 0,
-        monCap: '',
-      }
-      // 保留小数位
-      if (list.includes('keepSmall')) {
-        const fixData = data.toFixedRound(numfix)
-        num.data = fixData
-        if (mainTarget) {
-          mainTarget = !mainTarget.startsWith('data.')
-            ? 'data.' + mainTarget
-            : mainTarget
-          utils.setValueByConfigKey(this, { trget: mainTarget }, 'trget', data)
-        }
-      } else {
-        if (mainTarget && data != null) {
-          mainTarget = !mainTarget.startsWith('data.')
-            ? 'data.' + mainTarget
-            : mainTarget
-          utils.setValueByConfigKey(
-            this,
-            { trget: mainTarget },
-            'trget',
-            data.toFixedRound(4)
-          )
-        }
-      }
-
-      //百分比
-      if (list.includes('percentage')) {
-        num.data = Number(data * 100) + '%'
-      }
-      // 千分位
-      if (list.includes('Micrometer')) {
-        num.data = utils.thousandBit(data)
-      }
-      if (
-        list.includes('keepSmall') &&
-        list.includes('percentage') &&
-        list.includes('Micrometer')
-      ) {
-        num.data =
-          utils.thousandBit(Number(data * 100).toFixedRound(numfix)) + '%'
-
-        return num
-      }
-      if (list.includes('keepSmall') && list.includes('percentage')) {
-        num.data = Number(data * 100).toFixedRound(numfix) + '%'
-
-        return num
-      }
-      if (list.includes('Micrometer') && list.includes('percentage')) {
-        num.data = utils.thousandBit(Number(data * 100)) + '%'
-        return num
-      }
-      if (list.includes('keepSmall') && list.includes('Micrometer')) {
-        num.data = utils.thousandBit(data.toFixedRound(numfix))
-      }
-
-      // 货币大写
-      if (list.includes('monCap')) {
-        num = {
-          data: data,
-          monCap: utils.convertCurrency(data),
-        }
-        return num
-      }
-
-      return num
-    },
     getExpandArr(data, type) {
       if (type === 'expand' && data) {
         let arr = []

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) {

package/src/mixins/templatePreview.js

@@ -11,7 +11,7 @@ const { saveAs } = require('file-saver')
 import _ from 'lodash'
 import { decode } from '@/util/base64'
 
-const req = function (url, data = {}, option = {}) {
+const req = function(url, data = {}, option = {}) {
   const requestData = {
     url: url,
     data: data,
@@ -253,7 +253,7 @@ export default {
       deep: true,
     },
     ents: {
-      handler: function (newVal, oldValue) {
+      handler: function(newVal, oldValue) {
         if (newVal && newVal.length >= 1 && newVal != oldValue) {
           this.getSubData(this, this.refId)
         }
@@ -262,7 +262,7 @@ export default {
       immediate: true,
     },
     templateInfo: {
-      handler: function (newVal) {
+      handler: function(newVal) {
         if (newVal && newVal.id) {
           let _me = this
           _me.templateInfo = newVal
@@ -382,13 +382,13 @@ export default {
       deep: true,
       immediate: true,
     },
-    currentTabName: function (newVal) {
+    currentTabName: function(newVal) {
       if (newVal) {
         this.querySubValue = ''
       }
     },
     rows: {
-      handler: function (newVal) {
+      handler: function(newVal) {
         if (this.templateInfo.defId) {
           let this_ = this
           let boAlias = this.templateInfo.boDefAlias
@@ -430,8 +430,9 @@ export default {
       if (val) {
         this.$nextTick(() => {
           if (document.getElementById('summaryDiv')) {
-            this.summaryTableHeight =
-              document.getElementById('summaryDiv').clientHeight
+            this.summaryTableHeight = document.getElementById(
+              'summaryDiv'
+            ).clientHeight
           }
         })
       }
@@ -442,7 +443,7 @@ export default {
       //如果当前页面被嵌入iframe里面不显示草稿
       return !this.isJoinFlow
     },
-    navbarCollapseStyle: function () {
+    navbarCollapseStyle: function() {
       if (this.asideShow) {
         return { left: '200px' }
       }
@@ -481,7 +482,7 @@ export default {
     })
     this.handelBindFiledValua()
     let this_ = this
-    this.$on('data-reload-success', function () {
+    this.$on('data-reload-success', function() {
       this_.calcScriptBtnPermission()
     })
     this.$emit('afterMounted')
@@ -807,7 +808,7 @@ export default {
           this.listSelectable = false
         }
         let _this = this
-        setTimeout(function () {
+        setTimeout(function() {
           let tdDom = _this.$el.querySelector('td.right_menu')
           if (
             !tdDom ||
@@ -912,7 +913,7 @@ export default {
               selectList[i].selectValue = value
 
               //添加监听
-              pInst.$watch(path, function (newVal, oldVal) {
+              pInst.$watch(path, function(newVal, oldVal) {
                 // 监听中使用间隔请求，减少请求次数
                 clearTimeout(this.timeout)
                 this.timeout = setTimeout(() => {
@@ -935,7 +936,7 @@ export default {
               const value = utils.getValueByPath(pInst, path)
 
               bindList[i].fillValue = value
-              pInst.$watch(path, function (newVal, oldVal) {
+              pInst.$watch(path, function(newVal, oldVal) {
                 // 监听中使用间隔请求，减少请求次数
                 clearTimeout(this.timeout)
                 this.timeout = setTimeout(() => {
@@ -1193,7 +1194,7 @@ export default {
         }
         let msg = document.createElement('canvas')
 
-        this.$qrcode.toCanvas(msg, QRCodeurl, function (error) {
+        this.$qrcode.toCanvas(msg, QRCodeurl, function(error) {
           console.error(error)
         })
         let _canvas = document.createElement('div')
@@ -1233,7 +1234,7 @@ export default {
           .generateAsync({
             type: 'blob',
           })
-          .then(function (content) {
+          .then(function(content) {
             let eleLink = document.createElement('a')
             eleLink.download = '二维码.zip'
             eleLink.style.display = 'none'
@@ -1286,7 +1287,7 @@ export default {
         context.scale(2, 2)
         return html2canvas(document.querySelector(classs), {
           canvas: canvas2,
-        }).then(function (canvas) {
+        }).then(function(canvas) {
           resolve(canvas)
         })
       })
@@ -1328,7 +1329,7 @@ export default {
       // Base64.encode(this.$store.state.login.currentUser.account);
       let msg = document.getElementById('QRCode')
 
-      this.$qrcode.toCanvas(msg, this.QRCodeurl, function (error) {
+      this.$qrcode.toCanvas(msg, this.QRCodeurl, function(error) {
         console.log(error)
       })
       this.QRCodeShow = true
@@ -1351,13 +1352,13 @@ export default {
       this.rowTemplateId = templateId
       this.rowId = id
     },
-    handleSizeChange: function (size) {
+    handleSizeChange: function(size) {
       //每页下拉显示数据
       this.pagination.page = 1
       this.pagination.pageSize = size
       this.$refs.multipleTemplateTable.handleFilterChange()
     },
-    handleCurrentChange: function (currentPage) {
+    handleCurrentChange: function(currentPage) {
       //点击第几页
       this.pagination.page = currentPage
       this.$refs.multipleTemplateTable.handleFilterChange()
@@ -1876,10 +1877,18 @@ 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
@@ -1905,10 +1914,18 @@ 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('type')
-            operationMap[$(searchItems[i]).children().attr('ht-query')] =
+            operation = $(searchItems[i])
+              .children()
+              .attr('type')
+            operationMap[
+              $(searchItems[i])
+                .children()
+                .attr('ht-query')
+            ] =
               typeof operationType[operation] != 'undefined'
                 ? operationType[operation]
                 : operation
@@ -1931,12 +1948,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
           }
@@ -2004,7 +2028,7 @@ export default {
       }
     },
     //回车查询
-    searchEnterFun: function (e) {
+    searchEnterFun: function(e) {
       let keyCode = window.event ? e.keyCode : e.which
       if (keyCode == 13) {
         this.search()
@@ -4079,8 +4103,7 @@ export default {
           this.printDetail(parameter.templateId, parameter.id, parameter.action)
         } else if (btnAlias == 'sub' && this.checkSelect()) {
           this.showSubList(this.tableData.selectRows[0].id_, parameter)
-        } else if (btnAlias == 'js') {
-          if (parameter.needValidateSelect && !this.checkSelect()) return
+        } else if (btnAlias == 'js' && this.checkSelect()) {
           this.customEvilJS(this.tableData.selectRows[0], parameter.jsValue)
         } else if (
           btnAlias == 'startFlow' &&