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

package/dist/variables.css

@@ -9870,6 +9870,20 @@ p {
   padding-left: 7px;
   box-sizing: border-box;
 }
+.lm_editTable_warpper.lm_editable_autosize .ant-table-wrapper,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-nested-loading,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-container,
+.lm_editTable_warpper.lm_editable_autosize .ant-table,
+.lm_editTable_warpper.lm_editable_autosize .ant-table-container {
+  height: 100%;
+}
+.lm_editTable_warpper.lm_editable_autosize .ant-table-wrapper .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-nested-loading .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-container .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-table .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-table-container .ant-table-body {
+  height: calc(100% - 41px);
+}
 .lm_editTable_wrapperRange .inputRange {
   display: inline-flex;
   align-items: center;

package/es/LmEditTable/EditTable.d.ts

@@ -15,6 +15,7 @@ interface ILmEditTable extends TableProps<any> {
     size?: TableProps<any>['size'];
     colSortOpen?: boolean;
     indexCol?: boolean | Record<string, any>;
+    autoSizer?: boolean;
     filterChange?: (data: TableProps<any>['columns']) => void;
     recordCreatorProps?: {
         creatorButtonText?: string;
@@ -27,6 +28,9 @@ interface ILmEditTable extends TableProps<any> {
     rowSelection?: TableProps<any>['rowSelection'] & {
         selectedRows?: Record<string, any>;
     };
+    rowDisabled?: {
+        disabledRows?: Record<string, any>;
+    };
 }
 export interface CountdownHandle {
     setRow: (data: any) => void;

package/es/LmEditTable/EditTable.js

@@ -61,7 +61,7 @@ import SortableItem from './sortableItem';
 import ColSortableItem from './sortableItemCol';
 import DragHandle from './DragHandle';
 import UploadOss from '../UploadOss';
-import { isObjEmpty, deepDataSourcePreKeys, isExpandRow, checkRowKeyByDataSource, checkMemoShouldUploadSpecialFun, checkExpandIconColumnIndex, checkDataSourceIsEmpty } from './util';
+import { isObjEmpty, deepDataSourcePreKeys, isExpandRow, checkRowKeyByDataSource, checkMemoShouldUploadSpecialFun, checkExpandIconColumnIndex, checkDataSourceIsEmpty, checkTableRowIsDisable } from './util';
 import { DraggableContainer, BottomOpetateComponent, QuickOpetate, CustomizeRenderEmpty } from './components';
 import cls from 'classnames';
 import ConfigProvider from '../ConfigProvider';
@@ -80,6 +80,7 @@ var EditableRow = function EditableRow(_a) {
 
   return /*#__PURE__*/React.createElement(Form, {
     form: form,
+    disabled: props.disabled || false,
     component: false
   }, /*#__PURE__*/React.createElement(EditableContext.Provider, {
     value: form
@@ -661,6 +662,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       _props$quickOpetateCl = props.quickOpetateClearAll,
       quickOpetateClearAll = _props$quickOpetateCl === void 0 ? true : _props$quickOpetateCl,
       rowSelection = props.rowSelection,
+      rowDisabled = props.rowDisabled,
       virtual = props.virtual,
       sortOpen = props.sortOpen,
       disabled = props.disabled,
@@ -675,7 +677,9 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       shouldUpdate = _props$shouldUpdate === void 0 ? false : _props$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"]);
+      _props$autoSizer = props.autoSizer,
+      autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer,
+      resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "rowDisabled", "virtual", "sortOpen", "disabled", "colSortOpen", "indexCol", "filterChange", "size", "recordCreatorProps", "shouldUpdate", "loading", "autoSizer"]);
 
   var _useControllableValue = useControllableValue({
     value: checkRowKeyByDataSource(props.value, _rowKey),
@@ -700,6 +704,14 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       _useControllableValue4 = _slicedToArray(_useControllableValue3, 2),
       localRowSelectList = _useControllableValue4[0],
       setLocalRowSelectList = _useControllableValue4[1];
+
+  var _useControllableValue5 = useControllableValue({
+    value: {
+      disabledRows: (rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled.disabledRows) || []
+    }
+  }),
+      _useControllableValue6 = _slicedToArray(_useControllableValue5, 1),
+      localDisabledRows = _useControllableValue6[0];
   /** TODO: 当前展开的列 */
 
 
@@ -712,7 +724,10 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
   var deepDataSourceRef = useRef(deepDataSourcePreKeys(dataSource, _rowKey));
   dataSourceRef.current = dataSource;
   deepDataSourceRef.current = deepDataSourcePreKeys(dataSource, _rowKey);
+  var disabledDataSourceRowKeys = useRef(checkTableRowIsDisable(deepDataSourceRef.current, localDisabledRows.disabledRows, _rowKey));
+  disabledDataSourceRowKeys.current = checkTableRowIsDisable(deepDataSourceRef.current, localDisabledRows.disabledRows, _rowKey);
   var tableWarpRef = useRef(null);
+  var autoSizerRef = useRef(null);
 
   var onColSortEnd = function onColSortEnd(active, over) {
     var _a;
@@ -1091,7 +1106,6 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       render: function render(_, record, index) {
         var _a, _b, _c;
 
-        console.log(deepDataSourceRef.current, '--deepDataSourceRef.current', _rowKey);
         return ((_c = (_b = (_a = deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[record[_rowKey]]) === null || _b === void 0 ? void 0 : _b['_deepIds']) === null || _c === void 0 ? void 0 : _c.join('-')) || "".concat(index + 1);
       }
     } : Object.assign(Object.assign({
@@ -1307,11 +1321,39 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       }
     },
     onRow: function onRow(record, index) {
+      var _a;
+
       return {
-        disabled: disabled
+        disabled: disabled || !!((_a = disabledDataSourceRowKeys.current) === null || _a === void 0 ? void 0 : _a.includes(record[_rowKey]))
       };
     }
   }, resetProps));
+  useEffect(function () {
+    var _a;
+
+    if (autoSizer) {
+      var tableClient = (_a = tableWarpRef === null || tableWarpRef === void 0 ? void 0 : tableWarpRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
+      var height = (tableClient === null || tableClient === void 0 ? void 0 : tableClient.height) || '100%';
+      var TailorHeight = size === 'middle' ? 48 : 40;
+
+      if (isAdd) {
+        TailorHeight += 48;
+      }
+
+      if (props.summary) {
+        TailorHeight += 48;
+      }
+
+      if (props.pagination) {
+        TailorHeight += 48;
+      }
+
+      autoSizerRef.current = {
+        width: tableClient === null || tableClient === void 0 ? void 0 : tableClient.width,
+        height: typeof height === 'string' ? "calc(".concat(height, " - ").concat(TailorHeight, "px)") : height - TailorHeight
+      };
+    }
+  }, []);
 
   if (colSortOpen) {
     return /*#__PURE__*/React.createElement("div", {
@@ -1329,7 +1371,7 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
       items: columns.reduce(function (acc, item) {
         return [].concat(_toConsumableArray(acc), [item.dataIndex]);
       }, [])
-    }, /*#__PURE__*/React.createElement(Table, Object.assign({}, checkDataSourceIsEmpty(config.current, dataSourceRef.current), {
+    }, /*#__PURE__*/React.createElement(Table, Object.assign({}, checkDataSourceIsEmpty(config.current, dataSourceRef.current, autoSizerRef.current), {
       loading: loading,
       size: size || 'small',
       columns: resultColumns,
@@ -1359,18 +1401,21 @@ var EditTable = /*#__PURE__*/forwardRef(function (props, ref) {
 
 
   return /*#__PURE__*/React.createElement("div", {
-    className: "lm_editTable_warpper",
+    className: cls('lm_editTable_warpper', autoSizer && 'lm_editable_autosize'),
     ref: tableWarpRef
   }, /*#__PURE__*/React.createElement(ConfigProvider, {
     renderEmpty: loading ? function () {
       return null;
     } : CustomizeRenderEmpty
-  }, /*#__PURE__*/React.createElement(Table, Object.assign({}, checkDataSourceIsEmpty(config.current, dataSourceRef.current), {
+  }, /*#__PURE__*/React.createElement(Table, Object.assign({}, checkDataSourceIsEmpty(config.current, dataSourceRef.current, autoSizerRef.current), {
     size: size || 'small',
     columns: resultColumns,
     rowClassName: "editable-row",
     bordered: true,
     loading: loading,
+    style: autoSizer ? {
+      height: isAdd ? "calc(100% - ".concat(48, "px)") : '100%'
+    } : undefined,
     pagination: false,
     // components={tableComponents}
     expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {

package/es/LmEditTable/rowSort/DndContainerRow.js

@@ -1,4 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+
+/* eslint-disable no-unused-vars */
 import React, { memo } from 'react';
 import { DndContext, closestCenter, KeyboardSensor, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
 import { restrictToParentElement, restrictToVerticalAxis } from '@dnd-kit/modifiers';
@@ -53,7 +55,8 @@ var DndContainer = function DndContainer(_ref) {
     if (active.id !== over.id) {
       move(active.id, over.id);
     }
-  };
+  }; // @ts-ignore
+
 
   var instance = {
     isDragging: isDragging,
@@ -64,8 +67,8 @@ var DndContainer = function DndContainer(_ref) {
     move: move,
     items: items,
     tableWidth: tableWidth
-  };
-  console.log('instance', instance);
+  }; // console.log('instance', instance)
+
   return /*#__PURE__*/React.createElement(DndContext, {
     sensors: sensors,
     onDragStart: handleDragStart,

package/es/LmEditTable/style/index.css

@@ -670,6 +670,20 @@ p {
   padding-left: 7px;
   box-sizing: border-box;
 }
+.lm_editTable_warpper.lm_editable_autosize .ant-table-wrapper,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-nested-loading,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-container,
+.lm_editTable_warpper.lm_editable_autosize .ant-table,
+.lm_editTable_warpper.lm_editable_autosize .ant-table-container {
+  height: 100%;
+}
+.lm_editTable_warpper.lm_editable_autosize .ant-table-wrapper .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-nested-loading .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-container .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-table .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-table-container .ant-table-body {
+  height: calc(100% - 41px);
+}
 .lm_editTable_wrapperRange .inputRange {
   display: inline-flex;
   align-items: center;

package/es/LmEditTable/style/variables.css

@@ -158,6 +158,20 @@
   padding-left: 7px;
   box-sizing: border-box;
 }
+.lm_editTable_warpper.lm_editable_autosize .ant-table-wrapper,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-nested-loading,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-container,
+.lm_editTable_warpper.lm_editable_autosize .ant-table,
+.lm_editTable_warpper.lm_editable_autosize .ant-table-container {
+  height: 100%;
+}
+.lm_editTable_warpper.lm_editable_autosize .ant-table-wrapper .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-nested-loading .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-container .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-table .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-table-container .ant-table-body {
+  height: calc(100% - 41px);
+}
 .lm_editTable_wrapperRange .inputRange {
   display: inline-flex;
   align-items: center;

package/es/LmEditTable/util.d.ts

@@ -9,7 +9,9 @@ export declare function checkExpandIconColumnIndex({ rowSelection, sortOpen, ind
     sortOpen: any;
     indexCol: any;
 }): number;
-export declare function checkDataSourceIsEmpty(config: any, dataSource: any): any;
+export declare function checkDataSourceIsEmpty(config: any, dataSource: any, scrollInfo: any): any;
+/** 根据传入的disabedRows, 得出最终需要disabed的rowKeys */
+export declare function checkTableRowIsDisable(deepDataSource: any, disabledRows: any, rowKey: any): any[];
 declare const _default: {
     isObjEmpty: typeof isObjEmpty;
 };

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, isEqual, pick, isFunction, omit } from 'lodash';
+import { keyBy, isEqual, pick, isFunction, omit, isObject } from 'lodash';
 export function isObjEmpty(obj) {
   var _a;
 
@@ -140,17 +140,66 @@ export function checkExpandIconColumnIndex(_ref) {
   });
   return arr.length;
 }
-export function checkDataSourceIsEmpty(config, dataSource) {
+export function checkDataSourceIsEmpty(config, dataSource, scrollInfo) {
+  var _a, _b;
+
+  var resultConfig = Object.assign({}, config);
+
+  if (scrollInfo) {
+    resultConfig = Object.assign(Object.assign({}, resultConfig), {
+      scroll: {
+        x: ((_a = resultConfig.scroll) === null || _a === void 0 ? void 0 : _a.x) || '100%',
+        y: scrollInfo.height || ((_b = resultConfig.scroll) === null || _b === void 0 ? void 0 : _b.y)
+      }
+    });
+  }
+
   if (dataSource.length) {
-    return config;
+    return resultConfig;
   }
 
-  return Object.assign(Object.assign({}, config), {
-    components: Object.assign(Object.assign({}, config.components), {
+  return Object.assign(Object.assign({}, resultConfig), {
+    components: Object.assign(Object.assign({}, resultConfig.components), {
       body: {}
     })
   });
 }
+/** 根据传入的disabedRows, 得出最终需要disabed的rowKeys */
+
+export function checkTableRowIsDisable(deepDataSource, disabledRows, rowKey) {
+  var disabledRkeys = [];
+
+  if (!disabledRows.length) {
+    return disabledRkeys;
+  }
+
+  var disableIds = disabledRows.map(function (item) {
+    return isObject(item) ? item === null || item === void 0 ? void 0 : item[rowKey] : item;
+  });
+
+  function deep(children, arrs) {
+    children === null || children === void 0 ? void 0 : children.forEach(function (item) {
+      arrs.push(item[rowKey]);
+
+      if (item.children) {
+        deep(item.children, arrs);
+      }
+    });
+  }
+
+  if (disableIds.length) {
+    disableIds === null || disableIds === void 0 ? void 0 : disableIds.forEach(function (item) {
+      disabledRkeys.push(item);
+      var record = deepDataSource[item];
+
+      if (record === null || record === void 0 ? void 0 : record.children) {
+        deep(record.children, disabledRkeys);
+      }
+    });
+  }
+
+  return disabledRkeys;
+}
 export default {
   isObjEmpty: isObjEmpty
 };

package/es/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/es/LmFilter/filterFns/index.js

@@ -168,6 +168,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
 
       if (getIsHas(itemValue) && !!item) {
         return [].concat(_toConsumableArray(pre), [{
+          relation: obj[cur].mode || 'and',
           fieldName: cur,
           fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
           type: item.type,
@@ -177,7 +178,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
            * and 等同于逻辑关系contains: 选中的值包含所有值
            * or 等同于逻辑关系in: 选中的值存在于所有值之中
            */
-          operator: obj[cur].mode === 'and' ? 'contains' : 'in'
+          operator: 'in'
         }]);
       }
 
@@ -344,11 +345,12 @@ var useCoreOptions = function useCoreOptions(_ref) {
         if (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/es/LmUpload/body/UploadCore.js

@@ -24,7 +24,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 = useCallback(function (e) {
     var _a;

package/es/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);
 };

package/es/Switch/index.js

@@ -17,16 +17,21 @@ var __rest = this && this.__rest || function (s, e) {
 
 import React from 'react';
 import cls from 'classnames';
+import DisabledContext from '../ConfigProvider/DisabledContext';
 
 var Switch = function Switch(props) {
   var _props$size = props.size,
       size = _props$size === void 0 ? 'default' : _props$size,
       className = props.className,
-      restProps = __rest(props, ["size", "className"]);
+      customDisabled = props.disabled,
+      restProps = __rest(props, ["size", "className", "disabled"]);
 
+  var disabled = React.useContext(DisabledContext);
+  var mergedDisabled = customDisabled || disabled;
   var classs = cls('lm-switch', className, _defineProperty({}, "lm-switch-".concat(size), size));
   return /*#__PURE__*/React.createElement(_Switch, Object.assign({
-    className: classs
+    className: classs,
+    disabled: mergedDisabled
   }, restProps, {
     size: size
   }));

package/es/styles/variables.css

@@ -9870,6 +9870,20 @@ p {
   padding-left: 7px;
   box-sizing: border-box;
 }
+.lm_editTable_warpper.lm_editable_autosize .ant-table-wrapper,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-nested-loading,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-container,
+.lm_editTable_warpper.lm_editable_autosize .ant-table,
+.lm_editTable_warpper.lm_editable_autosize .ant-table-container {
+  height: 100%;
+}
+.lm_editTable_warpper.lm_editable_autosize .ant-table-wrapper .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-nested-loading .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-spin-container .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-table .ant-table-body,
+.lm_editTable_warpper.lm_editable_autosize .ant-table-container .ant-table-body {
+  height: calc(100% - 41px);
+}
 .lm_editTable_wrapperRange .inputRange {
   display: inline-flex;
   align-items: center;

package/lib/LmEditTable/EditTable.d.ts

@@ -15,6 +15,7 @@ interface ILmEditTable extends TableProps<any> {
     size?: TableProps<any>['size'];
     colSortOpen?: boolean;
     indexCol?: boolean | Record<string, any>;
+    autoSizer?: boolean;
     filterChange?: (data: TableProps<any>['columns']) => void;
     recordCreatorProps?: {
         creatorButtonText?: string;
@@ -27,6 +28,9 @@ interface ILmEditTable extends TableProps<any> {
     rowSelection?: TableProps<any>['rowSelection'] & {
         selectedRows?: Record<string, any>;
     };
+    rowDisabled?: {
+        disabledRows?: Record<string, any>;
+    };
 }
 export interface CountdownHandle {
     setRow: (data: any) => void;

package/lib/LmEditTable/EditTable.js

@@ -114,6 +114,7 @@ var EditableRow = function EditableRow(_a) {
 
   return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
     form: form,
+    disabled: props.disabled || false,
     component: false
   }, /*#__PURE__*/_react.default.createElement(EditableContext.Provider, {
     value: form
@@ -695,6 +696,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       _props$quickOpetateCl = props.quickOpetateClearAll,
       quickOpetateClearAll = _props$quickOpetateCl === void 0 ? true : _props$quickOpetateCl,
       rowSelection = props.rowSelection,
+      rowDisabled = props.rowDisabled,
       virtual = props.virtual,
       sortOpen = props.sortOpen,
       disabled = props.disabled,
@@ -709,7 +711,9 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       shouldUpdate = _props$shouldUpdate === void 0 ? false : _props$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"]);
+      _props$autoSizer = props.autoSizer,
+      autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer,
+      resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "rowDisabled", "virtual", "sortOpen", "disabled", "colSortOpen", "indexCol", "filterChange", "size", "recordCreatorProps", "shouldUpdate", "loading", "autoSizer"]);
 
   var _useControllableValue = (0, _ahooks.useControllableValue)({
     value: (0, _util.checkRowKeyByDataSource)(props.value, _rowKey),
@@ -734,6 +738,14 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       _useControllableValue4 = (0, _slicedToArray2.default)(_useControllableValue3, 2),
       localRowSelectList = _useControllableValue4[0],
       setLocalRowSelectList = _useControllableValue4[1];
+
+  var _useControllableValue5 = (0, _ahooks.useControllableValue)({
+    value: {
+      disabledRows: (rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled.disabledRows) || []
+    }
+  }),
+      _useControllableValue6 = (0, _slicedToArray2.default)(_useControllableValue5, 1),
+      localDisabledRows = _useControllableValue6[0];
   /** TODO: 当前展开的列 */
 
 
@@ -746,7 +758,10 @@ 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 disabledDataSourceRowKeys = (0, _react.useRef)((0, _util.checkTableRowIsDisable)(deepDataSourceRef.current, localDisabledRows.disabledRows, _rowKey));
+  disabledDataSourceRowKeys.current = (0, _util.checkTableRowIsDisable)(deepDataSourceRef.current, localDisabledRows.disabledRows, _rowKey);
   var tableWarpRef = (0, _react.useRef)(null);
+  var autoSizerRef = (0, _react.useRef)(null);
 
   var onColSortEnd = function onColSortEnd(active, over) {
     var _a;
@@ -1125,7 +1140,6 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       render: function render(_, record, index) {
         var _a, _b, _c;
 
-        console.log(deepDataSourceRef.current, '--deepDataSourceRef.current', _rowKey);
         return ((_c = (_b = (_a = deepDataSourceRef.current) === null || _a === void 0 ? void 0 : _a[record[_rowKey]]) === null || _b === void 0 ? void 0 : _b['_deepIds']) === null || _c === void 0 ? void 0 : _c.join('-')) || "".concat(index + 1);
       }
     } : Object.assign(Object.assign({
@@ -1340,11 +1354,39 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       }
     },
     onRow: function onRow(record, index) {
+      var _a;
+
       return {
-        disabled: disabled
+        disabled: disabled || !!((_a = disabledDataSourceRowKeys.current) === null || _a === void 0 ? void 0 : _a.includes(record[_rowKey]))
       };
     }
   }, resetProps));
+  (0, _react.useEffect)(function () {
+    var _a;
+
+    if (autoSizer) {
+      var tableClient = (_a = tableWarpRef === null || tableWarpRef === void 0 ? void 0 : tableWarpRef.current) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
+      var height = (tableClient === null || tableClient === void 0 ? void 0 : tableClient.height) || '100%';
+      var TailorHeight = size === 'middle' ? 48 : 40;
+
+      if (isAdd) {
+        TailorHeight += 48;
+      }
+
+      if (props.summary) {
+        TailorHeight += 48;
+      }
+
+      if (props.pagination) {
+        TailorHeight += 48;
+      }
+
+      autoSizerRef.current = {
+        width: tableClient === null || tableClient === void 0 ? void 0 : tableClient.width,
+        height: typeof height === 'string' ? "calc(".concat(height, " - ").concat(TailorHeight, "px)") : height - TailorHeight
+      };
+    }
+  }, []);
 
   if (colSortOpen) {
     return /*#__PURE__*/_react.default.createElement("div", {
@@ -1362,7 +1404,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       items: columns.reduce(function (acc, item) {
         return [].concat((0, _toConsumableArray2.default)(acc), [item.dataIndex]);
       }, [])
-    }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Table, Object.assign({}, (0, _util.checkDataSourceIsEmpty)(config.current, dataSourceRef.current), {
+    }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Table, Object.assign({}, (0, _util.checkDataSourceIsEmpty)(config.current, dataSourceRef.current, autoSizerRef.current), {
       loading: loading,
       size: size || 'small',
       columns: resultColumns,
@@ -1392,18 +1434,21 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
 
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "lm_editTable_warpper",
+    className: (0, _classnames.default)('lm_editTable_warpper', autoSizer && 'lm_editable_autosize'),
     ref: tableWarpRef
   }, /*#__PURE__*/_react.default.createElement(_ConfigProvider.default, {
     renderEmpty: loading ? function () {
       return null;
     } : _components.CustomizeRenderEmpty
-  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Table, Object.assign({}, (0, _util.checkDataSourceIsEmpty)(config.current, dataSourceRef.current), {
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Table, Object.assign({}, (0, _util.checkDataSourceIsEmpty)(config.current, dataSourceRef.current, autoSizerRef.current), {
     size: size || 'small',
     columns: resultColumns,
     rowClassName: "editable-row",
     bordered: true,
     loading: loading,
+    style: autoSizer ? {
+      height: isAdd ? "calc(100% - ".concat(48, "px)") : '100%'
+    } : undefined,
     pagination: false,
     // components={tableComponents}
     expandable: (resetProps === null || resetProps === void 0 ? void 0 : resetProps.expandable) || {

package/lib/LmEditTable/rowSort/DndContainerRow.js

@@ -19,6 +19,7 @@ var _modifiers = require("@dnd-kit/modifiers");
 
 var _sortable = require("@dnd-kit/sortable");
 
+/* eslint-disable no-unused-vars */
 // 可拖拽容器
 var DndContainer = function DndContainer(_ref) {
   var children = _ref.children,
@@ -69,7 +70,8 @@ var DndContainer = function DndContainer(_ref) {
     if (active.id !== over.id) {
       move(active.id, over.id);
     }
-  };
+  }; // @ts-ignore
+
 
   var instance = {
     isDragging: isDragging,
@@ -80,8 +82,8 @@ var DndContainer = function DndContainer(_ref) {
     move: move,
     items: items,
     tableWidth: tableWidth
-  };
-  console.log('instance', instance);
+  }; // console.log('instance', instance)
+
   return /*#__PURE__*/_react.default.createElement(_core.DndContext, {
     sensors: sensors,
     onDragStart: handleDragStart,