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

package/dist/esm/Store.js

@@ -28,26 +28,6 @@ function _createClass(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties(Constructor, staticProps);
     return Constructor;
 }
-function _defineProperty(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        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) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
 }
@@ -95,58 +75,36 @@ 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";
     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);
-        /**
    * 当前选中的控件
-   * */ _defineProperty(this, "selected", null);
+   * */ this.selected = null;
         /**
    * 当前选中的数据作用域控件
-   * */ _defineProperty(this, "selectedInstanceDataScopeParent", null);
-        _defineProperty(this, "selectedDataScopeFlatInstances", []);
+   * */ this.selectedInstanceDataScopeParent = null;
+        this.selectedDataScopeFlatInstances = [];
         /**
    * 当前选中控件的setting
-   * */ _defineProperty(this, "selectedInstanceSetting", []);
-        _defineProperty(this, "selectedInstanceSettingItems", []);
+   * */ this.selectedInstanceSetting = [];
+        this.selectedInstanceSettingItems = [];
         /**
    * 当前选中控件的数据模型
-   * */ _defineProperty(this, "selectedFieldItem", null);
+   * */ 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);
-        var _options_getParentBeforeInstanceMove;
-        this.getParentBeforeInstanceMove = (_options_getParentBeforeInstanceMove = options.getParentBeforeInstanceMove) !== null && _options_getParentBeforeInstanceMove !== void 0 ? _options_getParentBeforeInstanceMove : function(instance) {
+   * */ this.external = {};
+        this.movingInstance = null;
+        this.movingInstanceOldParent = null;
+        this.movingInstanceOldDataScopeParent = null;
+        var _getParentBeforeInstanceMove;
+        this.getParentBeforeInstanceMove = (_getParentBeforeInstanceMove = options.getParentBeforeInstanceMove) !== null && _getParentBeforeInstanceMove !== void 0 ? _getParentBeforeInstanceMove : function(instance) {
             return instance.parent;
         };
         this.instance = options.instance;
@@ -199,15 +157,16 @@ export var Store = /*#__PURE__*/ function() {
                 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)));
+                    var _selectedInstanceSettingItems;
+                    (_selectedInstanceSettingItems = _this.selectedInstanceSettingItems).push.apply(_selectedInstanceSettingItems, _toConsumableArray(_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));
                     return result;
@@ -242,7 +201,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 _value = _slicedToArray(_step.value, 2), key = _value[0], value = _value[1];
                         if (value.id === instance.id) {
                             map.delete(key);
                             break;
@@ -297,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) {
@@ -318,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';

package/dist/esm/utils.js

@@ -85,105 +85,11 @@ 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);
 }
-var __generator = this && this.__generator || function(thisArg, body) {
-    var f, y, t, g, _ = {
-        label: 0,
-        sent: function() {
-            if (t[0] & 1) throw t[1];
-            return t[1];
-        },
-        trys: [],
-        ops: []
-    };
-    return g = {
-        next: verb(0),
-        "throw": verb(1),
-        "return": verb(2)
-    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
-        return this;
-    }), g;
-    function verb(n) {
-        return function(v) {
-            return step([
-                n,
-                v
-            ]);
-        };
-    }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while(_)try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [
-                op[0] & 2,
-                t.value
-            ];
-            switch(op[0]){
-                case 0:
-                case 1:
-                    t = op;
-                    break;
-                case 4:
-                    _.label++;
-                    return {
-                        value: op[1],
-                        done: false
-                    };
-                case 5:
-                    _.label++;
-                    y = op[1];
-                    op = [
-                        0
-                    ];
-                    continue;
-                case 7:
-                    op = _.ops.pop();
-                    _.trys.pop();
-                    continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
-                        _ = 0;
-                        continue;
-                    }
-                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
-                        _.label = op[1];
-                        break;
-                    }
-                    if (op[0] === 6 && _.label < t[1]) {
-                        _.label = t[1];
-                        t = op;
-                        break;
-                    }
-                    if (t && _.label < t[2]) {
-                        _.label = t[2];
-                        _.ops.push(op);
-                        break;
-                    }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop();
-                    continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) {
-            op = [
-                6,
-                e
-            ];
-            y = 0;
-        } finally{
-            f = t = 0;
-        }
-        if (op[0] & 5) throw op[1];
-        return {
-            value: op[0] ? op[1] : void 0,
-            done: true
-        };
-    }
-};
-import { loopFormControl } from "./designerUtils";
-import { CONTROL_BASE_TYPE, CONTROL_TYPE, FieldTypeToColumnType, isArray } from "@byteluck-fe/model-driven-shared";
-import Designer from "./Designer";
-import { objectDataBindControlTypes, objectDataBindKeyToFieldType } from "./constants";
+import regeneratorRuntime from "regenerator-runtime";
+import { loopFormControl } from './designerUtils';
+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
@@ -199,7 +105,7 @@ export function getMasterFormControls(controls) {
  * @description 给modelBindInfoList中填充fieldCode和dataCode
  * @description 我们生成fieldCode的规则是：DataBind的控件，取`field_${id}`，ObjectDataBind的控件，取`field_${id}_${key}`, key指的是ObjectDataBind.keys()
  * */ export function fillModelBindInfoListFieldCode(modelBindInfoList) {
-    var dataCode = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
+    var dataCode = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : '';
     if (!modelBindInfoList || !Array.isArray(modelBindInfoList)) return [];
     return modelBindInfoList.map(function(item) {
         if (!item.dataBind) return item;
@@ -210,7 +116,7 @@ export function getMasterFormControls(controls) {
             Object.keys(objectDataBind).forEach(function(key) {
                 var dataBind = objectDataBind[key];
                 // 如果是ObjectDataBind的话，需要将id拼接当前的key作为元素的fieldCode
-                var fieldCode = item.controlId + "_" + key;
+                var fieldCode = item.controlId + '_' + key;
                 dataBind.fieldCode = fieldCodeBeforeAddPrefix(fieldCode);
                 dataBind.dataCode = dataCode;
             });
@@ -222,7 +128,7 @@ export function getMasterFormControls(controls) {
     });
 }
 function fieldCodeBeforeAddPrefix(fieldCode) {
-    var prefix = "field_";
+    var prefix = 'field_';
     if (fieldCode.startsWith(prefix)) {
         return fieldCode;
     }
@@ -252,7 +158,7 @@ function fieldCodeBeforeAddPrefix(fieldCode) {
                 // 当前key对应的fieldType
                 var fieldType = objectDataBindKeyToFieldType[key].fieldType;
                 // 拼接当前列的caption
-                var caption = item.caption + "_" + objectDataBindKeyToFieldType[key].caption;
+                var caption = item.caption + '_' + objectDataBindKeyToFieldType[key].caption;
                 // 通过fieldType获取列类型
                 var controlType = getColumnTypeFromFiledType(fieldType);
                 if (!controlType) return;
@@ -260,8 +166,8 @@ function fieldCodeBeforeAddPrefix(fieldCode) {
                     caption: caption,
                     dataBind: dataBind
                 };
-                if (key === "currency") {
-                    props.optionConfig = "datasource";
+                if (key === 'currency') {
+                    props.optionConfig = 'datasource';
                     props.datasourceBind = datasourceBind;
                 }
                 // @ts-ignore
@@ -271,17 +177,17 @@ function fieldCodeBeforeAddPrefix(fieldCode) {
                 column && columns.push(column);
             });
         } else {
-            var controlType = getColumnTypeFromFiledType(item.fieldType);
-            if (!controlType) return;
+            var controlType1 = getColumnTypeFromFiledType(item.fieldType);
+            if (!controlType1) return;
             // @ts-ignore
-            var column = designer.createControlInstance(controlType, {
+            var column1 = designer.createControlInstance(controlType1, {
                 props: {
                     caption: item.caption,
                     dataBind: item.dataBind,
                     datasourceBind: item.datasourceBind
                 }
             });
-            column && columns.push(column);
+            column1 && columns.push(column1);
         }
     });
     return columns;
@@ -320,42 +226,35 @@ function checkSchema(controls, messages, ignore) {
     return _checkSchema.apply(this, arguments);
 }
 function _checkSchema() {
-    _checkSchema = _asyncToGenerator(function(controls, messages, ignore) {
+    _checkSchema = _asyncToGenerator(regeneratorRuntime.mark(function _callee(controls, messages, ignore) {
         var result;
-        return __generator(this, function(_state) {
-            switch(_state.label){
+        return regeneratorRuntime.wrap(function _callee$(_ctx) {
+            while(1)switch(_ctx.prev = _ctx.next){
                 case 0:
-                    if (!Array.isArray(controls)) return [
-                        3,
-                        2
-                    ];
-                    return [
-                        4,
-                        Promise.all(controls.map(function(control) {
-                            return control.validate(messages, ignore);
-                        }))
-                    ];
-                case 1:
-                    result = _state.sent();
-                    return [
-                        2,
-                        result.every(function(state) {
-                            return state;
-                        })
-                    ];
-                case 2:
-                    return [
-                        4,
-                        controls.validate(messages, ignore)
-                    ];
+                    if (!Array.isArray(controls)) {
+                        _ctx.next = 5;
+                        break;
+                    }
+                    _ctx.next = 3;
+                    return Promise.all(controls.map(function(control) {
+                        return control.validate(messages, ignore);
+                    }));
                 case 3:
-                    return [
-                        2,
-                        _state.sent()
-                    ];
+                    result = _ctx.sent;
+                    return _ctx.abrupt("return", result.every(function(state) {
+                        return state;
+                    }));
+                case 5:
+                    _ctx.next = 7;
+                    return controls.validate(messages, ignore);
+                case 7:
+                    return _ctx.abrupt("return", _ctx.sent);
+                case 8:
+                case "end":
+                    return _ctx.stop();
             }
-        });
-    });
+        }, _callee);
+    }));
     return _checkSchema.apply(this, arguments);
 }
 // 不可以被权限控制的控件
@@ -387,46 +286,46 @@ var cannotEditControlTypes = [
 // 列表操作列单独处理三个按钮的权限
 var LIST_OPERATION_BUTTON_PERMISSIONS_MAPS = {
     check: {
-        id: "listPageCheckBtnId",
-        caption: "查看"
+        id: 'listPageCheckBtnId',
+        caption: '查看'
     },
     edit: {
-        id: "listPageEditBtnId",
-        caption: "编辑"
+        id: 'listPageEditBtnId',
+        caption: '编辑'
     },
     delete: {
-        id: "listPageDeleteBtnId",
-        caption: "删除"
+        id: 'listPageDeleteBtnId',
+        caption: '删除'
     }
 };
 // 生成权限字段
 function generatePermissions(controls, parent) {
-    var result = [];
+    var result1 = [];
     if (isArray(controls)) {
         var _result;
-        (_result = result).push.apply(_result, _toConsumableArray(controls.map(function(item) {
+        (_result = result1).push.apply(_result, _toConsumableArray(controls.map(function(item) {
             return generatePermissions(item, parent);
         }).flat()));
     } else {
         var type = controls.type;
-        var _controls_props = controls.props, caption = _controls_props.caption, content = _controls_props.content;
+        var _props = controls.props, caption1 = _props.caption, content = _props.content;
         var permissionItem;
         if (!PermissionExcludeControlTypes.includes(type)) {
-            var _parent_controlId;
+            var ref;
             permissionItem = {
                 controlId: controls.id,
-                caption: caption || content || controls.name,
+                caption: caption1 || content || controls.name,
                 type: controls.type,
                 controlType: controls.controlType,
-                parentId: (_parent_controlId = parent === null || parent === void 0 ? void 0 : parent.controlId) !== null && _parent_controlId !== void 0 ? _parent_controlId : null,
+                parentId: (ref = parent === null || parent === void 0 ? void 0 : parent.controlId) !== null && ref !== void 0 ? ref : null,
                 canEdit: !cannotEditControlTypes.includes(type),
                 canRead: true,
                 canHide: true,
-                group: "element"
+                group: 'element'
             };
             if (parent && parent.type === CONTROL_TYPE.SUBTABLE) {
                 // 如果有parent，则利用下划线拼接caption
-                permissionItem.caption = parent.caption + "_" + permissionItem.caption;
+                permissionItem.caption = parent.caption + '_' + permissionItem.caption;
             }
             if (type === CONTROL_TYPE.VUE_FORM_ITEM) {
                 permissionItem.caption = controls.props.controlExportName || controls.name;
@@ -437,59 +336,59 @@ function generatePermissions(controls, parent) {
             // ) {
             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";
+                ref1, ref2, //@ts-ignore
+                ref3, ref4;
+                if (((ref1 = controls.props) === null || ref1 === void 0 ? void 0 : (ref2 = ref1.dataBind) === null || ref2 === void 0 ? void 0 : ref2.fieldCode) !== undefined && ((ref3 = controls.props) === null || ref3 === void 0 ? void 0 : (ref4 = ref3.dataBind) === null || ref4 === void 0 ? void 0 : ref4.fieldCode) !== '') {
+                    permissionItem.group = 'field';
                 }
             }
-            result.push(permissionItem);
+            result1.push(permissionItem);
             //追加vue容器权限
             if (type === CONTROL_TYPE.VUE_FORM_ITEM) {
-                var _controls_props3, _controls_props_dataBind2, _controls_props4, _controls_props_dataBind3;
-                var vueFormItemGroup = "element";
-                if (((_controls_props3 = controls.props) === null || _controls_props3 === void 0 ? void 0 : (_controls_props_dataBind2 = _controls_props3.dataBind) === null || _controls_props_dataBind2 === void 0 ? void 0 : _controls_props_dataBind2.fieldCode) !== undefined && ((_controls_props4 = controls.props) === null || _controls_props4 === void 0 ? void 0 : (_controls_props_dataBind3 = _controls_props4.dataBind) === null || _controls_props_dataBind3 === void 0 ? void 0 : _controls_props_dataBind3.fieldCode) !== "") {
-                    vueFormItemGroup = "field";
+                var ref5, ref6, ref7, ref8;
+                var vueFormItemGroup = 'element';
+                if (((ref5 = controls.props) === null || ref5 === void 0 ? void 0 : (ref6 = ref5.dataBind) === null || ref6 === void 0 ? void 0 : ref6.fieldCode) !== undefined && ((ref7 = controls.props) === null || ref7 === void 0 ? void 0 : (ref8 = ref7.dataBind) === null || ref8 === void 0 ? void 0 : ref8.fieldCode) !== '') {
+                    vueFormItemGroup = 'field';
                 }
-                var permissions = controls.props["permissions"];
+                var permissions = controls.props['permissions'];
                 permissions === null || permissions === void 0 ? void 0 : permissions.map(function(item) {
-                    var _controls_id;
+                    var _id;
                     permissionItem = {
                         controlId: item.key,
                         caption: item.caption,
                         type: controls.type,
                         controlType: controls.controlType,
-                        parentId: (_controls_id = controls.id) !== null && _controls_id !== void 0 ? _controls_id : null,
+                        parentId: (_id = controls.id) !== null && _id !== void 0 ? _id : null,
                         canEdit: true,
                         canRead: true,
                         canHide: true,
                         group: vueFormItemGroup
                     };
-                    result.push(permissionItem);
+                    result1.push(permissionItem);
                 });
             }
         } else if (type === CONTROL_TYPE.OPERATION_COLUMN) {
             // 列表的操作列单独处理
             Object.entries(LIST_OPERATION_BUTTON_PERMISSIONS_MAPS).reduce(function(result, param) {
-                var _param = _slicedToArray(param, 2), key = _param[0], _param_ = _param[1], caption = _param_.caption, controlId = _param_.id;
+                var _param = _slicedToArray(param, 2), key = _param[0], ref = _param[1], caption = ref.caption, controlId = ref.id;
                 var operationItem = controls.props[key];
                 if (operationItem && operationItem.isShow) {
-                    var _parent_controlId;
+                    var ref9;
                     // 只能控制是否显示
                     result.push({
                         controlId: controlId,
                         caption: caption,
                         type: controls.type,
                         controlType: controls.controlType,
-                        parentId: (_parent_controlId = parent === null || parent === void 0 ? void 0 : parent.controlId) !== null && _parent_controlId !== void 0 ? _parent_controlId : null,
+                        parentId: (ref9 = parent === null || parent === void 0 ? void 0 : parent.controlId) !== null && ref9 !== void 0 ? ref9 : null,
                         canEdit: false,
                         canRead: false,
                         canHide: true,
-                        group: "element"
+                        group: 'element'
                     });
                 }
                 return result;
-            }, result);
+            }, result1);
         }
         // else if (type === CONTROL_TYPE.CUSTOM_COLUMN) {
         //   //追加自定义列上的vue容器权限
@@ -513,7 +412,7 @@ function generatePermissions(controls, parent) {
         // }
         if (controls.children) {
             var _result1;
-            (_result1 = result).push.apply(_result1, _toConsumableArray(controls.children.map(function(item) {
+            (_result1 = result1).push.apply(_result1, _toConsumableArray(controls.children.map(function(item) {
                 return generatePermissions(item, parent);
             }).flat()));
         }
@@ -521,11 +420,11 @@ function generatePermissions(controls, parent) {
         if (controls.controlType === CONTROL_BASE_TYPE.LIST) {
             var // 明细子表和列表的需要给parentId
             _result2;
-            (_result2 = result).push.apply(_result2, _toConsumableArray(controls.props.headers.map(function(item) {
+            (_result2 = result1).push.apply(_result2, _toConsumableArray(controls.props.headers.map(function(item) {
                 return generatePermissions(item, permissionItem);
             }).flat()));
         }
     }
-    return result;
+    return result1;
 }
 export { toSchema, getModelBindInfoList, checkSchema, generatePermissions };