@pisell/materials 6.7.1 → 6.7.3

package/lib/components/pisellWalletPassCard/index.js

@@ -40,6 +40,7 @@ var import_antd = require("antd");
 var import_dayjs = __toESM(require("dayjs"));
 var import_iconfont = __toESM(require("../iconfont"));
 var import__ = require("../../index");
+var import_utils = require("@pisell/utils");
 var import_pisellTags = __toESM(require("../pisellTags"));
 var import_Amount = __toESM(require("../pisellText/components/Amount"));
 var import_Amount2 = __toESM(require("../virtual-keyboard/Amount"));
@@ -64,6 +65,7 @@ var PisellWalletPassCard = (props) => {
   const [pressTimer, setPressTimer] = import_react.default.useState(
     null
   );
+  const config = (0, import__.usePisellConfig)();
   (0, import_react.useEffect)(() => {
     return () => {
       if (pressTimer) {
@@ -120,7 +122,9 @@ var PisellWalletPassCard = (props) => {
     formatBalanceTitle,
     formatRedeem,
     formatRedeemTitle,
-    maxRedeem
+    maxRedeem,
+    validDateBySchedule,
+    scheduleList
   } = props;
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
@@ -248,6 +252,12 @@ var PisellWalletPassCard = (props) => {
     }
     setLastTap(now);
   };
+  const formatValidDate = (0, import_react.useMemo)(() => {
+    if (validDateBySchedule && scheduleList && (scheduleList == null ? void 0 : scheduleList.length) > 0) {
+      return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, (0, import_locales.getText)("pisell-wallet-pass-card-valid"), " ", (0, import_utils.getScheduleSummary)(scheduleList, config == null ? void 0 : config.locale) || validDate);
+    }
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, (0, import_locales.getText)("pisell-wallet-pass-card-valid-to"), " ", !!validDate ? validDate : (0, import_locales.getText)("pisell-wallet-pass-card-expireDate"));
+  }, [validDateBySchedule, scheduleList, validDate]);
   const _onConfirmEdit = () => {
     form.validateFields().then((values) => {
       var _a;
@@ -454,7 +464,7 @@ var PisellWalletPassCard = (props) => {
         useThousandsSeparator: true,
         value: discount
       }
-    )) : /* @__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" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-card-code" }, showCode && !isMini && /* @__PURE__ */ import_react.default.createElement("div", null, code), showValidDate && /* @__PURE__ */ import_react.default.createElement("div", null, (0, import_locales.getText)("pisell-wallet-pass-card-valid-to"), " ", !!validDate ? validDate : (0, import_locales.getText)("pisell-wallet-pass-card-expireDate")))));
+    )) : /* @__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 && /* @__PURE__ */ import_react.default.createElement("div", null, formatValidDate))));
   };
   const getInputItem = (name2) => {
     if ("validDate" === name2) {

package/lib/index.js

@@ -85,9 +85,11 @@ __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,
+  GraphicTextCard: () => import_GraphicTextCard.default,
   Grid: () => import_antd.Grid,
   Icon: () => import_icon.default,
   IconSelect: () => import_iconSelect.default,
@@ -103,6 +105,7 @@ __export(src_exports, {
   Mentions: () => import_antd.Mentions,
   Menu: () => import_antd.Menu,
   Modal: () => import_modal.default,
+  MultilevelCard: () => import_MultilevelCard.default,
   OrganizationTenantSwitcher: () => import_organizationTenantSwitcher.default,
   Page: () => import_page.default,
   PageHeader: () => import_page_header.default,
@@ -113,8 +116,10 @@ __export(src_exports, {
   PisellAnchor: () => import_pisellAnchor.default,
   PisellAppCard: () => import_pisellAppCard.default,
   PisellAvatar: () => import_pisellAvatar.default,
+  PisellBasicGrid: () => import_PisellBasicGrid.default,
   PisellCard: () => import_pisellCard.default,
   PisellCardList: () => import_pisellCardList.default,
+  PisellCards: () => import_PisellCards.default,
   PisellCheckboxGroup: () => import_pisellCheckboxGroup.default,
   PisellConfigProvider: () => import_pisell_config_provider.default,
   PisellContainer: () => import_pisellContainer.default,
@@ -132,6 +137,7 @@ __export(src_exports, {
   PisellGoodPassCard: () => import_pisellGoodPassCard.default,
   PisellHeader: () => import_header.default,
   PisellHeaderProgressBar: () => import_pisellHeaderProgressBar.default,
+  PisellImageCard: () => import_PisellImageCard.default,
   PisellImageCarousels: () => import_pisellImageCarousels.default,
   PisellInformationEntry: () => import_pisellInformationEntry.default,
   PisellInput: () => import_pisellInput.default,
@@ -147,9 +153,13 @@ __export(src_exports, {
   PisellQrcode: () => import_pisellQrcode.default,
   PisellRow: () => import_pisellRow.default,
   PisellScan: () => import_pisellScan.default,
+  PisellScrollView: () => import_PisellScrollView.PisellScrollView,
   PisellSectionHeaders: () => import_pisellSectionHeaders.default,
   PisellSider: () => import_sider.default,
   PisellStatisticList: () => import_pisellStatisticList.default,
+  PisellSteps: () => import_PisellSteps.default,
+  PisellSuperTabs: () => import_PisellSuperTabs.default,
+  PisellTabbar: () => import_PisellTabbar.default,
   PisellTags: () => import_pisellTags.default,
   PisellText: () => import_pisellText.default,
   PisellToast: () => import_pisellToast.default,
@@ -183,9 +193,11 @@ __export(src_exports, {
   Steps: () => import_antd.Steps,
   SubmitButton: () => import_submitButton.default,
   Switch: () => import_antd.Switch,
+  TabCard: () => import_TabCard.default,
   Table: () => import_table.default,
   Tabs: () => import_tabs.default,
   Tag: () => import_antd.Tag,
+  TextCard: () => import_TextCard.default,
   TimePicker: () => import_time_picker.default,
   Timeline: () => import_antd.Timeline,
   Tooltip: () => import_antd.Tooltip,
@@ -237,6 +249,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"));
@@ -275,6 +288,8 @@ var import_pisellAnchor = __toESM(require("./components/pisellAnchor"));
 var import_pisellAvatar = __toESM(require("./components/pisellAvatar"));
 var import_pisellCard = __toESM(require("./components/pisellCard"));
 var import_pisellCardList = __toESM(require("./components/pisellCardList"));
+var import_PisellCards = __toESM(require("./components/PisellCards"));
+var import_TabCard = __toESM(require("./components/PisellCards/components/TabCard"));
 var import_pisellCheckboxGroup = __toESM(require("./components/pisellCheckboxGroup"));
 var import_pisellContainer = __toESM(require("./components/pisellContainer"));
 var import_pisellCountdown = __toESM(require("./components/pisellCountdown"));
@@ -298,6 +313,7 @@ var import_pisellQRScanner = __toESM(require("./components/pisellQRScanner"));
 var import_pisellRow = __toESM(require("./components/pisellRow"));
 var import_pisellScan = __toESM(require("./components/pisellScan"));
 var import_pisellStatisticList = __toESM(require("./components/pisellStatisticList"));
+var import_PisellSteps = __toESM(require("./components/PisellSteps"));
 var import_pisellTags = __toESM(require("./components/pisellTags"));
 var import_pisellText = __toESM(require("./components/pisellText"));
 var import_pisellToast = __toESM(require("./components/pisellToast"));
@@ -350,6 +366,14 @@ var import_pisellGoodPassCard = __toESM(require("./components/pisellGoodPassCard
 var import_keyboard = __toESM(require("./components/keyboard"));
 var import_virtualInput = __toESM(require("./components/virtualInput"));
 var import_auto_resize_text = __toESM(require("./components/auto-resize-text"));
+var import_PisellBasicGrid = __toESM(require("./components/PisellBasicGrid"));
+var import_PisellScrollView = require("./components/PisellScrollView");
+var import_PisellSuperTabs = __toESM(require("./components/PisellSuperTabs"));
+var import_TextCard = __toESM(require("./components/PisellCards/components/TextCard"));
+var import_GraphicTextCard = __toESM(require("./components/PisellCards/components/GraphicTextCard"));
+var import_MultilevelCard = __toESM(require("./components/PisellCards/components/MultilevelCard"));
+var import_PisellImageCard = __toESM(require("./components/PisellCards/components/PisellImageCard"));
+var import_PisellTabbar = __toESM(require("./components/PisellTabbar"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Affix,
@@ -408,9 +432,11 @@ var import_auto_resize_text = __toESM(require("./components/auto-resize-text"));
   FormItemInputNumber,
   FormItemRadio,
   FormItemSelect,
+  FormItemSwitch,
   FormItemTimePicker,
   FormItemTranslation,
   FormItemUpload,
+  GraphicTextCard,
   Grid,
   Icon,
   IconSelect,
@@ -426,6 +452,7 @@ var import_auto_resize_text = __toESM(require("./components/auto-resize-text"));
   Mentions,
   Menu,
   Modal,
+  MultilevelCard,
   OrganizationTenantSwitcher,
   Page,
   PageHeader,
@@ -436,8 +463,10 @@ var import_auto_resize_text = __toESM(require("./components/auto-resize-text"));
   PisellAnchor,
   PisellAppCard,
   PisellAvatar,
+  PisellBasicGrid,
   PisellCard,
   PisellCardList,
+  PisellCards,
   PisellCheckboxGroup,
   PisellConfigProvider,
   PisellContainer,
@@ -455,6 +484,7 @@ var import_auto_resize_text = __toESM(require("./components/auto-resize-text"));
   PisellGoodPassCard,
   PisellHeader,
   PisellHeaderProgressBar,
+  PisellImageCard,
   PisellImageCarousels,
   PisellInformationEntry,
   PisellInput,
@@ -470,9 +500,13 @@ var import_auto_resize_text = __toESM(require("./components/auto-resize-text"));
   PisellQrcode,
   PisellRow,
   PisellScan,
+  PisellScrollView,
   PisellSectionHeaders,
   PisellSider,
   PisellStatisticList,
+  PisellSteps,
+  PisellSuperTabs,
+  PisellTabbar,
   PisellTags,
   PisellText,
   PisellToast,
@@ -506,9 +540,11 @@ var import_auto_resize_text = __toESM(require("./components/auto-resize-text"));
   Steps,
   SubmitButton,
   Switch,
+  TabCard,
   Table,
   Tabs,
   Tag,
+  TextCard,
   TimePicker,
   Timeline,
   Tooltip,

package/lib/locales/en-US.js

@@ -23,6 +23,8 @@ __export(en_US_exports, {
 });
 module.exports = __toCommonJS(en_US_exports);
 var en_US_default = {
+  "pisell-tabbar-expand": "Expand",
+  "pisell-tabbar-minimize": "Minimize",
   "table-filter-search": "Search",
   "table-filter-clear": "Clear",
   "table-filter-filter": "Filter",
@@ -156,6 +158,7 @@ var en_US_default = {
   "pisell-wallet-pass-card-redeem": "use",
   "pisell-wallet-pass-card-code": "Code",
   "pisell-wallet-pass-card-valid-to": "Valid to",
+  "pisell-wallet-pass-card-valid": "Valid",
   "pisell-wallet-pass-card-confirm": "Confirm",
   "pisell-wallet-pass-card-cancel": "Cancel",
   "pisell-wallet-pass-card-required": "This field is required",

package/lib/locales/zh-CN.js

@@ -23,6 +23,8 @@ __export(zh_CN_exports, {
 });
 module.exports = __toCommonJS(zh_CN_exports);
 var zh_CN_default = {
+  "pisell-tabbar-expand": "展开",
+  "pisell-tabbar-minimize": "折叠",
   "table-filter-search": "搜索",
   "table-filter-clear": "清除",
   "table-filter-filter": "筛选",
@@ -156,6 +158,7 @@ var zh_CN_default = {
   "pisell-wallet-pass-card-redeem": "使用",
   "pisell-wallet-pass-card-code": "识别码编号",
   "pisell-wallet-pass-card-valid-to": "有效期至",
+  "pisell-wallet-pass-card-valid": "有效期",
   "pisell-wallet-pass-card-confirm": "确认",
   "pisell-wallet-pass-card-cancel": "取消",
   "pisell-wallet-pass-card-required": "此字段必填",

package/lib/locales/zh-TW.js

@@ -23,6 +23,8 @@ __export(zh_TW_exports, {
 });
 module.exports = __toCommonJS(zh_TW_exports);
 var zh_TW_default = {
+  "pisell-tabbar-expand": "展開",
+  "pisell-tabbar-minimize": "摺疊",
   "table-filter-search": "搜索",
   "table-filter-clear": "清除",
   "table-filter-filter": "篩選",
@@ -156,6 +158,7 @@ var zh_TW_default = {
   "pisell-wallet-pass-card-redeem": "使用",
   "pisell-wallet-pass-card-code": "識別碼編號",
   "pisell-wallet-pass-card-valid-to": "有效期至",
+  "pisell-wallet-pass-card-valid": "有效期",
   "pisell-wallet-pass-card-confirm": "確認",
   "pisell-wallet-pass-card-cancel": "取消",
   "pisell-wallet-pass-card-required": "此欄位為必填",

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