es-grid-template 1.9.103 → 1.9.105

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. package/es/ali-table/Grid.js +1 -1
  2. package/es/ali-table/base-table/cell/EditCell.js +3 -2
  3. package/es/ali-table/base-table/cell/HeaderEditCell.js +3 -2
  4. package/es/grid-component/GridRefreshButton.css +9 -9
  5. package/es/grid-component/GridToolbar.d.ts +3 -0
  6. package/es/grid-component/GridToolbar.js +16 -0
  7. package/es/group-component/TableContainer.js +1 -1
  8. package/es/group-component/TableContainerEdit.js +2 -1
  9. package/es/group-component/body/EditableCell.js +3 -2
  10. package/es/group-component/hook/utils.d.ts +3 -3
  11. package/es/table-component/TableContainer.js +1 -1
  12. package/es/table-component/TableContainerEdit.js +1 -1
  13. package/es/table-component/body/EditableCell.js +3 -2
  14. package/es/table-virtuoso/table/TableContainer.js +1 -1
  15. package/lib/ali-table/Grid.js +4 -4
  16. package/lib/ali-table/base-table/cell/EditCell.js +3 -2
  17. package/lib/ali-table/base-table/cell/HeaderEditCell.js +3 -2
  18. package/lib/grid-component/GridRefreshButton.css +9 -9
  19. package/lib/grid-component/GridToolbar.d.ts +3 -0
  20. package/lib/grid-component/GridToolbar.js +25 -0
  21. package/lib/group-component/TableContainer.js +2 -2
  22. package/lib/group-component/TableContainerEdit.js +4 -3
  23. package/lib/group-component/body/EditableCell.js +3 -2
  24. package/lib/table-component/TableContainer.js +4 -4
  25. package/lib/table-component/TableContainerEdit.js +4 -3
  26. package/lib/table-component/body/EditableCell.js +3 -2
  27. package/lib/table-virtuoso/table/TableContainer.js +3 -3
  28. package/package.json +1 -1
  29. package/CHANGELOG.md +0 -34
@@ -5,7 +5,7 @@ import React, { useContext } from "react";
5
5
  import { Tooltip } from "react-tooltip";
6
6
  import "./base-table/styles.scss";
7
7
  // import type { TableProps } from "../table-component"
8
- import { Toolbar } from 'rc-master-ui';
8
+ import Toolbar from "../grid-component/GridToolbar";
9
9
  import classNames from "classnames";
10
10
  import Pagination from "rc-master-ui/es/pagination";
11
11
  import { Maximize, Minimize } from "becoxy-icons";
@@ -626,8 +626,9 @@ const EditCell = props => {
626
626
  } : filterOption,
627
627
  optionRender: column.editSelectSettings?.formatOptionLabel,
628
628
  fieldNames: {
629
- value: keySelect,
630
- label: inputKey ?? 'label'
629
+ ...fieldNames,
630
+ value: fieldNames?.value ?? keySelect,
631
+ label: fieldNames?.label ?? inputKey ?? 'label'
631
632
  },
632
633
  onBlur: event => {
633
634
  if (event.inputValue && column?.editSelectSettings?.searchTextAsValue && isMulti !== true) {
@@ -622,8 +622,9 @@ const HeaderEditCell = props => {
622
622
  } : filterOption,
623
623
  optionRender: column.editSelectSettings?.formatOptionLabel,
624
624
  fieldNames: {
625
- value: keySelect,
626
- label: inputKey ?? 'label'
625
+ ...fieldNames,
626
+ value: fieldNames?.value ?? keySelect,
627
+ label: fieldNames?.label ?? inputKey ?? 'label'
627
628
  },
628
629
  onBlur: event => {
629
630
  if (event.inputValue && column?.editSelectSettings?.searchTextAsValue && isMulti !== true) {
@@ -1,9 +1,9 @@
1
- .ui-rc-grid-refresh-spin {
2
- transform-origin: center;
3
- transform-box: fill-box;
4
- animation: ui-rc-grid-refresh-spin 0.8s linear infinite;
5
- }
6
-
7
- @keyframes ui-rc-grid-refresh-spin {
8
- to { transform: rotate(360deg); }
9
- }
1
+ .ui-rc-grid-refresh-spin {
2
+ transform-origin: center;
3
+ transform-box: fill-box;
4
+ animation: ui-rc-grid-refresh-spin 0.8s linear infinite;
5
+ }
6
+
7
+ @keyframes ui-rc-grid-refresh-spin {
8
+ to { transform: rotate(360deg); }
9
+ }
@@ -0,0 +1,3 @@
1
+ import * as React from 'react';
2
+ import { Toolbar } from 'rc-master-ui';
3
+ export default function GridToolbar({ items, ...props }: React.ComponentProps<typeof Toolbar>): JSX.Element;
@@ -0,0 +1,16 @@
1
+ import _extends from "@babel/runtime/helpers/esm/extends";
2
+ import * as React from 'react';
3
+ import { Toolbar } from 'rc-master-ui';
4
+ export default function GridToolbar({
5
+ items,
6
+ ...props
7
+ }) {
8
+ const visibleItems = items.filter(item => item.visible !== false);
9
+ const layoutKey = JSON.stringify(visibleItems.map(item => [item.key ?? item.value, item.align ?? 'left']));
10
+
11
+ // rc-master-ui leaves old alignment classes on reused items when the layout changes.
12
+ return /*#__PURE__*/React.createElement(Toolbar, _extends({}, props, {
13
+ key: layoutKey,
14
+ items: visibleItems
15
+ }));
16
+ }
@@ -3,7 +3,7 @@ import React from 'react';
3
3
  import classNames from 'classnames';
4
4
  import { TableContext } from "./useContext";
5
5
  import Pagination from 'rc-master-ui/es/pagination';
6
- import { Toolbar } from 'rc-master-ui';
6
+ import Toolbar from "../grid-component/GridToolbar";
7
7
  import { Collapse2, Expand2, Maximize, Minimize } from 'becoxy-icons';
8
8
  import GridRefreshButton from "../grid-component/GridRefreshButton";
9
9
  // import { ColumnsChoose } from './ColumnsChoose'
@@ -11,7 +11,8 @@ import Pagination from "rc-master-ui/es/pagination";
11
11
  import { numericFormatter, removeNumericFormat } from "react-numeric-component";
12
12
  import { TableContext } from "./useContext";
13
13
  import { yupResolver } from "@hookform/resolvers/yup";
14
- import { Dropdown, Toolbar, Modal, Typography } from "rc-master-ui";
14
+ import { Dropdown, Modal, Typography } from "rc-master-ui";
15
+ import Toolbar from "../grid-component/GridToolbar";
15
16
  import classNames from "classnames";
16
17
  import { Collapse2, Expand2, Maximize, Minimize } from "becoxy-icons";
17
18
  // import { ColumnsChoose } from "./ColumnsChoose";
@@ -622,8 +622,9 @@ const EditableCell = props => {
622
622
  } : filterOption,
623
623
  optionRender: column.editSelectSettings?.formatOptionLabel,
624
624
  fieldNames: {
625
- value: keySelect,
626
- label: inputKey ?? 'label'
625
+ ...fieldNames,
626
+ value: fieldNames?.value ?? keySelect,
627
+ label: fieldNames?.label ?? inputKey ?? 'label'
627
628
  },
628
629
  onBlur: event => {
629
630
  if (event.inputValue && column?.editSelectSettings?.searchTextAsValue && isMulti !== true) {
@@ -196,10 +196,10 @@ export declare const fixColumnsLeft: <RecordType>(columns: ColumnTable<RecordTyp
196
196
  value: any;
197
197
  rowData: RecordType;
198
198
  }) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
199
- onCellStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
200
- onCellHeaderStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
199
+ onCellStyles?: Omit<CSSProperties, "position" | "display" | "left" | "minWidth" | "right" | "width"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "position" | "display" | "left" | "minWidth" | "right" | "width">);
200
+ onCellHeaderStyles?: Omit<CSSProperties, "position" | "display" | "left" | "minWidth" | "right" | "width"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "position" | "display" | "left" | "minWidth" | "right" | "width">);
201
201
  onCell?: (rowData: RecordType, index: number) => import("react").TdHTMLAttributes<HTMLTableCellElement>;
202
- onCellFooterStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
202
+ onCellFooterStyles?: Omit<CSSProperties, "position" | "display" | "left" | "minWidth" | "right" | "width"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "position" | "display" | "left" | "minWidth" | "right" | "width">);
203
203
  getValue?: (row: any, rowIndex: number) => any;
204
204
  getCellProps?: (value: any, row: any, rowIndex: number) => import("./../../grid-component/type").CellProps;
205
205
  headerCellProps?: import("./../../grid-component/type").CellProps;
@@ -3,7 +3,7 @@ import React from 'react';
3
3
  import classNames from 'classnames';
4
4
  import { TableContext } from "./useContext";
5
5
  import Pagination from 'rc-master-ui/es/pagination';
6
- import { Toolbar } from 'rc-master-ui';
6
+ import Toolbar from "../grid-component/GridToolbar";
7
7
  import { Maximize, Minimize } from 'becoxy-icons';
8
8
  import GridRefreshButton from "../grid-component/GridRefreshButton";
9
9
  import { numericFormatter } from 'react-numeric-component';
@@ -20,7 +20,7 @@ import Pagination from "rc-master-ui/es/pagination";
20
20
  import { numericFormatter, removeNumericFormat } from "react-numeric-component";
21
21
  import { TableContext } from "./useContext";
22
22
  import { yupResolver } from "@hookform/resolvers/yup";
23
- import { Toolbar } from "rc-master-ui";
23
+ import Toolbar from "../grid-component/GridToolbar";
24
24
  import classNames from "classnames";
25
25
  import { Maximize, Minimize } from "becoxy-icons";
26
26
  import TableWrapper from "./table/TableWrapper";
@@ -625,8 +625,9 @@ const EditableCell = props => {
625
625
  } : filterOption,
626
626
  optionRender: column.editSelectSettings?.formatOptionLabel,
627
627
  fieldNames: {
628
- value: keySelect,
629
- label: inputKey ?? 'label'
628
+ ...fieldNames,
629
+ value: fieldNames?.value ?? keySelect,
630
+ label: fieldNames?.label ?? inputKey ?? 'label'
630
631
  },
631
632
  onBlur: event => {
632
633
  if (event.inputValue && column?.editSelectSettings?.searchTextAsValue && isMulti !== true) {
@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
2
2
  import React from 'react';
3
3
  import classNames from 'classnames';
4
4
  import Pagination from 'rc-master-ui/es/pagination';
5
- import { Toolbar } from 'rc-master-ui';
5
+ import Toolbar from "../../grid-component/GridToolbar";
6
6
  import { Collapse2, Expand2, Maximize, Minimize } from 'becoxy-icons';
7
7
  import GridRefreshButton from "../../grid-component/GridRefreshButton";
8
8
  import { numericFormatter } from 'react-numeric-component';
@@ -11,7 +11,7 @@ var _locale = require("rc-master-ui/es/locale");
11
11
  var _react = _interopRequireWildcard(require("react"));
12
12
  var _reactTooltip = require("react-tooltip");
13
13
  require("./base-table/styles.scss");
14
- var _rcMasterUi = require("rc-master-ui");
14
+ var _GridToolbar = _interopRequireDefault(require("../grid-component/GridToolbar"));
15
15
  var _classnames = _interopRequireDefault(require("classnames"));
16
16
  var _pagination = _interopRequireDefault(require("rc-master-ui/es/pagination"));
17
17
  var _becoxyIcons = require("becoxy-icons");
@@ -246,7 +246,7 @@ const Grid = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
246
246
  className: (0, _classnames.default)('ui-rc-toolbar-bottom border-0', {
247
247
  'ui-rc-toolbar-bottom_border-bottom': !pagination || infiniteScroll
248
248
  })
249
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
249
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
250
250
  style: {
251
251
  width: '100%'
252
252
  },
@@ -276,7 +276,7 @@ const Grid = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
276
276
  flex: 1,
277
277
  overflow: 'hidden'
278
278
  }
279
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
279
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
280
280
  items: toolbarItemTopRight,
281
281
  mode: toolbarMode
282
282
  })), fullScreen !== false && (isFullScreen ? /*#__PURE__*/_react.default.createElement(_becoxyIcons.Minimize, {
@@ -394,7 +394,7 @@ const Grid = /*#__PURE__*/_react.default.forwardRef((props, ref) => {
394
394
  className: (0, _classnames.default)('ui-rc-toolbar-bottom', {
395
395
  'ui-rc-toolbar-bottom_border-bottom': !pagination || infiniteScroll
396
396
  })
397
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
397
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
398
398
  style: {
399
399
  width: '100%'
400
400
  },
@@ -633,8 +633,9 @@ const EditCell = props => {
633
633
  } : filterOption,
634
634
  optionRender: column.editSelectSettings?.formatOptionLabel,
635
635
  fieldNames: {
636
- value: keySelect,
637
- label: inputKey ?? 'label'
636
+ ...fieldNames,
637
+ value: fieldNames?.value ?? keySelect,
638
+ label: fieldNames?.label ?? inputKey ?? 'label'
638
639
  },
639
640
  onBlur: event => {
640
641
  if (event.inputValue && column?.editSelectSettings?.searchTextAsValue && isMulti !== true) {
@@ -629,8 +629,9 @@ const HeaderEditCell = props => {
629
629
  } : filterOption,
630
630
  optionRender: column.editSelectSettings?.formatOptionLabel,
631
631
  fieldNames: {
632
- value: keySelect,
633
- label: inputKey ?? 'label'
632
+ ...fieldNames,
633
+ value: fieldNames?.value ?? keySelect,
634
+ label: fieldNames?.label ?? inputKey ?? 'label'
634
635
  },
635
636
  onBlur: event => {
636
637
  if (event.inputValue && column?.editSelectSettings?.searchTextAsValue && isMulti !== true) {
@@ -1,9 +1,9 @@
1
- .ui-rc-grid-refresh-spin {
2
- transform-origin: center;
3
- transform-box: fill-box;
4
- animation: ui-rc-grid-refresh-spin 0.8s linear infinite;
5
- }
6
-
7
- @keyframes ui-rc-grid-refresh-spin {
8
- to { transform: rotate(360deg); }
9
- }
1
+ .ui-rc-grid-refresh-spin {
2
+ transform-origin: center;
3
+ transform-box: fill-box;
4
+ animation: ui-rc-grid-refresh-spin 0.8s linear infinite;
5
+ }
6
+
7
+ @keyframes ui-rc-grid-refresh-spin {
8
+ to { transform: rotate(360deg); }
9
+ }
@@ -0,0 +1,3 @@
1
+ import * as React from 'react';
2
+ import { Toolbar } from 'rc-master-ui';
3
+ export default function GridToolbar({ items, ...props }: React.ComponentProps<typeof Toolbar>): JSX.Element;
@@ -0,0 +1,25 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.default = GridToolbar;
8
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
+ var React = _interopRequireWildcard(require("react"));
10
+ var _rcMasterUi = require("rc-master-ui");
11
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
12
+ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
13
+ function GridToolbar({
14
+ items,
15
+ ...props
16
+ }) {
17
+ const visibleItems = items.filter(item => item.visible !== false);
18
+ const layoutKey = JSON.stringify(visibleItems.map(item => [item.key ?? item.value, item.align ?? 'left']));
19
+
20
+ // rc-master-ui leaves old alignment classes on reused items when the layout changes.
21
+ return /*#__PURE__*/React.createElement(_rcMasterUi.Toolbar, (0, _extends2.default)({}, props, {
22
+ key: layoutKey,
23
+ items: visibleItems
24
+ }));
25
+ }
@@ -10,7 +10,7 @@ var _react = _interopRequireDefault(require("react"));
10
10
  var _classnames = _interopRequireDefault(require("classnames"));
11
11
  var _useContext = require("./useContext");
12
12
  var _pagination = _interopRequireDefault(require("rc-master-ui/es/pagination"));
13
- var _rcMasterUi = require("rc-master-ui");
13
+ var _GridToolbar = _interopRequireDefault(require("../grid-component/GridToolbar"));
14
14
  var _becoxyIcons = require("becoxy-icons");
15
15
  var _GridRefreshButton = _interopRequireDefault(require("../grid-component/GridRefreshButton"));
16
16
  var _reactNumericComponent = require("react-numeric-component");
@@ -262,7 +262,7 @@ const TableContainer = props => {
262
262
  flex: 1,
263
263
  overflow: 'hidden'
264
264
  }
265
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
265
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
266
266
  items: (toolbarItems ?? []).filter(it => it.position !== 'Bottom'),
267
267
  mode: 'scroll'
268
268
  })), /*#__PURE__*/_react.default.createElement("div", {
@@ -17,6 +17,7 @@ var _reactNumericComponent = require("react-numeric-component");
17
17
  var _useContext = require("./useContext");
18
18
  var _yup = require("@hookform/resolvers/yup");
19
19
  var _rcMasterUi = require("rc-master-ui");
20
+ var _GridToolbar = _interopRequireDefault(require("../grid-component/GridToolbar"));
20
21
  var _classnames = _interopRequireDefault(require("classnames"));
21
22
  var _becoxyIcons = require("becoxy-icons");
22
23
  var _TableWrapper = _interopRequireDefault(require("./table/TableWrapper"));
@@ -2142,7 +2143,7 @@ const TableContainerEdit = props => {
2142
2143
  flex: 1,
2143
2144
  overflow: 'hidden'
2144
2145
  }
2145
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
2146
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
2146
2147
  items: toolbarItemsTop ?? [],
2147
2148
  mode: 'scroll'
2148
2149
  })), /*#__PURE__*/_react.default.createElement("div", {
@@ -2165,7 +2166,7 @@ const TableContainerEdit = props => {
2165
2166
  flex: 1,
2166
2167
  overflow: 'hidden'
2167
2168
  }
2168
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
2169
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
2169
2170
  items: toolbarItemTopRight,
2170
2171
  mode: 'responsive'
2171
2172
  })), /*#__PURE__*/_react.default.createElement(_GridRefreshButton.default, {
@@ -2303,7 +2304,7 @@ const TableContainerEdit = props => {
2303
2304
  // borderRight: '1px solid #e0e0e0',
2304
2305
  // borderLeft: '1px solid #e0e0e0'
2305
2306
  // }}
2306
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
2307
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
2307
2308
  style: {
2308
2309
  width: '100%'
2309
2310
  },
@@ -629,8 +629,9 @@ const EditableCell = props => {
629
629
  } : filterOption,
630
630
  optionRender: column.editSelectSettings?.formatOptionLabel,
631
631
  fieldNames: {
632
- value: keySelect,
633
- label: inputKey ?? 'label'
632
+ ...fieldNames,
633
+ value: fieldNames?.value ?? keySelect,
634
+ label: fieldNames?.label ?? inputKey ?? 'label'
634
635
  },
635
636
  onBlur: event => {
636
637
  if (event.inputValue && column?.editSelectSettings?.searchTextAsValue && isMulti !== true) {
@@ -10,7 +10,7 @@ var _react = _interopRequireDefault(require("react"));
10
10
  var _classnames = _interopRequireDefault(require("classnames"));
11
11
  var _useContext = require("./useContext");
12
12
  var _pagination = _interopRequireDefault(require("rc-master-ui/es/pagination"));
13
- var _rcMasterUi = require("rc-master-ui");
13
+ var _GridToolbar = _interopRequireDefault(require("../grid-component/GridToolbar"));
14
14
  var _becoxyIcons = require("becoxy-icons");
15
15
  var _GridRefreshButton = _interopRequireDefault(require("../grid-component/GridRefreshButton"));
16
16
  var _reactNumericComponent = require("react-numeric-component");
@@ -257,7 +257,7 @@ const TableContainer = props => {
257
257
  flex: 1,
258
258
  overflow: 'hidden'
259
259
  }
260
- }, toolbarItemTop && toolbarItemTop?.length > 0 && /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
260
+ }, toolbarItemTop && toolbarItemTop?.length > 0 && /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
261
261
  items: toolbarItemTop ?? []
262
262
  // mode={'scroll'}
263
263
  ,
@@ -282,7 +282,7 @@ const TableContainer = props => {
282
282
  flex: 1,
283
283
  overflow: 'hidden'
284
284
  }
285
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
285
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
286
286
  items: toolbarItemTopRight,
287
287
  mode: toolbarMode
288
288
  })), /*#__PURE__*/_react.default.createElement(_GridRefreshButton.default, {
@@ -391,7 +391,7 @@ const TableContainer = props => {
391
391
  flex: 1,
392
392
  overflow: 'hidden'
393
393
  }
394
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
394
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
395
395
  items: toolbarItemBottom ?? []
396
396
  // mode={'scroll'}
397
397
  ,
@@ -18,6 +18,7 @@ var _pagination = _interopRequireDefault(require("rc-master-ui/es/pagination"));
18
18
  var _reactNumericComponent = require("react-numeric-component");
19
19
  var _useContext = require("./useContext");
20
20
  var _yup = require("@hookform/resolvers/yup");
21
+ var _GridToolbar = _interopRequireDefault(require("../grid-component/GridToolbar"));
21
22
  var _classnames = _interopRequireDefault(require("classnames"));
22
23
  var _becoxyIcons = require("becoxy-icons");
23
24
  var _TableWrapper = _interopRequireDefault(require("./table/TableWrapper"));
@@ -2148,7 +2149,7 @@ const TableContainerEdit = props => {
2148
2149
  className: (0, _classnames.default)('ui-rc-toolbar-bottom border-0', {
2149
2150
  'ui-rc-toolbar-bottom_border-bottom': !pagination || infiniteScroll
2150
2151
  })
2151
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
2152
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
2152
2153
  style: {
2153
2154
  width: '100%'
2154
2155
  },
@@ -2177,7 +2178,7 @@ const TableContainerEdit = props => {
2177
2178
  flex: 1,
2178
2179
  overflow: 'hidden'
2179
2180
  }
2180
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
2181
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
2181
2182
  items: toolbarItemTopRight,
2182
2183
  mode: toolbarMode
2183
2184
  })), fullScreen !== false && (isFullScreen ? /*#__PURE__*/_react.default.createElement(_becoxyIcons.Minimize, {
@@ -2312,7 +2313,7 @@ const TableContainerEdit = props => {
2312
2313
  className: (0, _classnames.default)('ui-rc-toolbar-bottom', {
2313
2314
  'ui-rc-toolbar-bottom_border-bottom': !pagination || infiniteScroll
2314
2315
  })
2315
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
2316
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
2316
2317
  style: {
2317
2318
  width: '100%'
2318
2319
  },
@@ -632,8 +632,9 @@ const EditableCell = props => {
632
632
  } : filterOption,
633
633
  optionRender: column.editSelectSettings?.formatOptionLabel,
634
634
  fieldNames: {
635
- value: keySelect,
636
- label: inputKey ?? 'label'
635
+ ...fieldNames,
636
+ value: fieldNames?.value ?? keySelect,
637
+ label: fieldNames?.label ?? inputKey ?? 'label'
637
638
  },
638
639
  onBlur: event => {
639
640
  if (event.inputValue && column?.editSelectSettings?.searchTextAsValue && isMulti !== true) {
@@ -9,7 +9,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
9
9
  var _react = _interopRequireDefault(require("react"));
10
10
  var _classnames = _interopRequireDefault(require("classnames"));
11
11
  var _pagination = _interopRequireDefault(require("rc-master-ui/es/pagination"));
12
- var _rcMasterUi = require("rc-master-ui");
12
+ var _GridToolbar = _interopRequireDefault(require("../../grid-component/GridToolbar"));
13
13
  var _becoxyIcons = require("becoxy-icons");
14
14
  var _GridRefreshButton = _interopRequireDefault(require("../../grid-component/GridRefreshButton"));
15
15
  var _reactNumericComponent = require("react-numeric-component");
@@ -213,7 +213,7 @@ const TableContainer = props => {
213
213
  flex: 1,
214
214
  overflow: 'hidden'
215
215
  }
216
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
216
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
217
217
  items: toolbarItemTop ?? [],
218
218
  mode: toolbarMode
219
219
  })), /*#__PURE__*/_react.default.createElement("div", {
@@ -236,7 +236,7 @@ const TableContainer = props => {
236
236
  flex: 1,
237
237
  overflow: 'hidden'
238
238
  }
239
- }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar, {
239
+ }, /*#__PURE__*/_react.default.createElement(_GridToolbar.default, {
240
240
  items: toolbarItemTopRight,
241
241
  mode: toolbarMode
242
242
  })), /*#__PURE__*/_react.default.createElement(_GridRefreshButton.default, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "es-grid-template",
3
- "version": "1.9.103",
3
+ "version": "1.9.105",
4
4
  "description": "es-grid-template",
5
5
  "keywords": [
6
6
  "react",
package/CHANGELOG.md DELETED
@@ -1,34 +0,0 @@
1
- # Changelog
2
-
3
- ## 1.9.103 / 10-11-2026
4
-
5
- ### Fixed
6
- - Fixed infinite jitter/oscillation at table bottom in `TableVirtuoso` when rows have wrapped text (`wrapMode: 'Both'`).
7
- - Removed hardcoded inline `height` on non-editable rows (`editAble={false}`) in `TableWrapper` and `TableBodyRow`, allowing dynamic row height expansion with natural `ResizeObserver` measurement.
8
- - Added `overscroll-behavior: none` and `overflow-anchor: none` to virtuoso scroller container to prevent scroll anchoring artifacts at bottom boundary.
9
- - Provided consistent `computeItemKey` and `100%` height style to `TableVirtuoso`.
10
- - Fixed filter operator reset logic in `TableHeadCell`: resetting filter now restores column's default operator instead of remaining empty.
11
- - Fixed filter dropdown state synchronization on open/close in `TableHeadCell`.
12
-
13
- ### Added
14
- - Added multi-line text wrapping styles (`white-space: normal`, `word-break: break-word`, `line-height: 1.4`) for `*-grid-cell-text-wrap` across all table components.
15
- - Added `searchTextAsValue` support to `SelectTable` and `async-table-select`.
16
- - Added `i18n` translation fallback support for filter search inputs and column grouping labels.
17
-
18
- ### Changed
19
- - Converted rigid cell/row height styles (`height: 36px/32px`) to `minHeight` in `group-component` and `table-component` with row remeasuring on virtual index change.
20
-
21
- ## 1.9.95 / 06-11-2026
22
-
23
- ### Added
24
- - Added opt-in `selectionSettings.pruneSelection` (default `false`) to keep selected rows within the current filtered data view.
25
-
26
- ### Fixed
27
- - Preserved existing selection on sorting, grouping, expand/collapse and virtual scrolling when rows remain in the view.
28
- - Synchronized selection callbacks with current view rows, preserving original `children` data.
29
- - Fixed group selection with disabled child rows, including `getCheckboxProps` rules based on tree structure.
30
- - Kept existing selection during temporary loading and preserved legacy behavior when the option is disabled.
31
-
32
- ## 0.0.1 / 20-02-2025
33
-
34
- add package