@pisell/private-materials 3.4.54 → 3.4.56

package/lib/index.d.ts

@@ -57,4 +57,5 @@ export { default as ContactInfoModal } from './plus/contactInfoModal';
 export { Login2, Register2, AuthModal } from './pro/Login2.0';
 export { default as WalletEditor } from './plus/walletEditor';
 export { default as WalletPassGallery } from './plus/walletPassGallery';
+export { default as WalletPassDetail } from './plus/walletPassGallery/components/passDetail';
 export { default as SettingsRegistry } from './components/systemSettings/registry';

package/lib/index.js

@@ -94,6 +94,7 @@ __export(src_exports, {
   Wallet: () => import_wallet.default,
   WalletEditor: () => import_walletEditor.default,
   WalletList: () => import_walletList.default,
+  WalletPassDetail: () => import_passDetail.default,
   WalletPassGallery: () => import_walletPassGallery.default,
   WorkspaceList: () => import_workSpaceList.default,
   WorkspaceListDetail: () => import_workSpaceListDetail.default
@@ -159,6 +160,7 @@ var import_contactInfoModal = __toESM(require("./plus/contactInfoModal"));
 var import_Login2 = require("./pro/Login2.0");
 var import_walletEditor = __toESM(require("./plus/walletEditor"));
 var import_walletPassGallery = __toESM(require("./plus/walletPassGallery"));
+var import_passDetail = __toESM(require("./plus/walletPassGallery/components/passDetail"));
 var import_registry = __toESM(require("./components/systemSettings/registry"));
 import_dayjs.default.extend(import_weekday.default);
 import_dayjs.default.extend(import_localeData.default);
@@ -229,6 +231,7 @@ import_dayjs.default.extend(import_localeData.default);
   Wallet,
   WalletEditor,
   WalletList,
+  WalletPassDetail,
   WalletPassGallery,
   WorkspaceList,
   WorkspaceListDetail

package/lib/plus/walletPassGallery/components/passDetail/index.d.ts

@@ -3,6 +3,7 @@ interface PassDetailProps {
     dataSource?: any | null;
     platform?: 'pc' | 'h5';
     buttonGroupList?: any[][];
+    showTimeLine?: boolean;
 }
 declare const PassDetail: (props: PassDetailProps) => JSX.Element | null;
 export default PassDetail;

package/lib/plus/walletPassGallery/components/passDetail/index.js

@@ -48,19 +48,26 @@ var import_recharge = __toESM(require("../recharge"));
 var import_footerButton = __toESM(require("../footerButton"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
+var import_utils3 = require("../../../../components/wallet/utils");
+var import_locales = __toESM(require("../../locales"));
+var import_utils4 = require("../../../../utils");
 var { Text } = import_antd.Typography;
 var PassDetail = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-  if (!props.dataSource) return null;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
   const { symbol = "$" } = (0, import_materials.usePisellConfig)();
-  const { dataSource, platform = "pc" } = props;
+  const { dataSource, platform = "pc", showTimeLine = true } = props;
   const [activeKey, setActiveKey] = (0, import_react.useState)("detail");
   const [rechargeOpen, setRechargeOpen] = (0, import_react.useState)(false);
   const containerRef = (0, import_react.useRef)(null);
   const isIndicatorVisibleRef = (0, import_react.useRef)(false);
   const context = (0, import_useEngineContext.default)();
   const { store } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || { store: {} };
-  const timezone = ((_e = (_d = (_c = (_b = store == null ? void 0 : store.getState) == null ? void 0 : _b.call(store)) == null ? void 0 : _c.global) == null ? void 0 : _d.symbol) == null ? void 0 : _e.shop.timezone) || "Asia/Shanghai";
+  const { apiPrefix } = ((_b = context.appHelper) == null ? void 0 : _b.constants) || { apiPrefix: "/h5" };
+  const timezone = ((_g = (_f = (_e = (_d = (_c = store == null ? void 0 : store.getState) == null ? void 0 : _c.call(store)) == null ? void 0 : _d.global) == null ? void 0 : _e.symbol) == null ? void 0 : _f.shop) == null ? void 0 : _g.timezone) || "Asia/Shanghai";
+  import_utils.locales.init(import_locales.default, ((_i = (_h = context == null ? void 0 : context.engine) == null ? void 0 : _h.props) == null ? void 0 : _i.locale) || "en");
+  if ((_k = (_j = context.appHelper) == null ? void 0 : _j.utils) == null ? void 0 : _k.request) {
+    import_utils4.request.setRequest((_m = (_l = context.appHelper) == null ? void 0 : _l.utils) == null ? void 0 : _m.request);
+  }
   const {
     id = "",
     code = "",
@@ -69,17 +76,22 @@ var PassDetail = (props) => {
     encoded = "",
     balance,
     expire_date = "",
-    product = {}
+    product = {},
+    custom_schedule_snapshot,
+    customer_id
   } = dataSource || {};
   const {
     description = "",
     extension_data = [],
     customer_order_behavior_count = 0
   } = product || {};
-  const _getDetail = (0, import_ahooks.useRequest)(() => (0, import_serve.getDetailApi)({ id }), {
+  const _getDetail = (0, import_ahooks.useRequest)(() => (0, import_serve.getDetailApi)({ id, apiPrefix, order_behavior_count_customer_id: customer_id }), {
     ready: !!id,
-    refreshDeps: [id]
+    refreshDeps: [id, customer_id]
   });
+  const scheduleList = (0, import_react.useMemo)(() => {
+    return (custom_schedule_snapshot == null ? void 0 : custom_schedule_snapshot.data) || [];
+  }, [custom_schedule_snapshot]);
   (0, import_react.useEffect)(() => {
     if (tag === "product_discount_card") {
       setActiveKey("detail");
@@ -111,7 +123,29 @@ var PassDetail = (props) => {
     return () => clearTimeout(timeoutId);
   }, []);
   const descs = (0, import_react.useMemo)(() => {
-    var _a2;
+    var _a2, _b2, _c2;
+    const detail = (0, import_utils3.formatScheduleText)(scheduleList, (_b2 = (_a2 = context == null ? void 0 : context.engine) == null ? void 0 : _a2.props) == null ? void 0 : _b2.locale);
+    let expireText = expire_date ? expire_date : import_utils.locales.getText("wallet-pass-gallery.expireDate");
+    if (scheduleList.length > 0) {
+      let validityTexts = "";
+      let excludedText = "";
+      let includedText = "";
+      detail.forEach((item) => {
+        if (item.validityTexts.length > 0) {
+          validityTexts = `${validityTexts}${item.validityTexts.join("\n")}
+`;
+        }
+        if (item.excluded_date.length > 0) {
+          excludedText = `${excludedText}${item.excluded_date.join("\n")}
+`;
+        }
+        if (item.included_date.length > 0) {
+          includedText = `${includedText}${item.included_date.join("\n")}
+`;
+        }
+      });
+      expireText = /* @__PURE__ */ import_react.default.createElement("span", { className: "wallet-detail-expire-text" }, validityTexts, excludedText && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-detail-expire-text-title" }, import_utils.locales.getText("page.wallet.notValidDate")), excludedText, includedText && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-detail-expire-text-title" }, import_utils.locales.getText("page.wallet.includedDate")), includedText);
+    }
     let data = [
       {
         label: import_utils.locales.getText("wallet-pass-gallery.cardName"),
@@ -124,11 +158,11 @@ var PassDetail = (props) => {
       },
       {
         label: import_utils.locales.getText("wallet-pass-gallery.validDate"),
-        value: expire_date ? expire_date : import_utils.locales.getText("wallet-pass-gallery.expireDate")
+        value: expireText
       }
     ];
     if (tag === "product_discount_card") {
-      const isFixedAmount = ((_a2 = dataSource.metadata) == null ? void 0 : _a2.discount_card_type) === "fixed_amount";
+      const isFixedAmount = ((_c2 = dataSource.metadata) == null ? void 0 : _c2.discount_card_type) === "fixed_amount";
       data.splice(2, 0, {
         label: import_utils.locales.getText("wallet-pass-gallery.discount"),
         value: balance ? isFixedAmount ? `${symbol}${Number(balance)}` : `${Number(balance)}%` : ""
@@ -195,8 +229,10 @@ var PassDetail = (props) => {
   };
   const renderTimeLine = () => {
     if (tag === "product_discount_card") return null;
+    if (!showTimeLine) return null;
     return /* @__PURE__ */ import_react.default.createElement(import_timelineSection.default, { code, tag, timezone });
   };
+  if (!props.dataSource) return null;
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -240,7 +276,7 @@ var PassDetail = (props) => {
           },
           /* @__PURE__ */ import_react.default.createElement("div", { "data-anchor": "detail" })
         ),
-        /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(Text, { className: "pisell-wallet-pass-gallery_detail-title" }, import_utils.locales.getText("wallet-pass-gallery.details")), platform === "pc" && tag === "gift_card" && ((_f = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _f.hide_recharge) === 0 && /* @__PURE__ */ import_react.default.createElement(
+        /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(Text, { className: "pisell-wallet-pass-gallery_detail-title" }, import_utils.locales.getText("wallet-pass-gallery.details")), platform === "pc" && tag === "gift_card" && ((_n = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _n.hide_recharge) === 0 && /* @__PURE__ */ import_react.default.createElement(
           import_antd.Button,
           {
             type: "primary",
@@ -272,9 +308,9 @@ var PassDetail = (props) => {
   ), platform === "h5" && tag === "gift_card" ? /* @__PURE__ */ import_react.default.createElement(
     import_footerButton.default,
     {
-      appleWalletUrl: (_g = _getDetail.data) == null ? void 0 : _g.apple_wallet_url,
-      googleWalletUrl: (_h = _getDetail.data) == null ? void 0 : _h.google_wallet_url,
-      onRechargeClick: ((_i = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _i.hide_recharge) === 0 ? () => setRechargeOpen(true) : void 0,
+      appleWalletUrl: (_o = _getDetail.data) == null ? void 0 : _o.apple_wallet_url,
+      googleWalletUrl: (_p = _getDetail.data) == null ? void 0 : _p.google_wallet_url,
+      onRechargeClick: ((_q = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _q.hide_recharge) === 0 ? () => setRechargeOpen(true) : void 0,
       platform
     }
   ) : null, /* @__PURE__ */ import_react.default.createElement(

package/lib/plus/walletPassGallery/index.js

@@ -89,7 +89,8 @@ var WalletPassGallery = (props) => {
         num: 20,
         skip: (d == null ? void 0 : d.nextId) || 1,
         tags: TAGS,
-        filter_wallet_id: walletId || void 0
+        filter_wallet_id: walletId || void 0,
+        "with": ["customScheduleSnapshot"]
       });
       return {
         list: (res == null ? void 0 : res.list) || [],
@@ -115,7 +116,8 @@ var WalletPassGallery = (props) => {
         num: 20,
         skip: (d == null ? void 0 : d.nextId) || 1,
         tags: TAGS,
-        filter_wallet_id: walletId || void 0
+        filter_wallet_id: walletId || void 0,
+        "with": ["customScheduleSnapshot"]
       });
       return {
         list: (res == null ? void 0 : res.list) || [],

package/lib/plus/walletPassGallery/serve.d.ts

@@ -17,6 +17,7 @@ export interface IWalletListParmsProps {
     skip?: number;
     filter_wallet_id?: string;
     available: 0 | 1;
+    with?: string[];
 }
 /**
  * 钱包列表项属性接口
@@ -171,6 +172,8 @@ export declare const getAssetList: (params: IAssetListProps) => Promise<{
  */
 export declare const getDetailApi: (params: {
     id: string;
+    order_behavior_count_customer_id: string;
+    apiPrefix: string;
 }) => Promise<IDetailResponse>;
 /**
  * 详情响应数据结构，供组件消费

package/lib/plus/walletPassGallery/serve.js

@@ -69,11 +69,14 @@ var getAssetList = async (params) => {
   return data;
 };
 var getDetailApi = async (params) => {
-  const { data } = await import_utils.request.getRequest().get(`/h5/machinecode/lowcode/detail/${params.id}`, {
+  const { data } = await import_utils.request.getRequest().get(`${params.apiPrefix || "/h5"}/machinecode/lowcode/detail/${params.id}`, {
     order_behavior_count: 1,
     // 订单行为次数
-    order_behavior_count_customer: 1
+    order_behavior_count_customer: 1,
     // 客户订单行为次数
+    order_behavior_count_customer_id: params.apiPrefix === "/shop" ? params.order_behavior_count_customer_id : void 0
+  }, {
+    isOriginHost: true
   });
   return data;
 };

package/lib/pro/Login2.0/AuthModal.js

@@ -81,7 +81,7 @@ var AuthModal = () => {
     }
   }, [currentView]);
   const login2Config = (0, import_react.useMemo)(() => {
-    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
     if (!localesInitialized) {
       return {
         loginMethods: [],
@@ -262,9 +262,13 @@ var AuthModal = () => {
           show: (config == null ? void 0 : config.logo) ? true : false,
           url: config == null ? void 0 : config.logo,
           // 直接从 config.logo 读取
-          position: "center"
+          position: "center",
+          size: {
+            width: ((_v = config == null ? void 0 : config.logoSize) == null ? void 0 : _v.width) || 48,
+            height: ((_w = config == null ? void 0 : config.logoSize) == null ? void 0 : _w.height) || 48
+          }
         } : void 0,
-        themeColor: ((_x = (_w = (_v = config == null ? void 0 : config.page) == null ? void 0 : _v.login) == null ? void 0 : _w.ui) == null ? void 0 : _x.themeColor) || "#7F56D9",
+        themeColor: ((_z = (_y = (_x = config == null ? void 0 : config.page) == null ? void 0 : _x.login) == null ? void 0 : _y.ui) == null ? void 0 : _z.themeColor) || "#7F56D9",
         formLabels: {
           email: { show: false },
           phone: { show: false },
@@ -275,7 +279,7 @@ var AuthModal = () => {
     };
   }, [config, channel, emailLinkVerification, localesInitialized]);
   const register2Config = (0, import_react.useMemo)(() => {
-    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
     if (!localesInitialized) {
       return {
         registrationMethods: [],
@@ -395,10 +399,14 @@ var AuthModal = () => {
           show: config.logo ? true : false,
           url: config.logo,
           // 直接从 config.logo 读取
-          position: "center"
+          position: "center",
+          size: {
+            width: ((_l = config == null ? void 0 : config.logoSize) == null ? void 0 : _l.width) || 48,
+            height: ((_m = config == null ? void 0 : config.logoSize) == null ? void 0 : _m.height) || 48
+          }
         } : void 0,
-        themeColor: ((_n = (_m = (_l = config.page) == null ? void 0 : _l.register) == null ? void 0 : _m.ui) == null ? void 0 : _n.themeColor) || "#7F56D9",
-        passwordRules: transformPasswordRules((_o = config.auth) == null ? void 0 : _o.password),
+        themeColor: ((_p = (_o = (_n = config.page) == null ? void 0 : _n.register) == null ? void 0 : _o.ui) == null ? void 0 : _p.themeColor) || "#7F56D9",
+        passwordRules: transformPasswordRules((_q = config.auth) == null ? void 0 : _q.password),
         // 传递密码规则
         formLabels: {
           email: { show: false },

package/lib/pro/Login2.0/index.less

@@ -326,21 +326,21 @@
     .login2-submit-button {
       height: 44px;
       border-radius: 8px;
-      border: 1px solid var(--theme-color, #7f56d9);
-      background: var(--theme-color, #7f56d9);
+      border: 1px solid var(--custom-button-bg-color, var(--theme-color, #7f56d9));
+      background: var(--custom-button-bg-color, var(--theme-color, #7f56d9));
       box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
       font-size: 16px;
       font-weight: 600;
-      color: #ffffff;
+      color: var(--custom-button-text-color, #ffffff);
 
       &:hover:not(:disabled) {
-        background: #6941c6;
-        border-color: #6941c6;
+        background: var(--custom-button-bg-color, #6941c6);
+        border-color: var(--custom-button-bg-color, #6941c6);
       }
 
       &:focus {
-        background: var(--theme-color, #7f56d9);
-        border-color: var(--theme-color, #7f56d9);
+        background: var(--custom-button-bg-color, var(--theme-color, #7f56d9));
+        border-color: var(--custom-button-bg-color, var(--theme-color, #7f56d9));
         box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05),
           0px 0px 0px 4px rgba(127, 86, 217, 0.1);
       }

package/lowcode/wallet-pass-detail/meta.ts

@@ -0,0 +1,89 @@
+const Meta = {
+  componentName: 'WalletPassDetail',
+  title: 'WalletPassDetail',
+  docUrl: '',
+  screenshot: '',
+  devMode: 'proCode',
+  npm: {
+    package: '@pisell/private-materials',
+    version: '1.1.558',
+    exportName: 'WalletPassDetail',
+    main: 'src/index.ts',
+    destructuring: true,
+    subName: '',
+  },
+  configure: {
+    props: [
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "详情数据",
+            "zh-CN": "详情数据"
+          }
+        },
+        "name": "dataSource",
+        "setter": ["JsonSetter", "VariableSetter"],
+      },
+      {
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "平台",
+            "zh-CN": "平台"
+          }
+        },
+        "name": "platform",
+        "setter": "StringSetter",
+      },
+      {
+        name: 'buttonGroupList',
+        "title": {
+          "label": {
+            "type": "i18n",
+            "en-US": "按钮组列表",
+            "zh-CN": "按钮组列表"
+          }
+        },
+        type: 'array',
+        default: [],
+        setter: 'ArraySetter',
+        itemSetter: {
+          componentName: 'ObjectSetter',
+          props: {
+            itemSetter: {
+              componentName: 'ObjectSetter',
+              props: {
+                itemSetter: 'StringSetter',
+              },
+            },
+          },
+        },
+      },
+      {
+        name: 'showTimeLine',
+        title: { label: '显示时间轴', tip: 'showTimeLine | 显示时间轴' },
+        setter: 'BoolSetter',
+      },
+    ],
+    supports: {},
+    component: {},
+  },
+};
+const snippets = [
+  {
+    title: 'wallet详情',
+    screenshot: '',
+    schema: {
+      componentName: 'WalletPassDetail',
+      props: {
+
+      },
+    },
+  },
+];
+
+export default {
+  ...Meta,
+  snippets,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.4.54",
+  "version": "3.4.56",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,10 +61,10 @@
     "decimal.js": "^10.4.3",
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
-    "@pisell/date-picker": "3.0.3",
-    "@pisell/materials": "3.3.70",
     "@pisell/utils": "3.0.1",
-    "@pisell/icon": "0.0.11"
+    "@pisell/date-picker": "3.0.3",
+    "@pisell/icon": "0.0.11",
+    "@pisell/materials": "3.3.71"
   },
   "peerDependencies": {
     "react": "^18.0.0",