@byteluck-fe/model-driven-engine 2.7.0-alpha.25 → 2.7.0-alpha.28a

package/dist/esm/common/OkWorker.js

@@ -1,4 +1,4 @@
-function _classCallCheck(instance, Constructor) {
+function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
@@ -12,12 +12,12 @@ function _defineProperties(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _createClass(Constructor, protoProps, staticProps) {
+function _create_class(Constructor, protoProps, staticProps) {
     if (protoProps) _defineProperties(Constructor.prototype, protoProps);
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _defineProperty(obj, key, value) {
+function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
             value: value,
@@ -34,10 +34,10 @@ import { log } from "@byteluck-fe/model-driven-shared";
 var OkWorker = /*#__PURE__*/ function() {
     "use strict";
     function OkWorker() {
-        _classCallCheck(this, OkWorker);
-        _defineProperty(this, "worker", void 0);
+        _class_call_check(this, OkWorker);
+        _define_property(this, "worker", void 0);
     }
-    _createClass(OkWorker, [
+    _create_class(OkWorker, [
         {
             key: "run",
             value: function run(initState) {

package/dist/esm/common/Plugin.js

@@ -1,10 +1,10 @@
-function _classCallCheck(instance, Constructor) {
+function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
 var Plugin = function Plugin() {
     "use strict";
-    _classCallCheck(this, Plugin);
+    _class_call_check(this, Plugin);
 };
 export { Plugin };

package/dist/esm/common/Runtime.js

@@ -1,10 +1,10 @@
-function _assertThisInitialized(self) {
+function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
     }
     return self;
 }
-function _classCallCheck(instance, Constructor) {
+function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
@@ -18,12 +18,12 @@ function _defineProperties(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _createClass(Constructor, protoProps, staticProps) {
+function _create_class(Constructor, protoProps, staticProps) {
     if (protoProps) _defineProperties(Constructor.prototype, protoProps);
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _defineProperty(obj, key, value) {
+function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
             value: value,
@@ -36,11 +36,11 @@ function _defineProperty(obj, key, value) {
     }
     return obj;
 }
-function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
+function _get_prototype_of(o) {
+    _get_prototype_of = Object.setPrototypeOf ? Object.getPrototypeOf : function getPrototypeOf(o) {
         return o.__proto__ || Object.getPrototypeOf(o);
     };
-    return _getPrototypeOf(o);
+    return _get_prototype_of(o);
 }
 function _inherits(subClass, superClass) {
     if (typeof superClass !== "function" && superClass !== null) {
@@ -53,26 +53,26 @@ function _inherits(subClass, superClass) {
             configurable: true
         }
     });
-    if (superClass) _setPrototypeOf(subClass, superClass);
+    if (superClass) _set_prototype_of(subClass, superClass);
 }
-function _possibleConstructorReturn(self, call) {
-    if (call && (_typeof(call) === "object" || typeof call === "function")) {
+function _possible_constructor_return(self, call) {
+    if (call && (_type_of(call) === "object" || typeof call === "function")) {
         return call;
     }
-    return _assertThisInitialized(self);
+    return _assert_this_initialized(self);
 }
-function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+function _set_prototype_of(o, p) {
+    _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
         o.__proto__ = p;
         return o;
     };
-    return _setPrototypeOf(o, p);
+    return _set_prototype_of(o, p);
 }
-var _typeof = function(obj) {
+function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-};
-function _isNativeReflectConstruct() {
+}
+function _is_native_reflect_construct() {
     if (typeof Reflect === "undefined" || !Reflect.construct) return false;
     if (Reflect.construct.sham) return false;
     if (typeof Proxy === "function") return true;
@@ -83,59 +83,73 @@ function _isNativeReflectConstruct() {
         return false;
     }
 }
-function _createSuper(Derived) {
-    var hasNativeReflectConstruct = _isNativeReflectConstruct();
+function _create_super(Derived) {
+    var hasNativeReflectConstruct = _is_native_reflect_construct();
     return function _createSuperInternal() {
-        var Super = _getPrototypeOf(Derived), result;
+        var Super = _get_prototype_of(Derived), result;
         if (hasNativeReflectConstruct) {
-            var NewTarget = _getPrototypeOf(this).constructor;
+            var NewTarget = _get_prototype_of(this).constructor;
             result = Reflect.construct(Super, arguments, NewTarget);
         } else {
             result = Super.apply(this, arguments);
         }
-        return _possibleConstructorReturn(this, result);
+        return _possible_constructor_return(this, result);
     };
 }
 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";
     _inherits(Runtime, RegisterControls);
-    var _super = _createSuper(Runtime);
+    var _super = _create_super(Runtime);
     function Runtime(props) {
-        _classCallCheck(this, Runtime);
+        _class_call_check(this, Runtime);
         var _this;
         _this = _super.call(this, "Runtime");
-        _defineProperty(_assertThisInitialized(_this), "_schema", void 0);
-        _defineProperty(_assertThisInitialized(_this), "_instance", void 0);
-        _defineProperty(_assertThisInitialized(_this), "_flatInstances", []);
-        _defineProperty(_assertThisInitialized(_this), "_instanceMap", {});
+        _define_property(_assert_this_initialized(_this), "_schema", void 0);
+        _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);
         _this.getFlatInstances();
         return _this;
     }
-    _createClass(Runtime, [
+    _create_class(Runtime, [
         {
             key: "getFlatInstances",
             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

@@ -1,4 +1,4 @@
-function _classCallCheck(instance, Constructor) {
+function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
@@ -12,12 +12,12 @@ function _defineProperties(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _createClass(Constructor, protoProps, staticProps) {
+function _create_class(Constructor, protoProps, staticProps) {
     if (protoProps) _defineProperties(Constructor.prototype, protoProps);
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _defineProperty(obj, key, value) {
+function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
             value: value,
@@ -30,7 +30,7 @@ function _defineProperty(obj, key, value) {
     }
     return obj;
 }
-function _objectSpread(target) {
+function _object_spread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
         var ownKeys = Object.keys(source);
@@ -40,7 +40,7 @@ function _objectSpread(target) {
             }));
         }
         ownKeys.forEach(function(key) {
-            _defineProperty(target, key, source[key]);
+            _define_property(target, key, source[key]);
         });
     }
     return target;
@@ -51,13 +51,13 @@ import { loopDataViewControl, loopFormControl, buildUUID } from "../utils/runtim
 var Store = /*#__PURE__*/ function() {
     "use strict";
     function Store(props) {
-        _classCallCheck(this, Store);
-        _defineProperty(this, "emptyState", void 0);
-        _defineProperty(this, "state", void 0);
-        _defineProperty(this, "dataBindMapping", void 0 // 主要提供给二开使用
+        _class_call_check(this, Store);
+        _define_property(this, "emptyState", void 0);
+        _define_property(this, "state", void 0);
+        _define_property(this, "dataBindMapping", void 0 // 主要提供给二开使用
         );
-        _defineProperty(this, "controlIdMapping", void 0);
-        _defineProperty(this, "defaultState", void 0);
+        _define_property(this, "controlIdMapping", void 0);
+        _define_property(this, "defaultState", void 0);
         var _init = init(props.instance), state = _init.state, emptyState = _init.emptyState, databindMapping = _init.databindMapping, controlidMapping = _init.controlidMapping, defaultState = _init.defaultState;
         this.emptyState = emptyState;
         this.state = state;
@@ -65,7 +65,7 @@ var Store = /*#__PURE__*/ function() {
         this.controlIdMapping = controlidMapping;
         this.defaultState = defaultState;
     }
-    _createClass(Store, [
+    _create_class(Store, [
         {
             /**
    * 使用该方法仅改变数据，不会表单触发事件。明细表可全量赋值也可根据rowIndex进行单独设置
@@ -200,6 +200,7 @@ var Store = /*#__PURE__*/ function() {
         {
             key: "getDataBind",
             value: function getDataBind(controlId) {
+                var _result;
                 var result = this.controlIdMapping[controlId];
                 if (result) {
                     return result.dataBind;
@@ -215,7 +216,7 @@ var Store = /*#__PURE__*/ function() {
                         }
                     }
                 }
-                return result === null || result === void 0 ? void 0 : result.dataBind;
+                return (_result = result) === null || _result === void 0 ? void 0 : _result.dataBind;
             }
         }
     ]);
@@ -268,7 +269,7 @@ item) {
         });
         var _item_props_defaultRows, _fill_map;
         dataViewState[item.id] = (_fill_map = new Array((_item_props_defaultRows = item.props.defaultRows) !== null && _item_props_defaultRows !== void 0 ? _item_props_defaultRows : 1).fill(0).map(function() {
-            return _objectSpread({
+            return _object_spread({
                 uid: "new:" + buildUUID("uid")
             }, JSONCopy(emptyTemplate));
         })) !== null && _fill_map !== void 0 ? _fill_map : [];
@@ -279,7 +280,7 @@ function buildDataBindMapping(data, dataViewId, // @ts-ignore
 item) {
     // if (item instanceof RuntimeFormControl) {
     if (item.controlType === CONTROL_BASE_TYPE.FORM) {
-        var _item_props, _item_props_dataBind;
+        var _item_props_dataBind, _item_props;
         // if (item.props.dataBind instanceof ObjectDataBind) {
         if (!isDataBind(item.props.dataBind)) {
             // 特殊的dataBind，比如:金额是currency+amount两个key组成的，日期区间，继承自ObjectDataBind的需要通过Object.keys拿到多个databind
@@ -387,7 +388,7 @@ item) {
         loopFormSchema(item.props.headers, function(formControl) {
             var _data_item_id;
             var _data_item_id_children;
-            Object.assign((_data_item_id_children = (_data_item_id = data[item.id]) === null || _data_item_id === void 0 ? void 0 : _data_item_id.children) !== null && _data_item_id_children !== void 0 ? _data_item_id_children : {}, _defineProperty({}, formControl.id, {
+            Object.assign((_data_item_id_children = (_data_item_id = data[item.id]) === null || _data_item_id === void 0 ? void 0 : _data_item_id.children) !== null && _data_item_id_children !== void 0 ? _data_item_id_children : {}, _define_property({}, formControl.id, {
                 dataBind: formControl.props.dataBind
             }));
         });