diff --git a/admin-ui/package.json b/admin-ui/package.json index 024f2be0..db68d47b 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.36", - "@codingapi/form-pc": "^0.0.36", - "@codingapi/ui-framework": "^0.0.36", + "@codingapi/flow-pc": "^0.0.37", + "@codingapi/form-pc": "^0.0.37", + "@codingapi/ui-framework": "^0.0.37", "@dnd-kit/core": "^6.2.0", "@dnd-kit/sortable": "^9.0.0", "@handsontable/react-wrapper": "^15.0.0", diff --git a/admin-ui/src/components/flow/PostponedFormView.tsx b/admin-ui/src/components/flow/PostponedFormView.tsx index 2b571a5c..23c70af3 100644 --- a/admin-ui/src/components/flow/PostponedFormView.tsx +++ b/admin-ui/src/components/flow/PostponedFormView.tsx @@ -13,10 +13,7 @@ const PostponedFormView:React.FC = (props)=>{ onCancel: () => { props.setVisible(false); }, - onClose: () => { - props.setVisible(false); - }, - destroyOnClose:true, + destroyOnHidden:true, }} onFinish={async (values) => { props.onFinish(values.hours); diff --git a/admin-ui/src/components/flow/UserSelectView.tsx b/admin-ui/src/components/flow/UserSelectView.tsx index 704e20df..82c7f7f4 100644 --- a/admin-ui/src/components/flow/UserSelectView.tsx +++ b/admin-ui/src/components/flow/UserSelectView.tsx @@ -43,9 +43,7 @@ const UserSelectView: React.FC = (props) => { onCancel: () => { props.setVisible(false); }, - onClose: () => { - props.setVisible(false); - } + destroyOnHidden:true, }} onFinish={async (values) => { const users = values.users; diff --git a/admin-ui/src/config/variables.scss b/admin-ui/src/config/variables.scss deleted file mode 100644 index db056393..00000000 --- a/admin-ui/src/config/variables.scss +++ /dev/null @@ -1,9 +0,0 @@ -// 主题颜色 -$theme-primary-color: #4a79d8; -// 背景颜色 -$body-background-color: #e6e7ea; - -// 标题字体大小 -$title-font-size: 16px; -// 内容字体大小 -$content-font-size:14px; diff --git a/admin-ui/src/index.scss b/admin-ui/src/index.scss deleted file mode 100644 index 4109e9ba..00000000 --- a/admin-ui/src/index.scss +++ /dev/null @@ -1,10 +0,0 @@ -body { - margin: 0; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; -} diff --git a/admin-ui/src/index.tsx b/admin-ui/src/index.tsx index 3cbfbf44..d7d349fb 100644 --- a/admin-ui/src/index.tsx +++ b/admin-ui/src/index.tsx @@ -7,7 +7,7 @@ import store from "@/store/Redux"; import {ConfigProvider} from "antd"; import zhCN from 'antd/es/locale/zh_CN'; import {theme} from "@/config/theme"; -import './index.scss'; +import '@/styles/index.scss'; import "@/config/register.component"; const root = ReactDOM.createRoot( diff --git a/admin-ui/src/pages/flow/user/index.tsx b/admin-ui/src/pages/flow/user/index.tsx index 4e529e2a..e1d14bc9 100644 --- a/admin-ui/src/pages/flow/user/index.tsx +++ b/admin-ui/src/pages/flow/user/index.tsx @@ -183,9 +183,6 @@ const UserPage = () => { title={"编辑用户"} open={visible} destroyOnHidden={true} - onClose={()=>{ - setVisible(false); - }} onCancel={()=>{ setVisible(false); }} diff --git a/admin-ui/src/pages/flow/user/select.tsx b/admin-ui/src/pages/flow/user/select.tsx index 16b26f09..2bfcab36 100644 --- a/admin-ui/src/pages/flow/user/select.tsx +++ b/admin-ui/src/pages/flow/user/select.tsx @@ -42,7 +42,6 @@ const UserSelect:React.FC = (props) => { width={"60%"} open={props.visible} onCancel={() => props.setVisible(false)} - onClose={() => props.setVisible(false)} destroyOnHidden={true} title={"选择用户"} onOk={() => { diff --git a/admin-ui/src/pages/flow/work/index.tsx b/admin-ui/src/pages/flow/work/index.tsx index a7ffc002..4d244a20 100644 --- a/admin-ui/src/pages/flow/work/index.tsx +++ b/admin-ui/src/pages/flow/work/index.tsx @@ -196,9 +196,6 @@ const FlowPage = () => { title="编辑流程" open={editorVisible} destroyOnHidden={true} - onClose={()=>{ - setEditorVisible(false) - }} onCancel={()=>{ setEditorVisible(false) }} diff --git a/admin-ui/src/pages/flow/work/select.tsx b/admin-ui/src/pages/flow/work/select.tsx index 85f5ab9a..c0e5405f 100644 --- a/admin-ui/src/pages/flow/work/select.tsx +++ b/admin-ui/src/pages/flow/work/select.tsx @@ -62,7 +62,6 @@ const FlowSelect: React.FC = (props) => { width={"60%"} open={props.visible} onCancel={() => props.setVisible(false)} - onClose={() => props.setVisible(false)} destroyOnHidden={true} title={"选择流程"} onOk={() => { diff --git a/admin-ui/src/styles/index.scss b/admin-ui/src/styles/index.scss new file mode 100644 index 00000000..1d69b157 --- /dev/null +++ b/admin-ui/src/styles/index.scss @@ -0,0 +1,25 @@ +:root { + --primary-color: #4a79d8; + --body-background-color: #fdfdfd; + + --content-font-size-large: 24px; + --content-font-size-middle: 16px; + --content-font-size-small: 12px; + + --content-font-size: var(--content-font-size-middle); +} + + +body { + margin: 0; + padding: 0; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + background-color: var(--body-background-color); + font-size: var(--content-font-size); +} + +code { + font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', + monospace; +} diff --git a/admin-ui/src/styles/mixins.scss b/admin-ui/src/styles/mixins.scss new file mode 100644 index 00000000..6027f078 --- /dev/null +++ b/admin-ui/src/styles/mixins.scss @@ -0,0 +1,13 @@ +@mixin flex-center { + display: flex; + justify-content: center; + align-items: center; + width: 100%; +} + +@mixin flex-right { + display: flex; + justify-content: right; + align-items: center; + width: 100%; +} \ No newline at end of file diff --git a/admin-ui/src/styles/variable.scss b/admin-ui/src/styles/variable.scss new file mode 100644 index 00000000..222b64a3 --- /dev/null +++ b/admin-ui/src/styles/variable.scss @@ -0,0 +1,9 @@ +// 主题颜色 +$theme-primary-color: var(--primary-color, #4a79d8); +// 背景颜色 +$body-background-color: var(--body-background-color, #fdfdfd); + +// 标题字体大小 +$title-font-size: var(--content-font-size-middle, 16px); +// 内容字体大小 +$content-font-size:var(--content-font-size, 12px); diff --git a/mobile-ui/package.json b/mobile-ui/package.json index 471d1627..84220cb5 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.36", - "@codingapi/form-mobile": "^0.0.36", - "@codingapi/ui-framework": "^0.0.36", + "@codingapi/flow-mobile": "^0.0.37", + "@codingapi/form-mobile": "^0.0.37", + "@codingapi/ui-framework": "^0.0.37", "@logicflow/core": "^2.0.10", "@logicflow/extension": "^2.0.14", "@reduxjs/toolkit": "^2.2.7", diff --git a/mobile-ui/src/index.scss b/mobile-ui/src/index.scss deleted file mode 100644 index c3bdded7..00000000 --- a/mobile-ui/src/index.scss +++ /dev/null @@ -1,14 +0,0 @@ -@use "config/variables" as *; - -body { - margin: 0; - padding: 0; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - background-color: $body-background-color; -} - -code { - font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", - monospace; -} diff --git a/mobile-ui/src/index.tsx b/mobile-ui/src/index.tsx index d58a42ce..9f12d458 100644 --- a/mobile-ui/src/index.tsx +++ b/mobile-ui/src/index.tsx @@ -1,7 +1,7 @@ import React, {createContext} from 'react'; import ReactDOM from 'react-dom/client'; import reportWebVitals from './reportWebVitals'; -import './index.scss'; +import '@/styles/index.scss'; import {createHashRouter, RouterProvider} from "react-router-dom"; import {routes} from "@/config/route"; import zhCN from "antd-mobile/es/locales/zh-CN"; diff --git a/mobile-ui/src/layout/Footer/index.scss b/mobile-ui/src/layout/Footer/index.scss index 37632510..7b919ec3 100644 --- a/mobile-ui/src/layout/Footer/index.scss +++ b/mobile-ui/src/layout/Footer/index.scss @@ -1,4 +1,4 @@ -@use "@/config/variables" as *; +@use "@/styles/variable" as *; .page-footer { width: 100%; diff --git a/mobile-ui/src/layout/Header/index.scss b/mobile-ui/src/layout/Header/index.scss index 94502c3c..63e5af71 100644 --- a/mobile-ui/src/layout/Header/index.scss +++ b/mobile-ui/src/layout/Header/index.scss @@ -1,4 +1,4 @@ -@use "@/config/variables" as *; +@use "@/styles/variable" as *; .page-header { background-color: white; diff --git a/mobile-ui/src/pages/flow/index.scss b/mobile-ui/src/pages/flow/index.scss index 1972909f..55d2c0bd 100644 --- a/mobile-ui/src/pages/flow/index.scss +++ b/mobile-ui/src/pages/flow/index.scss @@ -1,4 +1,4 @@ -@use "@/config/variables" as *; +@use "@/styles/variable" as *; $flow-tabs-height: 45px; diff --git a/mobile-ui/src/styles/index.scss b/mobile-ui/src/styles/index.scss new file mode 100644 index 00000000..c33f0200 --- /dev/null +++ b/mobile-ui/src/styles/index.scss @@ -0,0 +1,25 @@ +:root { + --primary-color: #4a79d8; + --body-background-color: #e6e7ea; + + --content-font-size-large: 24px; + --content-font-size-middle: 16px; + --content-font-size-small: 12px; + + --content-font-size: var(--content-font-size-middle); +} + + +body { + margin: 0; + padding: 0; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + background-color: var(--body-background-color); + font-size: var(--content-font-size); +} + +code { + font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", + monospace; +} diff --git a/mobile-ui/src/styles/mixins.scss b/mobile-ui/src/styles/mixins.scss new file mode 100644 index 00000000..6027f078 --- /dev/null +++ b/mobile-ui/src/styles/mixins.scss @@ -0,0 +1,13 @@ +@mixin flex-center { + display: flex; + justify-content: center; + align-items: center; + width: 100%; +} + +@mixin flex-right { + display: flex; + justify-content: right; + align-items: center; + width: 100%; +} \ No newline at end of file diff --git a/mobile-ui/src/config/variables.scss b/mobile-ui/src/styles/variable.scss similarity index 64% rename from mobile-ui/src/config/variables.scss rename to mobile-ui/src/styles/variable.scss index f55d467c..4202a649 100644 --- a/mobile-ui/src/config/variables.scss +++ b/mobile-ui/src/styles/variable.scss @@ -1,7 +1,7 @@ // 主题颜色 -$theme-primary-color: #4a79d8; +$theme-primary-color: var(--primary-color,#4a79d8); // 背景颜色 -$body-background-color: #e6e7ea; +$body-background-color: var(--body-background-color,#e6e7ea); // header颜色 $header-background-color: white; // FormPlaceholder颜色 @@ -13,6 +13,6 @@ $page-footer-height: 50px; // 页面内容区域的高度 $page-content-height: calc(100vh - #{$page-header-height} - #{$page-footer-height}); // 标题字体大小 -$title-font-size: 16px; +$title-font-size: var(--content-font-size-middle,16px); // 内容字体大小 -$content-font-size:14px; +$content-font-size:var(--content-font-size,12px); \ No newline at end of file