@zat-design/sisyphus-react 3.7.3-beta.12 → 3.7.3-beta.14

package/dist/index.esm.css

@@ -1909,7 +1909,7 @@
 .pro-table .ant-table-body .ant-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);
 }
 .pro-table .ant-table-body .varied-cell.empty-cell {
@@ -3856,6 +3856,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-transfer-right .checked-item.disabled .anticon {
   pointer-events: none;
 }
+.pro-tree-wrap-ellipse {
+  display: block;
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-break: keep-all;
+}
 .pro-tree {
   height: 100%;
 }
@@ -4222,6 +4230,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree-select-drop-down-container.ant-select-dropdown .ant-select-tree-node-content-wrapper .check-mark-icon {
   display: none;
 }
+.ant-select-tree-node-content-wrapper:has(.pro-tree-wrap-ellipse) {
+  overflow: hidden;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;
@@ -5315,7 +5326,7 @@ input[type='button'] {
   --zaui-brand: #006aff;
   --zaui-brand-hover: #3387ff;
   --zaui-brand-active: #005ad9;
-  --zaui-brand-disabled: #99c3ff;
+  --zaui-brand-disabled: color-mix(in srgb, var(--zaui-brand) 70%, white);
   --zaui-text: #343434;
   --zaui-text-weak: #616161;
   --zaui-aide-text: #909090;

package/dist/less.esm.css

@@ -1909,7 +1909,7 @@
 .pro-table .ant-table-body .ant-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);
 }
 .pro-table .ant-table-body .varied-cell.empty-cell {
@@ -3856,6 +3856,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-transfer-right .checked-item.disabled .anticon {
   pointer-events: none;
 }
+.pro-tree-wrap-ellipse {
+  display: block;
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-break: keep-all;
+}
 .pro-tree {
   height: 100%;
 }
@@ -4222,6 +4230,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree-select-drop-down-container.ant-select-dropdown .ant-select-tree-node-content-wrapper .check-mark-icon {
   display: none;
 }
+.ant-select-tree-node-content-wrapper:has(.pro-tree-wrap-ellipse) {
+  overflow: hidden;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;
@@ -5315,7 +5326,7 @@ input[type='button'] {
   --zaui-brand: #006aff;
   --zaui-brand-hover: #3387ff;
   --zaui-brand-active: #005ad9;
-  --zaui-brand-disabled: #99c3ff;
+  --zaui-brand-disabled: color-mix(in srgb, var(--zaui-brand) 70%, white);
   --zaui-text: #343434;
   --zaui-text-weak: #616161;
   --zaui-aide-text: #909090;

package/es/ProEnum/components/Group.js

@@ -43,7 +43,10 @@ var Group = function Group(props) {
   }
   return _jsx("div", {
     id: id,
-    className: classNames('pro-enum-group-root', disabled ? 'pro-enum-group-root-disabled' : ''),
+    className: classNames({
+      'pro-enum-group-root': true,
+      'pro-enum-group-root-disabled': disabled
+    }),
     children: dataSource.map(function (item, index) {
       return _jsx("div", {
         onClick: function onClick() {
@@ -51,7 +54,12 @@ var Group = function Group(props) {
             handleClick(item[fieldValue], index);
           }
         },
-        className: classNames('pro-enum-group-item', value === item[fieldValue] ? 'pro-enum-group-item-selected' : '', index === idx.current || index + 1 === idx.current ? 'pro-enum-group-item-disabled-after' : '', item.disabled ? 'pro-enum-group-item-disabled' : ''),
+        className: classNames({
+          'pro-enum-group-item': true,
+          'pro-enum-group-item-selected': value === item[fieldValue],
+          'pro-enum-group-item-disabled-after': index === idx.current || index + 1 === idx.current,
+          'pro-enum-group-item-disabled': item.disabled
+        }),
         children: item[fieldLabel]
       }, item[fieldValue]);
     })

package/es/ProEnum/style/index.less

@@ -1,6 +1,8 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
 
+@zaui-disabled-bg: var(--zaui-disabled-bg);
+
 .pro-enum {
   &-tag-root {
     display: flex;
@@ -96,14 +98,13 @@
   }
 
   &-group-root-disabled {
-    color: #bfbfbf;
+    color: var(--zaui-aide-text);
 
     .pro-enum-group-item {
       background: var(--zaui-disabled-bg);
       &.pro-enum-group-item-selected {
-        background: var(--zaui-brand);
-        opacity: 0.7;
-        border-color: var(--zaui-brand);
+        background: var(--zaui-brand-disabled);
+        border-color: var(--zaui-brand-disabled);
       }
     }
   }

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -616,32 +616,37 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   }, [onOff, visible, value]);
   useEffect(function () {
-    if (value && !visible && isInit) {
-      if (readOnly) {
-        // 加定时器 修复依赖数据同步更新未取到问题
-        setTimeout(function () {
-          var _useRequest$options7, _useRequest$options8;
-          var initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams;
-          if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
-            var _contentForm$getField2;
-            initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField2 = contentForm.getFieldsValue) === null || _contentForm$getField2 === void 0 ? void 0 : _contentForm$getField2.call(contentForm));
-          }
-          var params = withPagination ? {
-            pageNum: 1,
-            pageSize: 50,
-            queryBean: _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
-          } : _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
-          var nextParams = transformParams ? transformParams(params) : params;
-          run(nextParams);
-          setState({
-            isInit: false
-          });
-        }, 300);
-      } else {
-        getInitValues();
-      }
+    if (value && !visible && isInit && !readOnly) {
+      getInitValues();
     }
   }, [value, visible, isInit, useRequest]);
+  useEffect(function () {
+    if (value && !visible && readOnly) {
+      var _options$some;
+      var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
+        return item[valueKey] === value;
+      });
+      if (isHasValue) {
+        return;
+      }
+      // 加定时器 修复依赖数据同步更新未取到问题
+      setTimeout(function () {
+        var _useRequest$options7, _useRequest$options8;
+        var initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams;
+        if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
+          var _contentForm$getField2;
+          initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField2 = contentForm.getFieldsValue) === null || _contentForm$getField2 === void 0 ? void 0 : _contentForm$getField2.call(contentForm));
+        }
+        var params = withPagination ? {
+          pageNum: 1,
+          pageSize: 50,
+          queryBean: _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
+        } : _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
+        var nextParams = transformParams ? transformParams(params) : params;
+        run(nextParams);
+      }, 300);
+    }
+  }, [value, options, visible, useRequest]);
   useEffect(function () {
     if (!value) {
       if (defaultOne) {

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/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;
+}) => 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/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,6 +75,11 @@ 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 _props$showEllipse = props.showEllipse,
+    showEllipse = _props$showEllipse === void 0 ? true : _props$showEllipse,
+    _props$isDiffChange = props.isDiffChange,
+    isDiffChange = _props$isDiffChange === void 0 ? false : _props$isDiffChange;
+  var _showEllipse = showEllipse && !isDiffChange;
   var _ref2 = otherProps || {},
     isView = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
@@ -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/SearchTitle.d.ts

@@ -4,6 +4,7 @@ declare function SearchTitle(props: {
     label?: string;
     showEllipse?: boolean;
     ellipseWidth?: string;
+    isDiffChange?: boolean;
 }): JSX.Element;
 declare const _default: import("react").MemoExoticComponent<typeof SearchTitle>;
 export default _default;

package/es/ProTree/components/SearchTitle.js

@@ -1,13 +1,14 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { memo } from 'react';
+import AdaptiveTooltip from './AdaptiveTooltip';
 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,
+    _props$isDiffChange = props.isDiffChange,
+    isDiffChange = _props$isDiffChange === void 0 ? false : _props$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);
@@ -40,11 +41,9 @@ function SearchTitle(props) {
     style: style,
     children: strTitle
   });
-  if (classEllipse) {
-    return _jsx(_Tooltip, {
-      title: titleTips,
-      placement: "rightTop",
-      children: title
+  if (classEllipse && !isDiffChange) {
+    return _jsx(AdaptiveTooltip, {
+      children: titleTips
     });
   }
   return title;