@hw-component/table 1.1.7 → 1.1.9

package/lib/HTableBody/Options/index.js

@@ -2,8 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _slicedToArray = require('@babel/runtime-corejs3/helpers/slicedToArray');
-var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/keys');
 var jsxRuntime = require('react/jsx-runtime');
 var index = require('../../hooks/index.js');
 var antd = require('antd');
@@ -11,8 +9,7 @@ var icons = require('@ant-design/icons');
 var React = require('react');
 var Content = require('./Content.js');
 var Title = require('./Title.js');
-var context = require('../../context.js');
-var utils = require('./utils.js');
+var hooks = require('./hooks.js');
 
 var Options = (function (_ref) {
   var reload = _ref.reload,
@@ -22,26 +19,16 @@ var Options = (function (_ref) {
     density = _ref$density === void 0 ? true : _ref$density,
     setSizeChange = _ref.setSizeChange,
     columns = _ref.columns,
-    onChange = _ref.onChange;
+    onChange = _ref.onChange,
+    colStatusValue = _ref.colStatusValue,
+    reset = _ref.reset,
+    settingRender = _ref.settingRender;
   var pointer = index.useClassName(["hw-table-pointer", "hw-table-body-option-icon"]);
   var ref = React.useRef(null);
-  var _useState = React.useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    keys = _useState2[0],
-    setKeys = _useState2[1];
-  var _useHTableContext = context.useHTableContext(),
-    tableInstance = _useHTableContext.tableInstance;
-  React.useEffect(function () {
-    var _defaultKeys = utils.defaultKeys(columns),
-      changeKeys = _keysInstanceProperty(_defaultKeys),
-      allKeys = _defaultKeys.allKeys,
-      checkCols = _defaultKeys.checkCols;
-    tableInstance.table.settingKeys = {
-      keys: allKeys,
-      checkCols: checkCols
-    };
-    setKeys(changeKeys);
-  }, [columns]);
+  var checkKeys = hooks.useCheckKeys({
+    columns: columns,
+    colStatusValue: colStatusValue
+  });
   var SizeItem = function SizeItem() {
     var MenuComponent = antd.Menu;
     var MenuItem = antd.Menu.Item;
@@ -71,9 +58,8 @@ var Options = (function (_ref) {
   };
   return jsxRuntime.jsx(antd.Row, {
     justify: "end",
-    ref: ref,
     children: jsxRuntime.jsxs(antd.Space, {
-      size: 20,
+      size: 15,
       children: [reload && jsxRuntime.jsx(antd.Tooltip, {
         title: "\u5237\u65B0",
         children: jsxRuntime.jsx(icons.ReloadOutlined, {
@@ -97,24 +83,26 @@ var Options = (function (_ref) {
             width: 24
           })
         })
-      }), jsxRuntime.jsx(antd.Tooltip, {
-        title: "\u5217\u8BBE\u7F6E",
-        children: jsxRuntime.jsx(antd.Popover, {
-          content: jsxRuntime.jsx(Content.ColsSettingContent, {
-            columns: columns,
-            checkKeys: keys,
-            onChange: onChange
-          }),
-          title: jsxRuntime.jsx(Title.Title, {
-            columns: columns,
-            checkKeys: keys,
-            onChange: onChange
-          }),
-          placement: "bottomLeft",
-          getPopupContainer: function getPopupContainer() {
-            return ref.current || document.body;
-          },
-          trigger: "click",
+      }), jsxRuntime.jsx(antd.Popover, {
+        content: jsxRuntime.jsx(Content.ColsSettingContent, {
+          columns: columns,
+          checkKeys: checkKeys,
+          onCheck: onChange
+        }),
+        title: jsxRuntime.jsx(Title.Title, {
+          columns: columns,
+          reset: reset,
+          checkKeys: checkKeys,
+          onCheck: onChange
+        }),
+        placement: "bottomRight",
+        getPopupContainer: function getPopupContainer() {
+          return ref.current || document.body;
+        },
+        arrowPointAtCenter: true,
+        trigger: "click",
+        children: settingRender ? settingRender() : jsxRuntime.jsx(antd.Tooltip, {
+          title: "\u5217\u8BBE\u7F6E",
           children: jsxRuntime.jsx(icons.SettingOutlined, {
             className: pointer,
             width: 24

package/lib/HTableBody/Options/utils.d.ts

@@ -1,4 +1,4 @@
-import type { ConfigDataModal, ConfigItemModal } from "../../modal";
+import type { ConfigItemModal } from "../../modal";
 import React from "react";
 export declare const getItemValue: (data: ConfigItemModal) => {
     name?: string | undefined;
@@ -1124,12 +1124,7 @@ export declare const getItemValue: (data: ConfigItemModal) => {
         onChange?: ((color: string) => void) | undefined;
         colors?: string[] | undefined;
     }))) | undefined;
-    childrenDataIndex?: ConfigItemModal[] | string[] | undefined;
+    childrenDataIndex?: string[] | ConfigItemModal[] | undefined;
     title: any;
     dataIndex: ((string | number | (string | number)[]) & import("rc-table/lib/interface").DataIndex) | undefined;
 };
-export declare const defaultKeys: (cols: ConfigDataModal) => {
-    keys: string[];
-    allKeys: string[];
-    checkCols: ConfigDataModal;
-};

package/lib/HTableBody/Options/utils.js

@@ -4,16 +4,12 @@ var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
 var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js/object/get-own-property-symbols');
 var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/filter');
 var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptor');
+var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
 var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptors');
 var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/define-properties');
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
-var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
-require('core-js/modules/es.object.to-string.js');
-require('core-js/modules/es.regexp.to-string.js');
-var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
-var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/keys');
 var React = require('react');
 
 var _excluded = ["dataIndex", "title", "titleStr"];
@@ -33,58 +29,6 @@ var getItemValue = function getItemValue(data) {
     dataIndex: dataIndex
   }, oData);
 };
-var childDataIndexProvider = function childDataIndexProvider(data, title) {
-  var keys = [];
-  var cols = [];
-  _forEachInstanceProperty(data).call(data, function (value) {
-    if (typeof value === "string") {
-      keys.push(value);
-      cols.push(getItemValue({
-        title: title,
-        dataIndex: value
-      }));
-      return;
-    }
-    keys.push(value.dataIndex);
-    cols.push(getItemValue(value));
-  });
-  return {
-    keys: keys,
-    cols: cols
-  };
-};
-var defaultKeys = function defaultKeys(cols) {
-  var keys = [];
-  var allKeys = [];
-  var checkCols = [];
-  _forEachInstanceProperty(cols).call(cols, function (value) {
-    var title = value.title,
-      titleStr = value.titleStr,
-      dataIndex = value.dataIndex,
-      hideInTable = value.hideInTable,
-      childrenDataIndex = value.childrenDataIndex;
-    if (hideInTable || !dataIndex) {
-      return;
-    }
-    keys.push(dataIndex.toString());
-    if (childrenDataIndex) {
-      var _childDataIndexProvid = childDataIndexProvider(childrenDataIndex, titleStr || title),
-        childKeys = _keysInstanceProperty(_childDataIndexProvid),
-        childCols = _childDataIndexProvid.cols;
-      allKeys.push.apply(allKeys, _toConsumableArray(childKeys));
-      checkCols.push.apply(checkCols, _toConsumableArray(childCols));
-      return;
-    }
-    allKeys.push(dataIndex.toString());
-    checkCols.push(getItemValue(value));
-  });
-  return {
-    keys: keys,
-    allKeys: allKeys,
-    checkCols: checkCols
-  };
-};
 
-exports.defaultKeys = defaultKeys;
 exports.getItemValue = getItemValue;
 // powered by h

package/lib/HTableBody/hooks.d.ts

@@ -2,9 +2,10 @@ import type { HTableProps, ConfigDataModal } from "../modal";
 import React from "react";
 import type { GetRowKey } from "rc-table/lib/interface";
 import type { SizeType } from "antd/lib/config-provider/SizeContext";
+import type { ColumnsStateType } from "@ant-design/pro-table/es/typing";
+import type { ColumnsState } from "@ant-design/pro-table/es/container";
 export declare const useCols: ({ configData, rowSelection, table }: HTableProps) => {
     cols: ConfigDataModal;
-    changeCols: (cuCols: ConfigDataModal) => void;
 };
 interface FilterKeysModal {
     selectedRowKeys?: React.Key[];
@@ -16,4 +17,15 @@ export declare const useSize: (size: SizeType) => {
     cuSize: "small" | "middle" | "large" | undefined;
     setCuSize: React.Dispatch<React.SetStateAction<"small" | "middle" | "large" | undefined>>;
 };
+interface useColumnsStateTypeModal {
+    columnsState?: ColumnsStateType;
+    columns: ConfigDataModal;
+}
+export declare const useColumnsStateType: ({ columnsState, columns, }: useColumnsStateTypeModal) => {
+    persistenceType: "localStorage" | "sessionStorage" | undefined;
+    persistenceKey: string | undefined;
+    value: Record<string, ColumnsState> | undefined;
+    onChange: (keys: string[], notCheck: string[]) => void;
+    reset: () => void;
+};
 export {};

package/lib/HTableBody/hooks.js

@@ -3,7 +3,6 @@
 var _Object$keys = require('@babel/runtime-corejs3/core-js/object/keys');
 var _Object$getOwnPropertySymbols = require('@babel/runtime-corejs3/core-js/object/get-own-property-symbols');
 var _Object$getOwnPropertyDescriptor = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptor');
-var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
 var _Object$getOwnPropertyDescriptors = require('@babel/runtime-corejs3/core-js/object/get-own-property-descriptors');
 var _Object$defineProperties = require('@babel/runtime-corejs3/core-js/object/define-properties');
 var _Object$defineProperty = require('@babel/runtime-corejs3/core-js/object/define-property');
@@ -13,10 +12,12 @@ var _filterInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/f
 var _spliceInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/splice');
 var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/map');
 var _indexOfInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/index-of');
+var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var context = require('../context.js');
 var RowSelection = require('./RowSelection.js');
+var utils = require('./utils.js');
 
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -73,12 +74,8 @@ var useCols = function useCols(_ref2) {
   React.useEffect(function () {
     setCols(changeConfigData(configData));
   }, [configData, table, rowSelection]);
-  var changeCols = function changeCols(cuCols) {
-    setCols(cuCols);
-  };
   return {
-    cols: cols,
-    changeCols: changeCols
+    cols: cols
   };
 };
 var useSynchronousKeys = function useSynchronousKeys(_ref3) {
@@ -110,8 +107,56 @@ var useSize = function useSize(size) {
     setCuSize: setCuSize
   };
 };
+var useColumnsStateType = function useColumnsStateType(_ref4) {
+  var columnsState = _ref4.columnsState,
+    columns = _ref4.columns;
+  var _useHTableContext2 = context.useHTableContext(),
+    tableInstance = _useHTableContext2.tableInstance;
+  var _ref5 = columnsState || {},
+    persistenceType = _ref5.persistenceType,
+    persistenceKey = _ref5.persistenceKey,
+    value = _ref5.value,
+    defaultValue = _ref5.defaultValue,
+    onChange = _ref5.onChange;
+  var _useState5 = React.useState(defaultValue),
+    _useState6 = _slicedToArray(_useState5, 2),
+    selfValue = _useState6[0],
+    setSelfValue = _useState6[1];
+  var initTableColsVal = React.useMemo(function () {
+    return selfValue;
+  }, []);
+  React.useEffect(function () {
+    tableInstance.table.getColSettingKeys = function () {
+      return utils.outColSetting(columns, selfValue);
+    };
+  }, [selfValue]);
+  React.useEffect(function () {
+    setSelfValue(utils.mkChangeValue(columnsState));
+  }, [value]);
+  var change = function change(keys, notCheck) {
+    var newObj = {};
+    _forEachInstanceProperty(notCheck).call(notCheck, function (key) {
+      newObj[key] = {
+        show: false
+      };
+    });
+    setSelfValue(newObj);
+    onChange === null || onChange === void 0 || onChange(newObj);
+  };
+  var reset = function reset() {
+    setSelfValue(initTableColsVal);
+  };
+  return {
+    persistenceType: persistenceType,
+    persistenceKey: persistenceKey,
+    value: selfValue,
+    onChange: change,
+    reset: reset
+  };
+};
 
 exports.useCols = useCols;
+exports.useColumnsStateType = useColumnsStateType;
 exports.useSize = useSize;
 exports.useSynchronousKeys = useSynchronousKeys;
 // powered by h

package/lib/HTableBody/index.d.ts

@@ -2,7 +2,11 @@ import type { ProTableProps } from "@ant-design/pro-table";
 import type { ActionRenderFn, ConfigDataModal, ParamsModal, HTableInstance, HRowSelection } from "../modal";
 import React from "react";
 import type { AffixProps } from "antd/lib/affix";
-export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource" | "rowSelection"> {
+import { OptionConfig } from "@ant-design/pro-table/lib/components/ToolBar";
+export interface OptionModal extends OptionConfig {
+    settingRender?: () => React.ReactNode;
+}
+export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSource" | "rowSelection" | "options"> {
     configData?: ConfigDataModal;
     onPageChange?: (params: ParamsModal) => void;
     emptyRender?: (tableInstance: HTableInstance) => React.ReactNode;
@@ -16,6 +20,7 @@ export interface HTableBodyProps extends Omit<ProTableProps<any, any>, "dataSour
     optionsRender?: (node: React.ReactNode) => React.ReactNode;
     paginationActionRender?: (tableInstance: HTableInstance) => React.ReactNode;
     localSorter?: boolean;
+    options?: OptionModal | false;
 }
-declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, headerTitle, options, actionRender, affixProps, goTop, size, optionsRender, paginationActionRender, localSorter, ...props }: HTableBodyProps) => JSX.Element;
+declare const _default: ({ configData, pagination, onPageChange, rowSelection, rowKey, emptyRender, errorRender, tableStyle, paginationStyle, headerTitle, options, actionRender, affixProps, goTop, size, optionsRender, paginationActionRender, localSorter, columnsState, ...props }: HTableBodyProps) => JSX.Element;
 export default _default;

package/lib/HTableBody/index.js

@@ -25,7 +25,8 @@ var AlertMsg = require('./AlertMsg.js');
 var index = require('./Options/index.js');
 var index$2 = require('./HeaderTitle/index.js');
 
-var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle", "headerTitle", "options", "actionRender", "affixProps", "goTop", "size", "optionsRender", "paginationActionRender", "localSorter"];
+var _excluded = ["configData", "pagination", "onPageChange", "rowSelection", "rowKey", "emptyRender", "errorRender", "tableStyle", "paginationStyle", "headerTitle", "options", "actionRender", "affixProps", "goTop", "size", "optionsRender", "paginationActionRender", "localSorter", "columnsState"],
+  _excluded2 = ["value", "onChange", "reset"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 var defaultRender = function defaultRender() {
@@ -61,6 +62,7 @@ var Body = (function (_ref) {
     optionsRender = _ref.optionsRender,
     paginationActionRender = _ref.paginationActionRender,
     localSorter = _ref.localSorter,
+    columnsState = _ref.columnsState,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = rowSelection || {},
     selectedRowKeys = _ref2.selectedRowKeys,
@@ -93,8 +95,15 @@ var Body = (function (_ref) {
       table: tableInstance,
       rowSelection: rowSelection
     }),
-    cols = _useCols.cols,
-    changeCols = _useCols.changeCols;
+    cols = _useCols.cols;
+  var _useColumnsStateType = hooks.useColumnsStateType({
+      columnsState: columnsState,
+      columns: cols
+    }),
+    value = _useColumnsStateType.value,
+    onChange = _useColumnsStateType.onChange,
+    reset = _useColumnsStateType.reset,
+    selfColStatus = _objectWithoutProperties(_useColumnsStateType, _excluded2);
   hooks.useSynchronousKeys({
     selectedRowKeys: selectedRowKeys,
     records: records,
@@ -108,7 +117,9 @@ var Body = (function (_ref) {
     size: cuSize,
     columns: cols,
     setSizeChange: setCuSize,
-    onChange: changeCols
+    colStatusValue: value || {},
+    onChange: onChange,
+    reset: reset
   }));
   var _selectedRowData$keys = _keysInstanceProperty(selectedRowData),
     keys = _selectedRowData$keys === void 0 ? [] : _selectedRowData$keys,
@@ -139,6 +150,9 @@ var Body = (function (_ref) {
         return tableEmptyRender === null || tableEmptyRender === void 0 ? void 0 : tableEmptyRender(tableInstance);
       },
       children: [jsxRuntime.jsx(ProTable, _objectSpread(_objectSpread({}, props), {}, {
+        columnsState: _objectSpread(_objectSpread({}, selfColStatus), {}, {
+          value: value
+        }),
         columns: cols,
         size: cuSize,
         search: false,
@@ -156,10 +170,10 @@ var Body = (function (_ref) {
             asc: asc
           });
         },
-        options: false,
         tableStyle: {
           paddingBottom: 0
         },
+        options: false,
         rowSelection: false,
         loading: loading,
         rowKey: rowKey,

package/lib/HTableBody/utils.d.ts

@@ -0,0 +1,7 @@
+import type { ColumnsStateType } from "@ant-design/pro-table/es/typing";
+import type { ConfigDataModal } from "@/components/modal";
+export declare const mkChangeValue: (columnsState?: ColumnsStateType) => any;
+export declare const outColSetting: (columns: ConfigDataModal, columnsState?: ColumnsStateType) => {
+    checkCols: ConfigDataModal;
+    keys: string[];
+};

package/lib/HTableBody/utils.js

@@ -0,0 +1,101 @@
+'use strict';
+
+var _toConsumableArray = require('@babel/runtime-corejs3/helpers/toConsumableArray');
+var _typeof = require('@babel/runtime-corejs3/helpers/typeof');
+var _forEachInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/for-each');
+var _keysInstanceProperty = require('@babel/runtime-corejs3/core-js/instance/keys');
+require('core-js/modules/es.object.keys.js');
+require('core-js/modules/es.object.to-string.js');
+require('core-js/modules/es.regexp.to-string.js');
+var utils = require('./Options/utils.js');
+
+var strToJson = function strToJson(str) {
+  if (!str) {
+    return {};
+  }
+  try {
+    var result = JSON.parse(str);
+    if (_typeof(result) === "object") {
+      return result;
+    }
+    return {};
+  } catch (e) {
+    return {};
+  }
+};
+var mkChangeValue = function mkChangeValue(columnsState) {
+  var _ref = columnsState || {},
+    persistenceType = _ref.persistenceType,
+    persistenceKey = _ref.persistenceKey,
+    value = _ref.value;
+    _ref.defaultValue;
+    _ref.onChange;
+  if (value) {
+    return value;
+  }
+  if (!persistenceKey) {
+    return {};
+  }
+  var cuPersistenceType = persistenceType || "localStorage";
+  var saveValStr = window[cuPersistenceType].getItem(persistenceKey);
+  return strToJson(saveValStr);
+};
+var childDataIndexProvider = function childDataIndexProvider(data, title) {
+  var keys = [];
+  var cols = [];
+  _forEachInstanceProperty(data).call(data, function (value) {
+    if (typeof value === "string") {
+      keys.push(value);
+      cols.push(utils.getItemValue({
+        title: title,
+        dataIndex: value
+      }));
+      return;
+    }
+    keys.push(value.dataIndex);
+    cols.push(utils.getItemValue(value));
+  });
+  return {
+    keys: keys,
+    cols: cols
+  };
+};
+var outColSetting = function outColSetting(columns) {
+  var columnsState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var keys = [];
+  var checkCols = [];
+  _forEachInstanceProperty(columns).call(columns, function (value) {
+    var dataIndex = value.dataIndex,
+      titleStr = value.titleStr,
+      title = value.title,
+      hideInTable = value.hideInTable,
+      childrenDataIndex = value.childrenDataIndex;
+    if (hideInTable || !dataIndex) {
+      return;
+    }
+    var _ref2 = columnsState[dataIndex.toString()] || {},
+      _ref2$show = _ref2.show,
+      show = _ref2$show === void 0 ? true : _ref2$show;
+    if (!show) {
+      return;
+    }
+    if (childrenDataIndex) {
+      var _childDataIndexProvid = childDataIndexProvider(childrenDataIndex, titleStr || title),
+        childKeys = _keysInstanceProperty(_childDataIndexProvid),
+        childCols = _childDataIndexProvid.cols;
+      keys.push.apply(keys, _toConsumableArray(childKeys));
+      checkCols.push.apply(checkCols, _toConsumableArray(childCols));
+      return;
+    }
+    keys.push(dataIndex.toString());
+    checkCols.push(utils.getItemValue(value));
+  });
+  return {
+    checkCols: checkCols,
+    keys: keys
+  };
+};
+
+exports.mkChangeValue = mkChangeValue;
+exports.outColSetting = outColSetting;
+// powered by h

package/lib/HTableHeader/Context.d.ts

@@ -1,4 +1,4 @@
 import React from "react";
-import { IHeaderProps } from "./modal";
+import type { IHeaderProps } from "./modal";
 export declare const HeaderProvider: React.Provider<IHeaderProps>;
 export declare const useHeaderContext: () => IHeaderProps;

package/lib/HTableHeader/defaultSubComponent.js

@@ -82,7 +82,11 @@ var DefaultSubComponent = function DefaultSubComponent(_ref) {
           borderRadius: 4
         },
         onClick: function onClick() {
-          onReset ? onReset() : form.resetFields();
+          if (onReset) {
+            onReset();
+            return;
+          }
+          form.resetFields();
         },
         children: "\u91CD\u7F6E"
       }), hide ? null : jsxRuntime.jsx(OpenComponent, {})]

package/lib/HTableHeader/index.d.ts

@@ -1,3 +1,3 @@
 import type { IHeaderProps } from "./modal";
-declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, hideLabel, labelWidth, onReset }: IHeaderProps) => JSX.Element;
+declare const _default: ({ configData, onFinish, searchSpan, headerStyle, initValues, hideLabel, labelWidth, onReset, }: IHeaderProps) => JSX.Element;
 export default _default;

package/lib/hooks/useHTable.js

@@ -21,12 +21,14 @@ var useHTable = (function () {
       getParams: function getParams() {
         return {};
       },
-      settingKeys: {},
       getSelectedRowData: function getSelectedRowData() {
         return {};
       },
       getTableSourceData: function getTableSourceData() {
         return [];
+      },
+      getColSettingKeys: function getColSettingKeys() {
+        return {};
       }
     };
   }, []);

package/lib/modal.d.ts

@@ -6,6 +6,7 @@ import type React from "react";
 import type { ModalProps } from "antd";
 import type { TableProps } from "antd/lib/table";
 import type { AffixProps } from "antd/lib/affix";
+import { OptionModal } from "./HTableBody";
 export interface RowObj {
     keys?: React.Key[];
     rowData?: any[];
@@ -75,6 +76,11 @@ export interface HTableProps extends Omit<ProTableProps<any, any>, "request" | "
     formInitValues?: Record<string, any>;
     labelWidth?: number;
     hideLabel?: boolean;
+    options?: OptionModal | false;
+}
+interface ColCheckResultKeys {
+    keys?: string[];
+    checkCols?: ConfigDataModal;
 }
 export interface TableInstance {
     reload: (params?: ParamsModal) => Promise<any>;
@@ -82,12 +88,9 @@ export interface TableInstance {
     dispatch: (key: string, params: any) => void;
     reloadWithParams: (params?: ParamsModal) => Promise<any>;
     getParams: () => any;
-    settingKeys: {
-        keys?: string[];
-        checkCols?: ConfigDataModal;
-    };
     getSelectedRowData: () => RowObj;
     getTableSourceData: () => any;
+    getColSettingKeys: () => ColCheckResultKeys;
 }
 export interface HTableInstance {
     form: HFormInstance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/table",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "基于antd二次开发table组件",
   "keywords": [
     "table"

package/src/components/HTableBody/Options/Content.tsx

@@ -7,7 +7,7 @@ import { getItemValue } from "./utils";
 
 export const ColsSettingContent = ({
   columns,
-  onChange,
+  onCheck,
   checkKeys,
 }: ItemProps) => {
   const content = useClassName("hw-table-body-option-setting-content");
@@ -29,20 +29,16 @@ export const ColsSettingContent = ({
     });
     return treeData;
   }, [columns]);
-  const change = (key: string[]) => {
-    const newCols = [...columns];
-    newCols.forEach(({ dataIndex }, index) => {
-      if (!dataIndex) {
-        return;
+  const check = (keys: string[]) => {
+    const notCheck: string[] = [];
+    contentTreeData.forEach(({ key }) => {
+      const cuKey = key as string;
+      const index = keys.indexOf(cuKey);
+      if (index === -1) {
+        notCheck.push(cuKey);
       }
-      const strDataIndex = dataIndex.toString();
-      const item = newCols[index];
-      newCols[index] = {
-        ...item,
-        hideInTable: key.indexOf(strDataIndex) == -1,
-      };
     });
-    onChange(newCols);
+    onCheck(keys, notCheck);
   };
   return (
     <div className={content}>
@@ -52,7 +48,7 @@ export const ColsSettingContent = ({
           className={treeClass}
           checkedKeys={checkKeys}
           onCheck={(key) => {
-            change(key as string[]);
+            check(key as string[]);
           }}
           height={268}
           treeData={contentTreeData}