@zat-design/sisyphus-react 4.0.8 → 4.0.9

package/es/ProForm/components/combination/Group/style/index.less

@@ -314,7 +314,8 @@
         .@{ant-prefix}-input,
         .@{ant-prefix}-select .@{ant-prefix}-select-selector,
         .@{ant-prefix}-input-number,
-        .@{ant-prefix}-input-number-input {
+        .@{ant-prefix}-input-number-input,
+        .@{ant-prefix}-picker{
           // 重置z-index确保正确的层级关系
           position: relative;
           // 重置圆角
@@ -337,7 +338,8 @@
           .@{ant-prefix}-input,
           .@{ant-prefix}-select .@{ant-prefix}-select-selector,
           .@{ant-prefix}-input-number,
-          .@{ant-prefix}-input-number-input {
+          .@{ant-prefix}-input-number-input,
+          .@{ant-prefix}-picker{
             border-top-right-radius: 6px;
             border-bottom-right-radius: 6px;
           }

package/es/ProForm/components/combination/Group/utils/index.d.ts

@@ -75,46 +75,45 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
+    style?: React.CSSProperties;
     trim?: boolean;
     normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    id?: string;
     className?: string;
     hidden?: boolean;
-    style?: React.CSSProperties;
-    onReset?: () => void;
+    layout?: import("antd/es/form/Form").FormItemLayout;
+    help?: React.ReactNode;
+    vertical?: boolean;
+    preserve?: boolean;
     prefixCls?: string;
-    rootClassName?: string;
+    onReset?: () => void;
     status?: "" | "warning" | "error" | "success" | "validating";
-    validateTrigger?: string | false | string[];
-    preserve?: boolean;
-    labelCol?: import("antd").ColProps;
-    wrapperCol?: import("antd").ColProps;
-    colon?: boolean;
+    id?: string;
+    rootClassName?: string;
+    isView?: boolean;
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
     htmlFor?: string;
+    colon?: boolean;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
-    vertical?: boolean;
+    labelCol?: import("antd").ColProps;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     trigger?: string;
+    validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     messageVariables?: Record<string, string>;
     initialValue?: any;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
     isListField?: boolean;
     isList?: boolean;
-    upperCase?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    isView?: boolean;
     noStyle?: boolean;
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
     validateStatus?: "" | "warning" | "error" | "success" | "validating";
-    layout?: import("antd/es/form/Form").FormItemLayout;
-    help?: React.ReactNode;
+    wrapperCol?: import("antd").ColProps;
     fieldId?: string;
     valueType?: import("../../../render/propsType").ProFormValueType;
     switchValue?: [any, any];
@@ -124,6 +123,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         index?: number;
     }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
+    upperCase?: boolean;
     toISOString?: boolean;
     toCSTString?: boolean;
     clearNotShow?: boolean;
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
  * 创建组件属性
  */
 export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
-    componentProps: import("lodash").Omit<any, "format" | "precision" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow">;
+    componentProps: import("lodash").Omit<any, "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/es/ProIcon/index.js

@@ -23,8 +23,53 @@ import { iconMap } from "./config";
 import { onBeforeInjection } from "./utils";
 import locale from "../locale";
 import "./symbolIcon.js";
+
+// 提取主题色相关辅助函数
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
+var extractThemeColor = target => {
+  var _target$attributes, _styleAttr$value, _match$;
+  if (!target) return null;
+  var styleAttr = Object.values((_target$attributes = target.attributes) !== null && _target$attributes !== void 0 ? _target$attributes : {})
+  // @ts-ignore
+  .find(item => item.nodeName === 'style');
+  if (!styleAttr) return null;
+
+  // @ts-ignore
+  var match = (_styleAttr$value = styleAttr.value) === null || _styleAttr$value === void 0 ? void 0 : _styleAttr$value.match(/--zaui-brand:(.*?);/);
+  return (match === null || match === void 0 || (_match$ = match[1]) === null || _match$ === void 0 ? void 0 : _match$.trim()) || null;
+};
+var updateThemeColor = (newColor, dispatch, primaryColor) => {
+  if (!newColor) return;
+  dispatch({
+    type: 'set',
+    payload: {
+      theme: {
+        primaryColor,
+        qiankunPrimaryColor: newColor
+      },
+      forms: {}
+    }
+  });
+};
+var getMainAppWindow = () => {
+  if (window.parent === window) {
+    return window;
+  }
+  var currentWindow = window;
+  while (currentWindow.parent !== currentWindow) {
+    // @ts-ignore
+    currentWindow = currentWindow.parent;
+  }
+  return currentWindow;
+};
+var handleMutation = (mutationsList, dispatch, primaryColor, qiankunPrimaryColor) => {
+  var targetEntries = mutationsList[0];
+  if (!(targetEntries !== null && targetEntries !== void 0 && targetEntries.target)) return;
+  var newColor = extractThemeColor(targetEntries.target);
+  if (!newColor || qiankunPrimaryColor === newColor) return;
+  updateThemeColor(newColor, dispatch, primaryColor);
+};
 var ProIcon = props => {
   var _window, _window2;
   var _useProConfig = useProConfig(),
@@ -116,27 +161,36 @@ var ProIcon = props => {
   var _text = children;
   // svg图标对应文本
   var iconText = tooltip || '';
-  var typeIsExistAndIncludeEnglish = _type && /[a-zA-Z]/.test(_type);
 
-  // 模式为icon下，对传入的text进行指定语言-icon 映射
-  if (isIconMode && !type) {
-    if (_text) {
-      var target = mergedMapList.find(item => item['text-cn'] === _text || item['text-en'] === _text);
+  // 文本和类型映射处理函数
+  var resolveIconMapping = (isIconMode, type, text, mergedMapList, targetTextFill) => {
+    if (isIconMode && !type && text) {
+      var target = mergedMapList.find(item => item['text-cn'] === text || item['text-en'] === text);
       if (target) {
-        _type = target === null || target === void 0 ? void 0 : target.type;
-        iconText = target[targetTextFill];
+        return {
+          type: target.type,
+          text: target[targetTextFill]
+        };
       }
     }
-  }
-
-  // 模式为button下，对传入的type进行icon-指定语言 映射
-  if (!isIconMode) {
-    if (typeIsExistAndIncludeEnglish) {
-      var _target = mergedMapList.find(item => item.type === _type);
+    if (!isIconMode && type && /[a-zA-Z]/.test(type)) {
+      var _target = mergedMapList.find(item => item.type === type);
       if (_target) {
-        _text = _target[targetTextFill];
+        return {
+          text: _target[targetTextFill]
+        };
       }
     }
+    return null;
+  };
+  var mappingResult = resolveIconMapping(isIconMode, type, _text, mergedMapList, targetTextFill);
+  if (mappingResult) {
+    if (mappingResult.type) {
+      _type = mappingResult.type;
+      iconText = mappingResult.text || '';
+    } else if (mappingResult.text) {
+      _text = mappingResult.text;
+    }
   }
   var svgProps = {
     className: proIconClassNames,
@@ -147,105 +201,112 @@ var ProIcon = props => {
     }, rotateStyle), style)
   };
 
+  // 应用颜色到 SVG 路径元素
+  var applyColorToPaths = (svg, color) => {
+    var paths = svg.querySelectorAll('path, circle, rect, polygon, ellipse');
+    paths.forEach(path => {
+      var currentFill = path.getAttribute('fill');
+      if (!currentFill || currentFill === 'currentColor') {
+        path.setAttribute('fill', color);
+      }
+    });
+  };
+
+  // 应用颜色到 SVG
+  var applyColorToSvg = function applyColorToSvg(svg, color) {
+    var isComponentString = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    if (!color) {
+      svg.style.color = 'currentColor';
+      return;
+    }
+    svg.setAttribute('fill', color);
+    svg.style.color = color;
+
+    // 组件字符串类型需要遍历所有路径元素设置 fill
+    if (isComponentString) {
+      applyColorToPaths(svg, color);
+    }
+  };
+
+  // 创建 SVG beforeInjection 处理函数
+  var createSvgBeforeInjection = function createSvgBeforeInjection() {
+    var isComponentString = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    return svg => {
+      // 设置 SVG 的宽高和属性
+      svg.setAttribute('width', String(size));
+      svg.setAttribute('height', String(size));
+      svg.setAttribute('aria-hidden', 'true');
+
+      // 应用旋转
+      if (rotate) {
+        var transform = svg.getAttribute('transform') || '';
+        svg.setAttribute('transform', `${transform} rotate(${rotate})`);
+        svg.style.transform = `rotate(${rotate}deg)`;
+      }
+
+      // 应用颜色
+      applyColorToSvg(svg, color, isComponentString);
+
+      // 应用自定义样式
+      if (style) {
+        Object.keys(style).forEach(key => {
+          svg.style[key] = style[key];
+        });
+      }
+
+      // 应用 actionMap 的主题配置
+      onBeforeInjection({
+        svg,
+        actionMap,
+        primaryColor: isQiankun ? qiankunPrimaryColor : primaryColor
+      });
+    };
+  };
+
+  // 渲染自定义组件 icon
+  var renderComponentIcon = (component, svgProps, color, onClick) => {
+    var componentProps = _objectSpread(_objectSpread({}, svgProps), {}, {
+      style: _objectSpread({
+        color
+      }, svgProps === null || svgProps === void 0 ? void 0 : svgProps.style),
+      onClick,
+      'aria-hidden': 'true'
+    });
+    return /*#__PURE__*/React.isValidElement(component) ? /*#__PURE__*/React.cloneElement(component, componentProps) : /*#__PURE__*/React.createElement(component, componentProps);
+  };
+
   // 渲染 icon 的优先级：component > src > type
-  var icon;
-  if (component) {
-    // 判断 component 的类型
-    if (typeof component === 'string') {
-      // 字符串类型：当作 SVG 文件路径处理，使用 ReactSVG 加载
-      icon = /*#__PURE__*/_jsx(ReactSVG, {
+  var renderIcon = () => {
+    // component 字符串类型：当作 SVG 文件路径处理
+    if (component && typeof component === 'string') {
+      return /*#__PURE__*/_jsx(ReactSVG, {
         className: proIconClassNames
         // @ts-ignore
         ,
         onClick: onClick,
         src: component,
-        beforeInjection: svg => {
-          // 设置 SVG 的宽高
-          svg.setAttribute('width', String(size));
-          svg.setAttribute('height', String(size));
-          svg.setAttribute('aria-hidden', 'true');
-
-          // 应用旋转
-          if (rotate) {
-            var transform = svg.getAttribute('transform') || '';
-            svg.setAttribute('transform', `${transform} rotate(${rotate})`);
-            svg.style.transform = `rotate(${rotate}deg)`;
-          }
-
-          // 应用颜色 - 设置 fill 和 currentColor
-          if (color) {
-            svg.setAttribute('fill', color);
-            svg.style.color = color;
-            // 遍历所有路径元素，设置 fill
-            var paths = svg.querySelectorAll('path, circle, rect, polygon, ellipse');
-            paths.forEach(path => {
-              var currentFill = path.getAttribute('fill');
-              // 只修改使用 currentColor 或没有设置 fill 的元素
-              if (!currentFill || currentFill === 'currentColor') {
-                path.setAttribute('fill', color);
-              }
-            });
-          } else {
-            // 没有指定颜色时，使用 currentColor
-            svg.style.color = 'currentColor';
-          }
-
-          // 应用自定义样式
-          if (style) {
-            Object.keys(style).forEach(key => {
-              svg.style[key] = style[key];
-            });
-          }
-
-          // 应用 actionMap 的主题配置
-          onBeforeInjection({
-            svg,
-            actionMap,
-            primaryColor: isQiankun ? qiankunPrimaryColor : primaryColor
-          });
-        }
-      });
-    } else {
-      // 处理自定义组件
-      var componentProps = _objectSpread(_objectSpread({}, svgProps), {}, {
-        style: _objectSpread({
-          color
-        }, svgProps === null || svgProps === void 0 ? void 0 : svgProps.style),
-        onClick,
-        'aria-hidden': 'true'
+        beforeInjection: createSvgBeforeInjection(true)
       });
+    }
 
-      // 判断是组件类型还是组件实例
-      if ( /*#__PURE__*/React.isValidElement(component)) {
-        // 组件实例：使用 cloneElement
-        icon = /*#__PURE__*/React.cloneElement(component, componentProps);
-      } else {
-        // 组件类型：直接渲染
-        var ComponentType = component;
-        icon = /*#__PURE__*/_jsx(ComponentType, _objectSpread({}, componentProps));
-      }
+    // component 组件类型或实例（排除字符串类型）
+    if (component && typeof component !== 'string') {
+      return renderComponentIcon(component, svgProps, color, onClick);
     }
-  } else if (src) {
-    // 使用 ReactSVG 加载外部 SVG
-    icon = /*#__PURE__*/_jsx(ReactSVG, _objectSpread(_objectSpread({}, svgProps), {}, {
-      // @ts-ignore
-      onClick: onClick,
-      "aria-hidden": "true",
-      src: src,
-      beforeInjection: svg => {
-        onBeforeInjection({
-          svg,
-          actionMap,
-          primaryColor: isQiankun ? qiankunPrimaryColor : primaryColor
-        });
-        if (color) {
-          svg.setAttribute('fill', color);
-        }
-      }
-    }));
-  } else {
-    // 使用 symbol icon
-    icon = /*#__PURE__*/_jsx("svg", _objectSpread(_objectSpread({}, svgProps), {}, {
+
+    // src 类型：使用 ReactSVG 加载外部 SVG
+    if (src) {
+      return /*#__PURE__*/_jsx(ReactSVG, _objectSpread(_objectSpread({}, svgProps), {}, {
+        // @ts-ignore
+        onClick: onClick,
+        "aria-hidden": "true",
+        src: src,
+        beforeInjection: createSvgBeforeInjection()
+      }));
+    }
+
+    // symbol icon
+    return /*#__PURE__*/_jsx("svg", _objectSpread(_objectSpread({}, svgProps), {}, {
       style: _objectSpread({
         color
       }, svgProps === null || svgProps === void 0 ? void 0 : svgProps.style),
@@ -255,7 +316,8 @@ var ProIcon = props => {
         xlinkHref: `#icon-${_type}`
       })
     }));
-  }
+  };
+  var icon = renderIcon();
 
   // 判断 RenderIcon 是否会被外层 Button 包裹
   // 如果会被包裹（isExtendButtonMode && isIconMode），则内部不使用 Button，避免 button 嵌套
@@ -292,69 +354,23 @@ var ProIcon = props => {
     })
   }));
   useEffect(() => {
+    var _themeConfig$data;
     // 处于主子应用情况下才会执行下方逻辑，主题色的变更以主框架的为准
-    if (actionMap && isQiankun) {
-      var _themeConfig$data;
-      observer = new MutationObserver(mutationsList => {
-        var targetEntries = mutationsList[0];
-        if (targetEntries) {
-          if (targetEntries && targetEntries.target) {
-            var _Object$values, _targetEntries$target, _targetEntries$target2;
-            var _Object$values$find$v = // @ts-ignore
-              (_Object$values = Object.values((_targetEntries$target = targetEntries === null || targetEntries === 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 || (_Object$values = _Object$values.find(item => item.nodeName === 'style')
-              // @ts-ignore
-              ) === null || _Object$values === void 0 || (_Object$values = _Object$values.value) === null || _Object$values === void 0 ? void 0 : _Object$values.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,
-                      qiankunPrimaryColor: value === null || value === void 0 ? void 0 : value.trim()
-                    },
-                    forms: {}
-                  }
-                });
-              }
-            }
-          }
-        }
-      });
-      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 || (_themeConfig$data = themeConfig.data) === null || _themeConfig$data === void 0 ? void 0 : _themeConfig$data.zauiBrand;
-      if (extendFromMainColor && qiankunPrimaryColor !== extendFromMainColor) {
-        dispatch({
-          type: 'set',
-          payload: {
-            theme: {
-              primaryColor,
-              qiankunPrimaryColor: extendFromMainColor
-            },
-            forms: {}
-          }
-        });
-      }
+    if (!actionMap || !isQiankun) return;
+    observer = new MutationObserver(mutationsList => {
+      handleMutation(mutationsList, dispatch, primaryColor, qiankunPrimaryColor);
+    });
+    var mainWindow = getMainAppWindow();
+    var zaAccessibilityTarget = mainWindow.document.documentElement;
+    observer.observe(zaAccessibilityTarget, {
+      attributes: true,
+      attributeFilter: ['style']
+    });
+
+    // 未变更时及初始化时
+    var extendFromMainColor = themeConfig === null || themeConfig === void 0 || (_themeConfig$data = themeConfig.data) === null || _themeConfig$data === void 0 ? void 0 : _themeConfig$data.zauiBrand;
+    if (extendFromMainColor && qiankunPrimaryColor !== extendFromMainColor) {
+      updateThemeColor(extendFromMainColor, dispatch, primaryColor);
     }
   }, []);
   useEffect(() => {

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

@@ -14,7 +14,7 @@ var ProFooter = props => {
     className = props.className,
     children = props.children,
     _props$zIndex = props.zIndex,
-    zIndex = _props$zIndex === void 0 ? 99 : _props$zIndex,
+    zIndex = _props$zIndex === void 0 ? 98 : _props$zIndex,
     _props$sideDom = props.sideDom,
     sideDom = _props$sideDom === void 0 ? '.pro-layout-sider-nav' : _props$sideDom,
     _props$contentDom = props.contentDom,

package/es/ProLayout/index.js

@@ -11,7 +11,6 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /* eslint-disable func-call-spacing */
 /* eslint-disable no-spaced-func */
-import { message } from 'antd';
 import { createContext, useMemo, useRef, useCallback } from 'react';
 import classNames from 'classnames';
 import { useSetState, useToggle, useDeepCompareEffect } from 'ahooks';
@@ -92,7 +91,7 @@ var ProLayout = props => {
   }, [props.collapsed]);
   useDeepCompareEffect(() => {
     if (Array.isArray(dataSource) && !dataSource.length) {
-      return message.warning('Warning: Missing menu data source, or menu data source is not an array');
+      return;
     }
     var userData = transformMenus(dataSource, pathPrefix);
     // 确保 menus 始终是一个数组

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

@@ -59,7 +59,7 @@ export var Step = _ref => {
     setOnOff(false);
   };
   return /*#__PURE__*/_jsxs("div", {
-    className: `pro-step ${onOff ? 'open' : 'closed'}`,
+    className: `pro-step ${onOff ? 'pro-step-open' : 'pro-step-closed'}`,
     style: _objectSpread({
       top: fixedTop !== null && fixedTop !== void 0 ? fixedTop : 0,
       maxHeight: `calc(100vh - ${fixedTop}px)`

package/es/ProStep/style/index.less

@@ -115,6 +115,7 @@
         align-items: center;
         justify-content: center;
         width: 48px;
+        min-width: 48px;
         height: 100%;
 
         > svg {
@@ -168,6 +169,7 @@
 
       > .pro-step-menu-name {
         color: #0a0a0a;
+        text-align: left;
 
         &.disabled {
           color: #626366;
@@ -208,11 +210,11 @@
     }
   }
 
-  &.open {
+  &.pro-step-open {
     width: 200px;
   }
 
-  &.closed {
+  &.pro-step-closed {
     width: 48px;
   }
 }