@pisell/materials 1.8.7 → 1.8.8

package/lib/components/media/index.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+export interface MediaProps {
+    __designMode?: 'design' | undefined;
+    value?: string | string[];
+    onChange?: (value: string | string[]) => void;
+    multiple?: boolean;
+    maxCount?: number;
+    accept?: string;
+    disabled?: boolean;
+    className?: string;
+    style?: React.CSSProperties;
+    placeholder?: string;
+    showUploadList?: boolean;
+    listType?: 'text' | 'picture' | 'picture-card';
+}
+import './index.less';
+declare const Media: React.ForwardRefExoticComponent<MediaProps & React.RefAttributes<HTMLDivElement>>;
+export default Media;

package/lib/components/media/index.js

@@ -0,0 +1,265 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/media/index.tsx
+var media_exports = {};
+__export(media_exports, {
+  default: () => media_default
+});
+module.exports = __toCommonJS(media_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_icons = require("@ant-design/icons");
+var import_ahooks = require("ahooks");
+var import_utils = require("../table/utils");
+var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
+var import_index = require("./index.less");
+var Media = (0, import_react.forwardRef)((props, ref) => {
+  const {
+    __designMode,
+    value,
+    onChange,
+    multiple = false,
+    maxCount = 10,
+    accept = "image/*,video/*,audio/*",
+    disabled = false,
+    className,
+    style,
+    placeholder = "選擇媒體文件",
+    showUploadList = true,
+    listType = "picture-card"
+  } = props;
+  const [isModalVisible, setIsModalVisible] = (0, import_react.useState)(false);
+  const [selectedItems, setSelectedItems] = (0, import_react.useState)([]);
+  const [uploading, setUploading] = (0, import_react.useState)(false);
+  const { appHelper } = (0, import_useEngineContext.default)();
+  const { mediaUploadUrl, getHeaders } = (appHelper == null ? void 0 : appHelper.constants) || {};
+  const { data: mediaList, run: fetchMediaList } = (0, import_ahooks.useRequest)(
+    async () => {
+      const { data } = await import_utils.request.getRequest().get(
+        `/media:list`,
+        {
+          page: 1,
+          pageSize: 100
+        },
+        {
+          isNocobase: true,
+          fullResult: true,
+          headers: {
+            "x-data-source": "pisell2"
+          }
+        }
+      );
+      return (data == null ? void 0 : data.data) || [];
+    },
+    {
+      manual: true
+    }
+  );
+  const { run: uploadFile } = (0, import_ahooks.useRequest)(
+    async (file) => {
+      const formData = new FormData();
+      formData.append("file", file);
+      formData.append("group_id", "0");
+      const { data } = await import_utils.request.getRequest().post(mediaUploadUrl || "/api/media:upload", formData, {
+        headers: {
+          ...getHeaders == null ? void 0 : getHeaders(),
+          "Content-Type": "multipart/form-data"
+        }
+      });
+      return data;
+    },
+    {
+      manual: true,
+      onSuccess: (result) => {
+        import_antd.message.success("上傳成功");
+        fetchMediaList();
+      },
+      onError: () => {
+        import_antd.message.error("上傳失敗");
+      }
+    }
+  );
+  const handleUpload = (0, import_react.useCallback)(
+    async (file) => {
+      if (file.size > 10 * 1024 * 1024) {
+        import_antd.message.error("文件大小不能超過10MB");
+        return false;
+      }
+      setUploading(true);
+      try {
+        await uploadFile(file);
+      } finally {
+        setUploading(false);
+      }
+      return false;
+    },
+    [uploadFile]
+  );
+  const showModal = (0, import_react.useCallback)(() => {
+    if (__designMode === "design") {
+      return;
+    }
+    setIsModalVisible(true);
+    fetchMediaList();
+  }, [__designMode, fetchMediaList]);
+  const handleCancel = (0, import_react.useCallback)(() => {
+    setIsModalVisible(false);
+    setSelectedItems([]);
+  }, []);
+  const handleSelect = (0, import_react.useCallback)(
+    (item) => {
+      if (multiple) {
+        const isSelected = selectedItems.find(
+          (selected) => selected.id === item.id
+        );
+        if (isSelected) {
+          setSelectedItems(
+            selectedItems.filter((selected) => selected.id !== item.id)
+          );
+        } else {
+          if (selectedItems.length >= maxCount) {
+            import_antd.message.warning(`最多只能選擇${maxCount}個文件`);
+            return;
+          }
+          setSelectedItems([...selectedItems, item]);
+        }
+      } else {
+        setSelectedItems([item]);
+      }
+    },
+    [multiple, selectedItems, maxCount]
+  );
+  const handleOk = (0, import_react.useCallback)(() => {
+    if (selectedItems.length === 0) {
+      import_antd.message.warning("請選擇媒體文件");
+      return;
+    }
+    const urls = selectedItems.map((item) => item.url);
+    const result = multiple ? urls : urls[0];
+    onChange == null ? void 0 : onChange(result);
+    setIsModalVisible(false);
+    setSelectedItems([]);
+  }, [selectedItems, multiple, onChange]);
+  const renderCurrentFiles = (0, import_react.useMemo)(() => {
+    if (!value) return null;
+    const files = Array.isArray(value) ? value : [value];
+    if (listType === "picture-card") {
+      return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-media-current-files" }, files.map((url, index) => /* @__PURE__ */ import_react.default.createElement("div", { key: index, className: "pisell-media-file-item" }, /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Image,
+        {
+          src: url,
+          alt: `file-${index}`,
+          width: 80,
+          height: 80,
+          style: { objectFit: "cover" }
+        }
+      ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-media-file-actions" }, /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Button,
+        {
+          type: "text",
+          size: "small",
+          onClick: () => {
+            const newFiles = files.filter((_, i) => i !== index);
+            onChange == null ? void 0 : onChange(multiple ? newFiles : newFiles[0] || "");
+          }
+        },
+        "刪除"
+      )))));
+    }
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-media-current-files" }, files.map((url, index) => /* @__PURE__ */ import_react.default.createElement("div", { key: index, className: "pisell-media-file-item" }, /* @__PURE__ */ import_react.default.createElement("span", null, url), /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        type: "text",
+        size: "small",
+        onClick: () => {
+          const newFiles = files.filter((_, i) => i !== index);
+          onChange == null ? void 0 : onChange(multiple ? newFiles : newFiles[0] || "");
+        }
+      },
+      "刪除"
+    ))));
+  }, [value, listType, multiple, onChange]);
+  return /* @__PURE__ */ import_react.default.createElement("div", { ref, className: `pisell-media ${className || ""}`, style }, /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Button,
+    {
+      type: "dashed",
+      icon: /* @__PURE__ */ import_react.default.createElement(import_icons.PictureOutlined, null),
+      onClick: showModal,
+      disabled,
+      style: { width: "100%", height: listType === "picture-card" ? 80 : 32 }
+    },
+    placeholder
+  ), showUploadList && renderCurrentFiles, /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Modal,
+    {
+      title: "媒體庫",
+      open: isModalVisible,
+      onCancel: handleCancel,
+      onOk: handleOk,
+      width: 800,
+      okText: "確定",
+      cancelText: "取消"
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-media-modal" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-media-upload" }, /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Upload,
+      {
+        accept,
+        beforeUpload: handleUpload,
+        showUploadList: false,
+        disabled: uploading
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { icon: /* @__PURE__ */ import_react.default.createElement(import_icons.PlusOutlined, null), loading: uploading }, "上傳文件")
+    )), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-media-list" }, mediaList == null ? void 0 : mediaList.map((item) => {
+      const isSelected = selectedItems.find(
+        (selected) => selected.id === item.id
+      );
+      return /* @__PURE__ */ import_react.default.createElement(
+        "button",
+        {
+          key: item.id,
+          className: `pisell-media-item ${isSelected ? "selected" : ""}`,
+          onClick: () => handleSelect(item),
+          type: "button"
+        },
+        /* @__PURE__ */ import_react.default.createElement(
+          import_antd.Image,
+          {
+            src: item.url,
+            alt: item.name,
+            width: 80,
+            height: 80,
+            style: { objectFit: "cover" }
+          }
+        ),
+        /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-media-item-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-media-item-name" }, item.name), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-media-item-size" }, (item.size / 1024 / 1024).toFixed(2), " MB"))
+      );
+    })), selectedItems.length > 0 && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-media-selected" }, "已選擇 ", selectedItems.length, " 個文件"))
+  ));
+});
+var media_default = Media;

package/lib/components/media/index.less

@@ -0,0 +1,100 @@
+.pisell-media {
+  .pisell-media-current-files {
+    margin-top: 8px;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+
+    .pisell-media-file-item {
+      position: relative;
+      border: 1px solid #d9d9d9;
+      border-radius: 6px;
+      padding: 4px;
+      display: flex;
+      align-items: center;
+      gap: 8px;
+
+      .pisell-media-file-actions {
+        position: absolute;
+        top: 4px;
+        right: 4px;
+        opacity: 0;
+        transition: opacity 0.2s;
+      }
+
+      &:hover .pisell-media-file-actions {
+        opacity: 1;
+      }
+    }
+  }
+
+  .pisell-media-modal {
+    .pisell-media-upload {
+      margin-bottom: 16px;
+      padding-bottom: 16px;
+      border-bottom: 1px solid #f0f0f0;
+    }
+
+    .pisell-media-list {
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));
+      gap: 12px;
+      max-height: 400px;
+      overflow-y: auto;
+
+      .pisell-media-item {
+        border: 2px solid transparent;
+        border-radius: 8px;
+        padding: 8px;
+        cursor: pointer;
+        background: #fafafa;
+        transition: all 0.2s;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+        min-height: 120px;
+
+        &:hover {
+          border-color: #1890ff;
+          background: #f0f8ff;
+        }
+
+        &.selected {
+          border-color: #1890ff;
+          background: #e6f7ff;
+        }
+
+        .pisell-media-item-info {
+          margin-top: 8px;
+          width: 100%;
+
+          .pisell-media-item-name {
+            font-size: 12px;
+            color: #333;
+            margin-bottom: 4px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+
+          .pisell-media-item-size {
+            font-size: 10px;
+            color: #999;
+          }
+        }
+      }
+    }
+
+    .pisell-media-selected {
+      margin-top: 16px;
+      padding: 8px 12px;
+      background: #f6ffed;
+      border: 1px solid #b7eb8f;
+      border-radius: 6px;
+      color: #52c41a;
+      font-size: 14px;
+      text-align: center;
+    }
+  }
+}

package/lib/components/page/index.d.ts

@@ -1,9 +1,8 @@
-import React from 'react';
 import { ConfigProviderProps } from '../config-provider';
 interface PageProps extends ConfigProviderProps {
     variablesConfig?: {
         disabledHistoryListener?: boolean;
     };
 }
-declare const Page: (props: PageProps) => React.JSX.Element;
+declare const Page: (props: PageProps) => JSX.Element;
 export default Page;

package/lib/components/page/index.js

@@ -98,6 +98,9 @@ var Page = (props) => {
     });
   }, [platform, themeColor]);
   const PisellConfigProvid = isRenderPisellConfigProvider ? import_pisell_config_provider.default : import_react.default.Fragment;
+  (0, import_react.useEffect)(() => {
+    document.body.id = "body";
+  }, []);
   return /* @__PURE__ */ import_react.default.createElement(
     import_config_provider.default,
     {

package/lib/components/page-header/index.d.ts

@@ -10,5 +10,5 @@ interface PageHeaderProps {
     className?: string;
     style?: React.CSSProperties;
 }
-declare const PageHeader: (props: PageHeaderProps) => React.JSX.Element | null;
+declare const PageHeader: (props: PageHeaderProps) => JSX.Element | null;
 export default PageHeader;

package/lib/components/pisellAdjustPrice/PisellAdjustPriceInputNumber.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { InputNumberProps } from 'antd/es/input-number';
 export interface PisellAdjustPriceInputNumberProps extends Omit<InputNumberProps, 'onChange'> {
     value?: number;
@@ -6,5 +5,5 @@ export interface PisellAdjustPriceInputNumberProps extends Omit<InputNumberProps
     defaultValue?: number;
     onChange?: (val: number) => void;
 }
-declare const PisellAdjustPriceInputNumber: (props: PisellAdjustPriceInputNumberProps) => React.JSX.Element;
+declare const PisellAdjustPriceInputNumber: (props: PisellAdjustPriceInputNumberProps) => JSX.Element;
 export default PisellAdjustPriceInputNumber;

package/lib/components/pisellAdjustPrice/index.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
 import './index.less';
 import { PisellAdjustPriceProps } from './type';
-declare const PisellAdjustPrice: (props: PisellAdjustPriceProps) => React.JSX.Element;
+declare const PisellAdjustPrice: (props: PisellAdjustPriceProps) => JSX.Element;
 export default PisellAdjustPrice;

package/lib/components/pisellAlert/index.d.ts

@@ -18,5 +18,5 @@ export interface PisellAlertProps extends AlertProps {
  * @param props
  * @constructor
  */
-declare const PisellAlert: (props: PisellAlertProps) => false | React.JSX.Element;
+declare const PisellAlert: (props: PisellAlertProps) => false | JSX.Element;
 export default PisellAlert;

package/lib/components/pisellCard/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { CardProps } from 'antd';
 import './index.less';
 export interface PisellCardProps extends CardProps {
@@ -16,5 +15,5 @@ export interface PisellCardProps extends CardProps {
  * @param props
  * @constructor
  */
-declare const PisellCard: (props: PisellCardProps) => React.JSX.Element;
+declare const PisellCard: (props: PisellCardProps) => JSX.Element;
 export default PisellCard;

package/lib/components/pisellCheckboxGroup/index.d.ts

@@ -36,5 +36,5 @@ export interface PisellCheckboxGroupProps extends React.HTMLAttributes<HTMLDivEl
  * @Author: zhiwei.Wang
  * @Date: 2024-08-16 10:34
  */
-declare const PisellCheckboxGroup: (props: PisellCheckboxGroupProps) => React.JSX.Element;
+declare const PisellCheckboxGroup: (props: PisellCheckboxGroupProps) => JSX.Element;
 export default PisellCheckboxGroup;

package/lib/components/pisellCountdown/index.d.ts

@@ -20,5 +20,5 @@ export declare type PisellCountdownProps = React.HTMLAttributes<HTMLSpanElement>
     /** 格式化倒计时展示 参考 dayjs */
     format?: string;
 };
-declare const PisellCountdown: (props: PisellCountdownProps) => React.JSX.Element;
+declare const PisellCountdown: (props: PisellCountdownProps) => JSX.Element;
 export default PisellCountdown;

package/lib/components/pisellDataSourceContainer/PisellDataSourceContainer.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { DataSourceContainerProps } from './type';
-declare const PisellDataSourceContainer: (props: DataSourceContainerProps) => React.JSX.Element;
+declare const PisellDataSourceContainer: (props: DataSourceContainerProps) => JSX.Element;
 export default PisellDataSourceContainer;

package/lib/components/pisellDataSourceContainer/hooks/useDataSourceKey.d.ts

@@ -1,5 +1,5 @@
 declare const useDataSourceKey: () => {
-    dataSourceKey: string | undefined;
-    dataSourceKeyRef: import("react").MutableRefObject<string | undefined>;
+    dataSourceKey: string | import("../../dataSourceComponents/provider/dataSource/DataSourceContext").DataSourceType | undefined;
+    dataSourceKeyRef: import("react").MutableRefObject<string | import("../../dataSourceComponents/provider/dataSource/DataSourceContext").DataSourceType | undefined>;
 };
 export default useDataSourceKey;

package/lib/components/pisellDataSourceContainer/provider/HandleActions.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import { DataSourceContainerProps, HandleActionContextType } from '../type';
 export declare const HandleActionContext: React.Context<HandleActionContextType | null>;
-export declare const HandleActionsProvider: (props: DataSourceContainerProps) => React.JSX.Element;
+export declare const HandleActionsProvider: (props: DataSourceContainerProps) => JSX.Element;
 export declare const useHandleActionProvider: () => HandleActionContextType;

package/lib/components/pisellDatePicker/datePickerCpt.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { PickerDateProps } from 'antd/es/date-picker/generatePicker';
 import { Dayjs } from 'dayjs';
 import './detePickerCpt.less';
@@ -18,5 +17,5 @@ export interface DatePickerCptProps extends PickerDateProps<Dayjs> {
  * @param props
  * @constructor
  */
-declare const DatePickerCpt: (props: DatePickerCptProps) => React.JSX.Element;
+declare const DatePickerCpt: (props: DatePickerCptProps) => JSX.Element;
 export default DatePickerCpt;

package/lib/components/pisellDatePicker/index.d.ts

@@ -1,2 +1,2 @@
-declare const PisellDatePicker: (props: any) => import("react").JSX.Element;
+declare const PisellDatePicker: (props: any) => JSX.Element;
 export default PisellDatePicker;

package/lib/components/pisellDateTimeDisplay/PisellDateTimeDisplay.js

@@ -34,17 +34,20 @@ __export(PisellDateTimeDisplay_exports, {
 });
 module.exports = __toCommonJS(PisellDateTimeDisplay_exports);
 var import_react = __toESM(require("react"));
+var import_dayjs = __toESM(require("dayjs"));
 var import_zh_cn = require("dayjs/locale/zh-cn");
 var import_en = require("dayjs/locale/en");
 var import_hooks = require("./hooks");
 var import_utils = require("./utils");
 var import_components = require("./components");
+var import_dateTimeDisplayFormats = require("./formats/dateTimeDisplayFormats");
 var import_PisellDateTimeDisplay = require("./PisellDateTimeDisplay.less");
 var PisellDateTimeDisplay = (props) => {
   const {
     layout = "horizontal",
     textAlign = "center",
     fields,
+    formatByLocale,
     timeFormat,
     dateFormat,
     weekdayFormat,
@@ -62,7 +65,15 @@ var PisellDateTimeDisplay = (props) => {
     className,
     style
   } = props;
-  const computedRefreshInterval = refreshInterval ?? (0, import_utils.getRefreshInterval)(timeFormat);
+  const localeKey = (0, import_utils.getDayjsLocale)(locale);
+  const baseLocale = localeKey.split("-")[0];
+  const presetSource = formatByLocale ?? import_dateTimeDisplayFormats.DATETIME_DISPLAY_FORMATS;
+  const preset = presetSource[localeKey] ?? presetSource[baseLocale] ?? {};
+  const effectiveFields = { ...preset.fields, ...fields };
+  const effectiveDateFormat = { ...preset.dateFormat, ...dateFormat };
+  const effectiveTimeFormat = { ...preset.timeFormat, ...timeFormat };
+  const effectiveWeekdayFormat = { ...preset.weekdayFormat, ...weekdayFormat };
+  const computedRefreshInterval = refreshInterval ?? (0, import_utils.getRefreshInterval)(effectiveTimeFormat);
   const currentTime = (0, import_hooks.useCurrentTime)({
     refreshInterval: computedRefreshInterval,
     disabled: disableAutoRefresh,
@@ -95,7 +106,10 @@ var PisellDateTimeDisplay = (props) => {
     showDate = true,
     showWeekday = true,
     fieldOrder = ["time", "date", "weekday"]
-  } = fields || {};
+  } = effectiveFields || {};
+  const referenceDate = (0, import_dayjs.default)();
+  const relativeDay = (effectiveDateFormat == null ? void 0 : effectiveDateFormat.showRelativeDay) ? (0, import_utils.getRelativeDay)(currentTime, referenceDate) : null;
+  const hideWeekdayWhenDateRelative = showDate && relativeDay !== null;
   const containerInlineStyle = {
     background: containerStyle == null ? void 0 : containerStyle.background,
     borderRadius: containerStyle == null ? void 0 : containerStyle.borderRadius,
@@ -114,7 +128,7 @@ var PisellDateTimeDisplay = (props) => {
           {
             key: "time",
             time: currentTime,
-            format: timeFormat,
+            format: effectiveTimeFormat,
             style: timeStyle
           }
         ) : null;
@@ -124,17 +138,18 @@ var PisellDateTimeDisplay = (props) => {
           {
             key: "date",
             date: currentTime,
-            format: dateFormat,
+            format: effectiveDateFormat,
+            referenceDate: (0, import_dayjs.default)(),
             style: dateStyle
           }
         ) : null;
       case "weekday":
-        return showWeekday ? /* @__PURE__ */ import_react.default.createElement(
+        return showWeekday && !hideWeekdayWhenDateRelative ? /* @__PURE__ */ import_react.default.createElement(
           import_components.WeekdayDisplay,
           {
             key: "weekday",
             weekday: currentTime,
-            format: weekdayFormat,
+            format: effectiveWeekdayFormat,
             style: weekdayStyle
           }
         ) : null;
@@ -143,6 +158,7 @@ var PisellDateTimeDisplay = (props) => {
     }
   };
   if (layout === "inline") {
+    const inlineSeparators = effectiveFields == null ? void 0 : effectiveFields.inlineSeparators;
     const renderedFields2 = fieldOrder.map(renderField).filter((field) => field !== null);
     if (renderedFields2.length === 0) {
       return null;
@@ -154,7 +170,7 @@ var PisellDateTimeDisplay = (props) => {
         style: containerInlineStyle,
         onClick
       },
-      renderedFields2.map((field, index) => /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, { key: index }, field, index < renderedFields2.length - 1 && /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-datetime-display-separator" }, inlineSeparator)))
+      renderedFields2.map((field, index) => /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, { key: index }, field, index < renderedFields2.length - 1 && /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-datetime-display-separator" }, (inlineSeparators == null ? void 0 : inlineSeparators[index]) ?? inlineSeparator)))
     );
   }
   const renderedFields = fieldOrder.map(renderField).filter((field) => field !== null);
@@ -166,16 +182,10 @@ var PisellDateTimeDisplay = (props) => {
     const currentLocale = currentTime.locale();
     const isChinese = (0, import_utils.isChinese)(currentLocale);
     if (showDate && showWeekday) {
-      let combinedStr = "";
-      if (isChinese) {
-        const weekdayStr = currentTime.format("ddd");
-        const dateStr = currentTime.format("M月D日");
-        combinedStr = `${weekdayStr} ${dateStr}`;
-      } else {
-        const weekdayStr = currentTime.format("ddd");
-        const dateStr = currentTime.format("D MMM");
-        combinedStr = `${weekdayStr}, ${dateStr}`;
-      }
+      const labels = effectiveDateFormat == null ? void 0 : effectiveDateFormat.relativeDayLabels;
+      const dateStr = relativeDay ? (labels == null ? void 0 : labels[relativeDay]) ?? (0, import_utils.getRelativeDayLabel)(relativeDay, currentTime.locale()) : isChinese ? currentTime.format("M月D日") : currentTime.format("D MMM");
+      const weekdayStr = currentTime.format("ddd");
+      const combinedStr = relativeDay ? dateStr : isChinese ? `${weekdayStr} ${dateStr}` : `${weekdayStr}, ${dateStr}`;
       const dateInlineStyle = {
         fontSize: dateStyle == null ? void 0 : dateStyle.fontSize,
         fontWeight: dateStyle == null ? void 0 : dateStyle.fontWeight,

package/lib/components/pisellDateTimeDisplay/PisellDateTimeDisplay.stories.d.ts

@@ -26,6 +26,11 @@ export declare const InlineLayout: Story;
  * 单行布局 - 自定义分隔符
  */
 export declare const InlineWithCustomSeparator: Story;
+/**
+ * 中文完整日期格式：2025-12-31 - 2:00 周四
+ * 单行、日期在前、日期与时间之间 " - "、时间与星期之间空格
+ */
+export declare const InlineDateTimeWeekdayZh: Story;
 /**
  * 12小时制
  */
@@ -62,6 +67,20 @@ export declare const DateDMY: Story;
  * 中文日期带单位
  */
 export declare const DateChinese: Story;
+/**
+ * 相对日：今天/昨天/明天
+ * 与「当前日期」同天显示「今天」，前一天「昨天」，后一天「明天」；其他日期仍按原格式。
+ * 参考日为 dayjs()，随时间变化：例如 2 月 4 日当天，2 月 4 日显示「今天」，2 月 3 日显示「昨天」。
+ */
+export declare const RelativeDay: Story;
+/**
+ * 相对日 - 英文
+ */
+export declare const RelativeDayEn: Story;
+/**
+ * 相对日 - 自定义文案
+ */
+export declare const RelativeDayCustomLabels: Story;
 /**
  * 英文完整月份
  */