three-trees-ui 1.0.66 → 1.0.67

package/package.json

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

package/packages/Subtable/src/SubExportDialog.vue

@@ -35,16 +35,6 @@
         type: String,
         default: '子表数据',
       },
-      exportMaxRow: {
-        type: [String, Number],
-      },
-      exportField: {
-        // 禁止导出的字段集合
-        type: String,
-      },
-      exportFieldTransformData: {
-        type: String,
-      },
     },
     computed: {
       columns: function() {
@@ -57,44 +47,6 @@
       }
     },
     methods: {
-      async sqlChange(config, value = '') {
-        return new Promise((resolve) => {
-          let params = {
-            dsName: config.dataSource,
-            sql: config.relevancyValue
-              ? config.relevancyValue.replace(/{val}/g, value)
-              : '',
-          }
-          this.$requestConfig.getValueBySql(params).then((res) => {
-            resolve(res)
-          })
-        })
-      },
-      transformFieldData(data) {
-        return new Promise(async (resolve) => {
-          let fieldTransformData = JSON.parse(
-            decode(this.exportFieldTransformData)
-          )
-          for (let i = 0; i < data.length; i++) {
-            for (let j = 0; j < fieldTransformData.length; j++) {
-              if (fieldTransformData[j].relevancyType == 'value') {
-                data[i][fieldTransformData[j].field] =
-                  fieldTransformData[j].relevancyValue
-              } else {
-                // 动态时 请求接口修改数据
-                let result = await this.sqlChange(
-                  fieldTransformData[j],
-                  data[i][fieldTransformData[j].field]
-                )
-                if (result) {
-                  data[i][fieldTransformData[j].field] = result
-                }
-              }
-            }
-          }
-          resolve(data)
-        })
-      },
       // 配置的数据字典 导出时翻译为汉字
       changeDictionary(data) {
         return new Promise(async (resolve, reject) => {
@@ -124,18 +76,10 @@
       },
       changeRowKey(rows) {
         var exportData = []
-        let exportFieldArr = null
-        if (this.exportField) {
-          exportFieldArr = this.exportField.split(',')
-        }
         rows.forEach((row) => {
           var exportRow = {}
           this.columns.forEach((col) => {
-            if (
-              col.ctrlType != 'suntable' &&
-              (!exportFieldArr ||
-                (exportFieldArr && !exportFieldArr.includes(col.name)))
-            ) {
+            if (col.ctrlType != 'suntable') {
               exportRow[col.desc] = row[col.name]
             }
           })
@@ -143,25 +87,6 @@
         })
         return exportData
       },
-      getConfirmValue(rows, count) {
-        return new Promise((resolve) => {
-          this.$confirm(
-            `导出数据量超出导出限制【${count}】，将导出${count}条，是否继续?`,
-            '提示',
-            {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning',
-            }
-          )
-            .then(() => {
-              resolve(rows.slice(0, count))
-            })
-            .catch(() => {
-              resolve(false)
-            })
-        })
-      },
       handleCommand(type) {
         const pInst = utils.getOnlineFormInstance(this)
         SubPagination.exportData(
@@ -172,20 +97,6 @@
         )
           .then(async (data) => {
             data = JSON.parse(JSON.stringify(data))
-            if (this.exportMaxRow && Number(this.exportMaxRow) < data.length) {
-              let result = await this.getConfirmValue(
-                data,
-                Number(this.exportMaxRow)
-              )
-              if (result === false) {
-                return
-              }
-              data = result
-            }
-
-            if (this.exportFieldTransformData) {
-              data = await this.transformFieldData(data)
-            }
             // 导出时 字典转换
             await this.changeDictionary(data)
             let exportData = this.changeRowKey(data)

package/packages/Subtable/src/SubImportDialog.vue

@@ -102,45 +102,6 @@
         type: String,
         required: true,
       },
-      importMaxRow: {
-        type: [String, Number],
-        default: null,
-      },
-      templateType: {
-        // 导入模板类型 default 系统默认 custom 自定义
-        type: String,
-        default: 'default',
-      },
-      customTemplate: {
-        // 自定义的导入模板文件
-        type: String,
-        default: '',
-      },
-      importTransform: {
-        // 是否有转换字段
-        type: String,
-        default: '0',
-      },
-      importModes: {
-        // 导入模式选项显示
-        type: String,
-        default: 'append,override,merge',
-      },
-      fieldTransformData: {
-        // 转换字段配置
-        type: String,
-        default: '',
-      },
-      conditionRule: {
-        // 条件模式配置
-        type: String,
-        default: '',
-      },
-      conditionType: {
-        // 条件模式配置
-        type: String,
-        default: 'cover',
-      },
     },
     data() {
       return {
@@ -149,6 +110,11 @@
         showRowData: false,
         mergeFunc: null,
         mode: 'append',
+        modeOptions: [
+          { mode: 'append', desc: '追加导入' },
+          { mode: 'override', desc: '覆盖导入' },
+          { mode: 'merge', desc: '合并导入', disabled: true },
+        ],
         cacheDicData: {}, // 缓存字典数据
       }
     },
@@ -156,30 +122,6 @@
       columns: function() {
         return eval(decode(this.dataColumns))
       },
-      modeOptions() {
-        let options = [
-          { mode: 'append', desc: '追加导入' },
-          { mode: 'override', desc: '覆盖导入' },
-          { mode: 'merge', desc: '合并导入' },
-          { mode: 'condition', desc: '条件导入' },
-        ]
-        return options.filter((k) => {
-          return this.importModes.includes(k.mode)
-        })
-      },
-      conditionConfig() {
-        let config = {}
-        if (this.conditionRule) {
-          config = JSON.parse(decode(this.conditionRule))
-          config.conditionArr.forEach((k) => {
-            k.exportField = this.getNameByDesc(k.exportField)
-          })
-        }
-        return {
-          conditionType: this.conditionType,
-          ...config,
-        }
-      },
     },
     watch: {
       dialogVisible: {
@@ -197,7 +139,7 @@
         handler: function(newVal) {
           if (newVal) {
             // 如果有导入合并的代码，则允许选择合并导入模式
-            // this.$set(this.modeOptions[2], 'disabled', false)
+            this.$set(this.modeOptions[2], 'disabled', false)
             // 并设置默认为 合并导入
             this.mode = 'merge'
             // 解码合并的代码
@@ -214,9 +156,6 @@
       }
     },
     mounted() {
-      if (this.importModes) {
-        this.mode = this.importModes.split(',')[0]
-      }
       // 初始化导入时需要的参数
       const pInst = utils.getOnlineFormInstance(this)
       let formUid = pInst && pInst._uid ? pInst._uid : ''
@@ -235,46 +174,6 @@
       SubPagination.clear(this.dataSubname, this)
     },
     methods: {
-      transformFieldData(data) {
-        return new Promise(async (resolve) => {
-          if (this.importTransform === '0') {
-            resolve(data)
-            return
-          }
-          let fieldTransformData = JSON.parse(decode(this.fieldTransformData))
-          for (let i = 0; i < data.length; i++) {
-            for (let j = 0; j < fieldTransformData.length; j++) {
-              if (fieldTransformData[j].relevancyType == 'value') {
-                data[i][fieldTransformData[j].field] =
-                  fieldTransformData[j].relevancyValue
-              } else {
-                // 动态时 请求接口修改数据
-                let result = await this.sqlChange(
-                  fieldTransformData[j],
-                  data[i][fieldTransformData[j].field]
-                )
-                if (result) {
-                  data[i][fieldTransformData[j].field] = result
-                }
-              }
-            }
-          }
-          resolve(data)
-        })
-      },
-      async sqlChange(config, value = '') {
-        return new Promise((resolve) => {
-          let params = {
-            dsName: config.dataSource,
-            sql: config.relevancyValue
-              ? config.relevancyValue.replace(/{val}/g, value)
-              : '',
-          }
-          this.$requestConfig.getValueBySql(params).then((res) => {
-            resolve(res)
-          })
-        })
-      },
       changeDictionary(data) {
         return new Promise(async (resolve) => {
           for (let i = 0; i < data.length; i++) {
@@ -315,28 +214,6 @@
       },
       //子表模板导出
       exportFormSub() {
-        // 如果是自定义模板
-        if (this.templateType == 'custom' && this.customTemplate) {
-          let file = JSON.parse(decode(this.customTemplate))[0]
-          this.$requestConfig
-            .download(file.response.fileId)
-            .then(({ data, headers }) => {
-              if (data && headers) {
-                // 附件下载
-                const fileName = decodeURIComponent(
-                  headers['content-disposition']
-                    .split(';')[1]
-                    .split('filename=')[1]
-                )
-                const blob = new Blob([data])
-                saveAs(blob, fileName)
-              }
-            })
-            .catch((err) => {
-              this.$message.error(`附件下载失败：${err}`)
-            })
-          return
-        }
         let columns = this.columns.filter((item) => {
           return !(
             item.ctrlType &&
@@ -386,7 +263,6 @@
             let count = this.importRows.length
             if (count > maxRowInt && maxRowInt != 0) {
               this.$message.error('子表数据已超过最大行数【' + maxRowInt + '】')
-              this.$refs.selectFile.value = ''
               return
             }
           } else if (this.mode == 'append') {
@@ -415,21 +291,17 @@
           }
         }
         let importRows = await this.changeDictionary(this.importRows)
-        // 导入如果有数据转换的此处做转换
-        importRows = await this.transformFieldData(importRows)
         SubPagination.importData(
           this.dataSubname,
           importRows,
           this.mode,
-          this.mergeFunc,
-          this.conditionConfig
+          this.mergeFunc
         )
           .then(() => {
             this.$message.success('导入成功！')
             this.dialogVisible = false
           })
           .catch((err) => {
-            this.$refs.selectFile.value = ''
             this.$message.error(`数据导入失败：${err}`)
           })
       },
@@ -438,43 +310,10 @@
           return
         }
         this.importRows = []
-        this.readWorkbookFromLocalFile(m.target.files[0], async (rows) => {
-          if (this.importMaxRow) {
-            let count = rows.length
-            if (count > parseInt(this.importMaxRow)) {
-              let result = await this.getConfirmValue(
-                rows,
-                parseInt(this.importMaxRow)
-              )
-              if (result === false) {
-                this.$refs.selectFile.value = ''
-                return
-              }
-              rows = result
-            }
-          }
+        this.readWorkbookFromLocalFile(m.target.files[0], (rows) => {
           this.importRows = this.changeRowKey(rows)
         })
       },
-      getConfirmValue(rows, count) {
-        return new Promise((resolve) => {
-          this.$confirm(
-            `导入数据量已超过最大限制，将默认导入前【${count}】条，是否继续？`,
-            '提示',
-            {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning',
-            }
-          )
-            .then(() => {
-              resolve(rows.slice(0, count))
-            })
-            .catch(() => {
-              resolve(false)
-            })
-        })
-      },
       // 读取本地excel文件
       readWorkbookFromLocalFile(file, callback) {
         const reader = new FileReader()

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