linkmore-design 1.1.1 → 1.1.2

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,13 +162,16 @@ 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,
     onDoubleClick: handleDoubleClick,
     key: "".concat(rowIndex, "_").concat(colIndex)
-  }), content);
+  }), content, isRightEnd && isEnd && !isEditing && /*#__PURE__*/_react.default.createElement("div", {
+    ref: endCellRef,
+    className: 'lmtable_cell_end_icon'
+  }));
 };
 
 var _default = SheelTabelCell;

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
         }

package/lib/LmTable/util.js

@@ -10,7 +10,8 @@ exports.checkStatus = checkStatus;
 exports.getDataSourceIndex = getDataSourceIndex;
 exports.getSelectionColText = getSelectionColText;
 exports.getSelectionRowText = getSelectionRowText;
-exports.getSkipList = getSkipList;
+exports.isSelectCrossInvalidCol = isSelectCrossInvalidCol;
+exports.isSelectCrossRowGroup = isSelectCrossRowGroup;
 exports.range = void 0;
 exports.transformWithColGroup = transformWithColGroup;
 exports.transformWithRowGroup = transformWithRowGroup;
@@ -129,6 +130,7 @@ function transformWithColGroup(columns, dataSource, groupColKeys) {
 
   var tempColumns = groupBy(dataSourceCopy, columnsCopy, groupColKeysCopy, null);
   var keyMap = new Map();
+  var __index = 0;
 
   var dataSourceBy = function dataSourceBy(source) {
     return [source.reduce(function (prev, sItem) {
@@ -152,6 +154,10 @@ function transformWithColGroup(columns, dataSource, groupColKeys) {
         }); // 对dataSource的key值进行更改：例如：'name' => 'name_xiaoming_age_18_address'
 
         Object.keys(sItem).forEach(function (key) {
+          if (key === '__index') {
+            return;
+          }
+
           var newKey = "".concat(str, "_").concat(key);
 
           if (keyMap.has(newKey)) {
@@ -164,8 +170,9 @@ function transformWithColGroup(columns, dataSource, groupColKeys) {
           }
 
           sItem[newKey] = sItem[key];
-          sItem["".concat(newKey, "_originIndex")] = sItem.__index;
+          sItem["".concat(newKey, "_originIndex")] = sItem.__index === undefined ? __index : sItem.__index;
         });
+        __index += 1;
       }
 
       if (!prev) {
@@ -194,14 +201,15 @@ function transformWithRowGroup(dataSource, groupRowKeys) {
   var groupBy = function groupBy(lastFilter, oGroup, preKey) {
     if (!(oGroup === null || oGroup === void 0 ? void 0 : oGroup.length)) return lastFilter;
     var group = oGroup.slice();
-    var filterKey = group.shift(); // i:保证顺序
+    var filterKey = group.shift(); // 记录数据原来的位置索引信息
 
     var i = 0;
     var map = lastFilter.reduce(function (acc, el) {
-      el.__index = i;
-      i += 1;
       var value = el[filterKey];
-      acc[value] = [].concat((0, _toConsumableArray2.default)(acc[value] || []), [el]);
+      acc[value] = [].concat((0, _toConsumableArray2.default)(acc[value] || []), [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, el), {}, {
+        __index: i
+      })]);
+      i += 1;
       return acc;
     }, {});
     return Object.keys(map).map(function (item) {
@@ -247,27 +255,6 @@ function checkStatus(i, j, commiting) {
     isVaildCommit: mini <= i && maxi >= i || minj <= j && maxj >= j
   };
 }
-/**
- * 获取空行列表值数组
- * @param {Array} dataSourceWithGroup
- * @returns {Array}
- */
-
-
-function getSkipList(dataSourceWithGroup) {
-  var skipList = dataSourceWithGroup.reduce(function (prev, cur) {
-    if (!prev.length) {
-      return cur._group ? [1] : [0];
-    }
-
-    if (cur._group) {
-      return [].concat((0, _toConsumableArray2.default)(prev), [prev[prev.length - 1] + 1]);
-    }
-
-    return [].concat((0, _toConsumableArray2.default)(prev), [prev[prev.length - 1]]);
-  }, []);
-  return skipList;
-}
 /**
  * 获取选中行文本
  * @param {Object}
@@ -362,4 +349,84 @@ function getDataSourceIndex(_ref3) {
 
   dfs(dataSource);
   return index;
+}
+/**
+ * 框选是否跨行分组
+ * @param {number} i
+ * @param {React.Ref} shellStatusRef
+ * @param {React.Ref} deepDataSourceRef
+ * @returns
+ */
+
+
+function isSelectCrossRowGroup(i, shellStatusRef, deepDataSourceRef) {
+  var _shellStatusRef$curre;
+
+  var x;
+  var y;
+
+  if ((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre = shellStatusRef.current) === null || _shellStatusRef$curre === void 0 ? void 0 : _shellStatusRef$curre.commiting.start.i) < i) {
+    var _shellStatusRef$curre2;
+
+    x = shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre2 = shellStatusRef.current) === null || _shellStatusRef$curre2 === void 0 ? void 0 : _shellStatusRef$curre2.commiting.start.i;
+    y = i;
+  } else {
+    var _shellStatusRef$curre3;
+
+    x = i;
+    y = shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre3 = shellStatusRef.current) === null || _shellStatusRef$curre3 === void 0 ? void 0 : _shellStatusRef$curre3.commiting.start.i;
+  }
+
+  for (; x <= y; x += 1) {
+    var _deepDataSourceRef$cu;
+
+    if ((deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : (_deepDataSourceRef$cu = deepDataSourceRef.current) === null || _deepDataSourceRef$cu === void 0 ? void 0 : _deepDataSourceRef$cu.length) && (deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current[x]._group)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+/**
+ * 不允许跨无效列
+ * @param {number} i
+ * @param {number} j
+ * @param {React.Ref} shellStatusRef
+ * @param {React.Ref} deepDataSourceRef
+ * @param {React.Ref} deepColumnsRef
+ * @returns
+ */
+
+
+function isSelectCrossInvalidCol(i, j, shellStatusRef, deepDataSourceRef, deepColumnsRef) {
+  var _shellStatusRef$curre4;
+
+  var x;
+  var y;
+
+  if ((shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre4 = shellStatusRef.current) === null || _shellStatusRef$curre4 === void 0 ? void 0 : _shellStatusRef$curre4.commiting.start.j) < j) {
+    var _shellStatusRef$curre5;
+
+    x = shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre5 = shellStatusRef.current) === null || _shellStatusRef$curre5 === void 0 ? void 0 : _shellStatusRef$curre5.commiting.start.j;
+    y = j;
+  } else {
+    var _shellStatusRef$curre6;
+
+    x = j;
+    y = shellStatusRef === null || shellStatusRef === void 0 ? void 0 : (_shellStatusRef$curre6 = shellStatusRef.current) === null || _shellStatusRef$curre6 === void 0 ? void 0 : _shellStatusRef$curre6.commiting.start.j;
+  }
+
+  for (; x <= y; x += 1) {
+    var _deepColumnsRef$curre, _deepDataSourceRef$cu2;
+
+    if ((deepColumnsRef === null || deepColumnsRef === void 0 ? void 0 : (_deepColumnsRef$curre = deepColumnsRef.current) === null || _deepColumnsRef$curre === void 0 ? void 0 : _deepColumnsRef$curre.length) && (deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : (_deepDataSourceRef$cu2 = deepDataSourceRef.current) === null || _deepDataSourceRef$cu2 === void 0 ? void 0 : _deepDataSourceRef$cu2.length)) {
+      var key = deepColumnsRef === null || deepColumnsRef === void 0 ? void 0 : deepColumnsRef.current[x].dataIndex;
+
+      if (!(key in (deepDataSourceRef === null || deepDataSourceRef === void 0 ? void 0 : deepDataSourceRef.current[i]))) {
+        return true;
+      }
+    }
+  }
+
+  return false;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"
@@ -67,6 +67,7 @@
     "axios": "^0.21.0",
     "classnames": "^2.3.1",
     "dayjs": "^1.9.7",
+    "echarts": "^5.4.0",
     "hex-to-rgba": "^2.0.1",
     "immer": "^9.0.15",
     "intersection-observer": "^0.12.2",

package/dist/LmTable/test/index.d.ts

@@ -1,100 +0,0 @@
-export const myDataSource: {
-    dataIndex: string;
-    name: string;
-    id: number;
-    age: number;
-    address: string;
-    name_小黄_key_0: string;
-    name_小黄_name_0: string;
-    name_小黄_id_0: number;
-    name_小黄_age_0: number;
-    name_小黄_address_0: string;
-    name_小黄_key_1: string;
-    name_小黄_name_1: string;
-    name_小黄_id_1: number;
-    name_小黄_age_1: number;
-    name_小黄_address_1: string;
-    name_小黄_key_2: string;
-    name_小黄_name_2: string;
-    name_小黄_id_2: number;
-    name_小黄_age_2: number;
-    name_小黄_address_2: string;
-    name_小红_key_0: string;
-    name_小红_name_0: string;
-    name_小红_id_0: number;
-    name_小红_age_0: number;
-    name_小红_address_0: string;
-    name_达铭_key_0: string;
-    name_达铭_name_0: string;
-    name_达铭_id_0: number;
-    name_达铭_age_0: number;
-    name_达铭_address_0: string;
-    name_乔克_key_0: string;
-    name_乔克_name_0: string;
-    name_乔克_id_0: number;
-    name_乔克_age_0: number;
-    name_乔克_address_0: string;
-    name_零榆_key_0: string;
-    name_零榆_name_0: string;
-    name_零榆_id_0: number;
-    name_零榆_age_0: number;
-    name_零榆_address_0: string;
-    name_小迪_key_0: string;
-    name_小迪_name_0: string;
-    name_小迪_id_0: number;
-    name_小迪_age_0: number;
-    name_小迪_address_0: string;
-    name_小白_key_0: string;
-    name_小白_name_0: string;
-    name_小白_id_0: number;
-    name_小白_age_0: number;
-    name_小白_address_0: string;
-    name_小黑_key_0: string;
-    name_小黑_name_0: string;
-    name_小黑_id_0: number;
-    name_小黑_age_0: number;
-    name_小黑_address_0: string;
-    name_胡彦祖11_key_0: string;
-    name_胡彦祖11_name_0: string;
-    name_胡彦祖11_id_0: number;
-    name_胡彦祖11_age_0: number;
-    name_胡彦祖11_address_0: string;
-    name_胡彦斌12_key_0: string;
-    name_胡彦斌12_name_0: string;
-    name_胡彦斌12_id_0: number;
-    name_胡彦斌12_age_0: number;
-    name_胡彦斌12_address_0: string;
-}[];
-export const myColumns: ({
-    type: string;
-    title: string;
-    dataIndex: string;
-    children: ({
-        title: string;
-        dataIndex: string;
-        etype: string;
-        width: number;
-        key: number;
-    } | {
-        title: string;
-        dataIndex: string;
-        width: number;
-        key: number;
-        etype?: undefined;
-    })[];
-} | {
-    type: string;
-    title: string;
-    dataIndex: string;
-    children: ({
-        title: string;
-        dataIndex: string;
-        etype: string;
-        width: number;
-    } | {
-        title: string;
-        dataIndex: string;
-        width: number;
-        etype?: undefined;
-    })[];
-})[];