@byteluck-fe/model-driven-driven 2.7.0-alpha.1 → 2.7.0-alpha.11

package/dist/esm/EventLogic.js

@@ -1,2 +1,2 @@
-import { EventLogic } from "@byteluck-fe/model-driven-shared";
+import { EventLogic } from '@byteluck-fe/model-driven-shared';
 export default EventLogic;

package/dist/esm/Store.js

@@ -28,13 +28,6 @@ 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);
-    } else {
-        return left instanceof right;
-    }
-}
 function _iterableToArray(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -82,10 +75,9 @@ 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 { CONTROL_BASE_TYPE, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
+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";
@@ -111,94 +103,13 @@ export var Store = /*#__PURE__*/ function() {
         this.movingInstance = null;
         this.movingInstanceOldParent = null;
         this.movingInstanceOldDataScopeParent = null;
-        var _options_getParentBeforeInstanceMove;
-        this.getParentBeforeInstanceMove = (_options_getParentBeforeInstanceMove = options.getParentBeforeInstanceMove) !== null && _options_getParentBeforeInstanceMove !== void 0 ? _options_getParentBeforeInstanceMove : function(instance) {
+        var _getParentBeforeInstanceMove;
+        this.getParentBeforeInstanceMove = (_getParentBeforeInstanceMove = options.getParentBeforeInstanceMove) !== null && _getParentBeforeInstanceMove !== void 0 ? _getParentBeforeInstanceMove : function(instance) {
             return instance.parent;
         };
         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 +134,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 _selectedInstanceSettingItems;
+                    (_selectedInstanceSettingItems = _this.selectedInstanceSettingItems).push.apply(_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 _value = _slicedToArray(_step.value, 2), key = _value[0], value = _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 +256,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,13 +278,18 @@ export function loop(instances, callback) {
         if (hasHeaderControl(item)) {
             loop(item.props.headers, callback);
         }
+        if (hasFooterControl(item)) {
+            var ref;
+            var ref1;
+            loop((ref1 = (ref = item.props) === null || ref === void 0 ? void 0 : ref.footers) !== null && ref1 !== void 0 ? ref1 : [], callback);
+        }
     });
 }
 export function isDataScopeInstance(instance) {
     return [
         CONTROL_TYPE.SUBTABLE,
         CONTROL_TYPE.DATA_VIEW,
-        CONTROL_TYPE.LIST_VIEW
+        CONTROL_TYPE.LIST_VIEW, 
     ].includes(instance.type);
 }
 export function findInstanceDataScopeParent(instance) {

package/dist/esm/constants.js

@@ -1,33 +1,33 @@
-import { CONTROL_TYPE, FieldTypes } from "@byteluck-fe/model-driven-shared";
+import { CONTROL_TYPE, FieldTypes } from '@byteluck-fe/model-driven-shared';
 // 使用ObjectDataBind 的控件
 export var objectDataBindControlTypes = [
     CONTROL_TYPE.AMOUNT,
     CONTROL_TYPE.CALC,
-    CONTROL_TYPE.DATE_RANGE
+    CONTROL_TYPE.DATE_RANGE, 
 ];
 export var objectDataBindKeyToFieldType = {
     amount: {
-        caption: "金额",
+        caption: '金额',
         fieldType: FieldTypes.DECIMAL
     },
     currency: {
-        caption: "币种",
+        caption: '币种',
         fieldType: FieldTypes.VARCHAR
     },
     result: {
-        caption: "结果",
+        caption: '结果',
         fieldType: FieldTypes.DECIMAL
     },
     unit: {
-        caption: "单位",
+        caption: '单位',
         fieldType: FieldTypes.VARCHAR
     },
     min: {
-        caption: "开始时间",
+        caption: '开始时间',
         fieldType: FieldTypes.TIMESTAMP
     },
     max: {
-        caption: "结束时间",
+        caption: '结束时间',
         fieldType: FieldTypes.TIMESTAMP
     }
 };

package/dist/esm/designerUtils.js

@@ -1,9 +1,12 @@
-import { CONTROL_BASE_TYPE, CONTROL_TYPE, isArray } from "@byteluck-fe/model-driven-shared";
+import { CONTROL_BASE_TYPE, CONTROL_TYPE, isArray } from '@byteluck-fe/model-driven-shared';
 export function hasChildrenControl(instance) {
-    return "children" in instance && isArray(instance.children);
+    return 'children' in instance && isArray(instance.children);
 }
 export function hasHeaderControl(instance) {
-    return "headers" in instance.props && isArray(instance.props.headers);
+    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)) {
@@ -14,8 +17,9 @@ export function loopFormControl(control, callback) {
                 // @ts-ignore
                 loopFormControl(item.props.headers, callback);
             } else if (hasChildrenControl(item)) {
-                loopFormControl(// @ts-ignore
-                item === null || item === void 0 ? void 0 : item.children, callback);
+                var // @ts-ignore
+                ref;
+                loopFormControl((ref = (item)) === null || ref === void 0 ? void 0 : ref.children, callback);
             // @ts-ignore
             // } else if (item instanceof DesignerFormControl) {
             } else if (item.controlType === CONTROL_BASE_TYPE.FORM) {

package/dist/esm/index.js

@@ -1,7 +1,7 @@
-import Designer from "./Designer";
+import Designer from './Designer';
 export { Designer };
-export * from "./utils";
-export * from "./Builder";
-export * from "./designerUtils";
-export * from "./Driven";
-export * from "./Store";
+export * from './utils';
+export * from './Builder';
+export * from './designerUtils';
+export * from './Driven';
+export * from './Store';