linkmore-design 1.0.78 → 1.0.79

package/lib/LmTable/Table.js

@@ -37,6 +37,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactResizable = require("react-resizable");
 
+var _immer = require("immer");
+
 var _reactSortableHoc = require("react-sortable-hoc");
 
 var _hooks = require("../hooks");
@@ -53,7 +55,7 @@ var _tableChartsModal = _interopRequireDefault(require("./components/tableCharts
 
 var _resetConfig = _interopRequireDefault(require("./resetConfig"));
 
-var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "emptyProps"],
+var _excluded = ["dataSource", "autoSize", "columns", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "emptyProps"],
     _excluded2 = ["className", "style"],
     _excluded3 = ["onResize", "width", "onResizeStop"];
 var Summary = _proTable.default.Summary;
@@ -133,6 +135,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       openSheet = _props$openSheet === void 0 ? false : _props$openSheet,
       _props$editSheet = props.editSheet,
       editSheet = _props$editSheet === void 0 ? false : _props$editSheet,
+      dataChange = props.dataChange,
       emptyProps = props.emptyProps,
       resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _resetProps$rowKey = resetProps.rowKey,
@@ -158,6 +161,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       setColumns = _useState6[1];
 
   var tableWarpRef = (0, _react.useRef)(null);
+  var dataSourceRef = (0, _react.useRef)(null);
   /** 右键的ref */
 
   var contentMenuRef = (0, _react.useRef)(null);
@@ -229,6 +233,12 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var SortContainer = (0, _reactSortableHoc.SortableContainer)(function (props) {
     return /*#__PURE__*/_react.default.createElement("tbody", props);
   });
+  (0, _react.useEffect)(function () {
+    dataSourceRef.current = dataSource;
+  }, [dataSource]);
+  var dataEffect = (0, _react.useMemo)(function () {
+    return openSheet ? [dataSource] : [];
+  }, [openSheet]);
 
   var onSortEnd = function onSortEnd(_ref) {
     var oldIndex = _ref.oldIndex,
@@ -294,19 +304,40 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       filterChange === null || filterChange === void 0 ? void 0 : filterChange(useColumns);
     });
   };
+
+  var isSelected = function isSelected(i, j) {
+    var _shellStatusRef$curre = shellStatusRef.current,
+        start = _shellStatusRef$curre.start,
+        end = _shellStatusRef$curre.end,
+        editing = _shellStatusRef$curre.editing;
+    var maxi = Math.max(start === null || start === void 0 ? void 0 : start.i, end.i);
+    var mini = Math.min(start === null || start === void 0 ? void 0 : start.i, end.i);
+    var maxj = Math.max(start === null || start === void 0 ? void 0 : start.j, end.j);
+    var minj = Math.min(start === null || start === void 0 ? void 0 : start.j, end.j);
+    var posX = j >= start.j && j <= end.j;
+    var negX = j <= start.j && j >= end.j;
+    var posY = i >= start.i && i <= end.i;
+    var negY = i <= start.i && i >= end.i;
+    return {
+      isSelected: posX && posY || negX && posY || negX && negY || posX && negY,
+      isEnd: i === maxi && j >= minj && j <= maxj,
+      isRightEnd: j === maxj && i >= mini && i <= maxi,
+      isEditing: (editing === null || editing === void 0 ? void 0 : editing.i) === i && (editing === null || editing === void 0 ? void 0 : editing.j) === j
+    };
+  };
   /** 复制功能 */
 
 
   var handleCopy = function handleCopy(e) {
-    var _shellStatusRef$curre;
+    var _shellStatusRef$curre2;
 
-    if (isEmpty((_shellStatusRef$curre = shellStatusRef.current) === null || _shellStatusRef$curre === void 0 ? void 0 : _shellStatusRef$curre.editing)) {
+    if (isEmpty((_shellStatusRef$curre2 = shellStatusRef.current) === null || _shellStatusRef$curre2 === void 0 ? void 0 : _shellStatusRef$curre2.editing)) {
       var _e$clipboardData;
 
       e.preventDefault();
-      var _shellStatusRef$curre2 = shellStatusRef.current,
-          start = _shellStatusRef$curre2.start,
-          end = _shellStatusRef$curre2.end;
+      var _shellStatusRef$curre3 = shellStatusRef.current,
+          start = _shellStatusRef$curre3.start,
+          end = _shellStatusRef$curre3.end;
       var text = range(start.i, end.i).map(function (i) {
         return range(start.j, end.j).map(function (j) {
           var _columns$j, _columns$j2;
@@ -342,9 +373,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   };
 
   var onMouseOver = function onMouseOver(i, j) {
-    var _shellStatusRef$curre3, _shellStatusRef$curre4;
+    var _shellStatusRef$curre4, _shellStatusRef$curre5;
 
-    if (((_shellStatusRef$curre3 = shellStatusRef.current) === null || _shellStatusRef$curre3 === void 0 ? void 0 : _shellStatusRef$curre3.selecting) && isEmpty((_shellStatusRef$curre4 = shellStatusRef.current) === null || _shellStatusRef$curre4 === void 0 ? void 0 : _shellStatusRef$curre4.editing)) {
+    if (((_shellStatusRef$curre4 = shellStatusRef.current) === null || _shellStatusRef$curre4 === void 0 ? void 0 : _shellStatusRef$curre4.selecting) && isEmpty((_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,
@@ -375,23 +406,26 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   var handleCut = function handleCut(e) {
-    var _shellStatusRef$curre5;
+    var _shellStatusRef$curre6;
 
-    if (isEmpty((_shellStatusRef$curre5 = shellStatusRef.current) === null || _shellStatusRef$curre5 === void 0 ? void 0 : _shellStatusRef$curre5.editing)) {
+    if (isEmpty((_shellStatusRef$curre6 = shellStatusRef.current) === null || _shellStatusRef$curre6 === void 0 ? void 0 : _shellStatusRef$curre6.editing)) {
       e.preventDefault();
       handleCopy(e);
-      var _shellStatusRef$curre6 = shellStatusRef.current,
-          start = _shellStatusRef$curre6.start,
-          end = _shellStatusRef$curre6.end;
+      /** 暂时先不隐藏 */
+      // const { start, end } = shellStatusRef.current
+      // clearSelectedCells(start, end)
     }
   };
   /** 内容粘贴 */
 
 
   var handlePaste = function handlePaste(e) {
-    if (isEmpty(sheelStataus.editing)) {
-      var start = sheelStataus.start,
-          end = sheelStataus.end;
+    var _shellStatusRef$curre7;
+
+    if (isEmpty((_shellStatusRef$curre7 = shellStatusRef.current) === null || _shellStatusRef$curre7 === void 0 ? void 0 : _shellStatusRef$curre7.editing)) {
+      var _shellStatusRef$curre8 = shellStatusRef.current,
+          start = _shellStatusRef$curre8.start,
+          end = _shellStatusRef$curre8.end;
       start = {
         i: Math.min(start.i, end.i),
         j: Math.min(start.j, end.j)
@@ -400,7 +434,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         i: Math.max(start.i, end.i),
         j: Math.max(start.j, end.j)
       };
-      var parse = props.parsePaste || defaultParsePaste;
+      var parse = defaultParsePaste;
       var changes = [];
       var pasteData = [];
 
@@ -409,50 +443,33 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         pasteData = parse(window.clipboardData.getData('Text'));
       } else if (e.clipboardData && e.clipboardData.getData) {
         pasteData = parse(e.clipboardData.getData('text/plain'));
-      } // in order of preference
-      // const { data, onCellsChanged, onPaste, onChange } = this.props
-      // if (onCellsChanged) {
-      //   const additions = []
-      //   pasteData.forEach((row, i) => {
-      //     row.forEach((value, j) => {
-      //       end = { i: start.i + i, j: start.j + j }
-      //       const cell = data[end.i] && data[end.i][end.j]
-      //       if (!cell) {
-      //         additions.push({ row: end.i, col: end.j, value })
-      //       } else if (!cell.readOnly) {
-      //         changes.push({ cell, row: end.i, col: end.j, value })
-      //       }
-      //     })
-      //   })
-      //   if (additions.length) {
-      //     onCellsChanged(changes, additions)
-      //   } else {
-      //     onCellsChanged(changes)
-      //   }
-      // } else if (onPaste) {
-      //   pasteData.forEach((row, i) => {
-      //     const rowData = []
-      //     row.forEach((pastedData, j) => {
-      //       end = { i: start.i + i, j: start.j + j }
-      //       const cell = data[end.i] && data[end.i][end.j]
-      //       rowData.push({ cell: cell, data: pastedData })
-      //     })
-      //     changes.push(rowData)
-      //   })
-      //   onPaste(changes)
-      // } else if (onChange) {
-      //   pasteData.forEach((row, i) => {
-      //     row.forEach((value, j) => {
-      //       end = { i: start.i + i, j: start.j + j }
-      //       const cell = data[end.i] && data[end.i][end.j]
-      //       if (cell && !cell.readOnly) {
-      //         onChange(cell, end.i, end.j, value)
-      //       }
-      //     })
-      //   })
-      // }
-      // this._setState({ end })
+      }
+
+      var data = dataSourceRef.current; // in order of preference
 
+      var resultEnd = [];
+      pasteData.forEach(function (row, i) {
+        row.forEach(function (value, j) {
+          resultEnd.push({
+            i: start.i + i,
+            j: start.j + j,
+            value: value
+          });
+        });
+      });
+      var columnsKeysList = columns.map(function (item) {
+        return item.dataIndex;
+      });
+      var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
+        resultEnd.forEach(function (item) {
+          var _isSelected;
+
+          if ((_isSelected = isSelected(item.i, item.j)) === null || _isSelected === void 0 ? void 0 : _isSelected.isSelected) {
+            draft[item.i][columnsKeysList[item.j]] = item.value;
+          }
+        });
+      });
+      dataChange === null || dataChange === void 0 ? void 0 : dataChange(res);
     }
   };
 
@@ -489,13 +506,13 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   var sheelMouseDown = function sheelMouseDown(i, j, e) {
-    var _shellStatusRef$curre7, _shellStatusRef$curre8, _shellStatusRef$curre9, _shellStatusRef$curre10, _shellStatusRef$curre11, _shellStatusRef$curre12, _shellStatusRef$curre13, _shellStatusRef$curre14, _shellStatusRef$curre15;
+    var _shellStatusRef$curre9, _shellStatusRef$curre10, _shellStatusRef$curre11, _shellStatusRef$curre12, _shellStatusRef$curre13, _shellStatusRef$curre14, _shellStatusRef$curre15, _shellStatusRef$curre16, _shellStatusRef$curre17;
 
-    var isNowEditingSameCell = !isEmpty((_shellStatusRef$curre7 = shellStatusRef.current) === null || _shellStatusRef$curre7 === void 0 ? void 0 : _shellStatusRef$curre7.editing) && ((_shellStatusRef$curre8 = shellStatusRef.current) === null || _shellStatusRef$curre8 === void 0 ? void 0 : _shellStatusRef$curre8.editing.i) === i && ((_shellStatusRef$curre9 = shellStatusRef.current) === null || _shellStatusRef$curre9 === void 0 ? void 0 : _shellStatusRef$curre9.editing.j) === j;
-    var editing = isEmpty((_shellStatusRef$curre10 = shellStatusRef.current) === null || _shellStatusRef$curre10 === void 0 ? void 0 : _shellStatusRef$curre10.editing) || ((_shellStatusRef$curre11 = shellStatusRef.current) === null || _shellStatusRef$curre11 === void 0 ? void 0 : _shellStatusRef$curre11.editing.i) !== i || ((_shellStatusRef$curre12 = shellStatusRef.current) === null || _shellStatusRef$curre12 === void 0 ? void 0 : _shellStatusRef$curre12.editing.j) !== j ? {} : (_shellStatusRef$curre13 = shellStatusRef.current) === null || _shellStatusRef$curre13 === void 0 ? void 0 : _shellStatusRef$curre13.editing;
+    var isNowEditingSameCell = !isEmpty((_shellStatusRef$curre9 = shellStatusRef.current) === null || _shellStatusRef$curre9 === void 0 ? void 0 : _shellStatusRef$curre9.editing) && ((_shellStatusRef$curre10 = shellStatusRef.current) === null || _shellStatusRef$curre10 === void 0 ? void 0 : _shellStatusRef$curre10.editing.i) === i && ((_shellStatusRef$curre11 = shellStatusRef.current) === null || _shellStatusRef$curre11 === void 0 ? void 0 : _shellStatusRef$curre11.editing.j) === j;
+    var editing = isEmpty((_shellStatusRef$curre12 = shellStatusRef.current) === null || _shellStatusRef$curre12 === void 0 ? void 0 : _shellStatusRef$curre12.editing) || ((_shellStatusRef$curre13 = shellStatusRef.current) === null || _shellStatusRef$curre13 === void 0 ? void 0 : _shellStatusRef$curre13.editing.i) !== i || ((_shellStatusRef$curre14 = shellStatusRef.current) === null || _shellStatusRef$curre14 === void 0 ? void 0 : _shellStatusRef$curre14.editing.j) !== j ? {} : (_shellStatusRef$curre15 = shellStatusRef.current) === null || _shellStatusRef$curre15 === void 0 ? void 0 : _shellStatusRef$curre15.editing;
     shellStatusRef.current = {
       selecting: !isNowEditingSameCell,
-      start: (e === null || e === void 0 ? void 0 : e.shiftKey) ? (_shellStatusRef$curre14 = shellStatusRef.current) === null || _shellStatusRef$curre14 === void 0 ? void 0 : _shellStatusRef$curre14.start : {
+      start: (e === null || e === void 0 ? void 0 : e.shiftKey) ? (_shellStatusRef$curre16 = shellStatusRef.current) === null || _shellStatusRef$curre16 === void 0 ? void 0 : _shellStatusRef$curre16.start : {
         i: i,
         j: j
       },
@@ -508,7 +525,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     };
     SetSelectIng(!isNowEditingSameCell);
 
-    if (isEmpty((_shellStatusRef$curre15 = shellStatusRef.current) === null || _shellStatusRef$curre15 === void 0 ? void 0 : _shellStatusRef$curre15.editing)) {
+    if (isEmpty((_shellStatusRef$curre17 = shellStatusRef.current) === null || _shellStatusRef$curre17 === void 0 ? void 0 : _shellStatusRef$curre17.editing)) {
       setEditIng(false);
     }
 
@@ -521,9 +538,9 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   var onContextMenu = function onContextMenu(evt, i, j) {
     evt.preventDefault();
-    var _shellStatusRef$curre16 = shellStatusRef.current,
-        start = _shellStatusRef$curre16.start,
-        end = _shellStatusRef$curre16.end;
+    var _shellStatusRef$curre18 = shellStatusRef.current,
+        start = _shellStatusRef$curre18.start,
+        end = _shellStatusRef$curre18.end;
 
     if (isEmpty(start) && isEmpty(end)) {
       sheelMouseDown(i, j, evt);
@@ -568,7 +585,17 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   };
 
-  var dataSourceChange = function dataSourceChange(i, j, newRecord) {};
+  var dataSourceChange = function dataSourceChange(i, j, newRecord) {
+    var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
+      draft[i] = newRecord;
+    });
+    dataChange === null || dataChange === void 0 ? void 0 : dataChange(res);
+    shellStatusRef.current = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, shellStatusRef.current), {}, {
+      editing: {},
+      forceEdit: false,
+      clear: {}
+    });
+  };
 
   (0, _react.useEffect)(function () {
     return function () {
@@ -579,28 +606,6 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       document.removeEventListener('paste', handlePaste);
     };
   }, []);
-
-  var isSelected = function isSelected(i, j) {
-    var _shellStatusRef$curre17 = shellStatusRef.current,
-        start = _shellStatusRef$curre17.start,
-        end = _shellStatusRef$curre17.end,
-        editing = _shellStatusRef$curre17.editing;
-    var maxi = Math.max(start === null || start === void 0 ? void 0 : start.i, end.i);
-    var mini = Math.min(start === null || start === void 0 ? void 0 : start.i, end.i);
-    var maxj = Math.max(start === null || start === void 0 ? void 0 : start.j, end.j);
-    var minj = Math.min(start === null || start === void 0 ? void 0 : start.j, end.j);
-    var posX = j >= start.j && j <= end.j;
-    var negX = j <= start.j && j >= end.j;
-    var posY = i >= start.i && i <= end.i;
-    var negY = i <= start.i && i >= end.i;
-    return {
-      isSelected: posX && posY || negX && posY || negX && negY || posX && negY,
-      isEnd: i === maxi && j >= minj && j <= maxj,
-      isRightEnd: j === maxj && i >= mini && i <= maxi,
-      isEditing: (editing === null || editing === void 0 ? void 0 : editing.i) === i && (editing === null || editing === void 0 ? void 0 : editing.j) === j
-    };
-  };
-
   var resetColumns = (0, _react.useCallback)(function () {
     var result = useColumns.filter(function (item) {
       return item.show !== false;
@@ -640,7 +645,7 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       return obj;
     });
     return sortOpen ? [sortDefaultColumnItem].concat((0, _toConsumableArray2.default)(result)) : result;
-  }, [useColumns, sortOpen, selectIng]);
+  }, [useColumns, sortOpen, selectIng, dataSource]);
   (0, _react.useEffect)(function () {
     setColumns(columns);
   }, [columns]); // 行点击事件

package/lib/LmTable/components/inputDataEdit.js

@@ -23,6 +23,10 @@ var InputDataEdit = function InputDataEdit(props) {
 
       (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
     }, 150);
+    return function () {
+      console.log('unmounds');
+      handleSave === null || handleSave === void 0 ? void 0 : handleSave(inputRef.current);
+    };
   }, []);
 
   var handleChange = function handleChange(e) {

package/lib/LmTable/components/sheelTableCell.js

@@ -9,6 +9,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -45,7 +47,8 @@ var SheelTabelCell = function SheelTabelCell(props) {
       selectIng = props.selectIng,
       onContextMenu = props.onContextMenu,
       onDoubleClick = props.onDoubleClick,
-      restProps = __rest(props, ["record", "col", "rowKey", "children", "rowIndex", "colIndex", "onMouseDown", "onMouseOver", "isSelected", "selectIng", "onContextMenu", "onDoubleClick"]);
+      dataSourceChange = props.dataSourceChange,
+      restProps = __rest(props, ["record", "col", "rowKey", "children", "rowIndex", "colIndex", "onMouseDown", "onMouseOver", "isSelected", "selectIng", "onContextMenu", "onDoubleClick", "dataSourceChange"]);
 
   var onMouseEnter = restProps.onMouseEnter,
       onMouseLeave = restProps.onMouseLeave,
@@ -66,9 +69,16 @@ var SheelTabelCell = function SheelTabelCell(props) {
       value = _useState2[0],
       setValue = _useState2[1];
 
+  var valueRef = (0, _react.useRef)((record === null || record === void 0 ? void 0 : record[col === null || col === void 0 ? void 0 : col.dataIndex]) || '');
   (0, _ahooks.useUpdateEffect)(function () {
     console.log(value, '----changeValue');
+    valueRef.current = value;
   }, [value]);
+  (0, _ahooks.useUpdateEffect)(function () {
+    if (value !== (record === null || record === void 0 ? void 0 : record[col === null || col === void 0 ? void 0 : col.dataIndex])) {
+      setValue(record === null || record === void 0 ? void 0 : record[col === null || col === void 0 ? void 0 : col.dataIndex]);
+    }
+  }, [record]);
   /** 鼠标点击 */
 
   var handleMouseDown = function handleMouseDown(e) {
@@ -116,7 +126,9 @@ var SheelTabelCell = function SheelTabelCell(props) {
   };
 
   var saveRenderValue = function saveRenderValue() {
-    console.log(value, rowIndex, colIndex, '222');
+    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)));
+    }
   };
 
   var renderEditor = function renderEditor() {

package/lib/LmTable/components/tableChartsModal.js

@@ -119,6 +119,7 @@ var TableChartsModal = function TableChartsModal(props) {
   return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Modal, {
     visible: !!type,
     title: "\u667A\u80FD\u62A5\u8868",
+    onOk: onCancel,
     onCancel: onCancel
   }, type === 'column' && /*#__PURE__*/_react.default.createElement(_plots.Column, Object.assign({}, config)), type === 'line' && /*#__PURE__*/_react.default.createElement(_plots.Line, Object.assign({}, config)), type === 'pie' && /*#__PURE__*/_react.default.createElement(_plots.Pie, Object.assign({}, config)));
 };

package/lib/Modal/index.js

@@ -49,10 +49,12 @@ var CLMModal = function CLMModal(props) {
     width: size === 'default' ? 552 : 416,
     footer: [/*#__PURE__*/_react.default.createElement(_Button.default, {
       onClick: onCancel,
+      key: 'canncel_button',
       size: 'middle'
     }, cancelText), /*#__PURE__*/_react.default.createElement(_Button.default, {
       type: "primary",
       onClick: onOk,
+      key: 'ok_button',
       size: 'middle'
     }, okText)]
   }, other, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.0.78",
+  "version": "1.0.79",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"