fix version

xlorne · xlorne · commit 24ddd85f3eb7 · 2025-05-19T22:07:30.000+08:00
diff --git 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
@@ -13,10 +13,7 @@ const PostponedFormView:React.FC<PostponedFormProps> = (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
@@ -43,9 +43,7 @@ const UserSelectView: React.FC<UserSelectFormProps> = (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
diff --git a/admin-ui/src/index.scss b/admin-ui/src/index.scss
diff --git 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
@@ -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
@@ -42,7 +42,6 @@ const UserSelect:React.FC<UserSelectProps> = (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
@@ -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
@@ -62,7 +62,6 @@ const FlowSelect: React.FC<FlowSelectProps> = (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
@@ -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
@@ -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%;
+}
diff --git a/admin-ui/src/styles/variable.scss 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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%;
+}
diff --git a/mobile-ui/src/styles/variable.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);
