@byteluck-fe/model-driven-engine 2.5.1-alpha.1 → 2.5.2

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) {
@@ -77,7 +77,9 @@ var OkWorker = /*#__PURE__*/ function() {
             key: "createWorkerFunction",
             value: function createWorkerFunction() {
                 return function() {
-                    var createHandler = function createHandler(parentKey) {
+                    log("‍\uD83D\uDE80 worker running");
+                    var _self = self;
+                    function createHandler(parentKey) {
                         return {
                             get: function get(target, key, value) {
                                 return Reflect.get(target, key, value);
@@ -92,9 +94,7 @@ var OkWorker = /*#__PURE__*/ function() {
                                 return Reflect.set(target, key, value);
                             }
                         };
-                    };
-                    log("‍\uD83D\uDE80 worker running");
-                    var _self = self;
+                    }
                     // function createProxy(
                     // 	obj: Record<string, unknown> | Array<Record<string, unknown>>,
                     // 	parentKey?: string

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,17 +83,17 @@ 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";
@@ -102,22 +102,22 @@ import { hasChildrenControl, loopDataViewControl, loopFormControl } from "../uti
 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", {});
         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() {

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,
@@ -37,7 +37,7 @@ function _instanceof(left, right) {
         return left instanceof right;
     }
 }
-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);
@@ -47,7 +47,7 @@ function _objectSpread(target) {
             }));
         }
         ownKeys.forEach(function(key) {
-            _defineProperty(target, key, source[key]);
+            _define_property(target, key, source[key]);
         });
     }
     return target;
@@ -58,21 +58,23 @@ 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);
-        var _init = init(props.instance), state = _init.state, emptyState = _init.emptyState, databindMapping = _init.databindMapping, controlidMapping = _init.controlidMapping, defaultState = _init.defaultState;
+        _define_property(this, "controlIdMapping", void 0);
+        _define_property(this, "subtableHeadersControlIdMapping", 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, subtableHeadersControlIdMapping = _init.subtableHeadersControlIdMapping;
         this.emptyState = emptyState;
         this.state = state;
         this.dataBindMapping = databindMapping;
         this.controlIdMapping = controlidMapping;
         this.defaultState = defaultState;
+        this.subtableHeadersControlIdMapping = subtableHeadersControlIdMapping;
     }
-    _createClass(Store, [
+    _create_class(Store, [
         {
             /**
    * 使用该方法仅改变数据，不会表单触发事件。明细表可全量赋值也可根据rowIndex进行单独设置
@@ -82,9 +84,10 @@ 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) {
                     //qiyu 按照对象赋值，Object.assign会触发多次key的change事件
-                    this.state[controlInfo.dataView][controlId] = value;
+                    this.state[controlInfo.dataView][controlId] = noProxyValue;
                 // if (
                 //   controlInfo.dataBind instanceof ObjectDataBind &&
                 //   isPlainObject(value)
@@ -102,14 +105,16 @@ var Store = /*#__PURE__*/ function() {
                             if (children !== undefined) {
                                 Object.keys(children).map(function(childControlId) {
                                     if (childControlId === controlId) {
-                                        _this.state[dataView][subtableId][rowIndex][controlId] = value;
+                                        if (_this.state[dataView][subtableId][rowIndex]) {
+                                            _this.state[dataView][subtableId][rowIndex][controlId] = noProxyValue;
+                                        }
                                     }
                                 });
                             }
                         });
                     } else {
                         //不存在的 controlId，直接被挂载到外部key
-                        this.state[controlId] = value;
+                        this.state[controlId] = noProxyValue;
                     }
                 }
             }
@@ -231,6 +236,7 @@ function init(instance) {
     var emptyState = {};
     var databindMapping = {};
     var controlidMapping = {};
+    var subtableHeadersControlIdMapping = {};
     var defaultState = {};
     // loopFormControl(instance, (item, children) => {
     // })
@@ -246,6 +252,7 @@ function init(instance) {
             buildState(dataViewState, emptyDataViewState, item);
             buildDataBindMapping(databindMapping, dvId, item);
             buildControlIdMapping(controlidMapping, dvId, item);
+            buildSubtableHeadersControlIdMapping(subtableHeadersControlIdMapping, item);
         });
         state[dvId] = {};
         defaultState[dvId] = dataViewState;
@@ -254,6 +261,7 @@ function init(instance) {
     return {
         state: state,
         defaultState: defaultState,
+        subtableHeadersControlIdMapping: subtableHeadersControlIdMapping,
         emptyState: emptyState,
         databindMapping: databindMapping,
         controlidMapping: controlidMapping
@@ -271,12 +279,12 @@ item) {
         loopFormSchema(item.props.headers, function(headerItem) {
             emptyTemplate[headerItem.id] = JSONCopy(headerItem.props.defaultValue);
         });
-        var _item_props_defaultRows;
-        dataViewState[item.id] = new Array((_item_props_defaultRows = item.props.defaultRows) !== null && _item_props_defaultRows !== void 0 ? _item_props_defaultRows : 1).fill(0).map(function() {
-            return _objectSpread({
+        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 _object_spread({
                 uid: "new:" + buildUUID("uid")
             }, JSONCopy(emptyTemplate));
-        });
+        })) !== null && _fill_map !== void 0 ? _fill_map : [];
         emptyDataViewState[item.id] = emptyTemplate;
     }
 }
@@ -284,7 +292,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 (_instanceof(item.props.dataBind, ObjectDataBind)) {
             // 特殊的dataBind，比如:金额是currency+amount两个key组成的，日期区间，继承自ObjectDataBind的需要通过Object.keys拿到多个databind
             Object.keys(item.props.dataBind).map(function(key) {
@@ -390,10 +398,23 @@ 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
             }));
         });
     }
 }
+function buildSubtableHeadersControlIdMapping(data, // @ts-ignore
+item) {
+    if (item.type === CONTROL_TYPE.SUBTABLE) {
+        var headersInstances = {};
+        item.props.headers.map(// @ts-ignore
+        function(item) {
+            item.children.map(function(item) {
+                Object.assign(headersInstances, _define_property({}, item.id, item));
+            });
+        });
+        Object.assign(data, _define_property({}, item.id, headersInstances));
+    }
+}
 export { Store };