@zat-design/sisyphus-react 3.7.3 → 3.8.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/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]);
@@ -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;

package/es/ProTree/components/SearchTitle.js

@@ -1,13 +1,24 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/*
+ * @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
+ */
 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,
+    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);
@@ -40,11 +51,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;

package/es/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/es/ProTreeModal/components/Tree.js

@@ -177,23 +177,21 @@ function List(props, ref) {
     setAutoExpandParent(false);
   };
   if (mode === 'render') {
-    return _jsx(_Fragment, {
-      children: _jsx(_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 _jsx(_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 _jsx(_Fragment, {

package/es/ProTreeModal/index.js

@@ -15,7 +15,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * @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
  */
@@ -26,7 +26,8 @@ import { ReactSVG } from 'react-svg';
 import classNames from 'classnames';
 import { ProDrawerForm, useProConfig } from '../index';
 import { Trigger, ListView, TreeView, Cascader } from './components';
-import { getFlatTreeData, filterCheckedNodes, getChildrenKeys, findTreeNodeByKey, getAllKeys, transformMessage } from './utils';
+import { getFlatTreeData, filterCheckedNodes, getChildrenKeys, findTreeNodeByKey, getAllKeys, transformMessage, addLevelAndParentId } from './utils';
+import { transformTreeToArray, treeNodeFind } from '../ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index';
 import searchSVG from '../assets/input-search.svg';
 import locale, { formatMessage } from '../locale';
 import './style/index.less';
@@ -98,7 +99,8 @@ var ProTreeModal = function ProTreeModal(props) {
       flatTreeData: [],
       searchStr: '',
       checkAll: false,
-      allKeys: []
+      allKeys: [],
+      transformedTree: []
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],
@@ -220,6 +222,12 @@ var ProTreeModal = function ProTreeModal(props) {
       });
     }
   }, [value, state.allKeys, state.open]);
+  useDeepCompareEffect(function () {
+    var transformedTree = addLevelAndParentId(state.treeData, fieldNames);
+    setState({
+      transformedTree: transformedTree
+    });
+  }, [state.treeData]);
   var handleClick = function handleClick() {
     setState({
       open: true
@@ -360,8 +368,55 @@ var ProTreeModal = function ProTreeModal(props) {
   var onCheck = function onCheck(checkedKeys, info) {
     var checkedValues = _toConsumableArray(state.checkedValues);
     var originalTreeData = state.originalTreeData;
+    // 如果有检索则自管理
+    if (state.searchStr) {
+      var _transformTreeToArray;
+      var node = info.node;
+      // 从完整树中找到当前节点
+      var activeNode = treeNodeFind(state.transformedTree, function (t) {
+        return t[fieldNameValue] === node[fieldNameValue];
+      }, {
+        childrenKey: fieldNames.children
+      });
+      var allChildren = (_transformTreeToArray = 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 = treeNodeFind(state.transformedTree, function (t) {
+            return t[fieldNameValue] === findNode.parentId;
+          }, {
+            childrenKey: fieldNames.children
+          });
+          var parentChildrenKeys = (_transformTreeToArray2 = 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 = [];
@@ -378,8 +433,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;
@@ -618,7 +673,7 @@ var ProTreeModal = function ProTreeModal(props) {
         });
       case TREE:
         return _jsx(TreeView, {
-          treeData: state.treeData,
+          treeData: state.transformedTree,
           originalTreeData: state.originalTreeData,
           flatTreeData: state.flatTreeData,
           checkedValues: state.checkedValues,

package/es/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[];

package/es/ProTreeModal/utils.js

@@ -197,4 +197,24 @@ export var transformMessage = function transformMessage(obj, message) {
     _message = message.replaceAll("{".concat(key, "}"), obj[key]);
   });
   return _message;
-};
+};
+var _addLevelAndParentId = function addLevelAndParentId() {
+  var tree = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var fieldNames = arguments.length > 1 ? arguments[1] : undefined;
+  var currentLevel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  var currentParentId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+  var _fieldNames$children = fieldNames.children,
+    children = _fieldNames$children === void 0 ? 'children' : _fieldNames$children,
+    _fieldNames$value = fieldNames.value,
+    value = _fieldNames$value === void 0 ? 'value' : _fieldNames$value;
+  return tree.map(function (node) {
+    var newNode = _objectSpread({}, node);
+    newNode.level = currentLevel;
+    newNode.parentId = currentParentId;
+    if (node[children]) {
+      newNode[children] = _addLevelAndParentId(node[children], fieldNames, currentLevel + 1, newNode[value]);
+    }
+    return newNode;
+  });
+};
+export { _addLevelAndParentId as addLevelAndParentId };

package/es/style/theme/antd.less

@@ -749,3 +749,8 @@
     }
   }
 }
+
+.@{ant-prefix}-picker.@{ant-prefix}-picker-disabled  {
+  background: var(--zaui-disabled-bg);
+}
+

package/es/style/theme/index.less

@@ -8,7 +8,7 @@
   --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;
@@ -55,6 +55,7 @@
   --zaui-table-selected-hover-bg    : var(--zaui-table-hover-bg); // 默认同悬停
   --zaui-table-nested-bg            : #fafcfe;
   --zaui-contract-bg                : #fffaa1; // 对比背景色
+  --zaui-contract-bg-add            : #d2fff4; // 新增对比背景色
   --zaui-form-label-width           : 130px; // 8个全角字符宽度
   --zaui-border-radius              : 8px;
   --zaui-border-radius-card         : 4px;

package/es/style/theme/tokens.less

@@ -53,6 +53,7 @@
 @zaui-table-selected-hover-bg: var(--zaui-table-hover-bg #fafafa);
 @zaui-table-nested-bg: var(--zaui-table-nested-bg #FAFCFE);
 @zaui-contract-bg: var(--zaui-contract-bg; #fffaa1); // 对比背景色
+@zaui-contract-bg-add: var(--zaui-contract-bg-add; #d2fff4); // 新增对比背景色
 @zaui-form-required-after: var(--zaui-form-required-after; inline);
 @zaui-form-required-before: var(--zaui-form-required-before; none);
 @zaui-form-label-width: var(--zaui-form-label-width; 130px);

package/es/utils/index.d.ts

@@ -0,0 +1,2 @@
+/** 判断一个值是否是空值 */
+export declare const isEmpty: (value: any) => boolean;