@pisell/materials 2.2.26 → 2.2.27

package/es/components/filter/components/Dropdown/index.d.ts

@@ -1,5 +1,8 @@
-import React from "react";
-import "./index.less";
-import { DropdownProps } from "./types";
-declare const Dropdown: React.FC<DropdownProps>;
+import React from 'react';
+import './index.less';
+import { DropdownProps } from './types';
+declare const Dropdown: React.FC<DropdownProps & {
+    onOpen: () => void;
+    onClose: () => void;
+}>;
 export default Dropdown;

package/es/components/filter/components/Dropdown/index.js

@@ -5,21 +5,21 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import React, { useCallback, useMemo } from "react";
-import DotsSix from "@pisell/icon/es/DotsSix";
-import HelpCircle from "@pisell/icon/es/HelpCircle";
+import React, { useCallback, useMemo } from 'react';
+import DotsSix from '@pisell/icon/es/DotsSix';
+import HelpCircle from '@pisell/icon/es/HelpCircle';
 import "./index.less";
 import FilterItem from "../FilterItem";
-import { Tooltip } from "antd";
+import { Tooltip } from 'antd';
 import MultipleContainersSortList from "../../../MultipleContainersSortList";
 import { getText } from "../../../../locales";
 var titleMap = {
-  quickFilter: getText("table-action-filter-quick-filter"),
-  otherFilter: getText("table-action-filter-other-filter")
+  quickFilter: getText('table-action-filter-quick-filter'),
+  otherFilter: getText('table-action-filter-other-filter')
 };
 var tooltipMap = {
-  quickFilter: getText("table-action-filter-quick-filter-tip"),
-  otherFilter: getText("table-action-filter-other-filter-tip")
+  quickFilter: getText('table-action-filter-quick-filter-tip'),
+  otherFilter: getText('table-action-filter-other-filter-tip')
 };
 var DragItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var attributes = props.attributes,
@@ -35,7 +35,7 @@ var DragItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
     ref: setActivatorNodeRef
   }, listeners, {
     style: _objectSpread(_objectSpread({}, listeners.style || {}), {}, {
-      touchAction: "none"
+      touchAction: 'none'
     }),
     className: "dots-six-icon"
   }))), /*#__PURE__*/React.createElement("div", {
@@ -47,7 +47,9 @@ var Dropdown = function Dropdown(props) {
     otherFilter = props.otherFilter,
     onChange = props.onChange,
     quickFilterMaxLength = props.quickFilterMaxLength,
-    formFiltersPrefix = props.formFiltersPrefix;
+    formFiltersPrefix = props.formFiltersPrefix,
+    _onOpen = props.onOpen,
+    _onClose = props.onClose;
   var list = useMemo(function () {
     return {
       quickFilter: quickFilter || [],
@@ -87,7 +89,7 @@ var Dropdown = function Dropdown(props) {
     onChange: handleSortChange,
     quickFilterMaxLength: quickFilterMaxLength
   }, function (_ref2) {
-    var _item$name, _item$other;
+    var _item$name, _item$other3;
     var item = _ref2.item,
       index = _ref2.index,
       style = _ref2.style,
@@ -103,13 +105,23 @@ var Dropdown = function Dropdown(props) {
       listeners: listeners,
       style: style
     }), /*#__PURE__*/React.createElement(FilterItem, {
-      key: name.join("-"),
+      key: name.join('-'),
       name: name,
       label: item.label,
       type: item.type,
       other: _objectSpread(_objectSpread({}, item.other), {}, {
-        style: _objectSpread(_objectSpread({}, ((_item$other = item.other) === null || _item$other === void 0 ? void 0 : _item$other.style) || {}), {}, {
-          width: "100%"
+        onOpen: function onOpen() {
+          var _item$other, _item$other$onOpen;
+          (_item$other = item.other) === null || _item$other === void 0 ? void 0 : (_item$other$onOpen = _item$other.onOpen) === null || _item$other$onOpen === void 0 ? void 0 : _item$other$onOpen.call(_item$other);
+          _onOpen === null || _onOpen === void 0 ? void 0 : _onOpen();
+        },
+        onClose: function onClose() {
+          var _item$other2, _item$other2$onClose;
+          (_item$other2 = item.other) === null || _item$other2 === void 0 ? void 0 : (_item$other2$onClose = _item$other2.onClose) === null || _item$other2$onClose === void 0 ? void 0 : _item$other2$onClose.call(_item$other2);
+          _onClose === null || _onClose === void 0 ? void 0 : _onClose();
+        },
+        style: _objectSpread(_objectSpread({}, ((_item$other3 = item.other) === null || _item$other3 === void 0 ? void 0 : _item$other3.style) || {}), {}, {
+          width: '100%'
         })
       }),
       props: item.props

package/es/components/filter/components/FilterButton/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import { FilterListProps } from "./types";
+import React from 'react';
+import { FilterListProps } from './types';
 declare const Filter: React.FC<FilterListProps>;
 export default Filter;

package/es/components/filter/components/FilterButton/index.js

@@ -4,9 +4,15 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import React, { useMemo, useRef } from "react";
-import { Button, Popover } from "antd";
-import FilterLines from "@pisell/icon/es/FilterLines";
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useMemo, useRef, useState } from 'react';
+import { Button, Popover } from 'antd';
+import FilterLines from '@pisell/icon/es/FilterLines';
 import Dropdown from "../Dropdown";
 import { getText } from "../../../../locales";
 import { isMobile } from "../../../../utils/platform";
@@ -16,6 +22,15 @@ var Filter = function Filter(_ref) {
     quickFilterMaxLength = _ref.quickFilterMaxLength,
     formFiltersPrefix = _ref.formFiltersPrefix;
   var ref = useRef(null);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  // 日期范围组件是否打开
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    dateRangeOpen = _useState4[0],
+    setDateRangeOpen = _useState4[1];
   var quickFilter = useMemo(function () {
     return (value === null || value === void 0 ? void 0 : value.quickFilter) || [];
   }, [value === null || value === void 0 ? void 0 : value.quickFilter]);
@@ -31,7 +46,13 @@ var Filter = function Filter(_ref) {
       otherFilter: otherFilter,
       onChange: handleChange,
       quickFilterMaxLength: quickFilterMaxLength,
-      formFiltersPrefix: formFiltersPrefix
+      formFiltersPrefix: formFiltersPrefix,
+      onOpen: function onOpen() {
+        return setDateRangeOpen(true);
+      },
+      onClose: function onClose() {
+        return setDateRangeOpen(false);
+      }
     });
   }, [quickFilter, otherFilter, quickFilterMaxLength, formFiltersPrefix]);
   var isMobileBool = isMobile();
@@ -46,7 +67,15 @@ var Filter = function Filter(_ref) {
     getPopupContainer: function getPopupContainer() {
       return ref.current;
     },
-    trigger: ['click']
+    trigger: ['click'],
+    open: open,
+    onOpenChange: function onOpenChange(visible) {
+      // 如果日期范围组件打开时 不关闭筛选
+      if (dateRangeOpen && !visible) {
+        return;
+      }
+      setOpen(visible);
+    }
   }, /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(FilterLines, null),
     size: "large"

package/es/components/table/Table/utils.d.ts

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/lib/components/filter/components/Dropdown/index.d.ts

@@ -1,5 +1,8 @@
-import React from "react";
-import "./index.less";
-import { DropdownProps } from "./types";
-declare const Dropdown: React.FC<DropdownProps>;
+import React from 'react';
+import './index.less';
+import { DropdownProps } from './types';
+declare const Dropdown: React.FC<DropdownProps & {
+    onOpen: () => void;
+    onClose: () => void;
+}>;
 export default Dropdown;

package/lib/components/filter/components/Dropdown/index.js

@@ -79,7 +79,9 @@ var Dropdown = (props) => {
     otherFilter,
     onChange,
     quickFilterMaxLength,
-    formFiltersPrefix
+    formFiltersPrefix,
+    onOpen,
+    onClose
   } = props;
   const list = (0, import_react.useMemo)(() => {
     return {
@@ -137,6 +139,16 @@ var Dropdown = (props) => {
             type: item.type,
             other: {
               ...item.other,
+              onOpen: () => {
+                var _a2, _b2;
+                (_b2 = (_a2 = item.other) == null ? void 0 : _a2.onOpen) == null ? void 0 : _b2.call(_a2);
+                onOpen == null ? void 0 : onOpen();
+              },
+              onClose: () => {
+                var _a2, _b2;
+                (_b2 = (_a2 = item.other) == null ? void 0 : _a2.onClose) == null ? void 0 : _b2.call(_a2);
+                onClose == null ? void 0 : onClose();
+              },
               style: {
                 ...((_b = item.other) == null ? void 0 : _b.style) || {},
                 width: "100%"

package/lib/components/filter/components/FilterButton/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import { FilterListProps } from "./types";
+import React from 'react';
+import { FilterListProps } from './types';
 declare const Filter: React.FC<FilterListProps>;
 export default Filter;

package/lib/components/filter/components/FilterButton/index.js

@@ -45,6 +45,8 @@ var Filter = ({
   formFiltersPrefix
 }) => {
   const ref = (0, import_react.useRef)(null);
+  const [open, setOpen] = (0, import_react.useState)(false);
+  const [dateRangeOpen, setDateRangeOpen] = (0, import_react.useState)(false);
   const quickFilter = (0, import_react.useMemo)(() => {
     return (value == null ? void 0 : value.quickFilter) || [];
   }, [value == null ? void 0 : value.quickFilter]);
@@ -62,7 +64,9 @@ var Filter = ({
         otherFilter,
         onChange: handleChange,
         quickFilterMaxLength,
-        formFiltersPrefix
+        formFiltersPrefix,
+        onOpen: () => setDateRangeOpen(true),
+        onClose: () => setDateRangeOpen(false)
       }
     );
   }, [quickFilter, otherFilter, quickFilterMaxLength, formFiltersPrefix]);
@@ -73,7 +77,14 @@ var Filter = ({
       content,
       arrow: false,
       getPopupContainer: () => ref.current,
-      trigger: ["click"]
+      trigger: ["click"],
+      open,
+      onOpenChange: (visible) => {
+        if (dateRangeOpen && !visible) {
+          return;
+        }
+        setOpen(visible);
+      }
     },
     /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { icon: /* @__PURE__ */ import_react.default.createElement(import_FilterLines.default, null), size: "large" }, isMobileBool ? null : (0, import_locales.getText)("table-action-filter-button"))
   ));

package/lib/components/table/Table/utils.d.ts

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "2.2.26",
+  "version": "2.2.27",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -65,7 +65,7 @@
     "@zxing/library": "0.21.2",
     "@pisell/utils": "2.0.1",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.102"
+    "@pisell/date-picker": "1.0.103"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/components/table/Actions/component/ExportImport/utils/index.d.ts

@@ -1,9 +0,0 @@
-/**
- * @title: 格式化导出导入接口地址
- * @description:
- * @param {string} url
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-09-05 11:39
- */
-export declare const formatApiUrl: (url: string) => string;

package/es/components/table/Actions/component/ExportImport/utils/index.js

@@ -1,11 +0,0 @@
-/**
- * @title: 格式化导出导入接口地址
- * @description: 
- * @param {string} url
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-09-05 11:39
- */
-export var formatApiUrl = function formatApiUrl(url) {
-  return url || '/shop/form/data';
-};

package/lib/components/table/Actions/component/ExportImport/utils/index.d.ts

@@ -1,9 +0,0 @@
-/**
- * @title: 格式化导出导入接口地址
- * @description:
- * @param {string} url
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-09-05 11:39
- */
-export declare const formatApiUrl: (url: string) => string;

package/lib/components/table/Actions/component/ExportImport/utils/index.js

@@ -1,31 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/components/table/Actions/component/ExportImport/utils/index.ts
-var utils_exports = {};
-__export(utils_exports, {
-  formatApiUrl: () => formatApiUrl
-});
-module.exports = __toCommonJS(utils_exports);
-var formatApiUrl = (url) => {
-  return url || "/shop/form/data";
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  formatApiUrl
-});