@byteluck-fe/model-driven-driven 2.7.0-alpha.2 → 2.7.0-alpha.20

package/dist/esm/Store.js

@@ -28,12 +28,18 @@ function _createClass(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _instanceof(left, right) {
-    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-        return !!right[Symbol.hasInstance](left);
+function _defineProperty(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
     } else {
-        return left instanceof right;
+        obj[key] = value;
     }
+    return obj;
 }
 function _iterableToArray(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
@@ -82,9 +88,8 @@ 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 { DataBind } from "@byteluck-fe/model-driven-core";
-import { hasChildrenControl, hasHeaderControl } from "./designerUtils";
-import { Group } from "@byteluck-fe/model-driven-settings";
+import { isDataBind } from "@byteluck-fe/model-driven-core";
+import { hasChildrenControl, hasFooterControl, hasHeaderControl } from "./designerUtils";
 import { CONTROL_BASE_TYPE, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
 // 维护当前selected，。。 selectedControlSetting
 export var Store = /*#__PURE__*/ function() {
@@ -92,25 +97,46 @@ export var Store = /*#__PURE__*/ function() {
     function Store(options) {
         _classCallCheck(this, Store);
         /**
+   * 页面控件实例树
+   * */ _defineProperty(this, "instance", void 0);
+        /**
+   * 拍平的控件数组
+   * */ _defineProperty(this, "flatInstances", void 0);
+        /**
+   * 控件id组成的map
+   * */ _defineProperty(this, "instanceIdMap", void 0);
+        /**
+   * dataCode和fieldCode组成的map
+   * {
+   *   [主表dataCode]: {
+   *     [fieldCode]: 控件
+   *   },
+   *   [子表dataCode]: {
+   *     [fieldCode]: 控件
+   *   }
+   * }
+   * */ _defineProperty(this, "dataFieldCodeMap", void 0);
+        /**
    * 当前选中的控件
-   * */ this.selected = null;
+   * */ _defineProperty(this, "selected", null);
         /**
    * 当前选中的数据作用域控件
-   * */ this.selectedInstanceDataScopeParent = null;
-        this.selectedDataScopeFlatInstances = [];
+   * */ _defineProperty(this, "selectedInstanceDataScopeParent", null);
+        _defineProperty(this, "selectedDataScopeFlatInstances", []);
         /**
    * 当前选中控件的setting
-   * */ this.selectedInstanceSetting = [];
-        this.selectedInstanceSettingItems = [];
+   * */ _defineProperty(this, "selectedInstanceSetting", []);
+        _defineProperty(this, "selectedInstanceSettingItems", []);
         /**
    * 当前选中控件的数据模型
-   * */ this.selectedFieldItem = null;
+   * */ _defineProperty(this, "selectedFieldItem", null);
         /**
    * 扩展字段，比如appId，dataCode等
-   * */ this.external = {};
-        this.movingInstance = null;
-        this.movingInstanceOldParent = null;
-        this.movingInstanceOldDataScopeParent = null;
+   * */ _defineProperty(this, "external", {});
+        _defineProperty(this, "movingInstance", null);
+        _defineProperty(this, "movingInstanceOldParent", null);
+        _defineProperty(this, "movingInstanceOldDataScopeParent", null);
+        _defineProperty(this, "getParentBeforeInstanceMove", void 0);
         var _options_getParentBeforeInstanceMove;
         this.getParentBeforeInstanceMove = (_options_getParentBeforeInstanceMove = options.getParentBeforeInstanceMove) !== null && _options_getParentBeforeInstanceMove !== void 0 ? _options_getParentBeforeInstanceMove : function(instance) {
             return instance.parent;
@@ -118,87 +144,6 @@ export var Store = /*#__PURE__*/ function() {
         this.instance = options.instance;
         this.getFlatInstances();
     }
-    var _proto = Store.prototype;
-    _proto.setInstances = function setInstances(instances) {
-        this.instance = instances;
-        this.getFlatInstances();
-    };
-    _proto.setSelectInstance = function setSelectInstance(instance) {
-        this.selected = instance;
-        this.selectedInstanceDataScopeParent = instance ? findInstanceDataScopeParent(instance) : null;
-        this.selectedDataScopeFlatInstances = this.selectedInstanceDataScopeParent ? getDataScopeFlatInstances(this.selectedInstanceDataScopeParent) : [];
-    };
-    _proto.setSelectInstanceSettings = function setSelectInstanceSettings(settings) {
-        var _this = this;
-        this.selectedInstanceSetting = settings;
-        this.selectedInstanceSettingItems = [];
-        this.selectedInstanceSetting.forEach(function(group) {
-            var _this_selectedInstanceSettingItems;
-            (_this_selectedInstanceSettingItems = _this.selectedInstanceSettingItems).push.apply(_this_selectedInstanceSettingItems, _toConsumableArray(_this.getSettingItems(group)));
-        });
-    };
-    _proto.getSettingItems = function getSettingItems(group) {
-        return _instanceof(group, Group) ? group.items : group.items.reduce(function(result, curr) {
-            var _result;
-            (_result = result).push.apply(_result, _toConsumableArray(curr.items));
-            return result;
-        }, []);
-    };
-    _proto.setSelectedFieldItem = function setSelectedFieldItem(fieldItem) {
-        this.selectedFieldItem = fieldItem;
-    };
-    _proto.setMovingInstance = function setMovingInstance(instance) {
-        this.movingInstance = instance;
-        this.movingInstanceOldParent = instance ? this.getParentBeforeInstanceMove(instance) : null;
-        this.movingInstanceOldDataScopeParent = findInstanceDataScopeParent(instance);
-    };
-    _proto.updateDataFieldCodeMap = function updateDataFieldCodeMap(instance) {
-        var scopeParent = findInstanceDataScopeParent(instance);
-        if (!scopeParent) {
-            return;
-        }
-        var map = this.dataFieldCodeMap.get(scopeParent.props.datasourceBind.dataCode);
-        if (!map) {
-            return;
-        }
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-        try {
-            for(var _iterator = map.entries()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], value = _step_value[1];
-                if (value.id === instance.id) {
-                    map.delete(key);
-                    break;
-                }
-            }
-        } catch (err) {
-            _didIteratorError = true;
-            _iteratorError = err;
-        } finally{
-            try {
-                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                    _iterator.return();
-                }
-            } finally{
-                if (_didIteratorError) {
-                    throw _iteratorError;
-                }
-            }
-        }
-        setInstanceInDataFieldCodeMap(instance, this.dataFieldCodeMap);
-    };
-    _proto.getFlatInstances = function getFlatInstances() {
-        var instances = [];
-        var instanceIdMap = new Map();
-        var dataFieldCodeMap = new Map();
-        loop(this.instance, function(instance) {
-            instances.push(instance);
-            instanceIdMap.set(instance.id, instance);
-            setInstanceInDataFieldCodeMap(instance, dataFieldCodeMap);
-        });
-        this.flatInstances = instances;
-        this.instanceIdMap = instanceIdMap;
-        this.dataFieldCodeMap = dataFieldCodeMap;
-    };
     _createClass(Store, [
         {
             key: "selectedRules",
@@ -223,6 +168,111 @@ export var Store = /*#__PURE__*/ function() {
                 // TODO 转换Antd rules
                 return rules;
             }
+        },
+        {
+            key: "setInstances",
+            value: function setInstances(instances) {
+                this.instance = instances;
+                this.getFlatInstances();
+            }
+        },
+        {
+            key: "setSelectInstance",
+            value: function setSelectInstance(instance) {
+                this.selected = instance;
+                this.selectedInstanceDataScopeParent = instance ? findInstanceDataScopeParent(instance) : null;
+                this.selectedDataScopeFlatInstances = this.selectedInstanceDataScopeParent ? getDataScopeFlatInstances(this.selectedInstanceDataScopeParent) : [];
+            }
+        },
+        {
+            key: "setSelectInstanceSettings",
+            value: function setSelectInstanceSettings(settings) {
+                var _this = this;
+                this.selectedInstanceSetting = settings;
+                this.selectedInstanceSettingItems = [];
+                this.selectedInstanceSetting.forEach(function(group) {
+                    var _this_selectedInstanceSettingItems;
+                    (_this_selectedInstanceSettingItems = _this.selectedInstanceSettingItems).push.apply(_this_selectedInstanceSettingItems, _toConsumableArray(_this.getSettingItems(group)));
+                });
+            }
+        },
+        {
+            key: "getSettingItems",
+            value: function getSettingItems(group) {
+                // return group instanceof Group
+                return group.type === "group" ? group.items : group.items.reduce(function(result, curr) {
+                    var _result;
+                    (_result = result).push.apply(_result, _toConsumableArray(curr.items));
+                    return result;
+                }, []);
+            }
+        },
+        {
+            key: "setSelectedFieldItem",
+            value: function setSelectedFieldItem(fieldItem) {
+                this.selectedFieldItem = fieldItem;
+            }
+        },
+        {
+            key: "setMovingInstance",
+            value: function setMovingInstance(instance) {
+                this.movingInstance = instance;
+                this.movingInstanceOldParent = instance ? this.getParentBeforeInstanceMove(instance) : null;
+                this.movingInstanceOldDataScopeParent = findInstanceDataScopeParent(instance);
+            }
+        },
+        {
+            key: "updateDataFieldCodeMap",
+            value: function updateDataFieldCodeMap(instance) {
+                var scopeParent = findInstanceDataScopeParent(instance);
+                if (!scopeParent) {
+                    return;
+                }
+                var map = this.dataFieldCodeMap.get(scopeParent.props.datasourceBind.dataCode);
+                if (!map) {
+                    return;
+                }
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    for(var _iterator = map.entries()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], value = _step_value[1];
+                        if (value.id === instance.id) {
+                            map.delete(key);
+                            break;
+                        }
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                    }
+                }
+                setInstanceInDataFieldCodeMap(instance, this.dataFieldCodeMap);
+            }
+        },
+        {
+            key: "getFlatInstances",
+            value: function getFlatInstances() {
+                var instances = [];
+                var instanceIdMap = new Map();
+                var dataFieldCodeMap = new Map();
+                loop(this.instance, function(instance) {
+                    instances.push(instance);
+                    instanceIdMap.set(instance.id, instance);
+                    setInstanceInDataFieldCodeMap(instance, dataFieldCodeMap);
+                });
+                this.flatInstances = instances;
+                this.instanceIdMap = instanceIdMap;
+                this.dataFieldCodeMap = dataFieldCodeMap;
+            }
         }
     ]);
     return Store;
@@ -240,7 +290,8 @@ function setInstanceInDataFieldCodeMap(instance, dataFieldCodeMap) {
     // if (instance instanceof DesignerFormControl) {
     if (instance.controlType === CONTROL_BASE_TYPE.FORM) {
         var dataBind = instance.props.dataBind;
-        if (_instanceof(dataBind, DataBind)) {
+        //if (dataBind instanceof DataBind) {
+        if (isDataBind(dataBind)) {
             setDataFieldCodeMap(dataFieldCodeMap, dataBind, instance);
         } else {
             Object.values(dataBind).forEach(function(subDataBind) {
@@ -261,6 +312,11 @@ export function loop(instances, callback) {
         if (hasHeaderControl(item)) {
             loop(item.props.headers, callback);
         }
+        if (hasFooterControl(item)) {
+            var _item_props;
+            var _item_props_footers;
+            loop((_item_props_footers = (_item_props = item.props) === null || _item_props === void 0 ? void 0 : _item_props.footers) !== null && _item_props_footers !== void 0 ? _item_props_footers : [], callback);
+        }
     });
 }
 export function isDataScopeInstance(instance) {

package/dist/esm/designerUtils.js

@@ -5,6 +5,9 @@ export function hasChildrenControl(instance) {
 export function hasHeaderControl(instance) {
     return "headers" in instance.props && isArray(instance.props.headers);
 }
+export function hasFooterControl(instance) {
+    return "footers" in instance.props && isArray(instance.props.footers);
+}
 export function loopFormControl(control, callback) {
     if (Array.isArray(control)) {
         control.map(function(item) {

package/dist/esm/utils.js

@@ -378,7 +378,9 @@ var PermissionExcludeControlTypes = [
     CONTROL_TYPE.TAB_PANE,
     CONTROL_TYPE.TAB,
     CONTROL_TYPE.CARD_GROUP,
-    CONTROL_TYPE.ACTION_BAR
+    CONTROL_TYPE.ACTION_BAR,
+    CONTROL_TYPE.GRID_LAYOUT_CONTAINER,
+    CONTROL_TYPE.GRID_LAYOUT_WRAP
 ];
 // 不可以编辑的控件
 var cannotEditControlTypes = [