three-trees-ui 1.0.72 → 1.0.73

package/packages/TemplatePreview/src/TemplatePreview.vue

@@ -223,49 +223,6 @@
     margin: 0;
     padding: 0;
   }
-  ::v-deep .page-btn-count {
-    margin: 0 24px;
-    float: left;
-    padding: 10px 0;
-  }
-  ::v-deep .page-btn-total {
-    margin: 5px 0px;
-    float: left;
-    padding: 11px 0px;
-    color: #606266;
-    font-weight: normal;
-    font-size: 13px;
-  }
-  ::v-deep .pagination {
-    display: flex;
-    justify-content: flex-end;
-    padding: 10px 0;
-    float: right;
-    .el-select {
-      width: 100px;
-    }
-    .page-btn {
-      margin: 0 24px;
-    }
-
-    .target-page {
-      display: flex;
-      align-items: center;
-      color: #606266;
-      font-weight: normal;
-      font-size: 13px;
-      .el-input {
-        width: 50px;
-        margin: 0 3px;
-      }
-      //::v-deep input::-webkit-outer-spin-button, ::v-deep input::-webkit-inner-spin-button {
-      //  -webkit-appearance: none !important;
-      //}
-      //::v-deep input[type='number'] {
-      //  -moz-appearnce: textfield !important
-      //}
-    }
-  }
 </style>
 <style lang="scss">
   .template-dropdown {

package/src/directive/formulas.js

@@ -845,5 +845,5 @@ const Formulas = {
 Formulas.install = (Vue) => {
   Vue.prototype.$Formulas = Formulas
 }
-window.FormMath = Formulas
+
 export { formula, Formulas }

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 = []