Skip to content

fix version #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2025
Merged

fix version #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions admin-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 0 additions & 10 deletions admin-ui/src/config/theme.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
23 changes: 15 additions & 8 deletions admin-ui/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
<React.StrictMode>
<Provider store={store}>

<ThemeProvider theme={theme}>
<ConfigProvider
locale={zhCN}
theme={{
...theme
}}
theme={theme}
>
<RoutesProvider/>
<Provider store={store}>
<RoutesProvider/>
</Provider>
</ConfigProvider>
</Provider>
</ThemeProvider>
</React.StrictMode>
);

Expand Down
2 changes: 1 addition & 1 deletion admin-ui/src/styles/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:root {
--primary-color: #4a79d8;
--primary-color: #094edc;
--body-background-color: #fdfdfd;

--content-font-size-large: 24px;
Expand Down
6 changes: 3 additions & 3 deletions mobile-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 6 additions & 1 deletion mobile-ui/src/styles/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:root {
--primary-color: #4a79d8;
--primary-color: #0f58ea;
--body-background-color: #e6e7ea;

--content-font-size-large: 24px;
Expand All @@ -10,6 +10,11 @@
}


:root:root{
--adm-color-primary: var(--primary-color);
}


body {
margin: 0;
padding: 0;
Expand Down