@pisell/materials 3.3.73 → 3.3.74

package/lib/components/pisellWalletPassCard/index.less

@@ -8,6 +8,35 @@
   position: relative;
   overflow: hidden;
 
+  .pisell-wallet-add-holder-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.6);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 16px;
+    z-index: 9;
+
+    &-text {
+      color: #fff;
+      text-align: center;
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 600;
+      line-height: 24px;
+      white-space: pre-line;
+    }
+
+    &-button {
+      font-weight: bold;
+    }
+  }
+
   .actions-dropdown-trigger {
     position: absolute;
     top: 16px;
@@ -49,10 +78,15 @@
     justify-content: space-between;
   }
 
+  .pisell-card-name-info-wrap {
+    // 避免子组件 display: inline-block 产生的幽灵间距
+    font-size: 0px;
+  }
+
   .pisell-card-name-wrap {
     font-weight: 500;
     line-height: 20px;
-
+    font-size: 14px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -64,6 +98,27 @@
     }
   }
 
+  .pisell-card-holder-name {
+    cursor: pointer;
+    display: inline-block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    padding: 2px 8px;
+    border-radius: 16px;
+    max-width: 60%;
+    height: 22px;
+    min-width: 50px;
+    text-align: center;
+    line-height: 16px;
+    font-size: 12px;
+    font-style: normal;
+    font-weight: 500;
+    background-color: #475467;
+    color: white;
+    margin: 4px 0;
+  }
+
   .pisell-card-store-name {
     height: 20px;
     font-size: 12px;
@@ -74,30 +129,34 @@
     text-overflow: ellipsis;
   }
 
-  .pisell-card-amount-wrap {
+  .pisell-card-amount-item {
     display: flex;
-    margin-bottom: 4px;
+    flex-direction: row;
+    align-items: center;
+    margin-right: 16px;
+    overflow: hidden;
 
-    .pisell-card-amount-item {
-      display: flex;
-      flex-direction: column;
-      margin-right: 16px;
+    .pisell-card-amount-item-label {
+      color: var(--Gray-500, #667085);
+      font-weight: 400;
+      line-height: 20px;
+      height: 20px;
+      white-space: nowrap;
+    }
+
+    .pisell-card-amount-item-value {
+      font-size: 20px;
+      font-weight: 600;
+      line-height: 30px;
       overflow: hidden;
+      text-overflow: ellipsis;
+    }
 
+    &-balance,
+    &-discount {
       .pisell-card-amount-item-label {
-        color: var(--Gray-500, #667085);
-        font-weight: 400;
-        line-height: 20px;
-        height: 20px;
-        white-space: nowrap;
-      }
-
-      .pisell-card-amount-item-value {
-        font-size: 20px;
-        font-weight: 600;
-        line-height: 30px;
-        overflow: hidden;
-        text-overflow: ellipsis;
+        transform: translateY(2px);
+        margin-right: 2px;
       }
     }
   }
@@ -156,16 +215,18 @@
   color: var(--Gray-500, #667085);
   padding-bottom: 30px;
 
-  .pisell-card-amount-wrap {
-    .pisell-card-amount-item {
-      flex-direction: row;
-      align-items: center;
+  .pisell-card-amount-item {
+    flex-direction: row;
+    align-items: center;
 
-      .pisell-card-amount-item-value {
-        font-size: 14px;
-        font-weight: 400;
-        line-height: 20px;
-      }
+    .pisell-card-amount-item-label {
+      transform: unset !important;
+    }
+
+    .pisell-card-amount-item-value {
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 20px;
     }
   }
 
@@ -200,10 +261,6 @@
     line-height: 20px;
   }
 
-  .pisell-card-amount-wrap {
-    display: block;
-  }
-
   .pisell-wallet-pass-card-redeem {
     visibility: hidden;
     flex-direction: row;
@@ -224,7 +281,7 @@
     }
   }
 
-  .pisell-wallet-pass-card-balance {
+  .pisell-card-amount-item-balance {
     flex-direction: row;
     align-items: center;
 
@@ -242,6 +299,10 @@
     bottom: 16px;
     right: 16px;
   }
+
+  .pisell-card-warn-message {
+    padding: 6px 16px;
+  }
 }
 
 .pisell-wallet-pass-card-detail-modal,

package/lib/components/productCard/components/Time/components/SelectHolder/index.js

@@ -98,6 +98,7 @@ var SelectHolder = ({
         mode: holderMode,
         size: "large",
         showSearch: true,
+        optionFilterProp: "label",
         allowClear,
         onClear: () => onChange(""),
         value: selectedValue,

package/lib/components/select-time/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { VirtualKeyboardTimeProps } from "../virtual-keyboard/Time";
 import { PopoverProps, TimePickerProps } from "antd";
 import "./index.less";

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

@@ -1,5 +1,5 @@
 declare const useGapSize: (gap: number | number[]) => {
-    horizontal: number;
-    vertical: number;
+    horizontal: any;
+    vertical: any;
 };
 export default useGapSize;

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const fieldMaps: {
     text: {
         field: {
@@ -197,12 +198,12 @@ export declare const fieldList: ({
     field_icon: string;
     field_name: string;
     field_type: string;
-    default_value: boolean;
+    default_value: string;
 } | {
     field_icon: string;
     field_name: string;
     field_type: string;
-    default_value: string;
+    default_value: boolean;
 } | {
     field_icon: string;
     field_name: string;

package/lib/components/table/Table/fields/select/filterUtil/index.d.ts

@@ -2,4 +2,4 @@ export default function ({ value, key, item, }: {
     value: string | string[];
     key: string | string[];
     item: Record<string, any>;
-}): boolean;
+}): any;

package/lib/components/table/Table/fields/treeSelect/filterUtil/index.d.ts

@@ -2,4 +2,4 @@ export default function ({ value, key, item, }: {
     value: string | string[] | Record<string, any>[];
     key: string | string[];
     item: Record<string, any>;
-}): boolean;
+}): any;

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;
-}) => ("filters" | "order_by" | "group_by" | "column_setting" | "view_mode" | "gallery_setting" | "filter_setting")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filters" | "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/walletCard/index.js

@@ -62,6 +62,10 @@ var DEFAULT_PROPS = {
   showCode: true,
   walletName: "Level",
   isLogin: true,
+  showHolderName: true,
+  holder: null,
+  onSetHolder: () => {
+  },
   items: [
     {
       type: "rechargeable",
@@ -166,7 +170,9 @@ var CardHeader = ({
   onCodeClick,
   isLogin = false,
   showViewPin = false,
-  onViewPinClick
+  onViewPinClick,
+  showHolderName,
+  holderName
 }) => {
   const processedShowIcon = toBooleanValue(showIcon);
   const processedShowWalletName = toBooleanValue(showWalletName);
@@ -181,7 +187,7 @@ var CardHeader = ({
       alt: "wallet icon",
       style: { width: "20px", height: "20px" }
     }
-  )) : null, processedShowWalletName && walletName && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-header-level-text" }, walletName)), processedShowShopName && shopName && /* @__PURE__ */ import_react.default.createElement("div", null, shopName), processedShowCardNo && cardNo && /* @__PURE__ */ import_react.default.createElement("div", null, cardNo), processedShowViewPin && /* @__PURE__ */ import_react.default.createElement(
+  )) : null, processedShowWalletName && walletName && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-card-header-level-text" }, walletName)), showHolderName && /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-wallet-card-header-holder-name") }, holderName), processedShowShopName && shopName && /* @__PURE__ */ import_react.default.createElement("div", null, shopName), processedShowCardNo && cardNo && /* @__PURE__ */ import_react.default.createElement("div", null, cardNo), processedShowViewPin && /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: "pisell-wallet-card-header-view-pin",
@@ -307,7 +313,10 @@ var WalletCard = (props) => {
     onClick,
     className,
     style,
-    isGuide
+    isGuide,
+    showHolderName,
+    holder,
+    onSetHolder
   } = mergedProps;
   const showIcon = toBooleanValue(mergedProps.showIcon);
   const showWalletName = toBooleanValue(mergedProps.showWalletName);
@@ -350,11 +359,13 @@ var WalletCard = (props) => {
     if (!(items == null ? void 0 : items.length)) {
       return;
     }
+    const data = {
+      id: props.id,
+      holder_id: holder == null ? void 0 : holder.holder_id
+    };
     utils == null ? void 0 : utils.action({
       type: "pisell1.goWallet",
-      data: {
-        id: props.id
-      },
+      data,
       callback: () => {
       }
     });
@@ -367,6 +378,32 @@ var WalletCard = (props) => {
       console.error("onViewPinClick方法需要传入");
     }
   };
+  const _renderMask = () => {
+    if (typeof onSetHolder !== "function") return null;
+    if ((holder == null ? void 0 : holder.holder_type) === "form" && !(holder == null ? void 0 : holder.holder_id)) {
+      return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-add-holder-mask" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-add-holder-mask-text" }, (0, import_locales.getText)("pisell2.wallet-card.add-holder-tip")), /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Button,
+        {
+          type: "primary",
+          className: "pisell-wallet-add-holder-mask-button",
+          onClick: () => onSetHolder == null ? void 0 : onSetHolder()
+        },
+        (0, import_locales.getText)("pisell2.wallet-card.add-holder-button-text"),
+        /* @__PURE__ */ import_react.default.createElement(import_iconfont.default, { type: "pisell2-user-edit", style: { fontSize: 16 } })
+      ));
+    }
+    return null;
+  };
+  const _showHolderName = (0, import_react.useMemo)(() => {
+    return (holder == null ? void 0 : holder.holder_type) === "form" && showHolderName;
+  }, [holder, showHolderName]);
+  const holderName = (0, import_react.useMemo)(() => {
+    var _a2;
+    if ((holder == null ? void 0 : holder.holder_type) === "form" && !(holder == null ? void 0 : holder.holder_id)) {
+      return "--";
+    }
+    return ((_a2 = holder == null ? void 0 : holder.detail) == null ? void 0 : _a2.main_field) || "";
+  }, [holder]);
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -382,6 +419,7 @@ var WalletCard = (props) => {
           flexDirection: codeDirection === "top" ? "column-reverse" : "column"
         }
       },
+      _renderMask(),
       /* @__PURE__ */ import_react.default.createElement(
         "div",
         {
@@ -417,7 +455,9 @@ var WalletCard = (props) => {
               onCodeClick: handleCodeClick,
               isLogin,
               showViewPin,
-              onViewPinClick
+              onViewPinClick,
+              showHolderName: _showHolderName,
+              holderName
             }
           ),
           /* @__PURE__ */ import_react.default.createElement(

package/lib/components/walletCard/index.less

@@ -9,6 +9,36 @@
     width: 100%;
     display: flex;
     cursor: pointer;
+    position: relative;
+  }
+
+  .pisell-wallet-add-holder-mask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.6);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 16px;
+    z-index: 9;
+
+    &-text {
+      color: #fff;
+      text-align: center;
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 600;
+      line-height: 24px;
+      white-space: pre-line;
+    }
+
+    &-button {
+      font-weight: bold;
+    }
   }
 
   // 卡片内容区域
@@ -35,6 +65,12 @@
           color: #fff;
         }
       }
+
+      .pisell-wallet-card-header-holder-name {
+        color: var(--Gray-900, #101828);
+        border: 1px solid var(--Gray-100, #f2f4f7);
+        background: var(--Gray-100, #f2f4f7);
+      }
     }
 
     // 亮色主题
@@ -54,6 +90,12 @@
           color: #101828;
         }
       }
+
+      .pisell-wallet-card-header-holder-name {
+        color: #fff;
+        border: 1px solid var(--Gray-600, #475467);
+        background: var(--Gray-600, #475467);
+      }
     }
   }
 
@@ -66,6 +108,25 @@
     display: flex;
     justify-content: space-between;
     align-items: flex-start;
+    min-height: 100px;
+
+    .pisell-wallet-card-header-holder-name {
+      cursor: pointer;
+      display: inline-block;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      padding: 2px 8px;
+      border-radius: 16px;
+      height: 22px;
+      min-width: 50px;
+      text-align: center;
+      font-size: 12px;
+      line-height: 16px;
+      max-width: 100%;
+      font-style: normal;
+      font-weight: 500;
+    }
 
     // 头部左侧
     .pisell-wallet-card-header-left {
@@ -78,7 +139,7 @@
         display: flex;
         align-items: center;
         gap: 10px;
-        margin-bottom: 8px;
+        margin-bottom: 4px;
 
         // 卡片名称文本
         .pisell-wallet-card-header-level-text {
@@ -157,7 +218,7 @@
 
   // 卡片内容列表
   .pisell-wallet-card-list {
-    margin-top: 30px;
+    margin-top: unset;
     height: 50px;
     box-sizing: border-box;
     display: flex;

package/lib/locales/en-US.js

@@ -325,7 +325,9 @@ var en_US_default = {
   "pisell-login-and-register-register-button-text": "Create account",
   "pisell-login-and-register-remember-me": "Remember me",
   "pisell-login-and-register-forgot-password": "Forgot password?",
-  // 商品券组件
+  // 钱包卡片组件
+  "pisell2.wallet-card.add-holder-tip": "To ensure your benefits, please\r\nassign a holder to activate this card.",
+  "pisell2.wallet-card.add-holder-button-text": "Set Holder",
   "pisell2.text.goodpass.product-vouchers": "Promotions & Vouchers",
   "pisell2.text.goodpass.last-settlement": "(Last payment)",
   "pisell2.text.goodpass.view-more": "View More",

package/lib/locales/zh-CN.js

@@ -316,7 +316,9 @@ var zh_CN_default = {
   "pisell-login-and-register-register-button-text": "创建账户",
   "pisell-login-and-register-remember-me": "记住我",
   "pisell-login-and-register-forgot-password": "忘记密码？",
-  // 商品券
+  // 钱包卡片组件
+  "pisell2.wallet-card.add-holder-tip": "为确保您的权益，此卡\r\n需指定使用人后方可激活使用。",
+  "pisell2.wallet-card.add-holder-button-text": "添加持有人",
   "pisell2.text.goodpass.product-vouchers": "优惠促销",
   "pisell2.text.goodpass.last-settlement": "(上次结算)",
   "pisell2.text.goodpass.view-more": "查看更多",

package/lib/locales/zh-TW.js

@@ -318,6 +318,9 @@ var zh_TW_default = {
   "pisell-login-and-register-register-button-text": "創建帳戶",
   "pisell-login-and-register-remember-me": "記住我",
   "pisell-login-and-register-forgot-password": "忘記密碼？",
+  // 钱包卡片组件
+  "pisell2.wallet-card.add-holder-tip": "為確保您的權益，此卡\r\n需指定使用人後方可激活使用。",
+  "pisell2.wallet-card.add-holder-button-text": "添加使用人",
   "pisell2.text.goodpass.product-vouchers": "優惠促銷",
   "pisell2.text.goodpass.last-settlement": "(上次結算)",
   "pisell2.text.goodpass.view-more": "查看更多",

package/lib/utils/index.d.ts

@@ -1,4 +1,4 @@
 export declare const isBrowser: boolean;
-export declare const getCssNumber: (val: string | number) => string;
+export declare const getCssNumber: (val: string | number) => string | number;
 export declare function uuid(): string;
 export * from './mergeWith';

package/lib/utils/platform.d.ts

@@ -1 +1 @@
-export declare const isMobile: () => boolean;
+export declare const isMobile: () => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "3.3.73",
+  "version": "3.3.74",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -73,8 +73,8 @@
     "vod-js-sdk-v6": "^1.4.11",
     "react-camera-pro": "1.4.0",
     "@pisell/date-picker": "3.0.3",
-    "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.1"
+    "@pisell/utils": "3.0.1",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",

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

@@ -1,4 +0,0 @@
-import { AppVersionControlProps } from './types';
-import './index.less';
-declare const AppVersionControl: (props: AppVersionControlProps) => JSX.Element;
-export default AppVersionControl;

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

@@ -1,3 +0,0 @@
-import './index.less';
-declare const _default: (props: any) => JSX.Element;
-export default _default;

package/es/components/dataSourceComponents/dataSourceForm/provider/formSetting/FormSettingContext.d.ts

@@ -1,16 +0,0 @@
-/// <reference types="react" />
-import { ModeType } from '../../type';
-export interface FormSettingContextType {
-    onDataSourceFinish?: (values: any, result: any, form: any) => void;
-    renderMode?: ModeType;
-    groupInfoPosition?: 'top' | 'side';
-    children?: React.ReactNode;
-    currentValue?: 'server' | 'local';
-    size?: 'small' | 'middle' | 'large';
-    formatSubmitValues?: (values: Record<string, any>) => Record<string, any>;
-    formatInitialValues?: (values: Record<string, any>) => Record<string, any>;
-    customSubmit?: (values: Record<string, any>) => Promise<any>;
-    beforeSubmit?: (values: Record<string, any>) => Promise<boolean> | boolean;
-}
-export declare const FormSettingContext: import("react").Context<FormSettingContextType>;
-export default FormSettingContext;

package/es/components/dataSourceComponents/dataSourceForm/provider/formSetting/FormSettingProvider.d.ts

@@ -1,8 +0,0 @@
-import React from 'react';
-import { FormSettingContextType } from './FormSettingContext';
-/**
- * @title: 表单设置Provider
- * @description: 提供表单设置信息
- */
-declare const FormSettingProvider: React.FC<FormSettingContextType>;
-export default FormSettingProvider;