@byteluck-fe/model-driven-engine 2.2.11 → 2.2.12

package/dist/esm/common/Engine.js

@@ -958,15 +958,15 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         var data = getFieldData.map(function(item) {
                             var obj = {};
                             for(var key in item){
-                                var _controlIdMapping_controlId_children_key, _controlIdMapping_controlId, _controlIdMapping_controlId_children_key_dataBind, _controlIdMapping_controlId1;
-                                if ((_controlIdMapping_controlId_children_key = (_controlIdMapping_controlId = controlIdMapping[controlId]) === null || _controlIdMapping_controlId === void 0 ? void 0 : _controlIdMapping_controlId.children[key]) === null || _controlIdMapping_controlId_children_key === void 0 ? void 0 : (_controlIdMapping_controlId_children_key_dataBind = _controlIdMapping_controlId_children_key.dataBind) === null || _controlIdMapping_controlId_children_key_dataBind === void 0 ? void 0 : _controlIdMapping_controlId_children_key_dataBind.fieldCode) {
+                                var _controlIdMapping_controlId_children_key_dataBind, _controlIdMapping_controlId_children_key, _controlIdMapping_controlId, _controlIdMapping_controlId1;
+                                if ((_controlIdMapping_controlId = controlIdMapping[controlId]) === null || _controlIdMapping_controlId === void 0 ? void 0 : (_controlIdMapping_controlId_children_key = _controlIdMapping_controlId.children[key]) === null || _controlIdMapping_controlId_children_key === void 0 ? void 0 : (_controlIdMapping_controlId_children_key_dataBind = _controlIdMapping_controlId_children_key.dataBind) === null || _controlIdMapping_controlId_children_key_dataBind === void 0 ? void 0 : _controlIdMapping_controlId_children_key_dataBind.fieldCode) {
                                     var _controlIdMapping_controlId_children_key1;
                                     obj[(_controlIdMapping_controlId_children_key1 = controlIdMapping[controlId].children[key]) === null || _controlIdMapping_controlId_children_key1 === void 0 ? void 0 : _controlIdMapping_controlId_children_key1.dataBind.fieldCode] = item[key];
                                 } else if ((_controlIdMapping_controlId1 = controlIdMapping[controlId]) === null || _controlIdMapping_controlId1 === void 0 ? void 0 : _controlIdMapping_controlId1.children[key]) {
                                     // 兼容一个控件需要绑定多个字段的情况
                                     for(var keyChi in item[key]){
                                         var _controlIdMapping_controlId_children_key2, _controlIdMapping_controlId2;
-                                        obj[(_controlIdMapping_controlId_children_key2 = (_controlIdMapping_controlId2 = controlIdMapping[controlId]) === null || _controlIdMapping_controlId2 === void 0 ? void 0 : _controlIdMapping_controlId2.children[key]) === null || _controlIdMapping_controlId_children_key2 === void 0 ? void 0 : _controlIdMapping_controlId_children_key2.dataBind[keyChi].fieldCode] = item[key][keyChi];
+                                        obj[(_controlIdMapping_controlId2 = controlIdMapping[controlId]) === null || _controlIdMapping_controlId2 === void 0 ? void 0 : (_controlIdMapping_controlId_children_key2 = _controlIdMapping_controlId2.children[key]) === null || _controlIdMapping_controlId_children_key2 === void 0 ? void 0 : _controlIdMapping_controlId_children_key2.dataBind[keyChi].fieldCode] = item[key][keyChi];
                                     }
                                 }
                             }
@@ -975,7 +975,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                         return data;
                     } else {
                         var _loop = function(key) {
-                            var _controlIdMapping_key, _controlIdMapping_key_dataBind, _controlIdMapping_key1, _controlIdMapping_key_dataBind1;
+                            var _controlIdMapping_key_dataBind, _controlIdMapping_key, _controlIdMapping_key_dataBind1, _controlIdMapping_key1;
                             if ((_controlIdMapping_key = controlIdMapping[key]) === null || _controlIdMapping_key === void 0 ? void 0 : (_controlIdMapping_key_dataBind = _controlIdMapping_key.dataBind) === null || _controlIdMapping_key_dataBind === void 0 ? void 0 : _controlIdMapping_key_dataBind.fieldCode) {
                                 var _controlIdMapping_key2;
                                 obj[(_controlIdMapping_key2 = controlIdMapping[key]) === null || _controlIdMapping_key2 === void 0 ? void 0 : _controlIdMapping_key2.dataBind.fieldCode] = getFieldData[key];
@@ -1003,7 +1003,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                                 // 兼容一个控件需要绑定多个字段的情况
                                 for(var keyChi in getFieldData[key]){
                                     var _controlIdMapping_key_dataBind_keyChi, _controlIdMapping_key4;
-                                    obj[(_controlIdMapping_key_dataBind_keyChi = (_controlIdMapping_key4 = controlIdMapping[key]) === null || _controlIdMapping_key4 === void 0 ? void 0 : _controlIdMapping_key4.dataBind[keyChi]) === null || _controlIdMapping_key_dataBind_keyChi === void 0 ? void 0 : _controlIdMapping_key_dataBind_keyChi.fieldCode] = getFieldData[key][keyChi];
+                                    obj[(_controlIdMapping_key4 = controlIdMapping[key]) === null || _controlIdMapping_key4 === void 0 ? void 0 : (_controlIdMapping_key_dataBind_keyChi = _controlIdMapping_key4.dataBind[keyChi]) === null || _controlIdMapping_key_dataBind_keyChi === void 0 ? void 0 : _controlIdMapping_key_dataBind_keyChi.fieldCode] = getFieldData[key][keyChi];
                                 }
                             }
                         };
@@ -1159,7 +1159,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                             var skipKey = [] //qiyu ObjectDataBind中会提前将相关key拿出来赋值，为了避免重复赋值，设置了此变量
                             ;
                             Object.keys(row).map(function(fieldCode) {
-                                var _this_store_dataBindMapping_dataCode, _this_store_dataBindMapping_dataCode_fields;
+                                var _this_store_dataBindMapping_dataCode_fields, _this_store_dataBindMapping_dataCode;
                                 if (skipKey.includes(fieldCode)) {
                                     return;
                                 }
@@ -1273,11 +1273,9 @@ var Engine = /*#__PURE__*/ function(Watcher) {
                     // 如果能从flatInstances里边取到，就通过getInstanceInSubtableHeader方法取，取不到则换一种方式
                     if (instances.length) {
                         var instance = instances[0];
-                        if (this.inList(instance.id) === true) {
-                            var headerInstance = this.getInstanceInSubtableHeader(instance);
-                            if (headerInstance) {
-                                instances.unshift(headerInstance);
-                            }
+                        var headerInstance = this.getInstanceInSubtableHeader(instance);
+                        if (headerInstance) {
+                            instances.unshift(headerInstance);
                         }
                     } else {
                         var controlIdMapping = this.getControlIdMapping();
@@ -1507,7 +1505,7 @@ var Engine = /*#__PURE__*/ function(Watcher) {
             value: function inList(controlId) {
                 var mapping = this.store.controlIdMapping;
                 var result = Object.keys(mapping).some(function(key) {
-                    var _mapping_key, _mapping_key_children;
+                    var _mapping_key_children, _mapping_key;
                     return (_mapping_key = mapping[key]) === null || _mapping_key === void 0 ? void 0 : (_mapping_key_children = _mapping_key.children) === null || _mapping_key_children === void 0 ? void 0 : _mapping_key_children.hasOwnProperty(controlId);
                 });
                 return result;

package/dist/esm/common/OkWorker.js

@@ -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/Store.js

@@ -254,7 +254,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) {

package/dist/esm/common/checkerValue.js

@@ -254,13 +254,13 @@ var StringArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
         {
             key: "transform",
             value: function transform(value) {
-                var getStringValueArray = function getStringValueArray(value) {
+                if (value === undefined || value === null) {
+                    return [];
+                }
+                function getStringValueArray(value) {
                     return value.map(function(item) {
                         return !item ? "" : String(item);
                     });
-                };
-                if (value === undefined || value === null) {
-                    return [];
                 }
                 if (isArray(value)) {
                     return getStringValueArray(value);
@@ -299,15 +299,15 @@ var NumberArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
         {
             key: "transform",
             value: function transform(value) {
-                var getNumberValueArray = function getNumberValueArray(value) {
+                if (value === undefined || value === null) {
+                    return [];
+                }
+                function getNumberValueArray(value) {
                     return value.map(function(item) {
                         return !item && item !== 0 ? "" : Number(item);
                     }).filter(function(item) {
                         return item === "" || !Number.isNaN(item);
                     });
-                };
-                if (value === undefined || value === null) {
-                    return [];
                 }
                 if (isArray(value)) {
                     return getNumberValueArray(value);

package/dist/esm/common/proxyState.js

@@ -125,7 +125,11 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
             return Reflect.get(target, propertyKey, receiver);
         },
         set: function set(target, propertyKey, value, receiver) {
-            var reProxyState = function reProxyState(value) {
+            var newValue = value;
+            // @ts-ignore
+            var oldValue = target[propertyKey];
+            var concatKey = thisKey === "" ? propertyKey : thisKey + "." + propertyKey;
+            function reProxyState(value) {
                 if (typeof value === "object" && value !== null) {
                     // @ts-ignore
                     if (value[engineProxyFlag] !== true) {
@@ -136,11 +140,7 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
                         value[engineTargetKey], callback, beforeSetCallback, concatKey);
                     }
                 }
-            };
-            var newValue = value;
-            // @ts-ignore
-            var oldValue = target[propertyKey];
-            var concatKey = thisKey === "" ? propertyKey : thisKey + "." + propertyKey;
+            }
             var _reProxyState;
             newValue = (_reProxyState = reProxyState(value)) !== null && _reProxyState !== void 0 ? _reProxyState : newValue;
             // 先设置值，然后再进行触发回调，确保回调内拿到的是最新的值
@@ -285,7 +285,7 @@ function getArrayNewArgs(type, args, value) {
                 var result;
                 var addValue = getArrayNewValue(key, args);
                 if (addValue.length) {
-                    var _this, _this_engineArrayBeforeSetCallbackFlag;
+                    var _this_engineArrayBeforeSetCallbackFlag, _this;
                     // @ts-ignore
                     var newValue = (_this_engineArrayBeforeSetCallbackFlag = (_this = this)[engineArrayBeforeSetCallbackFlag]) === null || _this_engineArrayBeforeSetCallbackFlag === void 0 ? void 0 : _this_engineArrayBeforeSetCallbackFlag.call(_this, // @ts-ignore
                     this[engineTargetKey], // @ts-ignore

package/dist/esm/plugins/CalcPlugin.js

@@ -59,12 +59,12 @@ import { CONTROL_TYPE, CALC_TOKEN_TYPE, CALC_AGGREGATE_TYPE } from "@byteluck-fe
 import { format } from "mathjs";
 var DisplayType;
 (function(DisplayType) {
-    DisplayType[/**
+    /**
    * 完全等于
-   */ "EQ"] = "EQ";
-    DisplayType[/**
+   */ DisplayType["EQ"] = "EQ";
+    /**
    * 包含
-   * */ "IN"] = "IN";
+   * */ DisplayType["IN"] = "IN";
 })(DisplayType || (DisplayType = {}));
 export var CalcPlugin = /*#__PURE__*/ function() {
     "use strict";

package/dist/esm/plugins/ControlsEventPlugin.js

@@ -69,13 +69,13 @@ function _ts_generator(thisArg, body) {
         trys: [],
         ops: []
     };
-    return(g = {
+    return g = {
         next: verb(0),
         "throw": verb(1),
         "return": verb(2)
     }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
         return this;
-    }), g);
+    }), g;
     function verb(n) {
         return function(v) {
             return step([

package/dist/esm/plugins/LifecycleEventPlugin.js

@@ -115,13 +115,13 @@ function _ts_generator(thisArg, body) {
         trys: [],
         ops: []
     };
-    return(g = {
+    return g = {
         next: verb(0),
         "throw": verb(1),
         "return": verb(2)
     }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
         return this;
-    }), g);
+    }), g;
     function verb(n) {
         return function(v) {
             return step([