linkmore-design 1.1.28 → 1.1.30

package/es/LmTable/util.js

@@ -43,6 +43,7 @@ var range = function range(start, end) {
  * @param {Array} data
  * @param {string} key
  * @return {Object}
+ * 时间复杂度O(n), 空间复杂度O(n)
  */
 
 
@@ -75,7 +76,7 @@ function dataGroup(data, key) {
  */
 
 
-function transformWithColGroup(columns, dataSource, groupColKeys) {
+function transformWithColGroup(columns, dataSource, groupColKeys, groupRowKeys) {
   if (!Array.isArray(groupColKeys) || !groupColKeys.length) {
     return {
       columns: columns,
@@ -83,7 +84,19 @@ function transformWithColGroup(columns, dataSource, groupColKeys) {
     };
   }
 
-  var columnsCopy = _lodash.default.cloneDeep(columns);
+  columns.forEach(function (c) {
+    if (groupRowKeys.includes(c.dataIndex)) {
+      c.show = false;
+    }
+  });
+
+  var columnsCopy = _lodash.default.cloneDeep(columns.filter(function (item) {
+    return item.joinCol;
+  }));
+
+  var unColumns = _lodash.default.cloneDeep(columns.filter(function (item) {
+    return !item.joinCol;
+  }));
 
   var dataSourceCopy = _lodash.default.cloneDeep(dataSource); // 去重
 
@@ -95,6 +108,7 @@ function transformWithColGroup(columns, dataSource, groupColKeys) {
    * @param {Array<string>} oGroup 数组，列分组的keys值
    * @param {string} markStr
    * @returns
+   * 2万条数据 393ms
    */
 
   var groupBy = function groupBy(source, columns, oGroup, markStr) {
@@ -131,6 +145,7 @@ function transformWithColGroup(columns, dataSource, groupColKeys) {
   };
 
   var tempColumns = groupBy(dataSourceCopy, columnsCopy, groupColKeysCopy, null);
+  tempColumns = unColumns.concat(tempColumns);
   var keyMap = new Map();
   var __index = 0;
 
@@ -210,6 +225,11 @@ function transformWithRowGroup(dataSource, groupRowKeys) {
     var i = 0;
     var map = lastFilter.reduce(function (acc, el) {
       var value = el[filterKey];
+
+      if (value === undefined) {
+        value = '-';
+      }
+
       acc[value] = [].concat((0, _toConsumableArray2.default)(acc[value] || []), [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, el), {}, {
         __index: i
       })]);

package/es/LmTable/virTual/VirtualRow.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 interface rowProps {
-    children: any;
+    children?: any;
 }
 declare const VirtualRow: React.NamedExoticComponent<rowProps>;
 export default VirtualRow;

package/es/LmTable/virTual/VirtualRow.js

@@ -13,33 +13,63 @@ var __rest = this && this.__rest || function (s, e) {
 
 import React, { useRef, useMemo, useEffect } from 'react';
 import { useStore } from './context';
-var VirtualRow = /*#__PURE__*/React.memo(function (_a, ref) {
-  var children = _a.children,
-      resetProps = __rest(_a, ["children"]);
+
+var useOptions = function useOptions(_ref) {
+  var children = _ref.children,
+      ref = _ref.ref,
+      trRef = _ref.trRef;
 
   var _useStore = useStore(),
       state = _useStore.state,
       dispatch = _useStore.dispatch,
       instance = _useStore.instance;
 
+  var virtualItems = instance.columnVirtual.virtualItems;
   var rowHeight = state.rowHeight,
       totalLen = state.totalLen;
-  var virtualItems = instance.columnVirtual.virtualItems;
-  var trRef = useRef(null); // 列长度
+  var sliceColumns = useMemo(function () {
+    return children === null || children === void 0 ? void 0 : children.reduce(function (pre, cur) {
+      var _a, _b;
 
-  var columnsLen = useMemo(function () {
-    var _a;
+      if (typeof ((_a = cur.props) === null || _a === void 0 ? void 0 : _a.fixLeft) === 'number') {
+        pre.leftColumns.push(cur);
+        return pre;
+      }
+
+      if (typeof ((_b = cur.props) === null || _b === void 0 ? void 0 : _b.fixRight) === 'number') {
+        pre.rightColumns.push(cur);
+        return pre;
+      }
 
-    return (_a = children === null || children === void 0 ? void 0 : children.length) !== null && _a !== void 0 ? _a : 0;
+      pre.centerColumns.push(cur);
+      return pre;
+    }, {
+      leftColumns: [],
+      rightColumns: [],
+      centerColumns: []
+    });
   }, [children]);
   useEffect(function () {
-    if (state.columnsLen !== columnsLen) {
+    dispatch({
+      type: 'changeSliceColumns',
+      sliceColumns: sliceColumns
+    });
+  }, [sliceColumns]); // 非固定列长度
+
+  var centerColumnsLen = useMemo(function () {
+    var _a;
+
+    return (_a = sliceColumns.centerColumns.length) !== null && _a !== void 0 ? _a : 0;
+  }, [sliceColumns]);
+  useEffect(function () {
+    if (state.columnsLen !== centerColumnsLen) {
       dispatch({
         type: 'changeColumnsLen',
-        columnsLen: columnsLen !== null && columnsLen !== void 0 ? columnsLen : 0
+        columnsLen: centerColumnsLen !== null && centerColumnsLen !== void 0 ? centerColumnsLen : 0
       });
     }
-  }, [columnsLen, dispatch, state.columnsLen]);
+  }, [centerColumnsLen, dispatch, state.columnsLen]); // 获取行的高度
+
   useEffect(function () {
     var initHeight = function initHeight(tempRef) {
       var _a, _b, _c;
@@ -48,55 +78,59 @@ var VirtualRow = /*#__PURE__*/React.memo(function (_a, ref) {
         var tempRowHeight = (_c = (_b = tempRef === null || tempRef === void 0 ? void 0 : tempRef.current) === null || _b === void 0 ? void 0 : _b.offsetHeight) !== null && _c !== void 0 ? _c : 0;
         dispatch({
           type: 'initHeight',
-          rowHeight: tempRowHeight
+          rowHeight: tempRowHeight + 1
         });
       }
     };
 
     initHeight(Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef);
-  }, [trRef, dispatch, rowHeight, totalLen, ref]); // return {fixedLeft: [], fixedRight: [], columns: []}
-
-  var fixedColumns = useMemo(function () {
-    return children === null || children === void 0 ? void 0 : children.reduce(function (pre, cur) {
-      var _a, _b;
+  }, [trRef, dispatch, rowHeight, totalLen, ref]); // 横向单元格合并
 
-      if (typeof ((_a = cur.props) === null || _a === void 0 ? void 0 : _a.fixLeft) === 'number') {
-        pre.fixedLeft.push(cur);
-        return pre;
-      }
+  var leftColSpan = useMemo(function () {
+    var _a;
 
-      if (typeof ((_b = cur.props) === null || _b === void 0 ? void 0 : _b.fixRight) === 'number') {
-        pre.fixedRight.push(cur);
-        return pre;
-      }
+    return (_a = virtualItems[0]) === null || _a === void 0 ? void 0 : _a.index;
+  }, [virtualItems]); // 右侧隐藏数量
+
+  var rightColSpan = useMemo(function () {
+    return sliceColumns.centerColumns.length - virtualItems.length - leftColSpan || 0;
+  }, [sliceColumns.centerColumns.length, virtualItems.length, leftColSpan]);
+  return Object.assign(Object.assign({
+    virtualItems: virtualItems
+  }, sliceColumns), {
+    leftColSpan: leftColSpan,
+    rightColSpan: rightColSpan
+  });
+};
 
-      pre.columns.push(cur);
-      return pre;
-    }, {
-      fixedLeft: [],
-      fixedRight: [],
-      columns: []
-    });
-  }, [children]); // 截取非固定列
+var VirtualRow = /*#__PURE__*/React.memo(function (_a, ref) {
+  var children = _a.children,
+      resetProps = __rest(_a, ["children"]);
 
-  var resetVirtualItems = useMemo(function () {
-    var fixedLeft = fixedColumns.fixedLeft,
-        columns = fixedColumns.columns;
-    return virtualItems.slice(fixedLeft.length, fixedLeft.length + columns.length);
-  }, [fixedColumns, virtualItems]); // 横线单元格合并
+  var trRef = useRef(null);
 
-  var colSpan = useMemo(function () {
-    var _a;
+  var _useOptions = useOptions({
+    children: children,
+    ref: ref,
+    trRef: trRef
+  }),
+      virtualItems = _useOptions.virtualItems,
+      leftColumns = _useOptions.leftColumns,
+      centerColumns = _useOptions.centerColumns,
+      rightColumns = _useOptions.rightColumns,
+      leftColSpan = _useOptions.leftColSpan,
+      rightColSpan = _useOptions.rightColSpan;
 
-    var startIndex = ((_a = resetVirtualItems === null || resetVirtualItems === void 0 ? void 0 : resetVirtualItems[0]) === null || _a === void 0 ? void 0 : _a.index) || 0;
-    return startIndex ? startIndex - fixedColumns.fixedLeft.length : startIndex;
-  }, [fixedColumns, resetVirtualItems]);
   return /*#__PURE__*/React.createElement("tr", Object.assign({}, resetProps, {
     ref: Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef
-  }), fixedColumns.fixedLeft, !!colSpan && /*#__PURE__*/React.createElement("td", {
-    colSpan: colSpan
-  }), resetVirtualItems.map(function (virtualCol) {
-    return children[virtualCol.index];
-  }), fixedColumns.fixedRight);
+  }), leftColumns, !!leftColSpan && /*#__PURE__*/React.createElement("td", {
+    key: "leftColSpan",
+    colSpan: leftColSpan
+  }), virtualItems.map(function (virtualCol) {
+    return centerColumns[virtualCol.index];
+  }), !!rightColSpan && /*#__PURE__*/React.createElement("td", {
+    key: "rightColSpan",
+    colSpan: rightColSpan
+  }), rightColumns);
 });
 export default VirtualRow;

package/es/LmTable/virTual/VirtualTable.js

@@ -1,16 +1,36 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useRef } from 'react';
+
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
+import React, { useCallback, useRef } from 'react';
 import { useVirtual } from 'react-virtual';
+import cls from 'classnames';
 import { TableContext, useRealive } from './context';
+import CustomizeRenderEmpty from '../components/customRenderEmpty';
 var VirtualTable = /*#__PURE__*/React.memo(function (tableProps) {
   var _a, _b, _c, _d;
 
+  var className = tableProps.className,
+      isEmpty = tableProps.isEmpty,
+      rest = __rest(tableProps, ["className", "isEmpty"]);
+
   var bodyRef = useRef(null);
 
   var _useRealive = useRealive(),
       _useRealive2 = _slicedToArray(_useRealive, 2),
       state = _useRealive2[0],
-      dispatch = _useRealive2[1]; // { totalSize, virtualItems }
+      dispatch = _useRealive2[1]; // 行虚拟化 { totalSize, virtualItems }
 
 
   var rowVirtual = useVirtual({
@@ -23,18 +43,26 @@ var VirtualTable = /*#__PURE__*/React.memo(function (tableProps) {
       return state.rowHeight;
     }, [state.rowHeight]),
     overscan: 5
-  });
+  }); // 列动态宽度
+
+  var columnEstimateSize = useCallback(function (i) {
+    var _a, _b;
+
+    var colWidths = (_b = (_a = tableProps === null || tableProps === void 0 ? void 0 : tableProps.children[0]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.colWidths;
+    var leftColumnsLen = state.sliceColumns.leftColumns.length;
+    var centerColumnsLen = state.sliceColumns.centerColumns.length; // 获取非固定列
+
+    var virList = colWidths.slice(leftColumnsLen, leftColumnsLen + centerColumnsLen);
+    return virList[i] || 0;
+  }, [(_c = (_b = tableProps.children[0]) === null || _b === void 0 ? void 0 : _b.props) === null || _c === void 0 ? void 0 : _c.colWidths, state.sliceColumns.leftColumns.length, state.sliceColumns.centerColumns.length]); // 列虚拟化
+
   var columnVirtual = useVirtual({
     horizontal: true,
     size: state.columnsLen,
     parentRef: {
-      current: (_b = bodyRef === null || bodyRef === void 0 ? void 0 : bodyRef.current) === null || _b === void 0 ? void 0 : _b.parentNode
+      current: (_d = bodyRef === null || bodyRef === void 0 ? void 0 : bodyRef.current) === null || _d === void 0 ? void 0 : _d.parentNode
     },
-    estimateSize: React.useCallback(function (i) {
-      var _a, _b;
-
-      return (_b = (_a = tableProps === null || tableProps === void 0 ? void 0 : tableProps.children[0]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.colWidths[i];
-    }, [(_d = (_c = tableProps.children[0]) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.colWidths]),
+    estimateSize: columnEstimateSize,
     overscan: 5
   });
   var instance = {
@@ -47,8 +75,12 @@ var VirtualTable = /*#__PURE__*/React.memo(function (tableProps) {
       dispatch: dispatch,
       instance: instance
     }
-  }, /*#__PURE__*/React.createElement("table", Object.assign({
+  }, isEmpty ? /*#__PURE__*/React.createElement("table", Object.assign({
+    className: cls('lm_virtual_table', className),
+    ref: bodyRef
+  }, rest), /*#__PURE__*/React.createElement("tbody", null, /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(CustomizeRenderEmpty, null))))) : /*#__PURE__*/React.createElement("table", Object.assign({
+    className: cls('lm_virtual_table', className),
     ref: bodyRef
-  }, tableProps)));
+  }, rest)));
 });
 export default VirtualTable;

package/es/LmTable/virTual/context.js

@@ -15,13 +15,20 @@ var initialState = {
   rowHeight: 0,
   columnsLen: 0,
   // 总行数
-  totalLen: 0
+  totalLen: 0,
+  // 分割后的列数组
+  sliceColumns: {
+    leftColumns: [],
+    centerColumns: [],
+    rightColumns: []
+  }
 };
 
 var reducer = function reducer(state, action) {
   var totalLen = action.totalLen,
       columnsLen = action.columnsLen,
-      rowHeight = action.rowHeight;
+      rowHeight = action.rowHeight,
+      sliceColumns = action.sliceColumns;
 
   switch (action.type) {
     // 数据数量
@@ -42,6 +49,11 @@ var reducer = function reducer(state, action) {
         rowHeight: rowHeight
       });
 
+    case 'changeSliceColumns':
+      return Object.assign(Object.assign({}, state), {
+        sliceColumns: sliceColumns
+      });
+
     default:
       throw new Error();
   }

package/es/LmUpload/fns/index.js

@@ -370,7 +370,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
 
   var filesLoopCheck = useCallback(function (files) {
     return Promise.all(files.map(fileCheckAsync));
-  }, []);
+  }, [fileCheckAsync]);
   /*
    * 上传前: 先校验 => 全部校验通过后开始上传
    * 事件执行顺序:

package/es/Modal/index.js

@@ -41,12 +41,12 @@ var CLMModal = function CLMModal(props) {
         cancelText = props.cancelText;
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, Object.assign({
       onClick: onCancel,
-      key: 'canncel_button',
+      key: "canncel_button",
       size: defaultFooterSize
     }, props.cancelButtonProps), cancelText || contextLocale.cancelText), /*#__PURE__*/React.createElement(Button, Object.assign({
       type: "primary",
       onClick: onOk,
-      key: 'ok_button',
+      key: "ok_button",
       size: defaultFooterSize
     }, props.okButtonProps), okText !== null && okText !== void 0 ? okText : contextLocale.okText));
   });
@@ -95,7 +95,14 @@ LMModal.warn = function (props) {
 };
 
 LMModal.confirm = function (props) {
-  return _Modal.confirm(Object.assign(Object.assign({}, props), {
+  var okText = props.okText,
+      cancelText = props.cancelText,
+      resetProps = __rest(props, ["okText", "cancelText"]);
+
+  var runtimeLocale = getConfirmLocale();
+  return _Modal.confirm(Object.assign(Object.assign({}, resetProps), {
+    okText: okText || (props.okCancel ? runtimeLocale.okText : runtimeLocale.justOkText),
+    cancelText: cancelText || runtimeLocale.cancelText,
     wrapClassName: classNames(props.wrapClassName, prefixCls, 'lm_modal_info')
   }));
 };

package/es/Radio/index.js

@@ -19,13 +19,21 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react = _interopRequireDefault(require("react"));
 
-var _excluded = ["children"],
+var _DisabledContext = _interopRequireDefault(require("../ConfigProvider/DisabledContext"));
+
+var _excluded = ["children", "disabled"],
     _excluded2 = ["children", "size", "buttonStyle", "direction", "className"];
 
 var LMRadio = function LMRadio(props) {
   var children = props.children,
+      customDisabled = props.disabled,
       restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+
+  var disabled = _react.default.useContext(_DisabledContext.default);
+
+  var mergedDisabled = customDisabled || disabled;
   return /*#__PURE__*/_react.default.createElement(_radio.default, (0, _extends2.default)({
+    disabled: mergedDisabled,
     className: "lm-radio"
   }, restProps), children);
 };

package/es/Switch/index.js

@@ -17,16 +17,21 @@ var __rest = this && this.__rest || function (s, e) {
 
 import React from 'react';
 import cls from 'classnames';
+import DisabledContext from '../ConfigProvider/DisabledContext';
 
 var Switch = function Switch(props) {
   var _props$size = props.size,
       size = _props$size === void 0 ? 'default' : _props$size,
       className = props.className,
-      restProps = __rest(props, ["size", "className"]);
+      customDisabled = props.disabled,
+      restProps = __rest(props, ["size", "className", "disabled"]);
 
+  var disabled = React.useContext(DisabledContext);
+  var mergedDisabled = customDisabled || disabled;
   var classs = cls('lm-switch', className, _defineProperty({}, "lm-switch-".concat(size), size));
   return /*#__PURE__*/React.createElement(_Switch, Object.assign({
-    className: classs
+    className: classs,
+    disabled: mergedDisabled
   }, restProps, {
     size: size
   }));

package/es/hooks/useEvent/index.js

@@ -9,7 +9,7 @@ function useEvent(handler) {
 
   return useCallback(function () {
     var fn = handlerRef.current;
-    return fn.apply(void 0, arguments);
+    return fn === null || fn === void 0 ? void 0 : fn.apply(void 0, arguments);
   }, []);
 }
 

package/es/index.d.ts

@@ -51,10 +51,9 @@ export type { TooltipProps } from './Tooltip';
 export { default as Form } from './Form';
 export { default as Spin } from './Spin';
 export { default as LmEditTable } from './LmEditTable';
-export type { CountdownHandle, TLmEditTable } from './LmEditTable/EditTable';
+export type { TLmEditTable, CountdownHandle } from './LmEditTable/EditTable';
 export { default as List } from './List';
 export { default as LMQuickMenu } from './QuickMenu';
-export type { IMenuData, IQuickMenuProps } from './QuickMenu';
 export { default as DatePicker } from './DatePicker';
 export type { DatePickerProps, MonthPickerProps, WeekPickerProps, RangePickerProps } from './DatePicker';
 export { default as Popover } from './Popover';

package/es/locale-provider/index.js

@@ -4,7 +4,7 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import memoizeOne from 'memoize-one';
 import * as React from 'react';
-import { changeConfirmLocale } from 'antd/es/modal/locale';
+import { changeConfirmLocale } from '../Modal/locale';
 import warning from '../_util/warning';
 import LocaleContext from './context';
 export var ANT_MARK = 'internalMark';