@pisell/materials 6.11.8 → 6.11.10

package/lib/components/pisellCurrency/PisellCurrency.less

@@ -1,43 +1,181 @@
-// PisellCurrency 组件样式
+/**
+ * PisellCurrency 组件样式
+ * 基于 Figma 设计规范，与 PisellNumber / SingleLineText 设计体系一致，覆盖时使用 pisell-lowcode-xxx
+ */
 
 .pisell-currency {
-  // 基础样式
   display: inline-block;
+  width: 100%;
 
-  // 只读态样式
-  &-read {
-    color: rgba(0, 0, 0, 0.85);
-    line-height: 1.5715;
-    
-    // 货币数值可以加粗显示（可选）
-    font-weight: 500;
-  }
-
-  // 编辑态样式
   &-edit {
     position: relative;
+    width: 100%;
+
+    // InputNumber 外层（Figma 设计规范，无边框避免双边框）
+    .pisell-lowcode-input-number {
+      width: 100% !important;
+      font-size: 16px !important;
+      line-height: 24px !important;
+      border-radius: 8px !important;
+      border: none !important;
+      color: #101828 !important; // Gray/900
+      background-color: #ffffff !important;
+
+      // 内层 input
+      .pisell-lowcode-input-number-input {
+        height: 46px !important; // 48 - 2px border
+        padding: 12px 16px !important;
+        font-size: 16px !important;
+        line-height: 24px !important;
+        color: #101828 !important;
+        background: transparent !important;
+        border: none !important;
+
+        &::placeholder {
+          color: #667085 !important; // Gray/500
+        }
+      }
+
+      // 聚焦态
+      &.pisell-lowcode-input-number-focused,
+      &:focus,
+      &:focus-within {
+        border-color: #d6bbfb !important; // Primary/300
+        box-shadow: 0 0 0 4px #f4ebff !important; // Primary/100
+        outline: none !important;
+      }
+
+      // Hover 态
+      &:hover:not(.pisell-lowcode-input-number-disabled):not(.pisell-lowcode-input-number-focused) {
+        border-color: #b692f6 !important; // Primary/400
+      }
+
+      // 禁用态
+      &.pisell-lowcode-input-number-disabled {
+        background-color: #f9fafb !important; // Gray/50
+        border-color: #d0d5dd !important;
+        cursor: not-allowed !important;
+
+        .pisell-lowcode-input-number-input {
+          color: #98a2b3 !important; // Gray/400
+          cursor: not-allowed !important;
+        }
+      }
+
+      // 货币符号：前缀
+      .pisell-lowcode-input-number-prefix {
+        margin-right: 8px;
+        margin-left: 16px;
+        color: #667085; // Gray/500
+        font-size: 16px;
+      }
+
+      // 货币符号：后置（addonAfter）
+      .pisell-lowcode-input-number-suffix {
+        margin-left: 8px;
+        margin-right: 16px;
+        color: #667085;
+        font-size: 16px;
+      }
+
+      // addonBefore / addonAfter 包裹（InputNumber 后置符号可能用 addon 渲染）
+      .pisell-lowcode-input-number-group-addon {
+        background-color: #ffffff !important;
+        border: 1px solid #d0d5dd !important;
+        color: #344054; // Gray/700
+        font-size: 16px !important;
+        padding: 12px 16px !important;
+
+        &:first-child {
+          border-right: none !important;
+          border-radius: 8px 0 0 8px !important;
+        }
+
+        &:last-child {
+          border-left: none !important;
+          border-radius: 0 8px 8px 0 !important;
+        }
+      }
+
+      // 步进器按钮（controls）
+      .pisell-lowcode-input-number-handler-wrap {
+        border-left: 1px solid #d0d5dd !important;
+        background: #ffffff !important;
 
-    // 错误提示
-    .pisell-currency-error {
-      margin-top: 4px;
-      color: #ff4d4f;
-      font-size: 14px;
-      line-height: 1.5;
+        .pisell-lowcode-input-number-handler {
+          color: #667085;
+          border-color: #d0d5dd;
+
+          &:hover {
+            color: #344054;
+          }
+
+          &.pisell-lowcode-input-number-handler-up-disabled,
+          &.pisell-lowcode-input-number-handler-down-disabled {
+            color: #98a2b3;
+            cursor: not-allowed;
+          }
+        }
+      }
+
+      // 错误状态
+      &.pisell-lowcode-input-number-status-error {
+        border-color: #fda29b !important; // Error/300
+
+        &.pisell-lowcode-input-number-focused,
+        &:focus-within {
+          border-color: #f97066 !important; // Error/400
+          box-shadow: 0 0 0 4px #fee4e2 !important; // Error/100
+        }
+
+        &:hover:not(:focus-within) {
+          border-color: #f97066 !important;
+        }
+      }
     }
   }
 
-  // 禁用态样式
+  // 错误提示（与设计体系一致）
+  &-error {
+    margin-top: 4px;
+    font-size: 12px;
+    color: #d92d20; // Error/600
+    line-height: 1.5;
+    animation: pisell-currency-fadeIn 0.3s ease-in-out;
+  }
+
+  // 只读态（Figma: Gray/900, 16px, Medium, line-height 24px）
+  &-read {
+    color: #101828; // Gray/900
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 24px;
+    letter-spacing: 0;
+  }
+
   &-disabled {
-    // 继承 Ant Design InputNumber 的禁用样式
+    opacity: 0.4;
+    cursor: not-allowed;
   }
-  
-  // 负数显示为红色（可选）
+
+  // 负数显示（与设计体系 Error 色一致）
   &.negative {
-    color: #ff4d4f;
+    color: #d92d20; // Error/600
   }
-  
-  // 正数显示为绿色（可选，用于收益场景）
+
+  // 正数高亮（收益等场景）
   &.positive {
     color: #52c41a;
   }
 }
+
+@keyframes pisell-currency-fadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(-4px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}

package/lib/components/pisellCurrency/PisellCurrency.stories.js

@@ -38,7 +38,7 @@ var import_PisellCurrency = require("./PisellCurrency");
 var import_react = require("react");
 var import_antd = require("antd");
 var meta = {
-  title: "Components/PisellCurrency",
+  title: "表单/表单组件/PisellCurrency",
   component: import_PisellCurrency.PisellCurrency,
   tags: ["autodocs"],
   argTypes: {

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

@@ -1,6 +1,7 @@
 /**
  * PisellCurrency 组件导出
  */
-export { default as PisellCurrency } from './PisellCurrency';
+import PisellCurrency from './PisellCurrency';
+export { PisellCurrency };
 export type { PisellCurrencyProps } from './types';
 export type { DisplayState, ValidationResult, NumberInputState, BaseNumberInputProps } from './types';

package/lib/components/pisellCurrency/index.js

@@ -32,7 +32,14 @@ __export(pisellCurrency_exports, {
   PisellCurrency: () => import_PisellCurrency.default
 });
 module.exports = __toCommonJS(pisellCurrency_exports);
+var import_locales = require("../../locales");
 var import_PisellCurrency = __toESM(require("./PisellCurrency"));
+import_PisellCurrency.default.SortOptions = {
+  getSortItems: (fieldKey) => [
+    { key: `${fieldKey}:asc`, label: (0, import_locales.getText)("sort-0-9") },
+    { key: `${fieldKey}:desc`, label: (0, import_locales.getText)("sort-9-0") }
+  ]
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PisellCurrency

package/lib/components/pisellDataSourceContainer/components/ColumnsSetting/utils.d.ts

@@ -1,17 +1,24 @@
+/**
+ * 列设置工具：持久化复用 @pisell/utils 的 saveColumnSettingToLocal / getColumnSettingFromLocal；
+ * mergeColumnSettingSimple 为 Table 列与本地缓存的合并逻辑，保留在此。
+ */
 import React from 'react';
-export declare const saveColumnSettingToLocal: ({ componentId, columnSetting, }: {
+import { getColumnSettingFromLocal, clearColumnSettingFromLocal } from '@pisell/utils';
+export { getColumnSettingFromLocal, clearColumnSettingFromLocal };
+/** 与 DataSourceContainer ColumnsSetting 调用处类型兼容的列设置项（含 React.ReactNode title） */
+export interface ColumnSettingItemForSave {
+    key: string;
+    dataIndex: string;
+    title?: React.ReactNode;
+    titleString?: string;
+    isShow: boolean;
+    sortIndex?: number;
+    fixed?: 'left' | 'right' | boolean;
+}
+export declare const saveColumnSettingToLocal: (params: {
     componentId: string;
-    columnSetting: Array<{
-        key: string;
-        dataIndex: string;
-        title?: React.ReactNode;
-        titleString?: string;
-        isShow: boolean;
-        sortIndex?: number;
-        fixed?: 'left' | 'right' | boolean;
-    }>;
+    columnSetting: ColumnSettingItemForSave[];
 }) => void;
-export declare const getColumnSettingFromLocal: (componentId?: string) => any;
 export declare const mergeColumnSettingSimple: ({ columns, componentId, }: {
     columns: Record<string, any>[];
     componentId?: string | undefined;
@@ -19,4 +26,3 @@ export declare const mergeColumnSettingSimple: ({ columns, componentId, }: {
     isShow: any;
     sortIndex: any;
 }[];
-export declare const clearColumnSettingFromLocal: (componentId?: string) => void;

package/lib/components/pisellDataSourceContainer/components/ColumnsSetting/utils.js

@@ -19,52 +19,18 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/pisellDataSourceContainer/components/ColumnsSetting/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
-  clearColumnSettingFromLocal: () => clearColumnSettingFromLocal,
-  getColumnSettingFromLocal: () => getColumnSettingFromLocal,
+  clearColumnSettingFromLocal: () => import_utils.clearColumnSettingFromLocal,
+  getColumnSettingFromLocal: () => import_utils.getColumnSettingFromLocal,
   mergeColumnSettingSimple: () => mergeColumnSettingSimple,
   saveColumnSettingToLocal: () => saveColumnSettingToLocal
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
-var getTableKey = (componentId) => {
-  if (typeof window === "undefined" || typeof window.location === "undefined") {
-    return `table-setting-${componentId}`;
-  }
-  const { pathname, search } = window.location;
-  let appendPath = pathname || "/";
-  let memoryKey = "";
-  try {
-    const params = new URLSearchParams(search || "");
-    const mk = params.get("memory_key");
-    if (mk && mk.trim() !== "") {
-      memoryKey = mk.trim();
-    }
-  } catch (e) {
-  }
-  const urlPart = memoryKey ? `${appendPath}#${memoryKey}` : appendPath;
-  return `table-setting-${componentId}-${urlPart}`;
-};
-var saveColumnSettingToLocal = ({
-  componentId,
-  columnSetting
-}) => {
-  if (!componentId) return;
-  const storageKey = getTableKey(componentId);
-  const data = {
-    column_setting: columnSetting,
-    updatedAt: Date.now()
-  };
-  localStorage.setItem(storageKey, JSON.stringify(data));
-};
-var getColumnSettingFromLocal = (componentId) => {
-  if (!componentId) return null;
-  const storageKey = getTableKey(componentId);
-  const originData = localStorage.getItem(storageKey);
-  if (originData && (0, import_utils.isJson)(originData)) {
-    const data = JSON.parse(originData);
-    return data.column_setting;
-  }
-  return null;
+var saveColumnSettingToLocal = (params) => {
+  (0, import_utils.saveColumnSettingToLocal)({
+    componentId: params.componentId,
+    columnSetting: params.columnSetting
+  });
 };
 var mergeColumnSettingSimple = ({
   columns,
@@ -77,7 +43,7 @@ var mergeColumnSettingSimple = ({
       sortIndex: index
     }));
   }
-  const cachedColumns = getColumnSettingFromLocal(componentId);
+  const cachedColumns = (0, import_utils.getColumnSettingFromLocal)(componentId);
   if (!cachedColumns || !Array.isArray(cachedColumns)) {
     return columns.map((item, index) => ({
       ...item,
@@ -95,7 +61,6 @@ var mergeColumnSettingSimple = ({
         ...item,
         isShow: cached.isShow ?? true,
         sortIndex: cached.sortIndex ?? index
-        // 注意：fixed 等特殊字段不从缓存中覆盖，保持 props 传入的值
       };
     }
     return {
@@ -107,11 +72,6 @@ var mergeColumnSettingSimple = ({
   mergedColumns.sort((a, b) => (a.sortIndex ?? 0) - (b.sortIndex ?? 0));
   return mergedColumns;
 };
-var clearColumnSettingFromLocal = (componentId) => {
-  if (!componentId) return;
-  const storageKey = getTableKey(componentId);
-  localStorage.removeItem(storageKey);
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   clearColumnSettingFromLocal,

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const useDataSourceKey: () => {
     dataSourceKey: string | undefined;
     dataSourceKeyRef: import("react").MutableRefObject<string | undefined>;

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

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

package/lib/components/pisellDateTimeDisplay/PisellDateTimeDisplay.js

@@ -41,9 +41,12 @@ var import_hooks = require("./hooks");
 var import_utils = require("./utils");
 var import_components = require("./components");
 var import_dateTimeDisplayFormats = require("./formats/dateTimeDisplayFormats");
+var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_PisellDateTimeDisplay = require("./PisellDateTimeDisplay.less");
 var PisellDateTimeDisplay = (props) => {
+  var _a, _b;
   const {
+    value: valueProp,
     layout = "horizontal",
     textAlign = "center",
     fields,
@@ -65,7 +68,11 @@ var PisellDateTimeDisplay = (props) => {
     className,
     style
   } = props;
-  const localeKey = (0, import_utils.getDayjsLocale)(locale);
+  const context = (0, import_useEngineContext.default)();
+  const resolvedLocale = locale || ((_b = (_a = context == null ? void 0 : context.engine) == null ? void 0 : _a.props) == null ? void 0 : _b.locale) || "en";
+  console.log("resolvedLocale", resolvedLocale);
+  const localeKey = (0, import_utils.getDayjsLocale)(resolvedLocale);
+  console.log("localeKey", localeKey);
   const baseLocale = localeKey.split("-")[0];
   const presetSource = formatByLocale ?? import_dateTimeDisplayFormats.DATETIME_DISPLAY_FORMATS;
   const preset = presetSource[localeKey] ?? presetSource[baseLocale] ?? {};
@@ -76,12 +83,13 @@ var PisellDateTimeDisplay = (props) => {
   const computedRefreshInterval = refreshInterval ?? (0, import_utils.getRefreshInterval)(effectiveTimeFormat);
   const currentTime = (0, import_hooks.useCurrentTime)({
     refreshInterval: computedRefreshInterval,
-    disabled: disableAutoRefresh,
-    locale,
+    disabled: disableAutoRefresh || valueProp !== void 0,
+    locale: resolvedLocale,
     onUpdate: onTimeUpdate
   });
+  const displayTime = valueProp !== void 0 && valueProp !== null ? (0, import_dayjs.default)(valueProp).locale(localeKey) : currentTime;
   if (customFormat) {
-    const formattedTime = currentTime.format(customFormat);
+    const formattedTime = displayTime.format(customFormat);
     const containerInlineStyle2 = {
       background: containerStyle == null ? void 0 : containerStyle.background,
       borderRadius: containerStyle == null ? void 0 : containerStyle.borderRadius,
@@ -108,7 +116,7 @@ var PisellDateTimeDisplay = (props) => {
     fieldOrder = ["time", "date", "weekday"]
   } = effectiveFields || {};
   const referenceDate = (0, import_dayjs.default)();
-  const relativeDay = (effectiveDateFormat == null ? void 0 : effectiveDateFormat.showRelativeDay) ? (0, import_utils.getRelativeDay)(currentTime, referenceDate) : null;
+  const relativeDay = (effectiveDateFormat == null ? void 0 : effectiveDateFormat.showRelativeDay) ? (0, import_utils.getRelativeDay)(displayTime, referenceDate) : null;
   const hideWeekdayWhenDateRelative = showDate && relativeDay !== null;
   const containerInlineStyle = {
     background: containerStyle == null ? void 0 : containerStyle.background,
@@ -127,7 +135,7 @@ var PisellDateTimeDisplay = (props) => {
           import_components.TimeDisplay,
           {
             key: "time",
-            time: currentTime,
+            time: displayTime,
             format: effectiveTimeFormat,
             style: timeStyle
           }
@@ -137,7 +145,7 @@ var PisellDateTimeDisplay = (props) => {
           import_components.DateDisplay,
           {
             key: "date",
-            date: currentTime,
+            date: displayTime,
             format: effectiveDateFormat,
             referenceDate: (0, import_dayjs.default)(),
             style: dateStyle
@@ -148,7 +156,7 @@ var PisellDateTimeDisplay = (props) => {
           import_components.WeekdayDisplay,
           {
             key: "weekday",
-            weekday: currentTime,
+            weekday: displayTime,
             format: effectiveWeekdayFormat,
             style: weekdayStyle
           }
@@ -179,12 +187,12 @@ var PisellDateTimeDisplay = (props) => {
   }
   if (layout === "horizontal") {
     const timeField = showTime ? renderField("time") : null;
-    const currentLocale = currentTime.locale();
+    const currentLocale = displayTime.locale();
     const isChinese = (0, import_utils.isChinese)(currentLocale);
     if (showDate && showWeekday) {
       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 dateStr = relativeDay ? (labels == null ? void 0 : labels[relativeDay]) ?? (0, import_utils.getRelativeDayLabel)(relativeDay, displayTime.locale()) : isChinese ? displayTime.format("M月D日") : displayTime.format("D MMM");
+      const weekdayStr = displayTime.format("ddd");
       const combinedStr = relativeDay ? dateStr : isChinese ? `${weekdayStr} ${dateStr}` : `${weekdayStr}, ${dateStr}`;
       const dateInlineStyle = {
         fontSize: dateStyle == null ? void 0 : dateStyle.fontSize,

package/lib/components/pisellDateTimeDisplay/PisellDateTimeDisplay.less

@@ -64,9 +64,10 @@
     line-height: 1.2;
   }
 
-  // 分隔符
+  // 分隔符：保留空格占位，避免纯空格时被折叠不显示
   &-separator {
     display: inline-block;
+    white-space: pre;
   }
 
   // 自定义格式化

package/lib/components/pisellDateTimeDisplay/hooks/useCurrentTime.js

@@ -36,7 +36,9 @@ var import_react = require("react");
 var import_dayjs = __toESM(require("dayjs"));
 var import_localeUtils = require("../utils/localeUtils");
 var import_usePisellConfig = __toESM(require("../../pisell-config-provider/hooks/usePisellConfig"));
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 function useCurrentTime(options) {
+  var _a, _b;
   const {
     refreshInterval = 6e4,
     disabled = false,
@@ -44,8 +46,12 @@ function useCurrentTime(options) {
     onUpdate
   } = options || {};
   const globalConfig = (0, import_usePisellConfig.default)();
+  const context = (0, import_useEngineContext.default)();
   const globalLocale = globalConfig == null ? void 0 : globalConfig.locale;
-  const dayjsLocale = (0, import_localeUtils.getDayjsLocale)(userLocale || globalLocale);
+  const engineLocale = (_b = (_a = context == null ? void 0 : context.engine) == null ? void 0 : _a.props) == null ? void 0 : _b.locale;
+  const dayjsLocale = (0, import_localeUtils.getDayjsLocale)(
+    userLocale || globalLocale || engineLocale || "en"
+  );
   const [currentTime, setCurrentTime] = (0, import_react.useState)(() => {
     const time = (0, import_dayjs.default)();
     return time.locale(dayjsLocale);

package/lib/components/pisellDateTimeDisplay/utils/localeUtils.d.ts

@@ -14,9 +14,9 @@ export declare function normalizeLocale(locale: string): string;
 export declare function isChinese(locale: string): boolean;
 /**
  * 获取 dayjs 兼容的 locale 代码
- * 未传 locale 时使用 i18n 当前语言（全局配置 / umi_locale），不再使用浏览器语言
+ * 未传 locale 时：优先 materials 当前语言（globalConfig / umi_locale），若为默认 en-US 则用 @pisell/utils getLocale
  * @param locale 原始 locale 代码（可选）
- * @returns dayjs 兼容的 locale 代码
+ * @returns dayjs 兼容的 locale 代码（与已加载的 zh-cn、en 对齐）
  * @example 'zh-CN' -> 'zh-cn', 'en-US' -> 'en'
  */
 export declare function getDayjsLocale(locale?: string): string;

package/lib/components/pisellDateTimeDisplay/utils/localeUtils.js

@@ -24,6 +24,7 @@ __export(localeUtils_exports, {
   normalizeLocale: () => normalizeLocale
 });
 module.exports = __toCommonJS(localeUtils_exports);
+var import_utils = require("@pisell/utils");
 var import_locale = require("../../../utils/locale");
 function normalizeLocale(locale) {
   return locale.toLowerCase();
@@ -32,11 +33,18 @@ function isChinese(locale) {
   const normalizedLocale = normalizeLocale(locale);
   return normalizedLocale.startsWith("zh");
 }
+function toDayjsLoadedLocale(normalized) {
+  if (normalized.startsWith("en")) return "en";
+  return normalized;
+}
 function getDayjsLocale(locale) {
   if (!locale) {
-    return normalizeLocale((0, import_locale.getCurrentLocale)());
+    const fromMaterials = (0, import_locale.getCurrentLocale)();
+    const fromUtils = typeof import_utils.locales.getLocale === "function" ? import_utils.locales.getLocale() : void 0;
+    const raw = (fromMaterials && fromMaterials !== "en-US" ? fromMaterials : void 0) || (typeof fromUtils === "string" && fromUtils ? fromUtils : void 0) || fromMaterials;
+    return toDayjsLoadedLocale(normalizeLocale(raw));
   }
-  return normalizeLocale(locale);
+  return toDayjsLoadedLocale(normalizeLocale(locale));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/components/pisellDateTimeDisplay/utils/relativeDay.d.ts

@@ -15,6 +15,7 @@ export declare type RelativeDay = 'today' | 'yesterday' | 'tomorrow';
 export declare function getRelativeDay(date: Dayjs, reference: Dayjs): RelativeDay | null;
 /**
  * 根据 locale 返回相对日期的展示文案
+ * 未传 locale 时使用 getDayjsLocale()（与 locales.getLocale 同源）
  *
  * @param day 'today' | 'yesterday' | 'tomorrow'
  * @param locale dayjs locale，如 'zh-cn'、'en'

package/lib/components/pisellDateTimeDisplay/utils/relativeDay.js

@@ -44,7 +44,8 @@ function getRelativeDay(date, reference) {
   return null;
 }
 function getRelativeDayLabel(day, locale) {
-  const isZh = locale ? (0, import_localeUtils.isChinese)(locale) : false;
+  const resolvedLocale = locale ?? (0, import_localeUtils.getDayjsLocale)();
+  const isZh = (0, import_localeUtils.isChinese)(resolvedLocale);
   return isZh ? LABELS_ZH[day] : LABELS_EN[day];
 }
 // Annotate the CommonJS export names for ESM import in node: