Skip to content
Merged

Dev #16

Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion flow-engine-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.codingapi.flow</groupId>
<artifactId>flow-engine-parent</artifactId>
<version>0.0.1</version>
<version>0.0.2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flow-engine-framework/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.codingapi.flow</groupId>
<artifactId>flow-engine-parent</artifactId>
<version>0.0.1</version>
<version>0.0.2</version>
</parent>

<name>flow-engine-framework</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-engine-starter-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.codingapi.flow</groupId>
<artifactId>flow-engine-parent</artifactId>
<version>0.0.1</version>
<version>0.0.2</version>
</parent>

<name>flow-engine-starter-api</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-engine-starter-infra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.codingapi.flow</groupId>
<artifactId>flow-engine-parent</artifactId>
<version>0.0.1</version>
<version>0.0.2</version>
</parent>

<name>flow-engine-starter-infra</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-engine-starter-query/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.codingapi.flow</groupId>
<artifactId>flow-engine-parent</artifactId>
<version>0.0.1</version>
<version>0.0.2</version>
</parent>

<name>flow-engine-starter-query</name>
Expand Down
2 changes: 1 addition & 1 deletion flow-engine-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.codingapi.flow</groupId>
<artifactId>flow-engine-parent</artifactId>
<version>0.0.1</version>
<version>0.0.2</version>
</parent>

<name>flow-engine-starter</name>
Expand Down
53 changes: 38 additions & 15 deletions frontend/apps/app-pc/rsbuild.config.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,43 @@
import { defineConfig } from '@rsbuild/core';
import { pluginReact } from '@rsbuild/plugin-react';
import {defineConfig} from '@rsbuild/core';
import {pluginReact} from '@rsbuild/plugin-react';
import {pluginLess} from '@rsbuild/plugin-less';
import {pluginSass} from '@rsbuild/plugin-sass';
import * as path from "path";

// Docs: https://rsbuild.rs/config/
export default defineConfig({
plugins: [pluginReact()],
resolve: {
alias: {
"@/": path.resolve(__dirname, "src"),
}
},
server: {
proxy: {
'/api': 'http://127.0.0.1:8090',
'/open': 'http://127.0.0.1:8090',
'/user': 'http://127.0.0.1:8090',
}
}
plugins: [pluginReact(), pluginLess(), pluginSass()],
resolve: {
alias: {
"@/": path.resolve(__dirname, "src"),
}
},

source: {
entry: {
index: ['./src/index.tsx'],
},

/**
* support inversify @injectable() and @inject decorators
*/
decorators: {
version: 'legacy',
},
},
server: {
proxy: {
'/api': 'http://127.0.0.1:8090',
'/open': 'http://127.0.0.1:8090',
'/user': 'http://127.0.0.1:8090',
}
},
tools: {
rspack: {
/**
* ignore warnings from @coze-editor/editor/language-typescript
*/
ignoreWarnings: [/Critical dependency: the request of a dependency is an expression/],
},
},
});
4 changes: 4 additions & 0 deletions frontend/apps/app-pc/src/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
body {
padding: 0 !important;
border: 0 !important;
}
1 change: 1 addition & 0 deletions frontend/apps/app-pc/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {ConfigProvider} from "antd";
import zhCN from 'antd/locale/zh_CN';
import dayjs from 'dayjs';
import 'dayjs/locale/zh-cn';
import "./index.css";

dayjs.locale('zh');

Expand Down
2 changes: 2 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
"packageManager": "pnpm@10.27.0",
"devDependencies": {
"@rsbuild/core": "^1.7.2",
"@rsbuild/plugin-less": "^1.6.0",
"@rsbuild/plugin-react": "^1.4.2",
"@rsbuild/plugin-sass": "^1.5.0",
"@rslib/core": "^0.19.3",
"@types/node": "^25.0.10",
"@types/react": "^18.3.18",
Expand Down
12 changes: 10 additions & 2 deletions frontend/packages/flow-design/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,22 @@
"@ant-design/icons": "~6.1.0",
"@flow-engine/flow-core": "workspace:*",
"@flow-engine/flow-types": "workspace:*",
"@flowgram.ai/export-plugin": "1.0.7",
"@flowgram.ai/fixed-layout-editor": "1.0.7",
"@flowgram.ai/fixed-semi-materials": "1.0.7",
"@flowgram.ai/minimap-plugin": "1.0.7",
"@reduxjs/toolkit": "^2.11.2",
"antd": "^6.2.1",
"dayjs": "^1.11.19",
"immer": "^11.1.3",
"react-redux": "^9.2.0"
"lodash-es": "^4.17.23",
"react-redux": "^9.2.0",
"styled-components": "^5.3.11"
},
"devDependencies": {
"@flow-engine/flow-core": "workspace:*",
"@flow-engine/flow-types": "workspace:*"
"@flow-engine/flow-types": "workspace:*",
"@types/lodash-es": "^4.17.12",
"@types/styled-components": "^5.1.36"
}
}
4 changes: 3 additions & 1 deletion frontend/packages/flow-design/rslib.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { pluginReact } from '@rsbuild/plugin-react';
import { defineConfig } from '@rslib/core';
import {pluginSass} from '@rsbuild/plugin-sass';
import {pluginLess} from '@rsbuild/plugin-less';
import * as path from 'node:path';

export default defineConfig({
Expand All @@ -23,5 +25,5 @@ export default defineConfig({
output: {
target: 'web',
},
plugins: [pluginReact()],
plugins: [pluginReact(),pluginSass(),pluginLess()],
});
36 changes: 36 additions & 0 deletions frontend/packages/flow-design/src/assets/icon-mouse.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
export function IconMouse(props: { width?: number; height?: number }) {
const { width, height } = props;
return (
<svg
width={width || 34}
height={height || 52}
viewBox="0 0 34 52"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M30.9998 16.6666V35.3333C30.9998 37.5748 30.9948 38.4695 30.9 39.1895C30.2108 44.4247 26.0912 48.5443 20.856 49.2335C20.1361 49.3283 19.2413 49.3333 16.9998 49.3333C14.7584 49.3333 13.8636 49.3283 13.1437 49.2335C7.90847 48.5443 3.78888 44.4247 3.09965 39.1895C3.00487 38.4695 2.99984 37.5748 2.99984 35.3333V16.6666C2.99984 14.4252 3.00487 13.5304 3.09965 12.8105C3.78888 7.57528 7.90847 3.45569 13.1437 2.76646C13.7232 2.69017 14.4159 2.67202 15.8332 2.66785V9.86573C14.4738 10.3462 13.4998 11.6426 13.4998 13.1666V17.8332C13.4998 19.3571 14.4738 20.6536 15.8332 21.1341V23.6666C15.8332 24.3109 16.3555 24.8333 16.9998 24.8333C17.6442 24.8333 18.1665 24.3109 18.1665 23.6666V21.1341C19.5259 20.6536 20.4998 19.3572 20.4998 17.8332V13.1666C20.4998 11.6426 19.5259 10.3462 18.1665 9.86571V2.66785C19.5837 2.67202 20.2765 2.69017 20.856 2.76646C26.0912 3.45569 30.2108 7.57528 30.9 12.8105C30.9948 13.5304 30.9998 14.4252 30.9998 16.6666ZM0.666504 16.6666C0.666504 14.4993 0.666504 13.4157 0.786276 12.5059C1.61335 6.22368 6.55687 1.28016 12.8391 0.453085C13.7489 0.333313 14.8325 0.333313 16.9998 0.333313C19.1671 0.333313 20.2508 0.333313 21.1605 0.453085C27.4428 1.28016 32.3863 6.22368 33.2134 12.5059C33.3332 13.4157 33.3332 14.4994 33.3332 16.6666V35.3333C33.3332 37.5006 33.3332 38.5843 33.2134 39.494C32.3863 45.7763 27.4428 50.7198 21.1605 51.5469C20.2508 51.6666 19.1671 51.6666 16.9998 51.6666C14.8325 51.6666 13.7489 51.6666 12.8391 51.5469C6.55687 50.7198 1.61335 45.7763 0.786276 39.494C0.666504 38.5843 0.666504 37.5006 0.666504 35.3333V16.6666ZM15.8332 13.1666C15.8332 13.0011 15.8676 12.8437 15.9297 12.7011C15.9886 12.566 16.0722 12.4443 16.1749 12.3416C16.386 12.1305 16.6777 11.9999 16.9998 11.9999C17.6435 11.9999 18.1654 12.5212 18.1665 13.1646L18.1665 13.1666V17.8332L18.1665 17.8353C18.1665 17.8364 18.1665 17.8376 18.1665 17.8387C18.1661 17.9132 18.1588 17.986 18.1452 18.0565C18.0853 18.3656 17.9033 18.6312 17.6515 18.8011C17.4655 18.9266 17.2412 18.9999 16.9998 18.9999C16.3555 18.9999 15.8332 18.4776 15.8332 17.8332V13.1666Z"
fill="currentColor"
fillOpacity="0.8"
/>
</svg>
);
}

export const IconMouseTool = () => (
<svg
width="1em"
height="1em"
viewBox="0 0 24 24"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M4.5 8C4.5 4.13401 7.63401 1 11.5 1H12.5C16.366 1 19.5 4.13401 19.5 8V17C19.5 20.3137 16.8137 23 13.5 23H10.5C7.18629 23 4.5 20.3137 4.5 17V8ZM11.2517 3.00606C8.60561 3.13547 6.5 5.32184 6.5 8V17C6.5 19.2091 8.29086 21 10.5 21H13.5C15.7091 21 17.5 19.2091 17.5 17V8C17.5 5.32297 15.3962 3.13732 12.7517 3.00622V5.28013C13.2606 5.54331 13.6074 6.06549 13.6074 6.66669V8.75759C13.6074 9.35879 13.2606 9.88097 12.7517 10.1441V11.4091C12.7517 11.8233 12.4159 12.1591 12.0017 12.1591C11.5875 12.1591 11.2517 11.8233 11.2517 11.4091V10.1457C10.7411 9.88298 10.3931 9.35994 10.3931 8.75759V6.66669C10.3931 6.06433 10.7411 5.5413 11.2517 5.27862V3.00606ZM12.0017 6.14397C11.7059 6.14397 11.466 6.38381 11.466 6.67968V8.74462C11.466 9.03907 11.7036 9.27804 11.9975 9.28031L12.0002 9.28032C12.0456 9.28032 12.0896 9.27482 12.1316 9.26447C12.3401 9.21256 12.5002 9.0386 12.5318 8.82287C12.5345 8.80149 12.5359 8.7797 12.5359 8.75759V6.66669C12.5359 6.64463 12.5345 6.62288 12.5318 6.60154C12.4999 6.38354 12.3368 6.20817 12.1252 6.15826C12.0856 6.14891 12.0442 6.14397 12.0017 6.14397Z"
></path>
</svg>
);
51 changes: 51 additions & 0 deletions frontend/packages/flow-design/src/assets/icon-pad.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
export function IconPad(props: { width?: number; height?: number }) {
const { width, height } = props;
return (
<svg
width={width || 48}
height={height || 38}
viewBox="0 0 48 38"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<rect
x="1.83317"
y="1.49998"
width="44.3333"
height="35"
rx="3.5"
stroke="currentColor"
strokeOpacity="0.8"
strokeWidth="2.33333"
/>
<path
d="M14.6665 30.6667H33.3332"
stroke="currentColor"
strokeOpacity="0.8"
strokeWidth="2.33333"
strokeLinecap="round"
/>
</svg>
);
}

export const IconPadTool = () => (
<svg
width="1em"
height="1em"
viewBox="0 0 24 24"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M20.8549 5H3.1451C3.06496 5 3 5.06496 3 5.1451V18.8549C3 18.935 3.06496 19 3.1451 19H20.8549C20.935 19 21 18.935 21 18.8549V5.1451C21 5.06496 20.935 5 20.8549 5ZM3.1451 3C1.96039 3 1 3.96039 1 5.1451V18.8549C1 20.0396 1.96039 21 3.1451 21H20.8549C22.0396 21 23 20.0396 23 18.8549V5.1451C23 3.96039 22.0396 3 20.8549 3H3.1451Z"
></path>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M6.99991 16C6.99991 15.4477 7.44762 15 7.99991 15H15.9999C16.5522 15 16.9999 15.4477 16.9999 16C16.9999 16.5523 16.5522 17 15.9999 17H7.99991C7.44762 17 6.99991 16.5523 6.99991 16Z"
></path>
</svg>
);
Loading