@kne/table-page 0.1.5 → 0.1.6

package/dist/index.modern.js

@@ -18,7 +18,6 @@ import findLastIndex from 'lodash/findLastIndex';
 import isEqual from 'lodash/isEqual';
 import { useDebouncedCallback } from 'use-debounce';
 import { ReactSortable } from 'react-sortablejs';
-import set from 'lodash/set';
 import cloneDeep from 'lodash/cloneDeep';
 import { createWithIntlProvider, useIntl } from '@kne/react-intl';
 import filterZhCN from '@kne/react-filter/dist/locale/zh-CN';
@@ -1336,6 +1335,20 @@ const useSort = (props = {}) => {
 };
 useSort.sortDataSource = sortDataSource;
 
+const getColumnConfig = (config, columnName, field, defaultValue) => {
+  const columnConfig = config == null ? void 0 : config[columnName];
+  if (columnConfig != null && columnConfig[field] !== undefined) {
+    return columnConfig[field];
+  }
+  const legacyValue = get(config, `${columnName}.${field}`);
+  return legacyValue === undefined ? defaultValue : legacyValue;
+};
+const setColumnConfig = (config, columnName, updates) => {
+  return Object.assign({}, config, {
+    [columnName]: Object.assign({}, config == null ? void 0 : 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 = {
@@ -1408,9 +1421,9 @@ const ColumnsControlContent = withLocale(({
       if (item.fixed === true || item.fixed === 'left') {
         return 'leftFixedColumns';
       }
-      return get(config, `${item.name}.visible`) !== true && item.hidden || get(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(config, `${a.name}.rank`, 0) - get(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 = useMemo(() => {
@@ -1422,10 +1435,14 @@ const ColumnsControlContent = withLocale(({
     const newConfig = cloneDeep(config);
     const columnsList = [].concat(columnsState.leftFixedColumns, columnsState.visibleColumns, columnsState.rightFixedColumns);
     (columnsState.hiddenColumns || []).forEach(col => {
-      set(newConfig, `${col.name}.visible`, false);
+      Object.assign(newConfig, setColumnConfig(newConfig, col.name, {
+        visible: false
+      }));
     });
     columnsList.forEach((col, index) => {
-      set(newConfig, `${col.name}.rank`, index + 1);
+      Object.assign(newConfig, setColumnConfig(newConfig, col.name, {
+        rank: index + 1
+      }));
     });
     onChange(newConfig);
   };
@@ -1768,8 +1785,8 @@ const useTableConfig = ({
     }
   }, [name, _controllerOpen, _tableServerApis]);
   const visibleColumns = useMemo(() => {
-    return columns.filter(col => !(get(config, `${col.name}.visible`) === false || get(config, `${col.name}.visible`) !== true && col.hidden === true)).sort((a, b) => {
-      const computedIndex = item => get(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]);
@@ -1783,7 +1800,7 @@ const useTableConfig = ({
       const {
         width
       } = getColumnSize(col);
-      const contentWidth = get(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]);
@@ -1806,7 +1823,7 @@ const useTableConfig = ({
       min,
       max
     } = getColumnSize(column);
-    const currentWidth = Math.min(Math.max(get(config, `${column.name}.width`) || width, min), max);
+    const currentWidth = Math.min(Math.max(getColumnConfig(config, column.name, 'width') || width, min), max);
     return {
       currentWidth,
       min,