@pisell/materials 2.2.48 → 2.2.49

package/lib/components/sort/components/InlineMenu/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
+/// <reference types="react" />
 import { MenuProps } from "antd";
 import "./index.less";
 interface InlineMenuProps {
@@ -11,5 +11,5 @@ interface InlineMenuProps {
  * @param props
  * @constructor
  */
-declare const InlineMenu: (props: InlineMenuProps) => React.JSX.Element;
+declare const InlineMenu: (props: InlineMenuProps) => JSX.Element;
 export default InlineMenu;

package/lib/components/sort/index.js

@@ -102,7 +102,7 @@ var Sort = ({
         key: d.name,
         label: d.label,
         children: sortChildrenMap[d.type](d.name, !!(d == null ? void 0 : d.localFilter)),
-        popupClassName: `${prefix}sort-sub-menu-popup-wrap`,
+        popupClassName: `${prefix}sort-sub-menu-popup-wrap ${prefix}dropdown-css-var`,
         // 增加显示隐藏配置
         className: `${d.isHidden ? `${prefix}sort-menu-wrap-hide` : ""}`
       };

package/lib/components/table/Actions/component/ColumnsSetting/PopoverContent.d.ts

@@ -6,5 +6,5 @@ declare type PopoverContentProps = {
     isShowTitle?: boolean;
     headerContent?: React.ReactNode;
 };
-declare const PopoverContent: (props: PopoverContentProps) => React.JSX.Element;
+declare const PopoverContent: (props: PopoverContentProps) => JSX.Element;
 export default PopoverContent;

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

@@ -1,7 +1,7 @@
-import React from "react";
+/// <reference types="react" />
 declare type ColumnsSettingProps = {
     value?: Record<string, any>[];
     onChange?: (val: Record<string, any>[]) => void;
 };
-declare const ColumnsSetting: (props: ColumnsSettingProps) => React.JSX.Element;
+declare const ColumnsSetting: (props: ColumnsSettingProps) => JSX.Element;
 export default ColumnsSetting;

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

@@ -1,7 +1,7 @@
-import React from 'react';
+/// <reference types="react" />
 import { ExportImportType } from '../../../../../types';
 import './index.less';
 declare const ExportFile: (props: {
     exportImport: ExportImportType;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default ExportFile;

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

@@ -1,8 +1,8 @@
-import React from "react";
+/// <reference types="react" />
 import { ExportImportType } from "../../../../../types";
 import "./index.less";
 declare const ExportTable: (props: {
     onChange: any;
     exportImport: ExportImportType;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default ExportTable;

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

@@ -1,7 +1,7 @@
-import React from 'react';
+/// <reference types="react" />
 import { ExportImportType } from '../../../../../types';
 import './index.less';
 declare const ImportLog: (props: {
     exportImport: ExportImportType;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default ImportLog;

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

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import { ExportImportType } from '../../../../../types';
 import './index.less';
 declare type ImportTableProps = {
@@ -6,5 +6,5 @@ declare type ImportTableProps = {
     exportImport: ExportImportType;
     errorStatus: string | null;
 };
-declare const ImportTable: (props: ImportTableProps) => React.JSX.Element;
+declare const ImportTable: (props: ImportTableProps) => JSX.Element;
 export default ImportTable;

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

@@ -1,8 +1,8 @@
-import React from 'react';
+/// <reference types="react" />
 import { ExportImportType } from '../../../types';
 import './index.less';
 declare type ExportImportProps = {
     exportImport: ExportImportType;
 };
-declare const ExportImport: ({ exportImport }: ExportImportProps) => React.JSX.Element;
+declare const ExportImport: ({ exportImport }: ExportImportProps) => JSX.Element;
 export default ExportImport;

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

@@ -1,9 +1,9 @@
-import React from "react";
+/// <reference types="react" />
 import { GallerySettingType, ModeType } from "../../../types";
 import "./index.less";
 declare type GallerySettingProps = {
     setting: GallerySettingType;
     currentViewMode: ModeType;
 };
-declare const GallerySetting: (props: GallerySettingProps) => React.JSX.Element;
+declare const GallerySetting: (props: GallerySettingProps) => JSX.Element;
 export default GallerySetting;

package/lib/components/table/Actions/component/Group/PopoverContent.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import './PopoverContent.less';
 declare type FieldType = string | number;
 export declare type GroupValue = {
@@ -9,5 +9,5 @@ declare type PopoverContentProps = {
     onChange?: (value: GroupValue) => void;
     value?: GroupValue;
 };
-declare const PopoverContent: (props: PopoverContentProps) => React.JSX.Element;
+declare const PopoverContent: (props: PopoverContentProps) => JSX.Element;
 export default PopoverContent;

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

@@ -1,4 +1,4 @@
-import React from "react";
+/// <reference types="react" />
 import { DataSourceGroupType } from "../../../types";
 declare type GroupProps = {
     setting: DataSourceGroupType;
@@ -9,5 +9,5 @@ declare type GroupProps = {
         field: string | number;
     }[]) => void;
 };
-declare const Group: (props: GroupProps) => React.JSX.Element;
+declare const Group: (props: GroupProps) => JSX.Element;
 export default Group;

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

@@ -1,9 +1,9 @@
-import React from "react";
+/// <reference types="react" />
 import { GridViewType, ModeType } from "../../../types";
 declare type ViewModeProps = {
     view: GridViewType;
     value?: ModeType;
     onChange?: (value: ModeType) => void;
 };
-declare const ViewMode: (props: ViewModeProps) => React.JSX.Element;
+declare const ViewMode: (props: ViewModeProps) => JSX.Element;
 export default ViewMode;

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

@@ -1,4 +1,4 @@
-import React from "react";
+/// <reference types="react" />
 import { FilterType } from "../../filter/types";
 import { ColumnSettingType, DataSourceGroupType, ExportImportType, GallerySettingType, GridViewType, SortType } from "../types";
 import "./index.less";
@@ -14,5 +14,5 @@ declare type ActionsProps = {
     gallery: GallerySettingType;
     exportImport?: ExportImportType;
 };
-declare const Actions: ({ filter, sort, columnSetting, dataSourceGroup, tableId, localPagination, buttons, view, gallery, exportImport, }: ActionsProps) => React.JSX.Element | null;
+declare const Actions: ({ filter, sort, columnSetting, dataSourceGroup, tableId, localPagination, buttons, view, gallery, exportImport, }: ActionsProps) => JSX.Element | null;
 export default Actions;

package/lib/components/table/Actions/index.js

@@ -63,6 +63,9 @@ var Actions = ({
     preserve: true
   });
   const showActions = (0, import_react.useMemo)(() => {
+    if (import_react.default.isValidElement(filter)) {
+      return true;
+    }
     return (filter == null ? void 0 : filter.show) || (sort == null ? void 0 : sort.show) || (columnSetting == null ? void 0 : columnSetting.show) || (dataSourceGroup == null ? void 0 : dataSourceGroup.show) || view.multiple || (exportImport == null ? void 0 : exportImport.show);
   }, [
     filter == null ? void 0 : filter.show,
@@ -72,16 +75,22 @@ var Actions = ({
     view.multiple,
     exportImport == null ? void 0 : exportImport.show
   ]);
-  return showActions ? /* @__PURE__ */ import_react.default.createElement("div", { className: "materials-grid-actions" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "left-wrap" }, /* @__PURE__ */ import_react.default.createElement(
-    import_filter.default,
-    {
-      filter,
-      isRenderFormContent: false,
-      tableId,
-      viewMode,
-      isMobile: isMobileBool
+  const filterRender = (0, import_react.useMemo)(() => {
+    if (import_react.default.isValidElement(filter)) {
+      return filter;
     }
-  )), /* @__PURE__ */ import_react.default.createElement(
+    return /* @__PURE__ */ import_react.default.createElement(
+      import_filter.default,
+      {
+        filter,
+        isRenderFormContent: false,
+        tableId,
+        viewMode,
+        isMobile: isMobileBool
+      }
+    );
+  }, [filter, tableId, viewMode, isMobileBool]);
+  return showActions ? /* @__PURE__ */ import_react.default.createElement("div", { className: "materials-grid-actions" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "left-wrap" }, filterRender), /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: "right-wrap",

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

@@ -1,4 +1,4 @@
+/// <reference types="react" />
 import { TableProps } from 'antd';
-import React from 'react';
-declare const BasicTable: (props: TableProps<any>) => React.JSX.Element;
+declare const BasicTable: (props: TableProps<any>) => JSX.Element;
 export default BasicTable;

package/lib/components/table/Gallery/components/GalleryItem/components/Cover/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
+/// <reference types="react" />
 import { GallerySettingType, GallerySettingValueType } from "../../../../../types";
 declare type CoverProps = {
     cover?: GallerySettingType["cover"];
@@ -6,5 +6,5 @@ declare type CoverProps = {
     coverField: GallerySettingValueType["coverField"];
     coverObjectFit: GallerySettingValueType["coverObjectFit"];
 };
-declare const Cover: (props: CoverProps) => React.JSX.Element;
+declare const Cover: (props: CoverProps) => JSX.Element;
 export default Cover;

package/lib/components/table/Gallery/components/GalleryItem/components/RenderFields/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
+/// <reference types="react" />
 import "./index.less";
 declare type RenderFieldsProps = {
     fields: string[];
@@ -7,5 +7,5 @@ declare type RenderFieldsProps = {
     showMode: "inline" | "block";
     isShowLabel?: boolean;
 };
-declare const RenderFields: (props: RenderFieldsProps) => React.JSX.Element;
+declare const RenderFields: (props: RenderFieldsProps) => JSX.Element;
 export default RenderFields;

package/lib/components/table/Gallery/components/GalleryItem/components/Title/index.d.ts

@@ -1,9 +1,9 @@
-import React from "react";
+/// <reference types="react" />
 import { GallerySettingType } from "../../../../../types";
 import "./index.less";
 declare type TitleProps = GallerySettingType["title"] & {
     record: Record<string, any>;
     columnsMap: Map<string, Record<string, any>>;
 };
-declare const Title: (props: TitleProps) => React.JSX.Element;
+declare const Title: (props: TitleProps) => JSX.Element;
 export default Title;

package/lib/components/table/Gallery/components/GalleryItem/index.d.ts

@@ -10,5 +10,5 @@ declare type GalleryItemProps = {
     columns: Record<string, any>[];
     onClick: React.MouseEventHandler<HTMLDivElement>;
 };
-declare const GalleryItem: (props: GalleryItemProps) => React.JSX.Element;
+declare const GalleryItem: (props: GalleryItemProps) => JSX.Element;
 export default GalleryItem;

package/lib/components/table/Gallery/components/VirtualGrid/index.d.ts

@@ -9,5 +9,5 @@ declare type VirtualGridProps = {
     rowHeight: number;
     paddingTop: number;
 };
-declare const VirtualGrid: (props: VirtualGridProps) => React.JSX.Element;
+declare const VirtualGrid: (props: VirtualGridProps) => JSX.Element;
 export default VirtualGrid;

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

@@ -1,5 +1,5 @@
-import React from "react";
-import { GalleryProps } from "./types";
-import "./index.less";
-declare const _default: React.MemoExoticComponent<(props: GalleryProps) => React.JSX.Element>;
+import React from 'react';
+import { GalleryProps } from './types';
+import './index.less';
+declare const _default: React.MemoExoticComponent<(props: GalleryProps) => JSX.Element>;
 export default _default;

package/lib/components/table/Gallery/index.js

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(Gallery_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_utils = require("@pisell/utils");
+var import_Pagination = require("../../Pagination");
 var import_useTransDataSource = __toESM(require("../hooks/useTransDataSource"));
 var import_hooks = require("../../../hooks");
 var import_model = require("../model");
@@ -96,6 +97,9 @@ var Gallery = (props) => {
     },
     [gallery_setting, gallery, columnsMap, column_setting]
   );
+  const total = (0, import_react.useMemo)(() => {
+    return pagination == null ? void 0 : pagination.total;
+  }, [pagination]);
   const gap = (0, import_react.useMemo)(() => {
     return [horizontalGutter, verticalGutter];
   }, [horizontalGutter, verticalGutter]);
@@ -153,6 +157,19 @@ var Gallery = (props) => {
       gap,
       rowHeight
     }
+  ), !pagination.localPagination && /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Form.Item,
+    {
+      name: "pagination",
+      style: {
+        margin: 0,
+        position: "absolute",
+        bottom: 0,
+        left: 0,
+        right: 0
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement(import_Pagination.FormPagination, { ...pagination, total })
   )));
 };
 var Gallery_default = (0, import_react.memo)(Gallery);

package/lib/components/table/Gallery/index.less

@@ -14,6 +14,7 @@
     flex: 1 1 auto;
     height: 100%;
     overflow: hidden;
+    position: relative;
   }
   &-gallery-item-wrap {
     cursor: pointer;

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

@@ -1,4 +1,11 @@
-import React from "react";
-import "./index.less";
-declare const Header: ({ buttons, title }: any) => React.JSX.Element | null;
+import React from 'react';
+import './index.less';
+export interface HeaderProps {
+    buttons: React.ReactNode | any[];
+    title: React.ReactNode | (() => React.ReactNode);
+    subTitle: React.ReactNode | (() => React.ReactNode);
+    showTitle?: boolean;
+    showSubTitle?: boolean;
+}
+declare const Header: ({ buttons, title, subTitle, showTitle, showSubTitle, }: HeaderProps) => JSX.Element | null;
 export default Header;

package/lib/components/table/Header/index.js

@@ -33,12 +33,47 @@ __export(Header_exports, {
 });
 module.exports = __toCommonJS(Header_exports);
 var import_react = __toESM(require("react"));
+var import_utils = require("@pisell/utils");
+var import_page_header = __toESM(require("../../page-header"));
 var import_Buttons = __toESM(require("./Buttons"));
 var import_index = require("./index.less");
-var Header = ({ buttons, title }) => {
+var Header = ({
+  buttons,
+  title,
+  subTitle,
+  showTitle,
+  showSubTitle
+}) => {
   const showHeader = (0, import_react.useMemo)(() => {
-    return title || (buttons == null ? void 0 : buttons.length);
-  }, [buttons, title]);
-  return showHeader ? /* @__PURE__ */ import_react.default.createElement("div", { className: "materials-grid-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "left-wrap" }, title && title()), /* @__PURE__ */ import_react.default.createElement("div", { className: "right-wrap" }, /* @__PURE__ */ import_react.default.createElement(import_Buttons.default, { list: buttons }))) : null;
+    return title && showTitle || (Array.isArray(buttons) ? buttons.length > 0 : buttons) || subTitle && showSubTitle;
+  }, [buttons, title, subTitle, showTitle, showSubTitle]);
+  const titleNode = (0, import_react.useMemo)(() => {
+    if ((0, import_utils.isFunction)(title)) {
+      return title();
+    }
+    return title;
+  }, [title]);
+  const buttonsNode = (0, import_react.useMemo)(() => {
+    if (Array.isArray(buttons)) {
+      return /* @__PURE__ */ import_react.default.createElement(import_Buttons.default, { list: buttons });
+    }
+    return buttons;
+  }, [buttons]);
+  const subTitleNode = (0, import_react.useMemo)(() => {
+    if ((0, import_utils.isFunction)(subTitle)) {
+      return subTitle();
+    }
+    return subTitle;
+  }, [subTitle]);
+  return showHeader ? /* @__PURE__ */ import_react.default.createElement(
+    import_page_header.default,
+    {
+      title: titleNode,
+      showTitle,
+      subTitle: subTitleNode,
+      showSubTitle,
+      extra: buttonsNode
+    }
+  ) : null;
 };
 var Header_default = Header;

package/lib/components/table/Header/index.less

@@ -1,8 +1,12 @@
+.materials-grid-header-wrap {
+  margin-bottom: 16px;
+}
+
 .materials-grid-header {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  margin-bottom: 16px;
+  margin-bottom: 0;
 
   .left-wrap {}
 
@@ -10,7 +14,11 @@
     display: flex;
     align-items: center;
     gap: 8px;
+  }
+}
 
 
-  }
+.materials-grid-sub-title {
+  margin-top: 8px;
+  color: #425569;
 }

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

@@ -1,4 +1,4 @@
-import React from "react";
+/// <reference types="react" />
 import "./index.less";
-declare const Summary: ({ summary }: any) => React.JSX.Element | null;
+declare const Summary: ({ summary }: any) => JSX.Element | null;
 export default Summary;

package/lib/components/table/Table/SelectField/index.d.ts

@@ -1,3 +1,3 @@
-import React from "react";
-declare const SelectField: () => React.JSX.Element;
+/// <reference types="react" />
+declare const SelectField: () => JSX.Element;
 export default SelectField;

package/lib/components/table/Table/fields/date/Config/index.d.ts

@@ -1,3 +1,3 @@
-import React from "react";
-declare const Config: () => React.JSX.Element;
+/// <reference types="react" />
+declare const Config: () => JSX.Element;
 export default Config;

package/lib/components/table/Table/fields/date/Show/index.d.ts

@@ -1,4 +1,4 @@
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
-import React from "react";
-declare const Show: (props: FieldPropsType) => React.JSX.Element;
+declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

package/lib/components/table/Table/fields/date/Sort/index.d.ts

@@ -1,3 +1,3 @@
-import React from "react";
-declare const Sort: () => React.JSX.Element;
+/// <reference types="react" />
+declare const Sort: () => JSX.Element;
 export default Sort;

package/lib/components/table/Table/fields/date/index.d.ts

@@ -7,10 +7,10 @@ declare const _default: {
         field_type: string;
         default_value: string;
     };
-    config: () => import("react").JSX.Element;
+    config: () => JSX.Element;
     edit: import("react").ForwardRefExoticComponent<Omit<import("../types").EditPropsType, "ref"> & import("react").RefAttributes<any>>;
-    sort: () => import("react").JSX.Element;
-    show: (props: import("../types").FieldPropsType) => import("react").JSX.Element;
+    sort: () => JSX.Element;
+    show: (props: import("../types").FieldPropsType) => JSX.Element;
     filterFn: typeof filter;
 };
 export default _default;

package/lib/components/table/Table/fields/image/Config/index.d.ts

@@ -1,3 +1,3 @@
-import React from "react";
-declare const Config: () => React.JSX.Element;
+/// <reference types="react" />
+declare const Config: () => JSX.Element;
 export default Config;

package/lib/components/table/Table/fields/image/Show/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
+/// <reference types="react" />
 import { FieldPropsType } from "../../types";
-declare const Show: (props: FieldPropsType) => React.JSX.Element;
+declare const Show: (props: FieldPropsType) => JSX.Element;
 export default Show;

package/lib/components/table/Table/fields/image/Sort/index.d.ts

@@ -1,3 +1,3 @@
-import React from "react";
-declare const Sort: () => React.JSX.Element;
+/// <reference types="react" />
+declare const Sort: () => JSX.Element;
 export default Sort;

package/lib/components/table/Table/fields/image/index.d.ts

@@ -6,9 +6,9 @@ declare const _default: {
         field_type: string;
         default_value: string;
     };
-    config: () => import("react").JSX.Element;
+    config: () => JSX.Element;
     edit: import("react").ForwardRefExoticComponent<Omit<import("../types").EditPropsType, "ref"> & import("react").RefAttributes<any>>;
-    sort: () => import("react").JSX.Element;
-    show: (props: import("../types").FieldPropsType) => import("react").JSX.Element;
+    sort: () => JSX.Element;
+    show: (props: import("../types").FieldPropsType) => JSX.Element;
 };
 export default _default;