From 183ba8b29187e627d1b25d2c6f6317f91245049c Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Tue, 30 Apr 2024 09:22:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E4=BC=98=E5=8C=96=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/common.ts                           |  2 +-
 .../group/modules/group-detail-drawer.vue     | 33 +++++------
 .../log/modules/retry-log-detail-drawer.vue   | 40 ++++---------
 .../scene/modules/scene-detail-drawer.vue     | 44 +++++---------
 .../task/modules/retry-task-detail-drawer.vue | 58 +++++++------------
 5 files changed, 61 insertions(+), 116 deletions(-)

diff --git a/src/utils/common.ts b/src/utils/common.ts
index c3cdadd..9d425f5 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -75,7 +75,7 @@ export function tagColor(index: number) {
     1: 'info',
     2: 'success',
     3: 'warning',
-    4: 'default'
+    4: 'primary'
   };
 
   if (index === null || index < 0) {
diff --git a/src/views/group/modules/group-detail-drawer.vue b/src/views/group/modules/group-detail-drawer.vue
index 77fba68..8d2c8ff 100644
--- a/src/views/group/modules/group-detail-drawer.vue
+++ b/src/views/group/modules/group-detail-drawer.vue
@@ -30,36 +30,29 @@ watch(
 
 <template>
   <OperateDrawer v-model="visible" :title="$t('page.groupConfig.detail')">
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.groupConfig.groupName')">{{ rowData?.groupName }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.groupConfig.groupStatus')">
+    <NDescriptions label-placement="top" bordered :column="2">
+      <NDescriptionsItem :label="$t('page.groupConfig.groupName')" :span="2">
+        {{ rowData?.groupName }}
+      </NDescriptionsItem>
+
+      <NDescriptionsItem :label="$t('page.groupConfig.token')" :span="2">{{ rowData?.token }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.groupConfig.groupStatus')" :span="1">
         <NTag :type="tagColor(rowData?.groupStatus!)">{{ $t(groupConfigStatusRecord[rowData?.groupStatus!]) }}</NTag>
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.groupConfig.token')">{{ rowData?.token }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.groupConfig.idGeneratorMode')">
+      <NDescriptionsItem :label="$t('page.groupConfig.idGeneratorMode')" :span="1">
         <NTag :type="tagColor(rowData?.idGeneratorMode!)">
           {{ $t(groupConfigIdModeRecord[rowData?.idGeneratorMode!]) }}
         </NTag>
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.groupConfig.groupPartition')">
+      <NDescriptionsItem :label="$t('page.groupConfig.groupPartition')" :span="1">
         {{ rowData?.groupPartition }}
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.groupConfig.initScene')">
+      <NDescriptionsItem :label="$t('page.groupConfig.initScene')" :span="1">
         <NTag :type="tagColor(rowData?.initScene!)">{{ $t(yesOrNoRecord[rowData?.initScene!]) }}</NTag>
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.groupConfig.description')">{{ rowData?.description }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.groupConfig.description')" :span="2">
+        {{ rowData?.description }}
+      </NDescriptionsItem>
     </NDescriptions>
   </OperateDrawer>
 </template>
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 37cd790..51f8f3b 100644
--- a/src/views/retry/log/modules/retry-log-detail-drawer.vue
+++ b/src/views/retry/log/modules/retry-log-detail-drawer.vue
@@ -29,44 +29,28 @@ watch(
 
 <template>
   <OperateDrawer v-model="visible" :title="$t('page.retryLog.detail')">
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryLog.UniqueId')">
+    <NDescriptions label-placement="top" bordered :column="2">
+      <NDescriptionsItem :label="$t('page.retryLog.UniqueId')" :span="2">
         {{ rowData?.uniqueId }}
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryLog.groupName')">{{ rowData?.groupName }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryLog.sceneName')">{{ rowData?.sceneName }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryLog.retryStatus')">
+      <NDescriptionsItem :label="$t('page.retryLog.groupName')" :span="2">{{ rowData?.groupName }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryLog.sceneName')" :span="2">{{ rowData?.sceneName }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryLog.retryStatus')" :span="1">
         <NTag :type="tagColor(rowData?.retryStatus!)">
           {{ $t(retryTaskStatusTypeRecord[rowData?.retryStatus!]) }}
         </NTag>
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryLog.taskType')">
+      <NDescriptionsItem :label="$t('page.retryLog.taskType')" :span="1">
         <NTag :type="tagColor(rowData?.taskType!)">{{ $t(retryTaskTypeRecord[rowData?.taskType!]) }}</NTag>
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryLog.bizNo')">{{ rowData?.bizNo }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryLog.idempotentId')">
+      <NDescriptionsItem :label="$t('page.retryLog.bizNo')" :span="2">{{ rowData?.bizNo }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryLog.idempotentId')" :span="2">
         {{ rowData?.idempotentId }}
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryTask.executorName')">{{ rowData?.executorName }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryTask.argsStr')">{{ rowData?.argsStr }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
+      <NDescriptionsItem :label="$t('page.retryTask.executorName')" :span="2">
+        {{ rowData?.executorName }}
+      </NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryTask.argsStr')" :span="2">{{ rowData?.argsStr }}</NDescriptionsItem>
       <NDescriptionsItem :label="$t('common.createDt')">{{ rowData?.createDt }}</NDescriptionsItem>
     </NDescriptions>
   </OperateDrawer>
diff --git a/src/views/retry/scene/modules/scene-detail-drawer.vue b/src/views/retry/scene/modules/scene-detail-drawer.vue
index 3332255..ff0c97f 100644
--- a/src/views/retry/scene/modules/scene-detail-drawer.vue
+++ b/src/views/retry/scene/modules/scene-detail-drawer.vue
@@ -42,49 +42,35 @@ watch(
 
 <template>
   <OperateDrawer v-model="visible" :title="$t('page.retryScene.detail')">
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryScene.sceneName')">{{ rowData?.sceneName }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryScene.sceneStatus')">
+    <NDescriptions label-placement="top" bordered :column="2">
+      <NDescriptionsItem :label="$t('page.retryScene.sceneName')" :span="2">{{ rowData?.sceneName }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryScene.groupName')" :span="2">{{ rowData?.groupName }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryScene.sceneStatus')" :span="1">
         <NTag :type="tagColor(rowData?.sceneStatus!)">{{ $t(enableStatusNumberRecord[rowData?.sceneStatus!]) }}</NTag>
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryScene.groupName')">{{ rowData?.groupName }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('common.routeKey.routeLabel')">
+      <NDescriptionsItem :label="$t('common.routeKey.routeLabel')" :span="1">
         <NTag :type="tagColor(rowData?.routeKey!)">{{ $t(routeKeyRecord[rowData?.routeKey!]) }}</NTag>
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryScene.maxRetryCount')">{{ rowData?.maxRetryCount }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryScene.executorTimeout')">
+      <NDescriptionsItem :label="$t('page.retryScene.maxRetryCount')" :span="1">
+        {{ rowData?.maxRetryCount }}
+      </NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryScene.executorTimeout')" :span="1">
         {{ rowData?.executorTimeout }}
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryScene.deadlineRequest')">
+      <NDescriptionsItem :label="$t('page.retryScene.deadlineRequest')" :span="1">
         {{ rowData?.deadlineRequest }}
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryScene.backOff')">
+      <NDescriptionsItem :label="$t('page.retryScene.backOff')" :span="1">
         <NTag :type="tagColor(rowData?.backOff!)">
           {{ $t(backOffRecord[rowData?.backOff!]) }}
         </NTag>
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryScene.triggerInterval')">
+      <NDescriptionsItem :label="$t('page.retryScene.triggerInterval')" :span="2">
         {{ rowData?.backOff === 1 ? maxRetryCountUpdate(rowData?.maxRetryCount) : rowData?.triggerInterval }}
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryScene.description')">{{ rowData?.description }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryScene.description')" :span="2">
+        {{ rowData?.description }}
+      </NDescriptionsItem>
     </NDescriptions>
   </OperateDrawer>
 </template>
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 f0c91cd..3f29df6 100644
--- a/src/views/retry/task/modules/retry-task-detail-drawer.vue
+++ b/src/views/retry/task/modules/retry-task-detail-drawer.vue
@@ -29,54 +29,36 @@ watch(
 
 <template>
   <OperateDrawer v-model="visible" :title="$t('page.retryTask.detail')">
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryTask.uniqueId')">
+    <NDescriptions label-placement="top" bordered :column="2">
+      <NDescriptionsItem :label="$t('page.retryTask.uniqueId')" :span="2">
         {{ rowData?.uniqueId }}
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryTask.groupName')">{{ rowData?.groupName }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryTask.sceneName')">{{ rowData?.sceneName }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryTask.nextTriggerAt')">{{ rowData?.nextTriggerAt }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryTask.retryCount')">{{ rowData?.retryCount }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryTask.retryStatus')">
+      <NDescriptionsItem :label="$t('page.retryTask.groupName')" :span="2">{{ rowData?.groupName }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryTask.sceneName')" :span="2">{{ rowData?.sceneName }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryTask.nextTriggerAt')" :span="1">
+        {{ rowData?.nextTriggerAt }}
+      </NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryTask.retryCount')" :span="1">
+        {{ rowData?.retryCount }}
+      </NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryTask.retryStatus')" :span="1">
         <NTag :type="tagColor(rowData?.retryStatus!)">
           {{ $t(retryTaskStatusTypeRecord[rowData?.retryStatus!]) }}
         </NTag>
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryTask.taskType')">
+      <NDescriptionsItem :label="$t('page.retryTask.taskType')" :span="1">
         <NTag :type="tagColor(rowData?.taskType!)">{{ $t(retryTaskTypeRecord[rowData?.taskType!]) }}</NTag>
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryTask.bizNo')">{{ rowData?.bizNo }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryTask.idempotentId')">
+      <NDescriptionsItem :label="$t('page.retryTask.bizNo')" :span="2">{{ rowData?.bizNo }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryTask.idempotentId')" :span="2">
         {{ rowData?.idempotentId }}
       </NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryTask.executorName')">{{ rowData?.executorName }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('page.retryTask.argsStr')">{{ rowData?.argsStr }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('common.createDt')">{{ rowData?.createDt }}</NDescriptionsItem>
-    </NDescriptions>
-    <NDescriptions label-placement="top" bordered :column="6">
-      <NDescriptionsItem :label="$t('common.updateDt')">{{ rowData?.updateDt }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryTask.executorName')" :span="2">
+        {{ rowData?.executorName }}
+      </NDescriptionsItem>
+      <NDescriptionsItem :label="$t('page.retryTask.argsStr')" :span="2">{{ rowData?.argsStr }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('common.createDt')" :span="1">{{ rowData?.createDt }}</NDescriptionsItem>
+      <NDescriptionsItem :label="$t('common.updateDt')" :span="1">{{ rowData?.updateDt }}</NDescriptionsItem>
     </NDescriptions>
   </OperateDrawer>
 </template>