linkmore-design 1.0.100 → 1.1.1

package/lib/LmTable/util.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.checkIsSelectd = checkIsSelectd;
 exports.checkStatus = checkStatus;
+exports.getDataSourceIndex = getDataSourceIndex;
 exports.getSelectionColText = getSelectionColText;
 exports.getSelectionRowText = getSelectionRowText;
 exports.getSkipList = getSkipList;
@@ -66,13 +67,13 @@ function dataGroup(data, key) {
  * 列分组数据转换
  * @param columns 表格的columns属性值
  * @param dataSource 表格数据源
- * @param columnKeys 列分组的keys
+ * @param groupColKeys 列分组的keys
  * @returns
  */
 
 
-function transformWithColGroup(columns, dataSource, columnKeys) {
-  if (!Array.isArray(columnKeys) || !columnKeys.length) {
+function transformWithColGroup(columns, dataSource, groupColKeys) {
+  if (!Array.isArray(groupColKeys) || !groupColKeys.length) {
     return {
       columns: columns,
       dataSource: dataSource
@@ -84,7 +85,7 @@ function transformWithColGroup(columns, dataSource, columnKeys) {
   var dataSourceCopy = _lodash.default.cloneDeep(dataSource); // 去重
 
 
-  var columnKeysCopy = (0, _toConsumableArray2.default)(new Set(columnKeys));
+  var groupColKeysCopy = (0, _toConsumableArray2.default)(new Set(groupColKeys));
   /**
    * @param {Array} source source数据源，树状结构，行分组会有children子级结构
    * @param {Array} columns 列数据，用于表头，当列分组时会有children子级结构
@@ -101,7 +102,7 @@ function transformWithColGroup(columns, dataSource, columnKeys) {
       source.forEach(function (souItem, i) {
         handledColumns = handledColumns.concat(columns.filter(function (c) {
           // 过滤掉（表头操作） 使用列分组作为key的项
-          return columnKeysCopy.indexOf(c.dataIndex) === -1;
+          return groupColKeysCopy.indexOf(c.dataIndex) === -1;
         }).map(function (item) {
           return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
             dataIndex: "".concat(markStr, "_").concat(item.dataIndex, "_").concat(i)
@@ -126,7 +127,7 @@ function transformWithColGroup(columns, dataSource, columnKeys) {
     });
   };
 
-  var tempColumns = groupBy(dataSourceCopy, columnsCopy, columnKeysCopy, null);
+  var tempColumns = groupBy(dataSourceCopy, columnsCopy, groupColKeysCopy, null);
   var keyMap = new Map();
 
   var dataSourceBy = function dataSourceBy(source) {
@@ -142,7 +143,7 @@ function transformWithColGroup(columns, dataSource, columnKeys) {
       } else {
         var str = ''; // 根据筛选条件生成对应的前缀key值，比如[name, age] => 'name_xiaoming_age_18'
 
-        columnKeysCopy.forEach(function (dataIndex, i) {
+        groupColKeysCopy.forEach(function (dataIndex, i) {
           if (i !== 0) {
             str += '_';
           }
@@ -163,6 +164,7 @@ function transformWithColGroup(columns, dataSource, columnKeys) {
           }
 
           sItem[newKey] = sItem[key];
+          sItem["".concat(newKey, "_originIndex")] = sItem.__index;
         });
       }
 
@@ -183,32 +185,44 @@ function transformWithColGroup(columns, dataSource, columnKeys) {
 /**
  * 行分组
  * @param {Array} dataSource 数据源
- * @param {Array} groupInfo 行分组的keys
+ * @param {Array} groupRowKeys 行分组的keys
  * @returns
  */
 
 
-function transformWithRowGroup(dataSource, groupInfo) {
-  var groupBy = function groupBy(lastFilter, oGroup) {
+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();
+    var filterKey = group.shift(); // i:保证顺序
+
+    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]);
       return acc;
     }, {});
     return Object.keys(map).map(function (item) {
+      var key;
+
+      if (preKey) {
+        key = "".concat(preKey, "_").concat(filterKey, "_").concat(item);
+      } else {
+        key = "".concat(filterKey, "_").concat(item);
+      }
+
       return {
         type: filterKey,
         _group: item,
-        key: "".concat(item, "_").concat(filterKey),
-        children: groupBy(map[item], group)
+        key: key,
+        children: groupBy(map[item], group, key)
       };
     });
   };
 
-  return groupBy(dataSource, groupInfo);
+  return groupBy(dataSource, groupRowKeys);
 }
 
 function checkIsSelectd(i, j) {
@@ -243,10 +257,10 @@ function checkStatus(i, j, commiting) {
 function getSkipList(dataSourceWithGroup) {
   var skipList = dataSourceWithGroup.reduce(function (prev, cur) {
     if (!prev.length) {
-      return cur.group ? [1] : [0];
+      return cur._group ? [1] : [0];
     }
 
-    if (cur.group) {
+    if (cur._group) {
       return [].concat((0, _toConsumableArray2.default)(prev), [prev[prev.length - 1] + 1]);
     }
 
@@ -309,4 +323,43 @@ function getSelectionColText(_ref2) {
     });
   });
   return coltext;
+}
+/**
+ * 获取key所对应的原始数据的索引
+ * @param {Object} {key, dataSource}
+ * @returns {number}
+ */
+
+
+function getDataSourceIndex(_ref3) {
+  var key = _ref3.key,
+      _ref3$dataSource = _ref3.dataSource,
+      dataSource = _ref3$dataSource === void 0 ? [] : _ref3$dataSource;
+  var index = -1;
+
+  var dfs = function dfs(arr) {
+    if (!Array.isArray(arr)) {
+      return;
+    }
+
+    if (index !== -1) {
+      return;
+    }
+
+    for (var i = 0; i < arr.length; i += 1) {
+      var item = arr[i];
+
+      if (item["".concat(key, "_originIndex")] !== undefined) {
+        index = item["".concat(key, "_originIndex")];
+        return;
+      }
+
+      if (item.children) {
+        dfs(item.children);
+      }
+    }
+  };
+
+  dfs(dataSource);
+  return index;
 }

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;
 }