@pisell/materials 3.3.84 → 3.3.86

package/lib/components/pisellBatchActionBar/PisellBatchActionBar.js

@@ -37,8 +37,15 @@ var import_classnames = __toESM(require("classnames"));
 var import_antd = require("antd");
 var import_PisellBasicGrid = __toESM(require("../PisellBasicGrid"));
 var import_GraphicTextCard = __toESM(require("../PisellCards/components/GraphicTextCard"));
+var import_utils = require("@pisell/utils");
 var import_locales = require("../../locales");
 var import_PisellBatchActionBar = require("./PisellBatchActionBar.less");
+function getBatchBarText(key) {
+  const fullKey = `pisell2.salesManagement.batchActionBar.${key}`;
+  const fromUtils = import_utils.locales.getText(fullKey);
+  if (fromUtils !== fullKey) return fromUtils;
+  return (0, import_locales.getText)(fullKey) ?? (0, import_locales.getText)(`batch-action-bar-${key}`);
+}
 var PisellBatchActionBar = (props) => {
   const {
     className,
@@ -57,7 +64,7 @@ var PisellBatchActionBar = (props) => {
     actionOrder,
     enableOverflow = true,
     overflowThreshold = 5,
-    moreText = (0, import_locales.getText)("batch-action-bar-more"),
+    moreText = getBatchBarText("more"),
     onSelectAll,
     onClear,
     onInvert,
@@ -130,7 +137,7 @@ var PisellBatchActionBar = (props) => {
     if (selectedCountText) {
       return selectedCountText.replace("{count}", String(count));
     }
-    const i18nText = (0, import_locales.getText)("batch-action-bar-selected-count");
+    const i18nText = getBatchBarText("selectedCount");
     if (typeof i18nText === "function") {
       return i18nText(count);
     }
@@ -147,7 +154,7 @@ var PisellBatchActionBar = (props) => {
           import_GraphicTextCard.default,
           {
             key: "select-all",
-            text: (0, import_locales.getText)("batch-action-bar-select-all"),
+            text: getBatchBarText("selectAll"),
             icon: "pisell2-check-square",
             variant: "horizontal",
             size: "small",
@@ -182,7 +189,7 @@ var PisellBatchActionBar = (props) => {
           import_GraphicTextCard.default,
           {
             key: "invert",
-            text: (0, import_locales.getText)("batch-action-bar-invert"),
+            text: getBatchBarText("invert"),
             icon: "pisell2-check-done-01",
             variant: "horizontal",
             size: "small",
@@ -217,7 +224,7 @@ var PisellBatchActionBar = (props) => {
           import_GraphicTextCard.default,
           {
             key: "clear",
-            text: (0, import_locales.getText)("batch-action-bar-clear"),
+            text: getBatchBarText("clear"),
             icon: "pisell2-square",
             variant: "horizontal",
             size: "small",
@@ -252,7 +259,7 @@ var PisellBatchActionBar = (props) => {
           import_GraphicTextCard.default,
           {
             key: "delete",
-            text: (0, import_locales.getText)("batch-action-bar-delete"),
+            text: getBatchBarText("delete"),
             icon: "pisell2-delete_wght300_24px",
             variant: "horizontal",
             size: "small",
@@ -279,18 +286,13 @@ var PisellBatchActionBar = (props) => {
                 return;
               }
               isDeleteModalOpenRef.current = true;
-              const deleteContent = (() => {
-                const i18nContent = (0, import_locales.getText)("batch-action-bar-delete-confirm-content");
-                if (typeof i18nContent === "function") {
-                  return i18nContent(selectionState.selectedCount);
-                }
-                return i18nContent || `确定要删除选中的 ${selectionState.selectedCount} 项吗？`;
-              })();
+              const i18nContent = getBatchBarText("deleteConfirmContent");
+              const deleteContent = typeof i18nContent === "function" ? i18nContent(selectionState.selectedCount) : i18nContent || `确定要删除选中的 ${selectionState.selectedCount} 项吗？`;
               import_antd.Modal.confirm({
-                title: (deleteConfirmConfig == null ? void 0 : deleteConfirmConfig.title) || (0, import_locales.getText)("batch-action-bar-delete-confirm-title"),
-                content: (deleteConfirmConfig == null ? void 0 : deleteConfirmConfig.description) || deleteContent,
-                okText: (deleteConfirmConfig == null ? void 0 : deleteConfirmConfig.okText) || (0, import_locales.getText)("batch-action-bar-delete-confirm-ok"),
-                cancelText: (deleteConfirmConfig == null ? void 0 : deleteConfirmConfig.cancelText) || (0, import_locales.getText)("batch-action-bar-delete-confirm-cancel"),
+                title: (deleteConfirmConfig == null ? void 0 : deleteConfirmConfig.title) ?? getBatchBarText("deleteConfirmTitle"),
+                content: (deleteConfirmConfig == null ? void 0 : deleteConfirmConfig.description) ?? deleteContent,
+                okText: (deleteConfirmConfig == null ? void 0 : deleteConfirmConfig.okText) ?? getBatchBarText("deleteConfirmOk"),
+                cancelText: (deleteConfirmConfig == null ? void 0 : deleteConfirmConfig.cancelText) ?? getBatchBarText("deleteConfirmCancel"),
                 okButtonProps: { danger: true },
                 onOk: () => {
                   onDelete == null ? void 0 : onDelete(selectedKeys, selectedRows);
@@ -380,7 +382,6 @@ var PisellBatchActionBar = (props) => {
             height: "48px",
             ...action.style
           },
-          className: action.className,
           onClick: () => handleActionClick(action)
         }
       );
@@ -390,10 +391,10 @@ var PisellBatchActionBar = (props) => {
           import_antd.Popconfirm,
           {
             key: action.key,
-            title: confirmConfig.title || (0, import_locales.getText)("batch-action-bar-confirm-title"),
+            title: confirmConfig.title || getBatchBarText("confirmTitle"),
             description: confirmConfig.description,
-            okText: confirmConfig.okText || (0, import_locales.getText)("batch-action-bar-delete-confirm-ok"),
-            cancelText: confirmConfig.cancelText || (0, import_locales.getText)("batch-action-bar-delete-confirm-cancel"),
+            okText: confirmConfig.okText || getBatchBarText("deleteConfirmOk"),
+            cancelText: confirmConfig.cancelText || getBatchBarText("deleteConfirmCancel"),
             onConfirm: () => handleActionClick(action)
           },
           card
@@ -430,9 +431,11 @@ var PisellBatchActionBar = (props) => {
     const modifiedOverflowActions = overflowActions.map((action) => {
       var _a;
       if (import_react.default.isValidElement(action)) {
-        return import_react.default.cloneElement(action, {
+        const el = action;
+        const prevStyle = (_a = el.props) == null ? void 0 : _a.style;
+        return import_react.default.cloneElement(el, {
           style: {
-            ...((_a = action.props) == null ? void 0 : _a.style) || {},
+            ...prevStyle || {},
             minWidth: "160px",
             width: "160px"
           }

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

@@ -0,0 +1,6 @@
+/**
+ * PisellBatchActionBar 组件导出
+ * @description 批量操作栏组件，用于承载基于选中对象的批量行为操作
+ */
+export { default } from './PisellBatchActionBar';
+export type { PisellBatchActionBarProps, BatchActionItem, DefaultActionsConfig, BatchActionConfirmConfig, BatchActionBarPosition, } from './types';

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

@@ -6,6 +6,7 @@ export declare const COLUMNS_SHARED_STATE_KEYS: {
 };
 export interface ColumnsSettingProps {
     scopeId?: string;
+    __id?: string;
 }
 export interface ColumnSettingItem {
     key: string;
@@ -16,7 +17,12 @@ export interface ColumnSettingItem {
     sortIndex?: number;
     fixed?: 'left' | 'right' | boolean;
 }
-declare const _default: React.ForwardRefExoticComponent<Omit<ColumnsSettingProps & DataSourceContainerContextType & React.RefAttributes<unknown> & {
+/**
+ * 暴露给父组件的 ref 方法
+ */
+export interface ColumnsSettingRef {
+}
+declare const _default: React.ForwardRefExoticComponent<Omit<ColumnsSettingProps & DataSourceContainerContextType & React.RefAttributes<ColumnsSettingRef> & {
     refId?: string | undefined;
 }, "ref"> & React.RefAttributes<any>>;
 export default _default;

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

@@ -36,14 +36,16 @@ module.exports = __toCommonJS(ColumnsSetting_exports);
 var import_react = __toESM(require("react"));
 var import_withContainer = __toESM(require("../../utils/withContainer"));
 var import_ColumnsSetting = __toESM(require("../../../table/Actions/component/ColumnsSetting"));
+var import_utils = require("./utils");
 var COLUMNS_SHARED_STATE_KEYS = {
   columnsValue: (instanceId) => `${instanceId}:columns:value`,
   columnsChange: (instanceId) => `${instanceId}:columns:change`
 };
 var WithColumnsSetting = (0, import_react.forwardRef)(
-  (props) => {
-    const { refManager, scopeId = "table" } = props;
+  (props, ref) => {
+    const { refManager, scopeId = "table", __id } = props;
     const [value, setValue] = (0, import_react.useState)([]);
+    (0, import_react.useImperativeHandle)(ref, () => ({}), []);
     (0, import_react.useEffect)(() => {
       const unsubscribe = refManager.subscribeSharedState(
         COLUMNS_SHARED_STATE_KEYS.columnsValue(scopeId),
@@ -58,6 +60,20 @@ var WithColumnsSetting = (0, import_react.forwardRef)(
         COLUMNS_SHARED_STATE_KEYS.columnsChange(scopeId),
         typedValue
       );
+      if (__id) {
+        (0, import_utils.saveColumnSettingToLocal)({
+          componentId: __id,
+          columnSetting: typedValue.map((col, index) => ({
+            key: col.key,
+            dataIndex: col.dataIndex,
+            title: col.title,
+            titleString: col.titleString,
+            isShow: col.isShow,
+            sortIndex: col.sortIndex ?? index,
+            fixed: col.fixed
+          }))
+        });
+      }
     };
     return /* @__PURE__ */ import_react.default.createElement(import_ColumnsSetting.default, { value, onChange });
   }

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

@@ -0,0 +1,28 @@
+/**
+ * 列设置工具：持久化复用 @pisell/utils 的 saveColumnSettingToLocal / getColumnSettingFromLocal；
+ * mergeColumnSettingSimple 为 Table 列与本地缓存的合并逻辑，保留在此。
+ */
+import React from 'react';
+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: ColumnSettingItemForSave[];
+}) => void;
+export declare const mergeColumnSettingSimple: ({ columns, componentId, }: {
+    columns: Record<string, any>[];
+    componentId?: string | undefined;
+}) => {
+    isShow: any;
+    sortIndex: any;
+}[];

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

@@ -0,0 +1,81 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/pisellDataSourceContainer/components/ColumnsSetting/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  clearColumnSettingFromLocal: () => import_utils.clearColumnSettingFromLocal,
+  getColumnSettingFromLocal: () => import_utils.getColumnSettingFromLocal,
+  mergeColumnSettingSimple: () => mergeColumnSettingSimple,
+  saveColumnSettingToLocal: () => saveColumnSettingToLocal
+});
+module.exports = __toCommonJS(utils_exports);
+var import_utils = require("@pisell/utils");
+var saveColumnSettingToLocal = (params) => {
+  (0, import_utils.saveColumnSettingToLocal)({
+    componentId: params.componentId,
+    columnSetting: params.columnSetting
+  });
+};
+var mergeColumnSettingSimple = ({
+  columns,
+  componentId
+}) => {
+  if (!componentId) {
+    return columns.map((item, index) => ({
+      ...item,
+      isShow: item.isShow ?? true,
+      sortIndex: index
+    }));
+  }
+  const cachedColumns = (0, import_utils.getColumnSettingFromLocal)(componentId);
+  if (!cachedColumns || !Array.isArray(cachedColumns)) {
+    return columns.map((item, index) => ({
+      ...item,
+      isShow: item.isShow ?? true,
+      sortIndex: index
+    }));
+  }
+  const cachedMap = new Map(
+    cachedColumns.map((item) => [item.dataIndex, item])
+  );
+  const mergedColumns = columns.map((item, index) => {
+    const cached = cachedMap.get(item.dataIndex);
+    if (cached) {
+      return {
+        ...item,
+        isShow: cached.isShow ?? true,
+        sortIndex: cached.sortIndex ?? index
+      };
+    }
+    return {
+      ...item,
+      isShow: item.isShow ?? true,
+      sortIndex: index
+    };
+  });
+  mergedColumns.sort((a, b) => (a.sortIndex ?? 0) - (b.sortIndex ?? 0));
+  return mergedColumns;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  clearColumnSettingFromLocal,
+  getColumnSettingFromLocal,
+  mergeColumnSettingSimple,
+  saveColumnSettingToLocal
+});

package/lib/components/pisellDataSourceContainer/components/Table/index.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { DataSourceContainerContextType } from '../../type';
 declare const _default: React.ForwardRefExoticComponent<Omit<Partial<import("antd").TableProps<any>> & DataSourceContainerContextType & {
     scopeId?: string | undefined;
+    __id?: string | undefined;
 } & React.RefAttributes<unknown> & {
     refId?: string | undefined;
 }, "ref"> & React.RefAttributes<any>>;

package/lib/components/pisellDataSourceContainer/components/Table/index.js

@@ -43,13 +43,15 @@ var WithTable = (0, import_react.forwardRef)(
       refManager,
       columns,
       scopeId = "table",
+      __id,
       ...otherProps
     } = props;
     const { data, loading } = listAction;
     const { visibleColumns } = (0, import_useColumns.default)({
       columns: columns || [],
       scopeId,
-      refManager
+      refManager,
+      __id
     });
     return /* @__PURE__ */ import_react.default.createElement(
       import_antd.Table,

package/lib/components/pisellDataSourceContainer/components/Table/useColumns.d.ts

@@ -6,6 +6,7 @@ interface UseColumnsParams {
     columns: any[];
     scopeId: string;
     refManager: RefManagerContextType;
+    __id?: string;
 }
 declare const useColumns: (params: UseColumnsParams) => {
     visibleColumns: any[];

package/lib/components/pisellDataSourceContainer/components/Table/useColumns.js

@@ -24,18 +24,31 @@ __export(useColumns_exports, {
 module.exports = __toCommonJS(useColumns_exports);
 var import_react = require("react");
 var import_ColumnsSetting = require("../ColumnsSetting");
+var import_utils = require("../ColumnsSetting/utils");
 var useColumns = (params) => {
-  const { columns, scopeId, refManager } = params;
+  const { columns, scopeId, refManager, __id } = params;
   const [columnSettings, setColumnSettings] = (0, import_react.useState)([]);
   (0, import_react.useEffect)(() => {
     if (!(columns == null ? void 0 : columns.length)) return;
-    const settings = columns.map((col, index) => ({
-      key: col.key || col.dataIndex,
+    const mergedColumns = (0, import_utils.mergeColumnSettingSimple)({
+      columns: columns.map((col, index) => ({
+        key: col.key || col.dataIndex,
+        dataIndex: col.dataIndex,
+        title: col.title,
+        titleString: typeof col.title === "string" ? col.title : col.dataIndex,
+        isShow: typeof col.isShow === "boolean" ? col.isShow : true,
+        sortIndex: index,
+        fixed: col.fixed
+      })),
+      componentId: __id
+    });
+    const settings = mergedColumns.map((col) => ({
+      key: col.key,
       dataIndex: col.dataIndex,
       title: col.title,
-      titleString: typeof col.title === "string" ? col.title : col.dataIndex,
-      isShow: typeof col.isShow === "boolean" ? col.isShow : true,
-      sortIndex: index,
+      titleString: col.titleString,
+      isShow: col.isShow,
+      sortIndex: col.sortIndex,
       fixed: col.fixed
     }));
     refManager.setSharedState(
@@ -43,7 +56,7 @@ var useColumns = (params) => {
       settings
     );
     setColumnSettings(settings);
-  }, [columns, refManager, scopeId]);
+  }, [columns, refManager, scopeId, __id]);
   (0, import_react.useEffect)(() => {
     const unsubscribe = refManager.subscribeSharedState(
       import_ColumnsSetting.COLUMNS_SHARED_STATE_KEYS.columnsChange(scopeId),
@@ -51,14 +64,12 @@ var useColumns = (params) => {
     );
     return unsubscribe;
   }, [refManager, scopeId]);
-  const visibleColumns = (0, import_react.useMemo)(() => {
-    if (!(columns == null ? void 0 : columns.length)) return [];
-    if (!(columnSettings == null ? void 0 : columnSettings.length)) return columns;
+  return (0, import_react.useMemo)(() => {
+    if (!(columns == null ? void 0 : columns.length)) return { visibleColumns: [] };
+    if (!(columnSettings == null ? void 0 : columnSettings.length)) return { visibleColumns: columns };
     const columnMap = new Map(columns.map((col) => [col.dataIndex, col]));
-    return columnSettings.filter((setting) => setting.isShow).map((setting) => columnMap.get(setting.dataIndex)).filter(Boolean);
+    const visibleColumns = columnSettings.filter((setting) => setting.isShow).map((setting) => columnMap.get(setting.dataIndex)).filter(Boolean);
+    return { visibleColumns };
   }, [columns, columnSettings]);
-  return {
-    visibleColumns
-  };
 };
 var useColumns_default = useColumns;

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

@@ -1,4 +1,3 @@
-/// <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;