@4399ywkf/design 1.3.12 → 2.1.0

package/dist/Table/utils/Provide.js

@@ -1,268 +1,14 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(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 t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import _ from 'lodash-es';
 import React, { createContext, useRef } from 'react';
-import { createStore } from 'zustand';
-var TableContext = /*#__PURE__*/createContext({});
-var Container = function Container(props) {
-  var value = props.initValue;
-  return /*#__PURE__*/React.createElement(TableContext.Provider, {
-    value: value
-  }, props.children);
-};
-var StoreContext = /*#__PURE__*/createContext(createStore(function (set, get) {
-  return {
-    queryData: {
-      defaultPageSize: 20,
-      defaultCurrent: 1,
-      filter: {}
-    },
-    columnSetting: [],
-    setPagination: function setPagination() {},
-    setFilter: function setFilter() {},
-    setStorageName: function setStorageName() {},
-    readLocalData: function readLocalData() {},
-    resetFilter: function resetFilter() {},
-    setSearch: function setSearch() {},
-    setSortOrder: function setSortOrder() {},
-    setColumnSetting: function setColumnSetting() {},
-    setTotal: function setTotal() {},
-    setSize: function setSize() {},
-    setQueryData: function setQueryData() {},
-    setOffset: function setOffset() {}
-  };
-}));
+import { createTableStore } from "../store/createStore";
+var StoreContext = /*#__PURE__*/createContext(createTableStore());
 var StoreProvider = function StoreProvider(_ref) {
   var children = _ref.children;
   var storeRef = useRef(null);
   if (!storeRef.current) {
-    storeRef.current = createStore(function (set, get) {
-      return {
-        queryData: {
-          defaultPageSize: 20,
-          defaultCurrent: 1,
-          filter: {}
-        },
-        columnSetting: [],
-        setPagination: function setPagination(newPage, newPageSize) {
-          var queryData = get().queryData;
-          if (queryData.storageName) {
-            localStorage.setItem(queryData.storageName, JSON.stringify(_objectSpread(_objectSpread({}, queryData), {
-              limit: newPageSize,
-              offset: (newPage - 1) * newPageSize
-            })));
-          }
-          set({
-            queryData: _objectSpread(_objectSpread({}, queryData), {
-              limit: newPageSize,
-              offset: (newPage - 1) * newPageSize
-            })
-          });
-        },
-        readLocalData: function readLocalData(key) {
-          if (key) {
-            var localData = localStorage.getItem(key);
-            if (localData) {
-              var localDataJson = JSON.parse(localData);
-              set({
-                queryData: _objectSpread(_objectSpread({}, get().queryData), localDataJson)
-              });
-            }
-            var localColumnsData = localStorage.getItem("".concat(key, "_columns"));
-            if (localColumnsData) {
-              var localColumnsDataJson = JSON.parse(localColumnsData);
-              set({
-                columnSetting: [].concat(_toConsumableArray(get().columnSetting), _toConsumableArray(localColumnsDataJson))
-              });
-            }
-          }
-        },
-        setSize: function setSize(value) {
-          var queryData = get().queryData;
-          if (queryData.storageName) {
-            // 设置缓存
-            localStorage.setItem(queryData.storageName, JSON.stringify(_objectSpread(_objectSpread({}, queryData), {}, {
-              size: value
-            })));
-          }
-          set({
-            queryData: _objectSpread(_objectSpread({}, queryData), {}, {
-              size: value
-            })
-          });
-        },
-        setFilter: function setFilter(key, value) {
-          var exact = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-          var filter = _.cloneDeep(get().queryData.filter);
-          var queryData = get().queryData;
-          if (!_.isEmpty(value)) {
-            filter = _objectSpread(_objectSpread({}, filter), {}, _defineProperty({}, key, {
-              value: value,
-              exact: exact
-            }));
-          } else {
-            if (filter) {
-              delete filter[key];
-            }
-          }
-          if (queryData.storageName) {
-            // 设置缓存
-            localStorage.setItem(queryData.storageName, JSON.stringify(_objectSpread(_objectSpread({}, queryData), {}, {
-              filter: _objectSpread({}, filter)
-            })));
-          }
-          set({
-            queryData: _objectSpread(_objectSpread({}, queryData), {}, {
-              filter: _objectSpread({}, filter)
-            })
-          });
-        },
-        setStorageName: function setStorageName(key) {
-          set({
-            queryData: _objectSpread(_objectSpread({}, get().queryData), {}, {
-              storageName: key
-            })
-          });
-        },
-        resetFilter: function resetFilter() {
-          var queryData = get().queryData;
-          set({
-            queryData: _objectSpread(_objectSpread({}, queryData), {}, {
-              filter: {}
-            })
-          });
-        },
-        setSearch: function setSearch(value) {
-          var queryData = get().queryData;
-          var searchValue = _.isEmpty(value) ? undefined : value;
-          if (queryData.storageName) {
-            // 设置缓存
-            localStorage.setItem(queryData.storageName, JSON.stringify(_objectSpread(_objectSpread({}, queryData), {}, {
-              search: searchValue
-            })));
-          }
-          set({
-            queryData: _objectSpread(_objectSpread({}, queryData), {}, {
-              search: searchValue
-            })
-          });
-        },
-        setSortOrder: function setSortOrder(key, value) {
-          var isMultiple = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-          var queryData = get().queryData;
-          if (value === 'descend') {
-            value = 'desc';
-          } else if (value === 'ascend') {
-            value = 'asc';
-          } else if (value === undefined) {
-            value = undefined;
-            key = undefined;
-          }
-
-          /**
-           * 多列排序和单列排序是互斥的
-           */
-
-          // 多列排序
-          if (isMultiple) {
-            var _queryData$multipleSo;
-            var multipleSort = _.cloneDeep((_queryData$multipleSo = queryData === null || queryData === void 0 ? void 0 : queryData.multipleSort) !== null && _queryData$multipleSo !== void 0 ? _queryData$multipleSo : []);
-            if (value) {
-              var queryValue = {
-                key: key,
-                value: value
-              };
-              // 追加或者替换
-              if (multipleSort.findIndex(function (o) {
-                return o.key === key;
-              }) > -1) {
-                multipleSort[multipleSort.findIndex(function (o) {
-                  return o.key === key;
-                })] = queryValue;
-              } else {
-                multipleSort.push(queryValue);
-              }
-            } else {
-              if (multipleSort.findIndex(function (o) {
-                return o.key === key;
-              }) > -1) {
-                multipleSort.splice(multipleSort.findIndex(function (o) {
-                  return o.key === key;
-                }), 1);
-              }
-            }
-            var newQueryData = _objectSpread(_objectSpread({}, queryData), {}, {
-              multipleSort: multipleSort,
-              sort: undefined,
-              order: undefined
-            });
-            if (isMultiple && queryData.storageName) {
-              // 设置缓存
-              localStorage.setItem(queryData.storageName, JSON.stringify(newQueryData));
-            }
-            set({
-              queryData: newQueryData
-            });
-          } else {
-            var _newQueryData = _objectSpread(_objectSpread({}, queryData), {}, {
-              sort: key,
-              order: value,
-              multipleSort: undefined
-            });
-            if (queryData.storageName) {
-              localStorage.setItem(queryData.storageName, JSON.stringify(_newQueryData));
-            }
-            set({
-              queryData: _newQueryData
-            });
-          }
-        },
-        setColumnSetting: function setColumnSetting(value) {
-          var queryData = get().queryData;
-          if (queryData.storageName) {
-            var columnsKey = "".concat(queryData.storageName, "_columns");
-            // 设置缓存
-            localStorage.setItem(columnsKey, JSON.stringify(value));
-          }
-          set({
-            columnSetting: value
-          });
-        },
-        setTotal: function setTotal(value) {
-          var queryData = get().queryData;
-          set({
-            queryData: _objectSpread(_objectSpread({}, queryData), {}, {
-              total: value
-            })
-          });
-        },
-        setQueryData: function setQueryData(value) {
-          set({
-            queryData: value
-          });
-        },
-        setOffset: function setOffset(value) {
-          var queryData = _.cloneDeep(get().queryData);
-          queryData.offset = value;
-          set({
-            queryData: queryData
-          });
-        }
-      };
-    });
+    storeRef.current = createTableStore();
   }
   return /*#__PURE__*/React.createElement(StoreContext.Provider, {
     value: storeRef.current
   }, children);
 };
-export { Container, StoreContext, StoreProvider, TableContext };
+export { StoreContext, StoreProvider };

package/dist/Table/utils/columnKey.d.ts

@@ -0,0 +1,2 @@
+import type { Key } from 'react';
+export declare function genColumnKey(key?: string | number | Key, index?: number | string): string;

package/dist/Table/utils/columnKey.js

@@ -0,0 +1,6 @@
+export function genColumnKey(key, index) {
+  if (key) {
+    return Array.isArray(key) ? key.join('-') : key.toString();
+  }
+  return "".concat(index);
+}

package/dist/Table/utils/getColumn.d.ts

@@ -1,10 +1,10 @@
 declare const columnsMap: {
-    varchar: (key: string, queryData: any, setFilter: any) => import("antd").TableColumnType<any>;
-    enum: (key: string, queryData: any, setFilter: any, column: any) => import("antd").TableColumnType<any>;
-    date: (key: string, queryData: any, setFilter: any) => import("antd").TableColumnType<any>;
-    dateWeek: (key: string, queryData: any, setFilter: any) => import("antd").TableColumnType<any>;
-    dateYear: (key: string, queryData: any, setFilter: any) => import("antd").TableColumnType<any>;
-    dateMonth: (key: string, queryData: any, setFilter: any) => import("antd").TableColumnType<any>;
-    dateRange: (key: string, queryData: any, setFilter: any, column: any) => import("antd").TableColumnType<any>;
+    varchar: (key: string, queryData: import("../store/types").QuerySnapshot, setFilter: (key: string, value: import("../store/types").FilterInputValue | null | undefined, exact?: boolean | undefined) => void) => import("antd").TableColumnType<unknown>;
+    enum: (key: string, queryData: import("../store/types").QuerySnapshot, setFilter: (key: string, value: import("../store/types").FilterInputValue | null | undefined, exact?: boolean | undefined) => void, column: import("..").RichColumn<unknown>) => import("antd").TableColumnType<unknown>;
+    date: (key: string, queryData: import("../store/types").QuerySnapshot, setFilter: (key: string, value: import("../store/types").FilterInputValue | null | undefined, exact?: boolean | undefined) => void) => import("antd").TableColumnType<unknown>;
+    dateWeek: (key: string, queryData: import("../store/types").QuerySnapshot, setFilter: (key: string, value: import("../store/types").FilterInputValue | null | undefined, exact?: boolean | undefined) => void) => import("antd").TableColumnType<unknown>;
+    dateYear: (key: string, queryData: import("../store/types").QuerySnapshot, setFilter: (key: string, value: import("../store/types").FilterInputValue | null | undefined, exact?: boolean | undefined) => void) => import("antd").TableColumnType<unknown>;
+    dateMonth: (key: string, queryData: import("../store/types").QuerySnapshot, setFilter: (key: string, value: import("../store/types").FilterInputValue | null | undefined, exact?: boolean | undefined) => void) => import("antd").TableColumnType<unknown>;
+    dateRange: (key: string, queryData: import("../store/types").QuerySnapshot, setFilter: (key: string, value: import("../store/types").FilterInputValue | null | undefined, exact?: boolean | undefined) => void, column: import("..").RichColumn<unknown>) => import("antd").TableColumnType<unknown>;
 };
 export { columnsMap };

package/dist/Table/utils/getColumnEnumProps.d.ts

@@ -1,3 +1,5 @@
-import { TableColumnType } from 'antd';
-declare const getColumnEnumProps: (key: string, queryData: any, setFilter: any, column: any) => TableColumnType<any>;
+import type { TableColumnType } from 'antd';
+import type { QuerySnapshot, TableStore } from '../store/types';
+import type { RichColumn } from '../type';
+declare const getColumnEnumProps: (key: string, queryData: QuerySnapshot, setFilter: TableStore['setFilter'], column: RichColumn<unknown>) => TableColumnType<unknown>;
 export { getColumnEnumProps };

package/dist/Table/utils/getColumnEnumProps.js

@@ -19,7 +19,13 @@ var getColumnEnumProps = function getColumnEnumProps(key, queryData, setFilter,
       clearFilters();
       setSelectedKeys([]);
     };
-    var options = (_column$fullFilter$op = column === null || column === void 0 || (_column$fullFilter = column.fullFilter) === null || _column$fullFilter === void 0 ? void 0 : _column$fullFilter.options) !== null && _column$fullFilter$op !== void 0 ? _column$fullFilter$op : [];
+    var options = ((_column$fullFilter$op = column === null || column === void 0 || (_column$fullFilter = column.fullFilter) === null || _column$fullFilter === void 0 ? void 0 : _column$fullFilter.options) !== null && _column$fullFilter$op !== void 0 ? _column$fullFilter$op : []).map(function (item) {
+      var _ref2, _item$text, _ref3, _item$value;
+      return {
+        text: (_ref2 = (_item$text = item.text) !== null && _item$text !== void 0 ? _item$text : item.value) !== null && _ref2 !== void 0 ? _ref2 : '',
+        value: (_ref3 = (_item$value = item.value) !== null && _item$value !== void 0 ? _item$value : item.text) !== null && _ref3 !== void 0 ? _ref3 : ''
+      };
+    });
     var mode = (_column$fullFilter$mo = column === null || column === void 0 || (_column$fullFilter2 = column.fullFilter) === null || _column$fullFilter2 === void 0 ? void 0 : _column$fullFilter2.mode) !== null && _column$fullFilter$mo !== void 0 ? _column$fullFilter$mo : 'multiple';
     return /*#__PURE__*/React.createElement(FilterDropdown, {
       onReset: onReset,
@@ -33,11 +39,7 @@ var getColumnEnumProps = function getColumnEnumProps(key, queryData, setFilter,
       options: options
     }));
   };
-
-  // 是否亮起过滤筛选条件
-  var filtered = (_queryData$filter = queryData.filter) === null || _queryData$filter === void 0 ? void 0 : _queryData$filter.hasOwnProperty(key);
-
-  // 可控的过滤筛选条件
+  var filtered = Object.prototype.hasOwnProperty.call((_queryData$filter = queryData.filter) !== null && _queryData$filter !== void 0 ? _queryData$filter : {}, key);
   var filteredValue = (_queryData$filter$key = (_queryData$filter2 = queryData.filter) === null || _queryData$filter2 === void 0 || (_queryData$filter2 = _queryData$filter2[key]) === null || _queryData$filter2 === void 0 ? void 0 : _queryData$filter2.value) !== null && _queryData$filter$key !== void 0 ? _queryData$filter$key : [];
   return {
     filterDropdown: filterDropdown,

package/dist/Table/utils/getColumnMerge.d.ts

@@ -1,3 +1,8 @@
-import type { BearState, RichColumn } from '../type';
-declare const getColumnMerge: (columnKey: string, column: RichColumn<any>, queryData: BearState['queryData'], dataSource?: any[]) => any;
+import type { QuerySnapshot } from '../store/types';
+import type { RichColumn } from '../type';
+declare const getColumnMerge: (columnKey: string, column: RichColumn<unknown>, queryData: QuerySnapshot, dataSource?: unknown[]) => {
+    onCell?: ((_: unknown, index?: number) => {
+        rowSpan: number;
+    }) | undefined;
+};
 export { getColumnMerge };

package/dist/Table/utils/getColumnMerge.js

@@ -6,12 +6,13 @@ var getColumnMerge = function getColumnMerge(columnKey, column, queryData, dataS
       var b = AutoMergeCell(dataSource !== null && dataSource !== void 0 ? dataSource : [], columnKey, (_column$mergeCellDepe = column.mergeCellDependList) !== null && _column$mergeCellDepe !== void 0 ? _column$mergeCellDepe : []);
       // console.log((queryData?.offset ?? 0) + index);
       var _index;
+      var safeIndex = index !== null && index !== void 0 ? index : 0;
       if ((dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) === queryData.total) {
         var _queryData$offset;
         // 前端
-        _index = ((_queryData$offset = queryData === null || queryData === void 0 ? void 0 : queryData.offset) !== null && _queryData$offset !== void 0 ? _queryData$offset : 0) + index;
+        _index = ((_queryData$offset = queryData === null || queryData === void 0 ? void 0 : queryData.offset) !== null && _queryData$offset !== void 0 ? _queryData$offset : 0) + safeIndex;
       } else {
-        _index = index;
+        _index = safeIndex;
       }
       return {
         rowSpan: (_b$_index = b[_index]) !== null && _b$_index !== void 0 ? _b$_index : 1

package/dist/Table/utils/getDateColumn.d.ts

@@ -1,8 +1,9 @@
-import { TableColumnType } from 'antd';
-import './index.css';
-declare const getColumnDateProps: (key: string, queryData: any, setFilter: any) => TableColumnType<any>;
-declare const getColumnDateWeekProps: (key: string, queryData: any, setFilter: any) => TableColumnType<any>;
-declare const getColumnDateMonthProps: (key: string, queryData: any, setFilter: any) => TableColumnType<any>;
-declare const getColumnDateYearProps: (key: string, queryData: any, setFilter: any) => TableColumnType<any>;
-declare const getColumnDateRangeProps: (key: string, queryData: any, setFilter: any, column: any) => TableColumnType<any>;
+import type { TableColumnType } from 'antd';
+import type { QuerySnapshot, TableStore } from '../store/types';
+import type { RichColumn } from '../type';
+declare const getColumnDateProps: (key: string, queryData: QuerySnapshot, setFilter: TableStore['setFilter']) => TableColumnType<unknown>;
+declare const getColumnDateWeekProps: (key: string, queryData: QuerySnapshot, setFilter: TableStore['setFilter']) => TableColumnType<unknown>;
+declare const getColumnDateMonthProps: (key: string, queryData: QuerySnapshot, setFilter: TableStore['setFilter']) => TableColumnType<unknown>;
+declare const getColumnDateYearProps: (key: string, queryData: QuerySnapshot, setFilter: TableStore['setFilter']) => TableColumnType<unknown>;
+declare const getColumnDateRangeProps: (key: string, queryData: QuerySnapshot, setFilter: TableStore['setFilter'], column: RichColumn<unknown>) => TableColumnType<unknown>;
 export { getColumnDateMonthProps, getColumnDateProps, getColumnDateRangeProps, getColumnDateWeekProps, getColumnDateYearProps, };

package/dist/Table/utils/getDateColumn.js

@@ -1,7 +1,6 @@
+import React from 'react';
 import { DatePicker } from 'antd';
 import _ from 'lodash-es';
-import React, { useMemo } from 'react';
-import "./index.css";
 import dayjs from 'dayjs';
 import FilterDropdown from "../components/FilterDropdown";
 var RangePicker = DatePicker.RangePicker;
@@ -13,8 +12,8 @@ var getColumnDateProps = function getColumnDateProps(key, queryData, setFilter)
       confirm = _ref.confirm,
       _ref$clearFilters = _ref.clearFilters,
       clearFilters = _ref$clearFilters === void 0 ? function () {} : _ref$clearFilters;
-    var onChange = function onChange(date, dateString) {
-      setSelectedKeys(dateString);
+    var onChange = function onChange(_date, dateString) {
+      setSelectedKeys(dateString ? [dateString] : []);
     };
     var onReset = function onReset() {
       clearFilters();
@@ -25,12 +24,7 @@ var getColumnDateProps = function getColumnDateProps(key, queryData, setFilter)
       setSelectedKeys(selectedKeys);
       confirm();
     };
-    var dateValue = useMemo(function () {
-      if (typeof selectedKeys === 'string' && !_.isEmpty(selectedKeys)) {
-        return dayjs(selectedKeys);
-      }
-      return undefined;
-    }, [selectedKeys]);
+    var dateValue = Array.isArray(selectedKeys) && selectedKeys.length > 0 ? dayjs(selectedKeys[0]) : undefined;
     return /*#__PURE__*/React.createElement(FilterDropdown, {
       onReset: onReset,
       onOk: onOk,
@@ -40,11 +34,7 @@ var getColumnDateProps = function getColumnDateProps(key, queryData, setFilter)
       onChange: onChange
     }));
   };
-
-  // 是否亮起过滤筛选条件
-  var filtered = (_queryData$filter = queryData.filter) === null || _queryData$filter === void 0 ? void 0 : _queryData$filter.hasOwnProperty(key);
-
-  // 可控的过滤筛选条件
+  var filtered = Object.prototype.hasOwnProperty.call((_queryData$filter = queryData.filter) !== null && _queryData$filter !== void 0 ? _queryData$filter : {}, key);
   var filteredValue = (_queryData$filter$key = (_queryData$filter2 = queryData.filter) === null || _queryData$filter2 === void 0 || (_queryData$filter2 = _queryData$filter2[key]) === null || _queryData$filter2 === void 0 ? void 0 : _queryData$filter2.value) !== null && _queryData$filter$key !== void 0 ? _queryData$filter$key : [];
   return {
     filterDropdown: filterDropdown,
@@ -60,8 +50,8 @@ var getColumnDateWeekProps = function getColumnDateWeekProps(key, queryData, set
       confirm = _ref2.confirm,
       _ref2$clearFilters = _ref2.clearFilters,
       clearFilters = _ref2$clearFilters === void 0 ? function () {} : _ref2$clearFilters;
-    var onChange = function onChange(date, dateString) {
-      setSelectedKeys(dateString);
+    var onChange = function onChange(_date, dateString) {
+      setSelectedKeys(dateString ? [dateString] : []);
     };
     var onOk = function onOk() {
       setFilter(key, selectedKeys);
@@ -72,12 +62,7 @@ var getColumnDateWeekProps = function getColumnDateWeekProps(key, queryData, set
       clearFilters();
       setSelectedKeys([]);
     };
-    var dateValue = useMemo(function () {
-      if (typeof selectedKeys === 'string' && !_.isEmpty(selectedKeys)) {
-        return dayjs(selectedKeys);
-      }
-      return undefined;
-    }, [selectedKeys]);
+    var dateValue = Array.isArray(selectedKeys) && selectedKeys.length > 0 ? dayjs(selectedKeys[0]) : undefined;
     return /*#__PURE__*/React.createElement(FilterDropdown, {
       onReset: onReset,
       onOk: onOk,
@@ -88,11 +73,7 @@ var getColumnDateWeekProps = function getColumnDateWeekProps(key, queryData, set
       picker: 'week'
     }));
   };
-
-  // 是否亮起过滤筛选条件
-  var filtered = (_queryData$filter3 = queryData.filter) === null || _queryData$filter3 === void 0 ? void 0 : _queryData$filter3.hasOwnProperty(key);
-
-  // 可控的过滤筛选条件
+  var filtered = Object.prototype.hasOwnProperty.call((_queryData$filter3 = queryData.filter) !== null && _queryData$filter3 !== void 0 ? _queryData$filter3 : {}, key);
   var filteredValue = (_queryData$filter$key2 = (_queryData$filter4 = queryData.filter) === null || _queryData$filter4 === void 0 || (_queryData$filter4 = _queryData$filter4[key]) === null || _queryData$filter4 === void 0 ? void 0 : _queryData$filter4.value) !== null && _queryData$filter$key2 !== void 0 ? _queryData$filter$key2 : [];
   return {
     filterDropdown: filterDropdown,
@@ -108,8 +89,8 @@ var getColumnDateMonthProps = function getColumnDateMonthProps(key, queryData, s
       confirm = _ref3.confirm,
       _ref3$clearFilters = _ref3.clearFilters,
       clearFilters = _ref3$clearFilters === void 0 ? function () {} : _ref3$clearFilters;
-    var onChange = function onChange(date, dateString) {
-      setSelectedKeys(dateString);
+    var onChange = function onChange(_date, dateString) {
+      setSelectedKeys(dateString ? [dateString] : []);
     };
     var onOk = function onOk() {
       setFilter(key, selectedKeys);
@@ -120,12 +101,7 @@ var getColumnDateMonthProps = function getColumnDateMonthProps(key, queryData, s
       clearFilters();
       setSelectedKeys([]);
     };
-    var dateValue = useMemo(function () {
-      if (typeof selectedKeys === 'string' && !_.isEmpty(selectedKeys)) {
-        return dayjs(selectedKeys);
-      }
-      return undefined;
-    }, [selectedKeys]);
+    var dateValue = Array.isArray(selectedKeys) && selectedKeys.length > 0 ? dayjs(selectedKeys[0]) : undefined;
     return /*#__PURE__*/React.createElement(FilterDropdown, {
       onReset: onReset,
       onOk: onOk,
@@ -136,11 +112,7 @@ var getColumnDateMonthProps = function getColumnDateMonthProps(key, queryData, s
       picker: 'month'
     }));
   };
-
-  // 是否亮起过滤筛选条件
-  var filtered = (_queryData$filter5 = queryData.filter) === null || _queryData$filter5 === void 0 ? void 0 : _queryData$filter5.hasOwnProperty(key);
-
-  // 可控的过滤筛选条件
+  var filtered = Object.prototype.hasOwnProperty.call((_queryData$filter5 = queryData.filter) !== null && _queryData$filter5 !== void 0 ? _queryData$filter5 : {}, key);
   var filteredValue = (_queryData$filter$key3 = (_queryData$filter6 = queryData.filter) === null || _queryData$filter6 === void 0 || (_queryData$filter6 = _queryData$filter6[key]) === null || _queryData$filter6 === void 0 ? void 0 : _queryData$filter6.value) !== null && _queryData$filter$key3 !== void 0 ? _queryData$filter$key3 : [];
   return {
     filterDropdown: filterDropdown,
@@ -156,8 +128,8 @@ var getColumnDateYearProps = function getColumnDateYearProps(key, queryData, set
       confirm = _ref4.confirm,
       _ref4$clearFilters = _ref4.clearFilters,
       clearFilters = _ref4$clearFilters === void 0 ? function () {} : _ref4$clearFilters;
-    var onChange = function onChange(date, dateString) {
-      setSelectedKeys(dateString);
+    var onChange = function onChange(_date, dateString) {
+      setSelectedKeys(dateString ? [dateString] : []);
     };
     var onReset = function onReset() {
       clearFilters();
@@ -168,12 +140,7 @@ var getColumnDateYearProps = function getColumnDateYearProps(key, queryData, set
       setSelectedKeys(selectedKeys);
       confirm();
     };
-    var dateValue = useMemo(function () {
-      if (typeof selectedKeys === 'string' && !_.isEmpty(selectedKeys)) {
-        return dayjs(selectedKeys);
-      }
-      return undefined;
-    }, [selectedKeys]);
+    var dateValue = Array.isArray(selectedKeys) && selectedKeys.length > 0 ? dayjs(selectedKeys[0]) : undefined;
     return /*#__PURE__*/React.createElement(FilterDropdown, {
       onReset: onReset,
       onOk: onOk,
@@ -184,11 +151,7 @@ var getColumnDateYearProps = function getColumnDateYearProps(key, queryData, set
       picker: 'year'
     }));
   };
-
-  // 是否亮起过滤筛选条件
-  var filtered = (_queryData$filter7 = queryData.filter) === null || _queryData$filter7 === void 0 ? void 0 : _queryData$filter7.hasOwnProperty(key);
-
-  // 可控的过滤筛选条件
+  var filtered = Object.prototype.hasOwnProperty.call((_queryData$filter7 = queryData.filter) !== null && _queryData$filter7 !== void 0 ? _queryData$filter7 : {}, key);
   var filteredValue = (_queryData$filter$key4 = (_queryData$filter8 = queryData.filter) === null || _queryData$filter8 === void 0 || (_queryData$filter8 = _queryData$filter8[key]) === null || _queryData$filter8 === void 0 ? void 0 : _queryData$filter8.value) !== null && _queryData$filter$key4 !== void 0 ? _queryData$filter$key4 : [];
   return {
     filterDropdown: filterDropdown,
@@ -205,7 +168,7 @@ var getColumnDateRangeProps = function getColumnDateRangeProps(key, queryData, s
       confirm = _ref5.confirm,
       _ref5$clearFilters = _ref5.clearFilters,
       clearFilters = _ref5$clearFilters === void 0 ? function () {} : _ref5$clearFilters;
-    var onChange = function onChange(_, datesString) {
+    var onChange = function onChange(_dates, datesString) {
       setSelectedKeys(datesString.filter(Boolean));
     };
     var onOk = function onOk() {
@@ -217,14 +180,9 @@ var getColumnDateRangeProps = function getColumnDateRangeProps(key, queryData, s
       clearFilters();
       setSelectedKeys([]);
     };
-    var dateValue = useMemo(function () {
-      if (!_.isEmpty(selectedKeys)) {
-        return selectedKeys.filter(Boolean).map(function (o) {
-          return dayjs(o);
-        });
-      }
-      return undefined;
-    }, [selectedKeys]);
+    var dateValue = !_.isEmpty(selectedKeys) ? selectedKeys.filter(Boolean).map(function (o) {
+      return dayjs(o);
+    }) : undefined;
     return /*#__PURE__*/React.createElement(FilterDropdown, {
       onReset: onReset,
       onOk: onOk,
@@ -236,11 +194,7 @@ var getColumnDateRangeProps = function getColumnDateRangeProps(key, queryData, s
       format: (_column$fullFilter$fo = column === null || column === void 0 || (_column$fullFilter2 = column.fullFilter) === null || _column$fullFilter2 === void 0 ? void 0 : _column$fullFilter2.format) !== null && _column$fullFilter$fo !== void 0 ? _column$fullFilter$fo : 'YYYY-MM-DD HH:mm:ss'
     }));
   };
-
-  // 是否亮起过滤筛选条件
-  var filtered = (_queryData$filter9 = queryData.filter) === null || _queryData$filter9 === void 0 ? void 0 : _queryData$filter9.hasOwnProperty(key);
-
-  // 可控的过滤筛选条件
+  var filtered = Object.prototype.hasOwnProperty.call((_queryData$filter9 = queryData.filter) !== null && _queryData$filter9 !== void 0 ? _queryData$filter9 : {}, key);
   var filteredValue = (_queryData$filter$key5 = (_queryData$filter10 = queryData.filter) === null || _queryData$filter10 === void 0 || (_queryData$filter10 = _queryData$filter10[key]) === null || _queryData$filter10 === void 0 ? void 0 : _queryData$filter10.value) !== null && _queryData$filter$key5 !== void 0 ? _queryData$filter$key5 : [];
   return {
     filterDropdown: filterDropdown,

package/dist/Table/utils/getInputColumn.d.ts

@@ -1,3 +1,4 @@
 import type { TableColumnType } from 'antd';
-declare const getColumnVarcharProps: (key: string, queryData: any, setFilter: any) => TableColumnType<any>;
+import type { QuerySnapshot, TableStore } from '../store/types';
+declare const getColumnVarcharProps: (key: string, queryData: QuerySnapshot, setFilter: TableStore['setFilter']) => TableColumnType<unknown>;
 export { getColumnVarcharProps };

package/dist/Table/utils/getInputColumn.js

@@ -1,5 +1,5 @@
-import { Input } from 'antd';
 import React from 'react';
+import { Input } from 'antd';
 import FilterDropdown from "../components/FilterDropdown";
 var getColumnVarcharProps = function getColumnVarcharProps(key, queryData, setFilter) {
   var _queryData$filter, _queryData$filter$key, _queryData$filter2;
@@ -33,11 +33,7 @@ var getColumnVarcharProps = function getColumnVarcharProps(key, queryData, setFi
       value: selectedKeys[0]
     }));
   };
-
-  // 是否亮起过滤筛选条件
-  var filtered = (_queryData$filter = queryData.filter) === null || _queryData$filter === void 0 ? void 0 : _queryData$filter.hasOwnProperty(key);
-
-  // 可控的过滤筛选条件
+  var filtered = Object.prototype.hasOwnProperty.call((_queryData$filter = queryData.filter) !== null && _queryData$filter !== void 0 ? _queryData$filter : {}, key);
   var filteredValue = (_queryData$filter$key = (_queryData$filter2 = queryData.filter) === null || _queryData$filter2 === void 0 || (_queryData$filter2 = _queryData$filter2[key]) === null || _queryData$filter2 === void 0 ? void 0 : _queryData$filter2.value) !== null && _queryData$filter$key !== void 0 ? _queryData$filter$key : [];
   return {
     filterDropdown: filterDropdown,

package/dist/Table/utils/getSort.d.ts

@@ -1,5 +1,7 @@
+import type { QuerySnapshot } from '../store/types';
 import type { RichColumn } from '../type';
-declare const getColumnSort: (column: RichColumn<any>, columnKey: string, queryData: any) => {
-    sortOrder: any;
+import type { SortOrder } from 'antd/es/table/interface';
+declare const getColumnSort: (column: RichColumn<unknown>, columnKey: string, queryData: QuerySnapshot) => {
+    sortOrder: SortOrder;
 };
 export { getColumnSort };