@zat-design/sisyphus-react 4.1.3-beta.7 → 4.2.0-beta.2

package/es/ProUpload/components/Example.js

@@ -12,8 +12,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState } from 'react';
 import ProDrawerForm from "../../ProDrawerForm";
 import locale from "../../locale";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var Example = props => {
   var _locale$ProUpload;
   var exampleContent = props.exampleContent,

package/es/ProUpload/components/FileItem.js

@@ -15,8 +15,7 @@ import downloadSvg from "../../assets/download.svg";
  * @param {*} num
  * @return {*}
  */
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var bToKb = num => {
   return num ? (num / 1024).toFixed(2) : '';
 };

package/es/ProUpload/components/ImageRender.js

@@ -26,9 +26,7 @@ import lookSvg from "../../assets/look.svg";
 import deleteSvg from "../../assets/delete.svg";
 import downloadSvg from "../../assets/download.svg";
 import locale from "../../locale";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var isImgage = _fileExt => {
   return ['.PNG', '.JPG', '.JPEG', '.GIF', '.BMP', '.JPE'].includes(_fileExt.toLocaleUpperCase());
 };

package/es/ProUpload/index.js

@@ -23,8 +23,7 @@ import ButtonRender from "./components/ButtonRender";
 import ImageRender from "./components/ImageRender";
 import { validateSize, validateFileExt } from "./uitls";
 import locale from "../locale";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var defaultCustomRequest = option => option.onSuccess();
 var ProUpload = /*#__PURE__*/React.forwardRef((props, ref) => {
   var _locale$ProUpload;

package/es/ProViewer/index.js

@@ -18,8 +18,7 @@ import React, { useEffect, useRef } from 'react';
 import locale from "../locale";
 
 // 用于解析word | excel
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var officeApp = 'https://view.officeapps.live.com/op/view.aspx?src=';
 
 // 文件MIME类型

package/lib/ProEditTable/utils/useShouldUpdateForTable.js

@@ -20,13 +20,13 @@ var useShouldUpdateForTable = props => {
     shouldUpdateDebounce = props.shouldUpdateDebounce;
 
   // refs 存储当前值
-  var isEditableRef = (0, _react.useRef)();
-  var requiredRef = (0, _react.useRef)();
-  var rulesRef = (0, _react.useRef)();
-  var fieldPropsRef = (0, _react.useRef)();
-  var desensitizationRef = (0, _react.useRef)();
-  var valueTypeRef = (0, _react.useRef)();
-  var componentRef = (0, _react.useRef)();
+  var isEditableRef = (0, _react.useRef)(undefined);
+  var requiredRef = (0, _react.useRef)(undefined);
+  var rulesRef = (0, _react.useRef)(undefined);
+  var fieldPropsRef = (0, _react.useRef)(undefined);
+  var desensitizationRef = (0, _react.useRef)(undefined);
+  var valueTypeRef = (0, _react.useRef)(undefined);
+  var componentRef = (0, _react.useRef)(undefined);
   var _useState = (0, _react.useState)({}),
     _useState2 = _slicedToArray(_useState, 2),
     reRender = _useState2[1];

package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -24,7 +24,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /* eslint-disable react/no-array-index-key */
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var actions = {
   add: {
     onClick: (value, _ref) => {
@@ -39,7 +39,7 @@ var actions = {
 var defaultActionProps = [{
   type: 'add'
 }];
-var filterKeys = ['actionType'];
+var filterKeys = ['actionType', 'addIndex'];
 var ToolbarButton = props => {
   var namePath = props.namePath,
     form = props.form,

package/lib/ProForm/components/combination/Group/component/ComRender.js

@@ -73,11 +73,11 @@ var ComRender = props => {
   }));
   var nextProps = mergedGetValueProps(fieldProps.value);
   var componentProps = (0, _lodash.omit)(_objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), nextProps), ['onFieldChange']);
-  var isSeparator = (props === null || props === void 0 || (_props$component = props.component) === null || _props$component === void 0 || (_props$component = _props$component.props) === null || _props$component === void 0 ? void 0 : _props$component.className) === 'group-separator';
+  var componentElementProps = props === null || props === void 0 || (_props$component = props.component) === null || _props$component === void 0 ? void 0 : _props$component.props;
+  var isSeparator = (componentElementProps === null || componentElementProps === void 0 ? void 0 : componentElementProps.className) === 'group-separator';
   if (isSeparator && isView) {
-    var _props$component2;
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [" ", props === null || props === void 0 || (_props$component2 = props.component) === null || _props$component2 === void 0 || (_props$component2 = _props$component2.props) === null || _props$component2 === void 0 ? void 0 : _props$component2.children, " "]
+      children: [" ", componentElementProps === null || componentElementProps === void 0 ? void 0 : componentElementProps.children, " "]
     });
   }
   if (viewRender && isView) {

package/lib/ProForm/components/render/ConfirmWrapper.js

@@ -32,7 +32,11 @@ var ConfirmWrapper = props => {
     otherProps = props.otherProps,
     rest = _objectWithoutProperties(props, _excluded);
   var _ProForm$useFieldProp = _index.default.useFieldProps(),
-    form = _ProForm$useFieldProp.form;
+    form = _ProForm$useFieldProp.form,
+    namePath = _ProForm$useFieldProp.namePath,
+    name = _ProForm$useFieldProp.name,
+    index = _ProForm$useFieldProp.index,
+    listName = _ProForm$useFieldProp.listName;
   var handleChange = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
       var _len,
@@ -56,10 +60,10 @@ var ConfirmWrapper = props => {
             return confirm(value, form.getFieldsValue(), {
               option: other[0],
               form,
-              namePath: otherProps.namePath,
-              name: otherProps.name,
-              index: otherProps.index,
-              preValue: form.getFieldValue(otherProps.listName || otherProps.name)
+              namePath,
+              name,
+              index,
+              preValue: form.getFieldValue(listName || name)
             });
           case 5:
             _context2.t0 = _context2.sent;

package/lib/ProForm/style/index.less

@@ -188,6 +188,7 @@
     > label {
       white-space: pre-wrap;
       word-break: break-all;
+      text-wrap: inherit;
     }
   }
 

package/lib/ProForm/utils/useForm.js

@@ -43,10 +43,14 @@ var useForm = exports.useForm = function useForm(originForm, options) {
   var _ref2 = _antd.Form.useForm(forms[formKey] || _originForm),
     _ref3 = _slicedToArray(_ref2, 1),
     form = _ref3[0];
-  if (formKey && forms[formKey] !== form) {
-    forms[formKey] = form;
-    form.formKey = formKey;
-  }
+
+  // 使用 useLayoutEffect 在浏览器绘制前同步注册 form 实例，避免 React 19 StrictMode 警告
+  (0, _react.useLayoutEffect)(() => {
+    if (formKey && forms[formKey] !== form) {
+      forms[formKey] = form;
+      form.formKey = formKey;
+    }
+  }, [formKey, form, forms]);
   var getFieldsValue = form.getFieldsValue,
     validateFields = form.validateFields,
     isModified = form.isModified,

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

@@ -157,28 +157,21 @@
   }
  }
 
+  // 父级菜单不展示选中态，仅最后一级菜单显示选中高亮
   .@{ant-prefix}-menu-submenu-selected {
     & > .@{ant-prefix}-menu-submenu-title {
+      background: transparent !important;
+
       .@{ant-prefix}-menu-title-content div {
         .pro-layout-icon {
-          color: var(--zaui-brand, #006aff);
+          color: var(--zaui-text, #343434);
         }
 
         h2 {
-          color: var(--zaui-brand, #006aff);
+          color: var(--zaui-text, #343434);
+          font-weight: 400;
         }
       }
     }
-
-    .@{ant-prefix}-menu-item-only-child .@{ant-prefix}-menu-title-content div {
-      .pro-layout-icon {
-        color: var(--zaui-text, #343434);
-      }
-
-      h2 {
-        color: var(--zaui-text, #343434);
-        font-weight: 400;
-      }
-    }
   }
 }

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

@@ -20,14 +20,14 @@
       overflow-y: auto;
 
       .@{ant-prefix}-menu-item-selected {
-        background-color: var(--ant-primary-1, #e6f4ff) !important;
+        background-color: transparent !important;
 
         h2 {
           color: var(--zaui-brand, #006aff) !important;
         }
 
         &::after {
-          border-right-color: var(--ant-primary-1, #e6f4ff);
+          display: none;
         }
       }
 
@@ -80,7 +80,8 @@
 
         // 与展开态一致：hover 使用透明背景 + 左侧品牌色半透明条
         .@{ant-prefix}-menu-submenu-title:hover,
-        .@{ant-prefix}-menu-item:hover {
+        .@{ant-prefix}-menu-item:hover,
+        .@{ant-prefix}-menu-item-selected {
           position: relative;
           background-color: transparent !important;
 

package/lib/ProLayout/style/index.less

@@ -262,7 +262,7 @@
 
     .pro-layout-open-menu .@{ant-prefix}-menu-item:hover,
     .pro-layout-open-menu .@{ant-prefix}-menu-submenu-title:hover,
-    .pro-layout-open-menu .@{ant-prefix}-menu-item-selected{
+    .pro-layout-open-menu .@{ant-prefix}-menu-item-selected {
       position: relative;
       background-color: transparent !important;
 

package/lib/ProStep/components/Anchor/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import type { JSX } from 'react';
 import { MenuItemProps } from '../../propsType';
 export declare const MenuItem: (props: MenuItemProps) => JSX.Element;
 export default MenuItem;

package/lib/ProStep/components/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProStepItemType } from '../../propsType';
 declare const ProStepItem: ({ id, title, collapse: collapseItem, children, lazyLoad: stepLazyLoad, order, ...restProps }: ProStepItemType) => JSX.Element;
 export default ProStepItem;

package/lib/ProStep/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import type { JSX } from 'react';
 import { ProStepType, ProStepContextType } from './propsType';
 export declare const ProStepContext: import("react").Context<ProStepContextType>;
 export declare const useStep: () => Partial<ProStepContextType>;
@@ -6,6 +6,6 @@ declare const ProStep: {
     ({ children, ...resetProps }: ProStepType): JSX.Element;
     useStep: () => Partial<ProStepContextType>;
     Item: ({ id, title, collapse: collapseItem, children, lazyLoad: stepLazyLoad, order, ...restProps }: import("./propsType").ProStepItemPropsType) => JSX.Element;
-    Listener: ({ children, delayTime, excludes, ...props }: import("./propsType").ListenerProps) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
+    Listener: ({ children, delayTime, excludes, ...props }: import("./propsType").ListenerProps) => import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>>;
 };
 export default ProStep;

package/lib/ProTooltip/index.js

@@ -34,9 +34,9 @@ var findTableParent = function findTableParent(element) {
 };
 var ProTooltip = props => {
   var _useSize;
-  var ref = (0, _react.useRef)();
-  var childRef = (0, _react.useRef)();
-  var contentWrapRef = (0, _react.useRef)();
+  var ref = (0, _react.useRef)(undefined);
+  var childRef = (0, _react.useRef)(undefined);
+  var contentWrapRef = (0, _react.useRef)(undefined);
   var text = props.text,
     _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'default' : _props$mode,

package/lib/ProUpload/components/DragRender.js

@@ -37,7 +37,7 @@ var DragRender = props => {
     setFileList = props.setFileList,
     onChange = props.onChange,
     customTextRender = props.customTextRender;
-  var refReSelect = (0, _react.useRef)();
+  var refReSelect = (0, _react.useRef)(null);
 
   // if (isView) return <>-</>;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.1.3-beta.7",
+  "version": "4.2.0-beta.2",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -60,6 +60,9 @@
     "start": "cross-env NODE_OPTIONS=\"--openssl-legacy-provider\" dumi dev",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
+    "test:react18": "REACT_VERSION=18 npm run test",
+    "test:react19": "npm run test",
+    "test:all-versions": "npm run test:react18 && npm run test:react19",
     "tsc": "tsc --noEmit"
   },
   "husky": {
@@ -95,9 +98,8 @@
     "@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",
+    "antd": "^6.3.4",
     "big.js": "^6.2.1",
     "classnames": "^2.3.1",
     "dayjs": "^1.11.13",
@@ -110,8 +112,8 @@
   },
   "peerDependencies": {
     "antd": "^6.0.0",
-    "react": "^18.3.0 || ^19.0.0",
-    "react-dom": "^18.3.0 || ^19.0.0",
+    "react": "^18.0.0 || ^19.0.0",
+    "react-dom": "^18.0.0 || ^19.0.0",
     "react-router-dom": "^6.0.0"
   },
   "devDependencies": {
@@ -119,23 +121,25 @@
     "@babel/runtime": "^7.28.4",
     "@commitlint/cli": "^12.1.1",
     "@commitlint/config-conventional": "^12.1.1",
+    "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^6.0.0",
-    "@testing-library/react": "^14.0.0",
+    "@testing-library/react": "^16.0.0",
     "@types/classnames": "^2.3.1",
     "@types/jest": "^29.5.11",
     "@types/lodash": "^4.14.171",
-    "@types/react": "^18.2.0",
-    "@types/react-dom": "^18.2.0",
+    "@types/react": "^19.0.2",
+    "@types/react-dom": "^19.0.2",
     "@types/react-lazyload": "^3.2.3",
     "@types/react-resizable": "^3.0.8",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
+    "@zat-design/sisyphus-login": "4.0.0-beta.1",
     "babel-plugin-import": "^1.13.8",
     "babel-plugin-lodash": "^3.3.4",
     "cross-env": "^7.0.3",
-    "dumi": "^1.1.53",
+    "dumi": "^1.1.54",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-jsx-a11y": "^6.9.0",
@@ -151,8 +155,8 @@
     "minimatch": "^9.0.5",
     "mockjs": "^1.0.0",
     "prettier": "^2.5.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
     "react-json-view": "^1.21.3",
     "react-router-dom": "^6.0.0",
     "stylelint": "13.0.0",