@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

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

@@ -2,15 +2,25 @@ export interface ThemesProps {
     [key: string]: any;
 }
 /**
- * 取主题配置的mapping值, 返回antd可用的主题配置
- * @param themes
- * @param themeMapping
+ * 将 kebab-case 的主题配置转换为 antd5 的 token 格式
+ * @param themes kebab-case 格式的主题配置
+ * @param themeMapping 自定义映射关系
  */
-export declare const replaceObject: (themes: ThemesProps, themeMapping: ThemesProps) => ThemesProps;
+export declare const convertToAntd5Tokens: (themes: ThemesProps, themeMapping?: ThemesProps) => {
+    token: ThemesProps;
+};
+/**
+ * 设置主题变量 - antd5 兼容版本
+ * 只设置 CSS 变量，不再使用 ConfigProvider.config
+ */
+export declare const setThemes: (themes: ThemesProps) => boolean;
 /**
- * 设置主题变量
+ * 获取 antd5 主题配置
+ * @param themes kebab-case 格式的主题配置
  */
-export declare const setThemes: (themes: ThemesProps, themeMapping?: ThemesProps) => boolean;
+export declare const getAntd5ThemeConfig: (themes: ThemesProps) => {
+    token: ThemesProps;
+};
 /** JS实现驼峰命名与横线命名的转换  */
 export declare const getKebabCase: (str: string) => string;
 /** JS实现对象驼峰命名与横线命名的转换  */

package/es/ProThemeTools/utils/index.js

@@ -1,46 +1,55 @@
-import "antd/es/config-provider/style";
-import _ConfigProvider from "antd/es/config-provider";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-/** 主题配置mapping */
-var configProviderMapping = {
-  'zaui-brand': 'primaryColor'
+/** antd5 主题配置 mapping */
+var antd5ConfigMapping = {
+  'zaui-brand': 'colorPrimary'
+  // 可以根据需要添加更多映射
 };
+
 /**
- * 取主题配置的mapping值, 返回antd可用的主题配置
- * @param themes
- * @param themeMapping
+ * 将 kebab-case 的主题配置转换为 antd5 的 token 格式
+ * @param themes kebab-case 格式的主题配置
+ * @param themeMapping 自定义映射关系
  */
-export var replaceObject = function replaceObject(themes, themeMapping) {
-  var result = {};
-  Object.keys(themes).forEach(function (key, index) {
+export var convertToAntd5Tokens = function convertToAntd5Tokens(themes, themeMapping) {
+  var mapping = _objectSpread(_objectSpread({}, antd5ConfigMapping), themeMapping);
+  var tokens = {};
+  Object.keys(themes).forEach(function (key) {
     var value = themes[key];
-    var mappingKey = themeMapping[key];
+    var mappingKey = mapping[key];
     if (mappingKey) {
-      result[mappingKey] = value;
+      tokens[mappingKey] = value;
     }
   });
-  return result;
+  return {
+    token: tokens
+  };
 };
+
 /**
- * 设置主题变量
+ * 设置主题变量 - antd5 兼容版本
+ * 只设置 CSS 变量，不再使用 ConfigProvider.config
  */
-export var setThemes = function setThemes(themes, themeMapping) {
+export var setThemes = function setThemes(themes) {
   if (!Object.keys(themes).length) {
     return false;
   }
-  var mapping = _objectSpread(_objectSpread({}, configProviderMapping), themeMapping);
-  var configProviderThemes = replaceObject(themes, mapping);
-  // 匹配到主题配置执行antd的主题配置
-  if (configProviderThemes && Object.keys(configProviderThemes).length) {
-    _ConfigProvider.config({
-      theme: configProviderThemes
-    });
-  }
+
+  // 只设置 CSS 变量，主题配置通过 Context 管理
   var list = Object.entries(themes);
   list.forEach(function (item) {
     document.documentElement.style.setProperty("--".concat(item[0]), item[1]);
   });
+  return true;
+};
+
+/**
+ * 获取 antd5 主题配置
+ * @param themes kebab-case 格式的主题配置
+ */
+export var getAntd5ThemeConfig = function getAntd5ThemeConfig(themes) {
+  return convertToAntd5Tokens(themes);
 };
+
 /** JS实现驼峰命名与横线命名的转换  */
 export var getKebabCase = function getKebabCase(str) {
   var temp = str.replace(/[A-Z]/g, function (i) {
@@ -51,6 +60,7 @@ export var getKebabCase = function getKebabCase(str) {
   }
   return temp;
 };
+
 /** JS实现对象驼峰命名与横线命名的转换  */
 export var getMapKebabCase = function getMapKebabCase(obj) {
   var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -58,6 +68,7 @@ export var getMapKebabCase = function getMapKebabCase(obj) {
     return ["".concat(prefix).concat(getKebabCase(item === null || item === void 0 ? void 0 : item[0])), item === null || item === void 0 ? void 0 : item[1]];
   }));
 };
+
 /** JS实现对象横线命名与驼峰命名的转换  */
 export var getMapHumpCase = function getMapHumpCase() {
   var obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -69,6 +80,7 @@ export var getMapHumpCase = function getMapHumpCase() {
     return acc;
   }, {});
 };
+
 /**
  * 设置表格斑马纹
  * @param stripe boolean
@@ -97,6 +109,7 @@ export var setTableNoStripe = function setTableNoStripe(stripe) {
     }
   }
 };
+
 /**
  * 设置表格边框
  * @param border boolean

package/es/ProTooltip/index.js

@@ -1,21 +1,20 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-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";
 var _excluded = ["text", "mode", "width", "line", "className", "style", "lineHeight", "scrollFollowParent"];
-import { jsx as _jsx } from "react/jsx-runtime";
 import { useSize, useSetState, useDebounce } from 'ahooks';
+import { Tooltip } from 'antd';
 import { useEffect, useRef } from 'react';
 import classnames from 'classnames';
-import { isEllipsisActive } from '../utils';
-var _findTableParent = function findTableParent(element) {
+import { isEllipsisActive } from "../utils";
+import { jsx as _jsx } from "react/jsx-runtime";
+var findTableParent = function findTableParent(element) {
   var _element$tagName;
   var depth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   if (!element || depth >= 3) return false;
   if (((_element$tagName = element.tagName) === null || _element$tagName === void 0 ? void 0 : _element$tagName.toLowerCase()) === 'td') return true;
-  return _findTableParent(element.parentElement, depth + 1);
+  return findTableParent(element.parentElement, depth + 1);
 };
 var ProTooltip = function ProTooltip(props) {
   var _useSize;
@@ -65,39 +64,41 @@ var ProTooltip = function ProTooltip(props) {
   });
   var _ref = (_useSize = useSize(localElement)) !== null && _useSize !== void 0 ? _useSize : {},
     _localSizeWidth = _ref.width;
-  var isTable = _findTableParent(ref.current);
-  var overlayStyle = mode === 'auto' ? {
+  var isTable = findTableParent(ref.current);
+  var rootStyles = mode === 'auto' ? {
     maxWidth: _localSizeWidth
   } : {};
   var multiStyle = isMultiLine ? {
     WebkitLineClamp: line
   } : {};
   var AutoMixinSingle = function AutoMixinSingle() {
-    return isShowToolTip && line === 1 ? _jsx(_Tooltip, _objectSpread(_objectSpread({
+    return isShowToolTip && line === 1 ? /*#__PURE__*/_jsx(Tooltip, _objectSpread(_objectSpread({
       title: text,
       getPopupContainer: function getPopupContainer(triggerNode) {
         return triggerNode.parentNode;
       }
     }, restProps), {}, {
-      overlayStyle: overlayStyle,
-      children: _jsx("div", _objectSpread(_objectSpread({}, specialProps), {}, {
+      styles: {
+        root: rootStyles
+      },
+      children: /*#__PURE__*/_jsx("div", _objectSpread(_objectSpread({}, specialProps), {}, {
         style: _objectSpread(_objectSpread({}, multiStyle), {}, {
           width: localWidth,
           visibility: visible
         }),
         ref: childRef,
-        children: _jsx("div", _objectSpread(_objectSpread({}, specialProps), {}, {
+        children: /*#__PURE__*/_jsx("div", _objectSpread(_objectSpread({}, specialProps), {}, {
           ref: contentWrapRef,
           children: content
         }))
       }))
-    })) : _jsx("div", {
+    })) : /*#__PURE__*/_jsx("div", {
       className: isMultiLine ? 'multiLine' : 'singleLine',
       style: _objectSpread(_objectSpread({}, multiStyle), {}, {
         width: localWidth
       }),
       ref: childRef,
-      children: _jsx("div", {
+      children: /*#__PURE__*/_jsx("div", {
         className: "single-content-box",
         style: {
           visibility: visible
@@ -108,31 +109,33 @@ var ProTooltip = function ProTooltip(props) {
     });
   };
   var AutoMixinMulti = function AutoMixinMulti() {
-    return isShowToolTip && line > 1 ? _jsx(_Tooltip, _objectSpread(_objectSpread({
+    return isShowToolTip && line > 1 ? /*#__PURE__*/_jsx(Tooltip, _objectSpread(_objectSpread({
       title: text,
       getPopupContainer: function getPopupContainer(triggerNode) {
         return triggerNode.parentNode;
       }
     }, restProps), {}, {
-      overlayStyle: overlayStyle,
-      children: _jsx("div", _objectSpread(_objectSpread({}, specialProps), {}, {
+      styles: {
+        root: rootStyles
+      },
+      children: /*#__PURE__*/_jsx("div", _objectSpread(_objectSpread({}, specialProps), {}, {
         style: _objectSpread(_objectSpread({}, multiStyle), {}, {
           width: localWidth,
           visibility: visible
         }),
         ref: childRef,
-        children: _jsx("div", _objectSpread(_objectSpread({}, specialProps), {}, {
+        children: /*#__PURE__*/_jsx("div", _objectSpread(_objectSpread({}, specialProps), {}, {
           ref: contentWrapRef,
           children: content
         }))
       }))
-    })) : _jsx("div", {
+    })) : /*#__PURE__*/_jsx("div", {
       className: "multiLine",
       style: _objectSpread(_objectSpread({}, multiStyle), {}, {
         width: localWidth
       }),
       ref: childRef,
-      children: _jsx("div", {
+      children: /*#__PURE__*/_jsx("div", {
         className: "multi-content-box",
         style: {
           visibility: visible
@@ -146,7 +149,7 @@ var ProTooltip = function ProTooltip(props) {
     if (mode !== 'auto') {
       return null;
     }
-    return line > 1 ? _jsx(AutoMixinMulti, {}) : _jsx(AutoMixinSingle, {});
+    return line > 1 ? /*#__PURE__*/_jsx(AutoMixinMulti, {}) : /*#__PURE__*/_jsx(AutoMixinSingle, {});
   };
   useEffect(function () {
     if (mode === 'auto' && line === 1) {
@@ -162,7 +165,7 @@ var ProTooltip = function ProTooltip(props) {
       var contentWrapDom = childRef.current;
       var contentDom = contentWrapRef.current;
       if (contentWrapDom && contentDom) {
-        if ((contentWrapDom === null || contentWrapDom === void 0 ? void 0 : contentWrapDom.offsetWidth) && (contentDom === null || contentDom === void 0 ? void 0 : contentDom.scrollWidth)) {
+        if (contentWrapDom !== null && contentWrapDom !== void 0 && contentWrapDom.offsetWidth && contentDom !== null && contentDom !== void 0 && contentDom.scrollWidth) {
           setState({
             isShowToolTip: contentDom.scrollWidth > contentDom.offsetWidth,
             specialProps: {
@@ -190,7 +193,7 @@ var ProTooltip = function ProTooltip(props) {
       var contentWrapDom = childRef.current;
       var contentDom = contentWrapRef.current;
       if (contentWrapDom && contentDom) {
-        if (contentWrapDom === null || contentWrapDom === void 0 ? void 0 : contentWrapDom.scrollHeight) {
+        if (contentWrapDom !== null && contentWrapDom !== void 0 && contentWrapDom.scrollHeight) {
           setState({
             isShowToolTip: (contentWrapDom === null || contentWrapDom === void 0 ? void 0 : contentWrapDom.scrollHeight) > lineHeight * Number(line),
             specialProps: {
@@ -237,7 +240,7 @@ var ProTooltip = function ProTooltip(props) {
     'pro-tooltip': true
   }, "".concat(className), className));
   var renderContentBox = function renderContentBox() {
-    return _jsx("div", {
+    return /*#__PURE__*/_jsx("div", {
       className: isMultiLine ? 'multiLine' : 'singleLine',
       style: _objectSpread(_objectSpread({}, multiStyle), {}, {
         width: localWidth
@@ -247,7 +250,7 @@ var ProTooltip = function ProTooltip(props) {
     });
   };
   var renderTooltipContent = function renderTooltipContent() {
-    return _jsx(_Tooltip, _objectSpread(_objectSpread({
+    return /*#__PURE__*/_jsx(Tooltip, _objectSpread(_objectSpread({
       title: text,
       getPopupContainer: function getPopupContainer(triggerNode) {
         // 修复scrollFollowParent为false时tooltip不显示的问题
@@ -255,15 +258,18 @@ var ProTooltip = function ProTooltip(props) {
         return scrollFollowParent ? triggerNode.parentNode : document.body;
       }
     }, restProps), {}, {
-      overlayStyle: mode === 'auto' ? overlayStyle : {},
+      styles: {
+        root: mode === 'auto' ? rootStyles : {}
+      },
       children: renderContentBox()
     }));
   };
   var renderContent = function renderContent() {
     // 自动模式使用专门的渲染逻辑
     if (mode === 'auto') {
-      return _jsx(AutoMixin, {});
+      return /*#__PURE__*/_jsx(AutoMixin, {});
     }
+
     // 响应式宽度模式，根据是否需要显示tooltip决定渲染内容 且 父元素为table
     if (isTable) {
       if (isShowToolTip) {
@@ -271,13 +277,14 @@ var ProTooltip = function ProTooltip(props) {
       }
       return renderContentBox();
     }
+
     // 默认模式始终显示tooltip
     if (mode === 'default') {
       return renderTooltipContent();
     }
     return renderContentBox();
   };
-  return _jsx("div", {
+  return /*#__PURE__*/_jsx("div", {
     className: cls,
     ref: ref,
     style: _objectSpread(_objectSpread(_objectSpread({}, style), multiStyle), {}, {

package/es/ProTooltip/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-tooltip {
   cursor: pointer;

package/es/ProTree/components/AdaptiveTooltip.js

@@ -1,17 +1,16 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
+import { Tooltip } from 'antd';
 import { jsx as _jsx } from "react/jsx-runtime";
 var AdaptiveTooltip = function AdaptiveTooltip(_ref) {
   var children = _ref.children;
-  return _jsx(_Tooltip, {
+  return /*#__PURE__*/_jsx(Tooltip, {
     placement: "rightTop",
-    title: _jsx("div", {
+    title: /*#__PURE__*/_jsx("div", {
       onMouseDown: function onMouseDown(e) {
         return e.stopPropagation();
       },
       children: children
     }),
-    children: _jsx("span", {
+    children: /*#__PURE__*/_jsx("span", {
       className: "pro-tree-wrap-ellipse",
       children: children
     })

package/es/ProTree/components/CloseIcon.js

@@ -1,15 +1,15 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx } from "react/jsx-runtime";
 function CloseIcon(props) {
-  return _jsx("span", _objectSpread(_objectSpread({}, props), {}, {
-    children: _jsx("span", {
+  return /*#__PURE__*/_jsx("span", _objectSpread(_objectSpread({}, props), {}, {
+    children: /*#__PURE__*/_jsx("span", {
       className: "pro-tree-modal-checkbox-close",
       role: "button",
-      children: _jsx("span", {
+      children: /*#__PURE__*/_jsx("span", {
         role: "img",
         "aria-label": "close-circle",
         className: "anticon anticon-close-circle",
-        children: _jsx("svg", {
+        children: /*#__PURE__*/_jsx("svg", {
           viewBox: "64 64 896 896",
           focusable: "false",
           "data-icon": "close-circle",
@@ -17,7 +17,7 @@ function CloseIcon(props) {
           height: "1em",
           fill: "currentColor",
           "aria-hidden": "true",
-          children: _jsx("path", {
+          children: /*#__PURE__*/_jsx("path", {
             d: "M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm165.4 618.2l-66-.3L512 563.4l-99.3 118.4-66.1.3c-4.4 0-8-3.5-8-8 0-1.9.7-3.7 1.9-5.2l130.1-155L340.5 359a8.32 8.32 0 01-1.9-5.2c0-4.4 3.6-8 8-8l66.1.3L512 464.6l99.3-118.4 66-.3c4.4 0 8 3.5 8 8 0 1.9-.7 3.7-1.9 5.2L553.5 514l130 155c1.2 1.5 1.9 3.3 1.9 5.2 0 4.4-3.6 8-8 8z"
           })
         })

package/es/ProTree/components/List.js

@@ -1,12 +1,13 @@
 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";
 import { memo } from 'react';
-import SearchTitle from './SearchTitle';
-import CloseIcon from './CloseIcon';
+import { Checkbox } from 'antd';
+import SearchTitle from "./SearchTitle";
+import CloseIcon from "./CloseIcon";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 function List(props) {
   var checkedValues = props.checkedValues,
     disabled = props.disabled,
@@ -23,8 +24,8 @@ function List(props) {
   var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
   if (mode === 'render') {
-    return _jsx(_Fragment, {
-      children: _jsx(_Checkbox.Group, {
+    return /*#__PURE__*/_jsx(_Fragment, {
+      children: /*#__PURE__*/_jsx(Checkbox.Group, {
         disabled: disabled,
         style: {
           width: '100%'
@@ -32,16 +33,16 @@ function List(props) {
         value: checkedValues,
         children: treeData.map(function (item) {
           var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
-          return _jsx("div", {
+          return /*#__PURE__*/_jsx("div", {
             className: "pro-tree-checkbox-content",
-            children: _jsx(_Checkbox, {
+            children: /*#__PURE__*/_jsx(Checkbox, {
               onChange: function onChange(e) {
                 return handleOnChange(e, item[fieldNameValue]);
               },
               value: item[fieldNameValue],
               disabled: item.disabled,
-              children: _jsx("span", {
-                children: optionRender ? optionRender(item, searchStr) : _jsx(SearchTitle, _objectSpread({
+              children: /*#__PURE__*/_jsx("span", {
+                children: optionRender ? optionRender(item, searchStr) : /*#__PURE__*/_jsx(SearchTitle, _objectSpread({
                   label: title,
                   searchStr: searchStr
                 }, other))
@@ -52,15 +53,15 @@ function List(props) {
       })
     });
   }
-  return _jsx(_Fragment, {
+  return /*#__PURE__*/_jsx(_Fragment, {
     children: treeData.map(function (item) {
       var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
-      return _jsxs("div", {
+      return /*#__PURE__*/_jsxs("div", {
         className: "pro-tree-checkbox-content",
-        children: [_jsx("div", {
+        children: [/*#__PURE__*/_jsx("div", {
           className: "pro-tree-checkbox-content-look",
           children: optionRender ? optionRender(item, searchStr) : title
-        }), disabled ? null : _jsx(CloseIcon, {
+        }), disabled ? null : /*#__PURE__*/_jsx(CloseIcon, {
           onClick: function onClick() {
             return handleFilterClose(item[fieldNameValue]);
           }