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

package/lib/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/lib/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/lib/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/lib/LmEditTable/util.js

@@ -9,6 +9,7 @@ exports.checkDataSourceIsEmpty = checkDataSourceIsEmpty;
 exports.checkExpandIconColumnIndex = checkExpandIconColumnIndex;
 exports.checkMemoShouldUploadSpecialFun = checkMemoShouldUploadSpecialFun;
 exports.checkRowKeyByDataSource = checkRowKeyByDataSource;
+exports.checkTableRowIsDisable = checkTableRowIsDisable;
 exports.deepDataSourcePreKeys = deepDataSourcePreKeys;
 exports.default = void 0;
 exports.getExpandStatus = getExpandStatus;
@@ -167,17 +168,67 @@ function checkExpandIconColumnIndex(_ref) {
   return arr.length;
 }
 
-function checkDataSourceIsEmpty(config, dataSource) {
+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 */
+
+
+function checkTableRowIsDisable(deepDataSource, disabledRows, rowKey) {
+  var disabledRkeys = [];
+
+  if (!disabledRows.length) {
+    return disabledRkeys;
+  }
+
+  var disableIds = disabledRows.map(function (item) {
+    return (0, _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 _default = {
   isObjEmpty: isObjEmpty

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

package/lib/Switch/index.js

@@ -17,6 +17,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _DisabledContext = _interopRequireDefault(require("../ConfigProvider/DisabledContext"));
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -34,11 +36,16 @@ 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.default.useContext(_DisabledContext.default);
 
+  var mergedDisabled = customDisabled || disabled;
   var classs = (0, _classnames.default)('lm-switch', className, (0, _defineProperty2.default)({}, "lm-switch-".concat(size), size));
   return /*#__PURE__*/_react.default.createElement(_switch.default, Object.assign({
-    className: classs
+    className: classs,
+    disabled: mergedDisabled
   }, restProps, {
     size: size
   }));

package/lib/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/package.json

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