@byteluck-fe/model-driven-engine 2.9.0-alpha.9 → 2.9.0-beta.2

package/dist/esm/common/ActionManager.js

@@ -237,9 +237,10 @@ export var ActionManager = /*#__PURE__*/ function() {
                                 e = _state.sent();
                                 // 执行的时候不使用throw error，而是使用console.error，避免阻塞内置代码的执行
                                 logerror("".concat(action.id, " Exception during calling action: ").concat(e));
+                                //尤其是在表单提交前事件异常，不能默认允许它通过。
                                 return [
-                                    3,
-                                    4
+                                    2,
+                                    false
                                 ];
                             case 4:
                                 return [

package/dist/esm/common/Engine.js

@@ -348,6 +348,7 @@ import { findItem, proxyState } from "./proxyState";
 import { ActionManager } from "./ActionManager";
 import { DataManager } from "./DataManager";
 import { checkerSubtableValue, checkerValue } from "./checkerValue";
+import { buildUUID } from "../utils/runtimeUtils";
 if (typeof window !== "undefined") {
     // @ts-ignore
     window.engines = {};
@@ -467,7 +468,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "_proxyStateBeforeSetCallback",
             value: function _proxyStateBeforeSetCallback(state, key, newValue, oldValue) {
-                var instance = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
+                var _findItem = findItem(key, this), instance = _findItem.instance, rowIndex = _findItem.rowIndex;
                 // 找不到控件说明不是改动控件上的字段，直接通过
                 if (!instance) {
                     return newValue;
@@ -517,7 +518,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             key: "_handlerArrayUpdate",
             value: function _handlerArrayUpdate(state, key, type, args, result) {
                 var _this = this;
-                var subtable = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
+                var instanceItem = findItem(key, this);
+                var subtable = instanceItem.instance;
                 // if (!(subtable instanceof RuntimeListControl)) return
                 if (!((subtable === null || subtable === void 0 ? void 0 : subtable.controlType) === CONTROL_BASE_TYPE.LIST)) return;
                 // 新增多行方法
@@ -602,14 +604,16 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             result
                         ];
                     }
+                    var subtableData = this.getState(subtable.id);
+                    this._handlerSubtableUpdateUid(subtableData);
                     this.emit("list-change", {
                         instance: subtable,
-                        value: this.getState(subtable.id),
+                        value: subtableData,
                         options: Object.assign({}, options, {
                             changed: createdNewRows,
                             data: createdNewRowsData,
                             deleted: deleted !== null && deleted !== void 0 ? deleted : [],
-                            jsonValue: JSON.stringify(this.getState(subtable.id)),
+                            jsonValue: JSON.stringify(subtableData),
                             isDeleteLastOne: isDeleteLastOne,
                             type: type,
                             args: args
@@ -620,14 +624,26 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
             }
         },
+        {
+            key: "_handlerSubtableUpdateUid",
+            value: function _handlerSubtableUpdateUid(subtableData) {
+                subtableData.forEach(function(item) {
+                    if (!item.uid) {
+                        Object.assign(item, {
+                            uid: "new:" + buildUUID("uid")
+                        });
+                    }
+                });
+            }
+        },
         {
             key: "_handlerObjectUpdate",
             value: function _handlerObjectUpdate(state, key, value, oldValue) {
-                var instance = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
+                var _findItem = findItem(key, this), instance = _findItem.instance, rowIndex = _findItem.rowIndex;
                 if (!instance) {
                     return;
                 }
-                var index = this.getInstanceRowIndex(instance);
+                var index = rowIndex;
                 var options = eventOptionsTemp || {};
                 // if (instance instanceof RuntimeListControl) {
                 if (instance.controlType === CONTROL_BASE_TYPE.LIST && instance.type === CONTROL_TYPE.SUBTABLE) {
@@ -652,6 +668,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     if ((options === null || options === void 0 ? void 0 : options.setData) === true) {
                         deleted = [];
                     }
+                    this._handlerSubtableUpdateUid(newValue);
                     this.emit("list-change", {
                         instance: instance,
                         value: value,
@@ -661,7 +678,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             data: newValue,
                             deleted: deleted,
                             // deleted: oldValue ?? [],
-                            type: "push"
+                            type: "push",
+                            jsonValue: JSON.stringify(newValue)
                         })
                     });
                 } else {

package/dist/esm/common/Store.js

@@ -77,9 +77,20 @@ var Store = /*#__PURE__*/ function() {
             value: function setState(controlId, value, rowIndex) {
                 var _this = this;
                 var controlInfo = this.controlIdMapping[controlId];
+                var noProxyValue = JSONCopy(value);
                 if (controlInfo !== undefined) {
+                    //明细表
+                    if (controlInfo.children) {
+                        value.forEach(function(item) {
+                            if (!item.uid) {
+                                Object.assign(item, {
+                                    uid: "new:" + buildUUID("uid")
+                                });
+                            }
+                        });
+                    }
                     //qiyu 按照对象赋值，Object.assign会触发多次key的change事件
-                    this.state[controlInfo.dataView][controlId] = value;
+                    this.state[controlInfo.dataView][controlId] = noProxyValue;
                 // if (
                 //   controlInfo.dataBind instanceof ObjectDataBind &&
                 //   isPlainObject(value)
@@ -98,7 +109,7 @@ var Store = /*#__PURE__*/ function() {
                                 Object.keys(children).map(function(childControlId) {
                                     if (childControlId === controlId) {
                                         if (_this.state[dataView][subtableId][rowIndex]) {
-                                            _this.state[dataView][subtableId][rowIndex][controlId] = value;
+                                            _this.state[dataView][subtableId][rowIndex][controlId] = noProxyValue;
                                         }
                                     }
                                 });
@@ -106,7 +117,7 @@ var Store = /*#__PURE__*/ function() {
                         });
                     } else {
                         //不存在的 controlId，直接被挂载到外部key
-                        this.state[controlId] = value;
+                        this.state[controlId] = noProxyValue;
                     }
                 }
             }
@@ -364,6 +375,13 @@ item) {
                     });
                 });
             } else {
+                if (data[item.props.dataBind.dataCode] === undefined) {
+                    data[item.props.dataBind.dataCode] = {
+                        controlId: dataViewId,
+                        fields: [],
+                        dataViewId: dataViewId
+                    };
+                }
                 data[item.props.dataBind.dataCode].fields.push({
                     fieldCode: item.props.dataBind.fieldCode,
                     controlId: item.id,

package/dist/esm/common/proxyState.js

@@ -24,7 +24,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 var cc = console;
-import { CONTROL_BASE_TYPE, error, logerror } from "@byteluck-fe/model-driven-shared";
+import { error, logerror, JSONCopy } from "@byteluck-fe/model-driven-shared";
 var proxyArrayApi = [
     "splice",
     "push",
@@ -125,7 +125,7 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
             return Reflect.get(target, propertyKey, receiver);
         },
         set: function set(target, propertyKey, value, receiver) {
-            var newValue = value;
+            var newValue = JSONCopy(value);
             // @ts-ignore
             var oldValue = target[propertyKey];
             var concatKey = thisKey === "" ? propertyKey : thisKey + "." + propertyKey;
@@ -142,14 +142,14 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
                 }
             }
             var _reProxyState;
-            newValue = (_reProxyState = reProxyState(value)) !== null && _reProxyState !== void 0 ? _reProxyState : newValue;
+            newValue = (_reProxyState = reProxyState(newValue)) !== null && _reProxyState !== void 0 ? _reProxyState : newValue;
             // 先设置值，然后再进行触发回调，确保回调内拿到的是最新的值
             var setResult;
             // TODO 数组拦截操作需要重构，优化现有逻辑
             // TODO 直接操作下标改动明细表时，没有对行数据进行checker
             if (Array.isArray(target)) {
                 // 操作数组的时候，不需要使用拼接的thisKey，先判断执行的是否是违规操作，违规操作的话会报错，不允许继续执行，正常操作的话，返回一个回调函数，用于在值修改完之后触发
-                var nextHandler = ArrayHandler(target, propertyKey, value, thisKey, callback);
+                var nextHandler = ArrayHandler(target, propertyKey, newValue, thisKey, callback);
                 setResult = Reflect.set(target, propertyKey, newValue, receiver);
                 if (nextHandler) {
                     nextHandler();
@@ -171,7 +171,7 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
                     return true;
                 }
                 setResult = Reflect.set(target, propertyKey, newValue, receiver);
-                callback.call(null, target, concatKey, value, oldValue);
+                callback.call(null, target, concatKey, newValue, oldValue);
             }
             // 不返回falsy 值（即 false、0、null、undefined、空字符串等）
             //fix: TypeError: Proxy object's 'set' trap returned falsy value for property 'length'
@@ -216,40 +216,33 @@ function flatInstanceForChildren(controls) {
  * 在flatInstance中通过key查找出对应的instance
  * @param flatInstance 拍平的instance数组
  * @param key 操作的数据在state的key - 可以是深层次的 subtable.0.input等
- * */ export function findItem(flatInstance, key, instanceMap) {
-    if (key === "") return undefined;
+ * */ export function findItem(key, engine) {
+    if (key === "") return {
+        instance: undefined,
+        rowIndex: undefined
+    };
     var keys = key.split(".");
-    if (keys.length === 0) return undefined;
-    var oneKey = keys[0];
-    var otherKeys = keys.slice(1);
-    // 3.4.1 优化速度，读取instanceMap
-    // cc.time('findItem flatInstance find')
-    // const initInstance = flatInstance.find((item) => item.id === oneKey)
-    // cc.log('🏠 findItem flatInstance find result', initInstance)
-    // cc.timeEnd('findItem flatInstance find')
-    // cc.time('findItem instanceMap match')
-    var initInstance = instanceMap[oneKey] ? instanceMap[oneKey][0] : undefined;
-    // cc.log('🏠 findItem instanceMap match result', initInstance)
-    // cc.timeEnd('findItem instanceMap match')
-    if (otherKeys.length === 0) return initInstance;
-    // @ts-ignore
-    return otherKeys.reduce(function(prevItem, key) {
-        var index = Number(key);
-        var isNotIndex = Number.isNaN(index);
-        if (isNotIndex && prevItem) {
-            var flatChildren = (prevItem === null || prevItem === void 0 ? void 0 : prevItem.children) ? flatInstanceForChildren(prevItem.children) : undefined;
-            var findEndItem = flatChildren === null || flatChildren === void 0 ? void 0 : flatChildren.find(function(item) {
-                return item.id === key;
-            });
-            // 最后一个key可能是值对象上边的key，比如金额的amount和currency，计算公式的result和unit，所以需要判断前一个控件是不是一个表单控件，是的话就返回最后一个表单控件
-            return findEndItem ? findEndItem : prevItem.controlType === CONTROL_BASE_TYPE.FORM ? prevItem : undefined;
-        } else {
-            var _prevItem_children;
-            var _prevItem_children_index;
-            // 如果有children，则取children中对应的下标，没有的话一直返回prevItem
-            return (_prevItem_children_index = prevItem === null || prevItem === void 0 ? void 0 : (_prevItem_children = prevItem.children) === null || _prevItem_children === void 0 ? void 0 : _prevItem_children[index]) !== null && _prevItem_children_index !== void 0 ? _prevItem_children_index : prevItem;
-        }
-    }, initInstance);
+    if (keys.length === 0) return {
+        instance: undefined,
+        rowIndex: undefined
+    };
+    var instanceIndex = keys.filter(function(item) {
+        return !isNaN(item);
+    }).at(-1);
+    var findKeyIndex = instanceIndex ? keys.lastIndexOf(instanceIndex) : -1;
+    var rowIndex;
+    var controlId;
+    if (findKeyIndex > -1) {
+        rowIndex = Number(keys[findKeyIndex]);
+        controlId = keys === null || keys === void 0 ? void 0 : keys[findKeyIndex + 1];
+    } else {
+        controlId = keys[1];
+    }
+    var proxyInstance = engine.getInstance(controlId, rowIndex);
+    return {
+        instance: proxyInstance,
+        rowIndex: rowIndex
+    };
 }
 function getArrayNewValue(type, args) {
     if ([

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" && !_this.engine.isMounted) {
+                                    if ((eventKey === "change" || eventKey === "list-change") && !_this.engine.isMounted) {
                                         return [
                                             2
                                         ];

package/dist/esm/plugins/LifecycleEventPlugin.js

@@ -201,6 +201,7 @@ function _ts_generator(thisArg, body) {
     }
 }
 var LifecycleEventKeyMap = {
+    "engine-initialized": "did_init",
     "engine-mounted": "did_mount",
     "engine-submit": "will_submit",
     "engine-submit-params": "do_submit",

package/dist/esm/plugins/StylePlugin.js

@@ -1,4 +1,10 @@
-function _class_call_check(instance, Constructor) {
+/*
+ * @Author: zhaoxiaoyang zhaoxiaoyang@byteluck.com
+ * @Date: 2022-04-15 14:06:03
+ * @LastEditors: zhaoxiaoyang zhaoxiaoyang@byteluck.com
+ * @LastEditTime: 2023-11-30 16:38:47
+ * @FilePath: /model-driven/packages/engine/src/plugins/StylePlugin.ts
+ */ function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }

package/dist/esm/utils/runtimeUtils.js

@@ -1,6 +1,6 @@
 import { CONTROL_BASE_TYPE, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
 export function hasChildrenControl(instance) {
-    return instance.controlType === CONTROL_BASE_TYPE.LAYOUT || instance.controlType === CONTROL_BASE_TYPE.WRAP || instance.controlType === CONTROL_BASE_TYPE.LIST || instance.controlType === CONTROL_BASE_TYPE.SEARCH;
+    return instance.controlType === CONTROL_BASE_TYPE.LAYOUT || instance.controlType === CONTROL_BASE_TYPE.WRAP || instance.controlType === CONTROL_BASE_TYPE.LIST || instance.controlType === CONTROL_BASE_TYPE.SEARCH || instance.controlType === CONTROL_BASE_TYPE.COLUMN && instance.type !== CONTROL_TYPE.OPERATION_COLUMN;
 }
 export function loopFormControl(control, callback) {
     if (Array.isArray(control)) {