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

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## <small>1.1.14 () </small>
+* 1.1.14
+* fix: 表单禁用disabled不生效([67393fd](https://gitlab.scm321.com/web-group/UFX.SCM.linkDesign/commit/67393fd))
+* feat: 分组表格支持金额总和计算([2402d16](https://gitlab.scm321.com/web-group/UFX.SCM.linkDesign/commit/2402d16))
+* fix: 修复表单响应式下多级下拉菜单宽度问题([a228946b](https://gitlab.scm321.com/web-group/UFX.SCM.linkDesign/commit/a228946b))
+
 ## <small>1.1.12 (2022-10-18)</small>
 
 * 1.1.12 ([ce4a587](https://gitlab.scm321.com/web-group/UFX.SCM.linkDesign/commit/ce4a587))
@@ -1117,3 +1123,8 @@
 
 
 
+
+
+[[git地址]: 
+
+[[小北IT官网]: 

package/dist/Form/demos/disabled.d.ts

@@ -0,0 +1,2 @@
+declare const App: () => JSX.Element;
+export default App;

package/dist/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/dist/LmFilter/LmFilter.d.ts

@@ -1,7 +1,3 @@
-declare const _default: React.ForwardRefExoticComponent<Pick<{
-    [x: string]: any;
-    searchConfig?: {};
-    localization?: {};
-}, string | number> & React.RefAttributes<any>>;
-export default _default;
+export default LmFilter;
+declare const LmFilter: React.ForwardRefExoticComponent<React.RefAttributes<any>>;
 import React from "react";

package/dist/LmTable/expression.d.ts

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

package/dist/LmTable/hooks/useGroupDataSource.d.ts

@@ -0,0 +1,7 @@
+export default useGroupDataSource;
+/** 行分组 */
+declare function useGroupDataSource({ groupRowKeys, customizeDataSource, columnsRef }: {
+    groupRowKeys: any;
+    customizeDataSource: any;
+    columnsRef: any;
+}): any[];

package/dist/index.umd.js

@@ -34780,7 +34780,7 @@
   Cascader$1.SHOW_PARENT = SHOW_PARENT$1;
   Cascader$1.SHOW_CHILD = SHOW_CHILD$1;
 
-  var _excluded$y = ["children", "className", "dropdownClassName", "placeholder"];
+  var _excluded$y = ["children", "className", "dropdownClassName", "placeholder", "defaultLabel"];
   var prefixCls = 'lm_cascader';
   var prefixDropdownCls = 'lm_cascader_dropdown';
 
@@ -34790,12 +34790,26 @@
         dropdownClassName = props.dropdownClassName,
         _props$placeholder = props.placeholder,
         placeholder = _props$placeholder === void 0 ? '请选择' : _props$placeholder,
+        defaultLabel = props.defaultLabel,
         others = _objectWithoutProperties$1(props, _excluded$y);
 
+    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['default'].createElement(Cascader$1, _objectSpread({
       placeholder: placeholder,
       className: classnames(prefixCls, className),
-      dropdownClassName: classnames(prefixDropdownCls, dropdownClassName)
+      dropdownClassName: classnames(prefixDropdownCls, dropdownClassName),
+      displayRender: displayRender
     }, others));
   };
 
@@ -90760,7 +90774,8 @@
         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);
@@ -90795,7 +90810,7 @@
         instance: resetInstance,
         item: item
       }),
-      overlayClassName: "filter_dropdown_container_".concat(item.type),
+      overlayClassName: classnames("filter_dropdown_container_".concat(item.type), _defineProperty$1({}, popupClassName, popupClassName)),
       onVisibleChange: function onVisibleChange(v) {
         return setVisible(v);
       } // 未开启则需手动控制下拉展示组件的初始化
@@ -93444,8 +93459,7 @@
   };
 
   var _excluded$1a = ["searchConfig", "localization"];
-
-  var LmFilter$1 = function LmFilter(_ref, ref) {
+  var LmFilter$1 = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     var _ref$searchConfig = _ref.searchConfig,
         searchConfig = _ref$searchConfig === void 0 ? {} : _ref$searchConfig,
         _ref$localization = _ref.localization,
@@ -93487,11 +93501,8 @@
     return /*#__PURE__*/React__default['default'].createElement(LmFilterRoot$1, _extends$2({
       ref: ref || defaultRef
     }, defaultProps, resetProps));
-  };
-
-  var LmFilter$2 = /*#__PURE__*/React.forwardRef(LmFilter$1);
-
-  LmFilter$2.FilterControl = FilterControl$1;
+  });
+  LmFilter$1.FilterControl = FilterControl$1;
 
   // 状态管理操作
   var reducer$1 = function reducer(state, action) {
@@ -181377,16 +181388,21 @@
         fileAreaSize = props.fileAreaSize,
         enabledOss = props.enabledOss,
         enableCrop = props.enableCrop,
-        ossConfig = props.ossConfig; // 获取两个对象是否存在指定值相等
+        ossConfig = props.ossConfig;
+    /* 获取两个对象是否存在指定值相等
+     * 取用户定义的列字段，如果读取不到则取'fileName'对比
+     */
 
     var getHasEqual = 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 = React.useCallback(function (obj) {
       var extend = [uid, 'fileName'];
@@ -188451,19 +188467,26 @@
     }))));
   };
 
-  var _excluded$1i = ["allowClear", "size"],
-      _excluded2$i = ["allowClear"],
-      _excluded3$5 = ["allowClear"];
+  var _excluded$1i = ["className", "size", "disabled", "allowClear"],
+      _excluded2$i = ["allowClear", "className"],
+      _excluded3$5 = ["allowClear", "className"];
   var LmInput = /*#__PURE__*/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 = _objectWithoutProperties$1(props, _excluded$1i);
+        rest = _objectWithoutProperties$1(props, _excluded$1i); // ===================== Size =====================
+
 
-    var size = customizeSize || React__default['default'].useContext(SizeContext$1) || 'middle';
+    var size = customSize || React__default['default'].useContext(SizeContext$1) || 'middle'; // ===================== Disabled =====================
+
+    var disabled = React__default['default'].useContext(DisabledContext$1);
+    var mergedDisabled = customDisabled || disabled;
     return /*#__PURE__*/React__default['default'].createElement(Input$3, _objectSpread(_objectSpread({
       ref: ref,
-      className: "lm_input",
+      className: classnames('lm_input', className),
+      disabled: mergedDisabled || undefined,
       size: size
     }, rest), {}, {
       allowClear: allowClear
@@ -188473,6 +188496,7 @@
   LmInput.Search = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var _props$allowClear2 = props.allowClear,
         allowClear = _props$allowClear2 === void 0 ? true : _props$allowClear2,
+        className = props.className,
         rest = _objectWithoutProperties$1(props, _excluded2$i);
 
     return /*#__PURE__*/React__default['default'].createElement(Input$3.Search, _objectSpread(_objectSpread({
@@ -188482,7 +188506,7 @@
     }, rest), {}, {
       ref: ref,
       allowClear: allowClear,
-      className: "lm_input_search"
+      className: classnames('lm_input_search', className)
     }));
   });
   LmInput.TextArea = Input$3.TextArea;
@@ -188490,10 +188514,11 @@
   LmInput.Password = function (props) {
     var _props$allowClear3 = props.allowClear,
         allowClear = _props$allowClear3 === void 0 ? true : _props$allowClear3,
+        className = props.className,
         rest = _objectWithoutProperties$1(props, _excluded3$5);
 
     return /*#__PURE__*/React__default['default'].createElement(Input$3.Password, _objectSpread(_objectSpread({
-      className: "lm_input_password",
+      className: classnames('lm_input_password', className),
       iconRender: function iconRender(visible) {
         return visible ? /*#__PURE__*/React__default['default'].createElement(IconFont, {
           type: "lmweb-eye"
@@ -188506,18 +188531,23 @@
     }));
   };
 
-  var _excluded$1j = ["children", "className"];
+  var _excluded$1j = ["children", "className", "disabled"];
   var prefixCls$3 = 'lm_input-number';
 
   var LMInputNumber = function LMInputNumber(props) {
     var children = props.children,
         className = props.className,
-        others = _objectWithoutProperties$1(props, _excluded$1j);
+        customDisabled = props.disabled,
+        rest = _objectWithoutProperties$1(props, _excluded$1j); // ===================== Disabled =====================
 
+
+    var disabled = React__default['default'].useContext(DisabledContext$1);
+    var mergedDisabled = customDisabled || disabled;
     return /*#__PURE__*/React__default['default'].createElement(InputNumber$1, _objectSpread({
       className: classnames(className, prefixCls$3),
+      disabled: mergedDisabled,
       placeholder: "\u8BF7\u8F93\u5165"
-    }, others));
+    }, rest));
   };
 
   var CInputNumber = LMInputNumber;
@@ -285562,6 +285592,71 @@
     }), fixedColumns.fixedRight);
   });
 
+  // 分组求和计算
+  function calcExpression(item, needCalcKeys) {
+    var _item$children;
+
+    if (item === null || item === void 0 ? void 0 : (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) {
+      needCalcKeys.forEach(function (dkey) {
+        var sum = 0;
+
+        var _dkey = _slicedToArray$1(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;
+        }
+      });
+    }
+  }
+
+  /** 行分组 */
+
+  function useGroupDataSource(_ref) {
+    var groupRowKeys = _ref.groupRowKeys,
+        customizeDataSource = _ref.customizeDataSource,
+        columnsRef = _ref.columnsRef;
+    var groupDataSource = React.useMemo(function () {
+      if (!(groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length)) {
+        return customizeDataSource;
+      }
+
+      var source = 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);
+            calcExpression(item, needCalcKeys);
+          }
+        });
+      };
+
+      deepChildren(source);
+      return source;
+    }, [customizeDataSource, groupRowKeys]);
+    return [groupDataSource];
+  }
+
   var _excluded$29 = ["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$w = ["className", "style"],
       _excluded3$7 = ["onResize", "width", "onResizeStop"];
@@ -285698,15 +285793,16 @@
     }, [customizeColumns]);
     /** 行分组 */
 
-    var groupDataSource = React.useMemo(function () {
-      if (!(groupRowKeys === null || groupRowKeys === void 0 ? void 0 : groupRowKeys.length)) {
-        return customizeDataSource;
-      }
-
-      return transformWithRowGroup(customizeDataSource, groupRowKeys);
-    }, [customizeDataSource, groupRowKeys]);
+    var _useGroupDataSource = useGroupDataSource({
+      groupRowKeys: groupRowKeys,
+      customizeDataSource: customizeDataSource,
+      columnsRef: columnsRef
+    }),
+        _useGroupDataSource2 = _slicedToArray$1(_useGroupDataSource, 1),
+        groupDataSource = _useGroupDataSource2[0];
     /** 列分组 */
 
+
     var _useMemo = React.useMemo(function () {
       if (!(groupColKeys === null || groupColKeys === void 0 ? void 0 : groupColKeys.length)) {
         return {
@@ -288104,19 +288200,24 @@
 
   LMRadio.Button = Radio$1.Button;
 
-  var _excluded$2h = ["children", "className", "size", "dropdownClassName", "options", "value", "defaultLabel"];
+  var _excluded$2h = ["children", "className", "size", "disabled", "dropdownClassName", "options", "value", "defaultLabel"];
   var prefixCls$7 = 'lm_select';
   var CLMSelect$1 = /*#__PURE__*/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 = _objectWithoutProperties$1(props, _excluded$2h);
+        rest = _objectWithoutProperties$1(props, _excluded$2h); // ===================== Size =====================
 
-    var size = customizeSize || React__default['default'].useContext(SizeContext$1) || 'middle'; // 当前值是否存于选项中
+
+    var size = customizeSize || React__default['default'].useContext(SizeContext$1) || 'middle'; // ===================== Disabled =====================
+
+    var disabled = React__default['default'].useContext(DisabledContext$1);
+    var mergedDisabled = customDisabled || disabled; // 当前值是否存于选项中
 
     var hasOption = React.useMemo(function () {
       var flag = false;
@@ -288135,24 +288236,27 @@
 
       if (options) {
         flag = !!options.some(function (v) {
-          return v.value === value;
+          var _props$fieldNames$val, _props$fieldNames;
+
+          return v[(_props$fieldNames$val = (_props$fieldNames = props.fieldNames) === null || _props$fieldNames === void 0 ? void 0 : _props$fieldNames.value) !== null && _props$fieldNames$val !== void 0 ? _props$fieldNames$val : 'value'] === value;
         });
       }
 
       return flag;
-    }, [children, value, options]); // 重组value: 传入value但找不到options项时，展示默认label
+    }, [children, value, options, props.fieldNames]); // 重组value: 传入value但找不到options项时，展示默认label
 
     var resetValue = 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['default'].createElement(Select$2, _objectSpread(_objectSpread({
       className: classnames(className, prefixCls$7),
       size: size,
       ref: ref,
       value: resetValue,
-      options: options
-    }, others), {}, {
+      options: options,
+      disabled: mergedDisabled || undefined
+    }, rest), {}, {
       dropdownClassName: classnames('lm_select_dropdown', dropdownClassName)
     }), children);
   });
@@ -312320,7 +312424,7 @@
     return isExpandRow(children) ? children === null || children === void 0 ? void 0 : (_children$2 = children[0]) === null || _children$2 === void 0 ? void 0 : (_children$2$props = _children$2.props) === null || _children$2$props === void 0 ? void 0 : (_children$2$props$chi = _children$2$props.children) === null || _children$2$props$chi === void 0 ? void 0 : (_children$2$props$chi2 = _children$2$props$chi[1]) === null || _children$2$props$chi2 === void 0 ? void 0 : (_children$2$props$chi3 = _children$2$props$chi2.props) === null || _children$2$props$chi3 === void 0 ? void 0 : _children$2$props$chi3['aria-label'] : '';
   }
   function checkMemoShouldUploadSpecialFun(prev, next) {
-    var _prevCol$componentPro, _nextCol$componentPro, _prevCol$componentPro3, _nextCol$componentPro3;
+    var _prevCol$componentPro, _nextCol$componentPro, _prevCol$componentPro2, _nextCol$componentPro2, _prevCol$componentPro3, _nextCol$componentPro3, _prevCol$componentPro4, _nextCol$componentPro4;
 
     var checkExpandStatus = getExpandStatus(prev.children) === getExpandStatus(next.children);
 
@@ -312330,20 +312434,28 @@
 
     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 ((prevCol === null || prevCol === void 0 ? void 0 : (_prevCol$componentPro = prevCol.componentProps) === null || _prevCol$componentPro === void 0 ? void 0 : _prevCol$componentPro.optionOnly) || (nextCol === null || nextCol === void 0 ? void 0 : (_nextCol$componentPro = nextCol.componentProps) === null || _nextCol$componentPro === void 0 ? void 0 : _nextCol$componentPro.optionOnly)) {
-      var _prevCol$componentPro2, _nextCol$componentPro2;
+    if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.render) || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.render)) && !lodash.isEqual(lodash.pick(prev, ['colIndex', 'record', 'children']), lodash.pick(next, ['colIndex', 'record', 'children']))) {
+      return false;
+    }
 
-      return lodash.isEqual(prevCol === null || prevCol === void 0 ? void 0 : (_prevCol$componentPro2 = prevCol.componentProps) === null || _prevCol$componentPro2 === void 0 ? void 0 : _prevCol$componentPro2.options, nextCol === null || nextCol === void 0 ? void 0 : (_nextCol$componentPro2 = nextCol.componentProps) === null || _nextCol$componentPro2 === void 0 ? void 0 : _nextCol$componentPro2.options);
+    if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.editable) === 'render' || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.editable) === 'render') && ((prevCol === null || prevCol === void 0 ? void 0 : (_prevCol$componentPro = prevCol.componentProps) === null || _prevCol$componentPro === void 0 ? void 0 : _prevCol$componentPro.render) || (nextCol === null || nextCol === void 0 ? void 0 : (_nextCol$componentPro = nextCol.componentProps) === null || _nextCol$componentPro === void 0 ? void 0 : _nextCol$componentPro.render)) && !lodash.isEqual(lodash.pick(prev, ['colIndex', 'record', 'rowIndex']), lodash.pick(next, ['colIndex', 'record', 'rowIndex']))) {
+      return false;
     }
-    /** 如果启用了快速复制功能，需要实时判断rowIndex与getLength */
 
+    if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.fixed) || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.fixed)) && !lodash.isEqual(prev === null || prev === void 0 ? void 0 : prev.style, next === null || next === void 0 ? void 0 : next.style)) {
+      return false;
+    }
 
-    if ((prevCol === null || prevCol === void 0 ? void 0 : (_prevCol$componentPro3 = prevCol.componentProps) === null || _prevCol$componentPro3 === void 0 ? void 0 : _prevCol$componentPro3.quickcopy) || (nextCol === null || nextCol === void 0 ? void 0 : (_nextCol$componentPro3 = nextCol.componentProps) === null || _nextCol$componentPro3 === void 0 ? void 0 : _nextCol$componentPro3.quickcopy)) {
-      var pickProps = ['record', 'colIndex', 'rowIndex', 'getLength'];
-      var p = lodash.pick(prev, pickProps);
-      var n = lodash.pick(next, pickProps);
-      return lodash.isEqual(p, n);
+    if (((prevCol === null || prevCol === void 0 ? void 0 : (_prevCol$componentPro2 = prevCol.componentProps) === null || _prevCol$componentPro2 === void 0 ? void 0 : _prevCol$componentPro2.optionOnly) || (nextCol === null || nextCol === void 0 ? void 0 : (_nextCol$componentPro2 = nextCol.componentProps) === null || _nextCol$componentPro2 === void 0 ? void 0 : _nextCol$componentPro2.optionOnly)) && !lodash.isEqual(prevCol === null || prevCol === void 0 ? void 0 : (_prevCol$componentPro3 = prevCol.componentProps) === null || _prevCol$componentPro3 === void 0 ? void 0 : _prevCol$componentPro3.options, nextCol === null || nextCol === void 0 ? void 0 : (_nextCol$componentPro3 = nextCol.componentProps) === null || _nextCol$componentPro3 === void 0 ? void 0 : _nextCol$componentPro3.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)) && !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) {
@@ -312351,6 +312463,15 @@
 
       return lodash.isEqual((_prev$children = prev.children) === null || _prev$children === void 0 ? void 0 : (_prev$children$ = _prev$children[1]) === null || _prev$children$ === void 0 ? void 0 : _prev$children$.props, (_next$children = next.children) === null || _next$children === void 0 ? void 0 : (_next$children$ = _next$children[1]) === null || _next$children$ === void 0 ? void 0 : _next$children$.props);
     }
+    /** 如果启用了快速复制功能，需要实时判断rowIndex与getLength */
+
+
+    if ((prevCol === null || prevCol === void 0 ? void 0 : (_prevCol$componentPro4 = prevCol.componentProps) === null || _prevCol$componentPro4 === void 0 ? void 0 : _prevCol$componentPro4.quickcopy) || (nextCol === null || nextCol === void 0 ? void 0 : (_nextCol$componentPro4 = nextCol.componentProps) === null || _nextCol$componentPro4 === void 0 ? void 0 : _nextCol$componentPro4.quickcopy)) {
+      var pickProps = ['record', 'colIndex', 'rowIndex', 'getLength'];
+      var p = lodash.pick(prev, pickProps);
+      var n = lodash.pick(next, pickProps);
+      return lodash.isEqual(p, n);
+    }
 
     return true;
   }
@@ -312384,7 +312505,7 @@
       _excluded3$b = ["value", "onChange", "record", "rowIndex", "colIndex", "validator"],
       _excluded4$1 = ["record", "rowKey", "isEdit", "col", "rowIndex", "colIndex", "handleTableRowDelete", "handleTableRowAdd", "quickOpetateClearAll", "getLength", "isHoverEdit", "editEnum", "valueType", "children", "handleSave", "handleAdd", "handleDelete", "handleCopy", "itemProps", "setValid", "reWriteOriginSource"],
       _excluded5 = ["onMouseEnter", "onMouseLeave"],
-      _excluded6 = ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "colSortOpen", "filterChange", "size", "recordCreatorProps", "shouldUpdate"];
+      _excluded6 = ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "colSortOpen", "indexCol", "filterChange", "size", "recordCreatorProps", "shouldUpdate"];
   var UploadBtn$1 = UploadOss.UploadBtn;
   var EditableContext$1 = /*#__PURE__*/React__default['default'].createContext(null); // 表格行
 
@@ -312606,7 +312727,7 @@
           fontSize: 16
         }
       })
-    })) : /*#__PURE__*/React__default['default'].createElement(LMButton, {
+    })) : (options === null || options === void 0 ? void 0 : options.includes('add')) || (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? /*#__PURE__*/React__default['default'].createElement(LMButton, {
       type: "link",
       size: "small",
       icon: /*#__PURE__*/React__default['default'].createElement(IconFont, {
@@ -312618,7 +312739,7 @@
       onClick: function onClick() {
         return handleAdd(record, (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? true : false);
       }
-    }));
+    }) : null);
   };
   /*
     表格单元格
@@ -312915,7 +313036,7 @@
             var fromData = form.getFieldsValue();
             return render === null || render === void 0 ? void 0 : render(_objectSpread(_objectSpread({}, !isObjEmpty(fromData) ? _objectSpread(_objectSpread({}, record), {}, _defineProperty$1({}, dataIndex, fromData[dataIndex])) : record), {}, {
               onChange: save
-            }));
+            }), rowIndex);
           }
 
         default:
@@ -313021,7 +313142,6 @@
     var pickProps = ['record', 'colIndex'];
     var p = lodash.pick(prev, pickProps);
     var n = lodash.pick(next, pickProps); // console.log(prev, next, '22', checkMemoShouldUploadSpecialFun(prev, next), isEqual(p, n))
-    // console.log(prev, next, '-sss')
 
     /** TODO: 在record中带有children，子列表数据修改之后，会导致父级的record对比不一样 */
 
@@ -313050,6 +313170,8 @@
         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,
@@ -313406,16 +313528,35 @@
       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['default'].createElement(Dragger$1, {
             id: record[_rowKey] || record.id
           });
         }
-      } : null].concat(_toConsumableArray$1(rColumns), [useQuickOpetate ? {
+      } : null, indexCol ? lodash.isBoolean(indexCol) ? {
+        title: '',
+        dataIndex: '_index',
+        width: 48,
+        maxWidth: 48,
+        fixed: 'left',
+        render: function render(_, record, index) {
+          return "".concat(index + 1);
+        }
+      } : _objectSpread({
+        title: '',
+        dataIndex: '_index',
+        width: 48,
+        maxWidth: 48,
+        fixed: 'left',
+        render: function render(_, record, index) {
+          return "".concat(index + 1);
+        }
+      }, indexCol || {}) : null].concat(_toConsumableArray$1(rColumns), [useQuickOpetate ? {
         title: '操作',
         dataIndex: 'lm_edit_opetate',
         width: 68,
@@ -313453,8 +313594,15 @@
       var mapColumns = function mapColumns(col, index) {
         var _col$children;
 
-        if (!col.editable && !((_col$children = col.children) === null || _col$children === void 0 ? void 0 : _col$children.length)) {
-          return col;
+        if (!col.editable && !((_col$children = col.children) === null || _col$children === void 0 ? void 0 : _col$children.length) && (col === null || col === void 0 ? void 0 : col.dataIndex) === '_sort') {
+          var fn = col === null || col === void 0 ? void 0 : col.render;
+          return _objectSpread(_objectSpread({}, col), {}, {
+            render: function render(text, record, i) {
+              var _dataSource$i;
+
+              return fn === null || fn === void 0 ? void 0 : fn((_dataSource$i = dataSource[i]) === null || _dataSource$i === void 0 ? void 0 : _dataSource$i[col.dataIndex], dataSource[i], i);
+            }
+          });
         }
 
         var newCol = _objectSpread(_objectSpread({}, col), {}, {
@@ -324604,7 +324752,7 @@
   exports.LeftTable = LeftSide;
   exports.List = List$2;
   exports.LmEditTable = LmEditTable;
-  exports.LmFilter = LmFilter$2;
+  exports.LmFilter = LmFilter$1;
   exports.LmImgList = LmImgList;
   exports.LmSelect = LMSelect;
   exports.LmTable = Table$2;