From db63d803389aed2c4d8e0028761b9c328a15f7f7 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Wed, 28 May 2025 14:14:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20[=E5=B7=A5=E4=BD=9C=E6=B5=81]=20Sim?=
=?UTF-8?q?ple=20=E6=A8=A1=E5=9E=8B=20-=20=E5=AE=A1=E6=89=B9=E4=BA=BA?=
=?UTF-8?q?=E8=8A=82=E7=82=B9=E7=9B=91=E5=90=AC=E5=99=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/http-request-param-setting.vue | 228 ++++++++++++++++++
.../modules/user-task-listener.vue | 107 ++++++++
.../nodes-config/user-task-node-config.vue | 48 ++--
3 files changed, 356 insertions(+), 27 deletions(-)
create mode 100644 apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue
create mode 100644 apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/user-task-listener.vue
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue
new file mode 100644
index 000000000..1561f7aca
--- /dev/null
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue
@@ -0,0 +1,228 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/user-task-listener.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/user-task-listener.vue
new file mode 100644
index 000000000..159c71c03
--- /dev/null
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/user-task-listener.vue
@@ -0,0 +1,107 @@
+
+
+
+
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/user-task-node-config.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/user-task-node-config.vue
index fdeac0433..dd2693bc1 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/user-task-node-config.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/user-task-node-config.vue
@@ -34,7 +34,6 @@ import {
TypographyText,
} from 'ant-design-vue';
-// TODO import { defaultProps4AntTree } from '#/utils/tree';
import {
APPROVE_METHODS,
APPROVE_TYPE,
@@ -65,10 +64,9 @@ import {
useNodeName,
useWatchNode,
} from '../../helpers';
+import UserTaskListener from './modules/user-task-listener.vue';
import { convertTimeUnit, getApproveTypeText } from './utils';
-// TODO import UserTaskListener from './components/UserTaskListener.vue';
-
defineOptions({ name: 'UserTaskNodeConfig' });
const props = defineProps({
flowNode: {
@@ -233,8 +231,7 @@ const {
cTimeoutMaxRemindCount,
} = useTimeoutHandler();
-// TODO 监听器待实现
-// const userTaskListenerRef = ref();
+const userTaskListenerRef = ref();
/** 节点类型名称 */
const nodeTypeName = computed(() => {
@@ -253,25 +250,20 @@ const saveConfig = async () => {
drawerApi.close();
return true;
}
- // TODO 监听器待实现
- // activeTabName.value = 'listener';
- // await nextTick();
- activeTabName.value = 'user';
-
if (!formRef.value) return false;
- // TODO 监听器待实现
- // if (!userTaskListenerRef.value) return false;
- // const valid =
- // (await formRef.value.validate()) &&
- // (await userTaskListenerRef.value.validate());
+ if (!userTaskListenerRef.value) return false;
- if (!(await formRef.value.validate())) {
- activeTabName.value = 'user';
+ // 校验监听器页面, TODO 在别的Tab 好像跳不到这个页面
+ if (!(await userTaskListenerRef.value.validate())) {
+ activeTabName.value = 'listener';
+ return false;
+ }
+ // 校验审批人页面
+ if (!(await formRef.value.validate())) {
+ // TODO 好像走不到这里
+ activeTabName.value = 'user';
+ return false;
}
- // TODO 监听器待实现
- // if (!(await userTaskListenerRef.value.validate())) {
- // activeTabName.value = 'listener';
- // }
const showText = getShowText();
if (!showText) return false;
@@ -658,10 +650,14 @@ onMounted(() => {
label="指定部门"
name="deptIds"
>
-
{
-
- 待实现
-
+ />
From 54d1471d435a675f823e4ab3c09a24f69f76aa7b Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Thu, 29 May 2025 08:51:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20[BPM=20=E5=B7=A5=E4=BD=9C=E6=B5=81]?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=89=B9=E4=BA=BA=E8=8A=82=E7=82=B9?=
=?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/http-request-param-setting.vue | 20 +++++++++----------
.../modules/user-task-listener.vue | 2 +-
.../nodes-config/user-task-node-config.vue | 16 +++++++++------
.../src/views/bpm/model/form/index.vue | 1 -
4 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue
index 1561f7aca..6f18a06dc 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/http-request-param-setting.vue
@@ -64,11 +64,11 @@ const deleteHttpRequestParam = (arr: HttpRequestParam[], index: number) => {
@@ -88,18 +88,18 @@ const deleteHttpRequestParam = (arr: HttpRequestParam[], index: number) => {
@@ -172,18 +172,18 @@ const deleteHttpRequestParam = (arr: HttpRequestParam[], index: number) => {
{
if (!formRef.value) return false;
if (!userTaskListenerRef.value) return false;
- // 校验监听器页面, TODO 在别的Tab 好像跳不到这个页面
- if (!(await userTaskListenerRef.value.validate())) {
+ // 先进行表单验证,记录验证结果
+ const userFormValid = await formRef.value.validate().catch(() => false);
+ const listenerValid = await userTaskListenerRef.value.validate().catch(() => {
+ return false;
+ });
+ // 如果监听器有错误,切换到监听器Tab
+ if (!listenerValid) {
activeTabName.value = 'listener';
return false;
}
- // 校验审批人页面
- if (!(await formRef.value.validate())) {
- // TODO 好像走不到这里
+ // 如果审批人表单有错误,切换到审批人Tab
+ if (!userFormValid) {
activeTabName.value = 'user';
return false;
}
@@ -1221,7 +1225,7 @@ onMounted(() => {
-
+
{
/** 步骤切换处理 */
const handleStepClick = async (index: number) => {
try {
- console.warn('handleStepClick', index);
if (index !== 0) {
await validateBasic();
}