@pisell/materials 1.0.1008 → 1.0.1010

package/lib/components/pisellDataSourceContainer/components/Pagination/index.js

@@ -44,6 +44,20 @@ var WithPagination = (0, import_react.forwardRef)(
       ...otherProps
     } = props;
     const { pagination, data } = listAction;
+    const paginationProps = (0, import_react.useMemo)(() => {
+      return {
+        showTotal: (total) => {
+          return (0, import_locales.getText)("table-pagination-total")(
+            (pagination == null ? void 0 : pagination.pageNumber) || 1,
+            Math.ceil(total / ((pagination == null ? void 0 : pagination.pageSize) || 10))
+          );
+        },
+        total: (data == null ? void 0 : data.count) || 0,
+        current: (pagination == null ? void 0 : pagination.pageNumber) || 1,
+        pageSize: (pagination == null ? void 0 : pagination.pageSize) || 10,
+        onChange: listAction.onPageChange
+      };
+    }, [pagination == null ? void 0 : pagination.pageNumber, pagination == null ? void 0 : pagination.pageSize, data == null ? void 0 : data.count, listAction.onPageChange]);
     if (!pagination) {
       console.error("分页功能未启用");
       return null;
@@ -51,14 +65,8 @@ var WithPagination = (0, import_react.forwardRef)(
     return /* @__PURE__ */ import_react.default.createElement(
       import_Pagination.default,
       {
-        showTotal: (total) => {
-          return (0, import_locales.getText)("table-pagination-total")((pagination == null ? void 0 : pagination.pageNumber) || 1, total);
-        },
         ...otherProps,
-        total: (data == null ? void 0 : data.count) || 0,
-        current: (pagination == null ? void 0 : pagination.pageNumber) || 1,
-        pageSize: (pagination == null ? void 0 : pagination.pageSize) || 10,
-        onChange: listAction.onPageChange
+        ...paginationProps
       }
     );
   }

package/lib/components/pisellDataSourceContainer/components/Table/index.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { DataSourceContainerContextType } from '../../type';
 declare const _default: React.ForwardRefExoticComponent<Omit<Partial<import("antd").TableProps<any>> & DataSourceContainerContextType & {
     scopeId?: string | undefined;
+    __id?: string | undefined;
 } & React.RefAttributes<unknown> & {
     refId?: string | undefined;
 }, "ref"> & React.RefAttributes<any>>;

package/lib/components/pisellDataSourceContainer/components/Table/index.js

@@ -43,13 +43,15 @@ var WithTable = (0, import_react.forwardRef)(
       refManager,
       columns,
       scopeId = "table",
+      __id,
       ...otherProps
     } = props;
     const { data, loading } = listAction;
     const { visibleColumns } = (0, import_useColumns.default)({
       columns: columns || [],
       scopeId,
-      refManager
+      refManager,
+      __id
     });
     return /* @__PURE__ */ import_react.default.createElement(
       import_antd.Table,

package/lib/components/pisellDataSourceContainer/components/Table/useColumns.d.ts

@@ -6,6 +6,7 @@ interface UseColumnsParams {
     columns: any[];
     scopeId: string;
     refManager: RefManagerContextType;
+    __id?: string;
 }
 declare const useColumns: (params: UseColumnsParams) => {
     visibleColumns: any[];

package/lib/components/pisellDataSourceContainer/components/Table/useColumns.js

@@ -24,18 +24,31 @@ __export(useColumns_exports, {
 module.exports = __toCommonJS(useColumns_exports);
 var import_react = require("react");
 var import_ColumnsSetting = require("../ColumnsSetting");
+var import_utils = require("../ColumnsSetting/utils");
 var useColumns = (params) => {
-  const { columns, scopeId, refManager } = params;
+  const { columns, scopeId, refManager, __id } = params;
   const [columnSettings, setColumnSettings] = (0, import_react.useState)([]);
   (0, import_react.useEffect)(() => {
     if (!(columns == null ? void 0 : columns.length)) return;
-    const settings = columns.map((col, index) => ({
-      key: col.key || col.dataIndex,
+    const mergedColumns = (0, import_utils.mergeColumnSettingSimple)({
+      columns: columns.map((col, index) => ({
+        key: col.key || col.dataIndex,
+        dataIndex: col.dataIndex,
+        title: col.title,
+        titleString: typeof col.title === "string" ? col.title : col.dataIndex,
+        isShow: typeof col.isShow === "boolean" ? col.isShow : true,
+        sortIndex: index,
+        fixed: col.fixed
+      })),
+      componentId: __id
+    });
+    const settings = mergedColumns.map((col) => ({
+      key: col.key,
       dataIndex: col.dataIndex,
       title: col.title,
-      titleString: typeof col.title === "string" ? col.title : col.dataIndex,
-      isShow: typeof col.isShow === "boolean" ? col.isShow : true,
-      sortIndex: index,
+      titleString: col.titleString,
+      isShow: col.isShow,
+      sortIndex: col.sortIndex,
       fixed: col.fixed
     }));
     refManager.setSharedState(
@@ -43,7 +56,7 @@ var useColumns = (params) => {
       settings
     );
     setColumnSettings(settings);
-  }, [columns, refManager, scopeId]);
+  }, [columns, refManager, scopeId, __id]);
   (0, import_react.useEffect)(() => {
     const unsubscribe = refManager.subscribeSharedState(
       import_ColumnsSetting.COLUMNS_SHARED_STATE_KEYS.columnsChange(scopeId),
@@ -51,14 +64,12 @@ var useColumns = (params) => {
     );
     return unsubscribe;
   }, [refManager, scopeId]);
-  const visibleColumns = (0, import_react.useMemo)(() => {
-    if (!(columns == null ? void 0 : columns.length)) return [];
-    if (!(columnSettings == null ? void 0 : columnSettings.length)) return columns;
+  return (0, import_react.useMemo)(() => {
+    if (!(columns == null ? void 0 : columns.length)) return { visibleColumns: [] };
+    if (!(columnSettings == null ? void 0 : columnSettings.length)) return { visibleColumns: columns };
     const columnMap = new Map(columns.map((col) => [col.dataIndex, col]));
-    return columnSettings.filter((setting) => setting.isShow).map((setting) => columnMap.get(setting.dataIndex)).filter(Boolean);
+    const visibleColumns = columnSettings.filter((setting) => setting.isShow).map((setting) => columnMap.get(setting.dataIndex)).filter(Boolean);
+    return { visibleColumns };
   }, [columns, columnSettings]);
-  return {
-    visibleColumns
-  };
 };
 var useColumns_default = useColumns;

package/lib/components/pisellWalletPassCard/index.js

@@ -407,7 +407,9 @@ var PisellWalletPassCard = (props) => {
       className: "pisell-card-amount-item-value",
       useThousandsSeparator: true,
       value: balance,
-      showCurrencySymbol: showBalanceSymbol
+      showCurrencySymbol: showBalanceSymbol,
+      precision: 2,
+      hideDecimalForWholeNumbers: false
     }
   );
   const createOriginalRedeemTitleDom = () => /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-card-amount-item-label-text" }, formatRedeemTitle ? formatRedeemTitle(redeemTitle, {
@@ -421,7 +423,9 @@ var PisellWalletPassCard = (props) => {
       className: "pisell-card-amount-item-value",
       useThousandsSeparator: true,
       value: redeem,
-      showCurrencySymbol: true
+      showCurrencySymbol: true,
+      precision: 2,
+      hideDecimalForWholeNumbers: false
     }
   );
   const renderRedeemInfo = () => {
@@ -453,9 +457,11 @@ var PisellWalletPassCard = (props) => {
     }) : createOriginalBalanceDom()), showDiscount && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-card-amount-item pisell-card-amount-item-discount" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-card-amount-item-label" }, (0, import_locales.getText)("pisell-discount-card-title"), ": "), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-card-amount-item-value" }, ((_a = props.metadata) == null ? void 0 : _a.discount_card_type) === "fixed_amount" ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, (0, import_locales.getText)("pisell-discount-card-fixed-amount-prefix"), " ", /* @__PURE__ */ import_react.default.createElement(
       import_Amount.default,
       {
-        className: "pisell-card-amount-item-value",
+        className: "pisell-card-amount-item-value test1",
         useThousandsSeparator: true,
-        value: discount
+        value: discount,
+        precision: 2,
+        hideDecimalForWholeNumbers: false
       }
     )) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, discount, "% ", (0, import_locales.getText)("pisell-discount-card-unit"))))), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-card-code-wrap", style: { marginRight: showQrCode && !isMini ? 60 : 0 } }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-card-code" }, showCode && !isMini && /* @__PURE__ */ import_react.default.createElement("div", null, code), showValidDate && (!isMini || !_showHolderName) && /* @__PURE__ */ import_react.default.createElement("div", null, formatValidDate))));
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.1008",
+  "version": "1.0.1010",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -88,7 +88,7 @@
     "swiper": "^8.4.7",
     "antd-mobile": "^5.38.1",
     "vod-js-sdk-v6": "^1.4.11",
-    "@pisell/date-picker": "1.0.128",
+    "@pisell/date-picker": "1.0.129",
     "@pisell/icon": "0.0.10",
     "@pisell/utils": "1.0.56"
   },