@zat-design/sisyphus-react 4.0.8 → 4.0.10

package/lib/ProThemeTools/utils/index.js

@@ -3,12 +3,60 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setThemes = exports.setTableNoStripe = exports.setTableBorder = exports.getMapKebabCase = exports.getMapHumpCase = exports.getKebabCase = exports.getAntd5ThemeConfig = exports.convertToAntd5Tokens = void 0;
+exports.setThemes = exports.setThemeUpdatersGetter = exports.setTableNoStripe = exports.setTableBorder = exports.getPendingThemes = exports.getMapKebabCase = exports.getMapHumpCase = exports.getKebabCase = exports.getAntd5ThemeConfig = exports.convertToAntd5Tokens = exports.clearPendingThemes = void 0;
+var _ThemeContext = require("../context/ThemeContext");
+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; }
 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; }
 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); }
+// 动态导入 getThemeUpdaters，避免循环依赖
+// 保留向后兼容性，但优先使用 ThemeContext 中的 getThemeUpdaters
+var getThemeUpdaters = null;
+
+// 设置 getThemeUpdaters 函数（由 index.tsx 调用，用于向后兼容）
+var setThemeUpdatersGetter = getter => {
+  getThemeUpdaters = getter;
+};
+
+// 保存待应用的主题配置（用于 ThemeProvider 初始化前设置的主题）
+exports.setThemeUpdatersGetter = setThemeUpdatersGetter;
+var pendingThemes = null;
+
+// 获取待应用的主题配置
+var getPendingThemes = () => {
+  return pendingThemes;
+};
+
+// 清除待应用的主题配置
+exports.getPendingThemes = getPendingThemes;
+var clearPendingThemes = () => {
+  pendingThemes = null;
+};
+
+// 获取主题更新函数的统一入口
+// 优先使用 ThemeContext 中的 getThemeUpdaters，如果不可用则使用局部变量
+exports.clearPendingThemes = clearPendingThemes;
+var getThemeUpdatersWrapper = () => {
+  try {
+    // 优先使用 ThemeContext 中的 getThemeUpdaters（不依赖 ProThemeTools 组件）
+    var contextUpdaters = (0, _ThemeContext.getThemeUpdaters)();
+    if (contextUpdaters && (contextUpdaters.updateAntdConfig || contextUpdaters.updateCssVariables || contextUpdaters.updateLocalConfig)) {
+      return contextUpdaters;
+    }
+  } catch (e) {
+    // ThemeContext 可能还未初始化，继续使用局部变量
+  }
+  // 回退到局部变量（向后兼容）
+  return getThemeUpdaters ? getThemeUpdaters() : null;
+};
+
 /** antd5 主题配置 mapping */
 var antd5ConfigMapping = {
   'zaui-brand': 'colorPrimary'
@@ -37,7 +85,8 @@ var convertToAntd5Tokens = (themes, themeMapping) => {
 
 /**
  * 设置主题变量 - antd5 兼容版本
- * 只设置 CSS 变量，不再使用 ConfigProvider.config
+ * 设置 CSS 变量，并同步更新 Context 的 antdConfig
+ * @param themes 主题配置对象，会自动过滤掉 antdConfig
  */
 exports.convertToAntd5Tokens = convertToAntd5Tokens;
 var setThemes = themes => {
@@ -45,11 +94,80 @@ var setThemes = themes => {
     return false;
   }
 
-  // 只设置 CSS 变量，主题配置通过 Context 管理
-  var list = Object.entries(themes);
-  list.forEach(item => {
-    document.documentElement.style.setProperty(`--${item[0]}`, item[1]);
+  // 过滤掉 antdConfig，它只用于 Ant Design ConfigProvider，不应作为 CSS 变量
+  var filteredThemes = Object.entries(themes).filter(_ref => {
+    var _ref2 = _slicedToArray(_ref, 1),
+      key = _ref2[0];
+    return key !== 'antdConfig';
   });
+  if (!filteredThemes.length) {
+    return false;
+  }
+
+  // 设置 CSS 变量
+  filteredThemes.forEach(_ref3 => {
+    var _ref4 = _slicedToArray(_ref3, 2),
+      key = _ref4[0],
+      value = _ref4[1];
+    // 确保值是字符串或数字，对象类型不应作为 CSS 变量
+    if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+      var cssVarName = `--${key}`;
+      var cssVarValue = String(value);
+      document.documentElement.style.setProperty(cssVarName, cssVarValue);
+    }
+  });
+
+  // 同步更新 Context（如果已注册）
+  // 使用统一的获取函数，优先使用 ThemeContext 中的更新函数
+  var updaters = getThemeUpdatersWrapper();
+  if (updaters) {
+    // 更新 CSS 变量到 Context
+    if (updaters.updateCssVariables) {
+      updaters.updateCssVariables(filteredThemes.reduce((acc, _ref5) => {
+        var _ref6 = _slicedToArray(_ref5, 2),
+          key = _ref6[0],
+          value = _ref6[1];
+        if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+          acc[key] = value;
+        }
+        return acc;
+      }, {}));
+    }
+
+    // 如果设置了 zaui-brand，同步更新 antdConfig
+    var zauiBrand = themes['zaui-brand'];
+    if (zauiBrand && typeof zauiBrand === 'string' && updaters.updateAntdConfig) {
+      var antdConfig = convertToAntd5Tokens({
+        'zaui-brand': zauiBrand
+      });
+      updaters.updateAntdConfig(antdConfig);
+    }
+
+    // 更新本地配置（将 kebab-case 转换为驼峰格式）
+    if (updaters.updateLocalConfig) {
+      var localConfig = {};
+      filteredThemes.forEach(_ref7 => {
+        var _ref8 = _slicedToArray(_ref7, 2),
+          key = _ref8[0],
+          value = _ref8[1];
+        if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+          // 将 kebab-case 转换为驼峰格式
+          var camelKey = key.replace(/-(\w)/g, (_, letter) => letter.toUpperCase());
+          if (camelKey === 'zauiBrand') {
+            localConfig.zauiBrand = value;
+          }
+        }
+      });
+      if (Object.keys(localConfig).length > 0) {
+        updaters.updateLocalConfig(localConfig);
+      }
+    }
+    // 清除待应用的主题配置（因为已经应用了）
+    pendingThemes = null;
+  } else {
+    // 如果更新函数不可用，保存主题配置，等待 ThemeProvider 初始化后应用
+    pendingThemes = _objectSpread({}, themes);
+  }
   return true;
 };
 

package/lib/index.d.ts

@@ -27,20 +27,21 @@ export { default as ProAction } from './ProAction';
 export * from './ProConfigProvider';
 export * from './locale';
 export { default as ProBackBtn } from './ProLayout/components/ProHeader/components/ProBackBtn';
+export type { ProConfigProviderType } from './ProConfigProvider';
 export type { ProFormType, ProColumnProps, ProFormColumnType } from './ProForm/propsType';
 export type { ProFormComponentType } from './ProForm/components';
-export type { ProTableType, ProTableColumnType, ProTableSummaryType, ProTableUseAntdTableType, ProTableProps, ProTableSummaryProps, ProTableColumn, UseAntdTableState } from './ProTable/propsType';
+export type { ProTableType, ProTableColumnType, ProTableSummaryType, ProTableUseAntdTableType, ProTableProps, ProTableSummaryProps, ProTableColumn, UseAntdTableState, } from './ProTable/propsType';
 export type { ProUploadType, ProUploadProps } from './ProUpload/propsType';
 export type { ProTabsType, ProTabsItemType, ProTabsProps, ProTabsItemsProps } from './ProTabs/propType';
-export type { BreadcrumbColumnType, SubDescribeColumnType, DescribeColumnType, ProHeaderType, ProHeaderProps, BreadcrumbColumnsProps, SubDescribeColumnsProps, DescribeColumnsProps } from './ProLayout/components/ProHeader/PropTypes';
+export type { BreadcrumbColumnType, SubDescribeColumnType, DescribeColumnType, ProHeaderType, ProHeaderProps, BreadcrumbColumnsProps, SubDescribeColumnsProps, DescribeColumnsProps, } from './ProLayout/components/ProHeader/PropTypes';
 export type { ProLayoutTabsInstance, AddTabParams, AddTabOptions } from './ProLayout/propTypes';
 export type { ProTooltipType, ProTooltipProps } from './ProTooltip/propsType';
 export type { ProIconType, ProIconProps } from './ProIcon/propsTypes';
 export type { ProTreeType, ProTreeSelectType, ProTreeProps, PropTreeSelectProps } from './ProTree/propsType';
-export type { ProTreeModalType, ProTreeModalActionType, ProTreeModalProps, ProTreeModalAction } from './ProTreeModal/propsType';
-export type { ProEditTableType, ProEditTableColumnType, ProEditTableSummaryColumnType, ProEditTableSummaryConfigType, ProEditTableActionType, ProEditTableProps, ProEditTableColumnsProps, SummaryProps, SummaryColumnProps, BaseActionProps } from './ProEditTable/propsType';
-export type { ProStepType, ProStepContextType, ProStepItemType, ProStepPropsType, ProStepItemPropsType } from './ProStep/propsType';
+export type { ProTreeModalType, ProTreeModalActionType, ProTreeModalProps, ProTreeModalAction, } from './ProTreeModal/propsType';
+export type { ProEditTableType, ProEditTableColumnType, ProEditTableSummaryColumnType, ProEditTableSummaryConfigType, ProEditTableActionType, ProEditTableProps, ProEditTableColumnsProps, SummaryProps, SummaryColumnProps, BaseActionProps, } from './ProEditTable/propsType';
+export type { ProStepType, ProStepContextType, ProStepItemType, ProStepPropsType, ProStepItemPropsType, } from './ProStep/propsType';
 export type { ProDrawerFormType, ProDrawerFormPropsType } from './ProDrawerForm/propsType';
-export type { ProModalSelectType, ProModalSelectConfigType, ProModalSelectPropsType } from './ProForm/components/combination/ProModalSelect/propsType';
+export type { ProModalSelectType, ProModalSelectConfigType, ProModalSelectPropsType, } from './ProForm/components/combination/ProModalSelect/propsType';
 export type { ProStepTabType, ProStepTabResultType } from './ProStepTab/propsType';
 export * from './tokens';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.0.8",
+  "version": "4.0.10",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",