linkmore-design 1.1.13-alpha.10 → 1.1.13-alpha.12

package/lib/LmEditTable/EditTable.js

@@ -705,7 +705,9 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       recordCreatorProps = props.recordCreatorProps,
       _props$shouldUpdate = props.shouldUpdate,
       shouldUpdate = _props$shouldUpdate === void 0 ? false : _props$shouldUpdate,
-      resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "disabled", "colSortOpen", "indexCol", "filterChange", "size", "recordCreatorProps", "shouldUpdate"]);
+      _props$loading = props.loading,
+      loading = _props$loading === void 0 ? false : _props$loading,
+      resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "disabled", "colSortOpen", "indexCol", "filterChange", "size", "recordCreatorProps", "shouldUpdate", "loading"]);
 
   var _useControllableValue = (0, _ahooks.useControllableValue)({
     value: (0, _util.checkRowKeyByDataSource)(props.value, _rowKey),
@@ -742,6 +744,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var deepDataSourceRef = (0, _react.useRef)((0, _util.deepDataSourcePreKeys)(dataSource, _rowKey));
   dataSourceRef.current = dataSource;
   deepDataSourceRef.current = (0, _util.deepDataSourcePreKeys)(dataSource, _rowKey);
+  var tableWarpRef = (0, _react.useRef)(null);
 
   var onColSortEnd = function onColSortEnd(active, over) {
     var _a;
@@ -890,7 +893,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         return newData;
       };
 
-      var res = filter(dataSource, key);
+      var res = filter(dataSourceRef.current, key);
       setDataSource(res);
     } else {
       if (((_c = dataSourceRef.current) === null || _c === void 0 ? void 0 : _c.length) === 1 && !quickOpetateClearAll) {
@@ -1311,14 +1314,17 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         cell: MemoEditableCell
       }, sortOpen ? {
         wrapper: function wrapper(wrapperProps) {
-          var _a;
+          var _a, _b, _c;
 
           return (0, _components.DraggableContainer)(Object.assign(Object.assign({}, wrapperProps), {
             virtual: virtual,
             keys: (_a = dataSourceRef.current) === null || _a === void 0 ? void 0 : _a.map(function (item) {
               return item[_rowKey];
             }),
-            onSortEnd: onSortEnd
+            options: dataSourceRef.current,
+            rowKey: _rowKey,
+            onSortEnd: onSortEnd,
+            tableWidth: (_c = (_b = tableWarpRef === null || tableWarpRef === void 0 ? void 0 : tableWarpRef.current) === null || _b === void 0 ? void 0 : _b.getBoundingClientRect()) === null || _c === void 0 ? void 0 : _c.width
           }));
         }
       } : virtual ? {
@@ -1337,7 +1343,8 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   if (colSortOpen) {
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: "lm_editTable_warpper"
+      className: "lm_editTable_warpper",
+      ref: tableWarpRef
     }, /*#__PURE__*/_react.default.createElement(_DndContainer.default, {
       move: onColSortEnd
     }, /*#__PURE__*/_react.default.createElement(_sortableBoxCol.default, {
@@ -1345,6 +1352,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         return [].concat((0, _toConsumableArray2.default)(acc), [item.dataIndex]);
       }, [])
     }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Table, Object.assign({}, config.current, {
+      loading: loading,
       size: size || 'small',
       columns: resultColumns,
       rowClassName: "editable-row",
@@ -1373,19 +1381,25 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "lm_editTable_warpper"
+    className: "lm_editTable_warpper",
+    ref: tableWarpRef
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Table, Object.assign({}, config.current, {
     size: size || 'small',
     columns: resultColumns,
     rowClassName: "editable-row",
     bordered: true,
+    loading: loading,
     pagination: false,
     // components={tableComponents}
     expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {
       expandedRowKeys: expandedRowKeys,
       fixed: true,
       // indentSize: 0,
-      expandIconColumnIndex: rowSelection && sortOpen ? 3 : rowSelection || sortOpen ? 2 : 0,
+      expandIconColumnIndex: (0, _util.checkExpandIconColumnIndex)({
+        rowSelection: rowSelection,
+        sortOpen: sortOpen,
+        indexCol: indexCol
+      }) || 0,
       onExpandedRowsChange: function onExpandedRowsChange(expandedRows) {
         return setExpandedRowKeys(expandedRows);
       }

package/lib/LmEditTable/components/DraggableContainer.d.ts

@@ -1,7 +1,10 @@
-declare const DraggableContainer: ({ keys, onSortEnd, virtual, ...props }: {
+declare const DraggableContainer: ({ keys, onSortEnd, virtual, rowKey, options, tableWidth, ...props }: {
     [x: string]: any;
     keys: any;
     onSortEnd: any;
     virtual: any;
+    rowKey: any;
+    options: any;
+    tableWidth: any;
 }) => JSX.Element;
 export default DraggableContainer;

package/lib/LmEditTable/components/DraggableContainer.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _DndContainer = _interopRequireDefault(require("../DndContainer"));
+var _DndContainerRow = _interopRequireDefault(require("../rowSort/DndContainerRow"));
 
 var _sortableBox = _interopRequireDefault(require("../sortableBox"));
 
@@ -32,10 +32,17 @@ var DraggableContainer = function DraggableContainer(_a) {
   var keys = _a.keys,
       onSortEnd = _a.onSortEnd,
       virtual = _a.virtual,
-      props = __rest(_a, ["keys", "onSortEnd", "virtual"]);
-
-  return /*#__PURE__*/_react.default.createElement(_DndContainer.default, {
-    move: onSortEnd
+      rowKey = _a.rowKey,
+      options = _a.options,
+      tableWidth = _a.tableWidth,
+      props = __rest(_a, ["keys", "onSortEnd", "virtual", "rowKey", "options", "tableWidth"]);
+
+  return /*#__PURE__*/_react.default.createElement(_DndContainerRow.default, {
+    move: onSortEnd,
+    items: keys,
+    rowKey: rowKey,
+    options: options,
+    tableWidth: tableWidth
   }, /*#__PURE__*/_react.default.createElement(_sortableBox.default, {
     items: keys
   }, virtual ? /*#__PURE__*/_react.default.createElement(_virtual.VirtualWrapper, Object.assign({}, props)) : /*#__PURE__*/_react.default.createElement("tbody", Object.assign({}, props))));

package/lib/LmEditTable/components/index.d.ts

@@ -3,11 +3,14 @@ import BottomOpetateComponent from './bottomOpetateComponent';
 import QuickOpetate from './QuickOpetate';
 export { DraggableContainer, BottomOpetateComponent, QuickOpetate };
 declare const _default: {
-    DraggableContainer: ({ keys, onSortEnd, virtual, ...props }: {
+    DraggableContainer: ({ keys, onSortEnd, virtual, rowKey, options, tableWidth, ...props }: {
         [x: string]: any;
         keys: any;
         onSortEnd: any;
         virtual: any;
+        rowKey: any;
+        options: any;
+        tableWidth: any;
     }) => JSX.Element;
 };
 export default _default;

package/lib/LmEditTable/hooks/useForkRef.d.ts

@@ -0,0 +1,2 @@
+import { Ref } from 'react';
+export default function useForkRef<InstanceA, InstanceB>(refA: Ref<InstanceA> | null | undefined, refB: Ref<InstanceB> | null | undefined): Ref<InstanceA & InstanceB> | null;

package/lib/LmEditTable/hooks/useForkRef.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = useForkRef;
+
+var _react = require("react");
+
+function setRef(ref, value) {
+  if (typeof ref === 'function') {
+    ref(value);
+  } else if (ref) {
+    ref.current = value;
+  }
+}
+
+function useForkRef(refA, refB) {
+  return (0, _react.useMemo)(function () {
+    if (refA == null && refB == null) {
+      return null;
+    }
+
+    return function (refValue) {
+      setRef(refA, refValue);
+      setRef(refB, refValue);
+    };
+  }, [refA, refB]);
+}

package/lib/LmEditTable/rowSort/DndContainerRow.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+declare const _default: React.MemoExoticComponent<({ children, options, move, rowKey, items, tableWidth }: {
+    children: any;
+    options: any;
+    move: any;
+    rowKey: any;
+    items: any;
+    tableWidth: any;
+}) => JSX.Element>;
+export default _default;

package/lib/LmEditTable/rowSort/DndContainerRow.js

@@ -0,0 +1,99 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _core = require("@dnd-kit/core");
+
+var _modifiers = require("@dnd-kit/modifiers");
+
+var _sortable = require("@dnd-kit/sortable");
+
+// 可拖拽容器
+var DndContainer = function DndContainer(_ref) {
+  var children = _ref.children,
+      options = _ref.options,
+      move = _ref.move,
+      rowKey = _ref.rowKey,
+      items = _ref.items,
+      tableWidth = _ref.tableWidth;
+
+  var _React$useState = _react.default.useState(false),
+      _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
+      isDragging = _React$useState2[0],
+      setIsDragging = _React$useState2[1]; // 是否拖拽中
+
+
+  var _React$useState3 = _react.default.useState(null),
+      _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
+      activeId = _React$useState4[0],
+      setActiveId = _React$useState4[1]; // 是否拖拽中
+
+
+  var sensors = (0, _core.useSensors)((0, _core.useSensor)(_core.PointerSensor), (0, _core.useSensor)(_core.KeyboardSensor, {
+    coordinateGetter: _sortable.sortableKeyboardCoordinates
+  })); // 开始拖拽
+
+  var handleDragStart = function handleDragStart(_ref2) {
+    var active = _ref2.active;
+    setIsDragging(true);
+
+    if (!active) {
+      return;
+    }
+
+    setActiveId(active.id);
+  }; // 拖拽结束
+
+
+  var handleDragEnd = function handleDragEnd(event) {
+    var active = event.active,
+        over = event.over;
+    setActiveId(null); // 未移入时触发
+
+    if (!(over === null || over === void 0 ? void 0 : over.id)) {
+      return;
+    } // 移入时触发更新数据
+
+
+    if (active.id !== over.id) {
+      move(active.id, over.id);
+    }
+  };
+
+  var instance = {
+    isDragging: isDragging,
+    activeId: activeId,
+    options: options,
+    rowKey: rowKey,
+    children: children,
+    move: move,
+    items: items,
+    tableWidth: tableWidth
+  };
+  console.log('instance', instance);
+  return /*#__PURE__*/_react.default.createElement(_core.DndContext, {
+    sensors: sensors,
+    onDragStart: handleDragStart,
+    onDragCancel: function onDragCancel() {
+      return setActiveId(null);
+    },
+    collisionDetection: _core.closestCenter,
+    onDragEnd: handleDragEnd,
+    modifiers: [_modifiers.restrictToParentElement, _modifiers.restrictToVerticalAxis]
+  }, children);
+};
+
+var _default = /*#__PURE__*/(0, _react.memo)(DndContainer);
+
+exports.default = _default;

package/lib/LmEditTable/sortableItem.js

@@ -58,6 +58,7 @@ var SortableItem = function SortableItem(props) {
 
   return /*#__PURE__*/_react.default.createElement(_virtual.VirtualRow, Object.assign({}, resetField, {
     ref: setNodeRef,
+    pref: setNodeRef,
     key: key,
     style: style
   }, attributes), children);

package/lib/LmEditTable/style/index.css

@@ -560,6 +560,10 @@ p {
   flex-direction: row;
   flex-wrap: nowrap;
 }
+.lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append .ant-table-row-expand-icon {
+  margin-right: 8px;
+  flex: none;
+}
 .lm_editTable_warpper .lm_custom_cell_td > .ant-form-item {
   flex: 1 1 auto;
 }
@@ -676,3 +680,6 @@ p {
 .lm_table_append_add_popover .ant-popover-inner-content ul li:hover {
   background-color: var(--color-15);
 }
+.lm_edittable_col_sort_item {
+  overflow: hidden;
+}

package/lib/LmEditTable/style/variables.css

@@ -48,6 +48,10 @@
   flex-direction: row;
   flex-wrap: nowrap;
 }
+.lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append .ant-table-row-expand-icon {
+  margin-right: 8px;
+  flex: none;
+}
 .lm_editTable_warpper .lm_custom_cell_td > .ant-form-item {
   flex: 1 1 auto;
 }
@@ -164,3 +168,6 @@
 .lm_table_append_add_popover .ant-popover-inner-content ul li:hover {
   background-color: var(--color-15);
 }
+.lm_edittable_col_sort_item {
+  overflow: hidden;
+}

package/lib/LmEditTable/util.d.ts

@@ -4,6 +4,11 @@ export declare function isExpandRow(children: any): boolean;
 export declare function checkRowKeyByDataSource(dataSource: any, rowKey: any): any;
 export declare function getExpandStatus(children: any): any;
 export declare function checkMemoShouldUploadSpecialFun(prev: any, next: any): any;
+export declare function checkExpandIconColumnIndex({ rowSelection, sortOpen, indexCol }: {
+    rowSelection: any;
+    sortOpen: any;
+    indexCol: any;
+}): number;
 declare const _default: {
     isObjEmpty: typeof isObjEmpty;
 };

package/lib/LmEditTable/util.js

@@ -5,6 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.checkExpandIconColumnIndex = checkExpandIconColumnIndex;
 exports.checkMemoShouldUploadSpecialFun = checkMemoShouldUploadSpecialFun;
 exports.checkRowKeyByDataSource = checkRowKeyByDataSource;
 exports.deepDataSourcePreKeys = deepDataSourcePreKeys;
@@ -101,6 +102,10 @@ function checkMemoShouldUploadSpecialFun(prev, next) {
     return false;
   }
 
+  if (!(next === null || next === void 0 ? void 0 : next.quickOpetateClearAll) && ((next === null || next === void 0 ? void 0 : next.getLength) < 2 || (prev === null || prev === void 0 ? void 0 : prev.getLength) === 1) && (next === null || next === void 0 ? void 0 : next.dataIndex) === 'lm_edit_opetate') {
+    return false;
+  }
+
   if (prev.isEdit !== next.isEdit) {
     return false;
   } // console.log(22, prevCol?.editable === 'render', nextCol?.editable === 'render', prevCol?.componentProps, prevCol?.componentProps)
@@ -151,6 +156,16 @@ function checkMemoShouldUploadSpecialFun(prev, next) {
   return true;
 }
 
+function checkExpandIconColumnIndex(_ref) {
+  var rowSelection = _ref.rowSelection,
+      sortOpen = _ref.sortOpen,
+      indexCol = _ref.indexCol;
+  var arr = [rowSelection, sortOpen, indexCol].filter(function (item) {
+    return !!item;
+  });
+  return arr.length;
+}
+
 var _default = {
   isObjEmpty: isObjEmpty
 };

package/lib/LmEditTable/virtual/VirtualRow.d.ts

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

package/lib/LmEditTable/virtual/VirtualRow.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
 
 Object.defineProperty(exports, "__esModule", {
@@ -11,6 +13,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _context = require("./context");
 
+var _useForkRef = _interopRequireDefault(require("../hooks/useForkRef"));
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -26,7 +30,8 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 
 var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
   var children = _a.children,
-      resetProps = __rest(_a, ["children"]);
+      pref = _a.pref,
+      resetProps = __rest(_a, ["children", "pref"]);
 
   var _useStore = (0, _context.useStore)(),
       state = _useStore.state,
@@ -62,10 +67,10 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
       }
     };
 
-    initHeight(Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef);
+    initHeight(trRef);
   }, [trRef, dispatch, rowHeight, totalLen, ref]);
   return /*#__PURE__*/_react.default.createElement("tr", Object.assign({}, resetProps, {
-    ref: Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef
+    ref: (0, _useForkRef.default)(pref, trRef)
   }), children);
 });
 

package/lib/LmEditTable/virtual/VirtualRowBack.js

@@ -36,12 +36,16 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
   var rowHeight = state.rowHeight,
       totalLen = state.totalLen;
   var virtualItems = instance.columnVirtual.virtualItems;
-  var trRef = (0, _react.useRef)(null); // 列长度
+  var trRef = (0, _react.useRef)(null); // 非固定列长度
 
   var columnsLen = (0, _react.useMemo)(function () {
     var _a;
 
-    return (_a = children === null || children === void 0 ? void 0 : children.length) !== null && _a !== void 0 ? _a : 0;
+    return (_a = children === null || children === void 0 ? void 0 : children.filter(function (v) {
+      var _a, _b;
+
+      return typeof ((_a = v.props) === null || _a === void 0 ? void 0 : _a.fixLeft) !== 'number' && typeof ((_b = v.props) === null || _b === void 0 ? void 0 : _b.fixRight) !== 'number';
+    }).length) !== null && _a !== void 0 ? _a : 0;
   }, [children]);
   (0, _react.useEffect)(function () {
     if (state.columnsLen !== columnsLen) {
@@ -88,26 +92,20 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
       fixedRight: [],
       columns: []
     });
-  }, [children]); // 截取非固定列
-
-  var resetVirtualItems = (0, _react.useMemo)(function () {
-    var fixedLeft = fixedColumns.fixedLeft,
-        columns = fixedColumns.columns;
-    return virtualItems.slice(fixedLeft.length, fixedLeft.length + columns.length);
-  }, [fixedColumns, virtualItems]); // 横向单元格合并
+  }, [children]); // 横向单元格合并
 
   var colSpan = (0, _react.useMemo)(function () {
     var _a;
 
-    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 (_a = virtualItems[0]) === null || _a === void 0 ? void 0 : _a.index;
+  }, [virtualItems]);
+  console.log('virtualItems', virtualItems);
   return /*#__PURE__*/_react.default.createElement("tr", Object.assign({}, resetProps, {
     ref: Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef
   }), fixedColumns.fixedLeft, !!colSpan && /*#__PURE__*/_react.default.createElement("td", {
     colSpan: colSpan
-  }), resetVirtualItems.map(function (virtualCol) {
-    return children[virtualCol.index];
+  }), virtualItems.map(function (virtualCol) {
+    return fixedColumns.columns[virtualCol.index];
   }), fixedColumns.fixedRight);
 });
 

package/lib/LmFilter/filterFns/index.js

@@ -188,7 +188,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
           fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
           type: item.type,
           value: Array.isArray(itemValue) ? itemValue : [itemValue],
-          operator: obj[cur].mode === 'and' ? 'equal' : 'contains'
+          operator: (item === null || item === void 0 ? void 0 : item.operator) || obj[cur].mode === 'and' ? 'equal' : 'contains'
         }]);
       }
 

package/lib/LmTable/virTual/VirtualRow.js

@@ -36,12 +36,16 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
   var rowHeight = state.rowHeight,
       totalLen = state.totalLen;
   var virtualItems = instance.columnVirtual.virtualItems;
-  var trRef = (0, _react.useRef)(null); // 列长度
+  var trRef = (0, _react.useRef)(null); // 非固定列长度
 
   var columnsLen = (0, _react.useMemo)(function () {
     var _a;
 
-    return (_a = children === null || children === void 0 ? void 0 : children.length) !== null && _a !== void 0 ? _a : 0;
+    return (_a = children === null || children === void 0 ? void 0 : children.filter(function (v) {
+      var _a, _b;
+
+      return typeof ((_a = v.props) === null || _a === void 0 ? void 0 : _a.fixLeft) !== 'number' && typeof ((_b = v.props) === null || _b === void 0 ? void 0 : _b.fixRight) !== 'number';
+    }).length) !== null && _a !== void 0 ? _a : 0; // return children?.length ?? 0
   }, [children]);
   (0, _react.useEffect)(function () {
     if (state.columnsLen !== columnsLen) {
@@ -88,26 +92,20 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
       fixedRight: [],
       columns: []
     });
-  }, [children]); // 截取非固定列
-
-  var resetVirtualItems = (0, _react.useMemo)(function () {
-    var fixedLeft = fixedColumns.fixedLeft,
-        columns = fixedColumns.columns;
-    return virtualItems.slice(fixedLeft.length, fixedLeft.length + columns.length);
-  }, [fixedColumns, virtualItems]); // 横线单元格合并
+  }, [children]); // 横线单元格合并
 
   var colSpan = (0, _react.useMemo)(function () {
     var _a;
 
-    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 (_a = virtualItems[0]) === null || _a === void 0 ? void 0 : _a.index;
+  }, [virtualItems]);
+  console.log('virtualItems', virtualItems);
   return /*#__PURE__*/_react.default.createElement("tr", Object.assign({}, resetProps, {
     ref: Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef
   }), fixedColumns.fixedLeft, !!colSpan && /*#__PURE__*/_react.default.createElement("td", {
     colSpan: colSpan
-  }), resetVirtualItems.map(function (virtualCol) {
-    return children[virtualCol.index];
+  }), virtualItems.map(function (virtualCol) {
+    return fixedColumns.columns[virtualCol.index];
   }), fixedColumns.fixedRight);
 });
 

package/lib/styles/variables.css

@@ -9760,6 +9760,10 @@ p {
   flex-direction: row;
   flex-wrap: nowrap;
 }
+.lm_editTable_warpper .lm_custom_cell_td.ant-table-cell-with-append .ant-table-row-expand-icon {
+  margin-right: 8px;
+  flex: none;
+}
 .lm_editTable_warpper .lm_custom_cell_td > .ant-form-item {
   flex: 1 1 auto;
 }
@@ -9876,6 +9880,9 @@ p {
 .lm_table_append_add_popover .ant-popover-inner-content ul li:hover {
   background-color: var(--color-15);
 }
+.lm_edittable_col_sort_item {
+  overflow: hidden;
+}
 .lm_filter_wrapper .lm_filter_container .lm_filter {
   display: flex;
   flex-wrap: wrap;

package/package.json

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