linkmore-design 1.1.13-alpha.0 → 1.1.13-alpha.2

package/lib/Cascader/index.js

@@ -37,12 +37,26 @@ var LMCascader = function LMCascader(props) {
       dropdownClassName = props.dropdownClassName,
       _props$placeholder = props.placeholder,
       placeholder = _props$placeholder === void 0 ? '请选择' : _props$placeholder,
-      others = __rest(props, ["children", "className", "dropdownClassName", "placeholder"]);
+      defaultLabel = props.defaultLabel,
+      others = __rest(props, ["children", "className", "dropdownClassName", "placeholder", "defaultLabel"]);
+
+  var displayRender = function displayRender(label, selectedOptions) {
+    var hasUndefined = selectedOptions.some(function (v) {
+      return !v;
+    });
+
+    if (hasUndefined && defaultLabel) {
+      return defaultLabel;
+    }
+
+    return label.join('/');
+  };
 
   return /*#__PURE__*/_react.default.createElement(_cascader.default, Object.assign({
     placeholder: placeholder,
     className: (0, _classnames.default)(prefixCls, className),
-    dropdownClassName: (0, _classnames.default)(prefixDropdownCls, dropdownClassName)
+    dropdownClassName: (0, _classnames.default)(prefixDropdownCls, dropdownClassName),
+    displayRender: displayRender
   }, others));
 };
 

package/lib/Form/style/index.css

@@ -6663,6 +6663,9 @@ p {
 .lm_container_wrapper .lm_container.responsive.lm_col_5 .ant-form-item-responsive.nth-five {
   margin-right: 0;
 }
+.lm_container_wrapper .lm_container.responsive .ant-cascader {
+  width: 100%;
+}
 .lm_form-item-tip-error .ant-form-item-explain {
   width: 100%;
   position: absolute;

package/lib/Form/style/variables.css

@@ -6151,6 +6151,9 @@
 .lm_container_wrapper .lm_container.responsive.lm_col_5 .ant-form-item-responsive.nth-five {
   margin-right: 0;
 }
+.lm_container_wrapper .lm_container.responsive .ant-cascader {
+  width: 100%;
+}
 .lm_form-item-tip-error .ant-form-item-explain {
   width: 100%;
   position: absolute;

package/lib/Input/index.js

@@ -17,8 +17,12 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _IconFont = _interopRequireDefault(require("../IconFont"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _SizeContext = _interopRequireDefault(require("../ConfigProvider/SizeContext"));
 
+var _DisabledContext = _interopRequireDefault(require("../ConfigProvider/DisabledContext"));
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -33,15 +37,24 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 };
 
 var LmInput = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var _props$allowClear = props.allowClear,
+  var className = props.className,
+      customSize = props.size,
+      customDisabled = props.disabled,
+      _props$allowClear = props.allowClear,
       allowClear = _props$allowClear === void 0 ? true : _props$allowClear,
-      customizeSize = props.size,
-      rest = __rest(props, ["allowClear", "size"]);
+      rest = __rest(props // ===================== Size =====================
+  , ["className", "size", "disabled", "allowClear"]); // ===================== Size =====================
+
+
+  var size = customSize || _react.default.useContext(_SizeContext.default) || 'middle'; // ===================== Disabled =====================
+
+  var disabled = _react.default.useContext(_DisabledContext.default);
 
-  var size = customizeSize || _react.default.useContext(_SizeContext.default) || 'middle';
+  var mergedDisabled = customDisabled || disabled;
   return /*#__PURE__*/_react.default.createElement(_input.default, Object.assign({
     ref: ref,
-    className: "lm_input",
+    className: (0, _classnames.default)('lm_input', className),
+    disabled: mergedDisabled || undefined,
     size: size
   }, rest, {
     allowClear: allowClear
@@ -51,7 +64,8 @@ LmInput.Group = _input.default.Group;
 LmInput.Search = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$allowClear2 = props.allowClear,
       allowClear = _props$allowClear2 === void 0 ? true : _props$allowClear2,
-      rest = __rest(props, ["allowClear"]);
+      className = props.className,
+      rest = __rest(props, ["allowClear", "className"]);
 
   return /*#__PURE__*/_react.default.createElement(_input.default.Search, Object.assign({
     enterButton: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
@@ -60,7 +74,7 @@ LmInput.Search = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, rest, {
     ref: ref,
     allowClear: allowClear,
-    className: "lm_input_search"
+    className: (0, _classnames.default)('lm_input_search', className)
   }));
 });
 LmInput.TextArea = _input.default.TextArea;
@@ -68,10 +82,11 @@ LmInput.TextArea = _input.default.TextArea;
 LmInput.Password = function (props) {
   var _props$allowClear3 = props.allowClear,
       allowClear = _props$allowClear3 === void 0 ? true : _props$allowClear3,
-      rest = __rest(props, ["allowClear"]);
+      className = props.className,
+      rest = __rest(props, ["allowClear", "className"]);
 
   return /*#__PURE__*/_react.default.createElement(_input.default.Password, Object.assign({
-    className: "lm_input_password",
+    className: (0, _classnames.default)('lm_input_password', className),
     iconRender: function iconRender(visible) {
       return visible ? /*#__PURE__*/_react.default.createElement(_IconFont.default, {
         type: "lmweb-eye"

package/lib/InputNumber/index.js

@@ -15,6 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react = _interopRequireDefault(require("react"));
 
+var _DisabledContext = _interopRequireDefault(require("../ConfigProvider/DisabledContext"));
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -33,12 +35,19 @@ var prefixCls = 'lm_input-number';
 var LMInputNumber = function LMInputNumber(props) {
   var children = props.children,
       className = props.className,
-      others = __rest(props, ["children", "className"]);
+      customDisabled = props.disabled,
+      rest = __rest(props // ===================== Disabled =====================
+  , ["children", "className", "disabled"]); // ===================== Disabled =====================
+
+
+  var disabled = _react.default.useContext(_DisabledContext.default);
 
+  var mergedDisabled = customDisabled || disabled;
   return /*#__PURE__*/_react.default.createElement(_inputNumber.default, Object.assign({
     className: (0, _classnames.default)(className, prefixCls),
+    disabled: mergedDisabled,
     placeholder: "\u8BF7\u8F93\u5165"
-  }, others));
+  }, rest));
 };
 
 var CInputNumber = LMInputNumber;

package/lib/LmEditTable/EditTable.d.ts

@@ -13,6 +13,7 @@ interface ILmEditTable extends TableProps<any> {
     sortOpen?: boolean;
     size?: TableProps<any>['size'];
     colSortOpen?: boolean;
+    indexCol?: boolean | Record<string, any>;
     filterChange?: (data: TableProps<any>['columns']) => void;
     recordCreatorProps?: {
         creatorButtonText?: string;

package/lib/LmEditTable/EditTable.js

@@ -323,7 +323,7 @@ var Opetate = function Opetate(_ref) {
         fontSize: 16
       }
     })
-  })) : /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+  })) : (options === null || options === void 0 ? void 0 : options.includes('add')) || (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     type: "link",
     size: "small",
     icon: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
@@ -335,7 +335,7 @@ var Opetate = function Opetate(_ref) {
     onClick: function onClick() {
       return handleAdd(record, (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? true : false);
     }
-  }));
+  }) : null);
 };
 /*
   表格单元格
@@ -628,7 +628,7 @@ var EditableCell = function EditableCell(props) {
           var fromData = form.getFieldsValue();
           return render === null || render === void 0 ? void 0 : render(Object.assign(Object.assign({}, !(0, _util.isObjEmpty)(fromData) ? Object.assign(Object.assign({}, record), (0, _defineProperty2.default)({}, dataIndex, fromData[dataIndex])) : record), {
             onChange: save
-          }));
+          }), rowIndex);
         }
 
       default:
@@ -734,7 +734,6 @@ var MemoEditableCell = /*#__PURE__*/(0, _react.memo)(EditableCell, function (pre
   var pickProps = ['record', 'colIndex'];
   var p = (0, _lodash.pick)(prev, pickProps);
   var n = (0, _lodash.pick)(next, pickProps); // console.log(prev, next, '22', checkMemoShouldUploadSpecialFun(prev, next), isEqual(p, n))
-  // console.log(prev, next, '-sss')
 
   /** TODO: 在record中带有children，子列表数据修改之后，会导致父级的record对比不一样 */
 
@@ -764,6 +763,8 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       virtual = props.virtual,
       sortOpen = props.sortOpen,
       colSortOpen = props.colSortOpen,
+      _props$indexCol = props.indexCol,
+      indexCol = _props$indexCol === void 0 ? false : _props$indexCol,
       filterChange = props.filterChange,
       _props$size = props.size,
       size = _props$size === void 0 ? 'small' : _props$size,
@@ -771,7 +772,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       _props$shouldUpdate = props.shouldUpdate,
       shouldUpdate = _props$shouldUpdate === void 0 ? false : _props$shouldUpdate,
       resetProps = __rest(props // const [dataSource, setDataSource] = useState([]);
-  , ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "colSortOpen", "filterChange", "size", "recordCreatorProps", "shouldUpdate"]); // const [dataSource, setDataSource] = useState([]);
+  , ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "colSortOpen", "indexCol", "filterChange", "size", "recordCreatorProps", "shouldUpdate"]); // const [dataSource, setDataSource] = useState([]);
 
 
   var _useControllableValue = (0, _ahooks.useControllableValue)({
@@ -1116,16 +1117,35 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var rColumns = hasDisableOptions ? DisableOptions : columns;
     var localColumns = [sortOpen ? {
       title: '排序',
-      dataIndex: 'sort',
+      dataIndex: '_sort',
       width: 48,
       maxWidth: 48,
       className: 'drag-visible',
+      fixed: 'left',
       render: function render(_, record) {
         return /*#__PURE__*/_react.default.createElement(_DragHandle.default, {
           id: record[_rowKey] || record.id
         });
       }
-    } : null].concat((0, _toConsumableArray2.default)(rColumns), [useQuickOpetate ? {
+    } : null, indexCol ? (0, _lodash.isBoolean)(indexCol) ? {
+      title: '',
+      dataIndex: '_index',
+      width: 48,
+      maxWidth: 48,
+      fixed: 'left',
+      render: function render(_, record, index) {
+        return "".concat(index + 1);
+      }
+    } : Object.assign({
+      title: '',
+      dataIndex: '_index',
+      width: 48,
+      maxWidth: 48,
+      fixed: 'left',
+      render: function render(_, record, index) {
+        return "".concat(index + 1);
+      }
+    }, indexCol || {}) : null].concat((0, _toConsumableArray2.default)(rColumns), [useQuickOpetate ? {
       title: '操作',
       dataIndex: 'lm_edit_opetate',
       width: 68,
@@ -1163,8 +1183,15 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var mapColumns = function mapColumns(col, index) {
       var _a, _b;
 
-      if (!col.editable && !((_a = col.children) === null || _a === void 0 ? void 0 : _a.length)) {
-        return col;
+      if (!col.editable && !((_a = col.children) === null || _a === void 0 ? void 0 : _a.length) && (col === null || col === void 0 ? void 0 : col.dataIndex) === '_sort') {
+        var fn = col === null || col === void 0 ? void 0 : col.render;
+        return Object.assign(Object.assign({}, col), {
+          render: function render(text, record, i) {
+            var _a;
+
+            return fn === null || fn === void 0 ? void 0 : fn((_a = dataSource[i]) === null || _a === void 0 ? void 0 : _a[col.dataIndex], dataSource[i], i);
+          }
+        });
       }
 
       var newCol = Object.assign(Object.assign({}, col), {

package/lib/LmEditTable/util.js

@@ -84,7 +84,7 @@ function getExpandStatus(children) {
 }
 
 function checkMemoShouldUploadSpecialFun(prev, next) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
 
   var checkExpandStatus = getExpandStatus(prev.children) === getExpandStatus(next.children);
 
@@ -94,24 +94,43 @@ function checkMemoShouldUploadSpecialFun(prev, next) {
 
   var prevCol = prev === null || prev === void 0 ? void 0 : prev.col;
   var nextCol = next === null || next === void 0 ? void 0 : next.col;
+  /** TODO: 使用了自定义render, 是否要判断rowIndex? 这样排序之后，渲染的性能就会变差 */
 
-  if (((_a = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _a === void 0 ? void 0 : _a.optionOnly) || ((_b = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _b === void 0 ? void 0 : _b.optionOnly)) {
-    return (0, _lodash.isEqual)((_c = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _c === void 0 ? void 0 : _c.options, (_d = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _d === void 0 ? void 0 : _d.options);
+  if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.render) || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.render)) && !(0, _lodash.isEqual)((0, _lodash.pick)(prev, ['colIndex', 'record', 'children']), (0, _lodash.pick)(next, ['colIndex', 'record', 'children']))) {
+    return false;
+  }
+
+  if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.editable) === 'render' || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.editable) === 'render') && (((_a = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _a === void 0 ? void 0 : _a.render) || ((_b = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _b === void 0 ? void 0 : _b.render)) && !(0, _lodash.isEqual)((0, _lodash.pick)(prev, ['colIndex', 'record', 'rowIndex']), (0, _lodash.pick)(next, ['colIndex', 'record', 'rowIndex']))) {
+    return false;
+  }
+
+  if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.fixed) || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.fixed)) && !(0, _lodash.isEqual)(prev === null || prev === void 0 ? void 0 : prev.style, next === null || next === void 0 ? void 0 : next.style)) {
+    return false;
+  }
+
+  if ((((_c = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _c === void 0 ? void 0 : _c.optionOnly) || ((_d = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _d === void 0 ? void 0 : _d.optionOnly)) && !(0, _lodash.isEqual)((_e = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _e === void 0 ? void 0 : _e.options, (_f = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _f === void 0 ? void 0 : _f.options)) {
+    // return isEqual(prevCol?.componentProps?.options, nextCol?.componentProps?.options)
+    return false;
+  }
+
+  if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.order) || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.order)) && !(0, _lodash.isEqual)(prevCol === null || prevCol === void 0 ? void 0 : prevCol.order, nextCol === null || nextCol === void 0 ? void 0 : nextCol.order)) {
+    // return isEqual(prevCol?.order, nextCol?.fixed)
+    return false;
+  }
+
+  if (next.className.indexOf('ant-table-selection-column') > -1) {
+    return (0, _lodash.isEqual)((_h = (_g = prev.children) === null || _g === void 0 ? void 0 : _g[1]) === null || _h === void 0 ? void 0 : _h.props, (_k = (_j = next.children) === null || _j === void 0 ? void 0 : _j[1]) === null || _k === void 0 ? void 0 : _k.props);
   }
   /** 如果启用了快速复制功能，需要实时判断rowIndex与getLength */
 
 
-  if (((_e = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _e === void 0 ? void 0 : _e.quickcopy) || ((_f = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _f === void 0 ? void 0 : _f.quickcopy)) {
+  if (((_l = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _l === void 0 ? void 0 : _l.quickcopy) || ((_m = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _m === void 0 ? void 0 : _m.quickcopy)) {
     var pickProps = ['record', 'colIndex', 'rowIndex', 'getLength'];
     var p = (0, _lodash.pick)(prev, pickProps);
     var n = (0, _lodash.pick)(next, pickProps);
     return (0, _lodash.isEqual)(p, n);
   }
 
-  if (next.className.indexOf('ant-table-selection-column') > -1) {
-    return (0, _lodash.isEqual)((_h = (_g = prev.children) === null || _g === void 0 ? void 0 : _g[1]) === null || _h === void 0 ? void 0 : _h.props, (_k = (_j = next.children) === null || _j === void 0 ? void 0 : _j[1]) === null || _k === void 0 ? void 0 : _k.props);
-  }
-
   return true;
 }
 

package/lib/LmFilter/LmFilter.js

@@ -21,9 +21,10 @@ var _FilterRoot = _interopRequireDefault(require("./wrapper/FilterRoot"));
 
 var _localization = require("./localization");
 
-var _excluded = ["searchConfig", "localization"];
+var _components = _interopRequireDefault(require("./components"));
 
-var LmFilter = function LmFilter(_ref, ref) {
+var _excluded = ["searchConfig", "localization"];
+var LmFilter = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var _ref$searchConfig = _ref.searchConfig,
       searchConfig = _ref$searchConfig === void 0 ? {} : _ref$searchConfig,
       _ref$localization = _ref.localization,
@@ -64,8 +65,7 @@ var LmFilter = function LmFilter(_ref, ref) {
   return /*#__PURE__*/_react.default.createElement(_FilterRoot.default, (0, _extends2.default)({
     ref: ref || defaultRef
   }, defaultProps, resetProps));
-};
-
-var _default = /*#__PURE__*/(0, _react.forwardRef)(LmFilter);
-
+});
+LmFilter.FilterControl = _components.default;
+var _default = LmFilter;
 exports.default = _default;

package/lib/LmFilter/components/DropdownFIlter.js

@@ -9,6 +9,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -205,7 +207,8 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
       setVisible = _useState2[1];
 
   var filterValue = instance.filterValue,
-      size = instance.size; // 触发查询时关闭下拉框
+      size = instance.size;
+  var popupClassName = item.popupClassName; // 触发查询时关闭下拉框
 
   var setFilterValue = function setFilterValue(obj) {
     instance.setFilterValue(obj);
@@ -239,7 +242,7 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
       instance: resetInstance,
       item: item
     }),
-    overlayClassName: "filter_dropdown_container_".concat(item.type),
+    overlayClassName: (0, _classnames.default)("filter_dropdown_container_".concat(item.type), (0, _defineProperty2.default)({}, popupClassName, popupClassName)),
     onVisibleChange: function onVisibleChange(v) {
       return setVisible(v);
     } // 未开启则需手动控制下拉展示组件的初始化

package/lib/LmFilter/index.js

@@ -9,8 +9,5 @@ exports.default = void 0;
 
 var _LmFilter = _interopRequireDefault(require("./LmFilter"));
 
-var _components = _interopRequireDefault(require("./components"));
-
-_LmFilter.default.FilterControl = _components.default;
 var _default = _LmFilter.default;
 exports.default = _default;

package/lib/LmTable/Table.js

@@ -61,6 +61,8 @@ var _resetConfig = _interopRequireDefault(require("./resetConfig"));
 
 var _virTual = require("./virTual");
 
+var _useGroupDataSource3 = _interopRequireDefault(require("./hooks/useGroupDataSource"));
+
 var _excluded = ["columns", "dataSource", "autoSize", "rowClick", "onDoubleClick", "checkConfig", "summary", "pagination", "hiddenPage", "loading", "virtual", "sortOpen", "colSortOpen", "resizeable", "customCheck", "components", "rowSelection", "columnsState", "onChange", "filterChange", "tableRowType", "size", "openSheet", "editSheet", "dataChange", "groupRowKeys", "groupColKeys", "emptyProps"],
     _excluded2 = ["className", "style"],
     _excluded3 = ["onResize", "width", "onResizeStop"];
@@ -197,15 +199,16 @@ var ResetTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, [customizeColumns]);
   /** 行分组 */
 
-  var groupDataSource = (0, _react.useMemo)(function () {
-    if (!(groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length)) {
-      return customizeDataSource;
-    }
-
-    return (0, _util.transformWithRowGroup)(customizeDataSource, groupRowKeys);
-  }, [customizeDataSource, groupRowKeys]);
+  var _useGroupDataSource = (0, _useGroupDataSource3.default)({
+    groupRowKeys: groupRowKeys,
+    customizeDataSource: customizeDataSource,
+    columnsRef: columnsRef
+  }),
+      _useGroupDataSource2 = (0, _slicedToArray2.default)(_useGroupDataSource, 1),
+      groupDataSource = _useGroupDataSource2[0];
   /** 列分组 */
 
+
   var _useMemo = (0, _react.useMemo)(function () {
     if (!(groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length)) {
       return {

package/lib/LmTable/expression.d.ts

@@ -0,0 +1 @@
+export default function calcExpression(item: any, needCalcKeys: string[]): void;

package/lib/LmTable/expression.js

@@ -0,0 +1,41 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = calcExpression;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+// 分组求和计算
+function calcExpression(item, needCalcKeys) {
+  var _a;
+
+  if ((_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.length) {
+    needCalcKeys.forEach(function (dkey) {
+      var sum = 0;
+
+      var _dkey = (0, _slicedToArray2.default)(dkey, 2),
+          key = _dkey[0],
+          expression = _dkey[1];
+
+      item.children.forEach(function (subItem) {
+        if (key in subItem) {
+          sum += Number(subItem[key]);
+        }
+      });
+
+      if (!sum) {
+        return;
+      }
+
+      if (expression === 'sum') {
+        item[key] = sum;
+      } else if (expression === 'average') {
+        item[key] = sum / item.children.length;
+      }
+    });
+  }
+}

package/lib/LmTable/hooks/useGroupDataSource.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = require("react");
+
+var _util = require("../util");
+
+var _expression = _interopRequireDefault(require("../expression"));
+
+/** 行分组 */
+function useGroupDataSource(_ref) {
+  var groupRowKeys = _ref.groupRowKeys,
+      customizeDataSource = _ref.customizeDataSource,
+      columnsRef = _ref.columnsRef;
+  var groupDataSource = (0, _react.useMemo)(function () {
+    if (!(groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length)) {
+      return customizeDataSource;
+    }
+
+    var source = (0, _util.transformWithRowGroup)(customizeDataSource, groupRowKeys); // 获取需要计算的key，生成数组
+
+    var needCalcKeys = columnsRef.current.filter(function (col) {
+      return col.expression;
+    }).map(function (col) {
+      return [col.dataIndex, col.expression];
+    });
+
+    var deepChildren = function deepChildren(arr) {
+      arr === null || arr === void 0 ? void 0 : arr.forEach(function (item) {
+        if (item === null || item === void 0 ? void 0 : item.children) {
+          deepChildren(item === null || item === void 0 ? void 0 : item.children);
+          (0, _expression.default)(item, needCalcKeys);
+        }
+      });
+    };
+
+    deepChildren(source);
+    return source;
+  }, [customizeDataSource, groupRowKeys]);
+  return [groupDataSource];
+}
+
+var _default = useGroupDataSource;
+exports.default = _default;

package/lib/LmUpload/fns/index.js

@@ -61,16 +61,21 @@ var useCoreOptions = function useCoreOptions(_ref) {
       fileAreaSize = props.fileAreaSize,
       enabledOss = props.enabledOss,
       enableCrop = props.enableCrop,
-      ossConfig = props.ossConfig; // 获取两个对象是否存在指定值相等
+      ossConfig = props.ossConfig;
+  /* 获取两个对象是否存在指定值相等
+   * 取用户定义的列字段，如果读取不到则取'fileName'对比
+   */
 
   var getHasEqual = (0, _react.useCallback)(function (obj1, obj2) {
     var extend = [uid, 'fileName'];
     var flag = false;
     extend.forEach(function (v) {
-      if (!flag) flag = obj1[v] === obj2[v];
+      if (!flag && obj1[v] && obj2[v]) {
+        flag = obj1[v] === obj2[v];
+      }
     });
     return flag;
-  }, []); // 从对象中读取存在的指定属性
+  }, [uid]); // 从对象中读取存在的指定属性
 
   var getFileHasValue = (0, _react.useCallback)(function (obj) {
     var extend = [uid, 'fileName'];

package/lib/Select/index.js

@@ -19,6 +19,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _SizeContext = _interopRequireDefault(require("../ConfigProvider/SizeContext"));
 
+var _DisabledContext = _interopRequireDefault(require("../ConfigProvider/DisabledContext"));
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -37,13 +39,20 @@ var CLMSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var children = props.children,
       className = props.className,
       customizeSize = props.size,
+      customDisabled = props.disabled,
       dropdownClassName = props.dropdownClassName,
       options = props.options,
       value = props.value,
       defaultLabel = props.defaultLabel,
-      others = __rest(props, ["children", "className", "size", "dropdownClassName", "options", "value", "defaultLabel"]);
+      rest = __rest(props // ===================== Size =====================
+  , ["children", "className", "size", "disabled", "dropdownClassName", "options", "value", "defaultLabel"]); // ===================== Size =====================
+
+
+  var size = customizeSize || _react.default.useContext(_SizeContext.default) || 'middle'; // ===================== Disabled =====================
 
-  var size = customizeSize || _react.default.useContext(_SizeContext.default) || 'middle'; // 当前值是否存于选项中
+  var disabled = _react.default.useContext(_DisabledContext.default);
+
+  var mergedDisabled = customDisabled || disabled; // 当前值是否存于选项中
 
   var hasOption = (0, _react.useMemo)(function () {
     var flag = false;
@@ -62,24 +71,27 @@ var CLMSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
     if (options) {
       flag = !!options.some(function (v) {
-        return v.value === value;
+        var _a, _b;
+
+        return v[(_b = (_a = props.fieldNames) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : 'value'] === value;
       });
     }
 
     return flag;
-  }, [children, value, options]); // 重组value: 传入value但找不到options项时，展示默认label
+  }, [children, value, options, props.fieldNames]); // 重组value: 传入value但找不到options项时，展示默认label
 
   var resetValue = (0, _react.useMemo)(function () {
     if (value && !hasOption) return defaultLabel !== null && defaultLabel !== void 0 ? defaultLabel : value;
     return value;
-  }, [value, hasOption]);
+  }, [value, defaultLabel, hasOption]);
   return /*#__PURE__*/_react.default.createElement(_select.default, Object.assign({
     className: (0, _classnames.default)(className, prefixCls),
     size: size,
     ref: ref,
     value: resetValue,
-    options: options
-  }, others, {
+    options: options,
+    disabled: mergedDisabled || undefined
+  }, rest, {
     dropdownClassName: (0, _classnames.default)('lm_select_dropdown', dropdownClassName)
   }), children);
 });

package/lib/styles/variables.css

@@ -9001,6 +9001,9 @@ p {
 .lm_container_wrapper .lm_container.responsive.lm_col_5 .ant-form-item-responsive.nth-five {
   margin-right: 0;
 }
+.lm_container_wrapper .lm_container.responsive .ant-cascader {
+  width: 100%;
+}
 .lm_form-item-tip-error .ant-form-item-explain {
   width: 100%;
   position: absolute;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.13-alpha.0",
+  "version": "1.1.13-alpha.2",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"