diff --git a/admin-ui/package.json b/admin-ui/package.json index db68d47b..bd0d2b33 100644 --- a/admin-ui/package.json +++ b/admin-ui/package.json @@ -6,9 +6,9 @@ "@ant-design/icons": "^5.4.0", "@ant-design/pro-components": "^2.8.7", "@babel/standalone": "^7.25.6", - "@codingapi/flow-pc": "^0.0.37", - "@codingapi/form-pc": "^0.0.37", - "@codingapi/ui-framework": "^0.0.37", + "@codingapi/flow-pc": "^0.0.38", + "@codingapi/form-pc": "^0.0.38", + "@codingapi/ui-framework": "^0.0.38", "@dnd-kit/core": "^6.2.0", "@dnd-kit/sortable": "^9.0.0", "@handsontable/react-wrapper": "^15.0.0", diff --git a/admin-ui/src/config/theme.tsx b/admin-ui/src/config/theme.tsx index 2cfb113c..ce6890db 100644 --- a/admin-ui/src/config/theme.tsx +++ b/admin-ui/src/config/theme.tsx @@ -1,15 +1,5 @@ -import {ThemeConfig} from "antd"; - -export const theme = { - token: { - colorPrimary: '#4a79d8', - } -} as ThemeConfig; - export const config = { - // 主题配置 - theme: theme, // 后台名称 title: 'Admin UI', // 后台logo diff --git a/admin-ui/src/index.tsx b/admin-ui/src/index.tsx index d7d349fb..80e97d1b 100644 --- a/admin-ui/src/index.tsx +++ b/admin-ui/src/index.tsx @@ -6,27 +6,34 @@ import {Provider} from "react-redux"; import store from "@/store/Redux"; import {ConfigProvider} from "antd"; import zhCN from 'antd/es/locale/zh_CN'; -import {theme} from "@/config/theme"; import '@/styles/index.scss'; import "@/config/register.component"; +import {CSSUtils, ThemeConfig, ThemeProvider} from "@codingapi/ui-framework"; const root = ReactDOM.createRoot( document.getElementById('root') as HTMLElement ); +export const theme = { + token: { + colorPrimary: CSSUtils.getRootVariable('--primary-color'), + contentFontSize: CSSUtils.getRootVariable('--content-font-size'), + } +} as ThemeConfig; + + root.render( - - + - + + + - + ); diff --git a/admin-ui/src/styles/index.scss b/admin-ui/src/styles/index.scss index 1d69b157..5070073e 100644 --- a/admin-ui/src/styles/index.scss +++ b/admin-ui/src/styles/index.scss @@ -1,5 +1,5 @@ :root { - --primary-color: #4a79d8; + --primary-color: #094edc; --body-background-color: #fdfdfd; --content-font-size-large: 24px; diff --git a/mobile-ui/package.json b/mobile-ui/package.json index 84220cb5..d45ebafa 100644 --- a/mobile-ui/package.json +++ b/mobile-ui/package.json @@ -4,9 +4,9 @@ "private": true, "dependencies": { "@babel/standalone": "^7.25.6", - "@codingapi/flow-mobile": "^0.0.37", - "@codingapi/form-mobile": "^0.0.37", - "@codingapi/ui-framework": "^0.0.37", + "@codingapi/flow-mobile": "^0.0.38", + "@codingapi/form-mobile": "^0.0.38", + "@codingapi/ui-framework": "^0.0.38", "@logicflow/core": "^2.0.10", "@logicflow/extension": "^2.0.14", "@reduxjs/toolkit": "^2.2.7", diff --git a/mobile-ui/src/styles/index.scss b/mobile-ui/src/styles/index.scss index c33f0200..05bd0fcc 100644 --- a/mobile-ui/src/styles/index.scss +++ b/mobile-ui/src/styles/index.scss @@ -1,5 +1,5 @@ :root { - --primary-color: #4a79d8; + --primary-color: #0f58ea; --body-background-color: #e6e7ea; --content-font-size-large: 24px; @@ -10,6 +10,11 @@ } +:root:root{ + --adm-color-primary: var(--primary-color); +} + + body { margin: 0; padding: 0;