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

package/lib/LmEditTable/virtual/VirtualRow.js

@@ -33,6 +33,8 @@ var useOptions = function useOptions(_ref) {
       ref = _ref.ref,
       trRef = _ref.trRef;
 
+  var _a;
+
   var _useStore = (0, _context.useStore)(),
       state = _useStore.state,
       dispatch = _useStore.dispatch,
@@ -42,7 +44,9 @@ var useOptions = function useOptions(_ref) {
   var rowHeight = state.rowHeight,
       totalLen = state.totalLen;
   var sliceColumns = (0, _react.useMemo)(function () {
-    return children === null || children === void 0 ? void 0 : children.reduce(function (pre, cur) {
+    var _a;
+
+    return (_a = children === null || children === void 0 ? void 0 : children.reduce) === null || _a === void 0 ? void 0 : _a.call(children, function (pre, cur) {
       var _a, _b;
 
       if (typeof ((_a = cur.props) === null || _a === void 0 ? void 0 : _a.fixLeft) === 'number') {
@@ -71,9 +75,9 @@ var useOptions = function useOptions(_ref) {
   }, [sliceColumns]); // 非固定列长度
 
   var centerColumnsLen = (0, _react.useMemo)(function () {
-    var _a;
+    var _a, _b;
 
-    return (_a = sliceColumns.centerColumns.length) !== null && _a !== void 0 ? _a : 0;
+    return (_b = (_a = sliceColumns === null || sliceColumns === void 0 ? void 0 : sliceColumns.centerColumns) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
   }, [sliceColumns]);
   (0, _react.useEffect)(function () {
     if (state.columnsLen !== centerColumnsLen) {
@@ -107,8 +111,10 @@ var useOptions = function useOptions(_ref) {
   }, [virtualItems]); // 右侧隐藏数量
 
   var rightColSpan = (0, _react.useMemo)(function () {
-    return sliceColumns.centerColumns.length - virtualItems.length - leftColSpan || 0;
-  }, [sliceColumns.centerColumns.length, virtualItems.length, leftColSpan]);
+    var _a;
+
+    return ((_a = sliceColumns === null || sliceColumns === void 0 ? void 0 : sliceColumns.centerColumns) === null || _a === void 0 ? void 0 : _a.length) - (virtualItems === null || virtualItems === void 0 ? void 0 : virtualItems.length) - leftColSpan || 0;
+  }, [(_a = sliceColumns === null || sliceColumns === void 0 ? void 0 : sliceColumns.centerColumns) === null || _a === void 0 ? void 0 : _a.length, virtualItems.length, leftColSpan]);
   return Object.assign(Object.assign({
     virtualItems: virtualItems
   }, sliceColumns), {

package/lib/LmEditTable/virtual/VirtualTable.js

@@ -20,6 +20,7 @@ var _context = require("./context");
 var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
   var _a, _b, _c, _d;
 
+  var fn = tableProps.fn;
   var bodyRef = (0, _react.useRef)(null);
 
   var _useRealive = (0, _context.useRealive)(),
@@ -38,7 +39,8 @@ var VirtualTable = /*#__PURE__*/_react.default.memo(function (tableProps) {
       return state.rowHeight;
     }, [state.rowHeight]),
     overscan: 5
-  }); // 列动态宽度
+  });
+  fn.current = rowVirtual.scrollToIndex; // 列动态宽度
 
   var columnEstimateSize = (0, _react.useCallback)(function (i) {
     var _a, _b;

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

@@ -1759,6 +1759,9 @@ p {
   color: var(--primary-color);
   cursor: pointer;
 }
+.lm_custom_option_columns .custom_hiddle {
+  display: none;
+}
 .lm_custom_option_columns .fixed_title {
   color: var(--color-45);
   font-size: 12px;
@@ -9870,6 +9873,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.4",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"