@pisell/materials 6.6.2 → 6.6.3

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;
@@ -61,9 +90,15 @@
     z-index: 2;
   }
 
+  .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;
@@ -75,6 +110,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;
@@ -85,30 +141,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: 20px;
-        overflow: hidden;
-        text-overflow: ellipsis;
+        transform: translateY(2px);
+        margin-right: 2px;
       }
     }
   }
@@ -167,16 +227,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;
     }
   }
 
@@ -211,10 +273,6 @@
     line-height: 20px;
   }
 
-  .pisell-card-amount-wrap {
-    display: block;
-  }
-
   .pisell-wallet-pass-card-redeem {
     visibility: hidden;
     flex-direction: row;
@@ -252,7 +310,7 @@
     }
   }
 
-  .pisell-wallet-pass-card-balance {
+  .pisell-card-amount-item-balance {
     flex-direction: row;
     align-items: center;
 
@@ -279,6 +337,10 @@
       height: 20px;
     }
   }
+
+  .pisell-card-warn-message {
+    padding: 6px 16px;
+  }
 }
 
 .pisell-wallet-pass-card-detail-modal,

package/lib/components/productCard/cartSkuCard/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/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/walletCard/index.d.ts

@@ -66,6 +66,12 @@ export interface WalletCardProps {
     showViewPin?: boolean;
     /** 查看PIN的回调 */
     onViewPinClick?: () => void;
+    /** 是否显示持有人 */
+    showHolderName?: boolean;
+    /** 持有人, 表单记录，展示时一般取main_field */
+    holder?: any;
+    /** 持有人点击回调 */
+    onSetHolder?: (currentValue?: any) => void;
 }
 declare const WalletCard: React.FC<WalletCardProps>;
 export default WalletCard;

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/index.d.ts

@@ -26,6 +26,7 @@ export { default as DataSourceTypography } from './components/dataSourceComponen
 export { default as DataSourceTable } from './components/dataSourceComponents/dataSourceTable';
 export { default as DataSourceWrapper } from './components/dataSourceComponents/dataSourceWrapper';
 export { default as FormItemCheckbox } from './components/dataSourceComponents/fields/Checkbox';
+export { default as FormItemSwitch } from './components/dataSourceComponents/fields/Switch';
 export { default as FormItemColorPicker } from './components/dataSourceComponents/fields/ColorPicker';
 export { default as FormItemDatePicker } from './components/dataSourceComponents/fields/DatePicker';
 export { default as FormItemInput } from './components/dataSourceComponents/fields/Input';

package/lib/index.js

@@ -85,6 +85,7 @@ __export(src_exports, {
   FormItemInputNumber: () => import_InputNumber.default,
   FormItemRadio: () => import_Radio.default,
   FormItemSelect: () => import_Select.default,
+  FormItemSwitch: () => import_Switch.default,
   FormItemTimePicker: () => import_TimePicker.default,
   FormItemTranslation: () => import_Translation.default,
   FormItemUpload: () => import_Upload.default,
@@ -237,6 +238,7 @@ var import_dataSourceTypography = __toESM(require("./components/dataSourceCompon
 var import_dataSourceTable = __toESM(require("./components/dataSourceComponents/dataSourceTable"));
 var import_dataSourceWrapper = __toESM(require("./components/dataSourceComponents/dataSourceWrapper"));
 var import_Checkbox = __toESM(require("./components/dataSourceComponents/fields/Checkbox"));
+var import_Switch = __toESM(require("./components/dataSourceComponents/fields/Switch"));
 var import_ColorPicker = __toESM(require("./components/dataSourceComponents/fields/ColorPicker"));
 var import_DatePicker = __toESM(require("./components/dataSourceComponents/fields/DatePicker"));
 var import_Input = __toESM(require("./components/dataSourceComponents/fields/Input"));
@@ -408,6 +410,7 @@ var import_auto_resize_text = __toESM(require("./components/auto-resize-text"));
   FormItemInputNumber,
   FormItemRadio,
   FormItemSelect,
+  FormItemSwitch,
   FormItemTimePicker,
   FormItemTranslation,
   FormItemUpload,

package/lib/locales/en-US.d.ts

@@ -284,6 +284,8 @@ declare const _default: {
     'pisell-wallet-pass-card-status-lastPayment': string;
     'pisell-wallet-pass-card-reset': string;
     'pisell-wallet-pass-card-done': string;
+    'pisell2.wallet-card.add-holder-tip': string;
+    'pisell2.wallet-card.add-holder-button-text': string;
     'pisell-camera-no-camera-accessible': string;
     'pisell-camera-permission-denied': string;
     'pisell-camera-switch-camera': string;

package/lib/locales/en-US.js

@@ -338,6 +338,8 @@ var en_US_default = {
   "pisell-wallet-pass-card-status-lastPayment": "Last Payment",
   "pisell-wallet-pass-card-reset": "Reset",
   "pisell-wallet-pass-card-done": "Done",
+  "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",
   // 相机组件
   "pisell-camera-no-camera-accessible": "No camera accessible",
   "pisell-camera-permission-denied": "Permission denied",

package/lib/locales/zh-CN.d.ts

@@ -279,6 +279,8 @@ declare const _default: {
     'pisell-wallet-pass-card-status-lastPayment': string;
     'pisell-wallet-pass-card-reset': string;
     'pisell-wallet-pass-card-done': string;
+    'pisell2.wallet-card.add-holder-tip': string;
+    'pisell2.wallet-card.add-holder-button-text': string;
     'pisell-camera-no-camera-accessible': string;
     'pisell-camera-permission-denied': string;
     'pisell-camera-switch-camera': string;

package/lib/locales/zh-CN.js

@@ -329,6 +329,8 @@ var zh_CN_default = {
   "pisell-wallet-pass-card-status-lastPayment": "上次结算",
   "pisell-wallet-pass-card-reset": "清空",
   "pisell-wallet-pass-card-done": "保存",
+  "pisell2.wallet-card.add-holder-tip": "为确保您的权益，此卡\r\n需指定使用人后方可激活使用。",
+  "pisell2.wallet-card.add-holder-button-text": "添加持有人",
   // 相机组件
   "pisell-camera-no-camera-accessible": "没有找到摄像头",
   "pisell-camera-permission-denied": "没有权限使用摄像头",

package/lib/locales/zh-TW.d.ts

@@ -279,6 +279,8 @@ declare const _default: {
     'pisell-wallet-pass-card-status-lastPayment': string;
     'pisell-wallet-pass-card-reset': string;
     'pisell-wallet-pass-card-done': string;
+    'pisell2.wallet-card.add-holder-tip': string;
+    'pisell2.wallet-card.add-holder-button-text': string;
     'pisell-camera-no-camera-accessible': string;
     'pisell-camera-permission-denied': string;
     'pisell-camera-switch-camera': string;

package/lib/locales/zh-TW.js

@@ -330,6 +330,8 @@ var zh_TW_default = {
   "pisell-wallet-pass-card-status-lastPayment": "上次結算",
   "pisell-wallet-pass-card-reset": "清空",
   "pisell-wallet-pass-card-done": "保存",
+  "pisell2.wallet-card.add-holder-tip": "為確保您的權益，此卡\r\n需指定使用人後方可激活使用。",
+  "pisell2.wallet-card.add-holder-button-text": "添加使用人",
   // 相机组件
   "pisell-camera-no-camera-accessible": "沒有找到攝像頭",
   "pisell-camera-permission-denied": "沒有權限使用攝像頭",

package/lowcode/data-source-form/constants.ts

@@ -1,4 +1,5 @@
 import formItemCheckboxMeta from '../form-item-checkbox/meta';
+import formItemSwitchMeta from '../form-item-switch/meta';
 import formItemCheckboxGroupMeta from '../form-item-checkbox.group/meta';
 import formItemColorPickerMeta from '../form-item-color-picker/meta';
 import formItemDatePickerMeta from '../form-item-date-picker/meta';
@@ -19,6 +20,7 @@ import formItemUploadMeta from '../form-item-upload/meta';
 
 export const metaAll = [
   formItemCheckboxMeta,
+  formItemSwitchMeta,
   formItemCheckboxGroupMeta,
   formItemColorPickerMeta,
   formItemDatePickerMeta,
@@ -67,6 +69,7 @@ export const nocobaseCpt2PisellCptMap: Record<string, any> = {
   TimePicker: 'FormItemTimePicker',
   ColorPicker: 'FormItemColorPicker',
   Checkbox: 'FormItemCheckbox',
+  Switch: 'FormItemSwitch',
   'Radio.Group': 'FormItemRadio.Group',
   'Checkbox.Group': 'FormItemCheckbox.Group',
   Upload: 'FormItemUpload',