From c58996930a69b5e66bc0c03d5ca3bb4b19de76c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Wed, 24 Apr 2024 09:31:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf-ui/src/views/deployment/publish/index.vue | 62 ++++++++++++++------
 1 file changed, 43 insertions(+), 19 deletions(-)

diff --git a/sf-ui/src/views/deployment/publish/index.vue b/sf-ui/src/views/deployment/publish/index.vue
index 3a061a0..5200d24 100644
--- a/sf-ui/src/views/deployment/publish/index.vue
+++ b/sf-ui/src/views/deployment/publish/index.vue
@@ -94,37 +94,48 @@
     </el-row>
 
     <el-table v-loading="loading" :data="publishList" @selection-change="handleSelectionChange">
-      <el-table-column align="center" type="selection" width="55"/>
-      <el-table-column align="center" label="APP名称" prop="appName"/>
-      <el-table-column align="center" label="版本号" prop="version"/>
-      <el-table-column align="center" label="系统" prop="systemType"/>
-      <el-table-column align="center" label="公开版" prop="publicVersion" width="180">
+      <el-table-column :show-overflow-tooltip="true" align="center" type="selection" width="55"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="APP名称" prop="appName"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="版本号" prop="version"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="系统" prop="systemType"/>
+      <el-table-column align="center" label="公开版" prop="publicVersion" width="90">
         <template slot-scope="scope">
           <el-switch v-model="scope.row.publicVersion" :active-value="1" :inactive-value="0" class="drawer-switch"
                      disabled
           />
         </template>
       </el-table-column>
-      <el-table-column align="center" label="强制更新" prop="forceUpdate" width="180">
+      <el-table-column :show-overflow-tooltip="true" align="center" label="强制更新" prop="forceUpdate" width="90">
         <template slot-scope="scope">
           <el-switch v-model="scope.row.forceUpdate" :active-value="1" :inactive-value="0" class="drawer-switch"
                      disabled
           />
         </template>
       </el-table-column>
-      <el-table-column align="center" label="上传时间" prop="updateTime" width="180">
+      <el-table-column :show-overflow-tooltip="true" align="center" label="上传时间" prop="updateTime" width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="发布环境" prop="publishEnvironment" width="180">
+      <el-table-column :show-overflow-tooltip="true" align="center" label="发布环境" prop="publishEnvironment"
+                       width="180"
+      >
         <template slot-scope="scope">
           <dict-tag :options="environmentList" :value="scope.row.publishEnvironment"/>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="安装包编号" prop="apkId"/>
-      <el-table-column align="center" label="版本说明" prop="versionDesc"/>
-      <el-table-column align="center" label="公开时间" prop="createTime" width="180">
+
+      <el-table-column :show-overflow-tooltip="true" align="center" label="发布状态" prop="publishEnvironment"
+                       width="180"
+      >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.release_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+
+      <el-table-column :show-overflow-tooltip="true" align="center" label="安装包编号" prop="apkId"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="版本说明" prop="versionDesc"/>
+      <el-table-column :show-overflow-tooltip="true" align="center" label="公开时间" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -137,14 +148,23 @@
         min-width="80"
       >
         <template slot-scope="scope">
+          <template v-if="scope.row.quickMark">
+            <el-image
+              v-if="scope.row.status!=2"
+              :preview-src-list="[scope.row.quickMark]"
+              :src="scope.row.quickMark"
+              style="width: 80px; height: 80px"
+            >
+            </el-image>
+
+            <el-image
+              v-else
+              :src="scope.row.quickMark"
+              style="width: 80px; height: 80px"
+            >
+            </el-image>
+          </template>
 
-          <el-image
-            v-if="scope.row.quickMark"
-            :preview-src-list="[scope.row.quickMark]"
-            :src="scope.row.quickMark"
-            style="width: 80px; height: 80px"
-          >
-          </el-image>
           <div v-else>/</div>
           <!--          <el-popover-->
           <!--              v-if="scope.row.qrCode && scopeC.row.status !== '20'"-->
@@ -164,6 +184,7 @@
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.status===1"
             icon="el-icon-bottom"
             size="mini"
             type="text"
@@ -171,6 +192,7 @@
           >下架
           </el-button>
           <el-button
+            v-if="scope.row.status==2 || scope.row.status==0"
             icon="el-icon-edit"
             size="mini"
             type="text"
@@ -194,6 +216,7 @@
           >下载安装包
           </el-button>
           <el-button
+            v-if="scope.row.status===2"
             v-hasPermi="['deployment:publish:edit']"
             icon="el-icon-edit"
             size="mini"
@@ -202,6 +225,7 @@
           >修改
           </el-button>
           <el-button
+            v-if="scope.row.status===2"
             v-hasPermi="['deployment:publish:remove']"
             icon="el-icon-delete"
             size="mini"
@@ -373,7 +397,7 @@ import { getApplicationName } from '@/utils/application'
 
 export default {
   name: 'Publish',
-  dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type'],
+  dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type', 'release_status'],
   components: {
     AddPack,
     DetailModal