mooho-base-admin-plus 2.4.6 → 2.4.8

package/package.json

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

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

@@ -1323,14 +1323,16 @@
 
             if (!sender || triggers.some(item => item == sender.code) || column.calculate != calculate) {
               // 包含在公式中，需要刷新
-              let result = this.calculate(calculate, this.data);
+              setTimeout(() => {
+                let result = this.calculate(calculate, this.data);
 
-              // 保留小数
-              if (column.digit != null) {
-                result = this.keepDecimal(result, column.digit, column.fixedDigit);
-              }
+                // 保留小数
+                if (column.digit != null) {
+                  result = this.keepDecimal(result, column.digit, column.fixedDigit);
+                }
 
-              this.setData(this.data, column.code, result);
+                this.setData(this.data, column.code, result);
+              });
             }
           }
         }

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

@@ -1071,7 +1071,9 @@
             this.itemSelectActive = true;
 
             setTimeout(() => {
-              this.$refs.itemSelect.init(this.tableView.batchSelectDataModel + 'Source', this.tableView.batchSelectDataModel + 'Target');
+              this.$refs.itemSelect.init(this.tableView.batchSelectDataModel + 'Source', this.tableView.batchSelectDataModel + 'Target', () => {
+                this.$refs.itemSelect.loadSource();
+              });
             });
           } else if (this.embedded && this.tableView.createEnable && this.createEnable && !this.readonly) {
             column.renderHeader = h => {

package/src/mixins/page.js

@@ -448,7 +448,11 @@ export default {
       }
 
       if (!!(expression || '').trim()) {
-        triggers.push(expression);
+        if (expression.indexOf('.') >= 0) {
+          triggers.push(expression.split('.')[0] + 'ID');
+        } else {
+          triggers.push(expression);
+        }
       }
 
       return triggers;