@byteluck-fe/model-driven-engine 2.2.1-test.1 → 2.2.1-test.2

package/dist/esm/common/Engine.js

@@ -333,8 +333,8 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { DataBind, ObjectDataBind, RuntimeFormControl, RuntimeLayoutControl, 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 { DataBind, ObjectDataBind, RuntimeListControl } from "@byteluck-fe/model-driven-core";
+import { CONTROL_BASE_TYPE, 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";
 import { findItem, proxyState } from "./proxyState";
@@ -444,7 +444,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             // @ts-ignore
             var fieldTypeMap = instance.props.headers.reduce(function(result, column) {
                 var formInstance = column.children[0];
-                if (formInstance && _instanceof(formInstance, RuntimeFormControl)) {
+                // if (formInstance && formInstance instanceof RuntimeFormControl) {
+                if (formInstance && formInstance.controlType === CONTROL_BASE_TYPE.FORM) {
                     result[formInstance.id] = formInstance.fieldType;
                 }
                 return result;
@@ -556,7 +557,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                 options: Object.assign({}, options, {
                     changed: createdNewRows,
                     data: createdNewRowsData,
-                    deleted: deleted !== null && deleted !== void 0 ? deleted : []
+                    deleted: deleted !== null && deleted !== void 0 ? deleted : [],
+                    jsonValue: JSON.stringify(this.getState(subtable.id))
                 })
             });
             // 主动清空本次任务中的options
@@ -570,7 +572,8 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         }
         var index = this.getInstanceRowIndex(instance);
         var options = eventOptionsTemp || {};
-        if (_instanceof(instance, RuntimeListControl)) {
+        // if (instance instanceof RuntimeListControl) {
+        if (instance.controlType === CONTROL_BASE_TYPE.LIST) {
             var // @ts-ignore
             _instance_children;
             instance.children.length = 0;
@@ -628,12 +631,15 @@ var Engine = /*#__PURE__*/ function(Watcher) {
     _proto.listControlCreateRow = function listControlCreateRow(instance, rowType) {
         var row = this.runtime.createControlInstance(rowType);
         if (!row) return;
-        if (_instanceof(row, RuntimeLayoutControl)) {
-            var _row_children;
+        // if (row instanceof RuntimeLayoutControl) {
+        // @ts-ignore
+        if (row.controlType === CONTROL_BASE_TYPE.LAYOUT) {
+            var _inst_children;
+            var inst = row;
             var template = JSONCopy(instance.props.headers);
             // @ts-ignore
             var columns = this.createControl(template);
-            (_row_children = row.children).push.apply(_row_children, _toConsumableArray(columns));
+            (_inst_children = inst.children).push.apply(_inst_children, _toConsumableArray(columns));
         }
         return row;
     };

package/dist/esm/common/Runtime.js

@@ -42,13 +42,6 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _setPrototypeOf(subClass, superClass);
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _possibleConstructorReturn(self, call) {
     if (call && (_typeof(call) === "object" || typeof call === "function")) {
         return call;
@@ -90,8 +83,8 @@ function _createSuper(Derived) {
         return _possibleConstructorReturn(this, result);
     };
 }
-import { RuntimeFormControl, RuntimeListControl, RegisterControls } from "@byteluck-fe/model-driven-core";
-import { CONTROL_TYPE, loopFormSchema } from "@byteluck-fe/model-driven-shared";
+import { RegisterControls } from "@byteluck-fe/model-driven-core";
+import { CONTROL_BASE_TYPE, CONTROL_TYPE, loopFormSchema } from "@byteluck-fe/model-driven-shared";
 import { hasChildrenControl, loopDataViewControl, loopFormControl } from "../utils/runtimeUtils";
 export var Runtime = /*#__PURE__*/ function(RegisterControls) {
     "use strict";
@@ -115,7 +108,7 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
         var instanceMap = {};
         loop(this._instance, function(item) {
             // 3.4.1 避免将subtable-row 放到 _flatInstances 中
-            if (item.type === "subtable-row") {
+            if (item.type === "subtable-row" || item.type === "subtable-column") {
                 return;
             }
             instances.push(item);
@@ -160,7 +153,11 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
                 loopDataViewControl(this._instance, function(dataView) {
                     ruleItems[dataView.id] = dataView.rules[0];
                     loopFormControl(dataView.children, function(item) {
-                        if (_instanceof(item, RuntimeFormControl) || _instanceof(item, RuntimeListControl)) {
+                        // if (
+                        //   item instanceof RuntimeFormControl ||
+                        //   item instanceof RuntimeListControl
+                        // ) {
+                        if (item.controlType === CONTROL_BASE_TYPE.FORM || item.controlType === CONTROL_BASE_TYPE.LIST) {
                             buildControlRules(ruleItems[dataView.id].fields, item);
                         }
                     });
@@ -175,7 +172,11 @@ export var Runtime = /*#__PURE__*/ function(RegisterControls) {
                 loopDataViewControl(this._instance, function(dataView) {
                     antdRules[dataView.id] = dataView.rules[0];
                     loopFormControl(dataView.children, function(item) {
-                        if (_instanceof(item, RuntimeFormControl) || _instanceof(item, RuntimeListControl)) {
+                        // if (
+                        //   item instanceof RuntimeFormControl ||
+                        //   item instanceof RuntimeListControl
+                        // ) {
+                        if (item.controlType === CONTROL_BASE_TYPE.FORM || item.controlType === CONTROL_BASE_TYPE.LIST) {
                             buildControlAntdRules(antdRules[dataView.id].fields, item);
                         }
                     });
@@ -215,7 +216,8 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
-    if (_instanceof(item, RuntimeFormControl)) {
+    // if (item instanceof RuntimeFormControl) {
+    if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         data[item.id] = item.rules;
     } else if (item.type === CONTROL_TYPE.SUBTABLE) {
         data[item.id] = item.rules;
@@ -246,7 +248,8 @@ item) {
     if (getControlIsHide(item)) {
         return;
     }
-    if (_instanceof(item, RuntimeFormControl)) {
+    // if (item instanceof RuntimeFormControl) {
+    if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         antdRules[item.id] = item.rules;
     } else if (item.type === CONTROL_TYPE.SUBTABLE && item.children.length) {
         antdRules[item.id] = [];

package/dist/esm/common/Store.js

@@ -23,8 +23,8 @@ function _instanceof(left, right) {
         return left instanceof right;
     }
 }
-import { RuntimeFormControl, DataBind, ObjectDataBind } from "@byteluck-fe/model-driven-core";
-import { loopFormSchema, JSONCopy, warn, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
+import { DataBind, ObjectDataBind } from "@byteluck-fe/model-driven-core";
+import { loopFormSchema, JSONCopy, warn, CONTROL_TYPE, CONTROL_BASE_TYPE } from "@byteluck-fe/model-driven-shared";
 import { loopDataViewControl, loopFormControl } from "../utils/runtimeUtils";
 var Store = /*#__PURE__*/ function() {
     "use strict";
@@ -202,7 +202,8 @@ function init(instance) {
 }
 function buildState(dataViewState, emptyDataViewState, // @ts-ignore
 item) {
-    if (_instanceof(item, RuntimeFormControl)) {
+    //if (item instanceof RuntimeFormControl) {
+    if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         dataViewState[item.id] = JSONCopy(item.props.defaultValue);
         emptyDataViewState[item.id] = JSONCopy(item.props.defaultValue);
     } else {
@@ -219,7 +220,8 @@ item) {
 }
 function buildDataBindMapping(data, dataViewId, // @ts-ignore
 item) {
-    if (_instanceof(item, RuntimeFormControl)) {
+    // if (item instanceof RuntimeFormControl) {
+    if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         if (_instanceof(item.props.dataBind, ObjectDataBind)) {
             // 特殊的dataBind，比如:金额是currency+amount两个key组成的，日期区间，继承自ObjectDataBind的需要通过Object.keys拿到多个databind
             Object.keys(item.props.dataBind).map(function(key) {
@@ -303,7 +305,8 @@ item) {
 }
 function buildControlIdMapping(data, dataViewId, // @ts-ignore
 item) {
-    if (_instanceof(item, RuntimeFormControl)) {
+    // if (item instanceof RuntimeFormControl) {
+    if (item.controlType === CONTROL_BASE_TYPE.FORM) {
         data[item.id] = {
             dataBind: item.props.dataBind,
             options: [],

package/dist/esm/common/proxyState.js

@@ -6,13 +6,6 @@ function _arrayLikeToArray(arr, len) {
 function _arrayWithoutHoles(arr) {
     if (Array.isArray(arr)) return _arrayLikeToArray(arr);
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _iterableToArray(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -30,9 +23,8 @@ function _unsupportedIterableToArray(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
 }
-import { RuntimeFormControl } from "@byteluck-fe/model-driven-core";
-import { error, logerror } from "@byteluck-fe/model-driven-shared";
 var cc = console;
+import { CONTROL_BASE_TYPE, error, logerror } from "@byteluck-fe/model-driven-shared";
 var proxyArrayApi = [
     "splice",
     "push",
@@ -248,7 +240,7 @@ function flatInstanceForChildren(controls) {
                 return item.id === key;
             });
             // 最后一个key可能是值对象上边的key，比如金额的amount和currency，计算公式的result和unit，所以需要判断前一个控件是不是一个表单控件，是的话就返回最后一个表单控件
-            return findEndItem ? findEndItem : _instanceof(prevItem, RuntimeFormControl) ? prevItem : undefined;
+            return findEndItem ? findEndItem : prevItem.controlType === CONTROL_BASE_TYPE.FORM ? prevItem : undefined;
         } else {
             var _prevItem_children;
             var _prevItem_children_index;

package/dist/esm/utils/runtimeUtils.js

@@ -1,11 +1,3 @@
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
-import { RuntimeFormControl } from "@byteluck-fe/model-driven-core";
 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;
@@ -20,7 +12,7 @@ export function loopFormControl(control, callback) {
                 callback(item, children);
             } else if (hasChildrenControl(item)) {
                 loopFormControl(item === null || item === void 0 ? void 0 : item.children, callback);
-            } else if (_instanceof(item, RuntimeFormControl)) {
+            } else if (item.controlType === CONTROL_BASE_TYPE.FORM) {
                 callback(item);
             }
         });