@zat-design/sisyphus-react 3.7.3 → 3.8.0-beat.2

package/es/ProStep/index.js

@@ -82,7 +82,7 @@ var ProStep = function ProStep(_ref) {
       return null;
     }
     var subEvent = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var value, _form$validateFields, _error$errorFields;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -128,47 +128,54 @@ var ProStep = function ProStep(_ref) {
     registerMap.current[id] = record;
   };
   var notify = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var events, res, nextErrorCollection;
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+      var _ref7, excludes, triggerIds, events, res, nextErrorCollection;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            events = Object.values(registerMap.current).map(function (item) {
-              var _item$subEvent;
-              return item === null || item === void 0 ? void 0 : (_item$subEvent = item.subEvent) === null || _item$subEvent === void 0 ? void 0 : _item$subEvent.call(item);
+            _ref7 = params || {}, excludes = _ref7.excludes;
+            triggerIds = Object.keys(registerMap.current); // 排除指定模块不触发校验
+            if (excludes === null || excludes === void 0 ? void 0 : excludes.length) {
+              triggerIds = triggerIds.filter(function (id) {
+                return !excludes.includes(id);
+              });
+            }
+            events = triggerIds.map(function (id) {
+              var _registerMap$current$, _registerMap$current$2;
+              return (_registerMap$current$ = registerMap.current[id]) === null || _registerMap$current$ === void 0 ? void 0 : (_registerMap$current$2 = _registerMap$current$.subEvent) === null || _registerMap$current$2 === void 0 ? void 0 : _registerMap$current$2.call(_registerMap$current$);
             });
-            _context2.next = 3;
+            _context2.next = 6;
             return Promise.all(events);
-          case 3:
+          case 6:
             res = _context2.sent;
             nextErrorCollection = {};
-            Object.keys(registerMap.current).forEach(function (id, index) {
-              var _ref7 = (res === null || res === void 0 ? void 0 : res[index]) || {},
-                errorFields = _ref7.errorFields;
+            triggerIds.forEach(function (id, index) {
+              var _ref8 = (res === null || res === void 0 ? void 0 : res[index]) || {},
+                errorFields = _ref8.errorFields;
               nextErrorCollection[id] = (errorFields === null || errorFields === void 0 ? void 0 : errorFields.length) || 0;
             });
             setErrorCollection(nextErrorCollection);
             return _context2.abrupt("return", res);
-          case 8:
+          case 11:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
-    return function notify() {
+    return function notify(_x) {
       return _ref6.apply(this, arguments);
     };
   }();
   var triggerTo = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
+    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
       var events, result, nextErrorCollection;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             events = [];
             keys === null || keys === void 0 ? void 0 : keys.forEach(function (key) {
-              var _registerMap$current, _registerMap$current$, _registerMap$current$2;
-              events.push(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : (_registerMap$current$ = _registerMap$current[key]) === null || _registerMap$current$ === void 0 ? void 0 : (_registerMap$current$2 = _registerMap$current$.subEvent) === null || _registerMap$current$2 === void 0 ? void 0 : _registerMap$current$2.call(_registerMap$current$));
+              var _registerMap$current, _registerMap$current$3, _registerMap$current$4;
+              events.push(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : (_registerMap$current$3 = _registerMap$current[key]) === null || _registerMap$current$3 === void 0 ? void 0 : (_registerMap$current$4 = _registerMap$current$3.subEvent) === null || _registerMap$current$4 === void 0 ? void 0 : _registerMap$current$4.call(_registerMap$current$3));
             });
             _context3.next = 4;
             return Promise.all(events);
@@ -190,8 +197,8 @@ var ProStep = function ProStep(_ref) {
         }
       }, _callee3);
     }));
-    return function triggerTo(_x) {
-      return _ref8.apply(this, arguments);
+    return function triggerTo(_x2) {
+      return _ref9.apply(this, arguments);
     };
   }();
   useDeepCompareEffect(function () {

package/es/ProTable/components/FormatColumn/index.d.ts

@@ -1,6 +1,12 @@
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: (column: ProTableColumn, originalObj: any, dataSourceObj: any, rowKey: any) => void;
+export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, }: {
+    column: ProTableColumn;
+    originalObj: any;
+    dataSourceObj: any;
+    rowKey: any;
+    diffToolTip?: boolean;
+}) => void;
 /**
  * 查找最近的父级className
  * @param element 当前node节点

package/es/ProTable/components/FormatColumn/index.js

@@ -11,7 +11,12 @@ import RenderColumn from '../RenderColumn';
 import { getDecimalDigits, getOriginalValue } from '../../utils';
 import getEnumLabel from '../../../ProEnum/utils/getEnumLabel';
 import ProForm from '../../../ProForm';
-export var formatColumn = function formatColumn(column, originalObj, dataSourceObj, rowKey) {
+export var formatColumn = function formatColumn(_ref) {
+  var column = _ref.column,
+    originalObj = _ref.originalObj,
+    dataSourceObj = _ref.dataSourceObj,
+    rowKey = _ref.rowKey,
+    diffToolTip = _ref.diffToolTip;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -31,6 +36,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
     originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps;
+  var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
     if (!prefix) {
@@ -98,7 +104,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -128,7 +134,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -181,7 +187,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -219,7 +225,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -246,7 +252,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -323,7 +329,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
           node: value,
           value: value,
           currentValue: value || '-',
-          originalDiffTip: originalDiffTip,
+          originalDiffTip: _originalDiffTip,
           toolTipProps: toolTipProps
         }), suffixNode(value, record, index)]
       });
@@ -346,7 +352,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: value || '-',
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };

package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -74,7 +74,7 @@ var DndWrapper = function DndWrapper(_ref2) {
     onDragStartGuard = _ref2.onDragStartGuard,
     onDragEndGuard = _ref2.onDragEndGuard;
   var onDragStart = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
       var active, _transformedValue, activeObject;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -105,7 +105,7 @@ var DndWrapper = function DndWrapper(_ref2) {
     };
   }();
   var onDragEnd = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
       var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {

package/es/ProTable/hooks/useAntdTable.js

@@ -276,7 +276,7 @@ function useAntdTable(service, options, useRequestOptions) {
     }
   };
   var handleRefresh = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -388,7 +388,7 @@ function useAntdTable(service, options, useRequestOptions) {
         total: total
       }),
       onSelect: function () {
-        var _onSelect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
+        var _onSelect = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -412,7 +412,7 @@ function useAntdTable(service, options, useRequestOptions) {
       key: 'uncheckAll',
       text: locale === null || locale === void 0 ? void 0 : (_locale$ProTable4 = locale.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.deselect,
       onSelect: function () {
-        var _onSelect2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _onSelect2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:

package/es/ProTable/index.js

@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "originalDataSource", "onDragStart", "onDragEnd"],
+var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "diffConfig", "onDragStart", "onDragEnd"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
@@ -52,10 +52,15 @@ function ProTable(props) {
     summary = props.summary,
     _props$emptyText = props.emptyText,
     emptyText = _props$emptyText === void 0 ? locale === null || locale === void 0 ? void 0 : (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.noData : _props$emptyText,
-    originalDataSource = props.originalDataSource,
+    diffConfig = props.diffConfig,
     onDragStartGuard = props.onDragStart,
     onDragEndGuard = props.onDragEnd,
     restProps = _objectWithoutProperties(props, _excluded);
+  var _ref3 = diffConfig || {},
+    originalDataSource = _ref3.originalDataSource,
+    changeTipColor = _ref3.changeTipColor,
+    addTipColor = _ref3.addTipColor,
+    toolTip = _ref3.toolTip;
   var quickTableConfig = quickConfig ? _objectSpread({
     columnConfig: true,
     cacheTime: true
@@ -71,10 +76,10 @@ function ProTable(props) {
     _quickTableConfig$sto = quickTableConfig.storage,
     storage = _quickTableConfig$sto === void 0 ? configStorage : _quickTableConfig$sto,
     tableProps = _objectWithoutProperties(quickTableConfig, _excluded2);
-  var _ref3 = tableProps || {},
-    pagination = _ref3.pagination,
-    dataSource = _ref3.dataSource,
-    rowKey = _ref3.rowKey;
+  var _ref4 = tableProps || {},
+    pagination = _ref4.pagination,
+    dataSource = _ref4.dataSource,
+    rowKey = _ref4.rowKey;
   var initDataSource = dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
       rowKey: getRowKey(rowKey, item)
@@ -157,8 +162,8 @@ function ProTable(props) {
   };
   // 列宽resize函数
   var handleResize = function handleResize(index) {
-    return function (e, _ref4) {
-      var size = _ref4.size;
+    return function (e, _ref5) {
+      var size = _ref5.size;
       var nextColumns = _toConsumableArray(curColumns);
       nextColumns[index] = _objectSpread(_objectSpread({}, nextColumns[index]), {}, {
         width: size.width
@@ -188,7 +193,13 @@ function ProTable(props) {
       return !(item === null || item === void 0 ? void 0 : item.delete);
     });
     newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item) {
-      formatColumn(item, originalObj, dataSourceObj, 'rowKey');
+      formatColumn({
+        column: item,
+        originalObj: originalObj,
+        dataSourceObj: dataSourceObj,
+        rowKey: 'rowKey',
+        diffToolTip: toolTip
+      });
     });
     return newColumns;
   }, [curColumns, handleResize]);
@@ -205,7 +216,7 @@ function ProTable(props) {
     });
   }, [columns]);
   var handleColumnConfig = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -241,7 +252,7 @@ function ProTable(props) {
       }, _callee);
     }));
     return function handleColumnConfig(_x) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   useDebounceEffect(function () {
@@ -314,7 +325,7 @@ function ProTable(props) {
     return _rowSelection;
   };
   var onDataSourceChange = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -330,7 +341,7 @@ function ProTable(props) {
       }, _callee2);
     }));
     return function onDataSourceChange(_x2) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var _rowClassName = function _rowClassName(record, index) {
@@ -339,6 +350,11 @@ function ProTable(props) {
     }
   };
   var TableComponent = draggable ? DraggableTable : BaseTable;
+  // 标记样式
+  var tagStyle = {
+    '--zaui-contract-bg': changeTipColor,
+    '--zaui-contract-bg-add': addTipColor
+  };
   return _jsx(TableContext.Provider, {
     value: {
       pathKey: pathKey,
@@ -362,6 +378,7 @@ function ProTable(props) {
         }
       }), _jsxs("div", {
         className: "pro-table-container",
+        style: tagStyle,
         children: [_jsx(TableComponent, _objectSpread(_objectSpread({}, restProps), {}, {
           draggableProps: {
             onChange: onDataSourceChange,

package/es/ProTable/propsType.d.ts

@@ -59,6 +59,16 @@ export interface DragStartGuardProps {
     activeObject: any;
     currentDataSource: any[];
 }
+export interface TableDiffConfigProps {
+    /** 比对原始数据源 */
+    originalDataSource: any[];
+    /** 是否显示对比值气泡 */
+    toolTip?: boolean;
+    /** 变更提示颜色 */
+    changeTipColor?: string;
+    /** 新增提示颜色 */
+    addTipColor?: string;
+}
 export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary' | 'columns'> {
     tableId?: string;
     rowKey?: string | GetRowKey<any>;
@@ -84,7 +94,10 @@ export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary'
      */
     stripe?: boolean;
     columns: ProTableColumn[];
-    originalDataSource?: any[];
+    /**
+     * 比对配置
+     */
+    diffConfig?: TableDiffConfigProps;
     /**
      * 拖拽额外配置
      */

package/es/ProTable/style/index.less

@@ -270,7 +270,7 @@
     .@{ant-prefix}-table-cell .varied-cell {
       margin-left: -8px;
       padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
-      background: var(--zaui-contract-bg, #fffaa1);
+      background: var(--zaui-contract-bg; #fffaa1) !important;
       border-radius: var(--zaui-border-radius, 8px);
     }
 

package/es/ProTree/components/AdaptiveTooltip.d.ts

@@ -0,0 +1,4 @@
+declare const AdaptiveTooltip: ({ children }: {
+    children: any;
+}) => import("react/jsx-runtime").JSX.Element;
+export default AdaptiveTooltip;

package/es/ProTree/components/AdaptiveTooltip.js

@@ -0,0 +1,55 @@
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2024-09-20 10:26:04
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2024-09-26 14:12:44
+ * @FilePath: /za-material-warehouse/src/ProTree/components/AdaptiveTooltip.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+
+import { useEffect, useState } from 'react';
+var AdaptiveTooltip = function AdaptiveTooltip(_ref) {
+  var children = _ref.children;
+  var _useState = useState('right'),
+    _useState2 = _slicedToArray(_useState, 2),
+    placement = _useState2[0],
+    setPlacement = _useState2[1];
+  useEffect(function () {
+    var handleResize = function handleResize() {
+      var tooltipElement = document.getElementById('adaptive-tooltip');
+      if (tooltipElement) {
+        var boundingRect = tooltipElement.getBoundingClientRect();
+        var windowWidth = window.innerWidth;
+        if (windowWidth - boundingRect.right < 150) {
+          setPlacement('left');
+        } else {
+          setPlacement('right');
+        }
+      }
+    };
+    window.addEventListener('resize', handleResize);
+    handleResize();
+    return function () {
+      window.removeEventListener('resize', handleResize);
+    };
+  }, [children]);
+  return _jsx(_Tooltip, {
+    placement: placement,
+    title: _jsx("div", {
+      onMouseDown: function onMouseDown(e) {
+        return e.stopPropagation();
+      },
+      children: children
+    }),
+    id: "adaptive-tooltip",
+    children: _jsxs("span", {
+      className: "pro-tree-wrap-ellipse",
+      children: [" ", children]
+    })
+  });
+};
+export default AdaptiveTooltip;

package/es/ProTree/components/List.js

@@ -1,6 +1,17 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/checkbox/style";
 import _Checkbox from "antd/es/checkbox";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["checkedValues", "disabled", "treeData", "searchStr", "showCodeName", "mode", "fieldNames", "handleOnChange", "handleFilterClose", "optionRender"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2024-07-03 11:02:19
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2024-09-26 14:30:26
+ * @FilePath: /za-material-warehouse/src/ProTree/components/List.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import { memo } from 'react';
 import SearchTitle from './SearchTitle';
 import CloseIcon from './CloseIcon';
@@ -15,7 +26,8 @@ function List(props) {
     fieldNames = props.fieldNames,
     handleOnChange = props.handleOnChange,
     handleFilterClose = props.handleFilterClose,
-    optionRender = props.optionRender;
+    optionRender = props.optionRender,
+    other = _objectWithoutProperties(props, _excluded);
   var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
   if (mode === 'render') {
@@ -37,10 +49,10 @@ function List(props) {
               value: item[fieldNameValue],
               disabled: item.disabled,
               children: _jsx("span", {
-                children: optionRender ? optionRender(item, searchStr) : _jsx(SearchTitle, {
+                children: optionRender ? optionRender(item, searchStr) : _jsx(SearchTitle, _objectSpread({
                   label: title,
                   searchStr: searchStr
-                })
+                }, other))
               })
             })
           }, item[fieldNameValue]);

package/es/ProTree/components/ProTree.js

@@ -359,7 +359,7 @@ var ProTree = function ProTree(props) {
   };
   /** 点击了树节点开始loading,改变自身state并将值通过onchange上传到form */
   var onSelectTreeNode = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(props, info) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(props, info) {
       var _options$;
       var values, options, option;
       return _regeneratorRuntime().wrap(function _callee$(_context) {

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

@@ -21,6 +21,7 @@ import { useImperativeHandle, forwardRef } from 'react';
 import { cloneDeep } from 'lodash';
 import { useProConfig } from '../../../ProConfigProvider';
 import Container from '../../../ProForm/components/Container';
+import AdaptiveTooltip from '../AdaptiveTooltip';
 var SHOW_PARENT = _TreeSelect.SHOW_PARENT;
 export var ProTreeSelect = function ProTreeSelect(props, ref) {
   // 全局属性配置在ConfigProvider
@@ -74,9 +75,14 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     selectProps = _objectWithoutProperties(props, _excluded);
   var _props$value = props.value,
     value = _props$value === void 0 ? undefined : _props$value;
-  var _ref2 = otherProps || {},
-    isView = _ref2.isView,
-    viewEmpty = _ref2.viewEmpty;
+  var _props$showEllipse = props.showEllipse,
+    showEllipse = _props$showEllipse === void 0 ? true : _props$showEllipse;
+  var _ref2 = otherProps !== null && otherProps !== void 0 ? otherProps : {},
+    isDiffChange = _ref2.isDiffChange;
+  var _showEllipse = showEllipse && !isDiffChange;
+  var _ref3 = otherProps || {},
+    isView = _ref3.isView,
+    viewEmpty = _ref3.viewEmpty;
   if (fieldNames && Object.keys(fieldNames).length) {
     code = fieldNames.value || 'value';
     label = fieldNames.label || 'label';
@@ -209,8 +215,8 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
       return undefined;
     }
     // 如果配置手动加载，不执行请求
-    var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
-      defaultParams = _ref3.defaultParams;
+    var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+      defaultParams = _ref4.defaultParams;
     // 执行用户配置的枚举服务，拉取枚举数据进行更新
     fetchFunction.run(defaultParams);
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, defaultDisableValue]);
@@ -288,9 +294,9 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
   var _renderTreeNode = function renderTreeNode(node, grade) {
     var children = node.children,
       icon = node.icon;
-    var labelText = node[label];
-    var value = node[code];
-    var key = node[uuidKey];
+    var labelText = node === null || node === void 0 ? void 0 : node.label;
+    var value = node === null || node === void 0 ? void 0 : node.value;
+    var key = uuidKey === proSelectFieldNames.value ? node === null || node === void 0 ? void 0 : node.value : node[uuidKey];
     var titleHtml = _jsx("span", {
       dangerouslySetInnerHTML: {
         __html: labelText
@@ -312,6 +318,20 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
         children: _jsx(Icon, {})
       }) : null]
     });
+    if (_showEllipse) {
+      title = _jsx(AdaptiveTooltip, {
+        children: treeCheckable ? titleHtml : _jsxs("span", {
+          className: "check-option-text",
+          children: [_jsx("span", {
+            className: "check-option-text-content",
+            children: titleHtml
+          }), !disabled ? _jsx("span", {
+            className: "check-mark-icon",
+            children: _jsx(Icon, {})
+          }) : null]
+        })
+      });
+    }
     if (!children) {
       return _jsx(_TreeSelect.TreeNode, {
         value: value,

package/es/ProTree/components/ProTreeSelect/propsType.d.ts

@@ -73,6 +73,8 @@ export interface PropTreeSelectProps extends Omit<TreeSelectProps, 'onSearch'> {
     expandedKeys?: any[];
     checkStrictly?: boolean;
     checkable?: boolean;
+    showEllipse?: boolean;
+    isDiffChange?: boolean;
 }
 export interface ProSelectAction {
     /** 获取发生请求的 useRequest 的 ref */

package/es/ProTree/components/ProTreeSelect/style/index.less

@@ -70,7 +70,7 @@
                     }
                 }
                 .@{ant-prefix}-select-tree-treenode:hover{
-                    background-color: #f5f5f5;
+                    background-color:  var(--zaui-disabled-bg);
                 }
                 .check-option-text{
                     .check-mark-icon{
@@ -90,7 +90,7 @@
                     padding-left: 7px;
                 }
                 .@{ant-prefix}-select-tree-treenode:hover{
-                    background-color: #f5f5f5;
+                    background-color:  var(--zaui-disabled-bg);;
                 }
                 .@{ant-prefix}-select-tree-node-content-wrapper{
                     padding-right: var(--zaui-space-size-md);

package/es/ProTree/components/SearchTitle.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="react" />
+import { ProFormOtherProps } from '../../ProForm/propsType';
 declare function SearchTitle(props: {
     searchStr?: string;
     label?: string;
     showEllipse?: boolean;
     ellipseWidth?: string;
+    otherProps?: ProFormOtherProps;
 }): import("react/jsx-runtime").JSX.Element;
 declare const _default: import("react").MemoExoticComponent<typeof SearchTitle>;
 export default _default;