@pisell/materials 1.0.584 → 1.0.586

package/es/components/dataSourceComponents/fields/Input.Subdomain/WithMode.d.ts

@@ -3,7 +3,7 @@ import { InputProps } from 'antd';
 declare const SubdomainlWithMode: React.FC<InputProps & {
     onChange: (value: string) => void;
     onBlur?: ((e: React.FocusEvent<HTMLInputElement>) => void) | undefined;
-    rootDomain: string;
+    rootDomain: 'xzero' | 'saas' | 'custom';
     customDomain?: string | undefined;
     value?: string | undefined;
     isVerification?: boolean | undefined;

package/es/components/dataSourceComponents/fields/Input.Subdomain/WithMode.js

@@ -14,29 +14,35 @@ import { useTenantData } from "./serve";
 import ReadPretty from "./ReadPretty";
 import { withMode } from "../../dataSourceForm/utils";
 import useEngineContext from "../../../../hooks/useEngineContext";
+
+// 定义组件的属性类型
+
 var Subdomain = function Subdomain(props) {
   var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5, _context$appHelper$ut6, _context$appHelper$ut7, _context$appHelper$ut8, _coreData$tenant;
   var propsOnBlur = props.onBlur,
     propsOnChange = props.onChange,
     _props$rootDomain = props.rootDomain,
-    rootDomain = _props$rootDomain === void 0 ? '' : _props$rootDomain,
+    rootDomain = _props$rootDomain === void 0 ? 'xzero' : _props$rootDomain,
     customDomain = props.customDomain,
     value = props.value,
     tenantId = props.tenantId,
     rest = _objectWithoutProperties(props, _excluded);
   var context = useEngineContext();
   var coreData = (_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.getApp) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.data) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.store) === null || _context$appHelper$ut5 === void 0 ? void 0 : (_context$appHelper$ut6 = _context$appHelper$ut5.getStore) === null || _context$appHelper$ut6 === void 0 ? void 0 : (_context$appHelper$ut7 = _context$appHelper$ut6.call(_context$appHelper$ut5)) === null || _context$appHelper$ut7 === void 0 ? void 0 : (_context$appHelper$ut8 = _context$appHelper$ut7.getDataByModel) === null || _context$appHelper$ut8 === void 0 ? void 0 : _context$appHelper$ut8.call(_context$appHelper$ut7, 'core', 'core');
-  var tenantData = useTenantData(coreData ? coreData === null || coreData === void 0 ? void 0 : (_coreData$tenant = coreData.tenant) === null || _coreData$tenant === void 0 ? void 0 : _coreData$tenant.id : ''); // 传递 tenantId
 
-  // 解析外部传入的value
+  // 仅在 rootDomain 为 'saas' 时调用 useTenantData
+  var tenantData = rootDomain === 'saas' ? useTenantData(coreData ? coreData === null || coreData === void 0 ? void 0 : (_coreData$tenant = coreData.tenant) === null || _coreData$tenant === void 0 ? void 0 : _coreData$tenant.id : '') : undefined;
+
+  // 解析外部传入的 value
   var parseExternalValue = function parseExternalValue(val) {
     if (!val) return {
       subdomain: '',
       suffix: coreData ? coreData.tenant_domain : ''
     };
-    var parts = val.split('.');
-    var subdomain = parts.length > 1 ? parts[0] : val;
-    var suffix = parts.length > 1 ? ".".concat(parts.slice(1).join('.')) : coreData ? coreData.tenant_domain : '';
+    var parts = val.split('.'); // 按点分割完整域名
+    var subdomain = parts.length > 1 ? parts[0] : val; // 第一个部分为子域名
+    var suffix = parts.length > 1 ? ".".concat(parts.slice(1).join('.')) : coreData ? coreData.tenant_domain : ''; // 确保 suffix 包含点
+
     return {
       subdomain: subdomain,
       suffix: suffix
@@ -47,11 +53,12 @@ var Subdomain = function Subdomain(props) {
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     subdomain = _useState2[0],
-    setSubdomain = _useState2[1];
+    setSubdomain = _useState2[1]; // 子域名状态
   var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
     suffix = _useState4[0],
-    setSuffix = _useState4[1];
+    setSuffix = _useState4[1]; // 后缀状态
+
   useEffect(function () {
     if (value) {
       // 如果传入值存在，解析并更新子域名和后缀
@@ -62,32 +69,38 @@ var Subdomain = function Subdomain(props) {
       setSuffix(_suffix);
     } else {
       // 根据 rootDomain 获取后缀
-      if (rootDomain === '1') {
-        setSuffix(coreData ? ".".concat(coreData.tenant_domain) : '');
-      } else if (rootDomain === '2') {
-        setSuffix(tenantData ? ".".concat(tenantData['saas.domain']) : '');
+      if (rootDomain === 'xzero') {
+        setSuffix(coreData ? ".".concat(coreData.tenant_domain) : ''); // 获取 xzero 的后缀
+      } else if (rootDomain === 'saas') {
+        setSuffix(tenantData ? ".".concat(tenantData['saas.domain']) : ''); // 获取 saas 的后缀
       } else {
-        setSuffix(customDomain ? customDomain.startsWith('.') ? customDomain : ".".concat(customDomain) : '');
+        setSuffix(customDomain ? customDomain.startsWith('.') ? customDomain : ".".concat(customDomain) : ''); // 获取自定义域名的后缀
       }
     }
   }, [value, rootDomain, customDomain, tenantData, coreData]);
   var handleChange = function handleChange(e) {
-    var inputValue = e.target.value.toLowerCase();
+    var inputValue = e.target.value.toLowerCase(); // 转为小写
     var _parseExternalValue2 = parseExternalValue(inputValue),
-      subdomain = _parseExternalValue2.subdomain;
-    setSubdomain(subdomain);
-    propsOnChange === null || propsOnChange === void 0 ? void 0 : propsOnChange(subdomain + suffix);
+      subdomain = _parseExternalValue2.subdomain; // 解析输入的值以获取子域名
+    setSubdomain(subdomain); // 更新子域名
+    propsOnChange === null || propsOnChange === void 0 ? void 0 : propsOnChange(subdomain + suffix); // 传递更新后的完整域名
   };
+
   var onBlur = useCallback(function (e) {
-    propsOnBlur === null || propsOnBlur === void 0 ? void 0 : propsOnBlur(e);
-    propsOnChange(subdomain + suffix);
+    propsOnBlur === null || propsOnBlur === void 0 ? void 0 : propsOnBlur(e); // 处理失去焦点事件
+    propsOnChange(subdomain + suffix); // 传递完整的域名
   }, [propsOnBlur, propsOnChange, subdomain, suffix]);
   return /*#__PURE__*/React.createElement(AntInput, _extends({}, rest, {
-    value: subdomain,
-    onChange: handleChange,
-    onBlur: onBlur,
-    addonAfter: suffix
+    value: subdomain // 输入框显示子域名
+    ,
+    onChange: handleChange // 绑定变化事件
+    ,
+    onBlur: onBlur // 绑定失去焦点事件
+    ,
+    addonAfter: suffix // 显示域名后缀
   }));
 };
+
+// 使用 withMode 高阶组件包装 Subdomain 组件
 var SubdomainlWithMode = withMode(Subdomain, ReadPretty);
-export default SubdomainlWithMode;
+export default SubdomainlWithMode; // 导出组件

package/es/components/dataSourceComponents/fields/Input.Subdomain/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 declare const Subdomain: React.FC<import("antd").InputProps & {
     onChange: (value: string) => void;
     onBlur?: ((e: React.FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-    rootDomain: string;
+    rootDomain: "custom" | "xzero" | "saas";
     customDomain?: string | undefined;
     value?: string | undefined;
     isVerification?: boolean | undefined;

package/es/components/dataSourceComponents/fields/index.d.ts

@@ -20,7 +20,7 @@ declare const formFieldMap: {
         Subdomain: import("react").FC<import("antd").InputProps & {
             onChange: (value: string) => void;
             onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-            rootDomain: string;
+            rootDomain: "custom" | "xzero" | "saas";
             customDomain?: string | undefined;
             value?: string | undefined;
             isVerification?: boolean | undefined;
@@ -76,7 +76,7 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     Subdomain: import("react").FC<import("antd").InputProps & {
         onChange: (value: string) => void;
         onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-        rootDomain: string;
+        rootDomain: "custom" | "xzero" | "saas";
         customDomain?: string | undefined;
         value?: string | undefined;
         isVerification?: boolean | undefined;

package/es/components/productCard/locales.d.ts

@@ -1,6 +1,7 @@
 declare const _default: {
     en: {
         'pisell2.product.card.day': (val: number) => string;
+        'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.discount.reason': string;
         'pisell2.product.card.discount.note': string;
         'pisell2.product.card.discount.add.note': string;
@@ -14,6 +15,7 @@ declare const _default: {
     };
     'zh-CN': {
         'pisell2.product.card.day': (val: number) => string;
+        'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.discount.reason': string;
         'pisell2.product.card.discount.note': string;
         'pisell2.product.card.discount.add.note': string;
@@ -27,6 +29,7 @@ declare const _default: {
     };
     'zh-HK': {
         'pisell2.product.card.day': (val: number) => string;
+        'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.discount.reason': string;
         'pisell2.product.card.discount.note': string;
         'pisell2.product.card.discount.add.note': string;

package/es/components/productCard/locales.js

@@ -3,6 +3,9 @@ export default {
     'pisell2.product.card.day': function pisell2ProductCardDay(val) {
       return "".concat(val > 1 ? 'days' : 'day');
     },
+    'pisell2.product.card.day.event': function pisell2ProductCardDayEvent(val) {
+      return "".concat(val > 1 ? 'events' : 'event');
+    },
     'pisell2.product.card.discount.reason': 'Discount reason',
     'pisell2.product.card.discount.note': 'Note',
     'pisell2.product.card.discount.add.note': 'Add note',
@@ -18,6 +21,9 @@ export default {
     'pisell2.product.card.day': function pisell2ProductCardDay(val) {
       return '天';
     },
+    'pisell2.product.card.day.event': function pisell2ProductCardDayEvent(val) {
+      return '活动';
+    },
     'pisell2.product.card.discount.reason': '折扣原因',
     'pisell2.product.card.discount.note': '备注',
     'pisell2.product.card.discount.add.note': '添加备注',
@@ -33,6 +39,9 @@ export default {
     'pisell2.product.card.day': function pisell2ProductCardDay(val) {
       return '天';
     },
+    'pisell2.product.card.day.event': function pisell2ProductCardDayEvent(val) {
+      return '活動';
+    },
     'pisell2.product.card.discount.reason': '折扣原因',
     'pisell2.product.card.discount.note': '備註',
     'pisell2.product.card.discount.add.note': '添加備註',

package/es/components/productCard/utils.js

@@ -68,7 +68,7 @@ export var getServiceTime = function getServiceTime(item, currentDate) {
   dayjs.locale(localeTypes[locale]);
   var startDate = dayjs(item === null || item === void 0 ? void 0 : item.start_date);
   var endDate = dayjs(item === null || item === void 0 ? void 0 : item.end_date);
-  var diffInDays = endDate.diff(startDate, 'day');
+  var diffInDays = (item === null || item === void 0 ? void 0 : item.custom_day_count) || endDate.diff(startDate, 'day');
   var _format = isEn ? 'ddd, DD/MM/YYYY' : 'YYYY-MM-DD，ddd';
 
   // 是否自定义格式
@@ -83,6 +83,12 @@ export var getServiceTime = function getServiceTime(item, currentDate) {
     endDate = dayjs("".concat(item === null || item === void 0 ? void 0 : item.end_date, " ").concat(item === null || item === void 0 ? void 0 : item.end_time));
   }
   var date = "".concat(startDate.format(_format), " ~ ").concat(endDate.format(_format));
-  var duration = "".concat(diffInDays, " ").concat(locales.getText('pisell2.product.card.day')(diffInDays));
+
+  // 自定义文案
+  var text = locales.getText('pisell2.product.card.day')(diffInDays);
+  if (item !== null && item !== void 0 && item.custom_day_count) {
+    text = locales.getText('pisell2.product.card.day.event')(diffInDays);
+  }
+  var duration = "".concat(diffInDays, " ").concat(text);
   return "".concat(date, " (").concat(duration, ")");
 };

package/lib/components/dataSourceComponents/fields/Input.Subdomain/WithMode.d.ts

@@ -3,7 +3,7 @@ import { InputProps } from 'antd';
 declare const SubdomainlWithMode: React.FC<InputProps & {
     onChange: (value: string) => void;
     onBlur?: ((e: React.FocusEvent<HTMLInputElement>) => void) | undefined;
-    rootDomain: string;
+    rootDomain: 'xzero' | 'saas' | 'custom';
     customDomain?: string | undefined;
     value?: string | undefined;
     isVerification?: boolean | undefined;

package/lib/components/dataSourceComponents/fields/Input.Subdomain/WithMode.js

@@ -43,16 +43,16 @@ var Subdomain = (props) => {
   const {
     onBlur: propsOnBlur,
     onChange: propsOnChange,
-    rootDomain = "",
+    rootDomain = "xzero",
+    // 默认值为 'xzero'
     customDomain,
     value,
     tenantId,
-    // 假设您在 props 中传递了 tenantId
     ...rest
   } = props;
   const context = (0, import_useEngineContext.default)();
   const coreData = (_h = (_g = (_f = (_e = (_d = (_c = (_b = (_a = context.appHelper.utils) == null ? void 0 : _a.getApp) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.data) == null ? void 0 : _d.store) == null ? void 0 : _e.getStore) == null ? void 0 : _f.call(_e)) == null ? void 0 : _g.getDataByModel) == null ? void 0 : _h.call(_g, "core", "core");
-  const tenantData = (0, import_serve.useTenantData)(coreData ? (_i = coreData == null ? void 0 : coreData.tenant) == null ? void 0 : _i.id : "");
+  const tenantData = rootDomain === "saas" ? (0, import_serve.useTenantData)(coreData ? (_i = coreData == null ? void 0 : coreData.tenant) == null ? void 0 : _i.id : "") : void 0;
   const parseExternalValue = (val) => {
     if (!val)
       return { subdomain: "", suffix: coreData ? coreData.tenant_domain : "" };
@@ -72,9 +72,9 @@ var Subdomain = (props) => {
       setSubdomain(subdomain2);
       setSuffix(suffix2);
     } else {
-      if (rootDomain === "1") {
+      if (rootDomain === "xzero") {
         setSuffix(coreData ? `.${coreData.tenant_domain}` : "");
-      } else if (rootDomain === "2") {
+      } else if (rootDomain === "saas") {
         setSuffix(tenantData ? `.${tenantData["saas.domain"]}` : "");
       } else {
         setSuffix(customDomain ? customDomain.startsWith(".") ? customDomain : `.${customDomain}` : "");

package/lib/components/dataSourceComponents/fields/Input.Subdomain/index.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 declare const Subdomain: React.FC<import("antd").InputProps & {
     onChange: (value: string) => void;
     onBlur?: ((e: React.FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-    rootDomain: string;
+    rootDomain: "custom" | "xzero" | "saas";
     customDomain?: string | undefined;
     value?: string | undefined;
     isVerification?: boolean | undefined;

package/lib/components/dataSourceComponents/fields/index.d.ts

@@ -20,7 +20,7 @@ declare const formFieldMap: {
         Subdomain: import("react").FC<import("antd").InputProps & {
             onChange: (value: string) => void;
             onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-            rootDomain: string;
+            rootDomain: "custom" | "xzero" | "saas";
             customDomain?: string | undefined;
             value?: string | undefined;
             isVerification?: boolean | undefined;
@@ -76,7 +76,7 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     Subdomain: import("react").FC<import("antd").InputProps & {
         onChange: (value: string) => void;
         onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-        rootDomain: string;
+        rootDomain: "custom" | "xzero" | "saas";
         customDomain?: string | undefined;
         value?: string | undefined;
         isVerification?: boolean | undefined;

package/lib/components/productCard/locales.d.ts

@@ -1,6 +1,7 @@
 declare const _default: {
     en: {
         'pisell2.product.card.day': (val: number) => string;
+        'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.discount.reason': string;
         'pisell2.product.card.discount.note': string;
         'pisell2.product.card.discount.add.note': string;
@@ -14,6 +15,7 @@ declare const _default: {
     };
     'zh-CN': {
         'pisell2.product.card.day': (val: number) => string;
+        'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.discount.reason': string;
         'pisell2.product.card.discount.note': string;
         'pisell2.product.card.discount.add.note': string;
@@ -27,6 +29,7 @@ declare const _default: {
     };
     'zh-HK': {
         'pisell2.product.card.day': (val: number) => string;
+        'pisell2.product.card.day.event': (val: number) => string;
         'pisell2.product.card.discount.reason': string;
         'pisell2.product.card.discount.note': string;
         'pisell2.product.card.discount.add.note': string;

package/lib/components/productCard/locales.js

@@ -25,6 +25,7 @@ module.exports = __toCommonJS(locales_exports);
 var locales_default = {
   "en": {
     "pisell2.product.card.day": (val) => `${val > 1 ? "days" : "day"}`,
+    "pisell2.product.card.day.event": (val) => `${val > 1 ? "events" : "event"}`,
     "pisell2.product.card.discount.reason": "Discount reason",
     "pisell2.product.card.discount.note": "Note",
     "pisell2.product.card.discount.add.note": "Add note",
@@ -38,6 +39,7 @@ var locales_default = {
   },
   "zh-CN": {
     "pisell2.product.card.day": (val) => "天",
+    "pisell2.product.card.day.event": (val) => "活动",
     "pisell2.product.card.discount.reason": "折扣原因",
     "pisell2.product.card.discount.note": "备注",
     "pisell2.product.card.discount.add.note": "添加备注",
@@ -51,6 +53,7 @@ var locales_default = {
   },
   "zh-HK": {
     "pisell2.product.card.day": (val) => "天",
+    "pisell2.product.card.day.event": (val) => "活動",
     "pisell2.product.card.discount.reason": "折扣原因",
     "pisell2.product.card.discount.note": "備註",
     "pisell2.product.card.discount.add.note": "添加備註",

package/lib/components/productCard/utils.js

@@ -75,7 +75,7 @@ var getServiceTime = (item, currentDate) => {
   import_dayjs.default.locale(localeTypes[locale]);
   let startDate = (0, import_dayjs.default)(item == null ? void 0 : item.start_date);
   let endDate = (0, import_dayjs.default)(item == null ? void 0 : item.end_date);
-  const diffInDays = endDate.diff(startDate, "day");
+  const diffInDays = (item == null ? void 0 : item.custom_day_count) || endDate.diff(startDate, "day");
   let _format = isEn2 ? "ddd, DD/MM/YYYY" : "YYYY-MM-DD，ddd";
   if ((item == null ? void 0 : item.hasOwnProperty("format")) && ((_b = item == null ? void 0 : item.format) == null ? void 0 : _b.length) > 0) {
     _format = isEn2 ? (_c = item == null ? void 0 : item.format) == null ? void 0 : _c[0] : (_d = item == null ? void 0 : item.format) == null ? void 0 : _d[1];
@@ -85,7 +85,11 @@ var getServiceTime = (item, currentDate) => {
     endDate = (0, import_dayjs.default)(`${item == null ? void 0 : item.end_date} ${item == null ? void 0 : item.end_time}`);
   }
   const date = `${startDate.format(_format)} ~ ${endDate.format(_format)}`;
-  const duration = `${diffInDays} ${import_utils.locales.getText("pisell2.product.card.day")(diffInDays)}`;
+  let text = import_utils.locales.getText("pisell2.product.card.day")(diffInDays);
+  if (item == null ? void 0 : item.custom_day_count) {
+    text = import_utils.locales.getText("pisell2.product.card.day.event")(diffInDays);
+  }
+  const duration = `${diffInDays} ${text}`;
   return `${date} (${duration})`;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lowcode/form-item-input.subdomain/meta.ts

@@ -54,20 +54,20 @@ export default {
             options: [
               {
                 title: 'xZero',
-                value: '1',
+                value: 'xzero',
               },
               {
                 title: 'SaaS platform',
-                value: '2',
+                value: 'saas',
               },
               {
                 title: 'Custom',
-                value: '3',
+                value: 'custom',
               },
             ],
           },
         },
-        defaultValue: '1',
+        defaultValue: 'xzero',
       },
       {
         name: 'customDomain',
@@ -95,7 +95,7 @@ export default {
           },
         },
         condition: (target) => {
-          return target.getProps().getPropValue('rootDomain') === '3';
+          return target.getProps().getPropValue('rootDomain') === 'custom';
         },
       },
       generalItemMap['defaultValue'],

package/lowcode/form-item-input.subdomain/snippets.ts

@@ -9,7 +9,7 @@ export default [
       title: '子域名输入',
       props: {
         placeholder: inputPlaceholder,
-        rootDomain:'1',
+        rootDomain:'xzero',
         typeobj: {
           type: 'pattern',
           pattern:'^[a-z0-9]([a-z0-9-]*[a-z0-9])?$',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.584",
+  "version": "1.0.586",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",