@byteluck-fe/model-driven-engine 2.0.9 → 2.1.0-beta.1

package/dist/esm/common/Engine.js

@@ -333,7 +333,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { DataBind, ObjectDataBind, RuntimeFormControl, RuntimeLayoutControl, RuntimeListControl } from "@byteluck-fe/model-driven-core";
+import { DataBind, ObjectDataBind, RuntimeFormControl, RuntimeListControl } from "@byteluck-fe/model-driven-core";
 import { CONTROL_TYPE, DEFAULT_LOCALE, error, genNonDuplicateId, isString, JSONCopy, log, RulesMessage, updateValueFromKeys, warn, Watcher } from "@byteluck-fe/model-driven-shared";
 import { Runtime } from "./Runtime";
 import { Store } from "./Store";
@@ -341,6 +341,7 @@ import { findItem, proxyState } from "./proxyState";
 import { ActionManager } from "./ActionManager";
 import { DataManager } from "./DataManager";
 import { checkerSubtableValue, checkerValue } from "./checkerValue";
+import { genSubTableRowInstanceFromHeaders } from "./SubTableSpeedUp";
 if (typeof window !== "undefined") {
     // @ts-ignore
     window.engines = {};
@@ -430,7 +431,6 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         this.store.state = proxyState(this.store.state, this._proxyStateCallback.bind(this), this._proxyStateBeforeSetCallback.bind(this));
     };
     _proto._proxyStateBeforeSetCallback = function _proxyStateBeforeSetCallback(state, key, newValue, oldValue) {
-        var _this = this;
         var instance = findItem(this.runtime.flatInstances, key);
         // 找不到控件说明不是改动控件上的字段，直接通过
         if (!instance) {
@@ -438,6 +438,9 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         }
         // @ts-ignore
         if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE)) {
+            if (newValue === null) {
+                return [];
+            }
             // @ts-ignore
             var fieldTypeMap = instance.props.headers.reduce(function(result, column) {
                 var formInstance = column.children[0];
@@ -446,12 +449,11 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
                 return result;
             }, {});
-            if (newValue === null) {
-                return [];
-            }
+            // @ts-ignore
+            var emptyState = this.getEmptyState(instance.id);
             return newValue.map(function(row) {
                 return(// @ts-ignore
-                checkerSubtableValue(fieldTypeMap, row, _this.getEmptyState(instance.id)));
+                checkerSubtableValue(fieldTypeMap, row, emptyState));
             });
         }
         var keys = key.split(".");
@@ -471,20 +473,12 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         }
     };
     _proto._handlerArrayUpdate = function _handlerArrayUpdate(state, key, type, args, result) {
-        var _this = this;
         var subtable = findItem(this.runtime.flatInstances, key);
         if (!_instanceof(subtable, RuntimeListControl)) return;
         // 新增多行方法
+        // JUTODO 这里已经直接删除了创建instance 的逻辑，或许以后连这个函数都不需要调用了
         var createRows = function(len) {
-            // @ts-ignore
-            var newRows = [];
-            for(var i = 0; i < len; i++){
-                // @ts-ignore
-                var row = _this.listControlCreateRow(subtable, "subtable-row");
-                row && newRows.push(row);
-            }
-            // @ts-ignore
-            return newRows;
+            return [];
         };
         var options = eventOptionsTemp;
         // @ts-ignore
@@ -569,19 +563,10 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         var index = this.getInstanceRowIndex(instance);
         var options = eventOptionsTemp || {};
         if (_instanceof(instance, RuntimeListControl)) {
-            var // @ts-ignore
-            _instance_children;
             instance.children.length = 0;
             var newValue = value;
             // @ts-ignore
             var newRows = [];
-            for(var i = 0; i < newValue.length; i++){
-                // @ts-ignore
-                var row = this.listControlCreateRow(instance, "subtable-row");
-                row && newRows.push(row);
-            }
-            (_instance_children = instance.children).push.apply(_instance_children, _toConsumableArray(newRows));
-            this.runtime.getFlatInstances();
             // 这里已经能拿到控件实例，所以在这里触发setStates，触发每一行每一个控件的change事件
             // for (let i = 0; i < newValue.length; i++) {
             //   this.setStates(newValue[i], i, options)
@@ -624,23 +609,13 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         this.__pluginsApplied = true;
     };
     _proto.listControlCreateRow = function listControlCreateRow(instance, rowType) {
-        var row = this.runtime.createControlInstance(rowType);
-        if (!row) return;
-        if (_instanceof(row, RuntimeLayoutControl)) {
-            var _row_children;
-            var template = JSONCopy(instance.props.headers);
-            // @ts-ignore
-            var columns = this.createControl(template);
-            (_row_children = row.children).push.apply(_row_children, _toConsumableArray(columns));
-        }
-        return row;
+        throw new Error("该api已废弃");
     };
     _proto.listControlAddRow = function listControlAddRow(instance) {
         var // @ts-ignore
         rowType = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "subtable-row";
-        var row = this.listControlCreateRow(instance, rowType);
-        if (!row) return;
-        instance.children.push(row);
+        // JUTODO 这似乎是个二开api
+        throw new Error("该api已废弃");
     };
     // payload应该是runtimeSchema和value，然后通过runTimeSchema去找需要修改的data里边的key
     _proto.emit = function emit(eventKey, payload) {
@@ -879,7 +854,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                     for(var keyChi1 in item[keyChi]){
                                         var _controlIdMapping_key_children_keyChi2;
                                         objChi[(_controlIdMapping_key_children_keyChi2 = controlIdMapping[key].children[keyChi]) === null || _controlIdMapping_key_children_keyChi2 === void 0 ? void 0 : _controlIdMapping_key_children_keyChi2.dataBind[keyChi1].fieldCode] = item[keyChi][keyChi1];
-                                    // 
+                                    //
                                     }
                                 }
                             }
@@ -1313,6 +1288,27 @@ var Engine = /*#__PURE__*/ function(Watcher) {
     _proto.getControlConfig = function getControlConfig(control) {
         return this.runtime.getControlConfig(control);
     };
+    _proto.initSubTableRowPropsFromInstanceHeaders = function initSubTableRowPropsFromInstanceHeaders(instance) {
+        var cc = console;
+        var now = Date.now();
+        var timeLabel = "\uD83D\uDC2E  initSubTableRowPropsFromInstanceHeaders " + now;
+        cc.time(timeLabel);
+        /**headers实际 是 SubTableColumnControl的数组 */ Object.assign(instance.rowProps, genSubTableRowInstanceFromHeaders(instance.props.headers));
+        cc.timeEnd(timeLabel);
+    };
+    _proto.initSubTableRowPropsFromProxySetNewValue = function initSubTableRowPropsFromProxySetNewValue(instance, value) {
+        var cc = console;
+        var now = Date.now();
+        var timeLabel = "\uD83D\uDC37  initSubTableRowPropsFromProxySetNewValue " + now;
+        cc.time(timeLabel);
+        value.forEach(function(item) {
+            Object.assign(instance.rowProps, {
+                // 这里只是做个性能测试，实际上需要merge rowProps，并且还需要一个恰当的key
+                now: genSubTableRowInstanceFromHeaders(instance.props.headers)
+            });
+        });
+        cc.timeEnd(timeLabel);
+    };
     // 注册外部控件
     Engine.register = function register() {
         for(var _len = arguments.length, arg = new Array(_len), _key = 0; _key < _len; _key++){

package/dist/esm/common/SubTableSpeedUp.js

@@ -0,0 +1,17 @@
+// import { RuntimeSubTableColumnControl } from '@byteluck-fe/model-driven-core'
+// import { RuntimeControl } from '@byteluck-fe/model-driven-core'
+import cloneDeep from "lodash.clonedeep";
+export function genSubTableRowInstanceFromHeaders(// headers: RuntimeSubTableColumnControl[]
+headers) {
+    var subtableRow = headers.reduce(function(pre, cur) {
+        var children = cur.children;
+        children.forEach(function(control) {
+            pre[control.id] = copyPropsFromControlInstance(control);
+        });
+        return pre;
+    }, {});
+    return subtableRow;
+}
+function copyPropsFromControlInstance(control) {
+    return cloneDeep(control.props);
+}