@byteluck-fe/model-driven-controls 4.36.0-lx2 → 6.1.0-1-beta.1

package/dist/esm/layoutControls/TabPane/designer.js

@@ -87,8 +87,8 @@ function _is_native_reflect_construct() {
 import { CONTROL_TYPE } from '@byteluck-fe/model-driven-shared';
 import { DesignerLayoutControl, COMMON_SETTING_TYPE } from '@byteluck-fe/model-driven-core';
 import TabPaneControlProperty from './property';
+import { getLocaleText } from '@byteluck-fe/locale-message';
 // import { RuleItem } from 'async-validator'
-// import { RulesMessage } from '@byteluck-fe/model-driven-shared'
 var TabPaneControl = /*#__PURE__*/ function(DesignerLayoutControl) {
     "use strict";
     _inherits(TabPaneControl, DesignerLayoutControl);
@@ -105,7 +105,7 @@ var TabPaneControl = /*#__PURE__*/ function(DesignerLayoutControl) {
         {
             key: "controlName",
             get: function get() {
-                return '标签单元';
+                return getLocaleText('CMD.tabPane', null, '标签单元');
             }
         },
         {
@@ -150,7 +150,7 @@ _define_property(TabPaneControl, "setting", [
 //   public caption: RuleItem = {
 //     type: 'string',
 //     required: true,
-//     message: RulesMessage.getMessage('pleaseEnterCaption'),
+//     message: getLocaleText('CMD.pleaseEnterCaption'),
 //   }
 //   constructor(props: TabPaneControlProperty) {
 //     super(props)

package/dist/esm/layoutControls/TabPane/property.js

@@ -72,7 +72,7 @@ function _is_native_reflect_construct() {
 }
 import { LayoutControlProperty, PropertyRules } from '@byteluck-fe/model-driven-core';
 import { DesignerTabControl } from '../Tab';
-import { RulesMessage } from '@byteluck-fe/model-driven-shared';
+import { getLocaleText } from '@byteluck-fe/locale-message';
 var TabPaneControlPropertyRules = /*#__PURE__*/ function(PropertyRules) {
     "use strict";
     _inherits(TabPaneControlPropertyRules, PropertyRules);
@@ -84,7 +84,7 @@ var TabPaneControlPropertyRules = /*#__PURE__*/ function(PropertyRules) {
         ]), _define_property(_this, "caption", {
             type: 'string',
             required: true,
-            message: RulesMessage.getMessage('pleaseEnterCaption')
+            message: getLocaleText('CMD.pleaseEnterCaption', null, '请输入标题')
         });
         return _this;
     }

package/dist/esm/layoutControls/Toolbox/designer.js

@@ -88,6 +88,7 @@ import { CONTROL_TYPE } from '@byteluck-fe/model-driven-shared';
 import { DesignerLayoutControl } from '@byteluck-fe/model-driven-core';
 import { ColControlProperty, DesignerColControl } from '../Col';
 import { ToolboxControlProperty } from './property';
+import { getLocaleText } from '@byteluck-fe/locale-message';
 var ToolboxControl = /*#__PURE__*/ function(DesignerLayoutControl) {
     "use strict";
     _inherits(ToolboxControl, DesignerLayoutControl);
@@ -116,7 +117,7 @@ var ToolboxControl = /*#__PURE__*/ function(DesignerLayoutControl) {
         {
             key: "controlName",
             get: function get() {
-                return '工具栏';
+                return getLocaleText('CMD.toolbox', null, '工具栏');
             }
         },
         {

package/dist/esm/listControls/GridTable/designer.js

@@ -104,6 +104,13 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _set_prototype_of(subClass, superClass);
 }
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
 function _object_spread(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
@@ -270,16 +277,19 @@ import { GridTableControlProperty } from './property';
 import { DesignerListControl, defineControlArrayToProperty } from '@byteluck-fe/model-driven-core';
 import { DesignerOrderColumnControl } from '../../columnControls/OrderColumn';
 import { DesignerOperationColumnControl } from '../../columnControls/OperationColumn';
-var GridTableControl = /*#__PURE__*/ function(DesignerListControl) {
+import { JSONCopy } from '@byteluck-fe/model-driven-shared';
+import { getLocaleText } from '@byteluck-fe/locale-message';
+var CHILDREN_MAX_LENGTH = 10000;
+var GridTableControl = /*#__PURE__*/ function _target(DesignerListControl) {
     "use strict";
     _inherits(GridTableControl, DesignerListControl);
     function GridTableControl(props) {
         _class_call_check(this, GridTableControl);
         var _this;
-        var _props_props;
         _this = _call_super(this, GridTableControl, [
             props
-        ]), _define_property(_this, "props", void 0), _define_property(_this, "children", void 0);
+        ]), _define_property(_this, "props", void 0), _define_property(_this, "children", void 0), _define_property(_this, "excludes", void 0), _define_property(_this, "childrenMaxLength", void 0);
+        var _ref = _instanceof(this, GridTableControl) ? this.constructor : void 0, excludes = _ref.excludes, childrenMaxLength = _ref.childrenMaxLength;
         _this.props = new GridTableControlProperty(_this, props === null || props === void 0 ? void 0 : props.props);
         defineControlArrayToProperty(_this, 'children', props === null || props === void 0 ? void 0 : props.children, undefined, 'Designer');
         if ((props === null || props === void 0 ? void 0 : props.props.headers) === undefined) {
@@ -288,12 +298,24 @@ var GridTableControl = /*#__PURE__*/ function(DesignerListControl) {
                 new DesignerOperationColumnControl()
             ];
         }
-        if ((props === null || props === void 0 ? void 0 : (_props_props = props.props) === null || _props_props === void 0 ? void 0 : _props_props.footers) === undefined) {
-            _this.props.footers = [];
-        }
+        // if (props?.props?.footers === undefined) {
+        //   this.props.footers = []
+        // }
+        _this.excludes = JSONCopy(excludes);
+        _this.childrenMaxLength = childrenMaxLength;
         return _this;
     }
     _create_class(GridTableControl, [
+        {
+            key: "judgeJoinChildren",
+            value: function judgeJoinChildren(type) {
+                var canJoin = this.excludes === false || Array.isArray(this.excludes) && !this.excludes.includes(type);
+                if (canJoin) {
+                    return this.childrenMaxLength > this.children.length;
+                }
+                return canJoin;
+            }
+        },
         {
             key: "toSchema",
             value: function toSchema() {
@@ -344,7 +366,7 @@ var GridTableControl = /*#__PURE__*/ function(DesignerListControl) {
         {
             key: "controlName",
             get: function get() {
-                return '表格';
+                return getLocaleText('CMD.gridTable', null, '表格');
             }
         },
         {
@@ -367,11 +389,16 @@ var GridTableControl = /*#__PURE__*/ function(DesignerListControl) {
 //   'on_list_mounted',
 //   'on_list_splice',
 // ]
+_define_property(GridTableControl, "slotPosition", {
+    toolbar: 'grid-table-toolbar-slot'
+});
 _define_property(GridTableControl, "setting", [
     {
         key: 'list-fixed-header',
         visible: true
     }
 ]);
+_define_property(GridTableControl, "excludes", []);
+_define_property(GridTableControl, "childrenMaxLength", CHILDREN_MAX_LENGTH);
 export default GridTableControl;
 export { GridTableControl as DesignerGridTableControl };

package/dist/esm/listControls/SubTable/designer.js

@@ -87,13 +87,14 @@ function _is_native_reflect_construct() {
 import SubTableControlProperty from './property';
 import { DesignerListControl, COMMON_SETTING_TYPE } from '@byteluck-fe/model-driven-core';
 import { DesignerSubTableColumnControl } from '../../layoutControls/SubTableColumn';
+import { getLocaleText } from '@byteluck-fe/locale-message';
 var SubTableControl = /*#__PURE__*/ function(DesignerListControl) {
     "use strict";
     _inherits(SubTableControl, DesignerListControl);
     function SubTableControl(props) {
         _class_call_check(this, SubTableControl);
         var _this;
-        var _props_props, _props_props1;
+        var _props_props;
         _this = _call_super(this, SubTableControl, [
             props
         ]), _define_property(_this, "props", void 0);
@@ -106,9 +107,6 @@ var SubTableControl = /*#__PURE__*/ function(DesignerListControl) {
                 new DesignerSubTableColumnControl()
             ];
         }
-        if ((props === null || props === void 0 ? void 0 : (_props_props1 = props.props) === null || _props_props1 === void 0 ? void 0 : _props_props1.footers) === undefined) {
-            _this.props.footers = [];
-        }
         return _this;
     }
     _create_class(SubTableControl, [
@@ -129,7 +127,7 @@ var SubTableControl = /*#__PURE__*/ function(DesignerListControl) {
         {
             key: "controlName",
             get: function get() {
-                return '明细子表';
+                return getLocaleText('CMD.subTable', null, '明细子表');
             }
         },
         {
@@ -155,6 +153,9 @@ _define_property(SubTableControl, "controlEventKeys", [
     'on_list_before_insert',
     'on_list_before_import'
 ]);
+_define_property(SubTableControl, "slotPosition", {
+    toolbar: 'subtable-toolbar-slot'
+});
 _define_property(SubTableControl, "setting", [
     {
         key: 'subtable-datasource-bind',
@@ -179,7 +180,8 @@ _define_property(SubTableControl, "setting", [
             COMMON_SETTING_TYPE.IS_HIDE,
             COMMON_SETTING_TYPE.IS_SHOW_CAPTION_TIP,
             COMMON_SETTING_TYPE.IS_PASTE,
-            COMMON_SETTING_TYPE.SERVER_PAGINATION
+            COMMON_SETTING_TYPE.SERVER_PAGINATION,
+            COMMON_SETTING_TYPE.SORTABLE
         ]
     },
     {

package/dist/esm/listControls/SubTable/property.js

@@ -72,8 +72,8 @@ function _is_native_reflect_construct() {
 }
 import SubTableControl from './designer';
 import { ListControlProperty, PropertyRules, PropertyRuntimeRules, DataSourceBind, DataStorageDoc } from '@byteluck-fe/model-driven-core';
-import { RulesMessage } from '@byteluck-fe/model-driven-shared';
-import { SUBTABLE_DEFAULT_MAX_HEIGHT } from '../../framework';
+import { SUBTABLE_DEFAULT_MAX_HEIGHT, ExportConfig, ImportConfig } from '../../framework';
+import { getLocaleText } from '@byteluck-fe/locale-message';
 var SubTableControlPropertyRules = /*#__PURE__*/ function(PropertyRules) {
     "use strict";
     _inherits(SubTableControlPropertyRules, PropertyRules);
@@ -85,35 +85,35 @@ var SubTableControlPropertyRules = /*#__PURE__*/ function(PropertyRules) {
         ]), _define_property(_this, "caption", {
             type: 'string',
             required: true,
-            message: RulesMessage.getMessage('pleaseEnterCaption')
+            message: getLocaleText('CMD.pleaseEnterCaption', null, '请输入标题')
         }), _define_property(_this, "limitRows", [
             {
                 type: 'number',
                 required: true,
-                message: RulesMessage.getMessage('isNotNumber')
+                message: getLocaleText('CMD.isNotNumber', null, '请输入一个数字')
             },
             {
                 type: 'number',
                 min: 0,
-                message: RulesMessage.getMessage('limitRowsCannotBeLessThan0')
+                message: getLocaleText('CMD.limitRowsCannotBeLessThan0', null, '最少填写行数不能小于0')
             }
         ]), _define_property(_this, "formKey", {
             type: 'string',
             required: false,
-            message: RulesMessage.getMessage('pleaseEnterForm')
+            message: getLocaleText('CMD.pleaseEnterForm', null, '请绑定表单')
         }), _define_property(_this, "maxHeight", {
             type: 'number',
             required: true,
-            message: RulesMessage.getMessage('pleaseEnterMaxHeight')
+            message: getLocaleText('CMD.pleaseEnterMaxHeight', null, '请输入最大高度')
         }), _define_property(_this, "captionTip", {
             type: 'string',
             required: false,
-            message: RulesMessage.getMessage('pleaseEnterCaptionTip')
+            message: getLocaleText('CMD.pleaseEnterCaptionTip', null, '请输入气泡提示语')
         }), // 行标题必填
         _define_property(_this, "mobileRowCaption", {
             type: 'string',
             required: false,
-            message: RulesMessage.getMessage('pleaseEnterRowCaption')
+            message: getLocaleText('CMD.pleaseEnterRowCaption', null, '请输入行标题')
         });
         if (props.openType === 'modal') {
             _this.formKey.required = true;
@@ -141,22 +141,22 @@ var SubtableControlRuntimeRules = /*#__PURE__*/ function(PropertyRuntimeRules) {
             _this.push({
                 type: 'array',
                 required: props.limitRows > 0,
-                message: RulesMessage.getMessage('runtimeRequired', {
+                message: getLocaleText('CMD.runtimeRequired', {
                     caption: props.caption
-                })
+                }, '{caption}必填')
             }, {
                 type: 'array',
                 validator: function validator(rule, value, callback) {
                     if (value.length < props.limitRows) {
-                        callback(RulesMessage.getMessage('TheNumberOfRowsCannotBeLessThanMinRows', {
+                        callback(getLocaleText('CMD.TheNumberOfRowsCannotBeLessThanMinRows', {
                             min: props.limitRows
-                        }));
+                        }, '行数量不能小于{min}行'));
                     }
                     callback();
                 },
-                message: RulesMessage.getMessage('TheNumberOfRowsCannotBeLessThanMinRows', {
+                message: getLocaleText('CMD.TheNumberOfRowsCannotBeLessThanMinRows', {
                     min: props.limitRows
-                })
+                }, '行数量不能小于{min}行')
             });
         }
         return _this;
@@ -245,8 +245,12 @@ var SubtableControlRuntimeRules = /*#__PURE__*/ function(PropertyRuntimeRules) {
    * */ _define_property(_this, "canEdit", void 0), /**
    * 可以导入
    * */ _define_property(_this, "canImport", void 0), /**
+   * 导入配置
+   * */ _define_property(_this, "importConfig", void 0), /**
    * 可以导出
    * */ _define_property(_this, "canExport", void 0), /**
+   * 导出配置
+   * */ _define_property(_this, "exportConfig", void 0), /**
    * 可以清除
    * */ _define_property(_this, "canClear", void 0), /**
    * 是否展示粘贴按钮
@@ -276,7 +280,13 @@ var SubtableControlRuntimeRules = /*#__PURE__*/ function(PropertyRuntimeRules) {
    * 移动端平铺数据流开关
    * @defaultValue false
    * @public
-   * */ _define_property(_this, "mobileIsTile", void 0);
+   * */ _define_property(_this, "mobileIsTile", void 0), /**
+   * 是否开启数据排序
+   * @defaultValue false
+   * @public
+   * */ _define_property(_this, "sortable", void 0), /**
+   * 排序or筛选字段
+   * */ _define_property(_this, "sortKey", void 0);
         var _props_caption;
         _this.caption = (_props_caption = props === null || props === void 0 ? void 0 : props.caption) !== null && _props_caption !== void 0 ? _props_caption : SubTableControl.controlName;
         var _props_isHideCaption;
@@ -331,7 +341,7 @@ var SubtableControlRuntimeRules = /*#__PURE__*/ function(PropertyRuntimeRules) {
         var _props_fixedColumn;
         _this.fixedColumn = (_props_fixedColumn = props === null || props === void 0 ? void 0 : props.fixedColumn) !== null && _props_fixedColumn !== void 0 ? _props_fixedColumn : [];
         var _props_mobileRowCaption;
-        _this.mobileRowCaption = (_props_mobileRowCaption = props === null || props === void 0 ? void 0 : props.mobileRowCaption) !== null && _props_mobileRowCaption !== void 0 ? _props_mobileRowCaption : '明细';
+        _this.mobileRowCaption = (_props_mobileRowCaption = props === null || props === void 0 ? void 0 : props.mobileRowCaption) !== null && _props_mobileRowCaption !== void 0 ? _props_mobileRowCaption : getLocaleText('CMD.detailed', null, '明细');
         var _props_mobileIsTile;
         _this.mobileIsTile = (_props_mobileIsTile = props === null || props === void 0 ? void 0 : props.mobileIsTile) !== null && _props_mobileIsTile !== void 0 ? _props_mobileIsTile : false;
         var _props_isPaste;
@@ -345,6 +355,12 @@ var SubtableControlRuntimeRules = /*#__PURE__*/ function(PropertyRuntimeRules) {
             50,
             100
         ];
+        _this.importConfig = new ImportConfig(props === null || props === void 0 ? void 0 : props.importConfig);
+        _this.exportConfig = new ExportConfig(props === null || props === void 0 ? void 0 : props.exportConfig);
+        var _props_sortable;
+        _this.sortable = (_props_sortable = props === null || props === void 0 ? void 0 : props.sortable) !== null && _props_sortable !== void 0 ? _props_sortable : false;
+        var _props_sortKey;
+        _this.sortKey = (_props_sortKey = props === null || props === void 0 ? void 0 : props.sortKey) !== null && _props_sortKey !== void 0 ? _props_sortKey : {};
         return _this;
     }
     return SubTableControlProperty;

package/dist/esm/searchControls/SimpleSearch/designer.js

@@ -87,6 +87,9 @@ var SimpleSearchControl = /*#__PURE__*/ function(DesignerSearchControl) {
     return SimpleSearchControl;
 }(DesignerSearchControl);
 _define_property(SimpleSearchControl, "controlType", 'simple-search');
+_define_property(SimpleSearchControl, "slotPosition", {
+    default: 'search'
+});
 _define_property(SimpleSearchControl, "setting", [
     {
         key: 'grid-child-min-width',

package/dist/esm/searchControls/SimpleSearch/property.js

@@ -70,6 +70,7 @@ function _is_native_reflect_construct() {
         return !!result;
     })();
 }
+import { getLocaleText } from '@byteluck-fe/locale-message';
 import { SearchControlProperty, PropertyRuntimeRules, OperationItem } from '@byteluck-fe/model-driven-core';
 var SimpleSearchControlPropertyRuntimeRules = /*#__PURE__*/ function(PropertyRuntimeRules) {
     "use strict";
@@ -133,7 +134,15 @@ var SimpleSearchControlPropertyRuntimeRules = /*#__PURE__*/ function(PropertyRun
    * 控件间距
    * @defaultValue 24
    * @public
-   */ _define_property(_this, "colGap", void 0);
+   */ _define_property(_this, "colGap", void 0), /**
+   * 查询方案字段
+   * @defaultValue []
+   * @public
+   */ _define_property(_this, "viewConfig", void 0), /**
+   * 普通筛选项查询字段
+   * @defaultValue []
+   * @public
+   */ _define_property(_this, "simpleConfig", void 0);
         var _props_searchType;
         _this.searchType = (_props_searchType = props === null || props === void 0 ? void 0 : props.searchType) !== null && _props_searchType !== void 0 ? _props_searchType : 'model';
         var _props_labelPosition;
@@ -142,12 +151,12 @@ var SimpleSearchControlPropertyRuntimeRules = /*#__PURE__*/ function(PropertyRun
         _this.viewType = (_props_viewType = props === null || props === void 0 ? void 0 : props.viewType) !== null && _props_viewType !== void 0 ? _props_viewType : 'mini';
         var _props_search;
         _this.search = new OperationItem((_props_search = props === null || props === void 0 ? void 0 : props.search) !== null && _props_search !== void 0 ? _props_search : {
-            content: '查询',
+            content: getLocaleText('CMD.query', null, '查询'),
             isShow: true
         });
         var _props_cancel;
         _this.cancel = new OperationItem((_props_cancel = props === null || props === void 0 ? void 0 : props.cancel) !== null && _props_cancel !== void 0 ? _props_cancel : {
-            content: '重置',
+            content: getLocaleText('CMD.reset', null, '重置'),
             isShow: true
         });
         var _props_isLoading;
@@ -162,6 +171,10 @@ var SimpleSearchControlPropertyRuntimeRules = /*#__PURE__*/ function(PropertyRun
         _this.childMinWidth = (_props_childMinWidth = props === null || props === void 0 ? void 0 : props.childMinWidth) !== null && _props_childMinWidth !== void 0 ? _props_childMinWidth : 230;
         var _props_colGap;
         _this.colGap = (_props_colGap = props === null || props === void 0 ? void 0 : props.colGap) !== null && _props_colGap !== void 0 ? _props_colGap : 24;
+        var _props_viewConfig;
+        _this.viewConfig = (_props_viewConfig = props === null || props === void 0 ? void 0 : props.viewConfig) !== null && _props_viewConfig !== void 0 ? _props_viewConfig : [];
+        var _props_simpleConfig;
+        _this.simpleConfig = (_props_simpleConfig = props === null || props === void 0 ? void 0 : props.simpleConfig) !== null && _props_simpleConfig !== void 0 ? _props_simpleConfig : [];
         return _this;
     }
     return SimpleSearchControlProperty;

package/dist/esm/wrapControls/GridLayoutWrap/Setting.js

@@ -4,14 +4,15 @@
  * @LastEditors: zhaoxiaoyang zhaoxiaoyang@byteluck.com
  * @LastEditTime: 2023-08-09 14:06:17
  * @FilePath: /model-driven/packages/controls/src/wrapControls/gridLayoutWrap/Setting.ts
- */ import { defineInstance } from '@byteluck-fe/model-driven-settings';
+ */ import { getLocaleText } from '@byteluck-fe/locale-message';
+import { defineInstance } from '@byteluck-fe/model-driven-settings';
 export default defineInstance({
     fields: [
         {
             key: 'wholeRow',
             type: 'boolean',
             component: 'switch',
-            label: '充满整行',
+            label: getLocaleText('CMD.fullLine', null, '充满整行'),
             props: {
                 updateParent: true
             }

package/dist/esm/wrapControls/GridLayoutWrap/designer.js

@@ -93,6 +93,7 @@ function _is_native_reflect_construct() {
 import { DesignerWrapControl } from '@byteluck-fe/model-driven-core';
 import GridLayoutWrapProperty from './property';
 // import Setting from './Setting'
+import { getLocaleText } from '@byteluck-fe/locale-message';
 var GridLayoutWrapControl = /*#__PURE__*/ function(DesignerWrapControl) {
     "use strict";
     _inherits(GridLayoutWrapControl, DesignerWrapControl);
@@ -110,7 +111,7 @@ var GridLayoutWrapControl = /*#__PURE__*/ function(DesignerWrapControl) {
         {
             key: "controlName",
             get: function get() {
-                return '换行容器Wrap';
+                return getLocaleText('CMD.gridLayoutWrap', null, '换行容器Wrap');
             }
         },
         {