es-grid-template 1.8.44 → 1.8.46

package/es/table-component/InternalTable.js

@@ -29,7 +29,7 @@ import Grid from "./table/Grid";
 
 // import { Tooltip } from 'react-tooltip'
 // import ContextMenu from './ContextMenu'
-import { addRowIdArray, convertToObj, convertToObjTrue,
+import { addRowIdArray, convertFlatColumn1, convertToObj, convertToObjTrue,
 // convertFilters,
 filterDataByColumns, findAllChildrenKeys2, flatColumns2,
 // filterDataByColumns,
@@ -37,6 +37,7 @@ getAllRowKey, getDiffent2Array, getFixedFields, getInvisibleColumns, groupArrayB
 // import GridEdit from './table/GridEdit'
 import { convertToTanStackColumns } from "./hook/useColumns";
 import { convertColumns } from "./hook/convert";
+import { removeInvisibleColumns } from "../grid-component/hooks";
 // import { Modal } from 'antd'
 // import { findAllChildrenKeys2 } from '../grid-component/hooks'
 // import { columns111 } from '../test-2/columns'
@@ -64,6 +65,7 @@ const InternalTable = props => {
     groupColumns,
     selectionSettings,
     expandable,
+    onChooseColumns,
     // contextMenuClick,
     // contextMenuOpen,
     height,
@@ -174,6 +176,11 @@ const InternalTable = props => {
       const aa = flatColumns2(columns).map(it => it.field);
       const rsss = getDiffent2Array(aa, keys);
       setColumnsHiddenKeys(rsss);
+      onChooseColumns?.({
+        showColumns: removeInvisibleColumns([...cols]),
+        columns: [...cols],
+        flattenColumns: convertFlatColumn1([...cols])
+      });
     }
   };
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Grid, _extends({}, rest, {

package/es/table-component/TableContainerEdit.js

@@ -474,27 +474,37 @@ const TableContainerEdit = props => {
           const isEdit = typeof columnOri?.editEnable === 'function' ? columnOri.editEnable(newData[targetRow]) : columnOri.editEnable;
           if (isEdit) {
             const columnKey = allCols[targetCol].id;
-            if (columnOri.type === 'number' && isFormattedNumber(cellValue.trim())) {
-              const colFormat = typeof columnOri.format === 'function' ? columnOri.format(record) : columnOri.format;
-              const valuePasteFormat = detectSeparators(cellValue.trim());
-              const cellFormat = getFormat(colFormat, format);
-              const thousandSeparator = valuePasteFormat?.thousandSeparator ?? cellFormat?.thousandSeparator;
-              const decimalSeparator = valuePasteFormat?.decimalSeparator ?? cellFormat?.decimalSeparator;
-              const dec = cellFormat?.decimalScale;
-              const numericFormatProps = {
-                thousandSeparator: checkThousandSeparator(thousandSeparator, decimalSeparator),
-                decimalSeparator: checkDecimalSeparator(thousandSeparator, decimalSeparator),
-                allowNegative: cellFormat?.allowNegative ?? true,
-                prefix: cellFormat?.prefix,
-                suffix: cellFormat?.suffix,
-                decimalScale: dec,
-                fixedDecimalScale: cellFormat?.fixedDecimalScale ?? false
-              };
-              const val = removeNumericFormat(cellValue.trim(), undefined, numericFormatProps);
-              newData[targetRow] = {
-                ...newData[targetRow],
-                [columnKey]: Number(val)
-              };
+
+            // if (columnOri.type === 'number' && isFormattedNumber(cellValue.trim())) {
+            if (columnOri.type === 'number') {
+              if (cellValue.trim() === '') {
+                newData[targetRow] = {
+                  ...newData[targetRow],
+                  [columnKey]: null
+                };
+              }
+              if (isFormattedNumber(cellValue.trim())) {
+                const colFormat = typeof columnOri.format === 'function' ? columnOri.format(record) : columnOri.format;
+                const valuePasteFormat = detectSeparators(cellValue.trim());
+                const cellFormat = getFormat(colFormat, format);
+                const thousandSeparator = valuePasteFormat?.thousandSeparator ?? cellFormat?.thousandSeparator;
+                const decimalSeparator = valuePasteFormat?.decimalSeparator ?? cellFormat?.decimalSeparator;
+                const dec = cellFormat?.decimalScale;
+                const numericFormatProps = {
+                  thousandSeparator: checkThousandSeparator(thousandSeparator, decimalSeparator),
+                  decimalSeparator: checkDecimalSeparator(thousandSeparator, decimalSeparator),
+                  allowNegative: cellFormat?.allowNegative ?? true,
+                  prefix: cellFormat?.prefix,
+                  suffix: cellFormat?.suffix,
+                  decimalScale: dec,
+                  fixedDecimalScale: cellFormat?.fixedDecimalScale ?? false
+                };
+                const val = removeNumericFormat(cellValue.trim(), undefined, numericFormatProps);
+                newData[targetRow] = {
+                  ...newData[targetRow],
+                  [columnKey]: Number(val)
+                };
+              }
             } else {
               newData[targetRow] = {
                 ...newData[targetRow],

package/es/table-component/hook/utils.d.ts

@@ -153,3 +153,4 @@ export declare function toggleRowAndChildren(row: Row<any>, isSelected?: boolean
 export declare function countUnselectedChildren(row: Row<any>): number;
 export declare function removeDuplicatesByKey(arr: any[], key?: string): any[];
 export declare const getTableHeight: (height?: number, minHeight?: number) => number;
+export declare const convertFlatColumn1: (array: ColumnsTable) => ColumnsTable[];

package/es/table-component/hook/utils.js

@@ -2266,4 +2266,16 @@ export const getTableHeight = (height, minHeight) => {
     //   return minHeight
     // }
   }
+};
+export const convertFlatColumn1 = array => {
+  const tmp = [...array];
+  let result = [];
+  tmp.forEach(item => {
+    if (item.children) {
+      result = result.concat(convertFlatColumn1(item.children));
+    } else {
+      result.push(item);
+    }
+  });
+  return result;
 };

package/es/table-component/style.scss

@@ -16,7 +16,7 @@ $cell-selected-bg: #F3F8FF !default;
 $cell-index-selected-bg: #1869E6 !default;
 //$cell-index-focus-bg: #CEDBEF !default;
 $cell-index-focus-bg: #E6EFFD !default;
-$rowSelectedHoverBg: 'ui-rc' !default;
+// $rowSelectedHoverBg: 'ui-rc' !default;
 $boxShadowColor: rgba(5, 5, 5, 0.09) !default;
 $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
 
@@ -546,9 +546,10 @@ $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
           // ------------ select  ---------------
 
           .#{$prefix}-table-select-single .#{$prefix}-table-select-selector,
-          .#{$prefix}-select-single .#{$prefix}-select-selector {
+          .#{$prefix}-select-single .#{$prefix}-select-selector,
+          .ui-rc-table-select-selector {
 
-            border-radius: 0;
+            border-radius: 0 !important;
 
           }
 

package/lib/table-component/InternalTable.js

@@ -19,6 +19,7 @@ var _Grid = _interopRequireDefault(require("./table/Grid"));
 var _utils = require("./hook/utils");
 var _useColumns = require("./hook/useColumns");
 var _convert = require("./hook/convert");
+var _hooks = require("../grid-component/hooks");
 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); }
 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; }
 // import en from "rc-master-ui/es/date-picker/locale/en_US"
@@ -70,6 +71,7 @@ const InternalTable = props => {
     groupColumns,
     selectionSettings,
     expandable,
+    onChooseColumns,
     // contextMenuClick,
     // contextMenuOpen,
     height,
@@ -180,6 +182,11 @@ const InternalTable = props => {
       const aa = (0, _utils.flatColumns2)(columns).map(it => it.field);
       const rsss = (0, _utils.getDiffent2Array)(aa, keys);
       setColumnsHiddenKeys(rsss);
+      onChooseColumns?.({
+        showColumns: (0, _hooks.removeInvisibleColumns)([...cols]),
+        columns: [...cols],
+        flattenColumns: (0, _utils.convertFlatColumn1)([...cols])
+      });
     }
   };
   return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_Grid.default, (0, _extends2.default)({}, rest, {

package/lib/table-component/TableContainerEdit.js

@@ -481,27 +481,37 @@ const TableContainerEdit = props => {
           const isEdit = typeof columnOri?.editEnable === 'function' ? columnOri.editEnable(newData[targetRow]) : columnOri.editEnable;
           if (isEdit) {
             const columnKey = allCols[targetCol].id;
-            if (columnOri.type === 'number' && (0, _utils.isFormattedNumber)(cellValue.trim())) {
-              const colFormat = typeof columnOri.format === 'function' ? columnOri.format(record) : columnOri.format;
-              const valuePasteFormat = (0, _utils.detectSeparators)(cellValue.trim());
-              const cellFormat = (0, _utils.getFormat)(colFormat, format);
-              const thousandSeparator = valuePasteFormat?.thousandSeparator ?? cellFormat?.thousandSeparator;
-              const decimalSeparator = valuePasteFormat?.decimalSeparator ?? cellFormat?.decimalSeparator;
-              const dec = cellFormat?.decimalScale;
-              const numericFormatProps = {
-                thousandSeparator: (0, _utils.checkThousandSeparator)(thousandSeparator, decimalSeparator),
-                decimalSeparator: (0, _utils.checkDecimalSeparator)(thousandSeparator, decimalSeparator),
-                allowNegative: cellFormat?.allowNegative ?? true,
-                prefix: cellFormat?.prefix,
-                suffix: cellFormat?.suffix,
-                decimalScale: dec,
-                fixedDecimalScale: cellFormat?.fixedDecimalScale ?? false
-              };
-              const val = (0, _reactNumericComponent.removeNumericFormat)(cellValue.trim(), undefined, numericFormatProps);
-              newData[targetRow] = {
-                ...newData[targetRow],
-                [columnKey]: Number(val)
-              };
+
+            // if (columnOri.type === 'number' && isFormattedNumber(cellValue.trim())) {
+            if (columnOri.type === 'number') {
+              if (cellValue.trim() === '') {
+                newData[targetRow] = {
+                  ...newData[targetRow],
+                  [columnKey]: null
+                };
+              }
+              if ((0, _utils.isFormattedNumber)(cellValue.trim())) {
+                const colFormat = typeof columnOri.format === 'function' ? columnOri.format(record) : columnOri.format;
+                const valuePasteFormat = (0, _utils.detectSeparators)(cellValue.trim());
+                const cellFormat = (0, _utils.getFormat)(colFormat, format);
+                const thousandSeparator = valuePasteFormat?.thousandSeparator ?? cellFormat?.thousandSeparator;
+                const decimalSeparator = valuePasteFormat?.decimalSeparator ?? cellFormat?.decimalSeparator;
+                const dec = cellFormat?.decimalScale;
+                const numericFormatProps = {
+                  thousandSeparator: (0, _utils.checkThousandSeparator)(thousandSeparator, decimalSeparator),
+                  decimalSeparator: (0, _utils.checkDecimalSeparator)(thousandSeparator, decimalSeparator),
+                  allowNegative: cellFormat?.allowNegative ?? true,
+                  prefix: cellFormat?.prefix,
+                  suffix: cellFormat?.suffix,
+                  decimalScale: dec,
+                  fixedDecimalScale: cellFormat?.fixedDecimalScale ?? false
+                };
+                const val = (0, _reactNumericComponent.removeNumericFormat)(cellValue.trim(), undefined, numericFormatProps);
+                newData[targetRow] = {
+                  ...newData[targetRow],
+                  [columnKey]: Number(val)
+                };
+              }
             } else {
               newData[targetRow] = {
                 ...newData[targetRow],

package/lib/table-component/hook/utils.d.ts

@@ -153,3 +153,4 @@ export declare function toggleRowAndChildren(row: Row<any>, isSelected?: boolean
 export declare function countUnselectedChildren(row: Row<any>): number;
 export declare function removeDuplicatesByKey(arr: any[], key?: string): any[];
 export declare const getTableHeight: (height?: number, minHeight?: number) => number;
+export declare const convertFlatColumn1: (array: ColumnsTable) => ColumnsTable[];

package/lib/table-component/hook/utils.js

@@ -17,7 +17,7 @@ exports.compareDate = compareDate;
 exports.compareDates = compareDates;
 exports.convertArrayWithIndent = void 0;
 exports.convertColumnsToTreeData = convertColumnsToTreeData;
-exports.convertFilters = exports.convertDayjsToDate = exports.convertDateToDayjs = void 0;
+exports.convertFlatColumn1 = exports.convertFilters = exports.convertDayjsToDate = exports.convertDateToDayjs = void 0;
 exports.convertFormat = convertFormat;
 exports.convertToObjTrue = exports.convertToObj = exports.convertLabelToTitle = void 0;
 exports.countUnselectedChildren = countUnselectedChildren;
@@ -2388,4 +2388,17 @@ const getTableHeight = (height, minHeight) => {
     // }
   }
 };
-exports.getTableHeight = getTableHeight;
+exports.getTableHeight = getTableHeight;
+const convertFlatColumn1 = array => {
+  const tmp = [...array];
+  let result = [];
+  tmp.forEach(item => {
+    if (item.children) {
+      result = result.concat(convertFlatColumn1(item.children));
+    } else {
+      result.push(item);
+    }
+  });
+  return result;
+};
+exports.convertFlatColumn1 = convertFlatColumn1;

package/lib/table-component/style.scss

@@ -16,7 +16,7 @@ $cell-selected-bg: #F3F8FF !default;
 $cell-index-selected-bg: #1869E6 !default;
 //$cell-index-focus-bg: #CEDBEF !default;
 $cell-index-focus-bg: #E6EFFD !default;
-$rowSelectedHoverBg: 'ui-rc' !default;
+// $rowSelectedHoverBg: 'ui-rc' !default;
 $boxShadowColor: rgba(5, 5, 5, 0.09) !default;
 $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
 
@@ -546,9 +546,10 @@ $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
           // ------------ select  ---------------
 
           .#{$prefix}-table-select-single .#{$prefix}-table-select-selector,
-          .#{$prefix}-select-single .#{$prefix}-select-selector {
+          .#{$prefix}-select-single .#{$prefix}-select-selector,
+          .ui-rc-table-select-selector {
 
-            border-radius: 0;
+            border-radius: 0 !important;
 
           }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.8.44",
+  "version": "1.8.46",
   "description": "es-grid-template",
   "keywords": [
     "react",