linkmore-design 1.1.0 → 1.1.2

package/es/LmTable/components/tableChartsModal.js

@@ -1,5 +1,6 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import React, { useMemo } from 'react';
-import { pick } from 'lodash';
+import { pick, keyBy } from 'lodash';
 import { Modal } from 'linkmore-design';
 import { Column, Line, Pie } from '@ant-design/plots';
 /** i 是行  j 是列 */
@@ -9,8 +10,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 = useMemo(function () {
+    return keyBy(columns, 'dataIndex');
+  }, [columns]);
   var resultData = 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) {
@@ -27,14 +36,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 pick(item, rCol);
+      return pick(item, [].concat(_toConsumableArray(rCol), [rowKey]));
     });
     return {
       rDataSource: rDataSource,
@@ -59,6 +68,7 @@ var TableChartsModal = function TableChartsModal(props) {
       yField: yField
     };
   }, [resultData, getTypeCol]);
+  console.log(Field, '--Field--', resultData);
   var config = useMemo(function () {
     if (type === 'pie') {
       return {
@@ -87,7 +97,7 @@ var TableChartsModal = function TableChartsModal(props) {
 
     return {
       data: resultData.rDataSource,
-      xField: Field.xField,
+      xField: rowKey,
       yField: Field.yField,
       label: {
         position: 'middle',
@@ -96,8 +106,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/es/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/es/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/es/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/es/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/es/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/lib/Badge/SingleNumber.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface UnitNumberProps {
     prefixCls: string;
     value: string | number;

package/lib/DatePicker/PickerButton.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 import type { ButtonProps } from 'antd';
 export default function PickerButton(props: ButtonProps): JSX.Element;

package/lib/DatePicker/PickerTag.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 import type { ILMTagProps } from '../Tag';
 export default function PickerTag(props: ILMTagProps): JSX.Element;

package/lib/LeftTable/index.js

@@ -96,7 +96,7 @@ var LeftSide = function LeftSide(props) {
       onHeaderClick = _props$onHeaderClick === void 0 ? function () {} : _props$onHeaderClick,
       _props$bottomNode = props.bottomNode,
       bottomNode = _props$bottomNode === void 0 ? null : _props$bottomNode,
-      rest = (0, _objectWithoutProperties2.default)(props, _excluded); // 带有删除的树
+      rest = (0, _objectWithoutProperties2.default)(props, _excluded); // 带有删除的
 
   if (modeType === 'edit' && treeData.category) {
     treeData.category = traverse(treeData.category);
@@ -108,8 +108,12 @@ var LeftSide = function LeftSide(props) {
   }),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       useTree = _useState2[0],
-      setTree = _useState2[1]; // 左侧树分类变化事件
+      setTree = _useState2[1];
 
+  (0, _react.useEffect)(function () {
+    useTree.treeData = treeData.category;
+    setTree((0, _objectSpread2.default)({}, useTree));
+  }, [treeData]); // 左侧树分类变化事件
 
   var getTreeTypeChange = function getTreeTypeChange(value) {
     var title = treeType.data.find(function (v) {

package/lib/LmEditTable/sortableItemCol.d.ts

@@ -1 +1,2 @@
+/// <reference types="react" />
 export default function SortableItem(props: any): JSX.Element;