From 32379906aae9a09aab163615bad021604c10ad3b Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Thu, 4 Jul 2024 14:08:25 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat(sj=5Fpreview):=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E6=89=A7=E8=A1=8C=E6=8C=89=E9=92=AE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/task/index.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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
 
             <n-divider vertical />
 
-            <NButton text type="error" ghost size="small" onClick={() => execute(row.id!)}>
-              {$t('common.execute')}
-            </NButton>
+            <NPopconfirm onPositiveClick={() => execute(row.id!)}>
+              {{
+                default: () => $t('common.confirmExecute'),
+                trigger: () => (
+                  <NButton type="error" text ghost size="small">
+                    {$t('common.execute')}
+                  </NButton>
+                )
+              }}
+            </NPopconfirm>
 
             <n-divider vertical />
 

From c09e51648e3aaccf3f9a81c2091861dfc433d1fe Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Fri, 5 Jul 2024 14:51:41 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat(sj=5Fpreview):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E8=A1=A8=E8=BE=BE=E5=BC=8F=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/dynamic-input.vue       | 20 +++++++-----
 .../workflow/modules/drawer/branch-drawer.vue | 31 ++++++++++++++-----
 .../workflow/modules/drawer/start-drawer.vue  |  2 +-
 3 files changed, 38 insertions(+), 15 deletions(-)

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) => {
 
 <template>
   <NDynamicInput v-model:value="content" item-style="margin-bottom: 0;" :on-create="onCreate" #="{ index }">
-    <NGrid :x-gap="16">
+    <NGrid>
       <NFormItemGi
-        :span="8"
+        :span="7"
         ignore-path-change
         :show-label="false"
         :rule="dynamicInputRule"
@@ -79,9 +79,9 @@ const handleUpdateType = (index: number) => {
       >
         <NInput v-model:value="content[index].key" placeholder="key" @keydown.enter.prevent />
       </NFormItemGi>
-      <NGi :span="1" class="h-34px lh-34px">=</NGi>
+      <NGi :span="2" class="h-34px text-center lh-34px">=</NGi>
       <NFormItemGi
-        :span="8"
+        :span="7"
         ignore-path-change
         :show-label="false"
         :rule="dynamicInputRule"
@@ -109,8 +109,14 @@ const handleUpdateType = (index: number) => {
           @keydown.enter.prevent
         />
       </NFormItemGi>
-      <NFormItemGi :span="3" class="w-130px" ignore-path-change :show-label="false" :path="`${path}[${index}].type`">
-        <div :span="1" class="h-34px lh-34px">(</div>
+      <NFormItemGi
+        :span="3"
+        class="ml-12px w-115px"
+        ignore-path-change
+        :show-label="false"
+        :path="`${path}[${index}].type`"
+      >
+        <div class="h-34px lh-34px">(</div>
         <NSelect
           v-model:value="content[index].type"
           class="mx-3px"
@@ -119,7 +125,7 @@ const handleUpdateType = (index: number) => {
           @keydown.enter.prevent
           @update:value="handleUpdateType(index)"
         />
-        <div :span="1" class="h-34px lh-34px">)</div>
+        <div class="h-34px lh-34px">)</div>
       </NFormItemGi>
     </NGrid>
   </NDynamicInput>
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' }]
   }
 };
 </script>
@@ -132,12 +137,24 @@ const rules: FormRules = {
             </NSpace>
           </NRadioGroup>
         </NFormItem>
-        <NFormItem path="decision.nodeExpression" label="条件表达式">
+        <NFormItem
+          path="decision.nodeExpression"
+          label="条件表达式"
+          validation-status="error"
+          :feedback="nodeExpressionFeedback"
+        >
           <CodeMirror v-model="form.decision!.nodeExpression" placeholder="请输入条件表达式" />
         </NFormItem>
-        <NFormItem path="decision.checkContents" label="模拟上下文">
+        <NFormItem
+          path="decision.checkContents"
+          label="模拟上下文"
+          :show-feedback="form.decision?.checkContents && form.decision.checkContents.length === 0"
+        >
           <DynamicInput v-model:value="form.decision!.checkContents!" path="decision.checkContents" />
         </NFormItem>
+        <NFormItem :show-label="false" :show-feedback="false">
+          <NButton type="primary" ghost block @click="checkNodeExpression">校验条件表达式</NButton>
+        </NFormItem>
       </NForm>
 
       <template #footer>
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<RuleKey, FormItemRule> = {
             </NFormItem>
           </NGi>
         </NGrid>
-        <NFormItem path="wfContext" label="工作流上下文">
+        <NFormItem path="wfContext" label="工作流上下文" :show-feedback="false">
           <DynamicInput v-model:value="form.wfContexts!" path="wfContexts" />
         </NFormItem>
         <NFormItem path="workflowStatus" label="节点状态">

From af915badd90ea298f81314eceb79a7d08190e506 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Fri, 5 Jul 2024 17:47:27 +0800
Subject: [PATCH 3/5] =?UTF-8?q?style(sj=5Fpreview):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95=E6=97=A5=E5=BF=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/log-drawer.vue                     | 9 +++++++++
 src/views/retry/log/modules/retry-log-detail-drawer.vue  | 6 +++++-
 .../retry/task/modules/retry-task-detail-drawer.vue      | 6 +++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/components/common/log-drawer.vue b/src/components/common/log-drawer.vue
index b6e12dc..c75067d 100644
--- a/src/components/common/log-drawer.vue
+++ b/src/components/common/log-drawer.vue
@@ -304,6 +304,10 @@ const SnailLogComponent = defineComponent({
           </NDropdown>
         </div>
       </template>
+      <div class="h-full flex-center">
+        <NEmpty v-if="logList.length === 0 && finished" />
+        <NSpin v-if="logList.length === 0 && !finished" />
+      </div>
       <SnailLogComponent />
     </NDrawerContent>
   </NDrawer>
@@ -344,6 +348,10 @@ const SnailLogComponent = defineComponent({
         </NTooltip>
       </div>
     </template>
+    <div class="h-full flex-center">
+      <NEmpty v-if="logList.length === 0 && finished" />
+      <NSpin v-if="logList.length === 0 && !finished" />
+    </div>
     <SnailLogComponent />
   </NCard>
 </template>
@@ -353,6 +361,7 @@ const SnailLogComponent = defineComponent({
   padding: 0;
 
   .virtual-list {
+    height: 100vh;
     max-height: calc(100vh - 101px);
   }
 
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..f7ae2b8 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,8 @@ const visible = defineModel<boolean>('visible', {
   </DetailDrawer>
 </template>
 
-<style scoped></style>
+<style scoped>
+:deep(.virtual-list) {
+  max-height: calc(100vh - 166px) !important;
+}
+</style>
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..f120d65 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,8 @@ onBeforeUnmount(() => {
   </OperateDrawer>
 </template>
 
-<style scoped></style>
+<style scoped>
+:deep(.virtual-list) {
+  max-height: calc(100vh - 166px) !important;
+}
+</style>

From 582e405dcb3ea2643a9d2ecfc9848e16bf86fbd6 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Fri, 5 Jul 2024 17:51:42 +0800
Subject: [PATCH 4/5] =?UTF-8?q?style(sj=5Fpreview):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95=E6=97=A5=E5=BF=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/log-drawer.vue                      | 6 +++---
 src/views/retry/log/modules/retry-log-detail-drawer.vue   | 1 +
 src/views/retry/task/modules/retry-task-detail-drawer.vue | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/common/log-drawer.vue b/src/components/common/log-drawer.vue
index c75067d..6d67c2e 100644
--- a/src/components/common/log-drawer.vue
+++ b/src/components/common/log-drawer.vue
@@ -304,7 +304,7 @@ const SnailLogComponent = defineComponent({
           </NDropdown>
         </div>
       </template>
-      <div class="h-full flex-center">
+      <div v-if="logList.length === 0" class="h-full flex-center">
         <NEmpty v-if="logList.length === 0 && finished" />
         <NSpin v-if="logList.length === 0 && !finished" />
       </div>
@@ -348,7 +348,7 @@ const SnailLogComponent = defineComponent({
         </NTooltip>
       </div>
     </template>
-    <div class="h-full flex-center">
+    <div v-if="logList.length === 0" class="h-full flex-center">
       <NEmpty v-if="logList.length === 0 && finished" />
       <NSpin v-if="logList.length === 0 && !finished" />
     </div>
@@ -361,7 +361,7 @@ const SnailLogComponent = defineComponent({
   padding: 0;
 
   .virtual-list {
-    height: 100vh;
+    height: calc(100vh - 101px);
     max-height: calc(100vh - 101px);
   }
 
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 f7ae2b8..092803f 100644
--- a/src/views/retry/log/modules/retry-log-detail-drawer.vue
+++ b/src/views/retry/log/modules/retry-log-detail-drawer.vue
@@ -61,6 +61,7 @@ const visible = defineModel<boolean>('visible', {
 
 <style scoped>
 :deep(.virtual-list) {
+  height: calc(100vh - 166px) !important;
   max-height: calc(100vh - 166px) !important;
 }
 </style>
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 f120d65..ddf149d 100644
--- a/src/views/retry/task/modules/retry-task-detail-drawer.vue
+++ b/src/views/retry/task/modules/retry-task-detail-drawer.vue
@@ -117,6 +117,7 @@ onBeforeUnmount(() => {
 
 <style scoped>
 :deep(.virtual-list) {
+  height: calc(100vh - 166px) !important;
   max-height: calc(100vh - 166px) !important;
 }
 </style>

From 06fae444b4b36a87a277beb2c525eeaa9ed9063e Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sat, 6 Jul 2024 13:15:51 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat(sj=5F1.1.0-beta2):=20=E9=87=8D?=
 =?UTF-8?q?=E8=AF=95=E5=9C=BA=E6=99=AF=E7=9A=84=E9=9A=8F=E6=9C=BA=E5=92=8C?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E9=97=B4=E9=9A=94=E6=97=B6=E9=97=B4=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E6=9C=80=E5=B0=8F=E6=97=B6=E9=97=B4=E4=B8=BA10?=
 =?UTF-8?q?=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/scene-trigger-interval.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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(
   <CronInput v-if="backOff === 3" v-model="cron" :lang="app.locale" />
 
   <NInputGroup v-else-if="backOff === 2 || backOff === 4">
-    <NInputNumber v-model:value="interval" :placeholder="$t('page.retryScene.form.triggerInterval')" clearable />
+    <NInputNumber
+      v-model:value="interval"
+      :min="10"
+      :placeholder="$t('page.retryScene.form.triggerInterval')"
+      clearable
+    />
     <NInputGroupLabel>{{ $t('common.second') }}</NInputGroupLabel>
   </NInputGroup>
 </template>