@byteluck-fe/model-driven-driven 2.2.0 → 2.2.1-beta.3

package/dist/esm/Driven.js

@@ -68,13 +68,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);
 }
@@ -185,11 +178,10 @@ function _createSuper(Derived) {
         return _possibleConstructorReturn(this, result);
     };
 }
-import { error, genNonDuplicateId, isArray, isBuiltInControls, isObject, isString, updateValueFromKeys, warn, Watcher } from "@byteluck-fe/model-driven-shared";
+import { CONTROL_BASE_TYPE, error, genNonDuplicateId, isArray, isBuiltInControls, isObject, isString, updateValueFromKeys, warn, Watcher } from "@byteluck-fe/model-driven-shared";
 import { findInstanceDataScopeParent, Store } from "./Store";
 import { Designer } from "./Designer";
 import EventLogic from "./EventLogic";
-import { DesignerControl, DesignerListControl, DesignerWrapControl } from "@byteluck-fe/model-driven-core";
 import { checkSchema, generatePermissions, getModelBindInfoList, toSchema } from "./utils";
 import { Group, initSettings, Tab } from "@byteluck-fe/model-driven-settings";
 // 当前正在注册的插件名称
@@ -285,13 +277,17 @@ var applyingPluginName = "";
         });
     };
     _proto.setSelectedInstanceSetting = function setSelectedInstanceSetting() {
+        var _instance_parent;
         var instance = this.store.selected;
         if (!instance) {
             return;
         }
         var setting = this.getControlSetting(instance.type);
-        if (_instanceof(instance.parent, DesignerWrapControl)) {
-            var wrapSetting = this.getControlSetting(instance.parent.type);
+        // console.log('iswrap:', instance.parent?.controlType, instance.parent)
+        // if (instance.parent instanceof DesignerWrapControl) {
+        if (((_instance_parent = instance.parent) === null || _instance_parent === void 0 ? void 0 : _instance_parent.controlType) === CONTROL_BASE_TYPE.WRAP) {
+            var _instance_parent1;
+            var wrapSetting = this.getControlSetting((_instance_parent1 = instance.parent) === null || _instance_parent1 === void 0 ? void 0 : _instance_parent1.type);
             setting = this.concatSetting(setting, wrapSetting, instance.parent.id);
         }
         this.store.setSelectInstanceSettings(setting);
@@ -433,10 +429,14 @@ var applyingPluginName = "";
         return this.designer.createControlInstance(type, initSchema);
     };
     _proto.getInstance = function getInstance(instanceId) {
-        if (_instanceof(instanceId, DesignerControl)) {
-            return instanceId;
+        // if (instanceId instanceof DesignerControl) {
+        //   return instanceId
+        // }
+        // return this.store.instanceIdMap.get(instanceId)
+        if (typeof instanceId === "string") {
+            return this.store.instanceIdMap.get(instanceId);
         }
-        return this.store.instanceIdMap.get(instanceId);
+        return instanceId;
     };
     _proto.getInstances = function getInstances() {
         return this.store.flatInstances;
@@ -501,7 +501,8 @@ var applyingPluginName = "";
         if (!parent) {
             return;
         }
-        var parentList = _instanceof(parent, DesignerListControl) && parent.props.headers.includes(instance) ? parent.props.headers : parent.children;
+        var parentList = // parent instanceof DesignerListControl &&
+        parent.controlType === CONTROL_BASE_TYPE.LIST && parent.props.headers.includes(instance) ? parent.props.headers : parent.children;
         var index = parentList.findIndex(function(item) {
             return item === instance;
         });
@@ -518,7 +519,8 @@ var applyingPluginName = "";
         if (!parent) {
             return;
         }
-        var parentList = _instanceof(parent, DesignerListControl) && parent.props.headers.includes(oldInstance) ? parent.props.headers : parent.children;
+        var parentList = // parent instanceof DesignerListControl &&
+        parent.controlType === CONTROL_BASE_TYPE.LIST && parent.props.headers.includes(oldInstance) ? parent.props.headers : parent.children;
         var index = parentList.findIndex(function(item) {
             return item === oldInstance;
         });
@@ -577,7 +579,8 @@ var applyingPluginName = "";
    * */ _proto.getInstanceInListControl = function getInstanceInListControl(instance) {
         var _instance = instance;
         while(_instance){
-            if (_instanceof(_instance, DesignerListControl)) {
+            // if (_instance instanceof DesignerListControl) {
+            if (_instance.controlType === CONTROL_BASE_TYPE.LIST) {
                 return true;
             }
             _instance = _instance.parent;

package/dist/esm/Store.js

@@ -82,10 +82,10 @@ 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 { DesignerFormControl, DataBind } from "@byteluck-fe/model-driven-core";
+import { DataBind } from "@byteluck-fe/model-driven-core";
 import { hasChildrenControl, hasHeaderControl } from "./designerUtils";
 import { Group } from "@byteluck-fe/model-driven-settings";
-import { CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
+import { CONTROL_BASE_TYPE, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
 // 维护当前selected，。。 selectedControlSetting
 export var Store = /*#__PURE__*/ function() {
     "use strict";
@@ -237,7 +237,8 @@ function setDataFieldCodeMap(dataFieldCodeMap, dataBind, instance) {
     }
 }
 function setInstanceInDataFieldCodeMap(instance, dataFieldCodeMap) {
-    if (_instanceof(instance, DesignerFormControl)) {
+    // if (instance instanceof DesignerFormControl) {
+    if (instance.controlType === CONTROL_BASE_TYPE.FORM) {
         var dataBind = instance.props.dataBind;
         if (_instanceof(dataBind, DataBind)) {
             setDataFieldCodeMap(dataFieldCodeMap, dataBind, instance);

package/dist/esm/designerUtils.js

@@ -1,11 +1,3 @@
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
-    } else {
-        return left instanceof right;
-    }
-}
-import { DesignerFormControl } from "@byteluck-fe/model-driven-core";
 import { CONTROL_TYPE, isArray } from "@byteluck-fe/model-driven-shared";
 export function hasChildrenControl(instance) {
     return "children" in instance && isArray(instance.children);
@@ -25,7 +17,8 @@ export function loopFormControl(control, callback) {
                 loopFormControl(// @ts-ignore
                 item === null || item === void 0 ? void 0 : item.children, callback);
             // @ts-ignore
-            } else if (_instanceof(item, DesignerFormControl)) {
+            // } else if (item instanceof DesignerFormControl) {
+            } else if (item.controlType === CONTROL_BASE_TYPE.FORM) {
                 callback(item);
             }
         });

package/dist/esm/utils.js

@@ -38,13 +38,6 @@ function _asyncToGenerator(fn) {
         });
     };
 }
-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);
 }
@@ -188,15 +181,15 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import { loopFormControl } from "./designerUtils";
-import { DesignerColumnControl, DesignerListControl, DesignerFormControl } from "@byteluck-fe/model-driven-core";
-import { CONTROL_TYPE, FieldTypeToColumnType, isArray } from "@byteluck-fe/model-driven-shared";
+import { CONTROL_BASE_TYPE, CONTROL_TYPE, FieldTypeToColumnType, isArray } from "@byteluck-fe/model-driven-shared";
 import Designer from "./Designer";
 import { objectDataBindControlTypes, objectDataBindKeyToFieldType } from "./constants";
 export function getMasterFormControls(controls) {
     var formctls = [];
     // @ts-ignore
     loopFormControl(controls, function(item) {
-        if (_instanceof(item, DesignerFormControl)) {
+        // if (item instanceof DesignerFormControl) {
+        if (item.controlType === CONTROL_BASE_TYPE.FORM) {
             formctls.push(item);
         } else if (item.type === CONTROL_TYPE.SUBTABLE) {}
     });
@@ -437,8 +430,14 @@ function generatePermissions(controls, parent) {
             if (type === CONTROL_TYPE.VUE_FORM_ITEM) {
                 permissionItem.caption = controls.props.controlExportName || controls.name;
             }
-            if (_instanceof(controls, DesignerFormControl) || _instanceof(controls, DesignerColumnControl)) {
-                var _controls_props1, _controls_props_dataBind, _controls_props2, _controls_props_dataBind1;
+            // if (
+            //   controls instanceof DesignerFormControl ||
+            //   controls instanceof DesignerColumnControl
+            // ) {
+            if (controls.controlType === CONTROL_BASE_TYPE.FORM || controls.controlType === CONTROL_BASE_TYPE.COLUMN) {
+                var //@ts-ignore
+                _controls_props1, _controls_props_dataBind, //@ts-ignore
+                _controls_props2, _controls_props_dataBind1;
                 if (((_controls_props1 = controls.props) === null || _controls_props1 === void 0 ? void 0 : (_controls_props_dataBind = _controls_props1.dataBind) === null || _controls_props_dataBind === void 0 ? void 0 : _controls_props_dataBind.fieldCode) !== undefined && ((_controls_props2 = controls.props) === null || _controls_props2 === void 0 ? void 0 : (_controls_props_dataBind1 = _controls_props2.dataBind) === null || _controls_props_dataBind1 === void 0 ? void 0 : _controls_props_dataBind1.fieldCode) !== "") {
                     permissionItem.group = "field";
                 }
@@ -517,7 +516,8 @@ function generatePermissions(controls, parent) {
                 return generatePermissions(item, parent);
             }).flat()));
         }
-        if (_instanceof(controls, DesignerListControl)) {
+        // if (controls instanceof DesignerListControl) {
+        if (controls.controlType === CONTROL_BASE_TYPE.LIST) {
             var // 明细子表和列表的需要给parentId
             _result2;
             (_result2 = result).push.apply(_result2, _toConsumableArray(controls.props.headers.map(function(item) {