Skip to content

Commit f9bc365

Browse files
xlornexlorne
authored
Merge pull request #42 from codingapi/dev
Dev
2 parents 39cfcc9 + bc133e3 commit f9bc365

228 files changed

Lines changed: 1118 additions & 189 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎frontend/apps/app-pc/package.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010
},
1111
"dependencies": {
1212
"@flow-engine/flow-core": "workspace:*",
13-
"@flow-engine/flow-design": "workspace:*",
1413
"@flow-engine/flow-types": "workspace:*",
14+
"@flow-engine/flow-pc-design": "workspace:*",
15+
"@flow-engine/flow-pc-ui": "workspace:*",
16+
"@flow-engine/flow-pc-form": "workspace:*",
17+
"@flow-engine/flow-pc-approval":"workspace:*",
1518
"antd": "^6.2.1",
1619
"dayjs": "^1.11.19",
1720
"react": "^18.3.1",
@@ -21,7 +24,7 @@
2124
},
2225
"devDependencies": {
2326
"@flow-engine/flow-core": "workspace:*",
24-
"@flow-engine/flow-design": "workspace:*",
25-
"@flow-engine/flow-types": "workspace:*"
27+
"@flow-engine/flow-types": "workspace:*",
28+
"@flow-engine/flow-pc-design": "workspace:*"
2629
}
2730
}

‎frontend/apps/app-pc/src/config/plugin-view.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {ViewPlugin} from "@flow-engine/flow-design";
2-
import {LeaveView} from "@/views/leave.tsx";
1+
import {ViewBindPlugin} from "@flow-engine/flow-types";
2+
import {FlowFormView} from "@flow-engine/flow-pc-form";
33

4-
ViewPlugin.getInstance().register('default',LeaveView);
4+
ViewBindPlugin.getInstance().register('default',FlowFormView);

‎frontend/apps/app-pc/src/pages/desgin.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import { DesignList } from '@flow-engine/flow-design';
2+
import { DesignList } from '@flow-engine/flow-pc-design';
33

44

55
const DesignPage: React.FC = () => {

‎frontend/apps/app-pc/src/pages/todo.tsx‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
import React from "react";
22
import {done, list, notify, todo} from "@/api/record.ts";
3-
import {
4-
type ActionType,
5-
ApprovalPanelDrawer,
6-
Table,
7-
type TableProps,
8-
WorkflowSelectModal
9-
} from "@flow-engine/flow-design";
3+
import {WorkflowSelectModal} from "@flow-engine/flow-pc-design";
4+
import {type ActionType, Table, type TableProps} from "@flow-engine/flow-pc-ui";
105
import {Button, Space, Tabs, type TabsProps} from "antd";
116
import dayjs from "dayjs";
7+
import {ApprovalPanelDrawer} from "@flow-engine/flow-pc-approval";
128

139
const TodoPage: React.FC = () => {
1410

‎frontend/apps/app-pc/src/pages/user.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import {type ActionType, Table, type TableProps} from "@flow-engine/flow-design";
2+
import {type ActionType, Table, type TableProps} from "@flow-engine/flow-pc-ui";
33
import {Button, Form, Input, message, Modal, Popconfirm, Space, Switch} from "antd";
44
import {list, remove, save} from "@/api/user.ts";
55

‎frontend/apps/app-pc/src/views/leave.tsx‎

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

‎frontend/package.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@
66
"scripts": {
77
"build:flow-core": "pnpm -F @flow-engine/flow-core build",
88
"build:flow-types": "pnpm -F @flow-engine/flow-types build",
9-
"build:flow-engine": "pnpm -F @flow-engine/flow-design build",
10-
"build": "pnpm run build:flow-core && pnpm run build:flow-types && pnpm run build:flow-engine ",
9+
"build:flow-pc-design": "pnpm -F @flow-engine/flow-pc-design build",
10+
"build:flow-pc-form": "pnpm -F @flow-engine/flow-pc-form build",
11+
"build:flow-pc-ui": "pnpm -F @flow-engine/flow-pc-ui build",
12+
"build:flow-pc-approval": "pnpm -F @flow-engine/flow-pc-approval build",
13+
"build:flow-pc": "pnpm -F pnpm run build:flow-pc-ui && pnpm run build:flow-pc-form && pnpm run build:flow-pc-approval && pnpm run build:flow-pc-design",
14+
"build": "pnpm run build:flow-core && pnpm run build:flow-types && pnpm run build:flow-pc ",
1115
"build:app-pc": "pnpm -F @flow-engine/app-pc build",
1216
"dev:app-pc": "pnpm -F @flow-engine/app-pc dev",
1317
"dev:app-mobile": "pnpm -F @flow-engine/app-mobile dev",
14-
"watch:flow-design": "pnpm -F @flow-engine/flow-design dev"
18+
"watch:flow-pc-design": "pnpm -F @flow-engine/flow-pc-design dev",
19+
"watch:flow-pc-form": "pnpm -F @flow-engine/flow-pc-form dev"
1520
},
1621
"keywords": [],
1722
"author": "",

‎frontend/packages/flow-core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"react-dom": ">=18"
2222
},
2323
"dependencies": {
24-
"axios": "^1.13.3",
24+
"axios": "^1.13.5",
2525
"react": "^18.3.1",
2626
"react-dom": "^18.3.1"
2727
}

‎frontend/packages/flow-core/src/index.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ export * from "./dispatch";
33
export * from "./http";
44
export * from "./presenter";
55
export * from "./hooks.ts";
6-
export * from "./object.ts";
6+
export * from "./object.ts";
7+
export * from "./table.ts";

‎frontend/packages/flow-core/src/table.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
export interface Result<T> {
2+
data:T[]
3+
total: number;
4+
success: boolean
5+
}
6+
7+
export interface ActionType {
8+
reload(): void;
9+
}
10+
11+
export interface ParamRequest {
12+
current: number;
13+
pageSize: number;
14+
[key: string]: any;
15+
}

0 commit comments

Comments
 (0)