diff --git a/react-ui/.storybook/preview.tsx b/react-ui/.storybook/preview.tsx
index 0ec22de0..33335bcf 100644
--- a/react-ui/.storybook/preview.tsx
+++ b/react-ui/.storybook/preview.tsx
@@ -5,6 +5,7 @@ import type { Preview } from '@storybook/react';
import { App, ConfigProvider } from 'antd';
import zhCN from 'antd/locale/zh_CN';
import { initialize, mswLoader } from 'msw-storybook-addon';
+import { addAlpha } from '../src/utils/color';
import { createWebSocketMock } from './mock/websocket.mock';
import './storybook.css';
@@ -61,14 +62,14 @@ const preview: Preview = {
},
components: {
Button: {
- defaultBg: 'rgba(22, 100, 255, 0.06)',
- defaultBorderColor: 'rgba(22, 100, 255, 0.11)',
+ defaultBg: addAlpha(themes['primaryColor'], 0.06),
+ defaultBorderColor: addAlpha(themes['primaryColor'], 0.11),
defaultColor: themes['textColor'],
- defaultHoverBg: 'rgba(22, 100, 255, 0.06)',
- defaultHoverBorderColor: 'rgba(22, 100, 255, 0.5)',
- defaultHoverColor: '#3F7FFF ',
- defaultActiveBg: 'rgba(22, 100, 255, 0.12)',
- defaultActiveBorderColor: 'rgba(22, 100, 255, 0.75)',
+ defaultHoverBg: addAlpha(themes['primaryColor'], 0.06),
+ defaultHoverBorderColor: addAlpha(themes['primaryColor'], 0.5),
+ defaultHoverColor: themes['primaryHoverColor'],
+ defaultActiveBg: addAlpha(themes['primaryColor'], 0.12),
+ defaultActiveBorderColor: addAlpha(themes['primaryColor'], 0.75),
defaultActiveColor: themes['primaryColor'],
contentFontSize: parseInt(themes['fontSize']),
},
diff --git a/react-ui/src/components/ParameterSelect/index.tsx b/react-ui/src/components/ParameterSelect/index.tsx
index bb23bc06..13d304c3 100644
--- a/react-ui/src/components/ParameterSelect/index.tsx
+++ b/react-ui/src/components/ParameterSelect/index.tsx
@@ -7,12 +7,11 @@
import jccResourceState, { getResourceTypes } from '@/state/jcdResource';
import systemResourceState, { getSystemResources } from '@/state/systemResource';
import { to } from '@/utils/promise';
-import { useSnapshot } from '@umijs/max';
import { Select, type SelectProps } from 'antd';
import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useSnapshot } from 'valtio';
import FormInfo from '../FormInfo';
import { paramSelectConfig, type ParameterSelectDataType } from './config';
-
export { ParameterSelectTypeList, type ParameterSelectDataType } from './config';
export type ParameterSelectObject = {
diff --git a/react-ui/src/iconfont/iconfont-menu.js b/react-ui/src/iconfont/iconfont-menu.js
index 6e58b648..ae0b20d7 100644
--- a/react-ui/src/iconfont/iconfont-menu.js
+++ b/react-ui/src/iconfont/iconfont-menu.js
@@ -1 +1 @@
-window._iconfont_svg_string_5014610='',(t=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var e,o,n,i,c,d=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}e=function(){var a,l=document.createElement("div");l.innerHTML=t._iconfont_svg_string_5014610,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?d(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(e,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),e()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(n=e,i=t.document,c=!1,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,h())})}function h(){c||(c=!0,n())}function m(){try{i.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}h()}})(window);
\ No newline at end of file
+window._iconfont_svg_string_5014610='',(t=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var e,o,n,i,c,d=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}e=function(){var a,l=document.createElement("div");l.innerHTML=t._iconfont_svg_string_5014610,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?d(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(e,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),e()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(n=e,i=t.document,c=!1,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,h())})}function h(){c||(c=!0,n())}function m(){try{i.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}h()}})(window);
\ No newline at end of file
diff --git a/react-ui/src/state/jcdResource.ts b/react-ui/src/state/jcdResource.ts
index 1c53e5f9..002be5d8 100644
--- a/react-ui/src/state/jcdResource.ts
+++ b/react-ui/src/state/jcdResource.ts
@@ -5,7 +5,7 @@ import {
jccLoginReq,
} from '@/services/external';
import { to } from '@/utils/promise';
-import { proxy } from '@umijs/max';
+import { proxy } from 'valtio';
export type JCCResourceRange = {
type: string;
diff --git a/react-ui/src/state/systemResource.ts b/react-ui/src/state/systemResource.ts
index 0d7d6b15..5f114f80 100644
--- a/react-ui/src/state/systemResource.ts
+++ b/react-ui/src/state/systemResource.ts
@@ -7,8 +7,8 @@
import { getComputingResourceReq } from '@/services/pipeline';
import { ComputingResource } from '@/types';
import { to } from '@/utils/promise';
-import { proxy } from '@umijs/max';
import { type SelectProps } from 'antd';
+import { proxy } from 'valtio';
/** 过滤资源规格 */
export const filterResourceStandard: SelectProps['filterOption'] = (