diff --git a/src/components/common/dynamic-input.vue b/src/components/common/dynamic-input.vue
index c46151a..ba5bd60 100644
--- a/src/components/common/dynamic-input.vue
+++ b/src/components/common/dynamic-input.vue
@@ -69,9 +69,9 @@ const handleUpdateType = (index: number) => {
-
+
{
>
- =
+ =
{
@keydown.enter.prevent
/>
-
- (
+
+ (
{
@keydown.enter.prevent
@update:value="handleUpdateType(index)"
/>
- )
+ )
diff --git a/src/components/common/log-drawer.vue b/src/components/common/log-drawer.vue
index b6e12dc..6d67c2e 100644
--- a/src/components/common/log-drawer.vue
+++ b/src/components/common/log-drawer.vue
@@ -304,6 +304,10 @@ const SnailLogComponent = defineComponent({
+
+
+
+
@@ -344,6 +348,10 @@ const SnailLogComponent = defineComponent({
+
+
+
+
@@ -353,6 +361,7 @@ const SnailLogComponent = defineComponent({
padding: 0;
.virtual-list {
+ height: calc(100vh - 101px);
max-height: calc(100vh - 101px);
}
diff --git a/src/components/common/scene-trigger-interval.vue b/src/components/common/scene-trigger-interval.vue
index 2b08c6f..8460c1d 100644
--- a/src/components/common/scene-trigger-interval.vue
+++ b/src/components/common/scene-trigger-interval.vue
@@ -65,7 +65,12 @@ watch(
-
+
{{ $t('common.second') }}
diff --git a/src/components/workflow/modules/drawer/branch-drawer.vue b/src/components/workflow/modules/drawer/branch-drawer.vue
index 98aa087..74b8554 100644
--- a/src/components/workflow/modules/drawer/branch-drawer.vue
+++ b/src/components/workflow/modules/drawer/branch-drawer.vue
@@ -72,25 +72,30 @@ const save = () => {
.catch(() => window.$message?.warning('请检查表单信息'));
};
+const nodeExpressionFeedback = ref('');
+
const checkNodeExpression = async () => {
if (!form.value.decision?.nodeExpression) {
- return Promise.reject(new Error('请填写条件表达式'));
+ nodeExpressionFeedback.value = '请填写条件表达式';
+ return;
}
const { error, data } = await fetchCheckNodeExpression(form.value.decision!);
if (!error) {
if (data.key !== 1) {
- return Promise.reject(data.value ?? '请检查条件表达式');
+ nodeExpressionFeedback.value = data.value || '请检查条件表达式';
+ return;
}
} else {
- return Promise.reject(new Error('接口请求失败'));
+ nodeExpressionFeedback.value = '接口请求失败';
+ return;
}
- return Promise.resolve();
+ nodeExpressionFeedback.value = '';
};
const rules: FormRules = {
decision: {
expressionType: [{ required: true, message: '请选择表达式类型', trigger: 'change', type: 'number' }],
- nodeExpression: [{ required: true, validator: checkNodeExpression, trigger: 'blur' }]
+ nodeExpression: [{ required: true, message: '请填写条件表达式', trigger: 'blur' }]
}
};
@@ -132,12 +137,24 @@ const rules: FormRules = {
-
+
-
+
+
+ 校验条件表达式
+
diff --git a/src/components/workflow/modules/drawer/start-drawer.vue b/src/components/workflow/modules/drawer/start-drawer.vue
index 24bd45f..c939de4 100644
--- a/src/components/workflow/modules/drawer/start-drawer.vue
+++ b/src/components/workflow/modules/drawer/start-drawer.vue
@@ -210,7 +210,7 @@ const rules: Record = {
-
+
diff --git a/src/views/retry/log/modules/retry-log-detail-drawer.vue b/src/views/retry/log/modules/retry-log-detail-drawer.vue
index 8670f6b..092803f 100644
--- a/src/views/retry/log/modules/retry-log-detail-drawer.vue
+++ b/src/views/retry/log/modules/retry-log-detail-drawer.vue
@@ -59,4 +59,9 @@ const visible = defineModel('visible', {
-
+
diff --git a/src/views/retry/task/modules/retry-task-detail-drawer.vue b/src/views/retry/task/modules/retry-task-detail-drawer.vue
index 68dd05c..ddf149d 100644
--- a/src/views/retry/task/modules/retry-task-detail-drawer.vue
+++ b/src/views/retry/task/modules/retry-task-detail-drawer.vue
@@ -115,4 +115,9 @@ onBeforeUnmount(() => {
-
+
diff --git a/src/views/workflow/task/index.vue b/src/views/workflow/task/index.vue
index 425275d..456f553 100644
--- a/src/views/workflow/task/index.vue
+++ b/src/views/workflow/task/index.vue
@@ -185,9 +185,16 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
- execute(row.id!)}>
- {$t('common.execute')}
-
+ execute(row.id!)}>
+ {{
+ default: () => $t('common.confirmExecute'),
+ trigger: () => (
+
+ {$t('common.execute')}
+
+ )
+ }}
+