@byteluck-fe/model-driven-engine 1.7.6-bete.2 → 1.7.6-bete.21

package/dist/esm/common/Engine.js

@@ -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 = {};
@@ -365,6 +366,10 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         _this.__pluginsApplied = false;
         _this.actionManager = new ActionManager();
         _this._jobTasks = [];
+        /**
+   * 用于存储运行态无需proxy的数据
+   * from v1.7.6-beta
+   */ _this.rawStore = {};
         _this.createControlInstance = _this.createInstance;
         _this.$options = Object.freeze(props);
         var _this_$options = _this.$options, _this_$options_autoMount = _this_$options.autoMount, autoMount = _this_$options_autoMount === void 0 ? true : _this_$options_autoMount, schema = _this_$options.schema, beforeCreateInstance = _this_$options.beforeCreateInstance, externalParams = _this_$options.externalParams, _this_$options_language = _this_$options.// fieldModel,
@@ -430,17 +435,21 @@ 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 cc = console;
-        cc.time("㊗️_proxyStateBeforeSetCallback findItem");
+        var now = Date.now();
+        cc.log("㊗️_proxyStateBeforeSetCallback findItem " + key, newValue, oldValue);
+        cc.time("㊗️_proxyStateBeforeSetCallback findItem " + key + " " + now);
         var instance = findItem(this.runtime.flatInstances, key);
-        cc.timeLog("㊗️_proxyStateBeforeSetCallback findItem");
+        cc.timeEnd("㊗️_proxyStateBeforeSetCallback findItem " + key + " " + now);
         // 找不到控件说明不是改动控件上的字段，直接通过
         if (!instance) {
             return newValue;
         }
         // @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];
@@ -449,12 +458,10 @@ 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)));
+                return checkerSubtableValue(fieldTypeMap, row, emptyState);
             });
         }
         var keys = key.split(".");
@@ -474,21 +481,20 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         }
     };
     _proto._handlerArrayUpdate = function _handlerArrayUpdate(state, key, type, args, result) {
-        var _this = this;
         var cc = console;
-        cc.time("㊗️ _handlerArrayUpdate findItem");
+        cc.time("㊗️ _handlerArrayUpdate findItem" + key);
         var subtable = findItem(this.runtime.flatInstances, key);
-        cc.timeLog("㊗️ _handlerArrayUpdate findItem");
+        cc.timeEnd("㊗️ _handlerArrayUpdate findItem" + key);
         if (!_instanceof(subtable, RuntimeListControl)) return;
         // 新增多行方法
         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);
-            }
+            // for (let i = 0; i < len; i++) {
+            //   // @ts-ignore
+            //   const row = this.listControlCreateRow(subtable, 'subtable-row')
+            //   row && newRows.push(row)
+            // }
             // @ts-ignore
             return newRows;
         };
@@ -569,32 +575,38 @@ var Engine = /*#__PURE__*/ function(Watcher) {
     };
     _proto._handlerObjectUpdate = function _handlerObjectUpdate(state, key, value, oldValue) {
         var cc = console;
-        cc.time("㊗️_handlerObjectUpdate findItem");
+        var now = Date.now();
+        cc.log("㊗️_handlerObjectUpdate findItem " + key, value, oldValue);
+        cc.time("㊗️_handlerObjectUpdate findItem " + key + " " + now);
+        // 1. header -> instance
+        // 2. 如何判断应该 给 subtableInstance.children中 push
+        // JUTODO
+        // 1. 修改生成的key的规则，去除[index]
+        // 2. 新增一个查找 subtable上的 _rowPropsList 的对应key instance的函数A
+        // 3. 判断 当前的key 应该调用 A 或者是 findItem
+        // 4.
         var instance = findItem(this.runtime.flatInstances, key);
-        cc.timeLog("㊗️_handlerObjectUpdate findItem");
+        cc.timeEnd("㊗️_handlerObjectUpdate findItem " + key + " " + now);
         if (!instance) {
             return;
         }
         var index = this.getInstanceRowIndex(instance);
         var options = eventOptionsTemp || {};
         if (_instanceof(instance, RuntimeListControl)) {
-            var // @ts-ignore
-            _instance_children;
-            instance.children.length = 0;
+            // instance.children.length = 0
+            this.initSubTableRowPropsFromInstanceHeaders(instance);
             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事件
+            this.initSubTableRowPropsFromProxySetNewValue(instance, value);
             // for (let i = 0; i < newValue.length; i++) {
-            //   this.setStates(newValue[i], i, options)
+            //   // @ts-ignore
+            //   const row = this.listControlCreateRow(instance, 'subtable-row')
+            //   row && newRows.push(row)
             // }
+            // @ts-ignore
+            // instance.children.push(...newRows)
+            this.runtime.getFlatInstances();
             this.emit("list-change", {
                 instance: instance,
                 value: value,
@@ -636,20 +648,21 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         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));
+        // const template = JSONCopy(instance.props.headers) as any
+        // @ts-ignore
+        // const columns = this.createControl(template) as unknown as any[]
+        // row.children.push(...columns)
         }
         return row;
     };
     _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已废弃");
+    // const row = this.listControlCreateRow(instance, rowType)
+    // if (!row) return
+    // instance.children.push(row)
     };
     // payload应该是runtimeSchema和value，然后通过runTimeSchema去找需要修改的data里边的key
     _proto.emit = function emit(eventKey, payload) {
@@ -1030,6 +1043,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         var _this = this;
         this.debugLog("engine setData方法执行，参数为%o，%o。", dataSet, options);
         var newState = {};
+        // debugger
         Object.keys(dataSet).map(function(dataCode) {
             var entity = dataSet[dataCode];
             if (Array.isArray(entity)) {
@@ -1142,6 +1156,10 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         if (controlId === undefined) {
             return this.runtime.flatInstances;
         }
+        var cc = console;
+        var now = Date.now();
+        var timeLabel = "⚠️ getInstances " + controlId + " " + header + now;
+        cc.time(timeLabel);
         var instances = this.runtime.flatInstances.filter(// @ts-ignore
         function(item) {
             return item.id === controlId;
@@ -1182,6 +1200,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 }
             }
         }
+        cc.timeEnd(timeLabel);
         return instances;
     };
     _proto.setInstance = function setInstance(instance, props, value, rowIndex) {
@@ -1322,6 +1341,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);
+}

package/dist/esm/plugins/CalcPlugin.js

@@ -283,6 +283,10 @@ export var CalcPlugin = /*#__PURE__*/ function() {
         if (!scriptEcho || scriptEcho.length === 0) {
             return;
         }
+        var cc = console;
+        var now = Date.now();
+        var timeLabel = "\uD83D\uDC36 computedCalcValue " + control.id + " " + now;
+        cc.time(timeLabel);
         // @ts-ignore
         var scriptText = scriptEcho.reduce(function(result, current) {
             if (current.type === CALC_TOKEN_TYPE.Operator || current.type === CALC_TOKEN_TYPE.Number) {
@@ -343,6 +347,8 @@ export var CalcPlugin = /*#__PURE__*/ function() {
             rowIndex = this.engine.getInstanceRowIndex(control);
             // 控件在明细表内，但是没有行下标，说明控件被已经删除了，所以直接return
             if (rowIndex === undefined) {
+                cc.log(timeLabel, "------> 控件在明细表内，但是没有行下标，说明控件被已经删除了，所以直接return");
+                cc.timeEnd(timeLabel);
                 return;
             }
         }
@@ -350,6 +356,8 @@ export var CalcPlugin = /*#__PURE__*/ function() {
         var result = !value || value === Infinity || value === -Infinity ? 0 : control.props.precision === "" ? value : Number(value.toFixed(control.props.precision));
         // 如果值没变的话，不触发修改
         if (result === (oldValue === null || oldValue === void 0 ? void 0 : oldValue.result)) {
+            cc.log(timeLabel, "------> 如果值没变的话，不触发修改");
+            cc.timeEnd(timeLabel);
             return;
         }
         var _oldValue_unit;
@@ -357,6 +365,7 @@ export var CalcPlugin = /*#__PURE__*/ function() {
             result: result,
             unit: (_oldValue_unit = oldValue === null || oldValue === void 0 ? void 0 : oldValue.unit) !== null && _oldValue_unit !== void 0 ? _oldValue_unit : ""
         }, rowIndex);
+        cc.timeEnd(timeLabel);
     };
     /**
    * @description 获取数字值，因为计算公式可以依赖计算公式和金额，所以需要从value中取到对应的值