@zat-design/sisyphus-react 3.7.3-beta.9 → 3.8.0

package/lib/ProForm/utils/transformValue.js

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.transformValue = exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _lodash = require("lodash");
 var _utils = require("../utils");
-var _excluded = ["value"];
+var _utils2 = require("../../utils");
 var transformValue = exports.transformValue = function transformValue(names, form, fieldName, _normalize, _getValueProps) {
   return {
     normalize: function normalize(value) {
@@ -29,23 +28,30 @@ var transformValue = exports.transformValue = function transformValue(names, for
       return _value;
     },
     getValueProps: function getValueProps(value) {
+      var _curValue;
       var _value = [];
       names.forEach(function (name, index) {
         var value = form.getFieldValue(name);
         _value[index] = value;
       });
       // 支持外部传入转换函数
-      var _ref = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
-          value: _value
-        },
-        cusValue = _ref.value,
-        cusRest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+      var res = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
+        value: _value
+      };
+      // 如果数组中值都为空, 则值置为空
+      var curValue = res === null || res === void 0 ? void 0 : res.value;
       // @ts-ignore
-      (0, _lodash.set)(form.getFieldsValue(true), fieldName, cusValue);
+      if ((_curValue = curValue) === null || _curValue === void 0 ? void 0 : _curValue.every(function (item) {
+        return (0, _utils2.isEmpty)(item);
+      })) {
+        curValue = undefined;
+      }
+      // @ts-ignore
+      (0, _lodash.set)(form.getFieldsValue(true), fieldName, curValue);
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
-      return (0, _objectSpread2.default)({
-        value: cusValue
-      }, cusRest);
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, res), {}, {
+        value: curValue
+      });
     },
     shouldUpdate: function shouldUpdate(prevValues, curValues) {
       return (0, _utils.diffField)(prevValues, curValues, names);

package/lib/ProSelect/index.js

@@ -297,8 +297,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       showArrow: true,
       loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       onChange: handleChange,
-      optionLabelProp: "children" // 解决warning报错，添加默认值
-      ,
+      optionLabelProp: (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isDiffChange) ? 'label' : 'children',
+      // optionLabelProp="label" // 解决warning报错，添加默认值
       showSearch: true,
       filterOption: (0, _lodash.isFunction)(_onSearch) ? false : function (input, option) {
         var _option$children, _option$children$prop;
@@ -315,16 +315,15 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       value: transformValue(),
       children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
         return (0, _jsxRuntime.jsx)(Option, {
+          label: item[label],
           value: item[code],
           record: item,
           disabled: !!item.disabled,
           children: (0, _jsxRuntime.jsx)(TooltipOption, {
             title: OptionRender ? OptionRender(item) : selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
             children: OptionRender ? (0, _jsxRuntime.jsx)("span", {
-              title: OptionRender(item),
               children: OptionRender(item)
             }) : (0, _jsxRuntime.jsx)("span", {
-              title: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
               children: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label]
             })
           }, item[code])

package/lib/ProSelect/utils/index.js

@@ -38,7 +38,7 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
       _iterator.f();
     }
     if (mode === 'multiple') {
-      selectValues = [].concat((0, _toConsumableArray2.default)(selectValues), (0, _toConsumableArray2.default)(result));
+      selectValues = [].concat((0, _toConsumableArray2.default)(selectValues), (0, _toConsumableArray2.default)(result || []));
     } else {
       selectValues.push(result);
     }
@@ -61,13 +61,14 @@ var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
   if (!otherProps) {
     return null;
   }
-  var listName = otherProps.listName,
+  var name = otherProps.name,
+    listName = otherProps.listName,
     form = otherProps.form;
   var firstNumberIndex = listName.lastIndexOf(listName.findLast(function (item) {
     return typeof item === 'number';
   }));
-  var fatherName = listName.slice(0, firstNumberIndex);
-  var selectName = listName.slice(firstNumberIndex + 1);
+  var fatherName = (name || listName).slice(0, firstNumberIndex);
+  var selectName = (name || listName).slice(firstNumberIndex + 1);
   return findSelectNameValues({
     list: form.getFieldValue(fatherName) || [],
     selectName: selectName,

package/lib/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/lib/ProTable/components/FormatColumn/index.js

@@ -17,7 +17,12 @@ var _RenderColumn = _interopRequireDefault(require("../RenderColumn"));
 var _utils2 = require("../../utils");
 var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEnumLabel"));
 var _ProForm = _interopRequireDefault(require("../../../ProForm"));
-var formatColumn = exports.formatColumn = function formatColumn(column, originalObj, dataSourceObj, rowKey) {
+var formatColumn = exports.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,
@@ -37,6 +42,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     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) {
@@ -104,7 +110,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -134,7 +140,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -187,7 +193,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -225,7 +231,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -252,7 +258,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: renderValue,
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };
@@ -329,7 +335,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
           node: value,
           value: value,
           currentValue: value || '-',
-          originalDiffTip: originalDiffTip,
+          originalDiffTip: _originalDiffTip,
           toolTipProps: toolTipProps
         }), suffixNode(value, record, index)]
       });
@@ -352,7 +358,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: value || '-',
-        originalDiffTip: originalDiffTip,
+        originalDiffTip: _originalDiffTip,
         toolTipProps: toolTipProps
       });
     };

package/lib/ProTable/index.js

@@ -27,7 +27,7 @@ var _reset = _interopRequireDefault(require("../assets/reset.svg"));
 var _customColumn = _interopRequireDefault(require("../assets/customColumn.svg"));
 var _utils = require("./utils");
 var _locale = _interopRequireDefault(require("../locale"));
-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"];
 var defaultCacheTime = 1; // columns 配置保存时间为一天
 // 全局上下文
@@ -59,10 +59,15 @@ function ProTable(props) {
     summary = props.summary,
     _props$emptyText = props.emptyText,
     emptyText = _props$emptyText === void 0 ? _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable = _locale.default.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 = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _ref3 = diffConfig || {},
+    originalDataSource = _ref3.originalDataSource,
+    changeTipColor = _ref3.changeTipColor,
+    addTipColor = _ref3.addTipColor,
+    toolTip = _ref3.toolTip;
   var quickTableConfig = quickConfig ? (0, _objectSpread4.default)({
     columnConfig: true,
     cacheTime: true
@@ -78,10 +83,10 @@ function ProTable(props) {
     _quickTableConfig$sto = quickTableConfig.storage,
     storage = _quickTableConfig$sto === void 0 ? configStorage : _quickTableConfig$sto,
     tableProps = (0, _objectWithoutProperties2.default)(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 (0, _objectSpread4.default)((0, _objectSpread4.default)({}, item), {}, {
       rowKey: (0, _utils.getRowKey)(rowKey, item)
@@ -164,8 +169,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 = (0, _toConsumableArray2.default)(curColumns);
       nextColumns[index] = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, nextColumns[index]), {}, {
         width: size.width
@@ -195,7 +200,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) {
-      (0, _FormatColumn.formatColumn)(item, originalObj, dataSourceObj, 'rowKey');
+      (0, _FormatColumn.formatColumn)({
+        column: item,
+        originalObj: originalObj,
+        dataSourceObj: dataSourceObj,
+        rowKey: 'rowKey',
+        diffToolTip: toolTip
+      });
     });
     return newColumns;
   }, [curColumns, handleResize]);
@@ -212,7 +223,7 @@ function ProTable(props) {
     });
   }, [columns]);
   var handleColumnConfig = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(checkList) {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -248,7 +259,7 @@ function ProTable(props) {
       }, _callee);
     }));
     return function handleColumnConfig(_x) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   (0, _ahooks.useDebounceEffect)(function () {
@@ -321,7 +332,7 @@ function ProTable(props) {
     return _rowSelection;
   };
   var onDataSourceChange = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(nextDataSource) {
+    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(nextDataSource) {
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -337,7 +348,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) {
@@ -346,6 +357,11 @@ function ProTable(props) {
     }
   };
   var TableComponent = draggable ? _RcTable.DraggableTable : _RcTable.BaseTable;
+  // 标记样式
+  var tagStyle = {
+    '--zaui-contract-bg': changeTipColor,
+    '--zaui-contract-bg-add': addTipColor
+  };
   return (0, _jsxRuntime.jsx)(TableContext.Provider, {
     value: {
       pathKey: pathKey,
@@ -369,6 +385,7 @@ function ProTable(props) {
         }
       }), (0, _jsxRuntime.jsxs)("div", {
         className: "pro-table-container",
+        style: tagStyle,
         children: [(0, _jsxRuntime.jsx)(TableComponent, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, restProps), {}, {
           draggableProps: {
             onChange: onDataSourceChange,

package/lib/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/lib/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/lib/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/lib/ProTree/components/AdaptiveTooltip.js

@@ -0,0 +1,61 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
+var _react = require("react");
+/*
+ * @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
+ */
+
+var AdaptiveTooltip = function AdaptiveTooltip(_ref) {
+  var children = _ref.children;
+  var _useState = (0, _react.useState)('right'),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    placement = _useState2[0],
+    setPlacement = _useState2[1];
+  (0, _react.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 (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    placement: placement,
+    title: (0, _jsxRuntime.jsx)("div", {
+      onMouseDown: function onMouseDown(e) {
+        return e.stopPropagation();
+      },
+      children: children
+    }),
+    id: "adaptive-tooltip",
+    children: (0, _jsxRuntime.jsxs)("span", {
+      className: "pro-tree-wrap-ellipse",
+      children: [" ", children]
+    })
+  });
+};
+var _default = exports.default = AdaptiveTooltip;

package/lib/ProTree/components/List.js

@@ -5,11 +5,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _antd = require("antd");
 var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _CloseIcon = _interopRequireDefault(require("./CloseIcon"));
+var _excluded = ["checkedValues", "disabled", "treeData", "searchStr", "showCodeName", "mode", "fieldNames", "handleOnChange", "handleFilterClose", "optionRender"];
+/*
+ * @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
+ */
 function List(props) {
   var checkedValues = props.checkedValues,
     disabled = props.disabled,
@@ -21,7 +32,8 @@ function List(props) {
     fieldNames = props.fieldNames,
     handleOnChange = props.handleOnChange,
     handleFilterClose = props.handleFilterClose,
-    optionRender = props.optionRender;
+    optionRender = props.optionRender,
+    other = (0, _objectWithoutProperties2.default)(props, _excluded);
   var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
   if (mode === 'render') {
@@ -43,10 +55,10 @@ function List(props) {
               value: item[fieldNameValue],
               disabled: item.disabled,
               children: (0, _jsxRuntime.jsx)("span", {
-                children: optionRender ? optionRender(item, searchStr) : (0, _jsxRuntime.jsx)(_SearchTitle.default, {
+                children: optionRender ? optionRender(item, searchStr) : (0, _jsxRuntime.jsx)(_SearchTitle.default, (0, _objectSpread2.default)({
                   label: title,
                   searchStr: searchStr
-                })
+                }, other))
               })
             })
           }, item[fieldNameValue]);

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

@@ -17,6 +17,7 @@ var _react = require("react");
 var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
+var _AdaptiveTooltip = _interopRequireDefault(require("../AdaptiveTooltip"));
 var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className", "checkStrictly", "checkable"],
   _excluded2 = ["children"];
 /* eslint-disable react/no-danger */
@@ -74,9 +75,14 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     selectProps = (0, _objectWithoutProperties2.default)(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 @@ var ProTreeSelect = exports.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]);
@@ -312,6 +318,20 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
         children: (0, _jsxRuntime.jsx)(Icon, {})
       }) : null]
     });
+    if (_showEllipse) {
+      title = (0, _jsxRuntime.jsx)(_AdaptiveTooltip.default, {
+        children: treeCheckable ? titleHtml : (0, _jsxRuntime.jsxs)("span", {
+          className: "check-option-text",
+          children: [(0, _jsxRuntime.jsx)("span", {
+            className: "check-option-text-content",
+            children: titleHtml
+          }), !disabled ? (0, _jsxRuntime.jsx)("span", {
+            className: "check-mark-icon",
+            children: (0, _jsxRuntime.jsx)(Icon, {})
+          }) : null]
+        })
+      });
+    }
     if (!children) {
       return (0, _jsxRuntime.jsx)(_antd.TreeSelect.TreeNode, {
         value: value,

package/lib/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/lib/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;

package/lib/ProTree/components/SearchTitle.js

@@ -1,18 +1,32 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
-var _antd = require("antd");
+var _AdaptiveTooltip = _interopRequireDefault(require("./AdaptiveTooltip"));
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2024-09-26 14:37:00
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2024-09-26 17:50:59
+ * @FilePath: /za-material-warehouse/src/ProTree/components/SearchTitle.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+
 function SearchTitle(props) {
   var label = props.label,
     _props$searchStr = props.searchStr,
     searchStr = _props$searchStr === void 0 ? '' : _props$searchStr,
     showEllipse = props.showEllipse,
-    ellipseWidth = props.ellipseWidth;
+    ellipseWidth = props.ellipseWidth,
+    otherProps = props.otherProps;
+  var _ref = otherProps !== null && otherProps !== void 0 ? otherProps : {},
+    _ref$isDiffChange = _ref.isDiffChange,
+    isDiffChange = _ref$isDiffChange === void 0 ? false : _ref$isDiffChange;
   var strTitle = label;
   var index = strTitle === null || strTitle === void 0 ? void 0 : strTitle.indexOf(searchStr);
   var beforeStr = strTitle === null || strTitle === void 0 ? void 0 : strTitle.substring(0, index);
@@ -45,11 +59,9 @@ function SearchTitle(props) {
     style: style,
     children: strTitle
   });
-  if (classEllipse) {
-    return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-      title: titleTips,
-      placement: "rightTop",
-      children: title
+  if (classEllipse && !isDiffChange) {
+    return (0, _jsxRuntime.jsx)(_AdaptiveTooltip.default, {
+      children: titleTips
     });
   }
   return title;

package/lib/ProTree/style/index.less

@@ -1,6 +1,15 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
 
+.pro-tree-wrap-ellipse {
+  display: block;
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-break: keep-all;
+}
+
 .pro-tree {
   height: 100%; // tree auto css
   .@{ant-prefix}-tree-iconEle{
@@ -368,3 +377,8 @@
 }
 
 
+.@{ant-prefix}-select-tree-node-content-wrapper {
+  &:has(.pro-tree-wrap-ellipse){
+    overflow: hidden;
+  }
+}