@zat-design/sisyphus-react 4.5.0 → 4.5.2

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

@@ -10,7 +10,7 @@ import locale from "../../../locale";
 import { useProConfig } from "../../../ProConfigProvider";
 import Container from "../../../ProForm/components/Container";
 import AdaptiveTooltip from "../AdaptiveTooltip";
-import { getFlatTreeData, restoreCodeNameLabel } from "../../utils";
+import { getFlatTreeData, restoreCodeNameLabel, applyCheckLeaf } from "../../utils";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const {
   SHOW_PARENT
@@ -63,6 +63,8 @@ export const ProTreeSelect = (props, ref) => {
     className,
     checkStrictly,
     checkable,
+    checkLeaf,
+    // 开启后只能选择叶子节点，非叶子节点置灰禁用
     ...selectProps
   } = props;
   const {
@@ -153,6 +155,17 @@ export const ProTreeSelect = (props, ref) => {
     loop(copyData);
     return copyData;
   };
+
+  /**
+   * 统一数据后处理：先处理 code-name 展示，再按 checkLeaf 标记非叶子节点禁用
+   * 数据已是标准格式（label, value, children）
+   * @param dataArr 标准格式数据
+   * @returns 后处理结果
+   */
+  const processData = dataArr => {
+    const result = transferDataSource(dataArr, showCodeName);
+    return checkLeaf ? applyCheckLeaf(result) : result;
+  };
   const defaultOnSuccessFun = res => {
     const {
       status = 200,
@@ -163,9 +176,9 @@ export const ProTreeSelect = (props, ref) => {
       message.error(msg);
       return;
     }
-    // 先转换字段名，再处理 code-name 展示
+    // 先转换字段名，再处理 code-name 展示与 checkLeaf 标记
     const transformedData = transformFieldNames(data || []);
-    const resultData = transferDataSource(transformedData, showCodeName);
+    const resultData = processData(transformedData);
     setState({
       selectList: resultData || [],
       origDataSource: resultData || []
@@ -194,9 +207,9 @@ export const ProTreeSelect = (props, ref) => {
     onSuccess: data => {
       if (transformResponse && typeof transformResponse === 'function') {
         const responseData = transformResponse(data);
-        // 先转换字段名，再处理 code-name 展示
+        // 先转换字段名，再处理 code-name 展示与 checkLeaf 标记
         const transformedData = transformFieldNames(responseData);
-        const resultData = transferDataSource(transformedData, showCodeName);
+        const resultData = processData(transformedData);
         setState({
           selectList: countChild(resultData),
           origDataSource: resultData
@@ -217,9 +230,9 @@ export const ProTreeSelect = (props, ref) => {
     if (fetchFunction?.data, useRequest?.options?.cacheKey) {
       if (transformResponse && typeof transformResponse === 'function') {
         const responseData = transformResponse(fetchFunction.data);
-        // 先转换字段名，再处理 code-name 展示
+        // 先转换字段名，再处理 code-name 展示与 checkLeaf 标记
         const transformedData = transformFieldNames(responseData);
-        const resultData = transferDataSource(transformedData, showCodeName);
+        const resultData = processData(transformedData);
         setState({
           selectList: countChild(resultData),
           origDataSource: resultData
@@ -232,18 +245,18 @@ export const ProTreeSelect = (props, ref) => {
   useDeepCompareEffect(() => {
     if (enumCode) {
       const dictEnum = dics[enumCode] || [];
-      // 先转换字段名，再处理 code-name 展示
+      // 先转换字段名，再处理 code-name 展示与 checkLeaf 标记
       const transformedData = transformFieldNames(dictEnum);
-      const resultData = transferDataSource(transformedData, showCodeName);
+      const resultData = processData(transformedData);
       const processedList = countChild(resultData);
       setState({
         selectList: processedList,
         origDataSource: resultData
       });
     } else if (dataSource) {
-      // 先转换字段名，再处理 code-name 展示
+      // 先转换字段名，再处理 code-name 展示与 checkLeaf 标记
       const transformedData = transformFieldNames(dataSource);
-      const resultData = transferDataSource(transformedData, showCodeName);
+      const resultData = processData(transformedData);
       const processedList = countChild(resultData);
       setState({
         selectList: processedList,
@@ -428,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）
@@ -459,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/ProTree/components/ProTreeSelect/style/index.less

@@ -30,12 +30,21 @@
       width: auto !important;
       padding: 0px;
     }
-    &.singal-tree,
+    &.signal-tree,
     &.checkable-tree {
       .@{ant-prefix}-select-tree {
         .@{ant-prefix}-select-tree-treenode {
-          padding-top: var(--zaui-space-size-xs);
-          padding-bottom: var(--zaui-space-size-xs);
+          padding-top: 2px;
+          padding-bottom: 2px;
+        }
+
+        .@{ant-prefix}-select-tree-node-content-wrapper {
+          min-height: 20px;
+          line-height: 20px;
+        }
+
+        .@{ant-prefix}-select-tree-switcher {
+          line-height: 24px;
         }
       }
       .highlight {
@@ -101,7 +110,7 @@
           background-color: transparent;
         }
         .@{ant-prefix}-select-tree-checkbox {
-          margin-top: var(--zaui-space-size-xs);
+          margin-top: 2px;
           align-self: stretch;
         }
       }

package/es/ProTree/style/index.less

@@ -76,7 +76,7 @@
         background-color: transparent;
       }
       .@{ant-prefix}-tree-checkbox {
-        margin-top: 11px;
+        margin-top: 7px;
         align-self: flex-start;
       }
     }
@@ -114,7 +114,7 @@
     }
 
     .@{ant-prefix}-tree-switcher {
-      line-height: 44px;
+      line-height: 32px;
     }
 
     .@{ant-prefix}-tree-switcher-leaf-line {
@@ -161,7 +161,7 @@
   &-tree-node {
     display: flex;
     flex-direction: row;
-    padding: 9px var(--zaui-space-size-sm);
+    padding: 6px var(--zaui-space-size-sm);
     margin-left: -8px;
     border-radius: var(--zaui-space-size-xs);
 
@@ -269,7 +269,7 @@
   .@{ant-prefix}-tree-switcher {
     width: 20px;
     align-self: flex-start;
-    margin-top: -4px;
+    margin-top: 0;
   }
 
   .@{ant-prefix}-tree-show-line .@{ant-prefix}-tree-indent-unit::before {
@@ -316,6 +316,9 @@
   }
 
   .pro-tree-operate-btn-popover {
+    overflow: hidden;
+    border-radius: var(--zaui-border-radius);
+
     .icon-item {
       position: relative;
       z-index: 1;
@@ -330,14 +333,22 @@
       &:after {
         position: absolute;
         display: block;
-        z-index: 0;
-        left: 0;
-        top: 0;
+        z-index: -1;
+        inset: 0;
         content: '';
-        width: 120px;
-        height: 32px;
         background-color: var(--zaui-brand);
         opacity: 0.08;
+        border-radius: var(--zaui-border-radius-card);
+      }
+
+      &:first-child:after {
+        border-top-left-radius: var(--zaui-border-radius);
+        border-top-right-radius: var(--zaui-border-radius);
+      }
+
+      &:last-child:after {
+        border-bottom-left-radius: var(--zaui-border-radius);
+        border-bottom-right-radius: var(--zaui-border-radius);
       }
     }
   }

package/es/ProTree/utils.js

@@ -201,4 +201,30 @@ export function getDefaultExpandKeys(isExpand, allKeys) {
     return allKeys;
   }
   return [];
+}
+
+/**
+ * checkLeaf 模式：只能选择叶子节点，非叶子节点设 disabled=true 整行置灰不可点
+ * 数据已是标准格式（label, value, children），仅单选 treeSelect 场景使用
+ * 不可变：返回全新数组，不修改入参
+ * @param data 标准格式树数据
+ * @returns 标记后的新树数据
+ */
+export function applyCheckLeaf(data) {
+  if (!Array.isArray(data)) {
+    return data;
+  }
+  return data.map(node => {
+    const hasChildren = Array.isArray(node.children) && node.children.length > 0;
+    if (!hasChildren) {
+      return {
+        ...node
+      };
+    }
+    return {
+      ...node,
+      disabled: true,
+      children: applyCheckLeaf(node.children)
+    };
+  });
 }

package/es/ProTreeModal/style/index.less

@@ -125,7 +125,7 @@
     .@{ant-prefix}-tree-treenode {
       width: 100%;
       padding: 0;
-      padding-bottom: var(--zaui-font-size-sm, 12px);
+      padding-bottom: 6px;
       color: var(--zaui-text);
       font-size: var(--zaui-font-size, 14px);
       line-height: 20px;

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/es/ProViewer/propsType.js

@@ -1,3 +1,5 @@
 import { ModalProps } from 'antd';
 
-// 弹窗 或者 页面
+// 弹窗 或者 页面
+
+/** 对外公开类型别名 */

package/es/index.js

@@ -45,6 +45,8 @@ export { default as ProBackBtn } from "./ProLayout/components/ProHeader/componen
 
 // ProTable 相关类型
 
+// ProSelect 类型
+
 // ProUpload 类型
 
 // ProTabs 类型
@@ -63,9 +65,17 @@ export { default as ProBackBtn } from "./ProLayout/components/ProHeader/componen
 
 // ProDrawerForm 类型
 
+// ProEditLabel 类型
+
 // ProModalSelect 类型
 
 // ProStepTab 类型
 
+// ProEnum 类型
+
+// ProAction / ProDownload / ProViewer 类型
+
+// ProWaterMark / ProThemeTools 类型
+
 // token导出
 export * from "./tokens";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.5.0",
+  "version": "4.5.2",
   "license": "MIT",
   "files": [
     "es",
@@ -48,35 +48,29 @@
   ],
   "scripts": {
     "analyze": "ANALYZE=1 dumi build",
-    "build": "father build && mv dist/index.min.css dist/index.esm.css && mv dist/less.min.css dist/less.esm.css",
-    "build-es": "father build --format esm",
-    "build-lib": "father build --format cjs",
-    "build-dist": "father build --format umd",
+    "build": "father build && mv dist/index.min.css dist/index.esm.css && mv dist/less.min.css dist/less.esm.css && npm run build:ai-meta",
+    "build:ai-meta": "node ./scripts/build-ai-meta.mjs",
     "docs": "cross-env NODE_OPTIONS=\"--openssl-legacy-provider\" dumi build",
     "docs:deploy": "gh-pages -d docs-dist",
     "lint": "npm run lint:js && npm run lint:style && npm run lint:prettier",
-    "lint-staged": "lint-staged",
     "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx --ignore-pattern '**/__tests__/**' --ignore-pattern '**/*.test.*' --ignore-pattern '**/*.spec.*'",
     "code-standards:check": "node ./scripts/code-standards-check.mjs",
+    "check:types": "node ./scripts/check-public-types.mjs",
     "commit-msg:format": "node ./scripts/format-commit-msg.mjs",
-    "git:pull:dev_4": "git pull --tags --no-rebase origin dev_4",
     "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
     "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
     "lint:prettier": "prettier --check \"**/*\" --end-of-line auto",
-    "lint:report": "eslint --ext .jsx,.js src -f checkstyle -o report_zacc_eslint_js.xml & exit 0; stylelint --custom-formatter node_modules/stylelint-checkstyle-formatter src/**/*.{css,scss,less} > report_zacc_stylelint_css.xml & exit 0",
     "lint:style": "stylelint --fix \"src/**/*.less\"",
-    "precommit": "lint-staged",
     "prepare": "husky && patch-package",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
-    "postpublish": "git clean -fd",
+    "pack:main": "npm pack --dry-run",
+    "pack:mcp": "npm run build:ai-meta && cd packages/sisyphus-react-mcp && npm pack --dry-run",
     "release": "yarn build && npm publish",
+    "release:mcp": "npm run build:ai-meta && cd packages/sisyphus-react-mcp && npm publish",
     "release:beta": "yarn build && npm publish --tag=beta",
     "start": "cross-env NODE_OPTIONS=\"--openssl-legacy-provider\" dumi dev",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
-    "test:react18": "REACT_VERSION=18 npm run test",
-    "test:react19": "npm run test",
-    "test:all-versions": "npm run test:react18 && npm run test:react19",
     "tsc": "tsc --noEmit"
   },
   "lint-staged": {

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;
-}