@zat-design/sisyphus-react 4.1.0 → 4.1.2-beta.1

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

@@ -75,45 +75,43 @@ 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;
     id?: string;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    trim?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     className?: string;
-    vertical?: boolean;
     hidden?: boolean;
+    style?: React.CSSProperties;
+    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
     onReset?: () => void;
     prefixCls?: string;
+    status?: "" | "warning" | "error" | "success" | "validating";
     rootClassName?: string;
-    status?: "" | "success" | "error" | "warning" | "validating";
-    trigger?: string;
-    colon?: boolean;
     isView?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
-    layout?: import("antd/es/form/Form").FormItemLayout;
-    help?: React.ReactNode;
-    preserve?: boolean;
+    colon?: boolean;
     htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
+    vertical?: boolean;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => 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;
+    preserve?: boolean;
     isListField?: boolean;
     isList?: boolean;
     noStyle?: boolean;
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
-    validateStatus?: "" | "success" | "error" | "warning" | "validating";
+    validateStatus?: "" | "warning" | "error" | "success" | "validating";
+    layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
+    help?: React.ReactNode;
     fieldId?: string;
     valueType?: import("../../../render/propsType").ProFormValueType;
     switchValue?: [any, any];
@@ -123,10 +121,12 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         index?: number;
     }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
+    trim?: boolean;
     upperCase?: boolean;
     toISOString?: boolean;
     toCSTString?: boolean;
     clearNotShow?: boolean;
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
     name: any;
     dependencies: any[];
     tooltip: string | {

package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -29,7 +29,9 @@ var OpenMenu = props => {
   var className = props.className,
     dataSource = props.dataSource,
     style = props.style,
-    onMenuClick = props.onMenuClick;
+    onMenuClick = props.onMenuClick,
+    _props$textVisible = props.textVisible,
+    textVisible = _props$textVisible === void 0 ? true : _props$textVisible;
   var _ref = dataSource || {},
     menus = _ref.menus,
     sideMenu = _ref.sideMenu;
@@ -53,6 +55,7 @@ var OpenMenu = props => {
   var layoutTarget = layoutContext === null || layoutContext === void 0 ? void 0 : layoutContext.target;
   var cls = (0, _classnames.default)({
     'pro-layout-open-menu': true,
+    'pro-layout-menu-text-hidden': textVisible === false,
     [`${className}`]: className
   });
 

package/lib/ProLayout/components/Layout/Menu/OpenMenu/style/index.less

@@ -1,6 +1,17 @@
 @import '../../../../../../style/variables.less';
 
 .pro-layout-open-menu {
+  // 展开动画期间（Menu 传入 textVisible=false）隐藏文字，避免”挤压式逐字出现”；宽度过渡结束后再淡入
+  &.pro-layout-menu-text-hidden {
+    .@{ant-prefix}-menu-title-content {
+      div {
+        h2 {
+          opacity: 0 !important;
+          transition: none !important; // 确保隐藏时无过渡动画
+        }
+      }
+    }
+  }
 
   .@{ant-prefix}-menu-root {
     overflow-y: auto !important;
@@ -98,7 +109,8 @@
         font-weight: 400;
         font-size: var(--zaui-font-size-md, 14px);
         opacity: 1;
-        transition: opacity 0.3s cubic-bezier(0.645, 0.045, 0.355, 1), margin 0.3s, color 0.3s;
+        // 修改：添加 150ms 的 opacity 淡入动画，消除"突然出现"的卡顿感
+        transition: opacity 0.15s ease-out, margin 0.3s, color 0.3s;
       }
     }
   }

package/lib/ProLayout/components/Layout/Menu/SideMenu/style/index.less

@@ -78,9 +78,24 @@
         overflow-x: hidden;
         overflow-y: auto;
 
+        // 与展开态一致：hover 使用透明背景 + 左侧品牌色半透明条
         .@{ant-prefix}-menu-submenu-title:hover,
         .@{ant-prefix}-menu-item:hover {
-          background-color: transparent;
+          position: relative;
+          background-color: transparent !important;
+
+          &::before {
+            position: absolute;
+            left: var(--zaui-space-size-sm, 8px);
+            right: var(--zaui-space-size-sm, 8px);
+            width: auto;
+            min-height: 38px;
+            height: 80%;
+            background-color: var(--zaui-brand, #006aff);
+            border-radius: var(--zaui-border-radius, 8px);
+            opacity: 0.08;
+            content: '';
+          }
         }
 
         .@{ant-prefix}-menu-item {

package/lib/ProLayout/components/Layout/Menu/index.js

@@ -4,13 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _OpenMenu = _interopRequireDefault(require("./OpenMenu"));
 var _FoldMenu = _interopRequireDefault(require("./FoldMenu"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-// 折叠后菜单
-
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } // 折叠后菜单
+// 菜单宽度配置
+var MENU_CONFIG = {
+  TRANSITION_DURATION: 300,
+  // 宽度过渡时长(ms)
+  TEXT_VISIBLE_THRESHOLD: 150,
+  // 文字显示阈值(px, 约68%展开)
+  FULL_WIDTH: 219 // 完全展开宽度(px)
+};
 var Menu = props => {
   var _ref = props || {},
     headerHeight = _ref.headerHeight,
@@ -24,6 +37,83 @@ var Menu = props => {
     sideMenuHeaderRender = _ref.sideMenuHeaderRender,
     onMenuClick = _ref.onMenuClick;
   var menus = [];
+  var menuRef = (0, _react.useRef)(null);
+  // 整合所有动画相关的refs
+  var animationStateRef = (0, _react.useRef)({
+    timer: null,
+    observer: null,
+    hasTriggered: false
+  });
+  var _useState = (0, _react.useState)(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isOpenMenuTextVisible = _useState2[0],
+    setIsOpenMenuTextVisible = _useState2[1];
+
+  // 提取清理逻辑
+  var cleanupAnimation = (0, _react.useCallback)(() => {
+    var state = animationStateRef.current;
+    if (state.timer) {
+      clearTimeout(state.timer);
+      state.timer = null;
+    }
+    if (state.observer) {
+      try {
+        state.observer.disconnect();
+      } catch (e) {
+        console.warn('ResizeObserver disconnect failed:', e);
+      }
+      state.observer = null;
+    }
+  }, []);
+
+  // 触发文字显示
+  var showMenuText = (0, _react.useCallback)(() => {
+    var state = animationStateRef.current;
+    if (state.hasTriggered) return;
+    state.hasTriggered = true;
+    setIsOpenMenuTextVisible(true);
+    // 延迟清理，避免回调内竞态
+    setTimeout(cleanupAnimation, 0);
+  }, [cleanupAnimation]);
+
+  // ResizeObserver 监听宽度变化，提前显示文字
+  (0, _react.useEffect)(() => {
+    var _menuRef$current$getB, _menuRef$current, _menuRef$current$getB2;
+    var state = animationStateRef.current;
+    state.hasTriggered = false;
+
+    // 折叠态：清理并隐藏文字
+    if (!collapsed) {
+      setIsOpenMenuTextVisible(false);
+      cleanupAnimation();
+      return;
+    }
+
+    // 检查是否已展开
+    var currentWidth = (_menuRef$current$getB = (_menuRef$current = menuRef.current) === null || _menuRef$current === void 0 || (_menuRef$current$getB2 = _menuRef$current.getBoundingClientRect) === null || _menuRef$current$getB2 === void 0 ? void 0 : _menuRef$current$getB2.call(_menuRef$current).width) !== null && _menuRef$current$getB !== void 0 ? _menuRef$current$getB : 0;
+    if (currentWidth >= MENU_CONFIG.FULL_WIDTH) {
+      state.hasTriggered = true;
+      setIsOpenMenuTextVisible(true);
+      return;
+    }
+
+    // 创建 ResizeObserver
+    var supportsResizeObserver = typeof ResizeObserver !== 'undefined';
+    if (supportsResizeObserver && menuRef.current) {
+      state.observer = new ResizeObserver(entries => {
+        var _entries$0$contentRec, _entries$;
+        var width = (_entries$0$contentRec = (_entries$ = entries[0]) === null || _entries$ === void 0 ? void 0 : _entries$.contentRect.width) !== null && _entries$0$contentRec !== void 0 ? _entries$0$contentRec : 0;
+        if (width >= MENU_CONFIG.TEXT_VISIBLE_THRESHOLD) {
+          showMenuText();
+        }
+      });
+      state.observer.observe(menuRef.current);
+    }
+
+    // Fallback：定时器保底
+    state.timer = setTimeout(showMenuText, MENU_CONFIG.TRANSITION_DURATION);
+    return cleanupAnimation;
+  }, [collapsed, cleanupAnimation, showMenuText]);
   var menuCls = (0, _classnames.default)({
     'pro-layout-menu': true,
     'pro-layout-menu-open': collapsed
@@ -37,10 +127,17 @@ var Menu = props => {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    ref: menuRef,
     className: menuCls,
     style: {
       top: notice ? 96 + headerHeight - 64 : headerHeight
     },
+    onTransitionEnd: e => {
+      // Fallback：确保宽度过渡结束后文字一定显示
+      if (e.propertyName === 'width' && e.target === menuRef.current && collapsed) {
+        showMenuText();
+      }
+    },
     children: [sideMenuHeaderRender, /*#__PURE__*/(0, _jsxRuntime.jsx)(_OpenMenu.default, {
       dataSource: {
         menus,
@@ -48,6 +145,7 @@ var Menu = props => {
         height: headerHeight + (notice ? 32 : 0) + 48
       },
       onMenuClick: onMenuClick,
+      textVisible: isOpenMenuTextVisible,
       style: {
         display: collapsed ? 'block' : 'none'
       }
@@ -67,7 +165,10 @@ var Menu = props => {
       }
     }), sideMenuFooterRender || /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "pro-layout-menu-collapsed",
-      onClick: onToggle,
+      onClick: () => {
+        setIsOpenMenuTextVisible(false);
+        onToggle === null || onToggle === void 0 || onToggle();
+      },
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "pro-layout-arrow "
       })

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -12,6 +12,8 @@ var _fold = _interopRequireDefault(require("../../../assets/fold.svg"));
 var _index = _interopRequireDefault(require("../../../ProIcon/index"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -61,11 +63,12 @@ var ProCollapse = props => {
     'pro-collapse-no-level1-title': !title && level !== '2' && level !== '3',
     [`${className}`]: className
   });
-  var content = /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+  var shouldRenderContent = children !== null && children !== undefined;
+  var content = shouldRenderContent ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "pro-collapse-content",
     style: contentStyle,
     children: children
-  });
+  }) : null;
 
   // 生成 Collapse items 配置
   var getCollapseItems = () => {

package/lib/ProSelect/index.js

@@ -431,7 +431,7 @@ var ProSelect = (props, ref) => {
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(OptGroup, {
             label: item[label],
             children: groupOpts.map(opt => /*#__PURE__*/(0, _jsxRuntime.jsx)(Option, {
-              label: opt[label],
+              label: selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label],
               value: opt[code],
               record: opt,
               disabled: !!opt.disabled,
@@ -447,7 +447,7 @@ var ProSelect = (props, ref) => {
           }, (_item$label = item[label]) !== null && _item$label !== void 0 ? _item$label : `group-${index}`);
         }
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(Option, {
-          label: item[label],
+          label: selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label],
           value: optionValue,
           record: item,
           disabled: !!item.disabled,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.1.0",
+  "version": "4.1.2-beta.1",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -92,6 +92,7 @@
     "@dnd-kit/utilities": "^3.2.1",
     "@rc-component/picker": "^1.9.0",
     "@zat-design/utils": "4.0.0",
+    "@zat-design/sisyphus-login": "4.0.0-beta.1",
     "ahooks": "3.9.5",
     "antd": "^6.2.2",
     "big.js": "^6.2.1",