@byteluck-fe/model-driven-engine 2.6.0-alpha.12 → 2.6.0-alpha.14

package/dist/esm/common/Engine.js

@@ -111,13 +111,6 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _setPrototypeOf(subClass, superClass);
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _iterableToArray(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -229,7 +222,7 @@ function _createSuper(Derived) {
     };
 }
 import regeneratorRuntime from "regenerator-runtime";
-import { DataBind, ObjectDataBind, RuntimeListControl } from '@byteluck-fe/model-driven-core';
+import { isDataBind } from '@byteluck-fe/model-driven-core';
 import { CONTROL_BASE_TYPE, CONTROL_TYPE, DEFAULT_LOCALE, error, genNonDuplicateId, isString, JSONCopy, log, RulesMessage, updateValueFromKeys, warn, Watcher } from '@byteluck-fe/model-driven-shared';
 import { Runtime } from './Runtime';
 import { Store } from './Store';
@@ -398,7 +391,8 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
             value: function _handlerArrayUpdate(state, key, type, args, result) {
                 var _this = this;
                 var subtable = findItem(this.runtime.flatInstances, key, this.runtime.instanceMap);
-                if (!_instanceof(subtable, RuntimeListControl)) return;
+                // if (!(subtable instanceof RuntimeListControl)) return
+                if (!(subtable.controlType === CONTROL_BASE_TYPE.LIST)) return;
                 // 新增多行方法
                 var createRows = function(len) {
                     // @ts-ignore
@@ -814,7 +808,8 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
                 }
                 var dataBind1 = dataBindMapping1.dataBind, controlId1 = dataBindMapping1.controlId;
                 var state = this.getState(controlId1, rowIndex);
-                if (_instanceof(dataBind1, ObjectDataBind)) {
+                //if (dataBind instanceof ObjectDataBind) {
+                if (!isDataBind(dataBind1)) {
                     return Object.entries(dataBind1).reduce(function(result, param) {
                         var _param = _slicedToArray(param, 2), key = _param[0], dataBind = _param[1];
                         // objectDataBind的元素，跳过下一次赋值
@@ -915,7 +910,8 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
                     return;
                 }
                 var dataBind2 = dataBindMapping.dataBind, controlId = dataBindMapping.controlId;
-                if (_instanceof(dataBind2, ObjectDataBind)) {
+                // if (dataBind instanceof ObjectDataBind) {
+                if (!isDataBind(dataBind2)) {
                     var ref;
                     var oldState = (ref = JSONCopy(this.getState(controlId, rowIndex))) !== null && ref !== void 0 ? ref : this.getEmptyState(controlId);
                     // fieldCode不代表是key，所以需要找到对应的key
@@ -957,7 +953,8 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
                         return;
                     }
                     // 对象类型的值
-                    if (_instanceof(dataBind3, ObjectDataBind)) {
+                    // if (dataBind instanceof ObjectDataBind) {
+                    if (!isDataBind(dataBind3)) {
                         var ref;
                         var oldState = (ref = JSONCopy(_this.getState(controlId, rowIndex))) !== null && ref !== void 0 ? ref : _this.getEmptyState(controlId);
                         // fieldCode不代表是key，所以需要找到对应的key
@@ -1001,7 +998,8 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
                         return;
                     }
                     // 对象类型的值
-                    if (_instanceof(dataBind4, ObjectDataBind)) {
+                    // if (dataBind instanceof ObjectDataBind) {
+                    if (!isDataBind(dataBind4)) {
                         var oldState = _this.getEmptyState(controlId);
                         // fieldCode不代表是key，所以需要找到对应的key
                         result1[item.controlId] = Object.entries(dataBind4).reduce(function(result, param) {
@@ -1059,9 +1057,11 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
                                     return i.fieldCode === fieldCode;
                                 });
                                 if (fieldMapping) {
-                                    if (_instanceof(fieldMapping.dataBind, DataBind) && row[fieldCode] !== undefined) {
+                                    if (// fieldMapping.dataBind instanceof DataBind &&
+                                    isDataBind(fieldMapping.dataBind) && row[fieldCode] !== undefined) {
                                         newRow[fieldMapping.controlId] = row[fieldCode];
-                                    } else if (_instanceof(fieldMapping.dataBind, ObjectDataBind)) {
+                                    // } else if (fieldMapping.dataBind instanceof ObjectDataBind) {
+                                    } else if (!isDataBind(fieldMapping.dataBind)) {
                                         var ref20;
                                         var objValue = JSONCopy((ref20 = _this.getEmptyState(fieldMapping.controlId)) !== null && ref20 !== void 0 ? ref20 : {});
                                         Object.keys(fieldMapping.dataBind).map(function(key) {
@@ -1097,9 +1097,11 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
                                 if (!newState[mapping.dataViewId[0]]) {
                                     newState[mapping.dataViewId[0]] = {};
                                 }
-                                if (_instanceof(mapping.dataBind, DataBind) && entity[fieldCode] !== undefined) {
+                                if (// mapping.dataBind instanceof DataBind &&
+                                isDataBind(mapping.dataBind) && entity[fieldCode] !== undefined) {
                                     newState[mapping.dataViewId[0]][mapping.controlId] = entity[fieldCode] !== undefined ? entity[fieldCode] : emptyState[mapping.dataViewId[0]][mapping.controlId];
-                                } else if (_instanceof(mapping.dataBind, ObjectDataBind)) {
+                                // } else if (mapping.dataBind instanceof ObjectDataBind) {
+                                } else if (!isDataBind(mapping.dataBind)) {
                                     var ref;
                                     var objValue = (ref = _this3.getEmptyState(mapping.controlId)) !== null && ref !== void 0 ? ref : {};
                                     Object.keys(mapping.dataBind).map(function(key) {
@@ -1334,28 +1336,48 @@ var Engine = // 整体渲染引擎  并且 提供发布订阅能力
    * 如果控件在表头内，则返回-1
    * 如果控件在表内，则返回行下标
    * 如果控件不在明细表内，则返回undefined
-   * */ function getInstanceRowIndex(instance) {
-                if (!instance.parent) {
-                    return;
-                }
+   * */ // public getInstanceRowIndex(
+            //   instance: ControlRuntimeInstance<ControlsKeys> | RuntimeControl
+            // ) {
+            //   if (!instance.parent) {
+            //     return
+            //   }
+            //   let rowIndex: number | undefined
+            //   // @ts-ignore
+            //   if (this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE)) {
+            //     // 表头内的控件
+            //     // @ts-ignore
+            //     if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
+            //       rowIndex = -1
+            //     } else {
+            //       // @ts-ignore
+            //       const index = instance.parent.children.findIndex(
+            //         (item: any) => item === instance
+            //       )
+            //       if (index > -1) {
+            //         rowIndex = index
+            //       }
+            //     }
+            //   } else {
+            //     rowIndex = this.getInstanceRowIndex(instance.parent)
+            //   }
+            //   return rowIndex
+            // }
+            function getInstanceRowIndex(instance) {
                 var rowIndex;
                 // @ts-ignore
-                if (this.assertInstance(instance.parent, CONTROL_TYPE.SUBTABLE)) {
-                    // 表头内的控件
-                    // @ts-ignore
-                    if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
-                        rowIndex = -1;
-                    } else {
-                        // @ts-ignore
-                        var index = instance.parent.children.findIndex(function(item) {
+                if (this.assertInstance(instance, CONTROL_TYPE.SUBTABLE_COLUMN)) {
+                    rowIndex = -1;
+                } else {
+                    var instanceList = this.runtime.instanceMap[instance.id];
+                    if (Object.prototype.toString.call(instanceList) === '[object Array]') {
+                        var index = instanceList.findIndex(function(item) {
                             return item === instance;
                         });
                         if (index > -1) {
                             rowIndex = index;
                         }
                     }
-                } else {
-                    rowIndex = this.getInstanceRowIndex(instance.parent);
                 }
                 return rowIndex;
             }

package/dist/esm/common/Store.js

@@ -30,14 +30,7 @@ function _defineProperty(obj, key, value) {
     }
     return obj;
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
-import { DataBind, ObjectDataBind } from '@byteluck-fe/model-driven-core';
+import { DataBind, isDataBind } from '@byteluck-fe/model-driven-core';
 import { loopFormSchema, JSONCopy, warn, CONTROL_TYPE, CONTROL_BASE_TYPE } from '@byteluck-fe/model-driven-shared';
 import { loopDataViewControl, loopFormControl, buildUUID } from '../utils/runtimeUtils';
 var Store = /*#__PURE__*/ function() {
@@ -263,7 +256,8 @@ item1) {
     // if (item instanceof RuntimeFormControl) {
     if (item1.controlType === CONTROL_BASE_TYPE.FORM) {
         var ref, ref1;
-        if (_instanceof(item1.props.dataBind, ObjectDataBind)) {
+        // if (item.props.dataBind instanceof ObjectDataBind) {
+        if (!isDataBind(item1.props.dataBind)) {
             // 特殊的dataBind，比如:金额是currency+amount两个key组成的，日期区间，继承自ObjectDataBind的需要通过Object.keys拿到多个databind
             Object.keys(item1.props.dataBind).map(function(key) {
                 var dataBind = item1.props.dataBind;
@@ -318,7 +312,8 @@ item1) {
         };
         var subtableId = item1.id;
         loopFormSchema(item1.props.headers, function(item) {
-            if (_instanceof(item.props.dataBind, ObjectDataBind)) {
+            // if (item.props.dataBind instanceof ObjectDataBind) {
+            if (!isDataBind(item.props.dataBind)) {
                 Object.keys(item.props.dataBind).map(function(key) {
                     var dataBind = item.props.dataBind;
                     var dataCode = dataBind[key].dataCode;

package/dist/esm/common/checkerValue.js

@@ -63,13 +63,6 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _setPrototypeOf(subClass, superClass);
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
 function _iterableToArrayLimit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
@@ -344,7 +337,8 @@ 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(// value instanceof AmountValue ||
+                (isPlainObject(value) && 'amount' in value && isNumber(value.amount) && 'currency' in value && isString(value.currency)));
             }
         },
         {
@@ -394,7 +388,8 @@ 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(// value instanceof RangeDateValue ||
+                (isPlainObject(value) && 'min' in value && isString(value.min) && 'max' in value && isString(value.max)));
             }
         },
         {
@@ -441,7 +436,8 @@ 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(// value instanceof CalcValue ||
+                (isPlainObject(value) && 'result' in value && isNumber(value.result) && 'unit' in value && isString(value.unit)));
             }
         },
         {
@@ -491,7 +487,18 @@ var AddressValueChecker = /*#__PURE__*/ function(ValueChecker) {
         {
             key: "validate",
             value: function validate(value) {
-                return _instanceof(value, AddressValue);
+                // return value instanceof AddressValue
+                if (isPlainObject(value)) {
+                    // city?: string;
+                    // cityDisplay?: string;
+                    // district?: string;
+                    // districtDisplay?: string;
+                    // province?: string;
+                    // provinceDisplay?: string
+                    return true;
+                } else {
+                    return false;
+                }
             }
         },
         {