linkmore-design 1.1.0 → 1.1.2

package/lib/LmTable/Table.js

@@ -171,12 +171,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var deepDataSourceRef = (0, _react.useRef)([]);
   var deepColumnsRef = (0, _react.useRef)([]);
-  /** 行分组表格对应数据的隐藏数列表 */
-
-  var hideListRef = (0, _react.useRef)([]);
-  /** 行分组的空行列表数据 */
-
-  var skipListRef = (0, _react.useRef)([]);
   /** 记录最原始数据 */
 
   (0, _react.useEffect)(function () {
@@ -210,8 +204,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     setExpandedRowKeys([]);
     deepDataSourceRef.current = [];
     deepColumnsRef.current = [];
-    hideListRef.current = [];
-  }, [groupRowKeys]);
+  }, [groupRowKeys, groupColKeys]);
   /** sheel数据的表格 */
 
   var _useState9 = (0, _react.useState)({
@@ -295,46 +288,18 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _react.useEffect)(function () {
     var source = [];
 
-    var dfs = function dfs(children) {
-      var num = 0;
-      children.forEach(function (item) {
-        if (item.children) {
-          num += dfs(item.children);
-        } else {
-          num += 1;
-        }
-      });
-      return num;
-    };
-
-    var hideList = [];
-
     var deepChildren = function deepChildren(arr) {
       arr.forEach(function (item) {
-        source.push((0, _lodash.omit)(item, 'children'));
-        var prev = hideList.length ? hideList[hideList.length - 1] : 0; // 展开
+        source.push((0, _lodash.omit)(item, 'children')); // 展开
 
         if ((item === null || item === void 0 ? void 0 : item.children) && expandedRowKeys.includes(item.key)) {
-          hideList.push(prev);
           deepChildren(item === null || item === void 0 ? void 0 : item.children);
-        } // 隐藏
-
-
-        if ((item === null || item === void 0 ? void 0 : item.children) && !expandedRowKeys.includes(item.key)) {
-          var count = dfs(item.children);
-          hideList.push(count + prev);
-        }
-
-        if (!(item === null || item === void 0 ? void 0 : item.children)) {
-          hideList.push(prev);
         }
       });
     };
 
     deepChildren(dataSource);
     deepDataSourceRef.current = source;
-    hideListRef.current = hideList;
-    skipListRef.current = (0, _util.getSkipList)((groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) ? deepDataSourceRef.current : dataSource);
   }, [dataSource, expandedRowKeys]); // 列分组数据铺平，在框选时获取数据使用
 
   (0, _react.useEffect)(function () {
@@ -444,7 +409,11 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       isEditing: (editing === null || editing === void 0 ? void 0 : editing.i) === i && (editing === null || editing === void 0 ? void 0 : editing.j) === j,
 
       /** 是否有效拉伸 */
-      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)
+      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),
+
+      /** 是否选中只读框  */
+      // TODO
+      selectedReadonly: true
     };
   };
   /** 获取框选的数据 */
@@ -473,40 +442,36 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   var handleCopy = function handleCopy(e) {
-    var _shellStatusRef$curre2;
-
-    if (isEmpty((_shellStatusRef$curre2 = shellStatusRef.current) === null || _shellStatusRef$curre2 === void 0 ? void 0 : _shellStatusRef$curre2.editing)) {
-      var _e$clipboardData;
-
-      e === null || e === void 0 ? void 0 : e.preventDefault();
-      var _shellStatusRef$curre3 = shellStatusRef.current,
-          start = _shellStatusRef$curre3.start,
-          end = _shellStatusRef$curre3.end;
-      var text = getSelectDatas(start, end);
-
-      if (window.clipboardData && window.clipboardData.setData) {
-        window.clipboardData.setData('Text', text);
-      } else if ((_e$clipboardData = e.clipboardData) === null || _e$clipboardData === void 0 ? void 0 : _e$clipboardData.setData) {
-        e.clipboardData.setData('text/plain', text);
-      } else {
-        var _document;
+    var _e$clipboardData;
+
+    e === null || e === void 0 ? void 0 : e.preventDefault();
+    var _shellStatusRef$curre2 = shellStatusRef.current,
+        start = _shellStatusRef$curre2.start,
+        end = _shellStatusRef$curre2.end;
+    var text = getSelectDatas(start, end);
+
+    if (window.clipboardData && window.clipboardData.setData) {
+      window.clipboardData.setData('Text', text);
+    } else if ((_e$clipboardData = e.clipboardData) === null || _e$clipboardData === void 0 ? void 0 : _e$clipboardData.setData) {
+      e.clipboardData.setData('text/plain', text);
+    } else {
+      var _document;
 
-        (_document = document) === null || _document === void 0 ? void 0 : _document.execCommand('copy');
+      (_document = document) === null || _document === void 0 ? void 0 : _document.execCommand('copy');
 
-        if (contextMenuStatus) {
-          setContextMenuStatus(false);
-        }
+      if (contextMenuStatus) {
+        setContextMenuStatus(false);
       }
     }
   };
 
   var onMouseOver = function onMouseOver(i, j) {
-    var _shellStatusRef$curre4, _shellStatusRef$curre7, _checkStatus, _shellStatusRef$curre8;
+    var _shellStatusRef$curre3, _shellStatusRef$curre6, _checkStatus, _shellStatusRef$curre7;
 
-    if (isEmpty(shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre4 = shellStatusRef.current) === null || _shellStatusRef$curre4 === void 0 ? void 0 : _shellStatusRef$curre4.commiting)) {
-      var _shellStatusRef$curre5, _shellStatusRef$curre6;
+    if (isEmpty(shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre3 = shellStatusRef.current) === null || _shellStatusRef$curre3 === void 0 ? void 0 : _shellStatusRef$curre3.commiting)) {
+      var _shellStatusRef$curre4, _shellStatusRef$curre5;
 
-      if ((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre5 = shellStatusRef.current) === null || _shellStatusRef$curre5 === void 0 ? void 0 : _shellStatusRef$curre5.selecting) && isEmpty(shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre6 = shellStatusRef.current) === null || _shellStatusRef$curre6 === void 0 ? void 0 : _shellStatusRef$curre6.editing)) {
+      if ((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre4 = shellStatusRef.current) === null || _shellStatusRef$curre4 === void 0 ? void 0 : _shellStatusRef$curre4.selecting) && isEmpty(shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre5 = shellStatusRef.current) === null || _shellStatusRef$curre5 === void 0 ? void 0 : _shellStatusRef$curre5.editing)) {
         shellStatusRef.current = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, shellStatusRef.current), {}, {
           end: {
             i: i,
@@ -520,7 +485,15 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           }
         }));
       }
-    } else if (!isEmpty((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre7 = shellStatusRef.current) === null || _shellStatusRef$curre7 === void 0 ? void 0 : _shellStatusRef$curre7.commiting) || {}) && ((_checkStatus = (0, _util.checkStatus)(i, j, shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre8 = shellStatusRef.current) === null || _shellStatusRef$curre8 === void 0 ? void 0 : _shellStatusRef$curre8.commiting)) === null || _checkStatus === void 0 ? void 0 : _checkStatus.isVaildCommit)) {
+    } else if (!isEmpty((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre6 = shellStatusRef.current) === null || _shellStatusRef$curre6 === void 0 ? void 0 : _shellStatusRef$curre6.commiting) || {}) && ((_checkStatus = (0, _util.checkStatus)(i, j, shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre7 = shellStatusRef.current) === null || _shellStatusRef$curre7 === void 0 ? void 0 : _shellStatusRef$curre7.commiting)) === null || _checkStatus === void 0 ? void 0 : _checkStatus.isVaildCommit)) {
+      if ((0, _util.isSelectCrossRowGroup)(i, shellStatusRef, deepDataSourceRef)) {
+        return;
+      }
+
+      if ((0, _util.isSelectCrossInvalidCol)(i, j, shellStatusRef, deepDataSourceRef, deepColumnsRef)) {
+        return;
+      }
+
       shellStatusRef.current = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, shellStatusRef.current), {}, {
         end: {
           i: i,
@@ -534,6 +507,49 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         }
       }));
     }
+  }; // 通过表格的行列索引，获取对应的原始数据的item信息
+
+
+  var getSourceItemInfo = function getSourceItemInfo(trIndex, tdIndex) {
+    var innerColumns = (groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length) ? deepColumnsRef.current : columns;
+    var columnsKeysList = innerColumns.map(function (item) {
+      return item.dataIndex;
+    });
+    var key = columnsKeysList[tdIndex];
+    var index;
+    var nil = {
+      index: -1,
+      key: undefined
+    };
+
+    if (key === undefined) {
+      return nil;
+    } // 列分组的情况下
+
+
+    if (groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length) {
+      var _deepDataSourceRef$cu;
+
+      if ((groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) && (deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : (_deepDataSourceRef$cu = deepDataSourceRef.current) === null || _deepDataSourceRef$cu === void 0 ? void 0 : _deepDataSourceRef$cu[trIndex]._group)) {
+        return nil;
+      }
+
+      index = (0, _util.getDataSourceIndex)({
+        key: key,
+        dataSource: dataSource
+      });
+      var arr = key.split('_');
+      key = arr[arr.length - 2];
+    } else if (groupRowKeys.length) {
+      index = deepDataSourceRef.current[trIndex].__index;
+    } else {
+      index = trIndex;
+    }
+
+    return {
+      index: index,
+      key: key
+    };
   };
   /** sheel 表格 鼠标松开 */
 
@@ -541,28 +557,29 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   var sheelOnMouseUp = function sheelOnMouseUp() {
-    var _shellStatusRef$curre9;
+    var _shellStatusRef$curre8;
 
-    if (!isEmpty((_shellStatusRef$curre9 = shellStatusRef.current) === null || _shellStatusRef$curre9 === void 0 ? void 0 : _shellStatusRef$curre9.commiting)) {
+    if (!isEmpty((_shellStatusRef$curre8 = shellStatusRef.current) === null || _shellStatusRef$curre8 === void 0 ? void 0 : _shellStatusRef$curre8.commiting)) {
       var _commiting$start, _commiting$end, _commiting$start2, _commiting$end2, _difference, _difference2, _obj$i;
 
-      var _shellStatusRef$curre10 = shellStatusRef.current,
-          start = _shellStatusRef$curre10.start,
-          end = _shellStatusRef$curre10.end,
-          commiting = _shellStatusRef$curre10.commiting; //
+      var _shellStatusRef$curre9 = shellStatusRef.current,
+          start = _shellStatusRef$curre9.start,
+          end = _shellStatusRef$curre9.end,
+          commiting = _shellStatusRef$curre9.commiting; //
 
       var innerColumns = (groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length) ? deepColumnsRef.current : columns;
       var innerDataSource = (groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length) ? deepDataSourceRef.current : dataSource; //
 
       var columnsKeysList = innerColumns.map(function (item) {
         return item.dataIndex;
-      }); // 空行值数组
+      }); // 行文本
 
       var rowtext = (0, _util.getSelectionRowText)({
         selection: commiting,
         columnsKeysList: columnsKeysList,
         dataSource: innerDataSource
-      });
+      }); // 列文本
+
       var coltext = (0, _util.getSelectionColText)({
         selection: commiting,
         columns: innerColumns,
@@ -609,20 +626,17 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           var _isSelected;
 
           if ((_isSelected = isSelected(tri, tdj)) === null || _isSelected === void 0 ? void 0 : _isSelected.isSelected) {
-            var key = columnsKeysList[tdj];
-            var sourceIndex; // 列分组的情况下
-
-            if (groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length) {
-              sourceIndex = (0, _util.getDataSourceIndex)({
-                key: key,
-                dataSource: dataSource
-              });
-              var arr = key.split('_');
-              key = arr[arr.length - 2];
-            } else {
-              sourceIndex = tri - skipListRef.current[tri] + hideListRef.current[tri];
+            var _deepColumnsRef$curre, _deepColumnsRef$curre2;
+
+            // 只读列无法修改其内容
+            if (deepColumnsRef === null || deepColumnsRef === void 0 ? void 0 : (_deepColumnsRef$curre = deepColumnsRef.current) === null || _deepColumnsRef$curre === void 0 ? void 0 : (_deepColumnsRef$curre2 = _deepColumnsRef$curre[tdj]) === null || _deepColumnsRef$curre2 === void 0 ? void 0 : _deepColumnsRef$curre2.readOnly) {
+              return;
             }
 
+            var _getSourceItemInfo = getSourceItemInfo(tri, tdj),
+                sourceIndex = _getSourceItemInfo.index,
+                key = _getSourceItemInfo.key;
+
             if (sourceIndex < 0 || sourceIndex >= data.length) {
               return;
             } // 行替换
@@ -670,9 +684,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   var handleCut = function handleCut(e) {
-    var _shellStatusRef$curre11;
+    var _shellStatusRef$curre10;
 
-    if (isEmpty((_shellStatusRef$curre11 = shellStatusRef.current) === null || _shellStatusRef$curre11 === void 0 ? void 0 : _shellStatusRef$curre11.editing)) {
+    if (isEmpty((_shellStatusRef$curre10 = shellStatusRef.current) === null || _shellStatusRef$curre10 === void 0 ? void 0 : _shellStatusRef$curre10.editing)) {
       e.preventDefault();
       handleCopy(e);
       /** 暂时先不隐藏 */
@@ -686,12 +700,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   var handlePaste = function handlePaste(e) {
-    var _shellStatusRef$curre12;
+    var _shellStatusRef$curre11;
 
-    if (isEmpty((_shellStatusRef$curre12 = shellStatusRef.current) === null || _shellStatusRef$curre12 === void 0 ? void 0 : _shellStatusRef$curre12.editing)) {
-      var _shellStatusRef$curre13 = shellStatusRef.current,
-          start = _shellStatusRef$curre13.start,
-          end = _shellStatusRef$curre13.end;
+    if (isEmpty((_shellStatusRef$curre11 = shellStatusRef.current) === null || _shellStatusRef$curre11 === void 0 ? void 0 : _shellStatusRef$curre11.editing)) {
+      var _shellStatusRef$curre12 = shellStatusRef.current,
+          start = _shellStatusRef$curre12.start,
+          end = _shellStatusRef$curre12.end;
       start = {
         i: Math.min(start.i, end.i),
         j: Math.min(start.j, end.j)
@@ -721,15 +735,20 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           });
         });
       });
-      var columnsKeysList = columns.map(function (item) {
-        return item.dataIndex;
-      });
       var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
         resultEnd.forEach(function (item) {
           var _isSelected2;
 
           if ((_isSelected2 = isSelected(item.i, item.j)) === null || _isSelected2 === void 0 ? void 0 : _isSelected2.isSelected) {
-            draft[item.i][columnsKeysList[item.j]] = item.value;
+            var _getSourceItemInfo2 = getSourceItemInfo(item.i, item.j),
+                index = _getSourceItemInfo2.index,
+                key = _getSourceItemInfo2.key;
+
+            if (index < 0 || index >= draft.length) {
+              return;
+            }
+
+            draft[index][key] = item.value;
           }
         });
       });
@@ -738,7 +757,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       if (editSheet) {
         dataChange === null || dataChange === void 0 ? void 0 : dataChange(res);
       }
-    }
+    } // 修复重复问题
+
+
+    document.removeEventListener('paste', handlePaste);
+    document.removeEventListener('copy', handleCopy);
+    document.removeEventListener('cut', handleCut);
   };
 
   var pageClick = function pageClick(e) {
@@ -782,13 +806,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   var sheelMouseDown = function sheelMouseDown(i, j, e, commitStatus) {
-    var _shellStatusRef$curre14, _shellStatusRef$curre15, _shellStatusRef$curre16, _shellStatusRef$curre17, _shellStatusRef$curre18, _shellStatusRef$curre19, _shellStatusRef$curre20, _shellStatusRef$curre21, _shellStatusRef$curre22, _shellStatusRef$curre23;
+    var _shellStatusRef$curre13, _shellStatusRef$curre14, _shellStatusRef$curre15, _shellStatusRef$curre16, _shellStatusRef$curre17, _shellStatusRef$curre18, _shellStatusRef$curre19, _shellStatusRef$curre20, _shellStatusRef$curre21, _shellStatusRef$curre22;
 
-    var isNowEditingSameCell = !isEmpty((_shellStatusRef$curre14 = shellStatusRef.current) === null || _shellStatusRef$curre14 === void 0 ? void 0 : _shellStatusRef$curre14.editing) && ((_shellStatusRef$curre15 = shellStatusRef.current) === null || _shellStatusRef$curre15 === void 0 ? void 0 : _shellStatusRef$curre15.editing.i) === i && ((_shellStatusRef$curre16 = shellStatusRef.current) === null || _shellStatusRef$curre16 === void 0 ? void 0 : _shellStatusRef$curre16.editing.j) === j;
-    var editing = isEmpty((_shellStatusRef$curre17 = shellStatusRef.current) === null || _shellStatusRef$curre17 === void 0 ? void 0 : _shellStatusRef$curre17.editing) || ((_shellStatusRef$curre18 = shellStatusRef.current) === null || _shellStatusRef$curre18 === void 0 ? void 0 : _shellStatusRef$curre18.editing.i) !== i || ((_shellStatusRef$curre19 = shellStatusRef.current) === null || _shellStatusRef$curre19 === void 0 ? void 0 : _shellStatusRef$curre19.editing.j) !== j ? {} : (_shellStatusRef$curre20 = shellStatusRef.current) === null || _shellStatusRef$curre20 === void 0 ? void 0 : _shellStatusRef$curre20.editing;
+    var isNowEditingSameCell = !isEmpty((_shellStatusRef$curre13 = shellStatusRef.current) === null || _shellStatusRef$curre13 === void 0 ? void 0 : _shellStatusRef$curre13.editing) && ((_shellStatusRef$curre14 = shellStatusRef.current) === null || _shellStatusRef$curre14 === void 0 ? void 0 : _shellStatusRef$curre14.editing.i) === i && ((_shellStatusRef$curre15 = shellStatusRef.current) === null || _shellStatusRef$curre15 === void 0 ? void 0 : _shellStatusRef$curre15.editing.j) === j;
+    var editing = isEmpty((_shellStatusRef$curre16 = shellStatusRef.current) === null || _shellStatusRef$curre16 === void 0 ? void 0 : _shellStatusRef$curre16.editing) || ((_shellStatusRef$curre17 = shellStatusRef.current) === null || _shellStatusRef$curre17 === void 0 ? void 0 : _shellStatusRef$curre17.editing.i) !== i || ((_shellStatusRef$curre18 = shellStatusRef.current) === null || _shellStatusRef$curre18 === void 0 ? void 0 : _shellStatusRef$curre18.editing.j) !== j ? {} : (_shellStatusRef$curre19 = shellStatusRef.current) === null || _shellStatusRef$curre19 === void 0 ? void 0 : _shellStatusRef$curre19.editing;
     shellStatusRef.current = {
       selecting: !isNowEditingSameCell,
-      start: (e === null || e === void 0 ? void 0 : e.shiftKey) || commitStatus ? (_shellStatusRef$curre21 = shellStatusRef.current) === null || _shellStatusRef$curre21 === void 0 ? void 0 : _shellStatusRef$curre21.start : {
+      start: (e === null || e === void 0 ? void 0 : e.shiftKey) || commitStatus ? (_shellStatusRef$curre20 = shellStatusRef.current) === null || _shellStatusRef$curre20 === void 0 ? void 0 : _shellStatusRef$curre20.start : {
         i: i,
         j: j
       },
@@ -799,7 +823,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       editing: editing,
       forceEdit: !!isNowEditingSameCell,
       commiting: commitStatus ? {
-        start: (_shellStatusRef$curre22 = shellStatusRef.current) === null || _shellStatusRef$curre22 === void 0 ? void 0 : _shellStatusRef$curre22.start,
+        start: (_shellStatusRef$curre21 = shellStatusRef.current) === null || _shellStatusRef$curre21 === void 0 ? void 0 : _shellStatusRef$curre21.start,
         end: {
           i: i,
           j: j
@@ -812,7 +836,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       setCommitIng(true);
     }
 
-    if (isEmpty((_shellStatusRef$curre23 = shellStatusRef.current) === null || _shellStatusRef$curre23 === void 0 ? void 0 : _shellStatusRef$curre23.editing)) {
+    if (isEmpty((_shellStatusRef$curre22 = shellStatusRef.current) === null || _shellStatusRef$curre22 === void 0 ? void 0 : _shellStatusRef$curre22.editing)) {
       setEditIng(false);
     }
 
@@ -827,9 +851,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var onContextMenu = function onContextMenu(evt, i, j) {
     evt.preventDefault();
-    var _shellStatusRef$curre24 = shellStatusRef.current,
-        start = _shellStatusRef$curre24.start,
-        end = _shellStatusRef$curre24.end;
+    var _shellStatusRef$curre23 = shellStatusRef.current,
+        start = _shellStatusRef$curre23.start,
+        end = _shellStatusRef$curre23.end;
     /** 如果表格当前没有选择，则把当前的右击的td块默认选中 */
 
     if (isEmpty(start) && isEmpty(end)) {
@@ -881,11 +905,18 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   };
 
-  var dataSourceChange = function dataSourceChange(i, j, newRecord) {
-    // 表格中的行数 转化为 对应的数据源索引
-    var rowIndex = i - skipListRef.current[i] + hideListRef.current[i];
+  var dataSourceChange = function dataSourceChange(i, j, value) {
+    var _getSourceItemInfo3 = getSourceItemInfo(i, j),
+        index = _getSourceItemInfo3.index,
+        key = _getSourceItemInfo3.key;
+
+    if (index < 0 || index >= dataSourceRef.current.length) {
+      return;
+    } // 表格中的行数 转化为 对应的数据源索引
+
+
     var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
-      draft[rowIndex] = newRecord;
+      draft[index][key] = value;
     });
     dataChange === null || dataChange === void 0 ? void 0 : dataChange(res);
     shellStatusRef.current = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, shellStatusRef.current), {}, {
@@ -915,6 +946,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
         if (col.children && col.children.length) {
           traverseColumns(col.children);
+          return;
         } else {
           // $_ 开头表示私有属性
           col.$_colIndex = colIndex;
@@ -1351,6 +1383,8 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       return setChartsModalStatus(false);
     },
     data: dataSource,
+    deepDataSource: deepDataSourceRef.current,
+    rowKey: rowKey,
     columns: columns,
     selectInfo: (0, _lodash.pick)(shellStatusRef.current, ['start', 'end'])
   }));

package/lib/LmTable/components/sheelTableCell.js

@@ -58,7 +58,7 @@ var SheelTabelCell = function SheelTabelCell(props) {
 
   var _ref = (isSelected === null || isSelected === void 0 ? void 0 : isSelected(rowIndex, colIndex)) || {},
       _ref$isSelected = _ref.isSelected,
-      sd = _ref$isSelected === void 0 ? false : _ref$isSelected,
+      _selected = _ref$isSelected === void 0 ? false : _ref$isSelected,
       _ref$isEnd = _ref.isEnd,
       isEnd = _ref$isEnd === void 0 ? false : _ref$isEnd,
       _ref$isRightEnd = _ref.isRightEnd,
@@ -66,7 +66,9 @@ var SheelTabelCell = function SheelTabelCell(props) {
       _ref$isEditing = _ref.isEditing,
       isEditing = _ref$isEditing === void 0 ? false : _ref$isEditing,
       _ref$isVaildCommit = _ref.isVaildCommit,
-      isVaildCommit = _ref$isVaildCommit === void 0 ? false : _ref$isVaildCommit;
+      isVaildCommit = _ref$isVaildCommit === void 0 ? false : _ref$isVaildCommit,
+      _ref$selectedReadonly = _ref.selectedReadonly,
+      selectedReadonly = _ref$selectedReadonly === void 0 ? false : _ref$selectedReadonly;
 
   var _useState = (0, _react.useState)((record === null || record === void 0 ? void 0 : record[col === null || col === void 0 ? void 0 : col.dataIndex]) || ''),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -134,13 +136,12 @@ var SheelTabelCell = function SheelTabelCell(props) {
 
   var saveRenderValue = function saveRenderValue() {
     if (valueRef.current !== (record === null || record === void 0 ? void 0 : record[col === null || col === void 0 ? void 0 : col.dataIndex])) {
-      dataSourceChange === null || dataSourceChange === void 0 ? void 0 : dataSourceChange(rowIndex, colIndex, Object.assign(Object.assign({}, record), (0, _defineProperty2.default)({}, col.dataIndex, valueRef.current)));
+      dataSourceChange === null || dataSourceChange === void 0 ? void 0 : dataSourceChange(rowIndex, colIndex, valueRef.current, Object.assign(Object.assign({}, record), (0, _defineProperty2.default)({}, col.dataIndex, valueRef.current)));
     }
   };
 
   var renderEditor = function renderEditor() {
     if (isEditing) {
-      console.log(isEditing, '-----isEditing-----');
       var Editor = (col === null || col === void 0 ? void 0 : col.dataEditor) || _inputDataEdit.default;
       return /*#__PURE__*/_react.default.createElement(Editor, {
         cell: col,
@@ -161,7 +162,7 @@ var SheelTabelCell = function SheelTabelCell(props) {
   var content = renderComponent() || renderEditor() || renderViewer;
   return /*#__PURE__*/_react.default.createElement("td", Object.assign({}, (0, _lodash.omit)(clearProps, ['commitIng', 'editIng']), {
     // style={{ userSelect: 'none' }}
-    className: (0, _classnames.default)(colIndex === undefined && 'row_selection_td', 'unselection', sd && selectIng && 'selected', isEnd && 'end', isRightEnd && 'right_end', isEditing && 'editing', isVaildCommit && 'commiting'),
+    className: (0, _classnames.default)(colIndex === undefined && 'row_selection_td', 'unselection', _selected && selectIng && 'selected', isEnd && 'end', isRightEnd && 'right_end', isEditing && 'editing', isVaildCommit && 'commiting', selectedReadonly && 'readonly_red'),
     onMouseDown: handleMouseDown,
     onMouseOver: handleMouseOver,
     onContextMenu: handleContextMenu,

package/lib/LmTable/components/sortableItemCol.js

@@ -21,11 +21,13 @@ var _utilities = require("@dnd-kit/utilities");
 
 var _excluded = ["children"];
 var Item = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var _children$props;
+
   var children = _ref.children,
       props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   return /*#__PURE__*/_react.default.createElement("th", (0, _extends2.default)({}, props, {
     ref: ref
-  }), children);
+  }), (children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.children) || children);
 });
 
 function SortableItem(props) {

package/lib/LmTable/components/tableChartsModal.d.ts

@@ -16,6 +16,8 @@ interface IProps extends ILMModalProps {
             j: number;
         };
     };
+    rowKey?: string;
+    deepDataSource?: Record<string, unknown>[];
 }
 /** i 是行  j 是列 */
 declare const TableChartsModal: (props: IProps) => JSX.Element;

package/lib/LmTable/components/tableChartsModal.js

@@ -2,11 +2,15 @@
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _lodash = require("lodash");
@@ -21,8 +25,16 @@ var TableChartsModal = function TableChartsModal(props) {
       onCancel = props.onCancel,
       data = props.data,
       columns = props.columns,
-      selectInfo = props.selectInfo;
+      selectInfo = props.selectInfo,
+      rowKey = props.rowKey,
+      deepDataSource = props.deepDataSource;
+  console.log(data, columns, '---props---', rowKey);
+  var keyByCol = (0, _react.useMemo)(function () {
+    return (0, _lodash.keyBy)(columns, 'dataIndex');
+  }, [columns]);
   var resultData = (0, _react.useMemo)(function () {
+    var _a;
+
     var start = selectInfo.start,
         end = selectInfo.end;
     var rCol = columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {
@@ -39,14 +51,14 @@ var TableChartsModal = function TableChartsModal(props) {
     });
     var maxi = Math.max(start.i, end.i);
     var mini = Math.min(start.i, end.i);
-    var rDataSource = data === null || data === void 0 ? void 0 : data.filter(function (item, index) {
+    var rDataSource = (_a = deepDataSource || data) === null || _a === void 0 ? void 0 : _a.filter(function (item, index) {
       if (index >= mini && index <= maxi) {
         return true;
       }
 
       return false;
     }).map(function (item) {
-      return (0, _lodash.pick)(item, rCol);
+      return (0, _lodash.pick)(item, [].concat((0, _toConsumableArray2.default)(rCol), [rowKey]));
     });
     return {
       rDataSource: rDataSource,
@@ -71,6 +83,7 @@ var TableChartsModal = function TableChartsModal(props) {
       yField: yField
     };
   }, [resultData, getTypeCol]);
+  console.log(Field, '--Field--', resultData);
   var config = (0, _react.useMemo)(function () {
     if (type === 'pie') {
       return {
@@ -99,7 +112,7 @@ var TableChartsModal = function TableChartsModal(props) {
 
     return {
       data: resultData.rDataSource,
-      xField: Field.xField,
+      xField: rowKey,
       yField: Field.yField,
       label: {
         position: 'middle',
@@ -108,8 +121,24 @@ var TableChartsModal = function TableChartsModal(props) {
           opacity: 0.6
         }
       },
+      tooltip: {
+        title: Field.xField,
+        formatter: function formatter(datum) {
+          var _a, _b;
+
+          return {
+            name: ((_a = keyByCol[Field.yField]) === null || _a === void 0 ? void 0 : _a.title) || ((_b = keyByCol[Field.yField]) === null || _b === void 0 ? void 0 : _b.dataIndex),
+            value: datum === null || datum === void 0 ? void 0 : datum[Field.yField]
+          };
+        }
+      },
       xAxis: {
         label: {
+          formatter: function formatter(text, item, index) {
+            var _a, _b;
+
+            return ((_b = (_a = resultData.rDataSource) === null || _a === void 0 ? void 0 : _a[index]) === null || _b === void 0 ? void 0 : _b[Field.xField]) || text;
+          },
           autoHide: true,
           autoRotate: false
         }