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

package/lib/LmEditTable/virtual/VirtualRow.js

@@ -28,32 +28,62 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
-var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
-  var children = _a.children,
-      pref = _a.pref,
-      resetProps = __rest(_a, ["children", "pref"]);
+var useOptions = function useOptions(_ref) {
+  var children = _ref.children,
+      ref = _ref.ref,
+      trRef = _ref.trRef;
 
   var _useStore = (0, _context.useStore)(),
       state = _useStore.state,
-      dispatch = _useStore.dispatch;
+      dispatch = _useStore.dispatch,
+      instance = _useStore.instance;
 
+  var virtualItems = instance.columnVirtual.virtualItems;
   var rowHeight = state.rowHeight,
       totalLen = state.totalLen;
-  var trRef = (0, _react.useRef)(null); // 列长度
+  var sliceColumns = (0, _react.useMemo)(function () {
+    return children === null || children === void 0 ? void 0 : children.reduce(function (pre, cur) {
+      var _a, _b;
 
-  var columnsLen = (0, _react.useMemo)(function () {
-    var _a;
+      if (typeof ((_a = cur.props) === null || _a === void 0 ? void 0 : _a.fixLeft) === 'number') {
+        pre.leftColumns.push(cur);
+        return pre;
+      }
 
-    return (_a = children === null || children === void 0 ? void 0 : children.length) !== null && _a !== void 0 ? _a : 0;
+      if (typeof ((_b = cur.props) === null || _b === void 0 ? void 0 : _b.fixRight) === 'number') {
+        pre.rightColumns.push(cur);
+        return pre;
+      }
+
+      pre.centerColumns.push(cur);
+      return pre;
+    }, {
+      leftColumns: [],
+      rightColumns: [],
+      centerColumns: []
+    });
   }, [children]);
   (0, _react.useEffect)(function () {
-    if (state.columnsLen !== columnsLen) {
+    dispatch({
+      type: 'changeSliceColumns',
+      sliceColumns: sliceColumns
+    });
+  }, [sliceColumns]); // 非固定列长度
+
+  var centerColumnsLen = (0, _react.useMemo)(function () {
+    var _a;
+
+    return (_a = sliceColumns.centerColumns.length) !== null && _a !== void 0 ? _a : 0;
+  }, [sliceColumns]);
+  (0, _react.useEffect)(function () {
+    if (state.columnsLen !== centerColumnsLen) {
       dispatch({
         type: 'changeColumnsLen',
-        columnsLen: columnsLen !== null && columnsLen !== void 0 ? columnsLen : 0
+        columnsLen: centerColumnsLen !== null && centerColumnsLen !== void 0 ? centerColumnsLen : 0
       });
     }
-  }, [columnsLen, dispatch, state.columnsLen]);
+  }, [centerColumnsLen, dispatch, state.columnsLen]); // 获取行的高度
+
   (0, _react.useEffect)(function () {
     var initHeight = function initHeight(tempRef) {
       var _a, _b, _c;
@@ -62,16 +92,63 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
         var tempRowHeight = (_c = (_b = tempRef === null || tempRef === void 0 ? void 0 : tempRef.current) === null || _b === void 0 ? void 0 : _b.offsetHeight) !== null && _c !== void 0 ? _c : 0;
         dispatch({
           type: 'initHeight',
-          rowHeight: tempRowHeight
+          rowHeight: tempRowHeight + 1
         });
       }
     };
 
-    initHeight(trRef);
-  }, [trRef, dispatch, rowHeight, totalLen, ref]);
+    initHeight(Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef);
+  }, [trRef, dispatch, rowHeight, totalLen, ref]); // 横向单元格合并
+
+  var leftColSpan = (0, _react.useMemo)(function () {
+    var _a;
+
+    return (_a = virtualItems[0]) === null || _a === void 0 ? void 0 : _a.index;
+  }, [virtualItems]); // 右侧隐藏数量
+
+  var rightColSpan = (0, _react.useMemo)(function () {
+    return sliceColumns.centerColumns.length - virtualItems.length - leftColSpan || 0;
+  }, [sliceColumns.centerColumns.length, virtualItems.length, leftColSpan]);
+  return Object.assign(Object.assign({
+    virtualItems: virtualItems
+  }, sliceColumns), {
+    leftColSpan: leftColSpan,
+    rightColSpan: rightColSpan
+  });
+};
+
+var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
+  var children = _a.children,
+      pref = _a.pref,
+      resetProps = __rest(_a, ["children", "pref"]);
+
+  var trRef = (0, _react.useRef)(null);
+
+  var _useOptions = useOptions({
+    children: children,
+    ref: ref,
+    trRef: trRef
+  }),
+      virtualItems = _useOptions.virtualItems,
+      leftColumns = _useOptions.leftColumns,
+      centerColumns = _useOptions.centerColumns,
+      rightColumns = _useOptions.rightColumns,
+      leftColSpan = _useOptions.leftColSpan,
+      rightColSpan = _useOptions.rightColSpan;
+
   return /*#__PURE__*/_react.default.createElement("tr", Object.assign({}, resetProps, {
     ref: (0, _useForkRef.default)(pref, trRef)
-  }), children);
+  }), leftColumns, !!leftColSpan && /*#__PURE__*/_react.default.createElement("td", {
+    key: "leftColSpan",
+    colSpan: leftColSpan
+  }), virtualItems.map(function (virtualCol) {
+    return /*#__PURE__*/_react.default.cloneElement(centerColumns[virtualCol.index], {
+      ref: virtualCol.measureRef
+    });
+  }), !!rightColSpan && /*#__PURE__*/_react.default.createElement("td", {
+    key: "rightColSpan",
+    colSpan: rightColSpan
+  }), rightColumns);
 });
 
 var _default = VirtualRow;

package/{es/LmEditTable/virtual/VirtualRowBack.d.ts → lib/LmEditTable/virtual/VirtualRow2.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/{VirtualRowBack.js → VirtualRow2.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,26 +30,21 @@ 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,
-      dispatch = _useStore.dispatch,
-      instance = _useStore.instance;
+      dispatch = _useStore.dispatch;
 
   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.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 (_a = children === null || children === void 0 ? void 0 : children.length) !== null && _a !== void 0 ? _a : 0;
   }, [children]);
   (0, _react.useEffect)(function () {
     if (state.columnsLen !== columnsLen) {
@@ -68,45 +67,11 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
       }
     };
 
-    initHeight(Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef);
-  }, [trRef, dispatch, rowHeight, totalLen, ref]); // return {fixedLeft: [], fixedRight: [], columns: []}
-
-  var fixedColumns = (0, _react.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 = (0, _react.useMemo)(function () {
-    var _a;
-
-    return (_a = virtualItems[0]) === null || _a === void 0 ? void 0 : _a.index;
-  }, [virtualItems]);
-  console.log('virtualItems', virtualItems);
+    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
-  }), fixedColumns.fixedLeft, !!colSpan && /*#__PURE__*/_react.default.createElement("td", {
-    colSpan: colSpan
-  }), virtualItems.map(function (virtualCol) {
-    return fixedColumns.columns[virtualCol.index];
-  }), fixedColumns.fixedRight);
+    ref: (0, _useForkRef.default)(pref, trRef)
+  }), children);
 });
 
 var _default = VirtualRow;

package/lib/LmEditTable/virtual/VirtualTable.js

@@ -25,7 +25,7 @@ var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
   var _useRealive = (0, _context.useRealive)(),
       _useRealive2 = (0, _slicedToArray2.default)(_useRealive, 2),
       state = _useRealive2[0],
-      dispatch = _useRealive2[1]; // { totalSize, virtualItems }
+      dispatch = _useRealive2[1]; // 行虚拟化 { totalSize, virtualItems }
 
 
   var rowVirtual = (0, _reactVirtual.useVirtual)({
@@ -38,18 +38,26 @@ var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
       return state.rowHeight;
     }, [state.rowHeight]),
     overscan: 5
-  });
+  }); // 列动态宽度
+
+  var columnEstimateSize = (0, _react.useCallback)(function (i) {
+    var _a, _b;
+
+    var colWidths = (_b = (_a = tableProps === null || tableProps === void 0 ? void 0 : tableProps.children[0]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.colWidths;
+    var leftColumnsLen = state.sliceColumns.leftColumns.length;
+    var centerColumnsLen = state.sliceColumns.centerColumns.length; // 获取非固定列
+
+    var virList = colWidths.slice(leftColumnsLen, leftColumnsLen + centerColumnsLen);
+    return virList[i] || 0;
+  }, [(_c = (_b = tableProps.children[0]) === null || _b === void 0 ? void 0 : _b.props) === null || _c === void 0 ? void 0 : _c.colWidths, state.sliceColumns.leftColumns.length, state.sliceColumns.centerColumns.length]); // 列虚拟化
+
   var columnVirtual = (0, _reactVirtual.useVirtual)({
     horizontal: true,
     size: state.columnsLen,
     parentRef: {
-      current: (_b = bodyRef === null || bodyRef === void 0 ? void 0 : bodyRef.current) === null || _b === void 0 ? void 0 : _b.parentNode
+      current: (_d = bodyRef === null || bodyRef === void 0 ? void 0 : bodyRef.current) === null || _d === void 0 ? void 0 : _d.parentNode
     },
-    estimateSize: _react.default.useCallback(function (i) {
-      var _a, _b;
-
-      return (_b = (_a = tableProps === null || tableProps === void 0 ? void 0 : tableProps.children[0]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.colWidths[i];
-    }, [(_d = (_c = tableProps.children[0]) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.colWidths]),
+    estimateSize: columnEstimateSize,
     overscan: 5
   });
   var instance = {

package/lib/LmEditTable/virtual/context.js

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

package/lib/LmFilter/baseFilter/index.js

@@ -16,8 +16,9 @@ var _components = _interopRequireDefault(require("../components"));
 // 二级过滤 => 基础过滤组件
 var LmFilterBase = /*#__PURE__*/_react.default.memo(function (_ref) {
   var instance = _ref.instance;
-  var dataSource = instance.dataSource;
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_fuzzySearch.default, {
+  var dataSource = instance.dataSource,
+      enableSearch = instance.enableSearch;
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, enableSearch && /*#__PURE__*/_react.default.createElement(_fuzzySearch.default, {
     instance: instance
   }), dataSource.map(function (v, index) {
     var isHidden = !v.show && typeof v.show === 'boolean';

package/lib/LmFilter/filterFns/index.js

@@ -184,6 +184,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
 
       if ((0, _utils.getIsHas)(itemValue) && !!item) {
         return [].concat((0, _toConsumableArray2.default)(pre), [{
+          relation: obj[cur].mode || 'and',
           fieldName: cur,
           fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
           type: item.type,
@@ -193,7 +194,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
            * and 等同于逻辑关系contains: 选中的值包含所有值
            * or 等同于逻辑关系in: 选中的值存在于所有值之中
            */
-          operator: obj[cur].mode === 'and' ? 'contains' : 'in'
+          operator: 'in'
         }]);
       }
 
@@ -360,11 +361,12 @@ var useCoreOptions = function useCoreOptions(_ref) {
         if ((0, _utils.getIsHas)(itemValue) && !!item) {
           // eslint-disable-next-line no-param-reassign
           pre[cur] = {
+            relation: complexFilter[cur].mode || 'and',
             fieldName: cur,
             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' ? 'contains' : 'in'
+            operator: 'in'
           };
         }
 

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

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

package/lib/LmTable/virTual/VirtualRow.js

@@ -24,37 +24,62 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
-var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
-  var children = _a.children,
-      resetProps = __rest(_a, ["children"]);
+var useOptions = function useOptions(_ref) {
+  var children = _ref.children,
+      ref = _ref.ref,
+      trRef = _ref.trRef;
 
   var _useStore = (0, _context.useStore)(),
       state = _useStore.state,
       dispatch = _useStore.dispatch,
       instance = _useStore.instance;
 
+  var virtualItems = instance.columnVirtual.virtualItems;
   var rowHeight = state.rowHeight,
       totalLen = state.totalLen;
-  var virtualItems = instance.columnVirtual.virtualItems;
-  var trRef = (0, _react.useRef)(null); // 非固定列长度
+  var sliceColumns = (0, _react.useMemo)(function () {
+    return children === null || children === void 0 ? void 0 : children.reduce(function (pre, cur) {
+      var _a, _b;
 
-  var columnsLen = (0, _react.useMemo)(function () {
-    var _a;
+      if (typeof ((_a = cur.props) === null || _a === void 0 ? void 0 : _a.fixLeft) === 'number') {
+        pre.leftColumns.push(cur);
+        return pre;
+      }
 
-    return (_a = children === null || children === void 0 ? void 0 : children.filter(function (v) {
-      var _a, _b;
+      if (typeof ((_b = cur.props) === null || _b === void 0 ? void 0 : _b.fixRight) === 'number') {
+        pre.rightColumns.push(cur);
+        return pre;
+      }
 
-      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
+      pre.centerColumns.push(cur);
+      return pre;
+    }, {
+      leftColumns: [],
+      rightColumns: [],
+      centerColumns: []
+    });
   }, [children]);
   (0, _react.useEffect)(function () {
-    if (state.columnsLen !== columnsLen) {
+    dispatch({
+      type: 'changeSliceColumns',
+      sliceColumns: sliceColumns
+    });
+  }, [sliceColumns]); // 非固定列长度
+
+  var centerColumnsLen = (0, _react.useMemo)(function () {
+    var _a;
+
+    return (_a = sliceColumns.centerColumns.length) !== null && _a !== void 0 ? _a : 0;
+  }, [sliceColumns]);
+  (0, _react.useEffect)(function () {
+    if (state.columnsLen !== centerColumnsLen) {
       dispatch({
         type: 'changeColumnsLen',
-        columnsLen: columnsLen !== null && columnsLen !== void 0 ? columnsLen : 0
+        columnsLen: centerColumnsLen !== null && centerColumnsLen !== void 0 ? centerColumnsLen : 0
       });
     }
-  }, [columnsLen, dispatch, state.columnsLen]);
+  }, [centerColumnsLen, dispatch, state.columnsLen]); // 获取行的高度
+
   (0, _react.useEffect)(function () {
     var initHeight = function initHeight(tempRef) {
       var _a, _b, _c;
@@ -63,50 +88,60 @@ var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
         var tempRowHeight = (_c = (_b = tempRef === null || tempRef === void 0 ? void 0 : tempRef.current) === null || _b === void 0 ? void 0 : _b.offsetHeight) !== null && _c !== void 0 ? _c : 0;
         dispatch({
           type: 'initHeight',
-          rowHeight: tempRowHeight
+          rowHeight: tempRowHeight + 1
         });
       }
     };
 
     initHeight(Object.prototype.hasOwnProperty.call(ref, 'current') ? ref : trRef);
-  }, [trRef, dispatch, rowHeight, totalLen, ref]); // return {fixedLeft: [], fixedRight: [], columns: []}
+  }, [trRef, dispatch, rowHeight, totalLen, ref]); // 横向单元格合并
 
-  var fixedColumns = (0, _react.useMemo)(function () {
-    return children === null || children === void 0 ? void 0 : children.reduce(function (pre, cur) {
-      var _a, _b;
+  var leftColSpan = (0, _react.useMemo)(function () {
+    var _a;
 
-      if (typeof ((_a = cur.props) === null || _a === void 0 ? void 0 : _a.fixLeft) === 'number') {
-        pre.fixedLeft.push(cur);
-        return pre;
-      }
+    return (_a = virtualItems[0]) === null || _a === void 0 ? void 0 : _a.index;
+  }, [virtualItems]); // 右侧隐藏数量
+
+  var rightColSpan = (0, _react.useMemo)(function () {
+    return sliceColumns.centerColumns.length - virtualItems.length - leftColSpan || 0;
+  }, [sliceColumns.centerColumns.length, virtualItems.length, leftColSpan]);
+  return Object.assign(Object.assign({
+    virtualItems: virtualItems
+  }, sliceColumns), {
+    leftColSpan: leftColSpan,
+    rightColSpan: rightColSpan
+  });
+};
 
-      if (typeof ((_b = cur.props) === null || _b === void 0 ? void 0 : _b.fixRight) === 'number') {
-        pre.fixedRight.push(cur);
-        return pre;
-      }
+var VirtualRow = /*#__PURE__*/_react.default.memo(function (_a, ref) {
+  var children = _a.children,
+      resetProps = __rest(_a, ["children"]);
 
-      pre.columns.push(cur);
-      return pre;
-    }, {
-      fixedLeft: [],
-      fixedRight: [],
-      columns: []
-    });
-  }, [children]); // 横线单元格合并
+  var trRef = (0, _react.useRef)(null);
 
-  var colSpan = (0, _react.useMemo)(function () {
-    var _a;
+  var _useOptions = useOptions({
+    children: children,
+    ref: ref,
+    trRef: trRef
+  }),
+      virtualItems = _useOptions.virtualItems,
+      leftColumns = _useOptions.leftColumns,
+      centerColumns = _useOptions.centerColumns,
+      rightColumns = _useOptions.rightColumns,
+      leftColSpan = _useOptions.leftColSpan,
+      rightColSpan = _useOptions.rightColSpan;
 
-    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
+  }), leftColumns, !!leftColSpan && /*#__PURE__*/_react.default.createElement("td", {
+    key: "leftColSpan",
+    colSpan: leftColSpan
   }), virtualItems.map(function (virtualCol) {
-    return fixedColumns.columns[virtualCol.index];
-  }), fixedColumns.fixedRight);
+    return centerColumns[virtualCol.index];
+  }), !!rightColSpan && /*#__PURE__*/_react.default.createElement("td", {
+    key: "rightColSpan",
+    colSpan: rightColSpan
+  }), rightColumns);
 });
 
 var _default = VirtualRow;

package/lib/LmTable/virTual/VirtualTable.js

@@ -25,7 +25,7 @@ var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
   var _useRealive = (0, _context.useRealive)(),
       _useRealive2 = (0, _slicedToArray2.default)(_useRealive, 2),
       state = _useRealive2[0],
-      dispatch = _useRealive2[1]; // { totalSize, virtualItems }
+      dispatch = _useRealive2[1]; // 行虚拟化 { totalSize, virtualItems }
 
 
   var rowVirtual = (0, _reactVirtual.useVirtual)({
@@ -38,18 +38,26 @@ var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
       return state.rowHeight;
     }, [state.rowHeight]),
     overscan: 5
-  });
+  }); // 列动态宽度
+
+  var columnEstimateSize = (0, _react.useCallback)(function (i) {
+    var _a, _b;
+
+    var colWidths = (_b = (_a = tableProps === null || tableProps === void 0 ? void 0 : tableProps.children[0]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.colWidths;
+    var leftColumnsLen = state.sliceColumns.leftColumns.length;
+    var centerColumnsLen = state.sliceColumns.centerColumns.length; // 获取非固定列
+
+    var virList = colWidths.slice(leftColumnsLen, leftColumnsLen + centerColumnsLen);
+    return virList[i] || 0;
+  }, [(_c = (_b = tableProps.children[0]) === null || _b === void 0 ? void 0 : _b.props) === null || _c === void 0 ? void 0 : _c.colWidths, state.sliceColumns.leftColumns.length, state.sliceColumns.centerColumns.length]); // 列虚拟化
+
   var columnVirtual = (0, _reactVirtual.useVirtual)({
     horizontal: true,
     size: state.columnsLen,
     parentRef: {
-      current: (_b = bodyRef === null || bodyRef === void 0 ? void 0 : bodyRef.current) === null || _b === void 0 ? void 0 : _b.parentNode
+      current: (_d = bodyRef === null || bodyRef === void 0 ? void 0 : bodyRef.current) === null || _d === void 0 ? void 0 : _d.parentNode
     },
-    estimateSize: _react.default.useCallback(function (i) {
-      var _a, _b;
-
-      return (_b = (_a = tableProps === null || tableProps === void 0 ? void 0 : tableProps.children[0]) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.colWidths[i];
-    }, [(_d = (_c = tableProps.children[0]) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.colWidths]),
+    estimateSize: columnEstimateSize,
     overscan: 5
   });
   var instance = {

package/lib/LmTable/virTual/context.js

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

package/lib/LmUpload/body/UploadCore.js

@@ -39,7 +39,7 @@ var UploadCore = function UploadCore(_ref) {
     var isUploading = getUploadStatus().uploading;
     if (isUploading) return;
     (_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.click();
-  }, [getUploadStatus]); // 上传触发事件
+  }, [disabled, getUploadStatus]); // 上传触发事件
 
   var uploadChange = (0, _react.useCallback)(function (e) {
     var _a;

package/lib/Radio/index.js

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