@byteluck-fe/model-driven-engine 2.7.0-beta → 2.8.0-alpha.1

package/dist/esm/plugins/CalcPlugin.js

@@ -59,12 +59,12 @@ import { CONTROL_TYPE, CALC_TOKEN_TYPE, CALC_AGGREGATE_TYPE } from "@byteluck-fe
 import { format } from "mathjs";
 var DisplayType;
 (function(DisplayType) {
-    DisplayType[/**
+    /**
    * 完全等于
-   */ "EQ"] = "EQ";
-    DisplayType[/**
+   */ DisplayType["EQ"] = "EQ";
+    /**
    * 包含
-   * */ "IN"] = "IN";
+   * */ DisplayType["IN"] = "IN";
 })(DisplayType || (DisplayType = {}));
 export var CalcPlugin = /*#__PURE__*/ function() {
     "use strict";
@@ -156,7 +156,7 @@ export var CalcPlugin = /*#__PURE__*/ function() {
                 if (control.props.isHide) {
                     return true;
                 }
-                if (control.parent === null) {
+                if (control.parent === null || control.parent === undefined) {
                     return false;
                 }
                 return this.getControlIsHide(control.parent);
@@ -167,12 +167,14 @@ export var CalcPlugin = /*#__PURE__*/ function() {
             value: function apply(engine) {
                 var _this = this;
                 this.engine = engine;
-                this.resetDependencies();
                 this.watchControlChange();
                 this.watchSubtableChange();
                 this.watchSchemaHideChange();
                 this.engine.on("engine-mounted", function() {
-                    _this.allCalcControlComputed();
+                    requestAnimationFrame(function() {
+                        _this.resetDependencies();
+                        _this.allCalcControlComputed();
+                    });
                 });
             }
         },
@@ -194,7 +196,9 @@ export var CalcPlugin = /*#__PURE__*/ function() {
    * */ function allCalcControlComputed() {
                 var _this = this;
                 this.calcControls.forEach(function(item) {
-                    return _this.computedCalcValue(item);
+                    if (item.props.dataBind.result.fieldCode === null || item.props.dataBind.result.fieldCode === undefined) {
+                        _this.computedCalcValue(item);
+                    }
                 });
             }
         },
@@ -287,6 +291,8 @@ export var CalcPlugin = /*#__PURE__*/ function() {
                 var _this = this;
                 this.engine.on("list-change", function(payload) {
                     var _payload_options;
+                    // 初始化前是批量操作。不做处理
+                    if (_this.engine.isMounted === false) return;
                     _this.resetDependencies();
                     var _payload_options_changed;
                     var changedRows = (_payload_options_changed = (_payload_options = payload.options) === null || _payload_options === void 0 ? void 0 : _payload_options.changed) !== null && _payload_options_changed !== void 0 ? _payload_options_changed : [];
@@ -312,6 +318,8 @@ export var CalcPlugin = /*#__PURE__*/ function() {
    * */ function watchControlChange() {
                 var _this = this;
                 this.engine.on("change", function(payload) {
+                    // 初始化前是批量操作。不做处理
+                    if (_this.engine.isMounted === false) return;
                     var instance = payload.instance;
                     if (!_this.dependenciesTriggerMap.has(instance.id)) {
                         return;
@@ -355,7 +363,6 @@ export var CalcPlugin = /*#__PURE__*/ function() {
    * */ // @ts-ignore
             function computedCalcValue(control) {
                 var _this = this;
-                var _oldValue, _oldValue1;
                 var scriptEcho = control.props.scriptEcho;
                 if (!scriptEcho || scriptEcho.length === 0) {
                     return;
@@ -430,13 +437,13 @@ export var CalcPlugin = /*#__PURE__*/ function() {
                 var oldValue = this.engine.getState(control.id, rowIndex);
                 var result = !value || value === Infinity || value === -Infinity ? 0 : control.props.precision === "" ? value : Number(value.toFixed(control.props.precision));
                 // 如果值没变的话，不触发修改
-                if (result === ((_oldValue = oldValue) === null || _oldValue === void 0 ? void 0 : _oldValue.result)) {
+                if (result === (oldValue === null || oldValue === void 0 ? void 0 : oldValue.result)) {
                     return;
                 }
                 var _oldValue_unit;
                 this.engine.setState(control.id, {
                     result: result,
-                    unit: (_oldValue_unit = (_oldValue1 = oldValue) === null || _oldValue1 === void 0 ? void 0 : _oldValue1.unit) !== null && _oldValue_unit !== void 0 ? _oldValue_unit : ""
+                    unit: (_oldValue_unit = oldValue === null || oldValue === void 0 ? void 0 : oldValue.unit) !== null && _oldValue_unit !== void 0 ? _oldValue_unit : ""
                 }, rowIndex);
             }
         },

package/dist/esm/plugins/ControlsEventPlugin.js

@@ -213,7 +213,7 @@ export var ControlsEventPlugin = /*#__PURE__*/ function() {
                             switch(_state.label){
                                 case 0:
                                     // 初始化state的时候不触发change事件,必须在engine mounted以后才触发
-                                    if ((eventKey === "change" || eventKey === "list-change") && !_this.engine.isMounted) {
+                                    if (eventKey === "change" && !_this.engine.isMounted) {
                                         return [
                                             2
                                         ];

package/dist/esm/utils/runtimeUtils.js

@@ -8,11 +8,11 @@ export function loopFormControl(control, callback) {
             //TODO 此处需要再抽象一层 datagrid/datalist
             if (item.type === CONTROL_TYPE.SUBTABLE) {
                 // @ts-ignore
-                var children = item.getChildrenFormControl();
+                var children = []//item.getChildrenFormControl() as RuntimeFormControl[]
+                ;
                 callback(item, children);
             } else if (hasChildrenControl(item)) {
-                var _item;
-                loopFormControl((_item = item) === null || _item === void 0 ? void 0 : _item.children, callback);
+                loopFormControl(item === null || item === void 0 ? void 0 : item.children, callback);
             // @ts-ignore
             } else if (item.controlType === CONTROL_BASE_TYPE.FORM) {
                 callback(item);
@@ -27,9 +27,8 @@ callback) {
             if (item.type === CONTROL_TYPE.DATA_VIEW || item.type === CONTROL_TYPE.SIMPLE_SEARCH) {
                 callback(item);
             } else if (hasChildrenControl(item)) {
-                var _item;
                 //  @ts-ignore
-                loopDataViewControl((_item = item) === null || _item === void 0 ? void 0 : _item.children, callback);
+                loopDataViewControl(item === null || item === void 0 ? void 0 : item.children, callback);
             }
         });
     }