@pisell/materials 6.3.16 → 6.3.17

package/lib/components/table/hooks/useTransColumns.d.ts

@@ -0,0 +1,14 @@
+import { FormInstance } from "antd/es/form";
+declare type UseTransColumnsProps = {
+    columns: Record<string, any>[];
+    form: FormInstance;
+    localPagination: boolean;
+    handleSave?: (row: Record<string, any>) => void;
+    handleResize?: (index: number, record: Record<string, any>) => (e: any, p2: any) => void;
+    dragSort: boolean;
+    bordered: boolean;
+};
+declare const useTransColumns: (params: UseTransColumnsProps) => {
+    columns: any[];
+};
+export default useTransColumns;

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

@@ -84,6 +84,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,
@@ -233,6 +234,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"));
@@ -400,6 +402,7 @@ var import_pisellGoodPassCard = __toESM(require("./components/pisellGoodPassCard
   FormItemInputNumber,
   FormItemRadio,
   FormItemSelect,
+  FormItemSwitch,
   FormItemTimePicker,
   FormItemTranslation,
   FormItemUpload,

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

@@ -273,6 +273,8 @@ declare const _default: {
     'pisell-login-and-register-register-button-text': string;
     'pisell-login-and-register-remember-me': string;
     'pisell-login-and-register-forgot-password': string;
+    'pisell2.wallet-card.add-holder-tip': string;
+    'pisell2.wallet-card.add-holder-button-text': string;
     'pisell2.text.goodpass.product-vouchers': string;
     'pisell2.text.goodpass.last-settlement': string;
     'pisell2.text.goodpass.view-more': string;

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

@@ -268,6 +268,8 @@ declare const _default: {
     'pisell-login-and-register-register-button-text': string;
     'pisell-login-and-register-remember-me': string;
     'pisell-login-and-register-forgot-password': string;
+    'pisell2.wallet-card.add-holder-tip': string;
+    'pisell2.wallet-card.add-holder-button-text': string;
     'pisell2.text.goodpass.product-vouchers': string;
     'pisell2.text.goodpass.last-settlement': string;
     'pisell2.text.goodpass.view-more': string;

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

@@ -268,6 +268,8 @@ declare const _default: {
     'pisell-login-and-register-register-button-text': string;
     'pisell-login-and-register-remember-me': string;
     'pisell-login-and-register-forgot-password': string;
+    'pisell2.wallet-card.add-holder-tip': string;
+    'pisell2.wallet-card.add-holder-button-text': string;
     'pisell2.text.goodpass.product-vouchers': string;
     'pisell2.text.goodpass.last-settlement': string;
     'pisell2.text.goodpass.view-more': string;

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/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',

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

@@ -109,33 +109,75 @@ const dataSourceForm: MetaType = {
               if (value.isSelect) {
                 target.getProps().setPropValue('title', '');
                 target.node.children.importSchema([]);
-              }
 
-              let childrenSchemas = fields2ChildrenSchemas(
-                value.item.fields,
-                target.getProps().getPropValue('renderMode')
-              );
+                // 检查是否fields包含group信息
+                const hasGroupInfo = value.item.fields?.some((field: any) => field._groupId);
+                
+                let formGroupSchemas: any[] = [];
+                
+                if (hasGroupInfo) {
+                  // 按group分组
+                  const groupedFields = new Map<string, { groupTitle: string; items: any[] }>();
+                  
+                  value.item.fields.forEach((field: any) => {
+                    const groupId = field._groupId;
+                    if (!groupedFields.has(groupId)) {
+                      groupedFields.set(groupId, {
+                        groupTitle: field._groupTitle,
+                        items: []
+                      });
+                    }
+                    // 移除group标记，避免污染
+                    const { _groupId, _groupTitle, ...cleanField } = field;
+                    groupedFields.get(groupId)!.items.push(cleanField);
+                  });
+                  
+                  // 为每个group创建一个FormGroup
+                  groupedFields.forEach(({ groupTitle, items }) => {
+                    const childrenSchemas = fields2ChildrenSchemas(
+                      items,
+                      target.getProps().getPropValue('renderMode')
+                    );
+                    formGroupSchemas.push(
+                      createFormGroup(childrenSchemas, groupTitle)
+                    );
+                  });
+                } else {
+                  // 原有逻辑：没有group信息时，创建单个FormGroup
+                  let childrenSchemas = fields2ChildrenSchemas(
+                    value.item.fields,
+                    target.getProps().getPropValue('renderMode')
+                  );
+                  formGroupSchemas = [createFormGroup(childrenSchemas)];
+                }
 
-              if (target.node.children.isEmptyNode) {
-                target.node.children.importSchema([
-                  createFormGroup(childrenSchemas),
-                  createSubmitButton(),
-                ]);
-              }
-              // 如果Title是空：选择Source后，自动把Source的名称填写到Title里
-              if (
-                !target.node.getProps().getPropValue('title') &&
-                value.title
-              ) {
-                target.getProps().setPropValue('title', value.title);
+                if (target.node.children.isEmptyNode) {
+                  target.node.children.importSchema([
+                    ...formGroupSchemas,
+                    createSubmitButton(),
+                  ]);
+                }
+                // 如果Title是空：选择Source后，自动把Source的名称填写到Title里
+                if (
+                  !target.node.getProps().getPropValue('title') &&
+                  value.title
+                ) {
+                  target.getProps().setPropValue('title', value.title);
+                }
               }
 
               const dataSource = value.isVariable ? value.value : value.item;
+              
+              // 清理fields中的group标记
+              const cleanFields = value.item.fields?.map((field: any) => {
+                const { _groupId, _groupTitle, ...cleanField } = field;
+                return cleanField;
+              }) || value.item.fields;
 
               setBatchVariables(target, [
                 {
                   label: 'currentFields',
-                  value: value.item.fields,
+                  value: cleanFields,
                 },
                 {
                   label: 'dataSourceTitle',
@@ -156,7 +198,7 @@ const dataSourceForm: MetaType = {
               return {
                 filters: {
                   tables: 'all',
-                  variables: {}
+                  variables: {},
                 },
                 mode: target.getProps().getPropValue('renderMode'),
                 variables: getDataSourceVariables(target),
@@ -168,7 +210,7 @@ const dataSourceForm: MetaType = {
           title: '字段',
           display: 'entry',
           type: 'group',
-          name: "_fields1",
+          name: '_fields1',
           items: [
             {
               title: {
@@ -261,7 +303,7 @@ const dataSourceForm: MetaType = {
             props: (target) => {
               return {
                 filters: {
-                  variables: {}
+                  variables: {},
                 },
                 variables: getCurrentValueVariables(target),
               };
@@ -270,7 +312,7 @@ const dataSourceForm: MetaType = {
         },
         {
           type: 'group',
-          name: "_extraParams",
+          name: '_extraParams',
           title: '额外参数',
           display: 'entry',
           items: [
@@ -281,7 +323,7 @@ const dataSourceForm: MetaType = {
                 'en-US': 'List Params',
                 'zh-CN': '列表参数',
               },
-              setter: 'StringSetter'
+              setter: 'StringSetter',
             },
             {
               name: 'extraParams.get',
@@ -290,7 +332,7 @@ const dataSourceForm: MetaType = {
                 'en-US': 'Get Params',
                 'zh-CN': '获取参数',
               },
-              setter: 'JsonSetter'
+              setter: 'JsonSetter',
             },
             {
               name: 'extraParams.update',
@@ -299,7 +341,7 @@ const dataSourceForm: MetaType = {
                 'en-US': 'Update Params',
                 'zh-CN': '更新参数',
               },
-              setter: 'JsonSetter'
+              setter: 'JsonSetter',
             },
             // {
             //   name: 'extraParams.create',
@@ -319,8 +361,8 @@ const dataSourceForm: MetaType = {
             //   },
             //   setter: 'StringSetter'
             // }
-          ]
-        }
+          ],
+        },
       ],
     },
     {
@@ -607,7 +649,7 @@ const dataSourceForm: MetaType = {
             },
           },
         },
-      ]
+      ],
     },
   ],
   configure: {
@@ -667,7 +709,24 @@ const dataSourceForm: MetaType = {
               componentName: 'FunctionSetter',
               props: {
                 template:
-                  "customSubmit(values,${extParams}){\n// 格式化数据\nreturn values}",
+                  'customSubmit(values,${extParams}){\n// 自定义提交逻辑\nreturn values}',
+              },
+            },
+          },
+          {
+            name: 'beforeSubmit',
+            title: {
+              label: {
+                type: 'i18n',
+                'en-US': 'Before Submit',
+                'zh-CN': '提交前校验',
+              },
+            },
+            setter: {
+              componentName: 'FunctionSetter',
+              props: {
+                template:
+                  'beforeSubmit(values,${extParams}){\n// 提交前校验逻辑\n// 返回 true 继续提交，返回 false 阻止提交\nreturn true}',
               },
             },
           },
@@ -684,7 +743,7 @@ const dataSourceForm: MetaType = {
               componentName: 'FunctionSetter',
               props: {
                 template:
-                  "formatSubmitValues(values,${extParams}){\n// 格式化数据\nreturn values}",
+                  'formatSubmitValues(values,${extParams}){\n// 格式化数据\nreturn values}',
               },
             },
           },
@@ -701,7 +760,7 @@ const dataSourceForm: MetaType = {
               componentName: 'FunctionSetter',
               props: {
                 template:
-                  "formatInitialValues(values,${extParams}){\n// 格式化数据\nreturn values}",
+                  'formatInitialValues(values,${extParams}){\n// 格式化数据\nreturn values}',
               },
             },
           },