three-trees-ui 1.0.58 → 1.0.59

package/lib/three-trees-ui.common.js

@@ -1249,7 +1249,7 @@ var utils = {
     }
     const keyPath = config[key];
     // 获取当前组件所在的表单
-    const formInst = utils.getOnlineFormInstance(inst.$parent);
+    const formInst = utils.getOnlineFormInstance(inst);
     // 获取当前组件是否在子表中的某一行
     const {
       subScopeEl,
@@ -1527,6 +1527,37 @@ Date.prototype.format = function (format) {
   }
   return format;
 };
+
+//精确四舍五入
+Number.prototype.toFixedRound = function (d) {
+  d = Number(d);
+  var s = this + '';
+  if (!d) d = 0;
+  if (s.indexOf('.') == -1) s += '.';
+  s += new Array(d + 1).join('0');
+  if (new RegExp('^(-|\\+)?(\\d+(\\.\\d{0,' + (d + 1) + '})?)\\d*$').test(s)) {
+    var s = '0' + RegExp.$2,
+      pm = RegExp.$1,
+      a = RegExp.$3.length,
+      b = true;
+    if (a == d + 2) {
+      a = s.match(/\d/g);
+      if (parseInt(a[a.length - 1]) > 4) {
+        for (var i = a.length - 2; i >= 0; i--) {
+          a[i] = parseInt(a[i]) + 1;
+          if (a[i] == 10) {
+            a[i] = 0;
+            b = i != 1;
+          } else break;
+        }
+      }
+      s = a.join('').replace(new RegExp('(\\d+)(\\d{' + d + '})\\d$'), '$1.$2');
+    }
+    if (b) s = s.substr(1);
+    return (pm + s).replace(/\.$/, '');
+  }
+  return this + '';
+};
 /* harmony default export */ __webpack_exports__["a"] = (utils);
 
 /***/ }),
@@ -12529,9 +12560,12 @@ var SubPagination = __webpack_require__("1639");
 
 // CONCATENATED MODULE: ./src/mixins/onlineSubtable.js
 
+
 /* harmony default export */ var onlineSubtable = ({
   data() {
     return {
+      searchVal: '',
+      //搜索关键字
       fillOrg: {},
       fillOrgConfMap: {},
       transitionIndex: -1,
@@ -12581,6 +12615,200 @@ var SubPagination = __webpack_require__("1639");
     }
   },
   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["a" /* default */].setValueByConfigKey(this, {
+            trget: mainTarget
+          }, 'trget', data);
+        }
+      } else {
+        if (mainTarget && data != null) {
+          mainTarget = !mainTarget.startsWith('data.') ? 'data.' + mainTarget : mainTarget;
+          utils["a" /* default */].setValueByConfigKey(this, {
+            trget: mainTarget
+          }, 'trget', data.toFixedRound(4));
+        }
+      }
+
+      //百分比
+      if (list.includes('percentage')) {
+        num.data = Number(data * 100) + '%';
+      }
+      // 千分位
+      if (list.includes('Micrometer')) {
+        num.data = utils["a" /* default */].thousandBit(data);
+      }
+      if (list.includes('keepSmall') && list.includes('percentage') && list.includes('Micrometer')) {
+        num.data = utils["a" /* default */].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["a" /* default */].thousandBit(Number(data * 100)) + '%';
+        return num;
+      }
+      if (list.includes('keepSmall') && list.includes('Micrometer')) {
+        num.data = utils["a" /* default */].thousandBit(data.toFixedRound(numfix));
+      }
+
+      // 货币大写
+      if (list.includes('monCap')) {
+        num = {
+          data: data,
+          monCap: utils["a" /* default */].convertCurrency(data)
+        };
+        return num;
+      }
+      return num;
+    },
     getExpandArr(data, type) {
       if (type === 'expand' && data) {
         let arr = [];
@@ -33461,7 +33689,7 @@ _main_vue__WEBPACK_IMPORTED_MODULE_0__["default"].register({
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"1.0.58\"}");
+module.exports = JSON.parse("{\"a\":\"1.0.59\"}");
 
 /***/ }),
 
@@ -54694,7 +54922,8 @@ const req = function (url, data = {}, option = {}) {
           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' && this.checkSelect()) {
+        } else if (btnAlias == 'js') {
+          if (parameter.needValidateSelect && !this.checkSelect()) return;
           this.customEvilJS(this.tableData.selectRows[0], parameter.jsValue);
         } else if (btnAlias == 'startFlow' && parameter.defId && !parameter.isStartFlow) {
           this.operating(parameter.templateId, parameter.id, parameter.action, parameter.defId, parameter.isStartFlow, parameter.openType, parameter.quitAfterSaving);

package/lib/three-trees-ui.umd.js

@@ -1258,7 +1258,7 @@ var utils = {
     }
     const keyPath = config[key];
     // 获取当前组件所在的表单
-    const formInst = utils.getOnlineFormInstance(inst.$parent);
+    const formInst = utils.getOnlineFormInstance(inst);
     // 获取当前组件是否在子表中的某一行
     const {
       subScopeEl,
@@ -1536,6 +1536,37 @@ Date.prototype.format = function (format) {
   }
   return format;
 };
+
+//精确四舍五入
+Number.prototype.toFixedRound = function (d) {
+  d = Number(d);
+  var s = this + '';
+  if (!d) d = 0;
+  if (s.indexOf('.') == -1) s += '.';
+  s += new Array(d + 1).join('0');
+  if (new RegExp('^(-|\\+)?(\\d+(\\.\\d{0,' + (d + 1) + '})?)\\d*$').test(s)) {
+    var s = '0' + RegExp.$2,
+      pm = RegExp.$1,
+      a = RegExp.$3.length,
+      b = true;
+    if (a == d + 2) {
+      a = s.match(/\d/g);
+      if (parseInt(a[a.length - 1]) > 4) {
+        for (var i = a.length - 2; i >= 0; i--) {
+          a[i] = parseInt(a[i]) + 1;
+          if (a[i] == 10) {
+            a[i] = 0;
+            b = i != 1;
+          } else break;
+        }
+      }
+      s = a.join('').replace(new RegExp('(\\d+)(\\d{' + d + '})\\d$'), '$1.$2');
+    }
+    if (b) s = s.substr(1);
+    return (pm + s).replace(/\.$/, '');
+  }
+  return this + '';
+};
 /* harmony default export */ __webpack_exports__["a"] = (utils);
 
 /***/ }),
@@ -12538,9 +12569,12 @@ var SubPagination = __webpack_require__("1639");
 
 // CONCATENATED MODULE: ./src/mixins/onlineSubtable.js
 
+
 /* harmony default export */ var onlineSubtable = ({
   data() {
     return {
+      searchVal: '',
+      //搜索关键字
       fillOrg: {},
       fillOrgConfMap: {},
       transitionIndex: -1,
@@ -12590,6 +12624,200 @@ var SubPagination = __webpack_require__("1639");
     }
   },
   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["a" /* default */].setValueByConfigKey(this, {
+            trget: mainTarget
+          }, 'trget', data);
+        }
+      } else {
+        if (mainTarget && data != null) {
+          mainTarget = !mainTarget.startsWith('data.') ? 'data.' + mainTarget : mainTarget;
+          utils["a" /* default */].setValueByConfigKey(this, {
+            trget: mainTarget
+          }, 'trget', data.toFixedRound(4));
+        }
+      }
+
+      //百分比
+      if (list.includes('percentage')) {
+        num.data = Number(data * 100) + '%';
+      }
+      // 千分位
+      if (list.includes('Micrometer')) {
+        num.data = utils["a" /* default */].thousandBit(data);
+      }
+      if (list.includes('keepSmall') && list.includes('percentage') && list.includes('Micrometer')) {
+        num.data = utils["a" /* default */].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["a" /* default */].thousandBit(Number(data * 100)) + '%';
+        return num;
+      }
+      if (list.includes('keepSmall') && list.includes('Micrometer')) {
+        num.data = utils["a" /* default */].thousandBit(data.toFixedRound(numfix));
+      }
+
+      // 货币大写
+      if (list.includes('monCap')) {
+        num = {
+          data: data,
+          monCap: utils["a" /* default */].convertCurrency(data)
+        };
+        return num;
+      }
+      return num;
+    },
     getExpandArr(data, type) {
       if (type === 'expand' && data) {
         let arr = [];
@@ -33470,7 +33698,7 @@ _main_vue__WEBPACK_IMPORTED_MODULE_0__["default"].register({
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"1.0.58\"}");
+module.exports = JSON.parse("{\"a\":\"1.0.59\"}");
 
 /***/ }),
 
@@ -54703,7 +54931,8 @@ const req = function (url, data = {}, option = {}) {
           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' && this.checkSelect()) {
+        } else if (btnAlias == 'js') {
+          if (parameter.needValidateSelect && !this.checkSelect()) return;
           this.customEvilJS(this.tableData.selectRows[0], parameter.jsValue);
         } else if (btnAlias == 'startFlow' && parameter.defId && !parameter.isStartFlow) {
           this.operating(parameter.templateId, parameter.id, parameter.action, parameter.defId, parameter.isStartFlow, parameter.openType, parameter.quitAfterSaving);