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"
>
-
{
-
- 待实现
-
+ />