@byteluck-fe/model-driven-driven 2.7.0-alpha.3 → 2.7.0-alpha.31

package/dist/esm/Driven.js

@@ -1,21 +1,21 @@
-function _arrayLikeToArray(arr, len) {
+function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _arrayWithHoles(arr) {
+function _array_with_holes(arr) {
     if (Array.isArray(arr)) return arr;
 }
-function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
 }
-function _assertThisInitialized(self) {
+function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
     }
     return self;
 }
-function _classCallCheck(instance, Constructor) {
+function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
@@ -29,12 +29,12 @@ function _defineProperties(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _createClass(Constructor, protoProps, staticProps) {
+function _create_class(Constructor, protoProps, staticProps) {
     if (protoProps) _defineProperties(Constructor.prototype, protoProps);
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _defineProperty(obj, key, value) {
+function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
             value: value,
@@ -51,23 +51,23 @@ function _get(target, property, receiver) {
     if (typeof Reflect !== "undefined" && Reflect.get) {
         _get = Reflect.get;
     } else {
-        _get = function _get(target, property, receiver) {
-            var base = _superPropBase(target, property);
+        _get = function get(target, property, receiver) {
+            var base = _super_prop_base(target, property);
             if (!base) return;
             var desc = Object.getOwnPropertyDescriptor(base, property);
             if (desc.get) {
-                return desc.get.call(receiver);
+                return desc.get.call(receiver || target);
             }
             return desc.value;
         };
     }
     return _get(target, property, receiver || target);
 }
-function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
+function _get_prototype_of(o) {
+    _get_prototype_of = Object.setPrototypeOf ? Object.getPrototypeOf : function getPrototypeOf(o) {
         return o.__proto__ || Object.getPrototypeOf(o);
     };
-    return _getPrototypeOf(o);
+    return _get_prototype_of(o);
 }
 function _inherits(subClass, superClass) {
     if (typeof superClass !== "function" && superClass !== null) {
@@ -80,12 +80,12 @@ function _inherits(subClass, superClass) {
             configurable: true
         }
     });
-    if (superClass) _setPrototypeOf(subClass, superClass);
+    if (superClass) _set_prototype_of(subClass, superClass);
 }
-function _iterableToArray(iter) {
+function _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-function _iterableToArrayLimit(arr, i) {
+function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
     var _arr = [];
@@ -109,13 +109,13 @@ function _iterableToArrayLimit(arr, i) {
     }
     return _arr;
 }
-function _nonIterableRest() {
+function _non_iterable_rest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _nonIterableSpread() {
+function _non_iterable_spread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _objectSpread(target) {
+function _object_spread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
         var ownKeys = Object.keys(source);
@@ -125,50 +125,50 @@ function _objectSpread(target) {
             }));
         }
         ownKeys.forEach(function(key) {
-            _defineProperty(target, key, source[key]);
+            _define_property(target, key, source[key]);
         });
     }
     return target;
 }
-function _possibleConstructorReturn(self, call) {
-    if (call && (_typeof(call) === "object" || typeof call === "function")) {
+function _possible_constructor_return(self, call) {
+    if (call && (_type_of(call) === "object" || typeof call === "function")) {
         return call;
     }
-    return _assertThisInitialized(self);
+    return _assert_this_initialized(self);
 }
-function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+function _set_prototype_of(o, p) {
+    _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
         o.__proto__ = p;
         return o;
     };
-    return _setPrototypeOf(o, p);
+    return _set_prototype_of(o, p);
 }
-function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+function _sliced_to_array(arr, i) {
+    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
-function _superPropBase(object, property) {
+function _super_prop_base(object, property) {
     while(!Object.prototype.hasOwnProperty.call(object, property)){
-        object = _getPrototypeOf(object);
+        object = _get_prototype_of(object);
         if (object === null) break;
     }
     return object;
 }
-function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
-var _typeof = function(obj) {
+function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
-};
-function _unsupportedIterableToArray(o, minLen) {
+}
+function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     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);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
-function _isNativeReflectConstruct() {
+function _is_native_reflect_construct() {
     if (typeof Reflect === "undefined" || !Reflect.construct) return false;
     if (Reflect.construct.sham) return false;
     if (typeof Proxy === "function") return true;
@@ -179,17 +179,17 @@ function _isNativeReflectConstruct() {
         return false;
     }
 }
-function _createSuper(Derived) {
-    var hasNativeReflectConstruct = _isNativeReflectConstruct();
+function _create_super(Derived) {
+    var hasNativeReflectConstruct = _is_native_reflect_construct();
     return function _createSuperInternal() {
-        var Super = _getPrototypeOf(Derived), result;
+        var Super = _get_prototype_of(Derived), result;
         if (hasNativeReflectConstruct) {
-            var NewTarget = _getPrototypeOf(this).constructor;
+            var NewTarget = _get_prototype_of(this).constructor;
             result = Reflect.construct(Super, arguments, NewTarget);
         } else {
             result = Super.apply(this, arguments);
         }
-        return _possibleConstructorReturn(this, result);
+        return _possible_constructor_return(this, result);
     };
 }
 import { CONTROL_BASE_TYPE, error, genNonDuplicateId, isArray, isBuiltInControls, isObject, isString, updateValueFromKeys, warn, Watcher } from "@byteluck-fe/model-driven-shared";
@@ -205,42 +205,42 @@ var applyingPluginName = "";
  * */ var Driven = /*#__PURE__*/ function(Watcher) {
     "use strict";
     _inherits(Driven, Watcher);
-    var _super = _createSuper(Driven);
+    var _super = _create_super(Driven);
     function Driven(options) {
-        _classCallCheck(this, Driven);
+        _class_call_check(this, Driven);
         var _this;
         _this = _super.call(this);
-        _defineProperty(_assertThisInitialized(_this), "mode", void 0);
-        _defineProperty(_assertThisInitialized(_this), "isMounted", false);
-        _defineProperty(_assertThisInitialized(_this), "id", genNonDuplicateId(8));
+        _define_property(_assert_this_initialized(_this), "mode", void 0);
+        _define_property(_assert_this_initialized(_this), "isMounted", false);
+        _define_property(_assert_this_initialized(_this), "id", genNonDuplicateId(8));
         /**
    * 控件可选的事件
-   * */ _defineProperty(_assertThisInitialized(_this), "eventLogic", void 0);
+   * */ _define_property(_assert_this_initialized(_this), "eventLogic", void 0);
         /**
    * 处理数据存储，存放模型等
-   * */ _defineProperty(_assertThisInitialized(_this), "store", void 0);
+   * */ _define_property(_assert_this_initialized(_this), "store", void 0);
         /**
    * 额外参数存储
-   */ _defineProperty(_assertThisInitialized(_this), "externalParams", void 0);
+   */ _define_property(_assert_this_initialized(_this), "externalParams", void 0);
         /**
    * 处理instance，和schema存储
-   * */ _defineProperty(_assertThisInitialized(_this), "designer", void 0);
+   * */ _define_property(_assert_this_initialized(_this), "designer", void 0);
         /**
    * 插件数组
-   * */ _defineProperty(_assertThisInitialized(_this), "__plugins", void 0);
-        _defineProperty(_assertThisInitialized(_this), "__pluginsApplied", false);
-        _defineProperty(_assertThisInitialized(_this), "$options", void 0);
+   * */ _define_property(_assert_this_initialized(_this), "__plugins", void 0);
+        _define_property(_assert_this_initialized(_this), "__pluginsApplied", false);
+        _define_property(_assert_this_initialized(_this), "$options", void 0);
         // TODO 拿到schema
-        _defineProperty(_assertThisInitialized(_this), "getSchema", toSchema);
+        _define_property(_assert_this_initialized(_this), "getSchema", toSchema);
         // TODO 拿到model_bind_info_list
-        _defineProperty(_assertThisInitialized(_this), "getModelBindInfoList", getModelBindInfoList);
+        _define_property(_assert_this_initialized(_this), "getModelBindInfoList", getModelBindInfoList);
         // TODO 拿到permission_controls
-        _defineProperty(_assertThisInitialized(_this), "generatePermissions", generatePermissions);
+        _define_property(_assert_this_initialized(_this), "generatePermissions", generatePermissions);
         _this.$options = Object.freeze(options);
         var _this_$options = _this.$options, _this_$options_autoMount = _this_$options.autoMount, autoMount = _this_$options_autoMount === void 0 ? false : _this_$options_autoMount, tmp = _this_$options.Designer, DesignerClass = tmp === void 0 ? Designer : tmp, schema = _this_$options.schema, _this_$options_mode = _this_$options.mode, mode = _this_$options_mode === void 0 ? "form" : _this_$options_mode, tmp1 = _this_$options.store, storeOptions = tmp1 === void 0 ? {} : tmp1;
         _this.eventLogic = new EventLogic();
         _this.designer = new DesignerClass();
-        _this.store = new Store(_objectSpread({
+        _this.store = new Store(_object_spread({
             instance: _this.designer.createControl(Array.isArray(schema) ? schema : [
                 schema
             ])
@@ -249,7 +249,7 @@ var applyingPluginName = "";
         autoMount && _this.mount();
         return _this;
     }
-    _createClass(Driven, [
+    _create_class(Driven, [
         {
             key: "mount",
             value: // 挂载
@@ -293,13 +293,13 @@ var applyingPluginName = "";
                 for(var _len = arguments.length, payload = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
                     payload[_key - 1] = arguments[_key];
                 }
-                return _get(_getPrototypeOf(Driven.prototype), "emit", this).call(this, key, payload);
+                return _get(_get_prototype_of(Driven.prototype), "emit", this).call(this, key, payload);
             }
         },
         {
             key: "on",
             value: function on(key, callback) {
-                return _get(_getPrototypeOf(Driven.prototype), "on", this).call(this, key, callback);
+                return _get(_get_prototype_of(Driven.prototype), "on", this).call(this, key, callback);
             }
         },
         {
@@ -342,6 +342,7 @@ var applyingPluginName = "";
                 var setting = this.getControlSetting(instance.type);
                 // console.log('iswrap:', instance.parent?.controlType, instance.parent)
                 // if (instance.parent instanceof DesignerWrapControl) {
+                // 如果父控件为自定义控件wrapper
                 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);
@@ -363,7 +364,7 @@ var applyingPluginName = "";
             key: "concatSetting",
             value: function concatSetting(settings, otherSettings, settingFromId) {
                 var _this = this;
-                var _settings_, _otherSettings_, _settings_1, _otherSettings_1;
+                var _settings_, _otherSettings_, _settings_1, _otherSettings_1, _settings_2, _otherSettings_2, _settings_3, _otherSettings_3;
                 var result = settings;
                 // tab
                 if (((_settings_ = settings[0]) === null || _settings_ === void 0 ? void 0 : _settings_.type) === "tab" && ((_otherSettings_ = otherSettings[0]) === null || _otherSettings_ === void 0 ? void 0 : _otherSettings_.type) === "tab") {
@@ -379,12 +380,12 @@ var applyingPluginName = "";
                         }
                         var otherTab = otherTabSettings.splice(otherTabIndex, 1)[0];
                         if (otherTab) {
-                            result.items = _toConsumableArray(_this.formatGroupSetting(otherTab.items, settingFromId)).concat(_toConsumableArray(result.items));
+                            result.items = _to_consumable_array(_this.formatGroupSetting(otherTab.items, settingFromId)).concat(_to_consumable_array(result.items));
                         }
                         return result;
                     });
                     if (otherTabSettings.length) {
-                        result = _toConsumableArray(result).concat(_toConsumableArray(otherTabSettings.map(function(item) {
+                        result = _to_consumable_array(result).concat(_to_consumable_array(otherTabSettings.map(function(item) {
                             return _this.formatGroupSetting(item, settingFromId);
                         })));
                     }
@@ -392,9 +393,28 @@ var applyingPluginName = "";
                 } else if (((_settings_1 = settings[0]) === null || _settings_1 === void 0 ? void 0 : _settings_1.type) === "group" && ((_otherSettings_1 = otherSettings[0]) === null || _otherSettings_1 === void 0 ? void 0 : _otherSettings_1.type) === "group") {
                     var groupSettings = settings;
                     var otherGroupSettings = otherSettings;
-                    result = _toConsumableArray(this.formatGroupSetting(otherGroupSettings, settingFromId)).concat(_toConsumableArray(groupSettings));
-                } else {
-                // 一个是tab，一个是group，暂时不支持
+                    result = _to_consumable_array(this.formatGroupSetting(otherGroupSettings, settingFromId)).concat(_to_consumable_array(groupSettings));
+                // 当前控件setting是tab，合并控件setting是group
+                } else if (((_settings_2 = settings[0]) === null || _settings_2 === void 0 ? void 0 : _settings_2.type) === "tab" && ((_otherSettings_2 = otherSettings[0]) === null || _otherSettings_2 === void 0 ? void 0 : _otherSettings_2.type) === "group") {
+                    var tabSettings1 = settings;
+                    var otherGroupSettings1 = otherSettings;
+                    result = tabSettings1.map(function(tab, index) {
+                        var result = new Tab(tab);
+                        if (index === 0) {
+                            result.items = _to_consumable_array(_this.formatGroupSetting(otherGroupSettings1, settingFromId)).concat(_to_consumable_array(result.items));
+                        }
+                        return result;
+                    });
+                } else if (((_settings_3 = settings[0]) === null || _settings_3 === void 0 ? void 0 : _settings_3.type) === "group" && ((_otherSettings_3 = otherSettings[0]) === null || _otherSettings_3 === void 0 ? void 0 : _otherSettings_3.type) === "tab") {
+                    var groupSettings1 = settings;
+                    var otherTabSettings1 = otherSettings;
+                    result = otherTabSettings1.map(function(tab, index) {
+                        var result = new Tab(tab);
+                        if (index === 0) {
+                            result.items = _to_consumable_array(result.items).concat(_to_consumable_array(_this.formatGroupSetting(groupSettings1, settingFromId)));
+                        }
+                        return result;
+                    });
                 }
                 return result;
             }
@@ -422,7 +442,7 @@ var applyingPluginName = "";
                     args[_key] = arguments[_key];
                 }
                 var _this_designer;
-                return (_this_designer = this.designer).registerControlConfig.apply(_this_designer, _toConsumableArray(args));
+                return (_this_designer = this.designer).registerControlConfig.apply(_this_designer, _to_consumable_array(args));
             }
         },
         {
@@ -504,9 +524,9 @@ var applyingPluginName = "";
                 };
                 this.callSelectedScopeEffect(payload);
                 if (oldParent) {
-                    this.emit("moved", _objectSpread({}, payload));
+                    this.emit("moved", _object_spread({}, payload));
                 } else {
-                    this.emit("joined", _objectSpread({}, payload));
+                    this.emit("joined", _object_spread({}, payload));
                 }
             }
         },
@@ -585,7 +605,7 @@ var applyingPluginName = "";
                 var prevKey = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : "";
                 var _this = this;
                 Object.entries(props).forEach(function(param) {
-                    var _param = _slicedToArray(param, 2), key = _param[0], value = _param[1];
+                    var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
                     var propName = "".concat(prevKey ? prevKey + "." : "").concat(key);
                     if (isObject(value)) {
                         _this.updateInstanceProps(instance, value, payload, propName);
@@ -701,7 +721,7 @@ var applyingPluginName = "";
                     arg[_key] = arguments[_key];
                 }
                 var _this_designer;
-                (_this_designer = this.designer).registerControl.apply(_this_designer, _toConsumableArray(arg));
+                (_this_designer = this.designer).registerControl.apply(_this_designer, _to_consumable_array(arg));
                 return this;
             }
         },
@@ -747,7 +767,7 @@ var applyingPluginName = "";
                 var payload = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
                 var _this = this;
                 this.store.selectedInstanceSettingItems.forEach(function(setting) {
-                    setting.callEffect(effectKey, _this, _objectSpread({
+                    setting.callEffect(effectKey, _this, _object_spread({
                         control: _this.store.selected
                     }, payload));
                 });
@@ -759,7 +779,7 @@ var applyingPluginName = "";
                 var payload = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
                 var _this = this;
                 this.store.selectedInstanceSettingItems.forEach(function(setting) {
-                    setting.callScopeEffect(_this, _objectSpread({
+                    setting.callScopeEffect(_this, _object_spread({
                         control: _this.store.selected
                     }, payload));
                 });
@@ -774,7 +794,7 @@ var applyingPluginName = "";
                     arg[_key] = arguments[_key];
                 }
                 var _Designer;
-                (_Designer = Designer).register.apply(_Designer, _toConsumableArray(arg));
+                (_Designer = Designer).register.apply(_Designer, _to_consumable_array(arg));
                 return this;
             }
         },
@@ -789,5 +809,5 @@ var applyingPluginName = "";
 }(Watcher);
 /**
    * 控件事件定义
-   * */ _defineProperty(Driven, "EventLogic", EventLogic);
+   * */ _define_property(Driven, "EventLogic", EventLogic);
 export { Driven };

package/dist/esm/Plugin.js

@@ -1,10 +1,10 @@
-function _classCallCheck(instance, Constructor) {
+function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
 }
 var Plugin = function Plugin() {
     "use strict";
-    _classCallCheck(this, Plugin);
+    _class_call_check(this, Plugin);
 };
 export { Plugin };

package/dist/esm/Store.js

@@ -1,15 +1,15 @@
-function _arrayLikeToArray(arr, len) {
+function _array_like_to_array(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
     return arr2;
 }
-function _arrayWithHoles(arr) {
+function _array_with_holes(arr) {
     if (Array.isArray(arr)) return arr;
 }
-function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+function _array_without_holes(arr) {
+    if (Array.isArray(arr)) return _array_like_to_array(arr);
 }
-function _classCallCheck(instance, Constructor) {
+function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
     }
@@ -23,12 +23,12 @@ function _defineProperties(target, props) {
         Object.defineProperty(target, descriptor.key, descriptor);
     }
 }
-function _createClass(Constructor, protoProps, staticProps) {
+function _create_class(Constructor, protoProps, staticProps) {
     if (protoProps) _defineProperties(Constructor.prototype, protoProps);
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _defineProperty(obj, key, value) {
+function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
             value: value,
@@ -41,17 +41,10 @@ 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;
-    }
-}
-function _iterableToArray(iter) {
+function _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
-function _iterableToArrayLimit(arr, i) {
+function _iterable_to_array_limit(arr, i) {
     var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
     if (_i == null) return;
     var _arr = [];
@@ -75,44 +68,43 @@ function _iterableToArrayLimit(arr, i) {
     }
     return _arr;
 }
-function _nonIterableRest() {
+function _non_iterable_rest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _nonIterableSpread() {
+function _non_iterable_spread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+function _sliced_to_array(arr, i) {
+    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
-function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+function _to_consumable_array(arr) {
+    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
-function _unsupportedIterableToArray(o, minLen) {
+function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
     var n = Object.prototype.toString.call(o).slice(8, -1);
     if (n === "Object" && o.constructor) n = o.constructor.name;
     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);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(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() {
     "use strict";
     function Store(options) {
-        _classCallCheck(this, Store);
+        _class_call_check(this, Store);
         /**
    * 页面控件实例树
-   * */ _defineProperty(this, "instance", void 0);
+   * */ _define_property(this, "instance", void 0);
         /**
    * 拍平的控件数组
-   * */ _defineProperty(this, "flatInstances", void 0);
+   * */ _define_property(this, "flatInstances", void 0);
         /**
    * 控件id组成的map
-   * */ _defineProperty(this, "instanceIdMap", void 0);
+   * */ _define_property(this, "instanceIdMap", void 0);
         /**
    * dataCode和fieldCode组成的map
    * {
@@ -123,28 +115,28 @@ export var Store = /*#__PURE__*/ function() {
    *     [fieldCode]: 控件
    *   }
    * }
-   * */ _defineProperty(this, "dataFieldCodeMap", void 0);
+   * */ _define_property(this, "dataFieldCodeMap", void 0);
         /**
    * 当前选中的控件
-   * */ _defineProperty(this, "selected", null);
+   * */ _define_property(this, "selected", null);
         /**
    * 当前选中的数据作用域控件
-   * */ _defineProperty(this, "selectedInstanceDataScopeParent", null);
-        _defineProperty(this, "selectedDataScopeFlatInstances", []);
+   * */ _define_property(this, "selectedInstanceDataScopeParent", null);
+        _define_property(this, "selectedDataScopeFlatInstances", []);
         /**
    * 当前选中控件的setting
-   * */ _defineProperty(this, "selectedInstanceSetting", []);
-        _defineProperty(this, "selectedInstanceSettingItems", []);
+   * */ _define_property(this, "selectedInstanceSetting", []);
+        _define_property(this, "selectedInstanceSettingItems", []);
         /**
    * 当前选中控件的数据模型
-   * */ _defineProperty(this, "selectedFieldItem", null);
+   * */ _define_property(this, "selectedFieldItem", null);
         /**
    * 扩展字段，比如appId，dataCode等
-   * */ _defineProperty(this, "external", {});
-        _defineProperty(this, "movingInstance", null);
-        _defineProperty(this, "movingInstanceOldParent", null);
-        _defineProperty(this, "movingInstanceOldDataScopeParent", null);
-        _defineProperty(this, "getParentBeforeInstanceMove", void 0);
+   * */ _define_property(this, "external", {});
+        _define_property(this, "movingInstance", null);
+        _define_property(this, "movingInstanceOldParent", null);
+        _define_property(this, "movingInstanceOldDataScopeParent", null);
+        _define_property(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;
@@ -152,7 +144,7 @@ export var Store = /*#__PURE__*/ function() {
         this.instance = options.instance;
         this.getFlatInstances();
     }
-    _createClass(Store, [
+    _create_class(Store, [
         {
             key: "selectedRules",
             get: /**
@@ -200,16 +192,17 @@ export var Store = /*#__PURE__*/ function() {
                 this.selectedInstanceSettingItems = [];
                 this.selectedInstanceSetting.forEach(function(group) {
                     var _this_selectedInstanceSettingItems;
-                    (_this_selectedInstanceSettingItems = _this.selectedInstanceSettingItems).push.apply(_this_selectedInstanceSettingItems, _toConsumableArray(_this.getSettingItems(group)));
+                    (_this_selectedInstanceSettingItems = _this.selectedInstanceSettingItems).push.apply(_this_selectedInstanceSettingItems, _to_consumable_array(_this.getSettingItems(group)));
                 });
             }
         },
         {
             key: "getSettingItems",
             value: function getSettingItems(group) {
-                return _instanceof(group, Group) ? group.items : group.items.reduce(function(result, curr) {
+                // 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));
+                    (_result = result).push.apply(_result, _to_consumable_array(curr.items));
                     return result;
                 }, []);
             }
@@ -242,7 +235,7 @@ export var Store = /*#__PURE__*/ function() {
                 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];
+                        var _step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], value = _step_value[1];
                         if (value.id === instance.id) {
                             map.delete(key);
                             break;
@@ -297,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) {
@@ -318,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) {