@zat-design/sisyphus-react 3.4.5 → 3.4.6-beta.10

package/es/ProIcon/index.js

@@ -2,21 +2,25 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap"];
-import { jsx as _jsx } from "react/jsx-runtime";
-import { useExternal } from 'ahooks';
+var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap", "tooltip"];
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
+import { useExternal, useLocalStorageState, useSetState, useDeepCompareLayoutEffect } from 'ahooks';
 import classNames from 'classnames';
 import { uniqBy } from 'lodash';
 import { ReactSVG } from 'react-svg';
+import { useEffect } from 'react';
 import { useProConfig } from '../ProConfigProvider';
-import { iconMap, themeMap, themeFillMap } from './config';
-import { recurseGetNodes } from './utils';
+import { iconMap } from './config';
+import { onBeforeInjection } from './utils';
 import locale from '../locale';
 var ProIcon = function ProIcon(props) {
+  var _window, _window2;
   var _useProConfig = useProConfig(),
-    state = _useProConfig.state;
+    state = _useProConfig.state,
+    dispatch = _useProConfig.dispatch;
   var config = state.ProIcon,
     antdTheme = state.theme;
   var _config = _objectSpread(_objectSpread({}, config), props !== null && props !== void 0 ? props : {});
@@ -44,11 +48,28 @@ var ProIcon = function ProIcon(props) {
     mapList = _config$mapList === void 0 ? [] : _config$mapList,
     src = _config.src,
     actionMap = _config.actionMap,
+    tooltip = _config.tooltip,
     reset = _objectWithoutProperties(_config, _excluded);
-  // 主题色
+  var _useSetState = useSetState({
+      IconInstance: _jsx(_Fragment, {})
+    }),
+    _useSetState2 = _slicedToArray(_useSetState, 2),
+    IconInstance = _useSetState2[0].IconInstance,
+    setState = _useSetState2[1];
+  // 主题色 primaryColor 用于单应用或处于组件库文档内 qiankunPrimaryColor用于主子应用
   var _ref = antdTheme !== null && antdTheme !== void 0 ? antdTheme : {},
     _ref$primaryColor = _ref.primaryColor,
-    primaryColor = _ref$primaryColor === void 0 ? '#006AFF' : _ref$primaryColor;
+    primaryColor = _ref$primaryColor === void 0 ? '#006AFF' : _ref$primaryColor,
+    _ref$qiankunPrimaryCo = _ref.qiankunPrimaryColor,
+    qiankunPrimaryColor = _ref$qiankunPrimaryCo === void 0 ? '#006AFF' : _ref$qiankunPrimaryCo;
+  // 本地存储初始化主题
+  var _useLocalStorageState = useLocalStorageState('themeConfig'),
+    _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 1),
+    themeConfig = _useLocalStorageState2[0];
+  // 文档内部就不用判断window.top !== window.self了
+  var isQiankun =
+  // @ts-ignore
+  ((_window = window) === null || _window === void 0 ? void 0 : _window.__POWERED_BY_QIANKUN__) || ((_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.isMicroApp);
   // 语言
   var language = locale.ProIcon.language;
   // 加载内部icon
@@ -64,6 +85,8 @@ var ProIcon = function ProIcon(props) {
     'pro-icon-btn': disabled
   });
   var _mode = mode || 'icon';
+  // 观察者实例
+  var observer;
   // 特殊情况，如果指定了type，并且没有接收到组件内的mode，那模式就是icon
   if (type && !props.mode) {
     _mode = 'icon';
@@ -75,7 +98,7 @@ var ProIcon = function ProIcon(props) {
   var _type = type;
   var _text = children;
   // svg图标对应文本
-  var iconText = '';
+  var iconText = tooltip || '';
   var typeIsExistAndIncludeEnglish = _type && /[a-zA-Z]/.test(_type);
   // 模式为icon下，对传入的text进行指定语言-icon 映射
   if (isIconMode && !type) {
@@ -116,82 +139,126 @@ var ProIcon = function ProIcon(props) {
   }, reset), {}, {
     children: _jsx(_Tooltip, {
       title: iconText,
-      children: !src ? _jsx("svg", _objectSpread(_objectSpread({}, svgProps), {}, {
-        onClick: onClick,
-        "aria-hidden": "true",
-        children: _jsx("use", {
-          xlinkHref: "#icon-".concat(_type)
-        })
-      })) : _jsx(ReactSVG, _objectSpread(_objectSpread({}, svgProps), {}, {
-        // @ts-ignore
-        onClick: onClick,
-        "aria-hidden": "true",
-        src: src,
-        beforeInjection: function beforeInjection(svg) {
-          if (actionMap && svg) {
-            var _actionMap$themeMap, _actionMap$themeFillM, _actionMap$gradation, _actionMap$fill;
-            // 项目内置的四种主题匹配渐变色
-            var mergeThemeMap = _objectSpread(_objectSpread({}, themeMap), (_actionMap$themeMap = actionMap.themeMap) !== null && _actionMap$themeMap !== void 0 ? _actionMap$themeMap : {});
-            // 项目内置的四种双色匹配fill
-            var mergeFillThemeMap = _objectSpread(_objectSpread({}, themeFillMap), (_actionMap$themeFillM = actionMap.themeFillMap) !== null && _actionMap$themeFillM !== void 0 ? _actionMap$themeFillM : {});
-            var _gradList = mergeThemeMap[primaryColor];
-            var _fillList = mergeFillThemeMap[primaryColor];
-            // 渐变操作序列
-            var gradList = (_actionMap$gradation = actionMap === null || actionMap === void 0 ? void 0 : actionMap.gradation) !== null && _actionMap$gradation !== void 0 ? _actionMap$gradation : _gradList;
-            // 填充操作序列
-            var fillList = (_actionMap$fill = actionMap === null || actionMap === void 0 ? void 0 : actionMap.fill) !== null && _actionMap$fill !== void 0 ? _actionMap$fill : _fillList;
-            // 节点收集
-            var nodeMap = {
-              // 渐变色节点收集
-              gradation: [],
-              // 具有fill属性的节点收集
-              fill: []
-            };
-            // 目前只支持处理渐变及fill填充
-            var types = Reflect.ownKeys(nodeMap !== null && nodeMap !== void 0 ? nodeMap : {});
-            types.forEach(function (typeKey) {
-              recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
+      children: _jsx(_Button, _objectSpread({
+        style: {
+          width: size,
+          height: size,
+          border: 'none',
+          borderRadius: 0,
+          padding: 0,
+          verticalAlign: 'baseline'
+        },
+        type: "text",
+        icon: !src ? _jsx("svg", _objectSpread(_objectSpread({}, svgProps), {}, {
+          onClick: onClick,
+          "aria-hidden": "true",
+          children: _jsx("use", {
+            xlinkHref: "#icon-".concat(_type)
+          })
+        })) : _jsx(ReactSVG, _objectSpread(_objectSpread({}, svgProps), {}, {
+          // @ts-ignore
+          onClick: onClick,
+          "aria-hidden": "true",
+          src: src,
+          beforeInjection: function beforeInjection(svg) {
+            onBeforeInjection({
+              svg: svg,
+              actionMap: actionMap,
+              primaryColor: isQiankun ? qiankunPrimaryColor : primaryColor
             });
-            if ((gradList === null || gradList === void 0 ? void 0 : gradList.length) > 0) {
-              nodeMap.gradation.forEach(function (item, index) {
-                // 下一步准备替换的
-                var nextStr = gradList[index];
-                // 属性原本的值
-                var originStr = item.getAttribute('stop-color');
-                if (nextStr && originStr !== nextStr) {
-                  item.setAttribute('stop-color', nextStr);
-                }
-              });
-            }
-            if ((fillList === null || fillList === void 0 ? void 0 : fillList.length) > 0) {
-              nodeMap.fill.forEach(function (item, index) {
-                // 默认接收的
-                var receiveStr = fillList[index];
-                // 下一步准备替换的
-                var nextFillStr = receiveStr === 'theme' ? primaryColor : receiveStr;
-                // 属性原本的值
-                var originFill = item.getAttribute('fill');
-                // 如果包含url(则是内链，不作替换处理
-                if (!(originFill && originFill.includes('url(')) && nextFillStr) {
-                  // 不同才替换
-                  if (originFill !== nextFillStr) {
-                    item.setAttribute('fill', nextFillStr);
+          }
+        }))
+      }, buttonProps))
+    })
+  }));
+  useEffect(function () {
+    // 处于主子应用情况下才会执行下方逻辑，主题色的变更以主框架的为准
+    if (actionMap && isQiankun) {
+      var _themeConfig$data;
+      observer = new MutationObserver(function (mutationsList) {
+        var targetEntries = mutationsList[0];
+        if (targetEntries) {
+          if (targetEntries && targetEntries.target) {
+            var _Object$values, _Object$values$find, _Object$values$find$v3, _targetEntries$target, _targetEntries$target2;
+            var _Object$values$find$v = // @ts-ignore
+              (_Object$values = Object.values((_targetEntries$target = targetEntries === null || targetEntries === void 0 ? void 0 : (_targetEntries$target2 = targetEntries.target) === null || _targetEntries$target2 === void 0 ? void 0 : _targetEntries$target2.attributes) !== null && _targetEntries$target !== void 0 ? _targetEntries$target : {})) === null || _Object$values === void 0 ? void 0 : (_Object$values$find = _Object$values.find(function (item) {
+                return item.nodeName === 'style';
+              })
+              // @ts-ignore
+              ) === null || _Object$values$find === void 0 ? void 0 : (_Object$values$find$v3 = _Object$values$find.value) === null || _Object$values$find$v3 === void 0 ? void 0 : _Object$values$find$v3.match(/--zaui-brand:(.*?);/),
+              _Object$values$find$v2 = _slicedToArray(_Object$values$find$v, 2),
+              label = _Object$values$find$v2[0],
+              value = _Object$values$find$v2[1];
+            if (label && value) {
+              if (qiankunPrimaryColor !== value) {
+                dispatch({
+                  type: 'set',
+                  payload: {
+                    theme: {
+                      primaryColor: primaryColor,
+                      qiankunPrimaryColor: value === null || value === void 0 ? void 0 : value.trim()
+                    }
                   }
-                }
-              });
+                });
+              }
             }
           }
         }
-      }))
-    })
-  }));
-  return !isExtendButtonMode ? RenderIcon : _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({
-    type: isIconMode ? 'text' : (buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.type) || 'link',
-    className: proIconClassNames,
-    disabled: disabled,
-    icon: isIconMode ? RenderIcon : null
-  }, reset), buttonProps), {}, {
-    children: _text
-  }));
+      });
+      var zaAccessibilityTarget = document.documentElement;
+      if (window.parent === window) {
+        // 在最顶层的window环境中，可以直接使用document
+        zaAccessibilityTarget = document.documentElement;
+      } else {
+        // 向上遍历直到找到主应用的window
+        var currentWindow = window;
+        while (currentWindow.parent !== currentWindow) {
+          // @ts-ignore
+          currentWindow = currentWindow.parent;
+        }
+        zaAccessibilityTarget = currentWindow.document.documentElement;
+      }
+      observer.observe(zaAccessibilityTarget, {
+        attributes: true,
+        attributeFilter: ['style']
+      });
+      // 未变更时及初始化时
+      var extendFromMainColor = themeConfig === null || themeConfig === void 0 ? void 0 : (_themeConfig$data = themeConfig.data) === null || _themeConfig$data === void 0 ? void 0 : _themeConfig$data.zauiBrand;
+      if (extendFromMainColor && qiankunPrimaryColor !== extendFromMainColor) {
+        dispatch({
+          type: 'set',
+          payload: {
+            theme: {
+              primaryColor: primaryColor,
+              qiankunPrimaryColor: extendFromMainColor
+            }
+          }
+        });
+      }
+    }
+  }, []);
+  useEffect(function () {
+    return function () {
+      if (observer) {
+        observer.disconnect();
+      }
+    };
+  }, []);
+  useDeepCompareLayoutEffect(function () {
+    setState({
+      IconInstance: RenderIcon
+    });
+  }, [_config, primaryColor, qiankunPrimaryColor, language, svgProps]);
+  return !isExtendButtonMode ? IconInstance : _jsx(_Tooltip, {
+    title: tooltip,
+    children: _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({
+      type: isIconMode ? 'text' : (buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.type) || 'link',
+      className: proIconClassNames,
+      disabled: disabled,
+      icon: isIconMode ? RenderIcon : null
+    }, reset), buttonProps), {}, {
+      children: _text
+    }))
+  });
 };
 export default ProIcon;

package/es/ProIcon/propsTypes.d.ts

@@ -54,6 +54,11 @@ export interface ProIconProps {
      * @default           false
      */
     disabled?: boolean;
+    /**
+     * @description      提示
+     * @default           -
+     */
+    tooltip?: string | React.ReactNode;
     /**
      * @description      是否跟随主题色
      * @default           false
@@ -80,7 +85,7 @@ export interface ProIconProps {
      */
     mode?: ModeType;
     /**
-     * @description        mode button时 props
+     * @description        mode button时 props 与antd Button接收props一致
      * @default           'link'
      */
     buttonProps?: ButtonProps;

package/es/ProIcon/utils/index.d.ts

@@ -1 +1,6 @@
 export declare const recurseGetNodes: (type: any, node: any, queue: any) => void;
+export declare const onBeforeInjection: ({ svg, actionMap, primaryColor }: {
+    svg: any;
+    actionMap: any;
+    primaryColor: any;
+}) => void;

package/es/ProIcon/utils/index.js

@@ -1,3 +1,5 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { themeMap, themeFillMap } from '../config';
 export var recurseGetNodes = function recurseGetNodes(type, node, queue) {
   switch (type) {
     // 渐变
@@ -20,4 +22,62 @@ export var recurseGetNodes = function recurseGetNodes(type, node, queue) {
       recurseGetNodes(type, node.childNodes[i], queue);
     }
   }
+};
+export var onBeforeInjection = function onBeforeInjection(_ref) {
+  var svg = _ref.svg,
+    actionMap = _ref.actionMap,
+    primaryColor = _ref.primaryColor;
+  if (actionMap && svg) {
+    var _actionMap$themeMap, _actionMap$themeFillM, _actionMap$gradation, _actionMap$fill;
+    // 项目内置的四种主题匹配渐变色
+    var mergeThemeMap = _objectSpread(_objectSpread({}, themeMap), (_actionMap$themeMap = actionMap.themeMap) !== null && _actionMap$themeMap !== void 0 ? _actionMap$themeMap : {});
+    // 项目内置的四种双色匹配fill
+    var mergeFillThemeMap = _objectSpread(_objectSpread({}, themeFillMap), (_actionMap$themeFillM = actionMap.themeFillMap) !== null && _actionMap$themeFillM !== void 0 ? _actionMap$themeFillM : {});
+    var _gradList = mergeThemeMap[primaryColor];
+    var _fillList = mergeFillThemeMap[primaryColor];
+    // 渐变操作序列
+    var gradList = (_actionMap$gradation = actionMap === null || actionMap === void 0 ? void 0 : actionMap.gradation) !== null && _actionMap$gradation !== void 0 ? _actionMap$gradation : _gradList;
+    // 填充操作序列
+    var fillList = (_actionMap$fill = actionMap === null || actionMap === void 0 ? void 0 : actionMap.fill) !== null && _actionMap$fill !== void 0 ? _actionMap$fill : _fillList;
+    // 节点收集
+    var nodeMap = {
+      // 渐变色节点收集
+      gradation: [],
+      // 具有fill属性的节点收集
+      fill: []
+    };
+    // 目前只支持处理渐变及fill填充
+    var types = Reflect.ownKeys(nodeMap !== null && nodeMap !== void 0 ? nodeMap : {});
+    types.forEach(function (typeKey) {
+      recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
+    });
+    if ((gradList === null || gradList === void 0 ? void 0 : gradList.length) > 0) {
+      nodeMap.gradation.forEach(function (item, index) {
+        // 下一步准备替换的
+        var nextStr = gradList[index];
+        // 属性原本的值
+        var originStr = item.getAttribute('stop-color');
+        if (nextStr && originStr !== nextStr) {
+          item.setAttribute('stop-color', nextStr);
+        }
+      });
+    }
+    if ((fillList === null || fillList === void 0 ? void 0 : fillList.length) > 0) {
+      nodeMap.fill.forEach(function (item, index) {
+        // 默认接收的
+        var receiveStr = fillList[index];
+        // 下一步准备替换的
+        var nextFillStr = receiveStr === 'theme' ? primaryColor : receiveStr;
+        // 属性原本的值
+        var originFill = item.getAttribute('fill');
+        // 如果包含url(则是内链，不作替换处理
+        if (!(originFill && originFill.includes('url(')) && nextFillStr) {
+          // 不同才替换
+          if (originFill !== nextFillStr) {
+            item.setAttribute('fill', nextFillStr);
+          }
+        }
+      });
+    }
+  }
 };

package/es/ProLayout/components/ProCollapse/index.js

@@ -10,9 +10,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useLayoutEffect } from 'react';
 import { CaretRightOutlined } from '@ant-design/icons';
 import classNames from 'classnames';
-import { ReactSVG } from 'react-svg';
 import { isBoolean } from 'lodash';
 import foldSvg from '../../../assets/fold.svg';
+import ProIcon from '../../../ProIcon/index';
 var Panel = _Collapse.Panel;
 var ProCollapse = function ProCollapse(props) {
   var title = props.title,
@@ -77,8 +77,11 @@ var ProCollapse = function ProCollapse(props) {
         align: "center",
         children: [_jsx("div", {
           className: "pro-collapse-icon",
-          children: isBoolean(icon) ? _jsx(ReactSVG, {
-            src: foldSvg
+          children: isBoolean(icon) ? _jsx(ProIcon, {
+            src: foldSvg,
+            actionMap: {
+              fill: []
+            }
           }) : icon
         }), title]
       });

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -16,7 +16,7 @@
     }
     .pro-collapse-level2{
       .@{ant-prefix}-collapse-header {
-        display: block !important;
+        display: flex !important;
       }
     }
   }

package/es/ProSelect/index.js

@@ -9,7 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import React, { useImperativeHandle, useState, forwardRef } from 'react';
@@ -19,6 +19,7 @@ import Container from '../ProForm/components/Container';
 import AdaptiveTooltip from './components/AdaptiveTooltip';
 import { ProForm } from '..';
 import locale from '../locale';
+import { getSelectList } from './utils';
 import './index.less';
 var Option = _Select.Option;
 export var ProSelect = function ProSelect(props, ref) {
@@ -41,6 +42,8 @@ export var ProSelect = function ProSelect(props, ref) {
     tooltip = _props$tooltip === void 0 ? false : _props$tooltip,
     otherProps = props.otherProps,
     labelInValue = props.labelInValue,
+    _props$filterInList = props.filterInList,
+    filterInList = _props$filterInList === void 0 ? false : _props$filterInList,
     _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa,
     defaultOne = props.defaultOne,
@@ -239,7 +242,7 @@ export var ProSelect = function ProSelect(props, ref) {
       if (!isObject(value)) {
         return undefined;
       }
-      return value === null || value === void 0 ? void 0 : value[code];
+      return (value === null || value === void 0 ? void 0 : value[code]) || (value === null || value === void 0 ? void 0 : value.value);
     }
     if (labelInValue && selectProps.mode) {
       // 对传入的值做一些基础判断
@@ -265,6 +268,15 @@ export var ProSelect = function ProSelect(props, ref) {
     }
     return value;
   };
+  var newSelectList = selectList;
+  if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
+    newSelectList = getSelectList({
+      otherProps: otherProps,
+      value: props.value,
+      dataSource: selectList,
+      labelInValue: labelInValue
+    });
+  }
   return _jsx(_Select, _objectSpread(_objectSpread({
     placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProSelect = locale.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
     allowClear: true,
@@ -287,7 +299,7 @@ export var ProSelect = function ProSelect(props, ref) {
     }
   }, omit(cloneDeep(selectProps), ['isView', 'showCodeName', 'form', 'name'])), {}, {
     value: transformValue(),
-    children: Array.isArray(selectList) && selectList.map(function (item) {
+    children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
       return _jsx(Option, {
         value: item[code],
         record: item,

package/es/ProSelect/propsType.d.ts

@@ -14,6 +14,8 @@ export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {
     defaultOne?: boolean;
     /** 数据源 */
     dataSource?: DataOption[];
+    /** list场景中过滤掉已选择的值 */
+    filterInList?: boolean;
     /** @deprecated  兼容 2.0 版本、3.0 使用view 模式 */
     defaultDisableValue?: string;
     /** 是否展示 tooltip、当 label 特别长的时候使用 */

package/es/ProSelect/utils/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 返回当前组件可以显示的数据源
+ */
+export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, }: {
+    otherProps: any;
+    value: any;
+    dataSource: any;
+    labelInValue: any;
+}) => any;

package/es/ProSelect/utils/index.js

@@ -0,0 +1,60 @@
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+/* eslint-disable no-restricted-syntax */
+import _ from 'lodash';
+var findSelectNameValues = function findSelectNameValues(_ref) {
+  var list = _ref.list,
+    selectName = _ref.selectName,
+    value = _ref.value,
+    dataSource = _ref.dataSource,
+    labelInValue = _ref.labelInValue;
+  var selectValues = [];
+  list.forEach(function (item) {
+    var result = item;
+    if (!item || !Object.keys(item).length || Object.keys(item).length === 1 && 'rowKey' in item) {
+      return false;
+    }
+    var _iterator = _createForOfIteratorHelper(selectName),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var key = _step.value;
+        result = result[key];
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    selectValues.push(result);
+  });
+  var diffList = _.difference(selectValues, [value]);
+  return dataSource.filter(function (item) {
+    return !diffList.includes(labelInValue ? item : item.value);
+  });
+};
+/**
+ * 返回当前组件可以显示的数据源
+ */
+export var getSelectList = function getSelectList(_ref2) {
+  var otherProps = _ref2.otherProps,
+    value = _ref2.value,
+    dataSource = _ref2.dataSource,
+    labelInValue = _ref2.labelInValue;
+  if (!otherProps) {
+    return null;
+  }
+  var listName = otherProps.listName,
+    form = otherProps.form;
+  var firstNumberIndex = listName.findIndex(function (item) {
+    return typeof item === 'number';
+  });
+  var fatherName = listName.slice(0, firstNumberIndex);
+  var selectName = listName.slice(firstNumberIndex + 1);
+  return findSelectNameValues({
+    list: form.getFieldValue(fatherName),
+    selectName: selectName,
+    value: value,
+    dataSource: dataSource,
+    labelInValue: labelInValue
+  });
+};

package/es/ProStep/components/Step/index.js

@@ -3,7 +3,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo, useState } from 'react';
 import { cloneDeep } from 'lodash';
-import { ReactSVG } from 'react-svg';
+import ProIcon from '../../../ProIcon/index';
 import catalogSvg from '../../../assets/catalog.svg';
 import Anchor from '../Anchor';
 import locale from '../../../locale';
@@ -59,9 +59,10 @@ export var Step = function Step(_ref) {
     onMouseLeave: handleMouseLeave,
     children: [_jsxs("div", {
       className: "step-menu",
-      children: [_jsx(ReactSVG, {
+      children: [_jsx(ProIcon, {
+        src: catalogSvg,
         className: "menu-icon",
-        src: catalogSvg
+        actionMap: {}
       }), onOff && _jsx("div", {
         children: locale === null || locale === void 0 ? void 0 : (_locale$ProStep = locale.ProStep) === null || _locale$ProStep === void 0 ? void 0 : _locale$ProStep.catalogue
       })]

package/es/ProStep/style/index.less

@@ -27,6 +27,43 @@
     height: 48px;
     font-size: var(--zaui-font-size-lg, 16px);
     border-bottom: 1px solid var(--zaui-line, #dddddd);
+    > .anticon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 48px;
+      height: 24px;
+      > .menu-icon {
+        width: auto !important;
+        height: auto !important;
+        font-size: var(--zaui-font-size-lg-title, 24px);
+        fill: var(--zaui-brand, #006aff);
+        > div {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          width: 48px;
+          height: 24px;
+        }
+      }
+      > button {
+        width: auto !important;
+        height: auto !important;
+        > .menu-icon {
+          width: auto !important;
+          height: auto !important;
+          font-size: var(--zaui-font-size-lg-title, 24px);
+          fill: var(--zaui-brand, #006aff);
+          > div {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 48px;
+            height: 24px;
+          }
+        }
+      }
+    }
 
     > .menu-icon {
       font-size: var(--zaui-font-size-lg-title, 24px);

package/es/ProTable/utils.js

@@ -269,19 +269,22 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         'varied-cell': originalValue !== undefined,
         'empty-cell': isEmpty
       });
-      var renderValue = _jsx(ProForm.ProAddressBar, {
+      var renderValue = _jsx(ProForm.ProCascader, {
         isView: true,
+        mode: "address",
         code: code,
         value: realValue
       });
-      var originalRenderValue = _jsx(ProForm.ProAddressBar, {
+      var originalRenderValue = _jsx(ProForm.ProCascader, {
         isView: true,
+        mode: "address",
         code: code,
         value: originalRealValue
       });
-      return _jsx(ProForm.ProAddressBar, {
+      return _jsx(ProForm.ProCascader, {
         className: className,
         isView: true,
+        mode: "address",
         code: code,
         value: realValue,
         tooltip: originalValue !== undefined ? _jsxs(_Fragment, {

package/es/ProThemeTools/component/PrdTools/index.d.ts

@@ -1,3 +1,3 @@
 import type { DevToolsPropsType } from '../../propsType';
-declare const PrdTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, prefixCls, }: DevToolsPropsType) => JSX.Element;
+declare const PrdTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => JSX.Element;
 export default PrdTools;