@byteluck-fe/model-driven-controls 4.41.0-lx0 → 5.5.0-1-beta1

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

@@ -87,6 +87,7 @@ function _is_native_reflect_construct() {
 import { CONTROL_TYPE } from '@byteluck-fe/model-driven-shared';
 import { DesignerLayoutControl } from '@byteluck-fe/model-driven-core';
 import RowControlProperty from './property';
+import { getLocaleText } from '@byteluck-fe/locale-message';
 var RowControl = /*#__PURE__*/ function(DesignerLayoutControl) {
     "use strict";
     _inherits(RowControl, DesignerLayoutControl);
@@ -103,7 +104,7 @@ var RowControl = /*#__PURE__*/ function(DesignerLayoutControl) {
         {
             key: "controlName",
             get: function get() {
-                return '栅格布局';
+                return getLocaleText('CMD.row', null, '栅格布局');
             }
         },
         {

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

@@ -73,6 +73,7 @@ function _is_native_reflect_construct() {
 import { DesignerLayoutControl, COMMON_SETTING_TYPE } from '@byteluck-fe/model-driven-core';
 import { CONTROL_TYPE } from '@byteluck-fe/model-driven-shared';
 import SubTableColumnControlProperty from './property';
+import { getLocaleText } from '@byteluck-fe/locale-message';
 var SubTableColumnControl = /*#__PURE__*/ function(DesignerLayoutControl) {
     "use strict";
     _inherits(SubTableColumnControl, DesignerLayoutControl);
@@ -87,7 +88,7 @@ var SubTableColumnControl = /*#__PURE__*/ function(DesignerLayoutControl) {
     }
     return SubTableColumnControl;
 }(DesignerLayoutControl);
-_define_property(SubTableColumnControl, "controlName", '明细子表单元格');
+_define_property(SubTableColumnControl, "controlName", getLocaleText('CMD.subtableColumn', null, '明细子表单元格'));
 _define_property(SubTableColumnControl, "controlType", 'subtable-column');
 _define_property(SubTableColumnControl, "controlIcon", 'subtable-column');
 _define_property(SubTableColumnControl, "childrenMaxLength", 1);
@@ -98,7 +99,8 @@ _define_property(SubTableColumnControl, "excludes", [
     CONTROL_TYPE.COL,
     CONTROL_TYPE.CARD_GROUP,
     CONTROL_TYPE.DIVIDER,
-    CONTROL_TYPE.TEXT
+    CONTROL_TYPE.TEXT,
+    CONTROL_TYPE.GRID_LAYOUT_CONTAINER
 ]);
 _define_property(SubTableColumnControl, "setting", [
     {

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

@@ -71,7 +71,7 @@ function _is_native_reflect_construct() {
     })();
 }
 import { LayoutControlProperty, PropertyRules, MetaAutoWidth } from '@byteluck-fe/model-driven-core';
-import { RulesMessage } from '@byteluck-fe/model-driven-shared';
+import { getLocaleText } from '@byteluck-fe/locale-message';
 var SubTableColumnControlPropertyRules = /*#__PURE__*/ function(PropertyRules) {
     "use strict";
     _inherits(SubTableColumnControlPropertyRules, PropertyRules);
@@ -83,15 +83,15 @@ var SubTableColumnControlPropertyRules = /*#__PURE__*/ function(PropertyRules) {
         ]), _define_property(_this, "caption", {
             type: 'string',
             required: true,
-            message: RulesMessage.getMessage('pleaseEnterCaption')
+            message: getLocaleText('CMD.pleaseEnterCaption', null, '请输入标题')
         }), _define_property(_this, "width", {
             type: 'number',
             required: false,
-            message: RulesMessage.getMessage('pleaseEnterColumnWidth')
+            message: getLocaleText('CMD.pleaseEnterColumnWidth', null, '请输入列宽')
         }), _define_property(_this, "captionTip", {
             type: 'string',
             required: false,
-            message: RulesMessage.getMessage('pleaseEnterCaptionTip')
+            message: getLocaleText('CMD.pleaseEnterCaptionTip', null, '请输入气泡提示语')
         });
         if (props.isShowCaptionTip) {
             _this.captionTip.required = true;
@@ -108,19 +108,19 @@ var SubTableColumnControlProperty = /*#__PURE__*/ function(LayoutControlProperty
         var _this;
         _this = _call_super(this, SubTableColumnControlProperty, [
             props
-        ]), /**
-   * 设置宽度在移动和pc - 宽度
-   * pc 电脑端   mobile -手机端
-   * */ _define_property(_this, "metaAutoWidth", void 0), /**
-   * 列标题
-   * */ _define_property(_this, "caption", void 0), /**
-   * 是否固定列
-   * */ _define_property(_this, "fixed", void 0), /**
-   * 是否开启气泡提示
-   * */ _define_property(_this, "isShowCaptionTip", void 0), /**
-   * 气泡提示语
-   * */ _define_property(_this, "captionTip", void 0), /**
-   * 隐藏标题一直为false
+        ]), /**
+   * 设置宽度在移动和pc - 宽度
+   * pc 电脑端   mobile -手机端
+   * */ _define_property(_this, "metaAutoWidth", void 0), /**
+   * 列标题
+   * */ _define_property(_this, "caption", void 0), /**
+   * 是否固定列
+   * */ _define_property(_this, "fixed", void 0), /**
+   * 是否开启气泡提示
+   * */ _define_property(_this, "isShowCaptionTip", void 0), /**
+   * 气泡提示语
+   * */ _define_property(_this, "captionTip", void 0), /**
+   * 隐藏标题一直为false
    * */ _define_property(_this, "isHideCaption", 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 : '';

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

@@ -73,6 +73,7 @@ function _is_native_reflect_construct() {
 import { DesignerLayoutControl, COMMON_SETTING_TYPE } from '@byteluck-fe/model-driven-core';
 import { CONTROL_TYPE } from '@byteluck-fe/model-driven-shared';
 import SubTableRowControlProperty from './property';
+import { getLocaleText } from '@byteluck-fe/locale-message';
 var SubTableRowControl = /*#__PURE__*/ function(DesignerLayoutControl) {
     "use strict";
     _inherits(SubTableRowControl, DesignerLayoutControl);
@@ -87,7 +88,7 @@ var SubTableRowControl = /*#__PURE__*/ function(DesignerLayoutControl) {
     }
     return SubTableRowControl;
 }(DesignerLayoutControl);
-_define_property(SubTableRowControl, "controlName", '明细子表行');
+_define_property(SubTableRowControl, "controlName", getLocaleText('CMD.subtableRow', null, '明细子表行'));
 _define_property(SubTableRowControl, "controlType", 'subtable-row');
 _define_property(SubTableRowControl, "controlIcon", 'subtable-row');
 _define_property(SubTableRowControl, "childrenMaxLength", 1);

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

@@ -88,6 +88,7 @@ import { CONTROL_TYPE } from '@byteluck-fe/model-driven-shared';
 import { DesignerLayoutControl } from '@byteluck-fe/model-driven-core';
 import TabControlProperty from './property';
 import { DesignerTabPaneControl } from '../TabPane';
+import { getLocaleText } from '@byteluck-fe/locale-message';
 var TabControl = /*#__PURE__*/ function(DesignerLayoutControl) {
     "use strict";
     _inherits(TabControl, DesignerLayoutControl);
@@ -109,7 +110,7 @@ var TabControl = /*#__PURE__*/ function(DesignerLayoutControl) {
         {
             key: "controlName",
             get: function get() {
-                return '标签页';
+                return getLocaleText('CMD.tab', null, '标签页');
             }
         },
         {

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/GridTable/property.js

@@ -1,10 +1,10 @@
-/*
- * @Author: Elvis shuaiqy@hotmail.com
- * @Date: 2022-01-11 22:20:55
- * @LastEditors: changjiaqi hypocrite_chang@163.com
- * @LastEditTime: 2023-05-31 10:33:27
- * @FilePath: /model-driven/packages/controls/src/listControls/GridTable/property.ts
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+/*
+ * @Author: Elvis shuaiqy@hotmail.com
+ * @Date: 2022-01-11 22:20:55
+ * @LastEditors: changjiaqi hypocrite_chang@163.com
+ * @LastEditTime: 2023-05-31 10:33:27
+ * @FilePath: /model-driven/packages/controls/src/listControls/GridTable/property.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */ function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -78,9 +78,9 @@ function _is_native_reflect_construct() {
     })();
 }
 import { ListControlProperty } from '@byteluck-fe/model-driven-core';
-/**
- * GridTable 表格组件
- * @public
+/**
+ * GridTable 表格组件
+ * @public
  */ var GridTableControlProperty = /*#__PURE__*/ function(ListControlProperty) {
     "use strict";
     _inherits(GridTableControlProperty, ListControlProperty);
@@ -90,25 +90,25 @@ import { ListControlProperty } from '@byteluck-fe/model-driven-core';
         _this = _call_super(this, GridTableControlProperty, [
             parent,
             props
-        ]), /**
-   * 冻结表头
-   * @defaultValue false
-   * @public
-   */ _define_property(_this, "isFixedHeader", void 0), /**
-   * 选择类型
-   * @public
-   */ _define_property(_this, "selectionType", void 0), /**
-   * 显示工具栏
-   * @defaultValue true
-   * @public
-   */ _define_property(_this, "isShowToolbar", void 0), /**
-   * 显示选择框
-   * @defaultValue false
-   * @public
-   */ _define_property(_this, "isShowSelection", void 0), /**
-   * 显示自定义表头
-   * @defaultValue true
-   * @public
+        ]), /**
+   * 冻结表头
+   * @defaultValue false
+   * @public
+   */ _define_property(_this, "isFixedHeader", void 0), /**
+   * 选择类型
+   * @public
+   */ _define_property(_this, "selectionType", void 0), /**
+   * 显示工具栏
+   * @defaultValue true
+   * @public
+   */ _define_property(_this, "isShowToolbar", void 0), /**
+   * 显示选择框
+   * @defaultValue false
+   * @public
+   */ _define_property(_this, "isShowSelection", void 0), /**
+   * 显示自定义表头
+   * @defaultValue true
+   * @public
    */ _define_property(_this, "isShowCustomColumns", void 0);
         var _props_isFixedHeader;
         _this.isFixedHeader = (_props_isFixedHeader = props === null || props === void 0 ? void 0 : props.isFixedHeader) !== null && _props_isFixedHeader !== void 0 ? _props_isFixedHeader : false;

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
         ]
     },
     {