@byteluck-fe/model-driven-driven 2.8.1-beta1 → 2.8.2-beta.10

package/dist/esm/Store.js

@@ -88,50 +88,50 @@ function _unsupported_iterable_to_array(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 _array_like_to_array(o, minLen);
 }
-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";
+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) {
         _class_call_check(this, Store);
-        /**
-   * 页面控件实例树
+        /**
+   * 页面控件实例树
    * */ _define_property(this, "instance", void 0);
-        /**
-   * 拍平的控件数组
+        /**
+   * 拍平的控件数组
    * */ _define_property(this, "flatInstances", void 0);
-        /**
-   * 控件id组成的map
+        /**
+   * 控件id组成的map
    * */ _define_property(this, "instanceIdMap", void 0);
-        /**
-   * dataCode和fieldCode组成的map
-   * {
-   *   [主表dataCode]: {
-   *     [fieldCode]: 控件
-   *   },
-   *   [子表dataCode]: {
-   *     [fieldCode]: 控件
-   *   }
-   * }
+        /**
+   * dataCode和fieldCode组成的map
+   * {
+   *   [主表dataCode]: {
+   *     [fieldCode]: 控件
+   *   },
+   *   [子表dataCode]: {
+   *     [fieldCode]: 控件
+   *   }
+   * }
    * */ _define_property(this, "dataFieldCodeMap", void 0);
-        /**
-   * 当前选中的控件
+        /**
+   * 当前选中的控件
    * */ _define_property(this, "selected", null);
-        /**
-   * 当前选中的数据作用域控件
+        /**
+   * 当前选中的数据作用域控件
    * */ _define_property(this, "selectedInstanceDataScopeParent", null);
         _define_property(this, "selectedDataScopeFlatInstances", []);
-        /**
-   * 当前选中控件的setting
+        /**
+   * 当前选中控件的setting
    * */ _define_property(this, "selectedInstanceSetting", []);
         _define_property(this, "selectedInstanceSettingItems", []);
-        /**
-   * 当前选中控件的数据模型
+        /**
+   * 当前选中控件的数据模型
    * */ _define_property(this, "selectedFieldItem", null);
-        /**
-   * 扩展字段，比如appId，dataCode等
+        /**
+   * 扩展字段，比如appId，dataCode等
    * */ _define_property(this, "external", {});
         _define_property(this, "movingInstance", null);
         _define_property(this, "movingInstanceOldParent", null);
@@ -147,8 +147,8 @@ export var Store = /*#__PURE__*/ function() {
     _create_class(Store, [
         {
             key: "selectedRules",
-            get: /**
-   * 当前选中控件的rules
+            get: /**
+   * 当前选中控件的rules
    * */ function get() {
                 if (!this.selected) {
                     return null;
@@ -158,8 +158,8 @@ export var Store = /*#__PURE__*/ function() {
         },
         {
             key: "selectedAntdRules",
-            get: /**
-   * 当前选中控件的antd rules
+            get: /**
+   * 当前选中控件的antd rules
    * */ function get() {
                 var rules = this.selectedRules;
                 if (!rules) {
@@ -200,7 +200,7 @@ export var Store = /*#__PURE__*/ function() {
             key: "getSettingItems",
             value: function getSettingItems(group) {
                 // return group instanceof Group
-                return group.type === "group" ? group.items : group.items.reduce(function(result, curr) {
+                return group.type === 'group' ? group.items : group.items.reduce(function(result, curr) {
                     var _result;
                     (_result = result).push.apply(_result, _to_consumable_array(curr.items));
                     return result;
@@ -294,9 +294,11 @@ function setInstanceInDataFieldCodeMap(instance, dataFieldCodeMap) {
         if (isDataBind(dataBind)) {
             setDataFieldCodeMap(dataFieldCodeMap, dataBind, instance);
         } else {
-            Object.values(dataBind).forEach(function(subDataBind) {
-                setDataFieldCodeMap(dataFieldCodeMap, subDataBind, instance);
-            });
+            if (dataBind) {
+                Object.values(dataBind).forEach(function(subDataBind) {
+                    setDataFieldCodeMap(dataFieldCodeMap, subDataBind, instance);
+                });
+            }
         }
     }
 }

package/dist/esm/constants.js

@@ -1,4 +1,4 @@
-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,
@@ -7,27 +7,27 @@ export var objectDataBindControlTypes = [
 ];
 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,12 +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);
+    return 'footers' in instance.props && isArray(instance.props.footers);
 }
 export function loopFormControl(control, callback) {
     if (Array.isArray(control)) {

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

@@ -180,10 +180,10 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-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 { 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
@@ -195,11 +195,11 @@ export function getMasterFormControls(controls) {
     });
     return formctls;
 }
-/**
- * @description 给modelBindInfoList中填充fieldCode和dataCode
- * @description 我们生成fieldCode的规则是：DataBind的控件，取`field_${id}`，ObjectDataBind的控件，取`field_${id}_${key}`, key指的是ObjectDataBind.keys()
+/**
+ * @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,11 +210,12 @@ 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;
             });
         } else {
+            ;
             item.dataBind.fieldCode = fieldCodeBeforeAddPrefix(item.controlId);
             item.dataBind.dataCode = dataCode;
         }
@@ -222,19 +223,19 @@ export function getMasterFormControls(controls) {
     });
 }
 function fieldCodeBeforeAddPrefix(fieldCode) {
-    var prefix = "field_";
+    var prefix = 'field_';
     if (fieldCode.startsWith(prefix)) {
         return fieldCode;
     }
     return prefix + fieldCode;
 }
-/**
- * @description 通过fieldType获取列表表头的type
+/**
+ * @description 通过fieldType获取列表表头的type
  * */ export function getColumnTypeFromFiledType(fieldType) {
     return FieldTypeToColumnType[fieldType];
 }
-/**
- * @description 通过modelBindInfoList生成多个columns
+/**
+ * @description 通过modelBindInfoList生成多个columns
  * */ export function getColumnsFromModelBindInfoList(modelBindInfoList) {
     var designer = new Designer();
     var columns = [];
@@ -252,7 +253,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 +261,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
@@ -389,16 +390,16 @@ 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: '删除'
     }
 };
 // 生成权限字段
@@ -424,11 +425,11 @@ function generatePermissions(controls, parent) {
                 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;
@@ -441,19 +442,19 @@ function generatePermissions(controls, parent) {
                 var //@ts-ignore
                 _controls_props_dataBind, _controls_props1, //@ts-ignore
                 _controls_props_dataBind1, _controls_props2;
-                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";
+                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';
                 }
             }
             result.push(permissionItem);
             //追加vue容器权限
             if (type === CONTROL_TYPE.VUE_FORM_ITEM) {
                 var _controls_props_dataBind2, _controls_props3, _controls_props_dataBind3, _controls_props4;
-                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 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 permissions = controls.props["permissions"];
+                var permissions = controls.props['permissions'];
                 permissions === null || permissions === void 0 ? void 0 : permissions.map(function(item) {
                     var _controls_id;
                     permissionItem = {
@@ -487,7 +488,7 @@ function generatePermissions(controls, parent) {
                         canEdit: false,
                         canRead: false,
                         canHide: true,
-                        group: "element"
+                        group: 'element'
                     });
                 }
                 return result;