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

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/ProTree.js

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

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,16 @@ 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;
+  console.log('tag1', showEllipse, otherProps, isDiffChange);
+  var _showEllipse = showEllipse && !isDiffChange;
+  console.log('tag2', _showEllipse);
+  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 +217,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]);
@@ -291,6 +299,16 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     var labelText = node[label];
     var value = node[code];
     var key = node[uuidKey];
+    // 三无走默认
+    if (['undefined-undefined', 'undefined'].includes(labelText) && !value && !key) {
+      if (showCodeName) {
+        labelText = "".concat(node === null || node === void 0 ? void 0 : node.value, "-").concat(node === null || node === void 0 ? void 0 : node.label);
+      } else {
+        labelText = node === null || node === void 0 ? void 0 : node.label;
+      }
+      value = node === null || node === void 0 ? void 0 : node.value;
+      key = node === null || node === void 0 ? void 0 : node.value;
+    }
     var titleHtml = (0, _jsxRuntime.jsx)("span", {
       dangerouslySetInnerHTML: {
         __html: labelText
@@ -312,6 +330,21 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
         children: (0, _jsxRuntime.jsx)(Icon, {})
       }) : null]
     });
+    if (_showEllipse) {
+      console.log('tag3', '走自身气泡了');
+      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/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/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/components/Tree.js

@@ -115,7 +115,7 @@ function List(props) {
     }
   }, [selectedKey]);
   var onSelect = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value, item) {
+    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value, item) {
       var _props$onSelect;
       var val;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {

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

package/lib/ProTreeModal/components/Tree.js

@@ -183,23 +183,21 @@ function List(props, ref) {
     setAutoExpandParent(false);
   };
   if (mode === 'render') {
-    return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: (0, _jsxRuntime.jsx)(_antd.Tree, {
-        disabled: disabled,
-        style: {
-          width: '100%'
-        },
-        checkable: true,
-        treeData: _treeData,
-        onExpand: onExpand,
-        expandedKeys: expandedKeys,
-        autoExpandParent: autoExpandParent,
-        selectable: false,
-        onCheck: onCheck,
-        checkedKeys: checkedValues,
-        checkStrictly: checkStrictly,
-        height: 432
-      })
+    return (0, _jsxRuntime.jsx)(_antd.Tree, {
+      disabled: disabled,
+      style: {
+        width: '100%'
+      },
+      checkable: true,
+      treeData: _treeData,
+      onExpand: onExpand,
+      expandedKeys: expandedKeys,
+      autoExpandParent: autoExpandParent,
+      selectable: false,
+      onCheck: onCheck,
+      checkedKeys: checkedValues,
+      checkStrictly: searchStr ? true : checkStrictly,
+      height: 432
     });
   }
   return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {

package/lib/ProTreeModal/index.js

@@ -20,6 +20,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _index = require("../index");
 var _components = require("./components");
 var _utils = require("./utils");
+var _index2 = require("../ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index");
 var _inputSearch = _interopRequireDefault(require("../assets/input-search.svg"));
 var _locale = _interopRequireWildcard(require("../locale"));
 require("./style/index.less");
@@ -27,7 +28,7 @@ require("./style/index.less");
  * @Author: za-xuwenli xuwenli@zhongan.io
  * @Date: 2024-06-04 10:01:18
  * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2024-06-25 17:56:33
+ * @LastEditTime: 2024-09-27 11:49:28
  * @FilePath: /za-material-warehouse/src/ProTreeModal/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -100,7 +101,8 @@ var ProTreeModal = function ProTreeModal(props) {
       flatTreeData: [],
       searchStr: '',
       checkAll: false,
-      allKeys: []
+      allKeys: [],
+      transformedTree: []
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     state = _useSetState2[0],
@@ -222,6 +224,12 @@ var ProTreeModal = function ProTreeModal(props) {
       });
     }
   }, [value, state.allKeys, state.open]);
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    var transformedTree = (0, _utils.addLevelAndParentId)(state.treeData, fieldNames);
+    setState({
+      transformedTree: transformedTree
+    });
+  }, [state.treeData]);
   var handleClick = function handleClick() {
     setState({
       open: true
@@ -362,8 +370,55 @@ var ProTreeModal = function ProTreeModal(props) {
   var onCheck = function onCheck(checkedKeys, info) {
     var checkedValues = (0, _toConsumableArray2.default)(state.checkedValues);
     var originalTreeData = state.originalTreeData;
+    // 如果有检索则自管理
+    if (state.searchStr) {
+      var _transformTreeToArray;
+      var node = info.node;
+      // 从完整树中找到当前节点
+      var activeNode = (0, _index2.treeNodeFind)(state.transformedTree, function (t) {
+        return t[fieldNameValue] === node[fieldNameValue];
+      }, {
+        childrenKey: fieldNames.children
+      });
+      var allChildren = (_transformTreeToArray = (0, _index2.transformTreeToArray)([activeNode], {
+        childrenKey: fieldNames.children
+      })) === null || _transformTreeToArray === void 0 ? void 0 : _transformTreeToArray.map(function (item) {
+        return item[fieldNameValue];
+      });
+      // 子项合并勾选
+      checkedValues = checkedValues.concat(allChildren);
+      // 从完整树中拿到父节点 只要存在父节点，那么就判断当前children是否全被勾选 若全被勾选就合并当前key到勾选队列
+      var _recourse2 = function _recourse(findNode) {
+        if (findNode.parentId) {
+          var _transformTreeToArray2;
+          var parentNode = (0, _index2.treeNodeFind)(state.transformedTree, function (t) {
+            return t[fieldNameValue] === findNode.parentId;
+          }, {
+            childrenKey: fieldNames.children
+          });
+          var parentChildrenKeys = (_transformTreeToArray2 = (0, _index2.transformTreeToArray)([parentNode], {
+            childrenKey: fieldNames.children
+          })) === null || _transformTreeToArray2 === void 0 ? void 0 : _transformTreeToArray2.map(function (item) {
+            return item[fieldNameValue];
+          });
+          var parentChildrenAllChecked = parentChildrenKeys.every(function (key) {
+            return checkedValues.includes(key);
+          });
+          if (parentChildrenAllChecked) {
+            // 把当前父节点追加进来
+            checkedValues = checkedValues.concat([parentNode[fieldNameValue]]);
+            // 继续向上查找
+            if (parentNode.parentId) {
+              _recourse2(parentNode);
+            }
+          }
+        }
+      };
+      _recourse2(activeNode);
+    }
+    var _checkStrictly = state.searchStr ? true : checkStrictly;
     // 此时应该取消掉自身并包含它所有的子集
-    if (!info.checked && !checkStrictly) {
+    if (!info.checked && !_checkStrictly) {
       // 1. 取消自身
       // 2. 把所有的子节点也要取消
       var childrenkeys = [];
@@ -380,8 +435,8 @@ var ProTreeModal = function ProTreeModal(props) {
         return !parentKeys.includes(key);
       });
     } else {
-      // checkStrictly 模式下取 checkedKeys.checked 或者自身的 key
-      if (checkStrictly) {
+      // _checkStrictly 模式下取 checkedKeys.checked 或者自身的 key
+      if (_checkStrictly) {
         if (!info.checked) {
           checkedValues = checkedValues.filter(function (key) {
             return key !== info.node.key;
@@ -620,7 +675,7 @@ var ProTreeModal = function ProTreeModal(props) {
         });
       case TREE:
         return (0, _jsxRuntime.jsx)(_components.TreeView, {
-          treeData: state.treeData,
+          treeData: state.transformedTree,
           originalTreeData: state.originalTreeData,
           flatTreeData: state.flatTreeData,
           checkedValues: state.checkedValues,

package/lib/ProTreeModal/utils.d.ts

@@ -36,3 +36,4 @@ export declare function filterCheckedNodes(data: any, checkedKeys: any, searchSt
  */
 export declare function getChildrenKeys(node: TreeDataProps, childrenKeys: string[], fieldNames: FieldNamesType, type: 'treeClose' | 'treeCheck'): void;
 export declare const transformMessage: (obj: any, message: string) => string;
+export declare const addLevelAndParentId: (tree: any[], fieldNames: any, currentLevel?: number, currentParentId?: any) => any[];