@pisell/materials 1.0.1005 → 1.0.1007

package/es/components/dataSourceComponents/dataSourceTable/filter/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface BaseFilterItem {
     name?: string;

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -52,7 +52,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         show: boolean;
         title: string;
         width: number;
-        align: "center" | "left" | "right";
+        align: "left" | "right" | "center";
         fixed: false | "left" | "right";
         type: "button" | "link";
         items: OperationItem[];
@@ -72,7 +72,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "middle" | "large";
+        openContentSize: "small" | "large" | "middle";
         openTitle: string;
         key: string;
     } | undefined;

package/es/components/dataSourceComponents/fields/Upload/utils.d.ts

@@ -15,4 +15,4 @@ export declare const getFileMetadataParams: (file: RcFile & {
     metadata?: MediaMetadata;
 }) => Record<string, any>;
 export declare const isValueEqual: (value: any, fileListValue: any) => boolean;
-export declare const getBaseTime: (size: number) => 2000 | 1000 | 4000 | 8000;
+export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;

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

@@ -13,14 +13,17 @@ import FilterItem from "../FilterItem";
 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')
-};
-var tooltipMap = {
-  quickFilter: getText('table-action-filter-quick-filter-tip'),
-  otherFilter: getText('table-action-filter-other-filter-tip')
-};
+
+// const titleMap: Record<string, any> = {
+//   quickFilter: getText('table-action-filter-quick-filter'),
+//   otherFilter: getText('table-action-filter-other-filter'),
+// };
+
+// const tooltipMap: Record<string, any> = {
+//   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,
     listeners = props.listeners,
@@ -66,6 +69,14 @@ var Dropdown = function Dropdown(props) {
   var handleSortChange = function handleSortChange(list) {
     onChange === null || onChange === void 0 || onChange(list);
   };
+  var titleMap = {
+    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')
+  };
   var renderContainer = useCallback(function (_ref) {
     var children = _ref.children,
       ref = _ref.ref,

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

@@ -23,7 +23,8 @@ var Filter = function Filter(_ref) {
     onChange = _ref.onChange,
     quickFilterMaxLength = _ref.quickFilterMaxLength,
     formFiltersPrefix = _ref.formFiltersPrefix,
-    renderItem = _ref.renderItem;
+    renderItem = _ref.renderItem,
+    placement = _ref.placement;
   var ref = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -81,7 +82,8 @@ var Filter = function Filter(_ref) {
         return;
       }
       setOpen(visible);
-    }
+    },
+    placement: placement
   }, /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(FilterLines, null),
     size: "large"

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

@@ -12,4 +12,5 @@ export declare type FilterListProps = {
     quickFilterMaxLength: number;
     formFiltersPrefix: string;
     renderItem?: (item: any, otherProps?: any) => React.ReactNode;
+    placement?: 'top' | 'left' | 'right' | 'bottom' | 'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight' | 'leftTop' | 'leftBottom' | 'rightTop' | 'rightBottom';
 };

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FilterProps } from "./types";
 declare const Filter: (props: FilterProps) => JSX.Element | null;
 export default Filter;

package/es/components/pisellDataSourceContainer/PisellDataSourceContainer.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DataSourceContainerProps } from './type';
 declare const PisellDataSourceContainer: (props: DataSourceContainerProps) => JSX.Element;
 export default PisellDataSourceContainer;

package/es/components/pisellDataSourceContainer/hooks/useHandleAction.d.ts

@@ -1,5 +1,6 @@
 import { DataSourceContainerProps } from '../type';
-declare const useHandleAction: (initialParams: Record<string, any> | undefined, options: DataSourceContainerProps['pagination']) => {
+import { FormInstance } from 'antd';
+declare const useHandleAction: (initialParams: Record<string, any> | undefined, options: DataSourceContainerProps['pagination'], form: FormInstance | undefined) => {
     list: {
         pagination?: {
             pageNumber: number;

package/es/components/pisellDataSourceContainer/hooks/useHandleAction.js

@@ -20,6 +20,7 @@ var defaultPagination = {
 var useHandleAction = function useHandleAction() {
   var initialParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var options = arguments.length > 1 ? arguments[1] : undefined;
+  var form = arguments.length > 2 ? arguments[2] : undefined;
   var _useDataSource = useDataSource(),
     list = _useDataSource.list,
     get = _useDataSource.get,
@@ -79,7 +80,8 @@ var useHandleAction = function useHandleAction() {
    */
   var onReset = useCallback(function () {
     var _initialParamsRef$cur2;
-    var resetParams = _objectSpread({}, ((_initialParamsRef$cur2 = initialParamsRef.current) === null || _initialParamsRef$cur2 === void 0 ? void 0 : _initialParamsRef$cur2.list) || {});
+    var formValues = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {};
+    var resetParams = _objectSpread(_objectSpread({}, ((_initialParamsRef$cur2 = initialParamsRef.current) === null || _initialParamsRef$cur2 === void 0 ? void 0 : _initialParamsRef$cur2.list) || {}), formValues);
     if (enablePagination) {
       setPagination({
         pageNumber: pageNumber !== null && pageNumber !== void 0 ? pageNumber : 1,

package/es/components/pisellDataSourceContainer/provider/HandleActions.js

@@ -27,7 +27,7 @@ export var HandleActionsProvider = function HandleActionsProvider(props) {
     dataSourceKey = _useDataSourceKey.dataSourceKey;
   var handleAction = useHandleAction({
     list: extraParams === null || extraParams === void 0 ? void 0 : extraParams.list
-  }, pagination);
+  }, pagination, form);
   useEffect(function () {
     registerValueVariable === null || registerValueVariable === void 0 || registerValueVariable(componentId, {
       currentDataSource: dataSource

package/es/components/pisellFilter/index.js

@@ -33,7 +33,7 @@ var PisellFilter = function PisellFilter(props) {
     });
   }, [originalValue]);
   var content = useMemo(function () {
-    return /*#__PURE__*/React.createElement(FilterButton, {
+    return /*#__PURE__*/React.createElement(FilterButton, _extends({}, otherProps, {
       value: {
         quickFilter: value.quickFilter,
         otherFilter: value.otherFilter
@@ -43,7 +43,7 @@ var PisellFilter = function PisellFilter(props) {
       onChange: setValue,
       quickFilterMaxLength: quickFilterMaxLength || 100,
       formFiltersPrefix: formFiltersPrefix || ''
-    });
+    }));
   }, [value, hiddenQuickFilter, hiddenOtherFilter, quickFilterMaxLength, formFiltersPrefix]);
   if (hasForm) {
     return /*#__PURE__*/React.createElement(Form, _extends({

package/es/components/pisellGridPro/GridView/index.js

@@ -7,12 +7,11 @@ var GridView = function GridView(props) {
     style = props.style,
     children = props.children;
   var footerClassName = classNames('pisell-grid-pro-view', className);
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(PisellScrollView, {
     className: footerClassName,
-    style: style
-  }, /*#__PURE__*/React.createElement(PisellScrollView, {
     height: "100%",
-    overflow: "y"
-  }, children));
+    overflow: "y",
+    style: style
+  }, children);
 };
 export default GridView;

package/es/components/pisellGridPro/index.less

@@ -7,7 +7,6 @@
   display: flex;
   flex-direction: column;
   width: 100%;
-  height: 100vh;
   background: #ffffff;
   overflow: hidden;
   padding: 0 24px;

package/es/components/productCard/components/Packages/utils.d.ts

@@ -17,4 +17,4 @@ export declare const minusSign: (item: any, type?: string) => "" | "-";
  * @Author: WangHan
  * @Date: 2024-11-22 10:58
  */
-export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => string | number;
+export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => any;

package/es/components/table/Actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FilterType } from "../../filter/types";
 import { ColumnSettingType, DataSourceGroupType, ExportImportType, GallerySettingType, GridViewType, SortType } from "../types";
 import "./index.less";

package/lib/components/dataSourceComponents/dataSourceTable/filter/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface BaseFilterItem {
     name?: string;

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -52,7 +52,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         show: boolean;
         title: string;
         width: number;
-        align: "center" | "left" | "right";
+        align: "left" | "right" | "center";
         fixed: false | "left" | "right";
         type: "button" | "link";
         items: OperationItem[];
@@ -72,7 +72,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "middle" | "large";
+        openContentSize: "small" | "large" | "middle";
         openTitle: string;
         key: string;
     } | undefined;

package/lib/components/dataSourceComponents/fields/Upload/utils.d.ts

@@ -15,4 +15,4 @@ export declare const getFileMetadataParams: (file: RcFile & {
     metadata?: MediaMetadata;
 }) => Record<string, any>;
 export declare const isValueEqual: (value: any, fileListValue: any) => boolean;
-export declare const getBaseTime: (size: number) => 2000 | 1000 | 4000 | 8000;
+export declare const getBaseTime: (size: number) => 1000 | 2000 | 4000 | 8000;

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

@@ -40,14 +40,6 @@ var import_FilterItem = __toESM(require("../FilterItem"));
 var import_antd = require("antd");
 var import_MultipleContainersSortList = __toESM(require("../../../MultipleContainersSortList"));
 var import_locales = require("../../../../locales");
-var titleMap = {
-  quickFilter: (0, import_locales.getText)("table-action-filter-quick-filter"),
-  otherFilter: (0, import_locales.getText)("table-action-filter-other-filter")
-};
-var tooltipMap = {
-  quickFilter: (0, import_locales.getText)("table-action-filter-quick-filter-tip"),
-  otherFilter: (0, import_locales.getText)("table-action-filter-other-filter-tip")
-};
 var DragItem = import_react.default.forwardRef((props, ref) => {
   const { attributes, listeners, setActivatorNodeRef, style } = props;
   return /* @__PURE__ */ import_react.default.createElement(
@@ -99,6 +91,14 @@ var Dropdown = (props) => {
   const handleSortChange = (list2) => {
     onChange == null ? void 0 : onChange(list2);
   };
+  const titleMap = {
+    quickFilter: (0, import_locales.getText)("table-action-filter-quick-filter"),
+    otherFilter: (0, import_locales.getText)("table-action-filter-other-filter")
+  };
+  const tooltipMap = {
+    quickFilter: (0, import_locales.getText)("table-action-filter-quick-filter-tip"),
+    otherFilter: (0, import_locales.getText)("table-action-filter-other-filter-tip")
+  };
   const renderContainer = (0, import_react.useCallback)(
     ({ children, ref, id }) => {
       return /* @__PURE__ */ import_react.default.createElement("div", { className: "filter-dropdown-container-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "filter-dropdown-container-title-wrap" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "filter-dropdown-container-title" }, titleMap[id]), /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title: tooltipMap[id](quickFilterMaxLength) }, /* @__PURE__ */ import_react.default.createElement(import_HelpCircle.default, { className: "filter-dropdown-container-icon-help" }))), /* @__PURE__ */ import_react.default.createElement("div", { ref, className: "filter-dropdown-container-filter-wrap" }, children));

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

@@ -45,7 +45,8 @@ var Filter = ({
   onChange,
   quickFilterMaxLength,
   formFiltersPrefix,
-  renderItem
+  renderItem,
+  placement
 }) => {
   const ref = (0, import_react.useRef)(null);
   const [open, setOpen] = (0, import_react.useState)(false);
@@ -98,7 +99,8 @@ var Filter = ({
           return;
         }
         setOpen(visible);
-      }
+      },
+      placement
     },
     /* @__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/filter/components/FilterButton/types.d.ts

@@ -12,4 +12,5 @@ export declare type FilterListProps = {
     quickFilterMaxLength: number;
     formFiltersPrefix: string;
     renderItem?: (item: any, otherProps?: any) => React.ReactNode;
+    placement?: 'top' | 'left' | 'right' | 'bottom' | 'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight' | 'leftTop' | 'leftBottom' | 'rightTop' | 'rightBottom';
 };

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FilterProps } from "./types";
 declare const Filter: (props: FilterProps) => JSX.Element | null;
 export default Filter;

package/lib/components/pisellDataSourceContainer/PisellDataSourceContainer.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DataSourceContainerProps } from './type';
 declare const PisellDataSourceContainer: (props: DataSourceContainerProps) => JSX.Element;
 export default PisellDataSourceContainer;

package/lib/components/pisellDataSourceContainer/hooks/useHandleAction.d.ts

@@ -1,5 +1,6 @@
 import { DataSourceContainerProps } from '../type';
-declare const useHandleAction: (initialParams: Record<string, any> | undefined, options: DataSourceContainerProps['pagination']) => {
+import { FormInstance } from 'antd';
+declare const useHandleAction: (initialParams: Record<string, any> | undefined, options: DataSourceContainerProps['pagination'], form: FormInstance | undefined) => {
     list: {
         pagination?: {
             pageNumber: number;

package/lib/components/pisellDataSourceContainer/hooks/useHandleAction.js

@@ -39,7 +39,7 @@ var defaultPagination = {
   pageNumber: 1,
   pageSize: 10
 };
-var useHandleAction = (initialParams = {}, options) => {
+var useHandleAction = (initialParams = {}, options, form) => {
   const { list, get, update, create, destroy, getCurrentRecord } = (0, import_useDataSource.default)();
   const normalizedOptions = options === true ? defaultPagination : typeof options === "object" ? options : {};
   const { pageNumber, pageSize } = normalizedOptions;
@@ -75,8 +75,10 @@ var useHandleAction = (initialParams = {}, options) => {
   );
   const onReset = (0, import_react.useCallback)(() => {
     var _a;
+    const formValues = (form == null ? void 0 : form.getFieldsValue()) || {};
     let resetParams = {
-      ...((_a = initialParamsRef.current) == null ? void 0 : _a.list) || {}
+      ...((_a = initialParamsRef.current) == null ? void 0 : _a.list) || {},
+      ...formValues
     };
     if (enablePagination) {
       setPagination({

package/lib/components/pisellDataSourceContainer/provider/HandleActions.js

@@ -50,7 +50,7 @@ var HandleActionsProvider = (props) => {
   const { dataSourceKey } = (0, import_useDataSourceKey.default)();
   const handleAction = (0, import_useHandleAction.default)({
     list: extraParams == null ? void 0 : extraParams.list
-  }, pagination);
+  }, pagination, form);
   (0, import_react.useEffect)(() => {
     registerValueVariable == null ? void 0 : registerValueVariable(componentId, {
       currentDataSource: dataSource

package/lib/components/pisellFilter/index.js

@@ -56,6 +56,7 @@ var PisellFilter = (props) => {
     return /* @__PURE__ */ import_react.default.createElement(
       import_FilterButton.default,
       {
+        ...otherProps,
         value: {
           quickFilter: value.quickFilter,
           otherFilter: value.otherFilter

package/lib/components/pisellGridPro/GridView/index.js

@@ -39,6 +39,6 @@ var import_index = require("./index.less");
 var GridView = (props) => {
   const { className, style, children } = props;
   const footerClassName = (0, import_classnames.default)("pisell-grid-pro-view", className);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: footerClassName, style }, /* @__PURE__ */ import_react.default.createElement(import_PisellScrollView.default, { height: "100%", overflow: "y" }, children));
+  return /* @__PURE__ */ import_react.default.createElement(import_PisellScrollView.default, { className: footerClassName, height: "100%", overflow: "y", style }, children);
 };
 var GridView_default = GridView;

package/lib/components/pisellGridPro/index.less

@@ -7,7 +7,6 @@
   display: flex;
   flex-direction: column;
   width: 100%;
-  height: 100vh;
   background: #ffffff;
   overflow: hidden;
   padding: 0 24px;

package/lib/components/productCard/components/Packages/utils.d.ts

@@ -17,4 +17,4 @@ export declare const minusSign: (item: any, type?: string) => "" | "-";
  * @Author: WangHan
  * @Date: 2024-11-22 10:58
  */
-export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => string | number;
+export declare const _formatAmount: (price?: number, amountSymbol?: string, digit?: number) => any;

package/lib/components/table/Actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FilterType } from "../../filter/types";
 import { ColumnSettingType, DataSourceGroupType, ExportImportType, GallerySettingType, GridViewType, SortType } from "../types";
 import "./index.less";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.1005",
+  "version": "1.0.1007",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -88,8 +88,8 @@
     "swiper": "^8.4.7",
     "antd-mobile": "^5.38.1",
     "vod-js-sdk-v6": "^1.4.11",
-    "@pisell/date-picker": "1.0.128",
     "@pisell/icon": "0.0.10",
+    "@pisell/date-picker": "1.0.128",
     "@pisell/utils": "1.0.56"
   },
   "peerDependencies": {
@@ -104,6 +104,12 @@
     "build": "father build",
     "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
     "lowcode:build": "build-scripts build --config ./build.lowcode.js",
-    "build:tsdown": "tsdown"
+    "build:tsdown": "tsdown",
+    "test": "vitest",
+    "test:ui": "vitest --ui",
+    "test:run": "vitest run",
+    "test:coverage": "vitest run --coverage",
+    "storybook": "storybook dev -p 6006",
+    "build-storybook": "storybook build"
   }
 }

package/es/components/PisellBasicGrid/PisellBasicGrid.d.ts

@@ -1,9 +0,0 @@
-import type { PisellBasicGridProps } from './types';
-import './PisellBasicGrid.less';
-/**
- * 使用 memo 优化组件性能
- * @description 当 props 没有变化时，避免不必要的重新渲染
- */
-declare const MemoizedPisellBasicGrid: <T>(props: PisellBasicGridProps<T>) => JSX.Element;
-export { MemoizedPisellBasicGrid as PisellBasicGrid };
-export default MemoizedPisellBasicGrid;

package/es/components/PisellBasicGrid/hooks/index.d.ts

@@ -1 +0,0 @@
-export { useGridStyle, default } from './useGridStyle';

package/es/components/PisellBasicGrid/hooks/useGridStyle.d.ts

@@ -1,37 +0,0 @@
-import type { DirectionType, WrapType, JustifyType, AlignType, AlignContentType, UseGridStyleReturn } from '../types';
-/**
- * useGridStyle Hook 参数
- */
-interface UseGridStyleParams {
-    /** 排列方向 */
-    direction?: DirectionType;
-    /** 换行控制 */
-    wrap?: WrapType;
-    /** 一行显示的元素个数 */
-    columns?: number;
-    /** 是否等分容器宽度 */
-    equalWidth?: boolean;
-    /** 统一间距 */
-    gap?: number | string;
-    /** 行间距 */
-    rowGap?: number | string;
-    /** 列间距 */
-    columnGap?: number | string;
-    /** 主轴对齐方式 */
-    justify?: JustifyType;
-    /** 交叉轴对齐方式 */
-    align?: AlignType;
-    /** 多行对齐方式 */
-    alignContent?: AlignContentType;
-}
-/**
- * 计算 Grid 布局样式的 Hook
- * @param params - 布局参数
- * @returns 容器样式和子元素样式
- * @description
- * - 根据传入的布局参数计算容器的 flex 样式
- * - 根据 columns 和 gap 计算子元素的 flex-basis
- * - 使用 useMemo 缓存计算结果，避免不必要的重复计算
- */
-export declare const useGridStyle: (params: UseGridStyleParams) => UseGridStyleReturn;
-export default useGridStyle;

package/es/components/PisellBasicGrid/index.d.ts

@@ -1,6 +0,0 @@
-/**
- * PisellBasicGrid 组件导出
- * @description 基于 Flexbox 的基础布局组件
- */
-export { PisellBasicGrid, default } from './PisellBasicGrid';
-export type { PisellBasicGridProps, DirectionType, WrapType, JustifyType, AlignType, AlignContentType, BreakpointType, ResponsiveConfig, } from './types';