linkmore-design 1.0.93 → 1.0.95

package/dist/message/demos/basic.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const App: () => JSX.Element;
 export default App;

package/dist/message/demos/other.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const App: () => JSX.Element;
 export default App;

package/dist/notification/demos/basic.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const App: () => JSX.Element;
 export default App;

package/dist/notification/demos/button.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const App: () => JSX.Element;
 export default App;

package/dist/notification/demos/icon.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const App: () => JSX.Element;
 export default App;

package/es/Alert/ErrorBoundary.d.ts

@@ -17,6 +17,6 @@ export default class ErrorBoundary extends React.Component<ErrorBoundaryProps, {
         };
     };
     componentDidCatch(error: Error | null, info: object): void;
-    render(): string | number | boolean | JSX.Element | React.ReactFragment;
+    render(): string | number | boolean | React.ReactFragment | JSX.Element;
 }
 export {};

package/es/Badge/SingleNumber.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface UnitNumberProps {
     prefixCls: string;
     value: string | number;

package/es/ConfigProvider/index.d.ts

@@ -1,7 +1,7 @@
 import type { ValidateMessages } from 'rc-field-form/lib/interface';
 import * as React from 'react';
 import type { RequiredMark } from 'antd/es/form/Form';
-import type { Locale } from 'antd/es/locale-provider';
+import type { Locale } from '../locale-provider';
 import type { Theme } from './context';
 import { ConfigConsumer, ConfigContext } from './context';
 import type { CSPConfig, DirectionType, ConfigConsumerProps } from './context';

package/es/ConfigProvider/index.js

@@ -4,9 +4,9 @@ import IconContext from '@ant-design/icons/lib/components/Context';
 import { FormProvider as RcFormProvider } from 'rc-field-form';
 import useMemo from 'rc-util/lib/hooks/useMemo';
 import * as React from 'react';
-import LocaleProvider, { ANT_MARK } from 'antd/es/locale-provider';
-import LocaleReceiver from 'antd/es/locale-provider/LocaleReceiver';
-import defaultLocale from 'antd/es/locale/default';
+import LocaleProvider, { ANT_MARK } from '../locale-provider';
+import LocaleReceiver from '../locale-provider/LocaleReceiver';
+import defaultLocale from '../Locale/default';
 import message from '../message';
 import notification from '../notification';
 import { ConfigConsumer, ConfigContext } from './context';

package/es/DatePicker/PickerButton.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 import type { ButtonProps } from 'antd';
 export default function PickerButton(props: ButtonProps): JSX.Element;

package/es/DatePicker/PickerTag.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 import type { ILMTagProps } from '../Tag';
 export default function PickerTag(props: ILMTagProps): JSX.Element;

package/es/DatePicker/generatePicker/generateSinglePicker.js

@@ -45,7 +45,6 @@ export default function generatePicker(generateConfig) {
           customStatus = props.status,
           restProps = __rest(props, ["prefixCls", "getPopupContainer", "className", "size", "bordered", "placement", "placeholder", "disabled", "status"]);
 
-      console.log(restProps, '---restProps');
       warning(picker !== 'quarter', displayName, "DatePicker.".concat(displayName, " is legacy usage. Please use DatePicker[picker='").concat(picker, "'] directly."));
 
       var _useContext = useContext(ConfigContext),

package/es/DatePicker/generatePicker/index.d.ts

@@ -94,7 +94,7 @@ export declare type RangePickerDateProps<DateType> = InjectDefaultProps<RCRangeP
 export declare type RangePickerTimeProps<DateType> = InjectDefaultProps<RCRangePickerTimeProps<DateType>>;
 export declare type RangePickerProps<DateType> = RangePickerBaseProps<DateType> | RangePickerDateProps<DateType> | RangePickerTimeProps<DateType>;
 declare function generatePicker<DateType>(generateConfig: GenerateConfig<DateType>): import("./interface").PickerComponentClass<PickerProps<DateType> & {
-    status?: "" | "error" | "warning";
+    status?: "" | "warning" | "error";
 }, unknown> & {
     WeekPicker: import("./interface").PickerComponentClass<Omit<PickerDateProps<DateType>, "picker">, unknown>;
     MonthPicker: import("./interface").PickerComponentClass<Omit<PickerDateProps<DateType>, "picker">, unknown>;

package/es/DatePicker/index.d.ts

@@ -5,7 +5,7 @@ export declare type MonthPickerProps = Omit<PickerDateProps<Moment>, 'picker'>;
 export declare type WeekPickerProps = Omit<PickerDateProps<Moment>, 'picker'>;
 export declare type RangePickerProps = BaseRangePickerProps<Moment>;
 declare const DatePicker: import("./generatePicker/interface").PickerComponentClass<PickerProps<Moment> & {
-    status?: "" | "error" | "warning";
+    status?: "" | "warning" | "error";
 }, unknown> & {
     WeekPicker: import("./generatePicker/interface").PickerComponentClass<Omit<PickerDateProps<Moment>, "picker">, unknown>;
     MonthPicker: import("./generatePicker/interface").PickerComponentClass<Omit<PickerDateProps<Moment>, "picker">, unknown>;

package/es/LmEditTable/EditTable.js

@@ -1,5 +1,5 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 
@@ -146,26 +146,54 @@ var InputRange = function InputRange(_a) {
       editEnum = __rest(_a, ["value", "onChange", "record", "rowIndex", "colIndex", "validator"]); // 输入值改变
 
 
+  var history = useRef([]);
+
+  var _useState = useState([]),
+      _useState2 = _slicedToArray(_useState, 2),
+      nValue = _useState2[0],
+      setValue = _useState2[1];
+
+  useEffect(function () {
+    setValue(value);
+  }, value);
+
+  var handleFocus = function handleFocus() {
+    history.current.push(nValue);
+  };
+
   var handleInput = function handleInput(e, type) {
-    var v = e.target.value;
+    var v = type === 'prev' ? [e.target.value, nValue[1]] : [nValue[0], e.target.value];
+    setValue(v);
+    onChange(v);
+    history.current.push(v);
+  };
 
-    var nValue = _toConsumableArray(value);
+  var handleBlur = function handleBlur(e, type) {
+    var isFun = isFunction(validator); // 验证历史记录
 
-    if (type === 'prev') {
-      nValue[0] = v;
-    }
+    var traverse = function traverse(arr) {
+      if (!arr || !arr.length) {
+        if (type === 'prev') {
+          setValue(['', nValue[1]]);
+        } else if (type === 'next') {
+          setValue([nValue[0], '']);
+        }
 
-    if (type === 'next') {
-      nValue[1] = v;
-    }
+        history.current = [];
+        return;
+      }
 
-    if (isFunction(validator)) {
-      if (validator(record, nValue, rowIndex, colIndex)) {
-        onChange(nValue);
+      var value = arr.pop();
+
+      if (isFun && validator(record, value, rowIndex, colIndex)) {
+        setValue(value);
+        history.current = [];
+      } else {
+        traverse(arr);
       }
-    } else {
-      onChange(nValue);
-    }
+    };
+
+    traverse(history.current);
   };
 
   return /*#__PURE__*/React.createElement("div", {
@@ -173,14 +201,26 @@ var InputRange = function InputRange(_a) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "inputRange"
   }, /*#__PURE__*/React.createElement(Input, Object.assign({
-    value: value === null || value === void 0 ? void 0 : value[0],
+    value: nValue === null || nValue === void 0 ? void 0 : nValue[0],
     placeholder: "\u8BF7\u8F93\u5165",
+    onFocus: function onFocus(e) {
+      return handleFocus();
+    },
+    onBlur: function onBlur(e) {
+      return handleBlur(e, 'prev');
+    },
     onChange: function onChange(e) {
       return handleInput(e, 'prev');
     }
   }, editEnum)), "~", /*#__PURE__*/React.createElement(Input, Object.assign({
-    value: value === null || value === void 0 ? void 0 : value[1],
+    value: nValue === null || nValue === void 0 ? void 0 : nValue[1],
     placeholder: "\u8BF7\u8F93\u5165",
+    onFocus: function onFocus(e) {
+      return handleFocus();
+    },
+    onBlur: function onBlur(e) {
+      return handleBlur(e, 'next');
+    },
     onChange: function onChange(e) {
       return handleInput(e, 'next');
     }
@@ -281,10 +321,10 @@ var EditableCell = function EditableCell(props) {
       dataIndex = col.dataIndex;
   /** 是否正在编辑中 */
 
-  var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      editing = _useState2[0],
-      setEditing = _useState2[1];
+  var _useState3 = useState(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      editing = _useState4[0],
+      setEditing = _useState4[1];
 
   var inputRef = useRef(null);
   var form = useContext(EditableContext);
@@ -644,26 +684,26 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       shouldUpdate = _props$shouldUpdate === void 0 ? false : _props$shouldUpdate,
       resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "sortOpen", "colSortOpen", "filterChange", "size", "recordCreatorProps", "shouldUpdate"]);
 
-  var _useState3 = useState([]),
-      _useState4 = _slicedToArray(_useState3, 2),
-      dataSource = _useState4[0],
-      setDataSource = _useState4[1]; // const [count, setCount] = useState(0);
-
-
-  var _useState5 = useState({}),
+  var _useState5 = useState([]),
       _useState6 = _slicedToArray(_useState5, 2),
-      _valid = _useState6[0],
-      setValid = _useState6[1];
+      dataSource = _useState6[0],
+      setDataSource = _useState6[1]; // const [count, setCount] = useState(0);
+
 
-  var _useState7 = useState([]),
+  var _useState7 = useState({}),
       _useState8 = _slicedToArray(_useState7, 2),
-      localRowSelectList = _useState8[0],
-      setLocalRowSelectList = _useState8[1];
+      _valid = _useState8[0],
+      setValid = _useState8[1];
 
   var _useState9 = useState([]),
       _useState10 = _slicedToArray(_useState9, 2),
-      sortEditTable = _useState10[0],
-      setCallBackFalg = _useState10[1];
+      localRowSelectList = _useState10[0],
+      setLocalRowSelectList = _useState10[1];
+
+  var _useState11 = useState([]),
+      _useState12 = _slicedToArray(_useState11, 2),
+      sortEditTable = _useState12[0],
+      setCallBackFalg = _useState12[1];
 
   var dataSourceRef = useRef([]);
   var sortDataSorceRef = useRef([]);

package/es/LmEditTable/sortableItemCol.d.ts

@@ -1 +1,2 @@
+/// <reference types="react" />
 export default function SortableItem(props: any): JSX.Element;

package/es/LmTable/Table.js

@@ -9,10 +9,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.Summary = void 0;
 
-require("antd/es/config-provider/style");
-
-var _configProvider = _interopRequireDefault(require("antd/es/config-provider"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
@@ -23,7 +19,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 
-var _proTable = _interopRequireDefault(require("@ant-design/pro-table"));
+var _proTable = _interopRequireWildcard(require("@ant-design/pro-table"));
 
 var _sortable = require("@dnd-kit/sortable");
 
@@ -39,6 +35,8 @@ var _immer = require("immer");
 
 var _reactSortableHoc = require("react-sortable-hoc");
 
+var _ConfigProvider = _interopRequireDefault(require("../ConfigProvider"));
+
 var _IconFont = _interopRequireDefault(require("../IconFont"));
 
 var _Empty = _interopRequireDefault(require("../Empty"));
@@ -83,7 +81,7 @@ var range = function range(start, end) {
   var array = [];
   var inc = end - start > 0;
 
-  for (var i = start; inc ? i <= end : i >= end; inc ? i++ : i--) {
+  for (var i = start; inc ? i <= end : i >= end; inc ? i += 1 : i -= 1) {
     inc ? array.push(i) : array.unshift(i);
   }
 
@@ -183,6 +181,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       setExpandedRowKeys = _useState8[1];
 
   var deepDataSourceRef = (0, _react.useRef)([]);
+  /** */
+
+  var deepColumnsRef = (0, _react.useRef)([]);
   /** 行分组 */
 
   var groupDataSource = (0, _react.useMemo)(function () {
@@ -224,6 +225,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
       sheelStataus = _useState10[0],
       setSheelStatus = _useState10[1];
+  /**
+   * start: {i, j} 框选的坐标开始位置
+   * end: {i, j} 框选的坐标结束位置
+   * commiting: { start: {i, j}, end: {i, j}} 提交
+   */
+
 
   var shellStatusRef = (0, _react.useRef)({
     start: {},
@@ -287,7 +294,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   });
   (0, _react.useEffect)(function () {
     dataSourceRef.current = dataSource;
-  }, [dataSource]);
+  }, [dataSource]); // 行分组数据铺平, 在框选时获取数据使用
+
   (0, _react.useEffect)(function () {
     var source = [];
 
@@ -303,7 +311,24 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
     deepChildren(dataSource);
     deepDataSourceRef.current = source;
-  }, [dataSource, expandedRowKeys]);
+  }, [dataSource, expandedRowKeys]); // 列分组数据铺平，在框选时获取数据使用
+
+  (0, _react.useEffect)(function () {
+    var source = [];
+
+    var deepChildren = function deepChildren(arr) {
+      arr.forEach(function (item) {
+        if (item.children && item.children.length) {
+          deepChildren(item.children);
+        } else {
+          source.push(item);
+        }
+      });
+    };
+
+    deepChildren(columns);
+    deepColumnsRef.current = source;
+  }, [columns, columnKeys]);
 
   var onSortEnd = function onSortEnd(_ref) {
     var oldIndex = _ref.oldIndex,
@@ -364,7 +389,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     };
   };
 
-  var endResize = function endResize(e, data) {
+  var endResize = function endResize() {
     setTimeout(function () {
       filterChange === null || filterChange === void 0 ? void 0 : filterChange(useColumns);
     });
@@ -398,13 +423,15 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       isVaildCommit: isEmpty(commiting) ? false : isSelected && !(0, _util.checkIsSelectd)(i, j, commiting === null || commiting === void 0 ? void 0 : commiting.start, commiting === null || commiting === void 0 ? void 0 : commiting.end)
     };
   };
+  /** 获取框选的数据 */
+
 
   var getSelectDatas = function getSelectDatas(start, end) {
     return range(start.i, end.i).map(function (i) {
       return range(start.j, end.j).map(function (j) {
         var _columns$j, _columns$j2;
 
-        var columnKey = (_columns$j = columns[j]) === null || _columns$j === void 0 ? void 0 : _columns$j.dataIndex;
+        var columnKey = (columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length) ? deepColumnsRef.current[j].dataIndex : (_columns$j = columns[j]) === null || _columns$j === void 0 ? void 0 : _columns$j.dataIndex;
         var dataItem = (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) ? deepDataSourceRef.current[i] : dataSource[i];
         var cell = dataItem === null || dataItem === void 0 ? void 0 : dataItem[columnKey];
 
@@ -497,7 +524,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           start = _shellStatusRef$curre10.start,
           end = _shellStatusRef$curre10.end,
           commiting = _shellStatusRef$curre10.commiting;
-      var columnsKeysList = columns.map(function (item) {
+      var innerColumns = (columnKeys === null || columnKeys === void 0 ? void 0 : columnKeys.length) ? deepColumnsRef.current : columns;
+      var columnsKeysList = innerColumns.map(function (item) {
         return item.dataIndex;
       });
       var rowtext = range(commiting === null || commiting === void 0 ? void 0 : commiting.start.i, commiting === null || commiting === void 0 ? void 0 : commiting.end.i).map(function (i) {
@@ -510,25 +538,29 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       });
       var coltext = range(commiting === null || commiting === void 0 ? void 0 : commiting.start.i, commiting === null || commiting === void 0 ? void 0 : commiting.end.i).map(function (i) {
         return range(commiting === null || commiting === void 0 ? void 0 : commiting.start.j, commiting === null || commiting === void 0 ? void 0 : commiting.end.j).map(function (j) {
-          var _columns$j4, _columns$j5;
+          var _innerColumns$j, _innerColumns$j2;
 
-          var columnKey = (_columns$j4 = columns[j]) === null || _columns$j4 === void 0 ? void 0 : _columns$j4.dataIndex;
+          var columnKey = (_innerColumns$j = innerColumns[j]) === null || _innerColumns$j === void 0 ? void 0 : _innerColumns$j.dataIndex;
           var dataItem = (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) ? deepDataSourceRef.current[i] : dataSource[i];
           var cell = dataItem === null || dataItem === void 0 ? void 0 : dataItem[columnKey];
 
-          if ((_columns$j5 = columns[j]) === null || _columns$j5 === void 0 ? void 0 : _columns$j5.render) {
-            var _columns$j6, _columns$j6$render;
+          if ((_innerColumns$j2 = innerColumns[j]) === null || _innerColumns$j2 === void 0 ? void 0 : _innerColumns$j2.render) {
+            var _innerColumns$j3, _innerColumns$j3$rend;
 
-            return (_columns$j6 = columns[j]) === null || _columns$j6 === void 0 ? void 0 : (_columns$j6$render = _columns$j6.render) === null || _columns$j6$render === void 0 ? void 0 : _columns$j6$render.call(_columns$j6, cell, dataItem, i);
+            return (_innerColumns$j3 = innerColumns[j]) === null || _innerColumns$j3 === void 0 ? void 0 : (_innerColumns$j3$rend = _innerColumns$j3.render) === null || _innerColumns$j3$rend === void 0 ? void 0 : _innerColumns$j3$rend.call(_innerColumns$j3, cell, dataItem, i);
           }
 
           return cell;
         });
       });
+      /** 选择范围 例如：i:[0,1], j:[1,2] */
+
       var selectedRange = {
         i: range(start.i, end.i),
         j: range(start.j, end.j)
       };
+      /** 提交范围 */
+
       var commitRange = {
         i: range(commiting === null || commiting === void 0 ? void 0 : (_commiting$start = commiting.start) === null || _commiting$start === void 0 ? void 0 : _commiting$start.i, commiting === null || commiting === void 0 ? void 0 : (_commiting$end = commiting.end) === null || _commiting$end === void 0 ? void 0 : _commiting$end.i),
         j: range(commiting === null || commiting === void 0 ? void 0 : (_commiting$start2 = commiting.start) === null || _commiting$start2 === void 0 ? void 0 : _commiting$start2.j, commiting === null || commiting === void 0 ? void 0 : (_commiting$end2 = commiting.end) === null || _commiting$end2 === void 0 ? void 0 : _commiting$end2.j)
@@ -835,54 +867,67 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     };
   }, []);
   var resetColumns = (0, _react.useCallback)(function () {
-    var result = useColumns.filter(function (item) {
-      return item.show !== false;
-    }).map(function (col, index) {
-      var obj = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, col), {}, {
-        width: col.width,
-        onHeaderCell: function onHeaderCell(column) {
-          return {
-            width: column.width,
-            // onResize: (e, size) => handleResize(e, size, index),
-            onResize: handleResize(index),
-            onResizeStop: endResize
-          };
+    var colIndex = 0;
+
+    var traverseColumns = function traverseColumns(columns) {
+      columns.forEach(function (col) {
+        if (col.show === false) {
+          return;
         }
-      });
 
-      if (openSheet) {
-        obj.onCell = function (record, rowIndex) {
-          return {
-            record: record,
-            rowKey: rowKey,
-            col: col,
-            colIndex: index,
-            selectIng: selectIng,
-            editIng: editIng,
-            commitIng: commitIng,
-            rowIndex: rowIndex,
-            onMouseDown: sheelMouseDown,
-            onMouseOver: onMouseOver,
-            onContextMenu: onContextMenu,
-            isSelected: isSelected,
-            onDoubleClick: onSheelDoubleClick,
-            dataSourceChange: dataSourceChange
+        if (col.children && col.children.length) {
+          traverseColumns(col.children);
+        } else {
+          // $_ 开头表示私有属性
+          col.$_colIndex = colIndex;
+
+          col.onHeaderCell = function (column) {
+            return {
+              width: column.width,
+              onResize: handleResize(col.$_colIndex),
+              onResizeStop: endResize
+            };
           };
-        };
-      }
 
-      return obj;
-    });
+          if (openSheet) {
+            col.onCell = function (record, rowIndex) {
+              return {
+                record: record,
+                rowKey: rowKey,
+                col: col,
+                colIndex: col.$_colIndex,
+                selectIng: selectIng,
+                editIng: editIng,
+                commitIng: commitIng,
+                rowIndex: rowIndex,
+                onMouseDown: sheelMouseDown,
+                onMouseOver: onMouseOver,
+                onContextMenu: onContextMenu,
+                isSelected: isSelected,
+                onDoubleClick: onSheelDoubleClick,
+                dataSourceChange: dataSourceChange
+              };
+            };
+          }
+        }
+
+        colIndex += 1;
+      });
+    };
+
+    var innerColumns = (0, _lodash.cloneDeep)(useColumns);
+    traverseColumns(innerColumns, null);
 
     if (groupInfo === null || groupInfo === void 0 ? void 0 : groupInfo.length) {
-      result = [{
-        dataIndex: 'group',
+      innerColumns = [{
+        type: 'name',
         title: '分组',
-        key: 'group'
-      }].concat((0, _toConsumableArray2.default)(result));
+        key: 'group',
+        width: 100
+      }].concat((0, _toConsumableArray2.default)(innerColumns));
     }
 
-    return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(result)) : result;
+    return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(innerColumns)) : innerColumns;
   }, [useColumns, sortOpen, selectIng, dataSource, groupInfo, commitIng]);
   (0, _react.useEffect)(function () {
     setColumns(columns);
@@ -920,13 +965,15 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   //     height: autoSize.height, // 此值和scrollY值相同. 必传.
   //   })
   // }, [autoSize.height])
+  // const { locale: contextLocale = defaultLocale } = React.useContext(ConfigContext)
+  // const tableLocale = { ...contextLocale.Table, ...locale }
   // 复选框配置
 
 
   var config = (0, _react.useMemo)(function () {
     return (0, _objectSpread2.default)({
       defaultSize: 'small',
-      tableLayout: columnKeys ? 'auto' : 'fixed',
+      tableLayout: 'fixed',
       rowKey: rowKey,
       debounceTime: 300,
       revalidateOnFocus: false,
@@ -1163,12 +1210,16 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       width: '100%'
     },
     ref: tableWarpRef
-  }, /*#__PURE__*/_react.default.createElement(_configProvider.default, {
+  }, /*#__PURE__*/_react.default.createElement(_ConfigProvider.default, {
     renderEmpty: loading ? function () {
       return null;
     } : emptyProps ? function () {
       return /*#__PURE__*/_react.default.createElement(_Empty.default, emptyProps, (emptyProps === null || emptyProps === void 0 ? void 0 : emptyProps.footer) || null);
     } : _customRenderEmpty.default
+  }, /*#__PURE__*/_react.default.createElement(_proTable.ConfigProvider, {
+    value: {
+      intl: _proTable.enUSIntl
+    }
   }, colSortOpen ? /*#__PURE__*/_react.default.createElement(_DndContainer.default, {
     move: onColSortEnd
   }, /*#__PURE__*/_react.default.createElement(_sortableBoxCol.default, {
@@ -1227,7 +1278,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     summary: function summary(pageData) {
       return _summary && _summary(pageData, resultColumns);
     }
-  }))), !!customCheck && /*#__PURE__*/_react.default.createElement("div", {
+  })))), !!customCheck && /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_customCheck"
   }, customCheck), contextMenuStatus && /*#__PURE__*/_react.default.createElement("div", {
     ref: contentMenuRef,
@@ -1331,11 +1382,13 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, [tableSize, props]);
 
   var changeSize = function changeSize() {
-    var _tableWarpRef$current;
+    if (!tableWarpRef.current) {
+      return;
+    }
 
     var value = props.summary ? 48 : 0;
 
-    var _ref6 = ((_tableWarpRef$current = tableWarpRef.current) === null || _tableWarpRef$current === void 0 ? void 0 : _tableWarpRef$current.getBoundingClientRect()) || {},
+    var _ref6 = tableWarpRef.current.getBoundingClientRect() || {},
         _ref6$width = _ref6.width,
         width = _ref6$width === void 0 ? '100%' : _ref6$width,
         _ref6$height = _ref6.height,
@@ -1351,13 +1404,15 @@ var ResizeSize = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _react.useEffect)(function () {
     var summary = props.summary;
     setTimeout(function () {
-      var _tableWarpRef$current5;
+      if (!tableWarpRef.current) {
+        return;
+      }
 
-      var _tableWarpRef$current2 = (_tableWarpRef$current5 = tableWarpRef.current) === null || _tableWarpRef$current5 === void 0 ? void 0 : _tableWarpRef$current5.getBoundingClientRect(),
-          _tableWarpRef$current3 = _tableWarpRef$current2.width,
-          width = _tableWarpRef$current3 === void 0 ? '100%' : _tableWarpRef$current3,
-          _tableWarpRef$current4 = _tableWarpRef$current2.height,
-          height = _tableWarpRef$current4 === void 0 ? '100%' : _tableWarpRef$current4;
+      var _tableWarpRef$current = tableWarpRef.current.getBoundingClientRect(),
+          _tableWarpRef$current2 = _tableWarpRef$current.width,
+          width = _tableWarpRef$current2 === void 0 ? '100%' : _tableWarpRef$current2,
+          _tableWarpRef$current3 = _tableWarpRef$current.height,
+          height = _tableWarpRef$current3 === void 0 ? '100%' : _tableWarpRef$current3;
 
       var value = summary ? 48 : 0;
       setTableSize({

package/es/LmTable/components/sheelTableCell.js

@@ -82,7 +82,7 @@ var SheelTabelCell = function SheelTabelCell(props) {
 
 
   var handleContextMenu = function handleContextMenu(e) {
-    if (!col.disableEvents) {
+    if (col && !col.disableEvents) {
       onContextMenu === null || onContextMenu === void 0 ? void 0 : onContextMenu(e, rowIndex, colIndex);
     }
   };