@byteluck-fe/model-driven-engine 2.22.1-beta.6 → 2.22.1-beta.8

package/dist/esm/common/Engine.js

@@ -44,6 +44,10 @@ function _async_to_generator(fn) {
         });
     };
 }
+function _call_super(_this, derived, args) {
+    derived = _get_prototype_of(derived);
+    return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
+}
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -222,28 +226,12 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 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;
     try {
-        Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
-function _create_super(Derived) {
-    var hasNativeReflectConstruct = _is_native_reflect_construct();
-    return function _createSuperInternal() {
-        var Super = _get_prototype_of(Derived), result;
-        if (hasNativeReflectConstruct) {
-            var NewTarget = _get_prototype_of(this).constructor;
-            result = Reflect.construct(Super, arguments, NewTarget);
-        } else {
-            result = Super.apply(this, arguments);
-        }
-        return _possible_constructor_return(this, result);
-    };
+        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
+    } catch (_) {}
+    return (_is_native_reflect_construct = function() {
+        return !!result;
+    })();
 }
 function _ts_generator(thisArg, body) {
     var f, y, t, g, _ = {
@@ -361,29 +349,14 @@ var applyingPluginName = '';
 var Engine = /*#__PURE__*/ function(Watcher) {
     "use strict";
     _inherits(Engine, Watcher);
-    var _super = _create_super(Engine);
     function Engine(props) {
         _class_call_check(this, Engine);
         var _this;
-        _this = _super.call(this);
-        _define_property(_assert_this_initialized(_this), "store", void 0);
-        _define_property(_assert_this_initialized(_this), "rawStore", {});
-        _define_property(_assert_this_initialized(_this), "parent", void 0);
-        // 提供注册运行态控件以及实例化控件的能力
-        _define_property(_assert_this_initialized(_this), "runtime", void 0);
-        // 提供子线程处理脚本以及修改数据的能力
+        _this = _call_super(this, Engine), _define_property(_this, "store", void 0), _define_property(_this, "rawStore", {}), _define_property(_this, "parent", void 0), // 提供注册运行态控件以及实例化控件的能力
+        _define_property(_this, "runtime", void 0), // 提供子线程处理脚本以及修改数据的能力
         // public worker: OkWorker
-        _define_property(_assert_this_initialized(_this), "isMounted", false);
-        _define_property(_assert_this_initialized(_this), "id", genNonDuplicateId(8));
-        _define_property(_assert_this_initialized(_this), "externalParams", void 0);
-        // 提供外部注册插件，在不同的hooks触发时执行固定函数的能力
-        _define_property(_assert_this_initialized(_this), "__plugins", void 0);
-        _define_property(_assert_this_initialized(_this), "__pluginsApplied", false);
-        _define_property(_assert_this_initialized(_this), "$options", void 0);
-        _define_property(_assert_this_initialized(_this), "actionManager", new ActionManager());
-        _define_property(_assert_this_initialized(_this), "dataManager", void 0);
-        _define_property(_assert_this_initialized(_this), "_jobTasks", []);
-        _define_property(_assert_this_initialized(_this), "createControlInstance", _this.createInstance);
+        _define_property(_this, "isMounted", false), _define_property(_this, "id", genNonDuplicateId(8)), _define_property(_this, "externalParams", void 0), // 提供外部注册插件，在不同的hooks触发时执行固定函数的能力
+        _define_property(_this, "__plugins", void 0), _define_property(_this, "__pluginsApplied", false), _define_property(_this, "$options", void 0), _define_property(_this, "actionManager", new ActionManager()), _define_property(_this, "dataManager", void 0), _define_property(_this, "_jobTasks", []), _define_property(_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,
         language, language = _this_$options_language === void 0 ? DEFAULT_LOCALE : _this_$options_language, _this_$options_debug = _this_$options.debug, debug = _this_$options_debug === void 0 ? false : _this_$options_debug;
@@ -602,12 +575,18 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     var subtableData = this.getState(subtable.id);
                     this._handlerSubtableUpdateUid(subtableData);
                     this.runtime.getFlatInstances();
+                    var rowIndexs = createdNewRows.map(function(item) {
+                        var _item_children_, _item_children;
+                        var subControl = item === null || item === void 0 ? void 0 : (_item_children = item.children) === null || _item_children === void 0 ? void 0 : (_item_children_ = _item_children[0]) === null || _item_children_ === void 0 ? void 0 : _item_children_.children[0];
+                        return _this.getInstanceRowIndex(subControl);
+                    });
                     this.emit('list-change', {
                         instance: subtable,
                         value: subtableData,
                         options: Object.assign({}, options, {
                             changed: createdNewRows,
                             data: createdNewRowsData,
+                            rowIndexs: rowIndexs,
                             deleted: deleted !== null && deleted !== void 0 ? deleted : [],
                             jsonValue: JSON.stringify(subtableData),
                             isDeleteLastOne: isDeleteLastOne,
@@ -623,6 +602,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "_handlerSubtableUpdateUid",
             value: function _handlerSubtableUpdateUid(subtableData) {
+                ;
                 subtableData.forEach(function(item) {
                     if (!item.uid) {
                         Object.assign(item, {
@@ -635,6 +615,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
         {
             key: "_handlerObjectUpdate",
             value: function _handlerObjectUpdate(state, key, value, oldValue) {
+                var _this = this;
                 var instance = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
                 if (!instance) {
                     return;
@@ -666,6 +647,11 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         this.runtime.getFlatInstances();
                     }
                     this._handlerSubtableUpdateUid(newValue);
+                    var rowIndexs = newRows.map(function(item) {
+                        var _item_children_, _item_children;
+                        var subControl = item === null || item === void 0 ? void 0 : (_item_children = item.children) === null || _item_children === void 0 ? void 0 : (_item_children_ = _item_children[0]) === null || _item_children_ === void 0 ? void 0 : _item_children_.children[0];
+                        return _this.getInstanceRowIndex(subControl);
+                    });
                     this.emit('list-change', {
                         instance: instance,
                         value: value,
@@ -673,6 +659,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             // @ts-ignore
                             changed: newRows,
                             data: newValue,
+                            rowIndexs: rowIndexs,
                             deleted: deleted,
                             // deleted: oldValue ?? [],
                             type: 'push',

package/dist/esm/common/Runtime.js

@@ -4,6 +4,10 @@ function _assert_this_initialized(self) {
     }
     return self;
 }
+function _call_super(_this, derived, args) {
+    derived = _get_prototype_of(derived);
+    return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
+}
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -73,28 +77,12 @@ function _type_of(obj) {
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
 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;
     try {
-        Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
-function _create_super(Derived) {
-    var hasNativeReflectConstruct = _is_native_reflect_construct();
-    return function _createSuperInternal() {
-        var Super = _get_prototype_of(Derived), result;
-        if (hasNativeReflectConstruct) {
-            var NewTarget = _get_prototype_of(this).constructor;
-            result = Reflect.construct(Super, arguments, NewTarget);
-        } else {
-            result = Super.apply(this, arguments);
-        }
-        return _possible_constructor_return(this, result);
-    };
+        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
+    } catch (_) {}
+    return (_is_native_reflect_construct = function() {
+        return !!result;
+    })();
 }
 import { RegisterControls, isDataBind } from '@byteluck-fe/model-driven-core';
 import { CONTROL_BASE_TYPE, CONTROL_TYPE, JSONCopy, loopFormSchema, isArray } from '@byteluck-fe/model-driven-shared';
@@ -102,16 +90,12 @@ import { hasChildrenControl, loopDataViewControl, loopFormControl } from '../uti
 export var Runtime = /*#__PURE__*/ function(RegisterControls) {
     "use strict";
     _inherits(Runtime, RegisterControls);
-    var _super = _create_super(Runtime);
     function Runtime(props) {
         _class_call_check(this, Runtime);
         var _this;
-        _this = _super.call(this, 'Runtime');
-        _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", {});
+        _this = _call_super(this, Runtime, [
+            'Runtime'
+        ]), _define_property(_this, "_schema", void 0), _define_property(_this, "_instance", void 0), _define_property(_this, "_flatInstances", []), _define_property(_this, "_instanceMap", {}), _define_property(_this, "_controlParentIdMap", {});
         var schema = props.schema;
         _this._schema = schema;
         _this._instance = _this.createControl(schema, props.beforeCreateInstance);

package/dist/esm/common/Store.js

@@ -81,6 +81,7 @@ var Store = /*#__PURE__*/ function() {
                 if (controlInfo !== undefined) {
                     //明细表
                     if (controlInfo.children) {
+                        ;
                         value.forEach(function(item) {
                             if (!item.uid) {
                                 Object.assign(item, {
@@ -109,6 +110,7 @@ var Store = /*#__PURE__*/ function() {
                                 Object.keys(children).map(function(childControlId) {
                                     if (childControlId === controlId) {
                                         if (_this.state[dataView][subtableId][rowIndex]) {
+                                            ;
                                             _this.state[dataView][subtableId][rowIndex][controlId] = noProxyValue;
                                         }
                                     }
@@ -167,6 +169,7 @@ var Store = /*#__PURE__*/ function() {
                                 if (children !== undefined) {
                                     Object.keys(children).map(function(childControlId) {
                                         if (childControlId === controlId) {
+                                            ;
                                             _this.state[dataViewId][subtableId].map(function(item) {
                                                 states.push(item[controlId]);
                                             });
@@ -364,15 +367,17 @@ item) {
                 Object.keys(item.props.dataBind).map(function(key) {
                     var dataBind = item.props.dataBind;
                     var dataCode = dataBind[key].dataCode;
-                    data[dataCode].fields.push({
-                        fieldCode: dataBind[key].fieldCode,
-                        controlId: item.id,
-                        dataBind: dataBind,
-                        dataViewId: [
-                            dataViewId,
-                            subtableId
-                        ]
-                    });
+                    if (dataBind[key].fieldCode !== '') {
+                        data[dataCode].fields.push({
+                            fieldCode: dataBind[key].fieldCode,
+                            controlId: item.id,
+                            dataBind: dataBind,
+                            dataViewId: [
+                                dataViewId,
+                                subtableId
+                            ]
+                        });
+                    }
                 });
             } else {
                 if (data[item.props.dataBind.dataCode] === undefined) {

package/dist/esm/common/checkerValue.js

@@ -12,6 +12,10 @@ function _assert_this_initialized(self) {
     }
     return self;
 }
+function _call_super(_this, derived, args) {
+    derived = _get_prototype_of(derived);
+    return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
+}
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -134,28 +138,12 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 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;
     try {
-        Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
-function _create_super(Derived) {
-    var hasNativeReflectConstruct = _is_native_reflect_construct();
-    return function _createSuperInternal() {
-        var Super = _get_prototype_of(Derived), result;
-        if (hasNativeReflectConstruct) {
-            var NewTarget = _get_prototype_of(this).constructor;
-            result = Reflect.construct(Super, arguments, NewTarget);
-        } else {
-            result = Super.apply(this, arguments);
-        }
-        return _possible_constructor_return(this, result);
-    };
+        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
+    } catch (_) {}
+    return (_is_native_reflect_construct = function() {
+        return !!result;
+    })();
 }
 import { isArray, isFunction, isString, isJSONArray, isJSONObject, isNumber, isNumberAndEmptyStringArray, isPlainObject, isStringArray, FieldTypes, isObject } from '@byteluck-fe/model-driven-shared';
 import { AddressValue, AmountValue, CalcValue, RangeDateValue } from '@byteluck-fe/model-driven-core';
@@ -167,10 +155,9 @@ var ValueChecker = function ValueChecker() {
 var StringValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(StringValueChecker, ValueChecker);
-    var _super = _create_super(StringValueChecker);
     function StringValueChecker() {
         _class_call_check(this, StringValueChecker);
-        return _super.apply(this, arguments);
+        return _call_super(this, StringValueChecker, arguments);
     }
     _create_class(StringValueChecker, [
         {
@@ -200,10 +187,9 @@ var StringValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var NumberValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(NumberValueChecker, ValueChecker);
-    var _super = _create_super(NumberValueChecker);
     function NumberValueChecker() {
         _class_call_check(this, NumberValueChecker);
-        return _super.apply(this, arguments);
+        return _call_super(this, NumberValueChecker, arguments);
     }
     _create_class(NumberValueChecker, [
         {
@@ -232,10 +218,9 @@ var NumberValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var StringArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(StringArrayValueChecker, ValueChecker);
-    var _super = _create_super(StringArrayValueChecker);
     function StringArrayValueChecker() {
         _class_call_check(this, StringArrayValueChecker);
-        return _super.apply(this, arguments);
+        return _call_super(this, StringArrayValueChecker, arguments);
     }
     _create_class(StringArrayValueChecker, [
         {
@@ -277,10 +262,9 @@ var StringArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var NumberArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(NumberArrayValueChecker, ValueChecker);
-    var _super = _create_super(NumberArrayValueChecker);
     function NumberArrayValueChecker() {
         _class_call_check(this, NumberArrayValueChecker);
-        return _super.apply(this, arguments);
+        return _call_super(this, NumberArrayValueChecker, arguments);
     }
     _create_class(NumberArrayValueChecker, [
         {
@@ -328,10 +312,9 @@ var NumberArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var MoneyValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(MoneyValueChecker, ValueChecker);
-    var _super = _create_super(MoneyValueChecker);
     function MoneyValueChecker() {
         _class_call_check(this, MoneyValueChecker);
-        return _super.apply(this, arguments);
+        return _call_super(this, MoneyValueChecker, arguments);
     }
     _create_class(MoneyValueChecker, [
         {
@@ -379,10 +362,9 @@ var MoneyValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var TimeScopeValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(TimeScopeValueChecker, ValueChecker);
-    var _super = _create_super(TimeScopeValueChecker);
     function TimeScopeValueChecker() {
         _class_call_check(this, TimeScopeValueChecker);
-        return _super.apply(this, arguments);
+        return _call_super(this, TimeScopeValueChecker, arguments);
     }
     _create_class(TimeScopeValueChecker, [
         {
@@ -427,10 +409,9 @@ var TimeScopeValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var CalcValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(CalcValueChecker, ValueChecker);
-    var _super = _create_super(CalcValueChecker);
     function CalcValueChecker() {
         _class_call_check(this, CalcValueChecker);
-        return _super.apply(this, arguments);
+        return _call_super(this, CalcValueChecker, arguments);
     }
     _create_class(CalcValueChecker, [
         {
@@ -478,10 +459,9 @@ var CalcValueChecker = /*#__PURE__*/ function(ValueChecker) {
 var AddressValueChecker = /*#__PURE__*/ function(ValueChecker) {
     "use strict";
     _inherits(AddressValueChecker, ValueChecker);
-    var _super = _create_super(AddressValueChecker);
     function AddressValueChecker() {
         _class_call_check(this, AddressValueChecker);
-        return _super.apply(this, arguments);
+        return _call_super(this, AddressValueChecker, arguments);
     }
     _create_class(AddressValueChecker, [
         {

package/dist/esm/plugins/ControlsEventPlugin.js

@@ -217,7 +217,7 @@ export var ControlsEventPlugin = /*#__PURE__*/ function() {
             key: "engineAddEventListener",
             value: function engineAddEventListener(eventKey, controlEventKey) {
                 var _this = this;
-                this.engine.on(eventKey, function() {
+                this.engine.on(eventKey, /*#__PURE__*/ function() {
                     var _ref = _async_to_generator(function(payload) {
                         return _ts_generator(this, function(_state) {
                             switch(_state.label){
@@ -272,7 +272,7 @@ export var ControlsEventPlugin = /*#__PURE__*/ function() {
                                 }
                                 return [
                                     4,
-                                    Promise.all(events[name].map(function() {
+                                    Promise.all(events[name].map(/*#__PURE__*/ function() {
                                         var _ref = _async_to_generator(function(eventName) {
                                             var execResult;
                                             return _ts_generator(this, function(_state) {

package/dist/esm/plugins/LifecycleEventPlugin.js

@@ -224,7 +224,7 @@ export var LifecycleEventPlugin = /*#__PURE__*/ function() {
                 Object.entries(LifecycleEventKeyMap).forEach(function(param) {
                     var _param = _sliced_to_array(param, 2), engineKey = _param[0], lifecycleKey = _param[1];
                     var _this1 = _this;
-                    engine.on(engineKey, function() {
+                    engine.on(engineKey, /*#__PURE__*/ function() {
                         var _ref = _async_to_generator(function(payload) {
                             var result;
                             return _ts_generator(this, function(_state) {
@@ -278,7 +278,7 @@ export var LifecycleEventPlugin = /*#__PURE__*/ function() {
                                 }
                                 return [
                                     4,
-                                    Promise.all(events[name].map(function() {
+                                    Promise.all(events[name].map(/*#__PURE__*/ function() {
                                         var _ref = _async_to_generator(function(eventName) {
                                             var execResult;
                                             return _ts_generator(this, function(_state) {