@byteluck-fe/model-driven-driven 2.23.0-beta.7 → 2.23.0

package/README.md

@@ -1,13 +1,13 @@
-# Driven
-设计态引擎
-
-    Builder.ts // 兼容旧版Designer，提供页面初始化
-    constants.ts // 常量
-    Designer.ts // 旧版designer的实现
-    designerUtils.ts // 工具函数
-    Driven.ts // 引擎
-    EventLogic.ts // 事件管理
-    index.ts
-    Plugin.ts // 插件
-    Store.ts // 仓库
-    utils.ts // 工具
+# Driven
+设计态引擎
+
+    Builder.ts // 兼容旧版Designer，提供页面初始化
+    constants.ts // 常量
+    Designer.ts // 旧版designer的实现
+    designerUtils.ts // 工具函数
+    Driven.ts // 引擎
+    EventLogic.ts // 事件管理
+    index.ts
+    Plugin.ts // 插件
+    Store.ts // 仓库
+    utils.ts // 工具

package/dist/esm/Builder.js

@@ -30,8 +30,9 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
+import { getLocaleText } from '@byteluck-fe/locale-message';
 import Designer from './Designer';
-import { CONTROL_TYPE, RulesMessage } from '@byteluck-fe/model-driven-shared';
+import { CONTROL_TYPE } from '@byteluck-fe/model-driven-shared';
 export var Builder = /*#__PURE__*/ function() {
     "use strict";
     function Builder() {
@@ -105,7 +106,7 @@ export var Builder = /*#__PURE__*/ function() {
                     rules: [
                         {
                             id: 'default',
-                            name: RulesMessage.getMessage('approvedDocuments'),
+                            name: getLocaleText('CMD.approvedDocuments', null, '审批通过单据'),
                             color: 'theme',
                             filters: [
                                 {
@@ -114,7 +115,7 @@ export var Builder = /*#__PURE__*/ function() {
                                     leftVariableBo: {
                                         type: 'varchar',
                                         value: 'process_status',
-                                        name: RulesMessage.getMessage('processStatus')
+                                        name: getLocaleText('CMD.processStatus', null, '流程状态')
                                     },
                                     checked: false,
                                     describe: 'ruleLine',

package/dist/esm/Driven.js

@@ -186,34 +186,33 @@ import { Designer } from './Designer';
 import EventLogic from './EventLogic';
 import { checkSchema, generatePermissions, getModelBindInfoList, toSchema } from './utils';
 import { Group, initSettings, Tab } from '@byteluck-fe/model-driven-settings';
-import { RulesMessage, DEFAULT_LOCALE } from '@byteluck-fe/model-driven-shared';
+import { DEFAULT_LOCALE } from '@byteluck-fe/model-driven-shared';
 // 当前正在注册的插件名称
 var applyingPluginName = '';
-/**
- * 设计器驱动
+/**
+ * 设计器驱动
  * */ var Driven = /*#__PURE__*/ function(Watcher) {
     "use strict";
     _inherits(Driven, Watcher);
     function Driven(options) {
         _class_call_check(this, Driven);
         var _this;
-        _this = _call_super(this, Driven), _define_property(_this, "mode", void 0), _define_property(_this, "isMounted", false), _define_property(_this, "id", genNonDuplicateId(8)), /**
-   * 控件可选的事件
-   * */ _define_property(_this, "eventLogic", void 0), /**
-   * 处理数据存储，存放模型等
-   * */ _define_property(_this, "store", void 0), /**
-   * 额外参数存储
-   */ _define_property(_this, "externalParams", void 0), /**
-   * 处理instance，和schema存储
-   * */ _define_property(_this, "designer", void 0), /**
-   * 插件数组
+        _this = _call_super(this, Driven), _define_property(_this, "mode", void 0), _define_property(_this, "isMounted", false), _define_property(_this, "id", genNonDuplicateId(8)), /**
+   * 控件可选的事件
+   * */ _define_property(_this, "eventLogic", void 0), /**
+   * 处理数据存储，存放模型等
+   * */ _define_property(_this, "store", void 0), /**
+   * 额外参数存储
+   */ _define_property(_this, "externalParams", void 0), /**
+   * 处理instance，和schema存储
+   * */ _define_property(_this, "designer", void 0), /**
+   * 插件数组
    * */ _define_property(_this, "__plugins", void 0), _define_property(_this, "__pluginsApplied", false), _define_property(_this, "$options", void 0), // TODO 拿到schema
         _define_property(_this, "getSchema", toSchema), // TODO 拿到model_bind_info_list
         _define_property(_this, "getModelBindInfoList", getModelBindInfoList), // TODO 拿到permission_controls
         _define_property(_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, messagesI18n = _this_$options.messagesI18n, _this_$options_language = _this_$options.language, language = _this_$options_language === void 0 ? DEFAULT_LOCALE : _this_$options_language;
-        RulesMessage.setLocale(language, messagesI18n);
         _this.eventLogic = new EventLogic();
         _this.designer = new DesignerClass();
         _this.store = new Store(_object_spread({
@@ -475,10 +474,10 @@ var applyingPluginName = '';
                 if (instance === null) return;
                 var _instance = this.getInstance(instance);
                 if (!_instance) return;
-                /*
-        移动之后，拿到控件新的位置，并触发事件, 如果是新增的控件的话，就没有原始位置和父级，
-        事件是否区分move和add
-        move是从主表移动到子表或子表移动到主表才触发，还是所有移动都触发
+                /*
+        移动之后，拿到控件新的位置，并触发事件, 如果是新增的控件的话，就没有原始位置和父级，
+        事件是否区分move和add
+        move是从主表移动到子表或子表移动到主表才触发，还是所有移动都触发
       */ var oldDataScopeParent = this.store.movingInstanceOldDataScopeParent;
                 var newDataScopeParent = findInstanceDataScopeParent(_instance);
                 var oldParent = this.store.movingInstanceOldParent;
@@ -603,8 +602,8 @@ var applyingPluginName = '';
         },
         {
             key: "removeInstance",
-            value: /**
-   * 删除控件
+            value: /**
+   * 删除控件
    * */ function removeInstance(instance) {
                 // 删除实例，并触发事件 removed
                 var parent = instance.parent;
@@ -643,8 +642,8 @@ var applyingPluginName = '';
         },
         {
             key: "updateInstanceType",
-            value: /**
-   * 修改控件类型
+            value: /**
+   * 修改控件类型
    * */ function updateInstanceType(instance, type) {
                 var schema = instance.toSchema();
                 var newInstance = this.createInstance(type, {
@@ -702,16 +701,16 @@ var applyingPluginName = '';
         },
         {
             key: "assertInstance",
-            value: /**
-   * 判断控件的类型，返回当前控件的正确类型
+            value: /**
+   * 判断控件的类型，返回当前控件的正确类型
    * */ function assertInstance(instance, types) {
                 return isString(types) ? instance.type === types : types.includes(instance.type);
             }
         },
         {
             key: "getInstanceInListControl",
-            value: /**
-   * 控件在列表控件内，如明细子表或列表控件
+            value: /**
+   * 控件在列表控件内，如明细子表或列表控件
    * */ function getInstanceInListControl(instance) {
                 var _instance = instance;
                 while(_instance){
@@ -782,7 +781,7 @@ var applyingPluginName = '';
     ]);
     return Driven;
 }(Watcher);
-/**
-   * 控件事件定义
+/**
+   * 控件事件定义
    * */ _define_property(Driven, "EventLogic", EventLogic);
 export { Driven };

package/dist/esm/Store.js

@@ -96,42 +96,42 @@ 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) {
@@ -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,5 @@
-import { CONTROL_TYPE, FieldTypes, RulesMessage } from '@byteluck-fe/model-driven-shared';
+import { getLocaleText } from '@byteluck-fe/locale-message';
+import { CONTROL_TYPE, FieldTypes } from '@byteluck-fe/model-driven-shared';
 // 使用ObjectDataBind 的控件
 export var objectDataBindControlTypes = [
     CONTROL_TYPE.AMOUNT,
@@ -7,27 +8,27 @@ export var objectDataBindControlTypes = [
 ];
 export var objectDataBindKeyToFieldType = {
     amount: {
-        caption: RulesMessage.getMessage('amount'),
+        caption: getLocaleText('CMD.amount', null, '金额'),
         fieldType: FieldTypes.DECIMAL
     },
     currency: {
-        caption: RulesMessage.getMessage('currency'),
+        caption: getLocaleText('CMD.currency', null, '币种'),
         fieldType: FieldTypes.VARCHAR
     },
     result: {
-        caption: RulesMessage.getMessage('result'),
+        caption: getLocaleText('CMD.result', null, '结果'),
         fieldType: FieldTypes.DECIMAL
     },
     unit: {
-        caption: RulesMessage.getMessage('unit'),
+        caption: getLocaleText('CMD.unit', null, '单位'),
         fieldType: FieldTypes.VARCHAR
     },
     min: {
-        caption: RulesMessage.getMessage('startTime'),
+        caption: getLocaleText('CMD.startTime', null, '开始时间'),
         fieldType: FieldTypes.TIMESTAMP
     },
     max: {
-        caption: RulesMessage.getMessage('endTime'),
+        caption: getLocaleText('CMD.endTime', null, '结束时间'),
         fieldType: FieldTypes.TIMESTAMP
     }
 };

package/dist/esm/utils.js

@@ -183,8 +183,9 @@ function _ts_generator(thisArg, body) {
 import { loopFormControl } from './designerUtils';
 import { CONTROL_BASE_TYPE, CONTROL_TYPE, // FieldTypes,
 // FieldTypeToColumnType,
-isArray, RulesMessage } from '@byteluck-fe/model-driven-shared';
+isArray } from '@byteluck-fe/model-driven-shared';
 import { objectDataBindControlTypes } from './constants';
+import { getLocaleText } from '@byteluck-fe/locale-message';
 export function getMasterFormControls(controls) {
     var formctls = [];
     // @ts-ignore
@@ -196,9 +197,9 @@ 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] : '';
     if (!modelBindInfoList || !Array.isArray(modelBindInfoList)) return [];
@@ -323,15 +324,15 @@ var cannotEditControlTypes = [
 var LIST_OPERATION_BUTTON_PERMISSIONS_MAPS = {
     check: {
         id: 'listPageCheckBtnId',
-        caption: RulesMessage.getMessage('view')
+        caption: getLocaleText('CMD.view', null, '查看')
     },
     edit: {
         id: 'listPageEditBtnId',
-        caption: RulesMessage.getMessage('edit')
+        caption: getLocaleText('CMD.edit', null, '编辑')
     },
     delete: {
         id: 'listPageDeleteBtnId',
-        caption: RulesMessage.getMessage('delete')
+        caption: getLocaleText('CMD.delete', null, '删除')
     }
 };
 // 生成权限字段