@kne/table-page 0.1.5 → 0.1.6

package/README.md

@@ -2,7 +2,7 @@
 
 ### 描述
 
-A React table page component based on Ant Design 5, supporting column config, filter, sort and batch operations.
+A React table page component based on Ant Design, supporting column config, filter, sort and batch operations.
 
 ### 安装
 

package/dist/index.js

@@ -18,7 +18,6 @@ var findLastIndex = require('lodash/findLastIndex');
 var isEqual = require('lodash/isEqual');
 var useDebounce = require('use-debounce');
 var reactSortablejs = require('react-sortablejs');
-var set = require('lodash/set');
 var cloneDeep = require('lodash/cloneDeep');
 var reactIntl = require('@kne/react-intl');
 var filterZhCN = require('@kne/react-filter/dist/locale/zh-CN');
@@ -39,7 +38,6 @@ var useRefCallback__default = /*#__PURE__*/_interopDefaultLegacy(useRefCallback)
 var pick__default = /*#__PURE__*/_interopDefaultLegacy(pick);
 var findLastIndex__default = /*#__PURE__*/_interopDefaultLegacy(findLastIndex);
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
-var set__default = /*#__PURE__*/_interopDefaultLegacy(set);
 var cloneDeep__default = /*#__PURE__*/_interopDefaultLegacy(cloneDeep);
 var filterZhCN__default = /*#__PURE__*/_interopDefaultLegacy(filterZhCN);
 var filterEnUS__default = /*#__PURE__*/_interopDefaultLegacy(filterEnUS);
@@ -1360,6 +1358,20 @@ const useSort = function (props) {
 };
 useSort.sortDataSource = sortDataSource;
 
+const getColumnConfig = (config, columnName, field, defaultValue) => {
+  const columnConfig = config?.[columnName];
+  if (columnConfig != null && columnConfig[field] !== undefined) {
+    return columnConfig[field];
+  }
+  const legacyValue = get__default["default"](config, `${columnName}.${field}`);
+  return legacyValue === undefined ? defaultValue : legacyValue;
+};
+const setColumnConfig = (config, columnName, updates) => {
+  return Object.assign({}, config, {
+    [columnName]: Object.assign({}, config?.[columnName], updates)
+  });
+};
+
 var configStyle = {"cell-resize-bar":"kne-table-page_PNaAP","table-changer-setting":"kne-table-page_B0U-O","is-active":"kne-table-page_vHrQo","table-config-header":"kne-table-page_Zp8MN","table-config-header-title":"kne-table-page_Pc6jR","columns-control-content":"kne-table-page_saJmr","columns-control-content-title":"kne-table-page_YmHni","columns-control-content-scroller":"kne-table-page_rgqWB","columns-control-sortable-list":"kne-table-page_JRcBW","columns-control-content-footer":"kne-table-page_nLwW1","columns-control-content-input":"kne-table-page_9qyJs","columns-control-content-list":"kne-table-page_Sslzr","columns-control-content-item":"kne-table-page_7CamD","is-drag":"kne-table-page_X18rq","columns-control-content-item-icon":"kne-table-page_Eab-e","columns-control-overlay":"kne-table-page_eT4HV","header-col":"kne-table-page_bjDly","header-cell-inner":"kne-table-page_9FKgD"};
 
 const locale$1 = {
@@ -1449,9 +1461,9 @@ const ColumnsControlContent = withLocale(({
       if (item.fixed === true || item.fixed === 'left') {
         return 'leftFixedColumns';
       }
-      return get__default["default"](config, `${item.name}.visible`) !== true && item.hidden || get__default["default"](config, `${item.name}.visible`) === false ? 'hiddenColumns' : 'visibleColumns';
+      return getColumnConfig(config, item.name, 'visible') !== true && item.hidden || getColumnConfig(config, item.name, 'visible') === false ? 'hiddenColumns' : 'visibleColumns';
     })), (result, value, key) => {
-      result[key] = value.sort((a, b) => get__default["default"](config, `${a.name}.rank`, 0) - get__default["default"](config, `${b.name}.rank`, 0));
+      result[key] = value.sort((a, b) => getColumnConfig(config, a.name, 'rank', 0) - getColumnConfig(config, b.name, 'rank', 0));
     }, {});
   }, [columns, config]);
   const sortableVisibleColumns = react.useMemo(() => {
@@ -1463,10 +1475,14 @@ const ColumnsControlContent = withLocale(({
     const newConfig = cloneDeep__default["default"](config);
     const columnsList = [].concat(columnsState.leftFixedColumns, columnsState.visibleColumns, columnsState.rightFixedColumns);
     (columnsState.hiddenColumns || []).forEach(col => {
-      set__default["default"](newConfig, `${col.name}.visible`, false);
+      Object.assign(newConfig, setColumnConfig(newConfig, col.name, {
+        visible: false
+      }));
     });
     columnsList.forEach((col, index) => {
-      set__default["default"](newConfig, `${col.name}.rank`, index + 1);
+      Object.assign(newConfig, setColumnConfig(newConfig, col.name, {
+        rank: index + 1
+      }));
     });
     onChange(newConfig);
   };
@@ -1833,8 +1849,8 @@ const useTableConfig = _ref2 => {
     }
   }, [name, controllerOpen, tableServerApis]);
   const visibleColumns = react.useMemo(() => {
-    return columns.filter(col => !(get__default["default"](config, col.name + ".visible") === false || get__default["default"](config, col.name + ".visible") !== true && col.hidden === true)).sort((a, b) => {
-      const computedIndex = item => get__default["default"](config, item.name + ".rank", 0) + (item.fixed === 'left' || item.fixed === true ? -10000 : 0) + (item.fixed === 'right' ? 10000 : 0);
+    return columns.filter(col => !(getColumnConfig(config, col.name, 'visible') === false || getColumnConfig(config, col.name, 'visible') !== true && col.hidden === true)).sort((a, b) => {
+      const computedIndex = item => getColumnConfig(config, item.name, 'rank', 0) + (item.fixed === 'left' || item.fixed === true ? -10000 : 0) + (item.fixed === 'right' ? 10000 : 0);
       return computedIndex(a) - computedIndex(b);
     });
   }, [columns, config]);
@@ -1847,7 +1863,7 @@ const useTableConfig = _ref2 => {
     return visibleColumns.reduce((sum, col, index) => {
       const _getColumnSize = getColumnSize(col),
         width = _getColumnSize.width;
-      const contentWidth = get__default["default"](config, col.name + ".width") || width;
+      const contentWidth = getColumnConfig(config, col.name, 'width') || width;
       return sum + withConfigColumnExtra(contentWidth, index, columnCount, controllerOpen);
     }, 0);
   }, [visibleColumns, config, columnCount, controllerOpen]);
@@ -1868,7 +1884,7 @@ const useTableConfig = _ref2 => {
       width = _getColumnSize2.width,
       min = _getColumnSize2.min,
       max = _getColumnSize2.max;
-    const currentWidth = Math.min(Math.max(get__default["default"](config, column.name + ".width") || width, min), max);
+    const currentWidth = Math.min(Math.max(getColumnConfig(config, column.name, 'width') || width, min), max);
     return {
       currentWidth,
       min,