@byteluck-fe/model-driven-engine 2.5.0-beta.9 → 2.5.1

package/dist/esm/common/checkerValue.js

@@ -65,7 +65,7 @@ function _inherits(subClass, superClass) {
 }
 function _instanceof(left, right) {
     if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return right[Symbol.hasInstance](left);
+        return !!right[Symbol.hasInstance](left);
     } else {
         return left instanceof right;
     }
@@ -164,9 +164,9 @@ function _createSuper(Derived) {
         return _possibleConstructorReturn(this, 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';
-import { camelizeKeys } from 'humps';
+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";
+import { camelizeKeys } from "humps";
 var ValueChecker = function ValueChecker() {
     "use strict";
     _classCallCheck(this, ValueChecker);
@@ -190,7 +190,7 @@ var StringValueChecker = /*#__PURE__*/ function(ValueChecker) {
             key: "transform",
             value: function transform(value) {
                 if (value === null || value === undefined) {
-                    return '';
+                    return "";
                 }
                 if (!isPlainObject(value) && !isFunction(value)) {
                     return String(value);
@@ -217,14 +217,14 @@ var NumberValueChecker = /*#__PURE__*/ function(ValueChecker) {
             // 数字类型允许是空字符串，用于置空数据
             key: "validate",
             value: function validate(value) {
-                return isNumber(value) || value === '';
+                return isNumber(value) || value === "";
             }
         },
         {
             key: "transform",
             value: function transform(value) {
                 if (value === null || value === undefined) {
-                    return '';
+                    return "";
                 }
                 var newValue = !isPlainObject(value) && !isFunction(value) ? Number(value) : undefined;
                 if (!Number.isNaN(newValue) && newValue !== undefined) {
@@ -253,28 +253,28 @@ var StringArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
         },
         {
             key: "transform",
-            value: function transform(value1) {
+            value: function transform(value) {
                 var getStringValueArray = function getStringValueArray(value) {
                     return value.map(function(item) {
-                        return !item ? '' : String(item);
+                        return !item ? "" : String(item);
                     });
                 };
-                if (value1 === undefined || value1 === null) {
+                if (value === undefined || value === null) {
                     return [];
                 }
-                if (isArray(value1)) {
-                    return getStringValueArray(value1);
+                if (isArray(value)) {
+                    return getStringValueArray(value);
                 }
-                if (isString(value1) && isJSONArray(value1)) {
+                if (isString(value) && isJSONArray(value)) {
                     try {
-                        var newValue = JSON.parse(value1);
+                        var newValue = JSON.parse(value);
                         if (Array.isArray(newValue)) {
                             return getStringValueArray(newValue);
                         }
                     } catch (e) {}
                 }
                 return [
-                    String(value1)
+                    String(value)
                 ];
             }
         }
@@ -298,31 +298,31 @@ var NumberArrayValueChecker = /*#__PURE__*/ function(ValueChecker) {
         },
         {
             key: "transform",
-            value: function transform(value2) {
+            value: function transform(value) {
                 var getNumberValueArray = function getNumberValueArray(value) {
                     return value.map(function(item) {
-                        return !item && item !== 0 ? '' : Number(item);
+                        return !item && item !== 0 ? "" : Number(item);
                     }).filter(function(item) {
-                        return item === '' || !Number.isNaN(item);
+                        return item === "" || !Number.isNaN(item);
                     });
                 };
-                if (value2 === undefined || value2 === null) {
+                if (value === undefined || value === null) {
                     return [];
                 }
-                if (isArray(value2)) {
-                    return getNumberValueArray(value2);
+                if (isArray(value)) {
+                    return getNumberValueArray(value);
                 }
-                if (isString(value2) && isJSONArray(value2)) {
+                if (isString(value) && isJSONArray(value)) {
                     try {
-                        var newValue = JSON.parse(value2);
+                        var newValue = JSON.parse(value);
                         if (isArray(newValue)) {
                             return getNumberValueArray(newValue);
                         }
                     } catch (e) {}
                 }
-                var newValue1 = Number(value2);
+                var newValue1 = Number(value);
                 if (Number.isNaN(newValue1)) {
-                    throw "".concat(value2, " is not a number array");
+                    throw "".concat(value, " is not a number array");
                 }
                 return [
                     newValue1
@@ -344,13 +344,13 @@ var MoneyValueChecker = /*#__PURE__*/ function(ValueChecker) {
         {
             key: "validate",
             value: function validate(value) {
-                return _instanceof(value, AmountValue) || isPlainObject(value) && 'amount' in value && isNumber(value.amount) && 'currency' in value && isString(value.currency);
+                return _instanceof(value, AmountValue) || isPlainObject(value) && "amount" in value && isNumber(value.amount) && "currency" in value && isString(value.currency);
             }
         },
         {
             key: "transform",
             value: function transform(value, oldValue) {
-                if (value === undefined || value === null || value === '') {
+                if (value === undefined || value === null || value === "") {
                     return new AmountValue({
                         currency: oldValue === null || oldValue === void 0 ? void 0 : oldValue.currency
                     });
@@ -394,13 +394,13 @@ var TimeScopeValueChecker = /*#__PURE__*/ function(ValueChecker) {
         {
             key: "validate",
             value: function validate(value) {
-                return _instanceof(value, RangeDateValue) || isPlainObject(value) && 'min' in value && isString(value.min) && 'max' in value && isString(value.max);
+                return _instanceof(value, RangeDateValue) || isPlainObject(value) && "min" in value && isString(value.min) && "max" in value && isString(value.max);
             }
         },
         {
             key: "transform",
             value: function transform(value, oldValue) {
-                if (value === undefined || value === null || value === '') {
+                if (value === undefined || value === null || value === "") {
                     return new RangeDateValue();
                 }
                 var result;
@@ -441,13 +441,13 @@ var CalcValueChecker = /*#__PURE__*/ function(ValueChecker) {
         {
             key: "validate",
             value: function validate(value) {
-                return _instanceof(value, CalcValue) || isPlainObject(value) && 'result' in value && isNumber(value.result) && 'unit' in value && isString(value.unit);
+                return _instanceof(value, CalcValue) || isPlainObject(value) && "result" in value && isNumber(value.result) && "unit" in value && isString(value.unit);
             }
         },
         {
             key: "transform",
             value: function transform(value, oldValue) {
-                if (value === undefined || value === null || value === '') {
+                if (value === undefined || value === null || value === "") {
                     return new CalcValue({
                         unit: oldValue === null || oldValue === void 0 ? void 0 : oldValue.unit
                     });
@@ -497,7 +497,7 @@ var AddressValueChecker = /*#__PURE__*/ function(ValueChecker) {
         {
             key: "transform",
             value: function transform(value, oldValue) {
-                if (value === undefined || value === null || value === '') {
+                if (value === undefined || value === null || value === "") {
                     return new AddressValue();
                 }
                 var result;
@@ -581,22 +581,22 @@ var ValueCheckerFactory = /*#__PURE__*/ function() {
 }();
 function getFieldTypeFromKey(key) {
     if ([
-        'min',
-        'max',
-        'currency',
-        'unit'
+        "min",
+        "max",
+        "currency",
+        "unit"
     ].includes(key)) {
         return FieldTypes.VARCHAR;
     } else if ([
-        'result',
-        'amount'
+        "result",
+        "amount"
     ].includes(key)) {
         return FieldTypes.DECIMAL;
     }
 }
 export function checkerValue(fieldType, key, value, oldValue) {
-    var ref;
-    var getCheckerFieldType = (ref = getFieldTypeFromKey(key)) !== null && ref !== void 0 ? ref : fieldType;
+    var _getFieldTypeFromKey;
+    var getCheckerFieldType = (_getFieldTypeFromKey = getFieldTypeFromKey(key)) !== null && _getFieldTypeFromKey !== void 0 ? _getFieldTypeFromKey : fieldType;
     var checker = ValueCheckerFactory.getValueChecker(getCheckerFieldType);
     if (!checker || checker.validate(value)) {
         return value;

package/dist/esm/common/index.js

@@ -1,2 +1,2 @@
-export * from './Engine';
-export * from './Plugin';
+export * from "./Engine";
+export * from "./Plugin";

package/dist/esm/common/proxyState.js

@@ -23,22 +23,22 @@ 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 { CONTROL_BASE_TYPE, error, logerror } from '@byteluck-fe/model-driven-shared';
 var cc = console;
+import { CONTROL_BASE_TYPE, error, logerror, JSONCopy } from "@byteluck-fe/model-driven-shared";
 var proxyArrayApi = [
-    'splice',
-    'push',
-    'shift',
-    'pop',
-    'unshift',
-    'reverse', 
+    "splice",
+    "push",
+    "shift",
+    "pop",
+    "unshift",
+    "reverse"
 ];
-export var engineProxyFlag = Symbol('__engineProxy__');
-export var engineTargetKey = Symbol('__engineTarget__');
-export var engineArrayBeforeSetCallbackFlag = Symbol('__engineArrayBeforeSetCallbackFlag__');
-export var engineProxyThisKey = Symbol('__engineProxyThisKey__');
+export var engineProxyFlag = Symbol("__engineProxy__");
+export var engineTargetKey = Symbol("__engineTarget__");
+export var engineArrayBeforeSetCallbackFlag = Symbol("__engineArrayBeforeSetCallbackFlag__");
+export var engineProxyThisKey = Symbol("__engineProxyThisKey__");
 var currentHandlerState = {
-    type: '',
+    type: "",
     args: [],
     callback: emptyFn
 };
@@ -55,16 +55,16 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
     // 操作下标
     // Number(propertyKey) > target.length 说明当前操作的下标已经超过了安全范围（数组的运行长度，比如[1,2,3]，它的长度为3，可操作的下标为0,1,2,3，如果操作4将会产生一个empty index）
     if (index > target.length) {
-        error("Wrong array operations may cause unknown errors. It is recommended to use APIs such as ".concat(proxyArrayApi.join(','), " for array operations"));
+        error("Wrong array operations may cause unknown errors. It is recommended to use APIs such as ".concat(proxyArrayApi.join(","), " for array operations"));
         return;
     }
     // 不是操作下标，而是直接操作length或者自定义属性等
     var isNotHandlerIndex = Number.isNaN(index);
-    if (isNotHandlerIndex && propertyKey !== 'length') {
+    if (isNotHandlerIndex && propertyKey !== "length") {
         return;
     }
     // 直接操作length
-    if (propertyKey === 'length') {
+    if (propertyKey === "length") {
         var newLength = value;
         var oldLength = target.length;
         if (newLength > target.length) {
@@ -76,9 +76,9 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
         }
         // 通过操作length删除旧的行
         return function() {
-            return callback.call(null, target, thisKey, 'splice', [
+            return callback.call(null, target, thisKey, "splice", [
                 newLength,
-                oldLength - newLength, 
+                oldLength - newLength
             ]);
         };
     // 直接操作下标
@@ -86,13 +86,13 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
         // 正常操作
         if (index === target.length) {
             return function() {
-                return callback.call(null, target, thisKey, 'push', [
+                return callback.call(null, target, thisKey, "push", [
                     value
                 ]);
             };
         } else {
             return function() {
-                return callback.call(null, target, thisKey, 'splice', [
+                return callback.call(null, target, thisKey, "splice", [
                     index,
                     1,
                     value
@@ -124,9 +124,9 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
             }
             return Reflect.get(target, propertyKey, receiver);
         },
-        set: function set(target, propertyKey, value1, receiver) {
+        set: function set(target, propertyKey, value, receiver) {
             var reProxyState = function reProxyState(value) {
-                if (typeof value === 'object' && value !== null) {
+                if (typeof value === "object" && value !== null) {
                     // @ts-ignore
                     if (value[engineProxyFlag] !== true) {
                         return proxyState(value, callback, beforeSetCallback, concatKey);
@@ -137,19 +137,19 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
                     }
                 }
             };
-            var newValue = value1;
+            var newValue = JSONCopy(value);
             // @ts-ignore
             var oldValue = target[propertyKey];
-            var concatKey = thisKey === '' ? propertyKey : thisKey + '.' + propertyKey;
-            var ref;
-            newValue = (ref = reProxyState(value1)) !== null && ref !== void 0 ? ref : newValue;
+            var concatKey = thisKey === "" ? propertyKey : thisKey + "." + propertyKey;
+            var _reProxyState;
+            newValue = (_reProxyState = reProxyState(newValue)) !== null && _reProxyState !== void 0 ? _reProxyState : newValue;
             // 先设置值，然后再进行触发回调，确保回调内拿到的是最新的值
             var setResult;
             // TODO 数组拦截操作需要重构，优化现有逻辑
             // TODO 直接操作下标改动明细表时，没有对行数据进行checker
             if (Array.isArray(target)) {
                 // 操作数组的时候，不需要使用拼接的thisKey，先判断执行的是否是违规操作，违规操作的话会报错，不允许继续执行，正常操作的话，返回一个回调函数，用于在值修改完之后触发
-                var nextHandler = ArrayHandler(target, propertyKey, value1, thisKey, callback);
+                var nextHandler = ArrayHandler(target, propertyKey, newValue, thisKey, callback);
                 setResult = Reflect.set(target, propertyKey, newValue, receiver);
                 if (nextHandler) {
                     nextHandler();
@@ -171,9 +171,11 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
                     return true;
                 }
                 setResult = Reflect.set(target, propertyKey, newValue, receiver);
-                callback.call(null, target, concatKey, value1, oldValue);
+                callback.call(null, target, concatKey, newValue, oldValue);
             }
-            return setResult;
+            // 不返回falsy 值（即 false、0、null、undefined、空字符串等）
+            //fix: TypeError: Proxy object's 'set' trap returned falsy value for property 'length'
+            return setResult ? setResult : true;
         }
     };
 }
@@ -184,15 +186,15 @@ function ArrayHandler(target, propertyKey, value, thisKey, callback) {
  * @param beforeSetCallback
  * @param prevKey 递归对象的key
  * */ export function proxyState(state, callback, beforeSetCallback) {
-    var prevKey = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : '';
+    var prevKey = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : "";
     // 冻结的对象不需要再执行proxy，否则会报错
     if (Object.isFrozen(state)) {
         return state;
     }
     for(var key in state){
-        var concatKey = prevKey === '' ? key : prevKey + '.' + key;
+        var concatKey = prevKey === "" ? key : prevKey + "." + key;
         var obj = state[key];
-        if (typeof obj === 'object' && obj !== null) {
+        if (typeof obj === "object" && obj !== null) {
             // @ts-ignore
             state[key] = proxyState(obj, callback, beforeSetCallback, concatKey);
         }
@@ -203,7 +205,7 @@ function flatInstanceForChildren(controls) {
     var result = [];
     controls.forEach(function(item) {
         result.push(item);
-        if (item.controlType === 'layout') {
+        if (item.controlType === "layout") {
             var _result;
             (_result = result).push.apply(_result, _toConsumableArray(flatInstanceForChildren(item.children)));
         }
@@ -214,9 +216,9 @@ function flatInstanceForChildren(controls) {
  * 在flatInstance中通过key查找出对应的instance
  * @param flatInstance 拍平的instance数组
  * @param key 操作的数据在state的key - 可以是深层次的 subtable.0.input等
- * */ export function findItem(flatInstance, key1, instanceMap) {
-    if (key1 === '') return undefined;
-    var keys = key1.split('.');
+ * */ export function findItem(flatInstance, key, instanceMap) {
+    if (key === "") return undefined;
+    var keys = key.split(".");
     if (keys.length === 0) return undefined;
     var oneKey = keys[0];
     var otherKeys = keys.slice(1);
@@ -242,31 +244,31 @@ function flatInstanceForChildren(controls) {
             // 最后一个key可能是值对象上边的key，比如金额的amount和currency，计算公式的result和unit，所以需要判断前一个控件是不是一个表单控件，是的话就返回最后一个表单控件
             return findEndItem ? findEndItem : prevItem.controlType === CONTROL_BASE_TYPE.FORM ? prevItem : undefined;
         } else {
-            var ref;
-            var ref1;
+            var _prevItem_children;
+            var _prevItem_children_index;
             // 如果有children，则取children中对应的下标，没有的话一直返回prevItem
-            return (ref1 = prevItem === null || prevItem === void 0 ? void 0 : (ref = prevItem.children) === null || ref === void 0 ? void 0 : ref[index]) !== null && ref1 !== void 0 ? ref1 : prevItem;
+            return (_prevItem_children_index = prevItem === null || prevItem === void 0 ? void 0 : (_prevItem_children = prevItem.children) === null || _prevItem_children === void 0 ? void 0 : _prevItem_children[index]) !== null && _prevItem_children_index !== void 0 ? _prevItem_children_index : prevItem;
         }
     }, initInstance);
 }
 function getArrayNewValue(type, args) {
     if ([
-        'push',
-        'unshift'
+        "push",
+        "unshift"
     ].includes(type)) {
         return args;
-    } else if (type === 'splice') {
+    } else if (type === "splice") {
         return args.slice(2);
     }
     return [];
 }
 function getArrayNewArgs(type, args, value) {
     if ([
-        'push',
-        'unshift'
+        "push",
+        "unshift"
     ].includes(type)) {
         return value;
-    } else if (type === 'splice') {
+    } else if (type === "splice") {
         return args.slice(0, 2).concat(value);
     }
 }
@@ -285,9 +287,9 @@ function getArrayNewArgs(type, args, value) {
                 var result;
                 var addValue = getArrayNewValue(key, args);
                 if (addValue.length) {
-                    var _obj, ref;
+                    var _this, _this_engineArrayBeforeSetCallbackFlag;
                     // @ts-ignore
-                    var newValue = (ref = (_obj = this)[engineArrayBeforeSetCallbackFlag]) === null || ref === void 0 ? void 0 : ref.call(_obj, // @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
                     this[engineProxyThisKey], addValue);
                     var newArgs = getArrayNewArgs(key, args, newValue);
@@ -301,8 +303,8 @@ function getArrayNewArgs(type, args, value) {
                     // @ts-ignore
                     result = oldApiHandler.apply(this, args);
                 }
-                typeof currentHandlerState.callback === 'function' && currentHandlerState.callback(key, args, result);
-                currentHandlerState.type = '';
+                typeof currentHandlerState.callback === "function" && currentHandlerState.callback(key, args, result);
+                currentHandlerState.type = "";
                 currentHandlerState.args = [];
                 currentHandlerState.callback = emptyFn;
                 return result;

package/dist/esm/index.js

@@ -1,3 +1,3 @@
-export * from './common';
-export * from './plugins';
-export * from './utils';
+export * from "./common";
+export * from "./plugins";
+export * from "./utils";