@zat-design/sisyphus-react 3.4.5-beta.10 → 3.4.5-beta.11

package/es/ProIcon/index.js

@@ -1,13 +1,13 @@
 import "antd/es/button/style";
 import _Button from "antd/es/button";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 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";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap", "tooltip"];
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useExternal } from 'ahooks';
+import { useExternal, useLocalStorageState } from 'ahooks';
 import classNames from 'classnames';
 import { uniqBy } from 'lodash';
 import { ReactSVG } from 'react-svg';
@@ -56,6 +56,10 @@ var ProIcon = function ProIcon(props) {
     primaryColor = _ref$primaryColor === void 0 ? '#006AFF' : _ref$primaryColor,
     _ref$qiankunPrimaryCo = _ref.qiankunPrimaryColor,
     qiankunPrimaryColor = _ref$qiankunPrimaryCo === void 0 ? '#006AFF' : _ref$qiankunPrimaryCo;
+  // 本地存储初始化主题
+  var _useLocalStorageState = useLocalStorageState('themeConfig'),
+    _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 1),
+    themeConfig = _useLocalStorageState2[0];
   // 文档内部就不用判断window.top !== window.self了
   var isQiankun =
   // @ts-ignore
@@ -156,6 +160,7 @@ var ProIcon = function ProIcon(props) {
   useEffect(function () {
     // 处于主子应用情况下才会执行下方逻辑，主题色的变更以主框架的为准
     if (actionMap && isQiankun) {
+      var _themeConfig$data;
       observer = new MutationObserver(function (mutationsList) {
         var targetEntries = mutationsList[0];
         if (targetEntries) {
@@ -203,6 +208,19 @@ var ProIcon = function ProIcon(props) {
         attributes: true,
         attributeFilter: ['style']
       });
+      // 未变更时及初始化时
+      var extendFromMainColor = themeConfig === null || themeConfig === void 0 ? 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: primaryColor,
+              qiankunPrimaryColor: extendFromMainColor
+            }
+          }
+        });
+      }
     }
   }, []);
   useEffect(function () {

package/lib/ProIcon/index.js

@@ -60,6 +60,10 @@ var ProIcon = function ProIcon(props) {
     primaryColor = _ref$primaryColor === void 0 ? '#006AFF' : _ref$primaryColor,
     _ref$qiankunPrimaryCo = _ref.qiankunPrimaryColor,
     qiankunPrimaryColor = _ref$qiankunPrimaryCo === void 0 ? '#006AFF' : _ref$qiankunPrimaryCo;
+  // 本地存储初始化主题
+  var _useLocalStorageState = (0, _ahooks.useLocalStorageState)('themeConfig'),
+    _useLocalStorageState2 = (0, _slicedToArray2.default)(_useLocalStorageState, 1),
+    themeConfig = _useLocalStorageState2[0];
   // 文档内部就不用判断window.top !== window.self了
   var isQiankun =
   // @ts-ignore
@@ -160,6 +164,7 @@ var ProIcon = function ProIcon(props) {
   (0, _react.useEffect)(function () {
     // 处于主子应用情况下才会执行下方逻辑，主题色的变更以主框架的为准
     if (actionMap && isQiankun) {
+      var _themeConfig$data;
       observer = new MutationObserver(function (mutationsList) {
         var targetEntries = mutationsList[0];
         if (targetEntries) {
@@ -207,6 +212,19 @@ var ProIcon = function ProIcon(props) {
         attributes: true,
         attributeFilter: ['style']
       });
+      // 未变更时及初始化时
+      var extendFromMainColor = themeConfig === null || themeConfig === void 0 ? 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: primaryColor,
+              qiankunPrimaryColor: extendFromMainColor
+            }
+          }
+        });
+      }
     }
   }, []);
   (0, _react.useEffect)(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.5-beta.10",
+  "version": "3.4.5-beta.11",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",