Skip to content

Commit 24ddd85

Browse files
xlornexlorne
committed
fix version
1 parent 4fab298 commit 24ddd85

File tree

22 files changed

+102
-63
lines changed

22 files changed

+102
-63
lines changed

‎admin-ui/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"@ant-design/icons": "^5.4.0",
77
"@ant-design/pro-components": "^2.8.7",
88
"@babel/standalone": "^7.25.6",
9-
"@codingapi/flow-pc": "^0.0.36",
10-
"@codingapi/form-pc": "^0.0.36",
11-
"@codingapi/ui-framework": "^0.0.36",
9+
"@codingapi/flow-pc": "^0.0.37",
10+
"@codingapi/form-pc": "^0.0.37",
11+
"@codingapi/ui-framework": "^0.0.37",
1212
"@dnd-kit/core": "^6.2.0",
1313
"@dnd-kit/sortable": "^9.0.0",
1414
"@handsontable/react-wrapper": "^15.0.0",

‎admin-ui/src/components/flow/PostponedFormView.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ const PostponedFormView:React.FC<PostponedFormProps> = (props)=>{
1313
onCancel: () => {
1414
props.setVisible(false);
1515
},
16-
onClose: () => {
17-
props.setVisible(false);
18-
},
19-
destroyOnClose:true,
16+
destroyOnHidden:true,
2017
}}
2118
onFinish={async (values) => {
2219
props.onFinish(values.hours);

‎admin-ui/src/components/flow/UserSelectView.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ const UserSelectView: React.FC<UserSelectFormProps> = (props) => {
4343
onCancel: () => {
4444
props.setVisible(false);
4545
},
46-
onClose: () => {
47-
props.setVisible(false);
48-
}
46+
destroyOnHidden:true,
4947
}}
5048
onFinish={async (values) => {
5149
const users = values.users;

‎admin-ui/src/config/variables.scss

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎admin-ui/src/index.scss

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎admin-ui/src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import store from "@/store/Redux";
77
import {ConfigProvider} from "antd";
88
import zhCN from 'antd/es/locale/zh_CN';
99
import {theme} from "@/config/theme";
10-
import './index.scss';
10+
import '@/styles/index.scss';
1111
import "@/config/register.component";
1212

1313
const root = ReactDOM.createRoot(

‎admin-ui/src/pages/flow/user/index.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,6 @@ const UserPage = () => {
183183
title={"编辑用户"}
184184
open={visible}
185185
destroyOnHidden={true}
186-
onClose={()=>{
187-
setVisible(false);
188-
}}
189186
onCancel={()=>{
190187
setVisible(false);
191188
}}

‎admin-ui/src/pages/flow/user/select.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ const UserSelect:React.FC<UserSelectProps> = (props) => {
4242
width={"60%"}
4343
open={props.visible}
4444
onCancel={() => props.setVisible(false)}
45-
onClose={() => props.setVisible(false)}
4645
destroyOnHidden={true}
4746
title={"选择用户"}
4847
onOk={() => {

‎admin-ui/src/pages/flow/work/index.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,6 @@ const FlowPage = () => {
196196
title="编辑流程"
197197
open={editorVisible}
198198
destroyOnHidden={true}
199-
onClose={()=>{
200-
setEditorVisible(false)
201-
}}
202199
onCancel={()=>{
203200
setEditorVisible(false)
204201
}}

‎admin-ui/src/pages/flow/work/select.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ const FlowSelect: React.FC<FlowSelectProps> = (props) => {
6262
width={"60%"}
6363
open={props.visible}
6464
onCancel={() => props.setVisible(false)}
65-
onClose={() => props.setVisible(false)}
6665
destroyOnHidden={true}
6766
title={"选择流程"}
6867
onOk={() => {

‎admin-ui/src/styles/index.scss

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
:root {
2+
--primary-color: #4a79d8;
3+
--body-background-color: #fdfdfd;
4+
5+
--content-font-size-large: 24px;
6+
--content-font-size-middle: 16px;
7+
--content-font-size-small: 12px;
8+
9+
--content-font-size: var(--content-font-size-middle);
10+
}
11+
12+
13+
body {
14+
margin: 0;
15+
padding: 0;
16+
-webkit-font-smoothing: antialiased;
17+
-moz-osx-font-smoothing: grayscale;
18+
background-color: var(--body-background-color);
19+
font-size: var(--content-font-size);
20+
}
21+
22+
code {
23+
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
24+
monospace;
25+
}

‎admin-ui/src/styles/mixins.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@mixin flex-center {
2+
display: flex;
3+
justify-content: center;
4+
align-items: center;
5+
width: 100%;
6+
}
7+
8+
@mixin flex-right {
9+
display: flex;
10+
justify-content: right;
11+
align-items: center;
12+
width: 100%;
13+
}

‎admin-ui/src/styles/variable.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// 主题颜色
2+
$theme-primary-color: var(--primary-color, #4a79d8);
3+
// 背景颜色
4+
$body-background-color: var(--body-background-color, #fdfdfd);
5+
6+
// 标题字体大小
7+
$title-font-size: var(--content-font-size-middle, 16px);
8+
// 内容字体大小
9+
$content-font-size:var(--content-font-size, 12px);

‎mobile-ui/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"private": true,
55
"dependencies": {
66
"@babel/standalone": "^7.25.6",
7-
"@codingapi/flow-mobile": "^0.0.36",
8-
"@codingapi/form-mobile": "^0.0.36",
9-
"@codingapi/ui-framework": "^0.0.36",
7+
"@codingapi/flow-mobile": "^0.0.37",
8+
"@codingapi/form-mobile": "^0.0.37",
9+
"@codingapi/ui-framework": "^0.0.37",
1010
"@logicflow/core": "^2.0.10",
1111
"@logicflow/extension": "^2.0.14",
1212
"@reduxjs/toolkit": "^2.2.7",

‎mobile-ui/src/index.scss

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎mobile-ui/src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, {createContext} from 'react';
22
import ReactDOM from 'react-dom/client';
33
import reportWebVitals from './reportWebVitals';
4-
import './index.scss';
4+
import '@/styles/index.scss';
55
import {createHashRouter, RouterProvider} from "react-router-dom";
66
import {routes} from "@/config/route";
77
import zhCN from "antd-mobile/es/locales/zh-CN";

‎mobile-ui/src/layout/Footer/index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use "@/config/variables" as *;
1+
@use "@/styles/variable" as *;
22

33
.page-footer {
44
width: 100%;

‎mobile-ui/src/layout/Header/index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use "@/config/variables" as *;
1+
@use "@/styles/variable" as *;
22

33
.page-header {
44
background-color: white;

‎mobile-ui/src/pages/flow/index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use "@/config/variables" as *;
1+
@use "@/styles/variable" as *;
22

33
$flow-tabs-height: 45px;
44

‎mobile-ui/src/styles/index.scss

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
:root {
2+
--primary-color: #4a79d8;
3+
--body-background-color: #e6e7ea;
4+
5+
--content-font-size-large: 24px;
6+
--content-font-size-middle: 16px;
7+
--content-font-size-small: 12px;
8+
9+
--content-font-size: var(--content-font-size-middle);
10+
}
11+
12+
13+
body {
14+
margin: 0;
15+
padding: 0;
16+
-webkit-font-smoothing: antialiased;
17+
-moz-osx-font-smoothing: grayscale;
18+
background-color: var(--body-background-color);
19+
font-size: var(--content-font-size);
20+
}
21+
22+
code {
23+
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
24+
monospace;
25+
}

‎mobile-ui/src/styles/mixins.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@mixin flex-center {
2+
display: flex;
3+
justify-content: center;
4+
align-items: center;
5+
width: 100%;
6+
}
7+
8+
@mixin flex-right {
9+
display: flex;
10+
justify-content: right;
11+
align-items: center;
12+
width: 100%;
13+
}

‎mobile-ui/src/config/variables.scss renamed to ‎mobile-ui/src/styles/variable.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// 主题颜色
2-
$theme-primary-color: #4a79d8;
2+
$theme-primary-color: var(--primary-color,#4a79d8);
33
// 背景颜色
4-
$body-background-color: #e6e7ea;
4+
$body-background-color: var(--body-background-color,#e6e7ea);
55
// header颜色
66
$header-background-color: white;
77
// FormPlaceholder颜色
@@ -13,6 +13,6 @@ $page-footer-height: 50px;
1313
// 页面内容区域的高度
1414
$page-content-height: calc(100vh - #{$page-header-height} - #{$page-footer-height});
1515
// 标题字体大小
16-
$title-font-size: 16px;
16+
$title-font-size: var(--content-font-size-middle,16px);
1717
// 内容字体大小
18-
$content-font-size:14px;
18+
$content-font-size:var(--content-font-size,12px);

0 commit comments

Comments
 (0)