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

package/dist/esm/common/Engine.js

@@ -630,7 +630,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 var index = this.getInstanceRowIndex(instance);
                 var options = eventOptionsTemp || {};
                 // if (instance instanceof RuntimeListControl) {
-                if (instance.controlType === CONTROL_BASE_TYPE.LIST) {
+                if (instance.controlType === CONTROL_BASE_TYPE.LIST && instance.type === CONTROL_TYPE.SUBTABLE) {
                     var // @ts-ignore
                     _instance_children;
                     instance.children.length = 0;
@@ -648,6 +648,10 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     // for (let i = 0; i < newValue.length; i++) {
                     //   this.setStates(newValue[i], i, options)
                     // }
+                    var deleted = oldValue !== null && oldValue !== void 0 ? oldValue : [];
+                    if ((options === null || options === void 0 ? void 0 : options.setData) === true) {
+                        deleted = [];
+                    }
                     this.emit("list-change", {
                         instance: instance,
                         value: value,
@@ -655,7 +659,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             // @ts-ignore
                             changed: newRows,
                             data: newValue,
-                            deleted: oldValue !== null && oldValue !== void 0 ? oldValue : [],
+                            deleted: deleted,
+                            // deleted: oldValue ?? [],
                             type: "push"
                         })
                     });
@@ -693,7 +698,32 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "listControlCreateRow",
             value: function listControlCreateRow(instance, rowType) {
-                var row = this.runtime.createControlInstance(rowType);
+                var row;
+                if (rowType === "subtable-row") {
+                    row = {
+                        children: [],
+                        controlType: CONTROL_BASE_TYPE.LAYOUT,
+                        id: genNonDuplicateId(),
+                        type: "subtable-row",
+                        props: {
+                            caption: "",
+                            isHide: false,
+                            style: {
+                                height: "",
+                                heightConfig: "fill",
+                                width: "",
+                                widthConfig: "fill"
+                            }
+                        },
+                        fieldType: undefined,
+                        customEvents: [],
+                        pageStatus: 0,
+                        rules: [],
+                        parent: undefined
+                    };
+                } else {
+                    row = this.runtime.createControlInstance(rowType);
+                }
                 if (!row) return;
                 // if (row instanceof RuntimeLayoutControl) {
                 // @ts-ignore
@@ -703,8 +733,32 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     var template = JSONCopy(instance.props.headers);
                     // @ts-ignore
                     var columns = this.createControl(template);
+                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                    try {
+                        for(var _iterator = columns[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                            var column = _step.value;
+                            if (!column.parent) {
+                                this.runtime.resetInstanceParent(column, inst);
+                            }
+                        }
+                    } catch (err) {
+                        _didIteratorError = true;
+                        _iteratorError = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                _iterator.return();
+                            }
+                        } finally{
+                            if (_didIteratorError) {
+                                throw _iteratorError;
+                            }
+                        }
+                    }
                     (_inst_children = inst.children).push.apply(_inst_children, _to_consumable_array(columns));
                 }
+                //@ts-ignore
+                row.parent = instance;
                 return row;
             }
         },
@@ -824,6 +878,12 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 return this.setInstance(instance, props, value, rowIndex);
             }
         },
+        {
+            key: "getRule",
+            value: function getRule(controlType, props) {
+                return Runtime.staticGetRules(controlType, props);
+            }
+        },
         {
             key: "getAllRules",
             value: function getAllRules(controlId) {
@@ -1133,7 +1193,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             value: function buildFields(dataCode, state) {
                 var _this = this;
                 var mapping = this.getDataBindMapping(dataCode);
-                if (!mapping) {
+                if (!mapping || !mapping.fields) {
                     return;
                 }
                 var skipKeys = [];
@@ -1177,7 +1237,11 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             value: function setData(dataSet, options) {
                 var _this = this;
                 this.debugLog("engine setData方法执行，参数为%o，%o。", dataSet, options);
+                var onlySetData = options === null || options === void 0 ? void 0 : options.onlySetData;
                 var newState = this.store.defaultState;
+                if (onlySetData === true) {
+                    newState = {};
+                }
                 Object.keys(dataSet).map(function(dataCode) {
                     var entity = dataSet[dataCode];
                     if (Array.isArray(entity)) {
@@ -1194,26 +1258,34 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         } else {
                             newState[mapping.dataViewId][mapping.controlId] = [];
                         }
+                        var cacheEmptyState = {};
+                        var cacheFieldMapping = {};
                         entity.map(function(row) {
                             var newRow = JSONCopy(_this.store.emptyState[mapping.dataViewId][mapping.controlId]);
                             var skipKey = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值，为了避免重复赋值，设置了此变量
                             ;
                             Object.keys(row).map(function(fieldCode) {
-                                var _this_store_dataBindMapping_dataCode_fields, _this_store_dataBindMapping_dataCode;
                                 if (skipKey.includes(fieldCode)) {
                                     return;
                                 }
-                                var fieldMapping = (_this_store_dataBindMapping_dataCode = _this.store.dataBindMapping[dataCode]) === null || _this_store_dataBindMapping_dataCode === void 0 ? void 0 : (_this_store_dataBindMapping_dataCode_fields = _this_store_dataBindMapping_dataCode.fields) === null || _this_store_dataBindMapping_dataCode_fields === void 0 ? void 0 : _this_store_dataBindMapping_dataCode_fields.find(function(i) {
-                                    return i.fieldCode === fieldCode;
-                                });
+                                if (cacheFieldMapping.hasOwnProperty(fieldCode) === false) {
+                                    var _this_store_dataBindMapping_dataCode_fields, _this_store_dataBindMapping_dataCode;
+                                    cacheFieldMapping[fieldCode] = (_this_store_dataBindMapping_dataCode = _this.store.dataBindMapping[dataCode]) === null || _this_store_dataBindMapping_dataCode === void 0 ? void 0 : (_this_store_dataBindMapping_dataCode_fields = _this_store_dataBindMapping_dataCode.fields) === null || _this_store_dataBindMapping_dataCode_fields === void 0 ? void 0 : _this_store_dataBindMapping_dataCode_fields.find(function(i) {
+                                        return i.fieldCode === fieldCode;
+                                    });
+                                }
+                                var fieldMapping = cacheFieldMapping[fieldCode];
                                 if (fieldMapping) {
                                     if (// fieldMapping.dataBind instanceof DataBind &&
                                     isDataBind(fieldMapping.dataBind) && row[fieldCode] !== undefined) {
                                         newRow[fieldMapping.controlId] = row[fieldCode];
                                     // } else if (fieldMapping.dataBind instanceof ObjectDataBind) {
                                     } else if (!isDataBind(fieldMapping.dataBind)) {
-                                        var _this_getEmptyState;
-                                        var objValue = JSONCopy((_this_getEmptyState = _this.getEmptyState(fieldMapping.controlId)) !== null && _this_getEmptyState !== void 0 ? _this_getEmptyState : {});
+                                        if (cacheEmptyState.hasOwnProperty(fieldMapping.controlId) === false) {
+                                            var _this_getEmptyState;
+                                            cacheEmptyState[fieldMapping.controlId] = JSONCopy((_this_getEmptyState = _this.getEmptyState(fieldMapping.controlId)) !== null && _this_getEmptyState !== void 0 ? _this_getEmptyState : {});
+                                        }
+                                        var objValue = JSONCopy(cacheEmptyState[fieldMapping.controlId]);
                                         Object.keys(fieldMapping.dataBind).map(function(key) {
                                             var dataBind = fieldMapping.dataBind[key];
                                             if (row[dataBind.fieldCode] !== undefined) {
@@ -1223,6 +1295,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                         });
                                         newRow[fieldMapping.controlId] = objValue;
                                     }
+                                } else if (fieldCode === "uid" && row["uid"] !== undefined) {
+                                    newRow["uid"] = row["uid"];
                                 }
                             });
                             newState[mapping.dataViewId][mapping.controlId].push(newRow);
@@ -1286,7 +1360,9 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     }
                 });
                 this.debugLog("engine setData方法数据组合完成，参数为%o。", newState);
-                this.setStates(newState, undefined, options);
+                this.setStates(newState, undefined, _object_spread({
+                    setData: true
+                }, options));
                 this.debugLog("engine setData方法执行完成。");
             }
         },
@@ -1326,7 +1402,59 @@ var Engine = /*#__PURE__*/ function(Watcher) {
    * 获取组件实例，明细表中的组件将会得到数组, 第二个参数为(false/不传入)则获取到的是明细表内不包含表头内实例的所有控件实例，传入true则获取到包含表头内实例的所有控件实例,表头内实例永远在下标0的位置
    * @param controlId
    * @param header 明细表内是否获取表头的控件
-   */ key: "getInstances",
+   */ // getInstances(
+            //   controlId?: string,
+            //   header: boolean = false
+            // ): ControlRuntimeInstance<ControlsKeys>[] {
+            //   // const cc = console
+            //   // const label = '🐑 genInstances ' + controlId + ' ' + Date.now()
+            //   // cc.time(label)
+            //
+            //   if (controlId === undefined) {
+            //     // cc.timeEnd(label)
+            //     return this.runtime.flatInstances
+            //   }
+            //   const instances = Array.from(this.runtime.instanceMap[controlId] || [])
+            //   if (header) {
+            //     // 如果能从flatInstances里边取到，就通过getInstanceInSubtableHeader方法取，取不到则换一种方式
+            //     if (instances.length) {
+            //       const instance: RuntimeControl = instances[0]
+            //       // if (this.inList(instance.id) === true) {
+            //       if (this.inList(instance.id) !== undefined) {
+            //         const headerInstance = this.getInstanceInSubtableHeader(instance)
+            //         if (headerInstance) {
+            //           instances.unshift(headerInstance)
+            //         }
+            //       }
+            //     } else {
+            //       const controlIdMapping = this.getControlIdMapping()
+            //       const [subtableId] =
+            //         Object.entries(controlIdMapping).find(
+            //           ([_, mapping]) => mapping.children && controlId in mapping.children
+            //         ) ?? []
+            //       if (subtableId) {
+            //         const subtable = this.getInstance(subtableId)
+            //         // @ts-ignore
+            //         const headerColumn = subtable.props.headers.find((column: any) =>
+            //           column.children.find((item: any) => item.id === controlId)
+            //         )
+            //         if (headerColumn) {
+            //           const headerInstance = headerColumn.children.find(
+            //             (item: any) => item.id === controlId
+            //           )
+            //           if (headerInstance) {
+            //             instances.unshift(
+            //               headerInstance as ControlRuntimeInstance<ControlsKeys>
+            //             )
+            //           }
+            //         }
+            //       }
+            //     }
+            //   }
+            //   // @ts-ignore
+            //   return instances
+            // }
+            key: "getInstances",
             value: function getInstances(controlId) {
                 var header = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : false;
                 // const cc = console
@@ -1494,55 +1622,64 @@ var Engine = /*#__PURE__*/ function(Watcher) {
    * 如果控件在表头内，则返回-1
    * 如果控件在表内，则返回行下标
    * 如果控件不在明细表内，则返回undefined
-   * */ function getInstanceRowIndex(instance) {
+   * */ // public getInstanceRowIndex(
+            //   instance: ControlRuntimeInstance<ControlsKeys> | RuntimeControl
+            // ) {
+            //   if (!instance.parent) {
+            //     return
+            //   }
+            //   let rowIndex: number | undefined
+            //   // @ts-ignore
+            //   if (this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE)) {
+            //     // 表头内的控件
+            //     // @ts-ignore
+            //     if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
+            //       rowIndex = -1
+            //     } else {
+            //       // @ts-ignore
+            //       // const index = instance.parent.children.findIndex(
+            //       //   (item: any) => item === instance
+            //       // )
+            //       let instances = this.runtime.instanceMap[instance.id] || []
+            //       const index = instances.findIndex((item: any) => item === instance)
+            //       if (index > -1) {
+            //         rowIndex = index
+            //       }
+            //     }
+            //   } else {
+            //     rowIndex = this.getInstanceRowIndex(instance.parent)
+            //   }
+            //   return rowIndex
+            // }
+            function getInstanceRowIndex(instance) {
                 if (!instance.parent) {
                     return;
                 }
                 var rowIndex;
                 // @ts-ignore
-                if (this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE)) {
-                    // 表头内的控件
-                    // @ts-ignore
-                    if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
-                        rowIndex = -1;
-                    } else {
-                        // @ts-ignore
-                        var index = instance.parent.children.findIndex(function(item) {
-                            return item === instance;
-                        });
-                        if (index > -1) {
-                            rowIndex = index;
+                if (this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE_COLUMN) && this.assertInstance(instance.parent.parent, CONTROL_TYPE.SUBTABLE)) {
+                    rowIndex = -1;
+                } else {
+                    var isColumnChild = this.getInstanceParentControl(instance, // @ts-ignore
+                    CONTROL_TYPE.SUBTABLE_COLUMN);
+                    if (isColumnChild) {
+                        var instanceList = this.runtime.instanceMap[instance.id];
+                        if (Object.prototype.toString.call(instanceList) === "[object Array]") {
+                            var index = instanceList.findIndex(function(item) {
+                                return item === instance;
+                            });
+                            if (index > -1) {
+                                rowIndex = index;
+                            }
                         }
                     }
-                } else {
-                    rowIndex = this.getInstanceRowIndex(instance.parent);
                 }
                 return rowIndex;
             }
         },
         {
             key: "getInstanceParentControl",
-            value: // public getInstanceRowIndex(
-            //   instance: ControlRuntimeInstance<ControlsKeys> | RuntimeControl
-            // ) {
-            //   let rowIndex: number | undefined
-            //   // @ts-ignore
-            //   if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
-            //     rowIndex = -1
-            //   }else{
-            //     const instanceList = this.runtime.instanceMap[instance.id]
-            //     if(Object.prototype.toString.call(instanceList) === '[object Array]'){
-            //       const index = instanceList.findIndex(
-            //         (item: any) => item === instance
-            //       )
-            //       if (index > -1) {
-            //         rowIndex = index
-            //       }
-            //     }
-            //   }
-            //   return rowIndex
-            // }
-            function getInstanceParentControl(instance, controlType) {
+            value: function getInstanceParentControl(instance, controlType) {
                 if (!instance.parent) {
                     return;
                 }
@@ -1621,12 +1758,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "register",
             value: // 注册外部控件
-            function register() {
-                for(var _len = arguments.length, arg = new Array(_len), _key = 0; _key < _len; _key++){
-                    arg[_key] = arguments[_key];
-                }
-                var _Runtime;
-                return (_Runtime = Runtime).register.apply(_Runtime, _to_consumable_array(arg));
+            function register(control) {
+                return Runtime.register(control, "Runtime");
             }
         },
         {
@@ -1638,4 +1771,5 @@ var Engine = /*#__PURE__*/ function(Watcher) {
     ]);
     return Engine;
 }(Watcher);
+// @ts-ignore
 export { Engine };

package/dist/esm/common/Runtime.js

@@ -97,7 +97,7 @@ function _create_super(Derived) {
     };
 }
 import { RegisterControls } from "@byteluck-fe/model-driven-core";
-import { CONTROL_BASE_TYPE, CONTROL_TYPE, loopFormSchema } from "@byteluck-fe/model-driven-shared";
+import { CONTROL_BASE_TYPE, CONTROL_TYPE, JSONCopy, loopFormSchema, isArray } from "@byteluck-fe/model-driven-shared";
 import { hasChildrenControl, loopDataViewControl, loopFormControl } from "../utils/runtimeUtils";
 export var Runtime = /*#__PURE__*/ function(RegisterControls) {
     "use strict";
@@ -111,6 +111,7 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
         _define_property(_assert_this_initialized(_this), "_instance", void 0);
         _define_property(_assert_this_initialized(_this), "_flatInstances", []);
         _define_property(_assert_this_initialized(_this), "_instanceMap", {});
+        _define_property(_assert_this_initialized(_this), "_controlParentIdMap", {});
         var schema = props.schema;
         _this._schema = schema;
         _this._instance = _this.createControl(schema, props.beforeCreateInstance);
@@ -123,19 +124,32 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
             value: function getFlatInstances() {
                 var instances = [];
                 var instanceMap = {};
-                loop(this._instance, function(item) {
+                var controlParentIdMap = {};
+                loop(this._instance, "", function(item, parentId) {
                     // 3.4.1 避免将subtable-row 放到 _flatInstances 中
-                    if (item.type === "subtable-row" || item.type === "subtable-column") {
-                        return;
+                    //4.3.0-lh2 将自处注释掉，为使instance.parent能取到父级
+                    // if (item.type === 'subtable-row' || item.type === 'subtable-column') {
+                    //   return
+                    // }
+                    if (parentId) {
+                        // @ts-ignore
+                        controlParentIdMap[item.id] = parentId;
                     }
-                    instances.push(item);
                     if (!instanceMap[item.id]) {
                         instanceMap[item.id] = [];
                     }
+                    //不知为何subtable-column会多存一次
+                    if (item.type === "subtable-column") {
+                        if (instanceMap[item.id].length > 0) {
+                            return;
+                        }
+                    }
+                    instances.push(item);
                     instanceMap[item.id].push(item);
                 });
                 this._flatInstances = instances;
                 this._instanceMap = instanceMap;
+                this._controlParentIdMap = controlParentIdMap;
                 return this._flatInstances;
             }
         },
@@ -169,8 +183,9 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
                 var antdRules = {};
                 var ruleItems = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    ruleItems[dataView.id] = dataView.rules[0];
-                    antdRules[dataView.id] = dataView.rules[0];
+                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
+                    ruleItems[dataView.id] = JSONCopy(result[0]);
+                    antdRules[dataView.id] = JSONCopy(result[0]);
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -193,7 +208,9 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
             get: function get() {
                 var ruleItems = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    ruleItems[dataView.id] = dataView.rules[0];
+                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
+                    // ruleItems[dataView.id] = dataView.rules[0]
+                    ruleItems[dataView.id] = result[0];
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -212,7 +229,9 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
             get: function get() {
                 var antdRules = {};
                 loopDataViewControl(this._instance, function(dataView) {
-                    antdRules[dataView.id] = dataView.rules[0];
+                    var result = Runtime.staticGetRules(dataView.type, dataView.props);
+                    // antdRules[dataView.id] = dataView.rules[0]
+                    antdRules[dataView.id] = result[0];
                     loopFormControl(dataView.children, function(item) {
                         // if (
                         //   item instanceof RuntimeFormControl ||
@@ -229,22 +248,30 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
     ]);
     return Runtime;
 }(RegisterControls);
-function loop(control, callback) {
-    if (Array.isArray(control)) {
-        control.map(function(item) {
-            callback(item);
-            if (hasChildrenControl(item)) {
-                var ctl = item;
-                if (!ctl.children) {
-                    ctl.children = [];
-                }
-                // @ts-ignore
-                loop(ctl.children, callback);
+function loop(control, parentId, callback) {
+    var _instances = Array.isArray(control) ? control : [
+        control
+    ];
+    _instances.map(function(item) {
+        callback(item, parentId);
+        if (hasChildrenControl(item)) {
+            var ctl = item;
+            if (!ctl.children) {
+                ctl.children = [];
             }
-        });
-    } else {
-        callback(control);
-    }
+            // @ts-ignore
+            loop(ctl.children, ctl.id, callback);
+        }
+        if (hasHeaderOrFooterControl(item, "headers")) {
+            loop(item.props.headers, item.id, callback);
+        }
+        if (hasHeaderOrFooterControl(item, "footers")) {
+            loop(item.props.footers, item.id, callback);
+        }
+    });
+}
+function hasHeaderOrFooterControl(control, checkType) {
+    return checkType in control.props && isArray(control.props[checkType]);
 }
 /**
  * 控件是否在视图中隐藏，遍历查找所有parent
@@ -252,7 +279,7 @@ function loop(control, callback) {
     if (control.props.isHide) {
         return true;
     }
-    if (control.parent === null) {
+    if (control.parent === null || control.parent === undefined) {
         return false;
     }
     return getControlIsHide(control.parent);
@@ -262,11 +289,14 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
+    var result = Runtime.staticGetRules(item.type, item.props);
     // if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
-        data[item.id] = item.rules;
+        // data[item.id] = item.rules
+        data[item.id] = result;
     } else if (item.type === CONTROL_TYPE.SUBTABLE) {
-        data[item.id] = item.rules;
+        // data[item.id] = item.rules
+        data[item.id] = result;
         var itemRules = {
             type: "array",
             fields: {}
@@ -281,8 +311,13 @@ item) {
                             fields: {}
                         };
                     }
+                    // // @ts-ignore
+                    // itemRules.fields[index].fields[formControl.id] = (
+                    //   formControl as RuntimeFormControl
+                    // ).rules
+                    var childResult = Runtime.staticGetRules(formControl.type, formControl.props);
                     // @ts-ignore
-                    itemRules.fields[index].fields[formControl.id] = formControl.rules;
+                    itemRules.fields[index].fields[formControl.id] = childResult;
                 }
             });
         });
@@ -294,15 +329,19 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
+    var result = Runtime.staticGetRules(item.type, item.props);
     // if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
-        antdRules[item.id] = item.rules;
+        // antdRules[item.id] = item.rules
+        antdRules[item.id] = result;
     } else if (item.type === CONTROL_TYPE.SUBTABLE && item.children.length) {
         antdRules[item.id] = [];
         item.children.forEach(function(row) {
             var rules = {};
             loopFormSchema(row.children, function(formControl) {
-                rules[formControl.id] = formControl.rules;
+                // rules[formControl.id] = (formControl as RuntimeFormControl).rules
+                var childResult = Runtime.staticGetRules(formControl.type, formControl.props);
+                rules[formControl.id] = childResult;
             });
             antdRules[item.id].push(rules);
         });

package/dist/esm/common/Store.js

@@ -121,7 +121,12 @@ var Store = /*#__PURE__*/ function() {
                 } else {
                     var controlInfo = this.controlIdMapping[controlId];
                     if (controlInfo !== undefined) {
-                        return this.state[controlInfo.dataView][controlId];
+                        var data = this.state[controlInfo.dataView][controlId];
+                        if (rowIndex !== undefined) {
+                            return data[rowIndex];
+                        } else {
+                            return data;
+                        }
                     } else {
                         if (rowIndex !== undefined) {
                             var state;

package/dist/esm/plugins/CalcPlugin.js

@@ -196,7 +196,9 @@ export var CalcPlugin = /*#__PURE__*/ function() {
    * */ function allCalcControlComputed() {
                 var _this = this;
                 this.calcControls.forEach(function(item) {
+                    // this.engine.getState(item.id)
                     if (item.props.dataBind.result.fieldCode === null || item.props.dataBind.result.fieldCode === undefined) {
+                        // formEngineModel在custom:beforeEngineMounted时调用二开赋值，表单值 set 了却没有做计算。但这个是正常的
                         _this.computedCalcValue(item);
                     }
                 });