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

package/dist/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/dist/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/dist/index.umd.js

@@ -91007,8 +91007,9 @@
   // 二级过滤 => 基础过滤组件
   var LmFilterBase = /*#__PURE__*/React__default['default'].memo(function (_ref) {
     var instance = _ref.instance;
-    var dataSource = instance.dataSource;
-    return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(FuzzySearch, {
+    var dataSource = instance.dataSource,
+        enableSearch = instance.enableSearch;
+    return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, enableSearch && /*#__PURE__*/React__default['default'].createElement(FuzzySearch, {
       instance: instance
     }), dataSource.map(function (v, index) {
       var isHidden = !v.show && typeof v.show === 'boolean';
@@ -92881,6 +92882,7 @@
 
         if (getIsHas(itemValue) && !!item) {
           return [].concat(_toConsumableArray$1(pre), [{
+            relation: obj[cur].mode || 'and',
             fieldName: cur,
             fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
             type: item.type,
@@ -92890,7 +92892,7 @@
              * and 等同于逻辑关系contains: 选中的值包含所有值
              * or 等同于逻辑关系in: 选中的值存在于所有值之中
              */
-            operator: obj[cur].mode === 'and' ? 'contains' : 'in'
+            operator: 'in'
           }]);
         }
 
@@ -93056,11 +93058,12 @@
           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'
             };
           }
 
@@ -182040,7 +182043,7 @@
       var isUploading = getUploadStatus().uploading;
       if (isUploading) return;
       inputRef === null || inputRef === void 0 ? void 0 : (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.click();
-    }, [getUploadStatus]); // 上传触发事件
+    }, [disabled, getUploadStatus]); // 上传触发事件
 
     var uploadChange = React.useCallback(function (e) {
       var _inputRef$current2;
@@ -288702,14 +288705,18 @@
     }));
   };
 
-  var _excluded$2g = ["children"],
+  var _excluded$2g = ["children", "disabled"],
       _excluded2$y = ["children", "size", "buttonStyle", "direction", "className"];
 
   var LMRadio = function LMRadio(props) {
     var children = props.children,
+        customDisabled = props.disabled,
         restProps = _objectWithoutProperties$1(props, _excluded$2g);
 
+    var disabled = React__default['default'].useContext(DisabledContext$1);
+    var mergedDisabled = customDisabled || disabled;
     return /*#__PURE__*/React__default['default'].createElement(Radio$1, _extends$2({
+      disabled: mergedDisabled,
       className: "lm-radio"
     }, restProps), children);
   };
@@ -293639,17 +293646,21 @@
   Tabs$3.TabPane = TabPane$3;
   Tabs$3.AntdTabs = Tabs$1;
 
-  var _excluded$2w = ["size", "className"];
+  var _excluded$2w = ["size", "className", "disabled"];
 
   var Switch$2 = function Switch(props) {
     var _props$size = props.size,
         size = _props$size === void 0 ? 'default' : _props$size,
         className = props.className,
+        customDisabled = props.disabled,
         restProps = _objectWithoutProperties$1(props, _excluded$2w);
 
+    var disabled = React__default['default'].useContext(DisabledContext$1);
+    var mergedDisabled = customDisabled || disabled;
     var classs = classnames('lm-switch', className, _defineProperty$1({}, "lm-switch-".concat(size), size));
     return /*#__PURE__*/React__default['default'].createElement(Switch$1, _objectSpread(_objectSpread({
-      className: classs
+      className: classs,
+      disabled: mergedDisabled
     }, restProps), {}, {
       size: size
     }));
@@ -313402,17 +313413,66 @@
     });
     return arr.length;
   }
-  function checkDataSourceIsEmpty(config, dataSource) {
+  function checkDataSourceIsEmpty(config, dataSource, scrollInfo) {
+    var resultConfig = _objectSpread({}, config);
+
+    if (scrollInfo) {
+      var _resultConfig$scroll, _resultConfig$scroll2;
+
+      resultConfig = _objectSpread(_objectSpread({}, resultConfig), {}, {
+        scroll: {
+          x: ((_resultConfig$scroll = resultConfig.scroll) === null || _resultConfig$scroll === void 0 ? void 0 : _resultConfig$scroll.x) || '100%',
+          y: scrollInfo.height || ((_resultConfig$scroll2 = resultConfig.scroll) === null || _resultConfig$scroll2 === void 0 ? void 0 : _resultConfig$scroll2.y)
+        }
+      });
+    }
+
     if (dataSource.length) {
-      return config;
+      return resultConfig;
     }
 
-    return _objectSpread(_objectSpread({}, config), {}, {
-      components: _objectSpread(_objectSpread({}, config.components), {}, {
+    return _objectSpread(_objectSpread({}, resultConfig), {}, {
+      components: _objectSpread(_objectSpread({}, resultConfig.components), {}, {
         body: {}
       })
     });
   }
+  /** 根据传入的disabedRows, 得出最终需要disabed的rowKeys */
+
+  function checkTableRowIsDisable(deepDataSource, disabledRows, rowKey) {
+    var disabledRkeys = [];
+
+    if (!disabledRows.length) {
+      return disabledRkeys;
+    }
+
+    var disableIds = disabledRows.map(function (item) {
+      return lodash.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;
+  }
 
   var DndContainer$3 = function DndContainer(_ref) {
     var children = _ref.children,
@@ -313463,19 +313523,8 @@
       if (active.id !== over.id) {
         move(active.id, over.id);
       }
-    };
+    }; // @ts-ignore
 
-    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['default'].createElement(DndContext, {
       sensors: sensors,
       onDragStart: handleDragStart,
@@ -313694,7 +313743,7 @@
       _excluded3$b = ["value", "onChange", "record", "rowIndex", "colIndex", "validator"],
       _excluded4$2 = ["record", "rowKey", "isEdit", "col", "rowIndex", "colIndex", "handleTableRowDelete", "handleTableRowAdd", "quickOpetateClearAll", "getLength", "isHoverEdit", "editEnum", "valueType", "children", "handleSave", "handleAdd", "handleDelete", "handleCopy", "itemProps"],
       _excluded5 = ["onMouseEnter", "onMouseLeave"],
-      _excluded6 = ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "disabled", "colSortOpen", "indexCol", "filterChange", "size", "recordCreatorProps", "shouldUpdate", "loading"];
+      _excluded6 = ["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 UploadBtn$1 = UploadOss.UploadBtn;
   var EditableContext$1 = /*#__PURE__*/React__default['default'].createContext(null); // 表格行
 
@@ -313709,6 +313758,7 @@
 
     return /*#__PURE__*/React__default['default'].createElement(Form$4, {
       form: form,
+      disabled: props.disabled || false,
       component: false
     }, /*#__PURE__*/React__default['default'].createElement(EditableContext$1.Provider, {
       value: form
@@ -314293,6 +314343,7 @@
         _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,
@@ -314307,6 +314358,8 @@
         shouldUpdate = _props$shouldUpdate === void 0 ? false : _props$shouldUpdate,
         _props$loading = props.loading,
         loading = _props$loading === void 0 ? false : _props$loading,
+        _props$autoSizer = props.autoSizer,
+        autoSizer = _props$autoSizer === void 0 ? false : _props$autoSizer,
         resetProps = _objectWithoutProperties$1(props, _excluded6);
 
     var _useControllableValue = useControllableValue({
@@ -314332,6 +314385,14 @@
         _useControllableValue4 = _slicedToArray$1(_useControllableValue3, 2),
         localRowSelectList = _useControllableValue4[0],
         setLocalRowSelectList = _useControllableValue4[1];
+
+    var _useControllableValue5 = useControllableValue({
+      value: {
+        disabledRows: (rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled.disabledRows) || []
+      }
+    }),
+        _useControllableValue6 = _slicedToArray$1(_useControllableValue5, 1),
+        localDisabledRows = _useControllableValue6[0];
     /** TODO: 当前展开的列 */
 
 
@@ -314344,7 +314405,10 @@
     var deepDataSourceRef = React.useRef(deepDataSourcePreKeys(dataSource, _rowKey));
     dataSourceRef.current = dataSource;
     deepDataSourceRef.current = deepDataSourcePreKeys(dataSource, _rowKey);
+    var disabledDataSourceRowKeys = React.useRef(checkTableRowIsDisable(deepDataSourceRef.current, localDisabledRows.disabledRows, _rowKey));
+    disabledDataSourceRowKeys.current = checkTableRowIsDisable(deepDataSourceRef.current, localDisabledRows.disabledRows, _rowKey);
     var tableWarpRef = React.useRef(null);
+    var autoSizerRef = React.useRef(null);
 
     var onColSortEnd = function onColSortEnd(active, over) {
       var _arrayMove;
@@ -314729,7 +314793,6 @@
         render: function render(_, record, index) {
           var _deepDataSourceRef$cu9, _deepDataSourceRef$cu10, _deepDataSourceRef$cu11;
 
-          console.log(deepDataSourceRef.current, '--deepDataSourceRef.current', _rowKey);
           return ((_deepDataSourceRef$cu9 = deepDataSourceRef.current) === null || _deepDataSourceRef$cu9 === void 0 ? void 0 : (_deepDataSourceRef$cu10 = _deepDataSourceRef$cu9[record[_rowKey]]) === null || _deepDataSourceRef$cu10 === void 0 ? void 0 : (_deepDataSourceRef$cu11 = _deepDataSourceRef$cu10['_deepIds']) === null || _deepDataSourceRef$cu11 === void 0 ? void 0 : _deepDataSourceRef$cu11.join('-')) || "".concat(index + 1);
         }
       } : _objectSpread(_objectSpread({
@@ -314949,11 +315012,39 @@
         }
       },
       onRow: function onRow(record, index) {
+        var _disabledDataSourceRo;
+
         return {
-          disabled: disabled
+          disabled: disabled || !!((_disabledDataSourceRo = disabledDataSourceRowKeys.current) === null || _disabledDataSourceRo === void 0 ? void 0 : _disabledDataSourceRo.includes(record[_rowKey]))
         };
       }
     }, resetProps));
+    React.useEffect(function () {
+      if (autoSizer) {
+        var _tableWarpRef$current3;
+
+        var tableClient = tableWarpRef === null || tableWarpRef === void 0 ? void 0 : (_tableWarpRef$current3 = tableWarpRef.current) === null || _tableWarpRef$current3 === void 0 ? void 0 : _tableWarpRef$current3.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) {
       var _localRowSelectList$s;
@@ -314973,7 +315064,7 @@
         items: columns.reduce(function (acc, item) {
           return [].concat(_toConsumableArray$1(acc), [item.dataIndex]);
         }, [])
-      }, /*#__PURE__*/React__default['default'].createElement(Table$1, _objectSpread(_objectSpread({}, checkDataSourceIsEmpty(config.current, dataSourceRef.current)), {}, {
+      }, /*#__PURE__*/React__default['default'].createElement(Table$1, _objectSpread(_objectSpread({}, checkDataSourceIsEmpty(config.current, dataSourceRef.current, autoSizerRef.current)), {}, {
         loading: loading,
         size: size || 'small',
         columns: resultColumns,
@@ -315003,18 +315094,21 @@
 
 
     return /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "lm_editTable_warpper",
+      className: classnames('lm_editTable_warpper', autoSizer && 'lm_editable_autosize'),
       ref: tableWarpRef
     }, /*#__PURE__*/React__default['default'].createElement(ConfigProvider$1, {
       renderEmpty: loading ? function () {
         return null;
       } : CustomizeRenderEmpty$1
-    }, /*#__PURE__*/React__default['default'].createElement(Table$1, _objectSpread(_objectSpread({}, checkDataSourceIsEmpty(config.current, dataSourceRef.current)), {}, {
+    }, /*#__PURE__*/React__default['default'].createElement(Table$1, _objectSpread(_objectSpread({}, 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) || {