@byteluck-fe/model-driven-driven 2.23.0-beta.2 → 2.23.0-beta.21

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/Designer.js

@@ -41,6 +41,10 @@ function _async_to_generator(fn) {
         });
     };
 }
+function _call_super(_this, derived, args) {
+    derived = _get_prototype_of(derived);
+    return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
+}
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -134,28 +138,12 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 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;
     try {
-        Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
-function _create_super(Derived) {
-    var hasNativeReflectConstruct = _is_native_reflect_construct();
-    return function _createSuperInternal() {
-        var Super = _get_prototype_of(Derived), result;
-        if (hasNativeReflectConstruct) {
-            var NewTarget = _get_prototype_of(this).constructor;
-            result = Reflect.construct(Super, arguments, NewTarget);
-        } else {
-            result = Super.apply(this, arguments);
-        }
-        return _possible_constructor_return(this, result);
-    };
+        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
+    } catch (_) {}
+    return (_is_native_reflect_construct = function() {
+        return !!result;
+    })();
 }
 function _ts_generator(thisArg, body) {
     var f, y, t, g, _ = {
@@ -259,16 +247,12 @@ import { toSchema, getModelBindInfoList, checkSchema } from './utils';
 var Designer = /*#__PURE__*/ function _target(RegisterControls) {
     "use strict";
     _inherits(Designer, RegisterControls);
-    var _super = _create_super(Designer);
     function Designer() {
         _class_call_check(this, Designer);
         var _this;
-        _this = _super.call(this, 'Designer');
-        _define_property(_assert_this_initialized(_this), "toolbox", []);
-        _define_property(_assert_this_initialized(_this), "services", {});
-        _define_property(_assert_this_initialized(_this), "eventLogic", new EventLogic());
-        _define_property(_assert_this_initialized(_this), "fieldTypes", FieldTypes);
-        _define_property(_assert_this_initialized(_this), "controlSettingMap", new Map());
+        _this = _call_super(this, Designer, [
+            'Designer'
+        ]), _define_property(_this, "toolbox", []), _define_property(_this, "services", {}), _define_property(_this, "eventLogic", new EventLogic()), _define_property(_this, "fieldTypes", FieldTypes), _define_property(_this, "controlSettingMap", new Map());
         (_instanceof(this, Designer) ? this.constructor : void 0).staticControls.forEach(function(control) {
             var _$Designer = control.Designer, Setting = control.Setting;
             _this.controlSettingMap.set(_$Designer.controlType, Setting);
@@ -279,6 +263,7 @@ var Designer = /*#__PURE__*/ function _target(RegisterControls) {
         {
             key: "registerControl",
             value: function registerControl(control) {
+                ;
                 this.constructor.register(control, 'Designer');
                 var DesignerClass = control.Designer, Setting = control.Setting;
                 this.register(DesignerClass);

package/dist/esm/Driven.js

@@ -15,6 +15,10 @@ function _assert_this_initialized(self) {
     }
     return self;
 }
+function _call_super(_this, derived, args) {
+    derived = _get_prototype_of(derived);
+    return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
+}
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -169,28 +173,12 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 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;
     try {
-        Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
-function _create_super(Derived) {
-    var hasNativeReflectConstruct = _is_native_reflect_construct();
-    return function _createSuperInternal() {
-        var Super = _get_prototype_of(Derived), result;
-        if (hasNativeReflectConstruct) {
-            var NewTarget = _get_prototype_of(this).constructor;
-            result = Reflect.construct(Super, arguments, NewTarget);
-        } else {
-            result = Super.apply(this, arguments);
-        }
-        return _possible_constructor_return(this, result);
-    };
+        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
+    } catch (_) {}
+    return (_is_native_reflect_construct = function() {
+        return !!result;
+    })();
 }
 import { CONTROL_BASE_TYPE, error, genNonDuplicateId, isArray, isBuiltInControls, isObject, isString, updateValueFromKeys, warn, Watcher } from '@byteluck-fe/model-driven-shared';
 import { findInstanceDataScopeParent, Store } from './Store';
@@ -198,7 +186,7 @@ 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 = '';
 /**
@@ -206,40 +194,25 @@ var applyingPluginName = '';
  * */ var Driven = /*#__PURE__*/ function(Watcher) {
     "use strict";
     _inherits(Driven, Watcher);
-    var _super = _create_super(Driven);
     function Driven(options) {
         _class_call_check(this, Driven);
         var _this;
-        _this = _super.call(this);
-        _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));
-        /**
+        _this = _call_super(this, Driven), _define_property(_this, "mode", void 0), _define_property(_this, "isMounted", false), _define_property(_this, "id", genNonDuplicateId(8)), /**
    * 控件可选的事件
-   * */ _define_property(_assert_this_initialized(_this), "eventLogic", void 0);
-        /**
+   * */ _define_property(_this, "eventLogic", void 0), /**
    * 处理数据存储，存放模型等
-   * */ _define_property(_assert_this_initialized(_this), "store", void 0);
-        /**
+   * */ _define_property(_this, "store", void 0), /**
    * 额外参数存储
-   */ _define_property(_assert_this_initialized(_this), "externalParams", void 0);
-        /**
+   */ _define_property(_this, "externalParams", void 0), /**
    * 处理instance，和schema存储
-   * */ _define_property(_assert_this_initialized(_this), "designer", void 0);
-        /**
+   * */ _define_property(_this, "designer", 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
-        _define_property(_assert_this_initialized(_this), "getSchema", toSchema);
-        // TODO 拿到model_bind_info_list
-        _define_property(_assert_this_initialized(_this), "getModelBindInfoList", getModelBindInfoList);
-        // TODO 拿到permission_controls
-        _define_property(_assert_this_initialized(_this), "generatePermissions", generatePermissions);
+   * */ _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({

package/dist/esm/Store.js

@@ -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
@@ -216,6 +217,7 @@ export function getMasterFormControls(controls) {
                 dataBind.dataCode = dataCode;
             });
         } else {
+            ;
             item.dataBind.fieldCode = fieldCodeBeforeAddPrefix(item.controlId);
             item.dataBind.dataCode = dataCode;
         }
@@ -322,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, '删除')
     }
 };
 // 生成权限字段