@zat-design/sisyphus-react 4.5.1 → 4.5.2

package/es/ProSelect/utils/index.js

@@ -1,4 +1,6 @@
 import _difference from "lodash/difference";
+import _isString from "lodash/isString";
+import _isObject from "lodash/isObject";
 import _isNumber from "lodash/isNumber";
 /* eslint-disable no-restricted-syntax */
 /**
@@ -109,4 +111,176 @@ export const getSelectList = ({
     fieldNames,
     mode
   });
+};
+
+/** 将 selectList（扁平或分组）转为扁平选项列表，用于查找、回显、defaultOne */
+export const flattenOptions = list => {
+  if (!Array.isArray(list) || !list.length) return [];
+  const out = [];
+  list.forEach(item => {
+    if (Array.isArray(item.options)) {
+      out.push(...item.options);
+    } else {
+      out.push(item);
+    }
+  });
+  return out;
+};
+
+/**
+ * 根据 code 在扁平选项中查找对应的数据对象
+ * @param flatOptions 扁平选项列表
+ * @param code 值字段名
+ * @param input 单个值或值数组
+ */
+export const findValueObject = (flatOptions, code, input) => {
+  if (Array.isArray(input) && input.length) {
+    return input.map(i => flatOptions.find(item => item[code] === i)).filter(item => !!item);
+  }
+  return flatOptions.find(item => item[code] === input);
+};
+
+/** 默认搜索过滤：在 searchText/title/label 中做大小写不敏感的包含匹配 */
+export const defaultFilterOption = (input, option) => {
+  if (option?.value == null) return false;
+  const optionLabel = option?.searchText ?? option?.title ?? option?.label;
+  return String(optionLabel ?? '').toLowerCase().includes(input.toLowerCase());
+};
+
+/** 取选项上挂载的原始 record（兼容 option.record / option.data.record） */
+export const getInnerRecord = option => {
+  if (!option) return undefined;
+  if (option.record) return option.record;
+  if (option.data?.record) return option.data.record;
+  return undefined;
+};
+
+/**
+ * 计算单个选项的展示文本
+ * @param optionRender 自定义渲染函数，返回字符串时直接使用
+ * @param showCodeName 是否以 code-label 形式展示
+ */
+export const getOptionText = ({
+  item,
+  optionRender,
+  showCodeName,
+  code,
+  label
+}) => {
+  if (optionRender) {
+    const rendered = optionRender(item);
+    return _isString(rendered) ? rendered : String(item[label] ?? '');
+  }
+  const text = showCodeName ? `${item[code]}-${item[label]}` : item[label];
+  return _isString(text) ? text : String(text ?? '');
+};
+
+/** 构建单个 antd Select option 对象 */
+export const buildOptionItem = (item, index, config) => {
+  const text = getOptionText({
+    item,
+    ...config
+  });
+  return {
+    key: item[config.code] != null ? `${item[config.code]}-${index}` : `option-${index}`,
+    label: text,
+    value: item[config.code] != null ? item[config.code] : undefined,
+    disabled: !!item.disabled,
+    title: text,
+    searchText: text,
+    record: item
+  };
+};
+
+/**
+ * 构建 antd Select 的 options（支持分组）
+ * @param list 当前数据源（可能含 options 分组项）
+ */
+export const buildSelectOptions = (list, config) => {
+  if (!Array.isArray(list)) {
+    return [];
+  }
+  return list.map((item, index) => {
+    const groupOptions = item.options;
+    if (Array.isArray(groupOptions)) {
+      return {
+        key: item[config.label] ?? `group-${index}`,
+        label: item[config.label],
+        options: groupOptions.map((opt, optIndex) => buildOptionItem(opt, optIndex, config))
+      };
+    }
+    return buildOptionItem(item, index, config);
+  });
+};
+
+/**
+ * labelInValue 模式下解析 onChange 回调拿到的 option：
+ * 多选模式下将 record 合并进每项并清理临时字段，单选直接透传
+ */
+export const resolveChangeOption = (rawOption, {
+  mode,
+  isReactNode
+}) => {
+  let option = rawOption;
+  if (isReactNode) {
+    option = getInnerRecord(rawOption);
+  }
+  if (mode === 'multiple' && Array.isArray(option)) {
+    option.forEach(item => {
+      const currentRecord = getInnerRecord(item);
+      if (currentRecord) {
+        Object.assign(item, currentRecord);
+      }
+      delete item.record;
+      delete item.children;
+    });
+  }
+  return option;
+};
+
+/**
+ * 计算 onChange 第一个参数（值）：根据 labelInValue/getChangeValue 决定透传原始值还是值对象
+ */
+export const computeChangeValue = (value, {
+  labelInValue,
+  mode,
+  getChangeValue,
+  flatOptions,
+  code
+}) => {
+  const useValueObject = labelInValue && (mode === 'multiple' || !mode);
+  const resolved = useValueObject ? findValueObject(flatOptions, code, value) : value;
+  return getChangeValue ? getChangeValue(resolved) : resolved;
+};
+
+/**
+ * 处理 labelInValue 模式及 defaultOne 下值的回填（只返回值，不触发状态更新）
+ */
+export const computeTransformValue = ({
+  value,
+  labelInValue,
+  mode,
+  defaultOne,
+  isDefaultOne,
+  selectList,
+  flatOptions,
+  code
+}) => {
+  if (labelInValue && !mode) {
+    if (!_isObject(value)) return undefined;
+    return value?.[code] || value?.value;
+  }
+  if (labelInValue && mode) {
+    if (!Array.isArray(value)) return [];
+    return value.map(item => item?.[code]);
+  }
+  // 兼容多选下显式传 null 的极端场景
+  if (mode && value === null) return undefined;
+  // 仅当 dataSource 只有一项时默认回填
+  if (defaultOne && !value && !isDefaultOne && selectList?.length === 1) {
+    return flatOptions[0]?.[code];
+  }
+  // 修复空字符 placeholder 不显示
+  if (value === '') return undefined;
+  return value;
 };

package/es/ProTree/components/ProTreeSelect/index.js

@@ -441,6 +441,22 @@ export const ProTreeSelect = (props, ref) => {
     });
   };
 
+  // 把 filterTree 写入的高亮标记（纯文本分隔）转成安全的 React 节点，避免 dangerouslySetInnerHTML
+  const renderHighlightLabel = text => {
+    if (!text || !text.includes('highlight-search-text')) return text;
+    const parts = text.split(/(<span class="highlight-search-text">.*?<\/span>)/g);
+    return parts.map((part, i) => {
+      const match = part.match(/^<span class="highlight-search-text">(.*?)<\/span>$/);
+      if (match) {
+        return /*#__PURE__*/_jsx("span", {
+          className: "highlight-search-text",
+          children: match[1]
+        }, i);
+      }
+      return part;
+    });
+  };
+
   /**
    * 自定义渲染子树
    * 注意：此时数据已经是标准格式（label, value, children）
@@ -472,9 +488,7 @@ export const ProTreeSelect = (props, ref) => {
       key = node?.value;
     }
     const titleHtml = /*#__PURE__*/_jsx("span", {
-      dangerouslySetInnerHTML: {
-        __html: labelText
-      }
+      children: renderHighlightLabel(labelText)
     });
     let searchKey = '';
     if (showCodeName) {

package/es/ProUpload/components/DragRender.js

@@ -86,7 +86,8 @@ const DragRender = props => {
       children: [/*#__PURE__*/_jsx("div", {
         className: "file-type-icon",
         children: /*#__PURE__*/_jsx("img", {
-          src: _fileIcon
+          src: _fileIcon,
+          alt: ""
         })
       }), /*#__PURE__*/_jsx(DragSingleFileItem, {
         file: file,

package/es/ProUpload/index.js

@@ -271,7 +271,7 @@ const ProUpload = /*#__PURE__*/React.forwardRef((props, ref) => {
           }
         });
         if (!file.uid) {
-          file.uid = `${Math.ceil(Math.random() * 10000)}`;
+          file.uid = crypto.randomUUID();
         }
         if (!file.status) {
           file.status = 'done';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.5.1",
+  "version": "4.5.2",
   "license": "MIT",
   "files": [
     "es",

package/es/FormsProvider/index.d.ts

@@ -1,18 +0,0 @@
-import React from 'react';
-import type { ModifiedFormInstanceType } from '../ProForm/propsType';
-type Forms = Record<string, ModifiedFormInstanceType<any>>;
-export declare const FormsContext: React.Context<Forms>;
-/**
- * @param formKey 表单实例key
- * @param formIst form实例, 如果传了会把传入的实例存入全局
- * @returns 没有入参: 返回表单实例但是不存入全局
- *          有formKey: 取全局中的表单实例返回, 如果不存在则创建后返回
- */
-export declare const useForms: () => Forms;
-/** 获取所有表单实例 */
-export declare const useContextForms: () => Forms;
-interface FormsProviderProps {
-    children?: React.ReactNode;
-}
-declare const FormsProvider: React.FC<FormsProviderProps>;
-export default FormsProvider;

package/es/ProAction/components/CheckModalContent/index.d.ts

@@ -1,8 +0,0 @@
-import './index.less';
-interface propsWithCheckModal {
-    errorTitle?: string;
-    list?: string[];
-    [key: string]: any;
-}
-declare const CheckModalContent: (props: propsWithCheckModal) => import("react/jsx-runtime").JSX.Element;
-export default CheckModalContent;

package/es/ProAction/index.d.ts

@@ -1,7 +0,0 @@
-import React, { PropsWithChildren } from 'react';
-import type { ProActionType } from './propsType';
-import './index.less';
-declare const ProAction: React.FC<PropsWithChildren<{
-    config?: ProActionType[];
-}>>;
-export default ProAction;

package/es/ProAction/propsType.d.ts

@@ -1,45 +0,0 @@
-import { ReactNode } from 'react';
-import { Service, Options } from 'ahooks/lib/useRequest/src/types';
-export interface ProActionType {
-    /**
-     * @description 模式类型：check执行校验并解析错误信息展示，confirm确认提示
-     * @default -
-     */
-    mode?: 'check' | 'confirm';
-    /**
-     * @description 标题
-     * @default -
-     */
-    title?: string | ReactNode;
-    /**
-     * @description 操作回调函数
-     * @param previousData 接上一个 useRequest 返回的值
-     * @param args 接所有链式 useRequest 返回的值
-     * @param index 当前操作的索引
-     * @returns void或Promise<void>
-     * @default -
-     */
-    onAction?: (previousData?: any, args?: any[], index?: number) => void | Promise<void>;
-    /**
-     * @description 自定义请求
-     * @param previousData 接上一个 useRequest 返回的值
-     * @param args 接所有链式 useRequest 返回的值
-     * @returns 包含service、options和transformResponse的对象
-     * @default -
-     */
-    useRequest?: (previousData: any, args: any) => {
-        service?: Service<any, any>;
-        options?: Options<any, any>;
-        transformResponse?: (data: any) => any;
-    };
-    /**
-     * @description 是否中断链式操作
-     * @param previousData 上一个操作的返回数据
-     * @param args 所有链式的数据合集
-     * @returns 布尔值，返回true继续执行，返回false中断操作
-     * @default -
-     */
-    continue?: (previousData: any, args: any[]) => boolean;
-    /** 自定义错误弹窗内容视图渲染 */
-    contextRender?: (data: any) => string | ReactNode;
-}

package/es/ProConfigProvider/index.d.ts

@@ -1,9 +0,0 @@
-import React, { FC } from 'react';
-import 'dayjs/locale/zh-cn';
-import type { ProConfigProviderProps, ConfigContext } from './propsType';
-export declare const ProConfigContext: React.Context<ConfigContext>;
-export declare function useProConfig(): ConfigContext;
-export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
-export declare const ProConfigProvider: FC<ProConfigProviderProps>;
-export type { ProConfigProviderType, ProConfigProviderProps, GlobalConfig, ProTableGlobalConfig, StorageType, } from './propsType';
-export default ProConfigProvider;

package/es/ProConfigProvider/propsType.d.ts

@@ -1,78 +0,0 @@
-import type React from 'react';
-import type { FormInstance } from 'antd';
-import type { PropSelectType } from '../ProSelect/propsType';
-import type { ProModalSelectType } from '../ProForm/components/combination/ProModalSelect/propsType';
-import type { ProCascaderType } from '../ProForm/components/combination/ProCascader/propsType';
-import type { ProEnumConfigType } from '../ProEnum/propsType';
-/** 浏览器缓存类型，与 ProEnum / ProTable 的 StorageType 定义一致 */
-export type StorageType = 'localStorage' | 'sessionStorage' | 'indexedDB';
-/** 项目级全局配置（一处配置，全局生效） */
-export interface GlobalConfig {
-    /** 缓存存储位置，影响 ProTable 列配置缓存与 ProEnum 枚举缓存，默认由各组件自身决定 */
-    storage?: StorageType;
-}
-/** ProTable 组件全局默认配置，通过 ProConfigProvider 统一设置，无需每个实例单独声明 */
-export interface ProTableGlobalConfig {
-    /** 是否开启可伸缩列功能，默认 false */
-    resizeColumn?: boolean;
-    /** 是否开启列配置功能，开启时默认同步开启缓存，默认 false */
-    columnConfig?: boolean | {
-        onColumnOk?: (catchColumns: any, columns: any[]) => Promise<void>;
-    };
-    /** 是否开启列配置缓存，单位为天，true 时缓存一天，默认 false */
-    cacheTime?: number | boolean;
-}
-/** 对外配置项类型（value、内部 state 均为此类型，字段均可选） */
-export interface ProConfigProviderType {
-    locale?: string;
-    /** 项目级全局配置：缓存位置等跨组件通用配置 */
-    globalConfig?: GlobalConfig;
-    /** ProTable 组件全局默认配置 */
-    ProTable?: ProTableGlobalConfig;
-    ProEnum?: Partial<ProEnumConfigType>;
-    ProSelect?: Partial<PropSelectType> & Record<string, any>;
-    ProModalSelect?: Partial<ProModalSelectType> & Record<string, any>;
-    ProAddressBar?: Partial<ProCascaderType> & Record<string, any>;
-    ProCascader?: Partial<ProCascaderType> & Record<string, any>;
-    forms?: Record<string, FormInstance | undefined>;
-    [key: string]: any;
-}
-/** ProConfigProvider 组件 Props（内部使用） */
-export interface ProConfigProviderProps {
-    value?: ProConfigProviderType;
-    locale?: string;
-    onSuccess?: (data: any, params: any) => void;
-    children?: React.ReactNode;
-}
-/** Config 上下文 */
-export interface ConfigContext {
-    state: ProConfigProviderType;
-    dispatch: React.Dispatch<ProConfigActions>;
-}
-/** ThemeAwareConfigProvider 内部组件 Props */
-export interface ThemeAwareConfigProviderProps {
-    locale: any;
-    children: React.ReactNode;
-}
-/** Reducer Actions */
-export type ProConfigActions = {
-    type: 'setFormRef';
-    name: string;
-    value: FormInstance;
-} | {
-    type: 'deleteFormRef';
-    name: string;
-} | {
-    type: 'set';
-    payload: ProConfigProviderType;
-} | {
-    type: 'setProEnum';
-    payload: Record<string, any>;
-} | {
-    type: 'setProEnumDic';
-    key: string;
-    payload: any;
-} | {
-    type: 'setWithLocal';
-    payload: ProConfigProviderType;
-};

package/es/ProDownload/index.d.ts

@@ -1,6 +0,0 @@
-import type { ProDownloadType } from './propsType';
-declare const ProDownload: {
-    (props: ProDownloadType): import("react/jsx-runtime").JSX.Element;
-    downLoadRequest: import("./utils").DownloadRequestProps;
-};
-export default ProDownload;

package/es/ProDownload/propsType.d.ts

@@ -1,71 +0,0 @@
-import { ReactNode } from 'react';
-import type { ButtonProps } from 'antd';
-import type { DownloadRequestProps, PropsWithMakeFilePropsType } from './utils';
-export interface ProDownloadType extends ButtonProps {
-    /**
-     * @description       下载资源获取来源：api：通过接口获取，url：通过静态资源链接获取
-     * @default           api
-     */
-    source?: string;
-    /**
-     * @description       下载请求的地址
-     * @default           (必选)
-     */
-    url: string;
-    /**
-     * @description       下载请求的地址
-     * @deprecated        弃用，请使用url进行替换
-     * @default           (非必选)
-     */
-    action?: string;
-    /**
-     * @description       下载请求的类型
-     * @default           post
-     */
-    method?: 'post' | 'get';
-    /**
-     * @description       下载所需额外参数或返回上传额外参数的方法
-     * @default           -
-     */
-    params?: any;
-    /**
-     * @description       下载保存的文件名
-     * @default           (必选)
-     */
-    fileName?: string;
-    /**
-     * @description       设置上传的请求头部，IE10 以上有效
-     * @default           -
-     */
-    headers?: object;
-    /**
-     * @description      禁用状态
-     * @default           false
-     */
-    disabled?: boolean;
-    /** 格式化数据 */
-    transformResponse?: (data: any) => any;
-    /**
-     * @description       上传文件之前的钩子,若返回 false 则停止下载。支持返回一个 Promise 对象，Promise 对象 reject 时则停止下载
-     * @default           -
-     */
-    beforeDownload?: () => boolean | Promise<any>;
-    /**
-     * @description       service 执行完成时触发
-     * @default           -
-     */
-    /**
-     * @description       下载出错的回调
-     * @default           -
-     */
-    onError?: (response: object) => void;
-    onFinish?: () => void;
-    /**
-     * @description       下载按钮的填充内容
-     * @default           -
-     */
-    downLoadRequest?: DownloadRequestProps;
-    downLoadBlobUrl?: PropsWithMakeFilePropsType;
-    children?: string | ReactNode;
-    [key: string]: any;
-}

package/es/ProDownload/utils.d.ts

@@ -1,60 +0,0 @@
-export interface PropsWithMakeFilePropsType {
-    blob?: Blob;
-    fileName: string;
-    url?: string;
-}
-export interface IDownloadRequestPropsType {
-    /**
-     * @description       下载请求的地址
-     * @default           (必选)
-     */
-    url: string;
-    /**
-     * @description       下载请求的类型
-     * @default           post
-     */
-    method?: 'post' | 'get';
-    /**
-     * @description       下载所需额外参数或返回上传额外参数的方法
-     * @default           -
-     */
-    params?: any;
-    headers?: any;
-    /** 格式化数据 */
-    transformResponse?: (data: any) => any;
-    /**
-     * @description       service 执行完成时触发
-     * @default           -
-     */
-    onFinish?: (response: object, params: object) => void;
-    /**
-     * @description       下载保存的文件名
-     * @default           (必选)
-     */
-    fileName?: string;
-    /**
-     * @description       下载出错的回调
-     * @default           -
-     */
-    onError?: (response: object) => void;
-}
-/**
- * 下载Blob
- *
- * @param response
- * @param fileName
- * @param extendName
- * @constructor
- */
-export declare function BlobMakeFile({ blob, fileName, url }: PropsWithMakeFilePropsType): void;
-export type DownloadRequestProps = (props: IDownloadRequestPropsType) => Promise<Response>;
-type convertBase64ToBlobType = (base64: string, fileType?: string, slice?: number) => Blob;
-export declare const convertBase64ToBlob: convertBase64ToBlobType;
-/**
- * 从Content-Disposition获取filename
- * @param contentDisposition string
- * @returns string
- */
-export declare function getFilenameFromContentDisposition(contentDisposition: any): string;
-export declare const DownloadRequest: DownloadRequestProps;
-export {};

package/es/ProDrawerForm/components/ProDrawer/index.d.ts

@@ -1,7 +0,0 @@
-import { FC } from 'react';
-import { ProDrawerFormType } from '../../propsType';
-/**
- * 抽屉组件
- */
-declare const ProDrawer: FC<ProDrawerFormType>;
-export default ProDrawer;

package/es/ProDrawerForm/components/ProModal/index.d.ts

@@ -1,7 +0,0 @@
-import { FC } from 'react';
-import { ProDrawerFormType } from '../../propsType';
-/**
- * 弹窗组件
- */
-declare const ProModal: FC<ProDrawerFormType>;
-export default ProModal;

package/es/ProDrawerForm/components/index.d.ts

@@ -1,2 +0,0 @@
-export { default as ProDrawer } from './ProDrawer';
-export { default as ProModal } from './ProModal';

package/es/ProDrawerForm/hooks/useConfirmClose.d.ts

@@ -1,25 +0,0 @@
-/// <reference types="react" />
-import type { ProDrawerFormType } from '../propsType';
-interface UseConfirmCloseParams {
-    open?: boolean;
-    isView?: boolean;
-    isConfirmClose?: boolean;
-    isConfirmCloseModalProps?: ProDrawerFormType['isConfirmCloseModalProps'];
-    onCancel?: ProDrawerFormType['onCancel'];
-}
-/**
- * 关闭抽屉/弹窗时的二次确认逻辑
- *
- * - markInteracted：绑定到内容容器的 input / change 事件，标记用户真实交互过。
- *   setFieldsValue 等程序回填不会派发用户输入事件，因此异步回填不会误触发二次确认。
- * - onConfirm：组件自带关闭入口（右上角 × / 遮罩）的关闭处理。未交互、查看模式或
- *   未开启二次确认时直接关闭；否则弹出二次确认。底部取消按钮不走此逻辑。
- * - contextHolder：Modal.useModal 的上下文占位，需渲染进组件，使二次确认弹框能继承
- *   ConfigProvider 的主题 / 国际化（替代静态 Modal.confirm，消除上下文告警）。
- */
-export declare const useConfirmClose: ({ open, isView, isConfirmClose, isConfirmCloseModalProps, onCancel, }: UseConfirmCloseParams) => {
-    markInteracted: () => void;
-    onConfirm: () => void;
-    contextHolder: import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>>;
-};
-export {};

package/es/ProDrawerForm/index.d.ts

@@ -1,6 +0,0 @@
-import React from 'react';
-import { FormInstance } from 'antd/es/form/Form';
-import { ProDrawerFormType } from './propsType';
-export declare const useProDrawerFormContext: () => any;
-declare const ProDrawerForm: React.ForwardRefExoticComponent<ProDrawerFormType & React.RefAttributes<FormInstance<any>>>;
-export default ProDrawerForm;