three-trees-ui 1.0.63 → 1.0.64

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,305 +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
-    },
-    dealCustomCalc(data, calc) {
-      let exp = calc.mathExp
-      if (!exp) return null
-      var reg = /([\[|\{]).*?\((.*?)\)[\}|\]]/g
-      exp = exp.replace(reg, function() {
-        var symbol = arguments[1],
-          name = arguments[2]
-        const prop = name.split('.')[1]
-        const values = data.map((item) => Number(item[prop]))
-        return values.join(',')
-      })
-      exp = exp.replace(/[|\[|\]]/g, '')
-      exp = eval(`(${exp})`)
-      if (exp === Infinity || isNaN(exp)) {
-        exp = null
-      }
-      return exp
-    },
-    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

@@ -7,12 +7,9 @@ import { decode } from '@/util/base64'
 import Vue from 'vue'
 import $ from 'jquery'
 import _ from 'lodash'
-import moment from 'moment'
 export default {
   data() {
     return {
-      defaultQuerys: [],
-      isInit: true,
       bpmRunTime: this.$requestConfig.flowUrl,
       fileList: [],
       tableData: { selectRows: [], querys: '' },
@@ -80,7 +77,6 @@ export default {
         pageSize: 30,
         total: 0,
       },
-      total: 0,
       rows: [],
       queryParam: {},
       allSummaryConfig: {},
@@ -88,16 +84,15 @@ export default {
       summaryTableData: [],
       needRequestTotal: false, // 需不需要后端统计列表全部数据
       tableDataTotal: {},
-      loadingTotal: false //统计按钮加载中
     }
   },
   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 = []
@@ -165,29 +160,7 @@ export default {
       deep: true,
     },
   },
-  created() {
-    if (this.queryView.jsScript) {
-      // 执行js脚本
-      this.handleDiyScript(this.queryView.jsScript)
-    }
-  },
   methods: {
-    handleDiyScript(scriptValue) {
-      //执行前置脚本内容
-      const _this = this
-      // 用户信息
-      const account = this.$requestConfig.getAccount()
-      const userId = this.$requestConfig.getUserId()
-      const userName = this.$requestConfig.getUsername()
-      const preScript = `const scriptFunction = function(_this, account, userId, userName){
-            ${scriptValue}
-          };`
-      try {
-        eval(`${preScript}scriptFunction(_this, account, userId, userName);`)
-      } catch (err) {
-        this.$message.error(`脚本事件执行错误：${err}`)
-      }
-    },
     handelBindFiledValua() {
       //数据视图控件
       let _me = this
@@ -236,7 +209,7 @@ export default {
               selectList[i].selectValue = value
 
               //添加监听
-              pInst.$watch(path, function(newVal, oldVal) {
+              pInst.$watch(path, function (newVal, oldVal) {
                 _.debounce(() => {
                   if (newVal !== oldVal) {
                     _me.queryViewOptions.selectList[i].selectValue = newVal
@@ -380,7 +353,7 @@ export default {
       this.$router.push(url)
     },
 
-    handleSizeChange: function(size) {
+    handleSizeChange: function (size) {
       //每页下拉显示数据
       this.pagination.pageSize = size
       if (this.$refs.queryViewList) {
@@ -389,7 +362,7 @@ export default {
         this.search()
       }
     },
-    handleCurrentChange: function(currentPage) {
+    handleCurrentChange: function (currentPage) {
       //点击第几页
       this.pagination.page = currentPage
       if (this.$refs.queryViewList) {
@@ -399,112 +372,14 @@ export default {
       }
     },
     //回车查询
-    searchEnterFun: function(e) {
+    searchEnterFun: function (e) {
       let keyCode = window.event ? e.keyCode : e.which
       if (keyCode == 13) {
         this.pagination.page = 1
         this.search()
       }
     },
-    getQueryDataViewOperation(key) {
-      switch (key) {
-        case 'EQ':
-          return 'EQUAL'
-        case 'NE':
-          return 'NOT_EQUAL'
-        case 'LK':
-          return 'LIKE'
-        case 'LFK':
-          return 'LEFT_LIKE'
-        case 'RHK':
-          return 'RIGHT_LIKE'
-        case 'BETWEEN':
-          return 'BETWEEN'
-        default:
-          return 'LIKE'
-      }
-    },
-    async buildDefaultQuerys() {
-      let querys = []
-      let conditions = JSON.parse(this.queryView.conditions)
-      //条件字段默认值判断
-      for (let i = 0; i < conditions.length; i++) {
-        let condition = conditions[i]
-        if (condition.defaultValue) {
-          let defaultValue = condition.isScriptDefault
-            ? await this.getScriptDefaultValue(condition.defaultValue)
-            : condition.defaultValue
-          if (condition.dataType == 'number') {
-            defaultValue = parseFloat(defaultValue)
-          }
-          this.$set(this.searchForm, condition.fieldName, defaultValue)
-
-          querys.push({
-            property: condition.fieldName,
-            value: defaultValue,
-            group: 'main',
-            operation: this.getQueryDataViewOperation(condition.operate),
-            relation: 'AND',
-          })
-        }
-      }
-      this.defaultQuerys = querys
-      return querys
-    },
-    getScriptDefaultValue(scriptValue) {
-      return new Promise((resolve) => {
-        //执行前置脚本内容
-        const _this = this
-        // 用户信息
-        const account = this.$requestConfig.getAccount()
-        const userId = this.$requestConfig.getUserId()
-        const userName = this.$requestConfig.getUsername()
-        const _moment = moment
-        const preScript = `const scriptFunction = function(_this, account, userId, userName, _moment){
-            ${scriptValue}
-          };`
-        let result = ''
-        try {
-          result = eval(
-            `${preScript}scriptFunction(_this, account, userId, userName, _moment);`
-          )
-          if (result && result.then && typeof result.then === 'function') {
-            result.then(
-              (t) => {
-                resolve(t)
-              },
-              (fail) => {
-                //接口返回失败则终止按钮操作，并输出错误信息
-                resolve('')
-              }
-            )
-          } else {
-            resolve(result)
-          }
-        } catch (err) {
-          resolve('')
-          this.$message.error(`查询值默认脚本事件执行错误：${err}`)
-        }
-      })
-    },
-    validateSearchRequired(querys) {
-      let errorMsg = ''
-      let conditions = JSON.parse(this.queryView.conditions)
-      if (conditions && querys) {
-        conditions.forEach((item) => {
-          if (item.isRequired) {
-            let index = querys.findIndex((k) => {
-              return k.property == item.fieldName
-            })
-            if (index == -1) {
-              errorMsg = `字段【${item.fieldDesc}】为必填查询字段，不能为空！`
-            }
-          }
-        })
-      }
-      return errorMsg
-    },
-    async search(param, cb, isSearchBtn, needRequestTotal = false) {
+    search(param, cb, isSearchBtn, needRequestTotal = false) {
       // 不需要请求后端接口统计列表数据
       this.needRequestTotal = needRequestTotal
       !param && (param = {})
@@ -512,35 +387,6 @@ export default {
       const dataTemplateQueryVo = {
         queryFilter: param,
       }
-      //初始化时，把查询字段的默认值加进去
-      if (this.isInit) {
-        this.isInit = false
-        let querys = await this.buildDefaultQuerys()
-        dataTemplateQueryVo.queryFilter.querys =
-          dataTemplateQueryVo.queryFilter.querys || []
-        dataTemplateQueryVo.queryFilter.querys = dataTemplateQueryVo.queryFilter.querys.concat(
-          querys
-        )
-      }
-      // 非高级查询时，将默认值带上
-      if (!isSearchBtn) {
-        dataTemplateQueryVo.queryFilter.querys =
-          dataTemplateQueryVo.queryFilter.querys || []
-        dataTemplateQueryVo.queryFilter.querys = dataTemplateQueryVo.queryFilter.querys.concat(
-          this.defaultQuerys
-        )
-      }
-      // 查询字段 校验是否必填，如果是必填没数据，需返回提示
-      if (isSearchBtn) {
-        let errorMsg = this.validateSearchRequired(
-          dataTemplateQueryVo.queryFilter.querys
-        )
-        if (errorMsg) {
-          this.$message.warning(errorMsg)
-          cb && cb()
-          return
-        }
-      }
       //保存查询参数，用于作为导出的查询参数
       if (this.queryViewOptions) {
         //关联查询字段
@@ -573,17 +419,13 @@ export default {
         })
       }
       this.$requestConfig
-        .getQueryViewDataListWithoutTotal(param)
+        .getQueryViewDataList(param)
         .then((response) => {
           this.rows = response.rows
-          // this.pagination.total = response.total
+          this.pagination.total = response.total
           this.pagination.page = response.page
           this.pagination.pageSize = response.pageSize
           this.filterOldSummaryValByType('currentPage')
-          //每次请求后不再统计总数，而是在统计按钮中去统计，当数量统计过一次后，再重新设置到当前页
-          if (this.total) {
-            this.$set(this.pagination, 'total', this.total)
-          }
           this.summaryTableData.push({
             project: '当前页汇总',
             key: 'currentPage',
@@ -603,31 +445,12 @@ export default {
           cb && cb()
         })
     },
-    getQuerySqlViewByPaginationTotal(param, cb) {
-      this.loadingTotal = true
-      this.$requestConfig
-        .getQueryViewDataListWithTotal(param)
-        .then((response) => {
-          this.total = response.value
-          //每次请求后不再统计总数，而是在统计按钮中去统计，当数量统计过一次后，再重新设置到当前页
-          if (this.total) {
-            this.$set(this.pagination, 'total', this.total)
-          }
-          this.loadingTotal = false
-          this.$nextTick(() => {
-            this.$refs.queryViewList && this.$refs.queryViewList.doLayout()
-          })
-        })
-        .finally(() => {
-          this.loadingTotal = false
-          cb && cb()
-        })
-    },
     getQueryFilter() {
       let operationMap = this.getSearchItems() //查询条件类型
       // let fieldQueryMap = this.getFieldQuery() //查询条件字段
       let specialMap = this.getSpecialMap() //获取特殊查询情况（自定义对话框）
       let querys = [] //查询条件
+      let queryFilter = {}
       let pageBean = { pageBean: this.pagination }
       let params = {
         sqlAlias: this.sqlAlias || this.queryView.sqlAlias,
@@ -635,10 +458,6 @@ export default {
       }
       params.pagination = pageBean
       if ($.isEmptyObject(this.searchForm)) {
-        if (this.$refs.queryViewList && this.$refs.queryViewList.querys) {
-          querys.push(...this.$refs.queryViewList.querys)
-        }
-        params = { pageBean: this.pagination, querys }
         return params
       } else {
         for (var key in this.searchForm) {
@@ -703,10 +522,9 @@ export default {
             }
           }
         }
-        if (this.$refs.queryViewList && this.$refs.queryViewList.querys) {
-          querys.push(...this.$refs.queryViewList.querys)
-        }
-        return { pageBean: this.pagination, querys }
+        queryFilter = { pageBean: this.pagination, querys }
+        params.pagination = queryFilter
+        return params
       }
     },
     //获取查询条件类型
@@ -960,22 +778,15 @@ export default {
       let loadingInstance = Loading.service({ fullscreen: true }) //开始
       this.$requestConfig
         .querySqlViewExport(data)
-        // .then(({ data, headers }) => {
-        //   const fileName = decodeURIComponent(
-        //     headers['content-disposition'].split(';')[1].split('filename=')[1]
-        //   )
-        //   const blob = new Blob([data])
-        //   saveAs(blob, fileName)
-        // })
-        // .finally(() => {
-        //   loadingInstance.close() // 结束
-        //   this.dialogExportVisible = false
-        // })
-        .then(() => {
-          this.$message.success('正在导出，请稍后前往报表附件管理查看')
+        .then(({ data, headers }) => {
+          const fileName = decodeURIComponent(
+            headers['content-disposition'].split(';')[1].split('filename=')[1]
+          )
+          const blob = new Blob([data])
+          saveAs(blob, fileName)
         })
         .finally(() => {
-          loadingInstance.close()
+          loadingInstance.close() // 结束
           this.dialogExportVisible = false
         })
     },
@@ -1286,34 +1097,5 @@ export default {
         this.search()
       })
     },
-    countPageTotal() {
-      this.searchCountTotal(this.getQueryFilter())
-    },
-    searchCountTotal(param, cb, isSearchBtn, needRequestTotal = false) {
-      // 不需要请求后端接口统计列表数据
-      this.needRequestTotal = needRequestTotal
-      !param && (param = {})
-      param.pageBean = this.pagination
-      const dataTemplateQueryVo = {
-        queryFilter: param,
-      }
-      //保存查询参数，用于作为导出的查询参数
-      if (this.queryViewOptions) {
-        //关联查询字段
-        if (
-          this.queryViewOptions.selectList &&
-          this.queryViewOptions.selectList.length > 0
-        ) {
-          dataTemplateQueryVo.selectList = this.queryViewOptions.selectList
-        }
-      }
-      this.queryParam = { ...param }
-      let obj = {
-        sqlAlias: this.sqlAlias || this.queryView.sqlAlias,
-        alias: this.alias || this.queryView.alias,
-        param: dataTemplateQueryVo,
-      }
-      this.getQuerySqlViewByPaginationTotal(obj, cb)
-    },
   },
 }