linkmore-design 1.1.26 → 1.1.27-alpha.0

package/es/LmEditTable/util.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { keyBy } from 'lodash';
+import { keyBy, isEqual, pick, isFunction, omit } from 'lodash';
 export function isObjEmpty(obj) {
   var _a;
 
@@ -9,19 +9,20 @@ export function isObjEmpty(obj) {
 export function deepDataSourcePreKeys(dataSource, rowKey) {
   var deepDataSource = [];
 
-  var eachChildren = function eachChildren(children, preKeys) {
-    children === null || children === void 0 ? void 0 : children.forEach(function (item) {
+  var eachChildren = function eachChildren(children, preKeys, deepIds) {
+    children === null || children === void 0 ? void 0 : children.forEach(function (item, index) {
       deepDataSource.push(Object.assign(Object.assign({}, item), {
-        preKeys: [].concat(_toConsumableArray(preKeys), [item === null || item === void 0 ? void 0 : item[rowKey]])
+        preKeys: [].concat(_toConsumableArray(preKeys), [item === null || item === void 0 ? void 0 : item[rowKey]]),
+        _deepIds: [].concat(_toConsumableArray(deepIds), [index + 1])
       }));
 
       if (item === null || item === void 0 ? void 0 : item.children) {
-        eachChildren(item === null || item === void 0 ? void 0 : item.children, [].concat(_toConsumableArray(preKeys), [item === null || item === void 0 ? void 0 : item[rowKey]])); // deepDataSource.push({ ...item, preKeys: [...preKeys, item[rowKey]] })
+        eachChildren(item === null || item === void 0 ? void 0 : item.children, [].concat(_toConsumableArray(preKeys), [item === null || item === void 0 ? void 0 : item[rowKey]]), [].concat(_toConsumableArray(deepIds), [index + 1])); // deepDataSource.push({ ...item, preKeys: [...preKeys, item[rowKey]] })
       }
     });
   };
 
-  eachChildren(dataSource, []);
+  eachChildren(dataSource, [], []);
   return keyBy(deepDataSource, rowKey);
 }
 export function isExpandRow(children) {
@@ -53,7 +54,91 @@ export function checkRowKeyByDataSource(dataSource, rowKey) {
 
     return Object.assign(Object.assign({}, v), _defineProperty({}, rowKey, v[rowKey] || "v".concat(idx + 1)));
   });
-  return res;
+  return res || [];
+}
+export function getExpandStatus(children) {
+  var _a, _b, _c, _d, _e;
+
+  return isExpandRow(children) ? (_e = (_d = (_c = (_b = (_a = children === null || children === void 0 ? void 0 : children[0]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.children) === null || _c === void 0 ? void 0 : _c[1]) === null || _d === void 0 ? void 0 : _d.props) === null || _e === void 0 ? void 0 : _e['aria-label'] : '';
+}
+export function checkMemoShouldUploadSpecialFun(prev, next) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+
+  var checkExpandStatus = getExpandStatus(prev.children) === getExpandStatus(next.children);
+
+  if (!checkExpandStatus) {
+    return false;
+  }
+
+  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.render) || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.render)) && !isEqual(pick(prev, ['colIndex', 'record', 'children']), pick(next, ['colIndex', 'record', 'children']))) {
+    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)
+
+
+  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)) && (!isEqual(omit(prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps, ['render']), omit(nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps, ['render'])) || !isEqual(pick(prev, ['colIndex', 'record', 'rowIndex']), 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)) && !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)) && !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 false;
+  }
+
+  if ((((_g = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _g === void 0 ? void 0 : _g.options) || ((_h = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _h === void 0 ? void 0 : _h.options)) && !isEqual((_j = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _j === void 0 ? void 0 : _j.options, (_k = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _k === void 0 ? void 0 : _k.options)) {
+    return false;
+  }
+
+  if ((isFunction(prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) || isFunction(nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps)) && !isEqual(prevCol.newOptions, nextCol.newOptions) && !isEqual(prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps, nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps)) {
+    return false;
+  }
+
+  if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.order) || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.order)) && !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('drag-visible') > -1) {
+    return isEqual(prev.style, next.style);
+  }
+
+  if (next.className.indexOf('ant-table-selection-column') > -1) {
+    return isEqual((_m = (_l = prev.children) === null || _l === void 0 ? void 0 : _l[1]) === null || _m === void 0 ? void 0 : _m.props, (_p = (_o = next.children) === null || _o === void 0 ? void 0 : _o[1]) === null || _p === void 0 ? void 0 : _p.props);
+  }
+  /** 如果启用了快速复制功能，需要实时判断rowIndex与getLength */
+
+
+  if (((_q = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _q === void 0 ? void 0 : _q.quickcopy) || ((_r = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _r === void 0 ? void 0 : _r.quickcopy)) {
+    var pickProps = ['record', 'colIndex', 'rowIndex', 'getLength'];
+    var p = pick(prev, pickProps);
+    var n = pick(next, pickProps);
+    return isEqual(p, n);
+  }
+
+  return true;
+}
+export 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;
 }
 export default {
   isObjEmpty: isObjEmpty

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

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

package/es/LmEditTable/virtual/VirtualRow.js

@@ -0,0 +1,62 @@
+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, { useRef, useMemo, useEffect } from 'react';
+import { useStore } from './context';
+import useForkRef from '../hooks/useForkRef';
+var VirtualRow = /*#__PURE__*/React.memo(function (_a, ref) {
+  var children = _a.children,
+      pref = _a.pref,
+      resetProps = __rest(_a, ["children", "pref"]);
+
+  var _useStore = useStore(),
+      state = _useStore.state,
+      dispatch = _useStore.dispatch;
+
+  var rowHeight = state.rowHeight,
+      totalLen = state.totalLen;
+  var trRef = useRef(null); // 列长度
+
+  var columnsLen = useMemo(function () {
+    var _a;
+
+    return (_a = children === null || children === void 0 ? void 0 : children.length) !== null && _a !== void 0 ? _a : 0;
+  }, [children]);
+  useEffect(function () {
+    if (state.columnsLen !== columnsLen) {
+      dispatch({
+        type: 'changeColumnsLen',
+        columnsLen: columnsLen !== null && columnsLen !== void 0 ? columnsLen : 0
+      });
+    }
+  }, [columnsLen, dispatch, state.columnsLen]);
+  useEffect(function () {
+    var initHeight = function initHeight(tempRef) {
+      var _a, _b, _c;
+
+      if (((_a = tempRef === null || tempRef === void 0 ? void 0 : tempRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight) && !rowHeight && totalLen) {
+        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
+        });
+      }
+    };
+
+    initHeight(trRef);
+  }, [trRef, dispatch, rowHeight, totalLen, ref]);
+  return /*#__PURE__*/React.createElement("tr", Object.assign({}, resetProps, {
+    ref: useForkRef(pref, trRef)
+  }), children);
+});
+export default VirtualRow;

package/es/LmEditTable/virtual/VirtualRowBack.d.ts

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

package/es/LmEditTable/virtual/VirtualRowBack.js

@@ -0,0 +1,100 @@
+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, { 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 _useStore = useStore(),
+      state = _useStore.state,
+      dispatch = _useStore.dispatch,
+      instance = _useStore.instance;
+
+  var rowHeight = state.rowHeight,
+      totalLen = state.totalLen;
+  var virtualItems = instance.columnVirtual.virtualItems;
+  var trRef = useRef(null); // 非固定列长度
+
+  var columnsLen = useMemo(function () {
+    var _a;
+
+    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]);
+  useEffect(function () {
+    if (state.columnsLen !== columnsLen) {
+      dispatch({
+        type: 'changeColumnsLen',
+        columnsLen: columnsLen !== null && columnsLen !== void 0 ? columnsLen : 0
+      });
+    }
+  }, [columnsLen, dispatch, state.columnsLen]);
+  useEffect(function () {
+    var initHeight = function initHeight(tempRef) {
+      var _a, _b, _c;
+
+      if (((_a = tempRef === null || tempRef === void 0 ? void 0 : tempRef.current) === null || _a === void 0 ? void 0 : _a.offsetHeight) && !rowHeight && totalLen) {
+        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
+        });
+      }
+    };
+
+    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;
+
+      if (typeof ((_a = cur.props) === null || _a === void 0 ? void 0 : _a.fixLeft) === 'number') {
+        pre.fixedLeft.push(cur);
+        return pre;
+      }
+
+      if (typeof ((_b = cur.props) === null || _b === void 0 ? void 0 : _b.fixRight) === 'number') {
+        pre.fixedRight.push(cur);
+        return pre;
+      }
+
+      pre.columns.push(cur);
+      return pre;
+    }, {
+      fixedLeft: [],
+      fixedRight: [],
+      columns: []
+    });
+  }, [children]); // 横向单元格合并
+
+  var colSpan = useMemo(function () {
+    var _a;
+
+    return (_a = virtualItems[0]) === null || _a === void 0 ? void 0 : _a.index;
+  }, [virtualItems]);
+  console.log('virtualItems', virtualItems);
+  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
+  }), virtualItems.map(function (virtualCol) {
+    return fixedColumns.columns[virtualCol.index];
+  }), fixedColumns.fixedRight);
+});
+export default VirtualRow;

package/es/LmEditTable/virtual/VirtualTable.d.ts

@@ -0,0 +1,3 @@
+import React, { PropsWithChildren } from 'react';
+declare const VirtualTable: React.MemoExoticComponent<(tableProps: PropsWithChildren<any>) => JSX.Element>;
+export default VirtualTable;

package/es/LmEditTable/virtual/VirtualTable.js

@@ -0,0 +1,54 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useRef } from 'react';
+import { useVirtual } from 'react-virtual';
+import { TableContext, useRealive } from './context';
+var VirtualTable = /*#__PURE__*/React.memo(function (tableProps) {
+  var _a, _b, _c, _d;
+
+  var bodyRef = useRef(null);
+
+  var _useRealive = useRealive(),
+      _useRealive2 = _slicedToArray(_useRealive, 2),
+      state = _useRealive2[0],
+      dispatch = _useRealive2[1]; // { totalSize, virtualItems }
+
+
+  var rowVirtual = useVirtual({
+    size: state.totalLen,
+    // 绑定父节点
+    parentRef: {
+      current: (_a = bodyRef === null || bodyRef === void 0 ? void 0 : bodyRef.current) === null || _a === void 0 ? void 0 : _a.parentNode
+    },
+    estimateSize: React.useCallback(function () {
+      return state.rowHeight;
+    }, [state.rowHeight]),
+    overscan: 5
+  });
+  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
+    },
+    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]),
+    overscan: 5
+  });
+  var instance = {
+    rowVirtual: rowVirtual,
+    columnVirtual: columnVirtual
+  };
+  return /*#__PURE__*/React.createElement(TableContext.Provider, {
+    value: {
+      state: state,
+      dispatch: dispatch,
+      instance: instance
+    }
+  }, /*#__PURE__*/React.createElement("table", Object.assign({
+    ref: bodyRef
+  }, tableProps)));
+});
+export default VirtualTable;

package/es/LmEditTable/virtual/VirtualWrapper.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const VirtualWrapper: React.MemoExoticComponent<(wrapperProps: React.PropsWithChildren<any>) => JSX.Element>;
+export default VirtualWrapper;

package/es/LmEditTable/virtual/VirtualWrapper.js

@@ -0,0 +1,60 @@
+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, { useEffect, useMemo } from 'react';
+import { useStore } from './context';
+var VirtualWrapper = /*#__PURE__*/React.memo(function (wrapperProps) {
+  var _a, _b;
+
+  var children = wrapperProps.children,
+      resetProps = __rest(wrapperProps, ["children"]);
+
+  var _useStore = useStore(),
+      state = _useStore.state,
+      dispatch = _useStore.dispatch,
+      instance = _useStore.instance;
+
+  var _instance$rowVirtual = instance.rowVirtual,
+      virtualItems = _instance$rowVirtual.virtualItems,
+      totalSize = _instance$rowVirtual.totalSize;
+  var contents = useMemo(function () {
+    return children[1];
+  }, [children]);
+  var contentsLen = useMemo(function () {
+    var _a;
+
+    return (_a = contents === null || contents === void 0 ? void 0 : contents.length) !== null && _a !== void 0 ? _a : 0;
+  }, [contents]);
+  useEffect(function () {
+    if (state.totalLen !== contentsLen) {
+      dispatch({
+        type: 'changeTotalLen',
+        totalLen: contentsLen !== null && contentsLen !== void 0 ? contentsLen : 0
+      });
+    }
+  }, [contentsLen, dispatch, state.totalLen]);
+  var paddingTop = virtualItems.length > 0 ? ((_a = virtualItems === null || virtualItems === void 0 ? void 0 : virtualItems[0]) === null || _a === void 0 ? void 0 : _a.start) || 0 : 0;
+  var paddingBottom = virtualItems.length > 0 ? totalSize - (((_b = virtualItems === null || virtualItems === void 0 ? void 0 : virtualItems[virtualItems.length - 1]) === null || _b === void 0 ? void 0 : _b.end) || 0) : 0;
+  return /*#__PURE__*/React.createElement("tbody", Object.assign({}, resetProps), paddingTop > 0 && /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", {
+    style: {
+      height: "".concat(paddingTop, "px")
+    }
+  })), children[0], virtualItems.map(function (virtualRow) {
+    return contents[virtualRow.index];
+  }), paddingBottom > 0 && /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", {
+    style: {
+      height: "".concat(paddingBottom, "px")
+    }
+  })));
+});
+export default VirtualWrapper;

package/es/LmEditTable/virtual/context.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+declare const TableContext: import("react").Context<{
+    state: any;
+    dispatch: any;
+    instance: any;
+}>;
+declare const useStore: () => {
+    state: any;
+    dispatch: any;
+    instance: any;
+};
+declare const useRealive: () => [any, import("react").Dispatch<any>];
+export { TableContext, useStore, useRealive };

package/es/LmEditTable/virtual/context.js

@@ -0,0 +1,54 @@
+import { createContext, useContext, useReducer } from 'react'; // =============== context ============== //
+
+var TableContext = /*#__PURE__*/createContext({
+  state: null,
+  dispatch: null,
+  instance: {}
+});
+
+var useStore = function useStore() {
+  return useContext(TableContext);
+};
+
+var initialState = {
+  // 行高度
+  rowHeight: 0,
+  columnsLen: 0,
+  // 总行数
+  totalLen: 0
+};
+
+var reducer = function reducer(state, action) {
+  var totalLen = action.totalLen,
+      columnsLen = action.columnsLen,
+      rowHeight = action.rowHeight;
+
+  switch (action.type) {
+    // 数据数量
+    case 'changeTotalLen':
+      return Object.assign(Object.assign({}, state), {
+        totalLen: totalLen
+      });
+    // 列数量
+
+    case 'changeColumnsLen':
+      return Object.assign(Object.assign({}, state), {
+        columnsLen: columnsLen
+      });
+    // 初始化行高度
+
+    case 'initHeight':
+      return Object.assign(Object.assign({}, state), {
+        rowHeight: rowHeight
+      });
+
+    default:
+      throw new Error();
+  }
+};
+
+var useRealive = function useRealive() {
+  return useReducer(reducer, initialState);
+};
+
+export { TableContext, useStore, useRealive };

package/es/LmEditTable/virtual/index.d.ts

@@ -0,0 +1,4 @@
+import VirtualTable from './VirtualTable';
+import VirtualWrapper from './VirtualWrapper';
+import VirtualRow from './VirtualRow';
+export { VirtualTable, VirtualWrapper, VirtualRow };

package/es/LmEditTable/virtual/index.js

@@ -0,0 +1,4 @@
+import VirtualTable from './VirtualTable';
+import VirtualWrapper from './VirtualWrapper';
+import VirtualRow from './VirtualRow';
+export { VirtualTable, VirtualWrapper, VirtualRow };

package/es/LmFilter/filterFns/index.js

@@ -172,7 +172,12 @@ 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: (item === null || item === void 0 ? void 0 : item.operator) || obj[cur].mode === 'and' ? 'equal' : 'contains'
+
+          /**
+           * and 等同于逻辑关系contains: 选中的值包含所有值
+           * or 等同于逻辑关系in: 选中的值存在于所有值之中
+           */
+          operator: obj[cur].mode === 'and' ? 'contains' : 'in'
         }]);
       }
 
@@ -343,7 +348,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: complexFilter[cur].mode === 'and' ? 'equal' : 'contains'
+            operator: complexFilter[cur].mode === 'and' ? 'contains' : 'in'
           };
         }
 

package/es/LmTable/virTual/VirtualRow.js

@@ -25,12 +25,16 @@ var VirtualRow = /*#__PURE__*/React.memo(function (_a, ref) {
   var rowHeight = state.rowHeight,
       totalLen = state.totalLen;
   var virtualItems = instance.columnVirtual.virtualItems;
-  var trRef = useRef(null); // 列长度
+  var trRef = useRef(null); // 非固定列长度
 
   var columnsLen = 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]);
   useEffect(function () {
     if (state.columnsLen !== columnsLen) {
@@ -77,26 +81,20 @@ var VirtualRow = /*#__PURE__*/React.memo(function (_a, ref) {
       fixedRight: [],
       columns: []
     });
-  }, [children]); // 截取非固定列
-
-  var resetVirtualItems = useMemo(function () {
-    var fixedLeft = fixedColumns.fixedLeft,
-        columns = fixedColumns.columns;
-    return virtualItems.slice(fixedLeft.length, fixedLeft.length + columns.length);
-  }, [fixedColumns, virtualItems]); // 横线单元格合并
+  }, [children]); // 横线单元格合并
 
   var colSpan = 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.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];
+  }), virtualItems.map(function (virtualCol) {
+    return fixedColumns.columns[virtualCol.index];
   }), fixedColumns.fixedRight);
 });
 export default VirtualRow;

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';