@lemon-fe/kits 1.0.0-90 → 1.0.0-92

package/es/components/DataGrid/index.js

@@ -326,6 +326,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
       return _objectSpread(_objectSpread({
         comparator: _this.isClientMode() ? undefined : unsort
       }, defaultColDef), defaultColDefProp);
+    }, function (next, prev) {
+      return shallowEqual(prev[0], next[0]);
     }));
 
     _defineProperty(_assertThisInitialized(_this), "getMemoizedColumnTypes", memoizeOne(function (columnTypesProp) {
@@ -334,6 +336,8 @@ var DataGrid = /*#__PURE__*/function (_Component) {
 
     _defineProperty(_assertThisInitialized(_this), "getMemoizedComponents", memoizeOne(function (componentsProp) {
       return _objectSpread(_objectSpread({}, defaultComponents), componentsProp);
+    }, function (next, prev) {
+      return shallowEqual(prev[0], next[0]);
     }));
 
     _defineProperty(_assertThisInitialized(_this), "getMemoizedDetailCellParams", memoizeOne(function (detailCell, params) {

package/es/components/Filter/index.js

@@ -34,7 +34,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import ResizeObserver from 'rc-resize-observer';
 import { Button, Checkbox, Form, Input, Popover, Space, Modal, message, Select, Empty, InputNumber } from 'antd';
 import { useDebounce, useRequest } from '@lemon-fe/hooks';
@@ -192,6 +192,8 @@ function Filter(props) {
       collapsed = _useState14[0],
       setCollapsed = _useState14[1];
 
+  var colWid = 295;
+
   var _useRequest = useRequest(function () {
     if (!storageKey) {
       return null;
@@ -386,14 +388,13 @@ function Filter(props) {
 
     return data;
   }, [keywords, data]);
-
-  var getColStyle = function getColStyle() {
+  var getColStyle = useCallback(function () {
     var colSpan = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
     return {
-      width: colSpan * 348,
+      width: colSpan * colWid,
       padding: '0 8px'
     };
-  };
+  }, []);
 
   var _useMemo = useMemo(function () {
     var getSet = function getSet(fields) {
@@ -403,7 +404,7 @@ function Filter(props) {
     };
 
     var result = data.filter(function (item) {
-      if (activeKeys.has(item.key)) {
+      if (activeKeys.has(item.key) && !item.hidden) {
         return true;
       }
 

package/es/components/Filter/typings.d.ts

@@ -6,7 +6,14 @@ export interface FilterItemType<T = any> {
   label?: string;
   type?: string;
   colSpan?: number;
+  /**
+   * @deprecated 不要传入label即可
+   */
   hideLabel?: boolean;
+  /**
+   * 控制是否隐藏筛选项
+   */
+  hidden?: boolean;
   extraProps?: Record<string, any>;
   renderFormItem?: (form: FormInstance<T>) => ReactElement;
   initialValue?: any;

package/es/components/FormLayout/index.less

@@ -1,7 +1,7 @@
 @spaceX: 16px;
 @spaceY: 8px;
 @labelWidth: 94px;
-@minWidth: 350px;
+@minWidth: 295px;
 @maxWidth: @labelWidth + 422px;
 
 .wrapper() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.0.0-90",
+  "version": "1.0.0-92",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",