mooho-base-admin-plus 2.0.9 → 2.0.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/components/view/view-form.vue

@@ -1152,8 +1152,6 @@
       // },
       // 选项变化事件
       onSelectDataChange(sender, selected) {
-        console.log('onSelectDataChange', sender, selected);
-
         let code;
         if (sender.code.endsWith('ID')) {
           code = sender.code.substr(0, sender.code.length - 2);
@@ -1272,11 +1270,19 @@
         // 公式计算
         for (let column of this.columns) {
           if (!!(column.calculate || '').trim()) {
-            let triggers = this.getTriggers(column.calculate);
+            let calculate = column.calculate;
+
+            // 计算sum、min、max等统计值
+            calculate = this.calcStat('sum', calculate);
+            calculate = this.calcStat('min', calculate);
+            calculate = this.calcStat('max', calculate);
+            calculate = this.calcStat('avg', calculate);
+
+            let triggers = this.getTriggers(calculate);
 
-            if (!sender || triggers.some(item => item == sender.code)) {
+            if (!sender || triggers.some(item => item == sender.code) || column.calculate != calculate) {
               // 包含在公式中，需要刷新
-              let result = this.calculate(column.calculate, this.data);
+              let result = this.calculate(calculate, this.data);
 
               // 保留小数
               if (column.digit != null) {
@@ -1481,6 +1487,52 @@
           return value;
         }
       },
+      // 计算统计值
+      calcStat(op, calculate) {
+        let start = calculate.indexOf(op + '(');
+        let end = calculate.indexOf(')', start);
+
+        if (start == -1 || end == -1) {
+          return calculate;
+        }
+
+        let property = calculate.substring(start + 4, end);
+
+        if (property.indexOf('.') == -1) {
+          return calculate;
+        }
+
+        let table = this.$refs['table_' + property.split('.')[0]];
+
+        if (table == null || table.length == 0) {
+          return calculate;
+        }
+
+        let tableData = table[0].getData();
+        let result = null;
+        let sum = null;
+        let count = null;
+
+        for (let item of tableData) {
+          let value = this.parseData(item, property.substr(property.indexOf('.') + 1));
+
+          if (value) {
+            if (op == 'sum') {
+              result = result == null ? value : result + value;
+            } else if (op == 'min') {
+              result = result == null ? value : value < result ? value : result;
+            } else if (op == 'max') {
+              result = result == null ? value : value > result ? value : result;
+            } else if (op == 'avg') {
+              sum = sum == null ? value : sum + value;
+              count = count == null ? 1 : count + 1;
+              result = count > 0 ? sum / count : null;
+            }
+          }
+        }
+
+        return calculate.substring(0, start) + (result == null ? 'null' : result.toString()) + calculate.substring(end + 1);
+      },
       // 获取多语言名称
       getNameI18n(column) {
         if (this.layout.showI18n) {

package/src/index.js

@@ -158,12 +158,10 @@ const API = {
 };
 
 // 页面
-console.log('import');
 const files = import.meta.globEager('./pages/**/*.vue');
 const pages = {};
 
 Object.keys(files).forEach(key => {
-  console.log('import', key.replace(/(\.\/pages\/)/g, ''));
   pages[key.replace(/(\.\/pages\/)/g, '')] = files[key].default;
 });
 

package/src/mixins/page.js

@@ -413,6 +413,12 @@ export default {
     },
     // 计算列
     calculate(text, model) {
+      if (text == null) {
+        return null;
+      } else {
+        text = text.toString();
+      }
+
       let result = '';
       let expression = '';