linkmore-design 1.1.0 → 1.1.2

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/lib/Popover/index.d.ts

@@ -7,5 +7,5 @@ export interface PopoverProps extends AbstractTooltipProps {
     /** @private Used For Popconfirm. Safe to remove. */
     _overlay?: React.ReactNode;
 }
-declare const Popover: React.ForwardRefExoticComponent<Pick<PopoverProps, keyof PopoverProps> & React.RefAttributes<unknown>>;
+declare const Popover: React.ForwardRefExoticComponent<PopoverProps & React.RefAttributes<unknown>>;
 export default Popover;

package/lib/Tooltip/index.d.ts

@@ -40,5 +40,5 @@ export interface TooltipPropsWithTitle extends AbstractTooltipProps {
     overlay?: React.ReactNode | RenderFunction;
 }
 export declare type TooltipProps = TooltipPropsWithTitle | TooltipPropsWithOverlay;
-declare const Tooltip: React.ForwardRefExoticComponent<(Pick<TooltipPropsWithOverlay, keyof TooltipPropsWithOverlay> | Pick<TooltipPropsWithTitle, keyof TooltipPropsWithTitle>) & React.RefAttributes<unknown>>;
+declare const Tooltip: React.ForwardRefExoticComponent<TooltipProps & React.RefAttributes<unknown>>;
 export default Tooltip;

package/lib/Tree/utils/dropIndicator.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const offset = 4;
 export default function dropIndicatorRender(props: {
     dropPosition: -1 | 0 | 1;

package/lib/locale-provider/index.d.ts

@@ -54,8 +54,8 @@ export default class LocaleProvider extends React.Component<LocaleProviderProps,
     componentDidMount(): void;
     componentDidUpdate(prevProps: LocaleProviderProps): void;
     componentWillUnmount(): void;
-    getMemoizedContextValue: (localeValue: Locale) => Locale & {
+    getMemoizedContextValue: import("memoize-one").MemoizedFn<(localeValue: Locale) => Locale & {
         exist?: boolean;
-    };
+    }>;
     render(): JSX.Element;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.0",
+  "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/CHANGELOG.md

@@ -1,12 +0,0 @@
-#
-## V2.0.0
-`2020-12-12`
-
-   * 升级项目中全部依赖库版本，主要包括：react17、antd4、webpack5...
-   * 增加 commitlint 规范git提交;
-   * 增加 husky + lint-staged + Prettier 规范代码提交校验
-   * 优化 eslint + prettier 规范项目代码风格
-
-
-## V1.0.0
-  第一版

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;
-    })[];
-})[];