Skip to content

Commit d50a05e

Browse files
authored
Merge pull request #43 from codingapi/dev
Dev
2 parents f9bc365 + b673c5b commit d50a05e

12 files changed

Lines changed: 1764 additions & 14 deletions

File tree

designs/title-expression-ui/README.md

Lines changed: 392 additions & 0 deletions
Large diffs are not rendered by default.

designs/title-expression-ui/design.pen

Lines changed: 1351 additions & 0 deletions
Large diffs are not rendered by default.

flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowCreateService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public long create() {
5353
}
5454
workflow.verify();
5555
// 获取备份
56-
WorkflowBackup workflowBackup = workflowBackupRepository.getByWorkId(workflow.getId(), workflow.getCreatedTime());
56+
WorkflowBackup workflowBackup = workflowBackupRepository.getByWorkId(workflow.getId(), workflow.getUpdatedTime());
5757
if (workflowBackup == null) {
5858
workflowBackup = new WorkflowBackup(workflow);
5959
workflowBackupRepository.save(workflowBackup);

frontend/.claude/commands/git-push.md

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

frontend/apps/app-pc/rsbuild.config.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {defineConfig} from '@rsbuild/core';
2-
import {pluginReact} from '@rsbuild/plugin-react';
3-
import {pluginLess} from '@rsbuild/plugin-less';
4-
import {pluginSass} from '@rsbuild/plugin-sass';
1+
import { defineConfig } from '@rsbuild/core';
2+
import { pluginReact } from '@rsbuild/plugin-react';
3+
import { pluginLess } from '@rsbuild/plugin-less';
4+
import { pluginSass } from '@rsbuild/plugin-sass';
55
import * as path from "path";
66

77
// Docs: https://rsbuild.rs/config/
@@ -38,6 +38,12 @@ export default defineConfig({
3838
* ignore warnings from @coze-design-editor/design-editor/language-typescript
3939
*/
4040
ignoreWarnings: [/Critical dependency: the request of a dependency is an expression/],
41+
// 添加 node 配置来模拟 __filename 和 __dirname
42+
node: {
43+
__filename: false,
44+
__dirname: false,
45+
global: true,
46+
},
4147
},
4248
},
4349
});

frontend/packages/flow-pc/flow-pc-approval/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"@flow-engine/flow-pc-ui": "workspace:*",
3131
"@reduxjs/toolkit": "^2.11.2",
3232
"antd": "^6.2.1",
33+
"immer": "^11.1.3",
3334
"react-redux": "^9.2.0"
3435
},
3536
"devDependencies": {

frontend/packages/flow-pc/flow-pc-design/src/components/design-list/hooks/use-presenter.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React from "react"
2-
import {ActionType} from "@flow-engine/flow-pc-ui";
3-
import {PresenterHooks} from "@flow-engine/flow-core";
2+
import {PresenterHooks,ActionType} from "@flow-engine/flow-core";
43
import {State} from "../types"
54
import {Presenter} from "../presenter";
65
import {DesignListApiImpl} from "../model";

frontend/packages/flow-pc/flow-pc-design/src/components/design-list/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import {ActionType, Table, TableProps} from "@flow-engine/flow-pc-ui";
1+
import {Table, TableProps} from "@flow-engine/flow-pc-ui";
2+
import {ActionType} from "@flow-engine/flow-core";
23
import React from "react";
34
import {DataType, DesignListProps} from "./types";
45
import {usePresenter} from "./hooks/use-presenter";

frontend/packages/flow-pc/flow-pc-design/src/components/design-list/model.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {ParamRequest, Result} from "@flow-engine/flow-pc-ui";
1+
import {ParamRequest, Result} from "@flow-engine/flow-core";
22
import {DataType, DesignListApi} from "./types";
33
import {list, remove,changeState} from "@/api/workflow";
44

frontend/packages/flow-pc/flow-pc-design/src/components/design-list/presenter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {DesignListApi, State} from "./types";
2-
import {ParamRequest} from "@flow-engine/flow-pc-ui";
2+
import {ParamRequest} from "@flow-engine/flow-core";
33
import {BasePresenter} from "@flow-engine/flow-core";
44

55
export class Presenter extends BasePresenter<State, DesignListApi> {

0 commit comments

Comments
 (0)