@pisell/materials 1.0.235 → 1.0.237

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- import React from "react";
1
+ import React, { useMemo } from "react";
2
2
  import { Form } from "antd";
3
3
  import FilterButton from "./components/FilterButton";
4
4
  import QuickFilter from "./components/QuickFilter";
@@ -14,7 +14,14 @@ var Filter = function Filter(props) {
14
14
  quickFilterMaxLength = _ref.quickFilterMaxLength,
15
15
  sortButtonShow = _ref.sortButtonShow,
16
16
  list = _ref.list;
17
- var content = /*#__PURE__*/React.createElement(React.Fragment, null, !isMobile() && /*#__PURE__*/React.createElement(Form.Item, {
17
+ var isShowQuickFilter = useMemo(function () {
18
+ // 移动端 并且 开启filter按钮 并且 开启filter排序时 不显示快速筛选
19
+ if (isMobile() && show && sortButtonShow) {
20
+ return false;
21
+ }
22
+ return true;
23
+ }, [show, sortButtonShow]);
24
+ var content = /*#__PURE__*/React.createElement(React.Fragment, null, isShowQuickFilter && /*#__PURE__*/React.createElement(Form.Item, {
18
25
  name: "filter_setting",
19
26
  noStyle: true
20
27
  }, /*#__PURE__*/React.createElement(QuickFilter, {
@@ -9,7 +9,7 @@ var useGenGridProps = function useGenGridProps(params) {
9
9
  var columnCount = useMemo(function () {
10
10
  var minCount = Math.floor(width / itemMinWidth);
11
11
  var maxCount = Math.floor(width / itemMaxWidth);
12
- return Math.floor((minCount + maxCount) / 2);
12
+ return Math.max(Math.floor((minCount + maxCount) / 2), 1);
13
13
  }, [width, itemMinWidth, itemMaxWidth]);
14
14
  var columnWidth = useMemo(function () {
15
15
  return (width - horizontal * (columnCount - 1) - 17) / columnCount;
@@ -41,7 +41,13 @@ var formFiltersPrefix = "filters";
41
41
  var Filter = (props) => {
42
42
  const { filter, isRenderFormContent = true, onValuesChange } = props;
43
43
  const { show, quickFilterMaxLength, sortButtonShow, list } = filter || {};
44
- const content = /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, !(0, import_platform.isMobile)() && /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "filter_setting", noStyle: true }, /* @__PURE__ */ import_react.default.createElement(
44
+ const isShowQuickFilter = (0, import_react.useMemo)(() => {
45
+ if ((0, import_platform.isMobile)() && show && sortButtonShow) {
46
+ return false;
47
+ }
48
+ return true;
49
+ }, [show, sortButtonShow]);
50
+ const content = /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, isShowQuickFilter && /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "filter_setting", noStyle: true }, /* @__PURE__ */ import_react.default.createElement(
45
51
  import_QuickFilter.default,
46
52
  {
47
53
  formFiltersPrefix: isRenderFormContent ? "" : formFiltersPrefix
@@ -35,7 +35,7 @@ var useGenGridProps = (params) => {
35
35
  const columnCount = (0, import_react.useMemo)(() => {
36
36
  const minCount = Math.floor(width / itemMinWidth);
37
37
  const maxCount = Math.floor(width / itemMaxWidth);
38
- return Math.floor((minCount + maxCount) / 2);
38
+ return Math.max(Math.floor((minCount + maxCount) / 2), 1);
39
39
  }, [width, itemMinWidth, itemMaxWidth]);
40
40
  const columnWidth = (0, import_react.useMemo)(() => {
41
41
  return (width - horizontal * (columnCount - 1) - 17) / columnCount;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pisell/materials",
3
- "version": "1.0.235",
3
+ "version": "1.0.237",
4
4
  "main": "./lib/index.js",
5
5
  "module": "./es/index.js",
6
6
  "types": "./lib/index.d.ts",