From ca41d8eafff551ef24152d5c1a8f54192f6578eb 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 16:11:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E7=9A=84appCode=EF=BC=8C=E5=8F=98=E6=88=90=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf-ui/src/components/FileUpload/index.vue     |  5 ++
 .../src/views/FDS/installationList/index.vue  | 60 +++++++------------
 .../FDS/publishList/components/addPack.vue    |  3 +-
 sf-ui/src/views/deployment/module/index.vue   | 11 ++--
 sf-ui/src/views/deployment/publish/index.vue  | 12 ++--
 sf-ui/src/views/system/user/index.vue         |  2 +-
 6 files changed, 41 insertions(+), 52 deletions(-)

diff --git a/sf-ui/src/components/FileUpload/index.vue b/sf-ui/src/components/FileUpload/index.vue
index a691dbe..8055550 100644
--- a/sf-ui/src/components/FileUpload/index.vue
+++ b/sf-ui/src/components/FileUpload/index.vue
@@ -2,6 +2,7 @@
   <div class="upload-file">
     <el-upload
       ref="fileUpload"
+      :accept="accept"
       :action="baseUrl+uploadFileUrl"
       :before-upload="handleBeforeUpload"
       :file-list="fileList"
@@ -70,6 +71,10 @@ export default {
     uploadFileUrl: {
       type: String,
       default: () => '/system/oss/zip/upload'
+    },
+    accept: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
diff --git a/sf-ui/src/views/FDS/installationList/index.vue b/sf-ui/src/views/FDS/installationList/index.vue
index 20c0f16..4aa0ee1 100644
--- a/sf-ui/src/views/FDS/installationList/index.vue
+++ b/sf-ui/src/views/FDS/installationList/index.vue
@@ -97,31 +97,24 @@
         >批量删除
         </el-button>
       </el-col>
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          v-hasPermi="['deploy:INFO:export']"-->
-      <!--          icon="el-icon-download"-->
-      <!--          plain-->
-      <!--          size="mini"-->
-      <!--          type="warning"-->
-      <!--          @click="handleExport"-->
-      <!--        >导出-->
-      <!--        </el-button>-->
-      <!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
     <el-table v-loading="loading" :data="INFOList" @selection-change="handleSelectionChange">
       <el-table-column align="center" type="selection" width="55"/>
-      <!--      <el-table-column align="center" label="主键" prop="id"/>-->
-      <!--      <el-table-column align="center" label="上传类型" prop="uploadingType">-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <dict-tag :options="dict.type.sys_apk_uploading_type" :value="scope.row.uploadingType"/>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
       <el-table-column align="center" label="安装包名称" prop="sysApkName"/>
       <el-table-column align="center" label="版本号" prop="version"/>
-      <el-table-column align="center" label="安装包" prop="sysApk"/>
+      <el-table-column align="center" label="安装包" prop="sysApk">
+        <template slot="header" slot-scope="scope">
+          <span>安装包</span>
+          <el-tooltip placement="top">
+            <div slot="content">复制当前的安装包地址</div>
+            <i class="el-icon-warning-outline" size="20"></i>
+          </el-tooltip>
+        </template>
+        <template slot-scope="scope">
+          <el-button icon="el-icon-copy" type="primary" @click="copyIt(scope.row.sysApk)">复制</el-button>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="安装包大小" prop="sysApkSize"/>
       <el-table-column align="center" label="安装包类型" prop="sysType">
         <template slot-scope="scope">
@@ -129,7 +122,7 @@
         </template>
       </el-table-column>
       <el-table-column align="center" label="创建人" prop="created"/>
-      <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
+      <el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作">
         <template slot-scope="scope">
 
           <el-button
@@ -179,16 +172,7 @@
     <!-- 添加或修改安装包管理（新）对话框 -->
     <el-dialog :title="title" :visible.sync="open" append-to-body width="700px">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <!--        <el-form-item label="上传类型" prop="uploadingType">-->
-        <!--          <el-select v-model="form.uploadingType" placeholder="请选择上传类型">-->
-        <!--            <el-option-->
-        <!--              v-for="dict in dict.type.sys_apk_uploading_type"-->
-        <!--              :key="dict.value"-->
-        <!--              :label="dict.label"-->
-        <!--              :value="dict.value"-->
-        <!--            ></el-option>-->
-        <!--          </el-select>-->
-        <!--        </el-form-item>-->
+
         <el-form-item label="安装包名称" prop="sysApkName">
           <el-input v-model="form.sysApkName" placeholder="请输入安装包名称"/>
         </el-form-item>
@@ -196,12 +180,12 @@
           <el-input v-model="form.version" placeholder="请输入版本号"/>
         </el-form-item>
         <el-form-item label="安装包" prop="sysApk">
-          <file-upload v-model="form.sysApk" :fileSize="50" :fileType="['apk','hap','iap','zip']" :limit="1"
+          <file-upload v-model="form.sysApk" :accept="['.zip','.apk','.hap','.iap']" :fileSize="50"
+                       :fileType="['apk','hap','iap','zip']"
+                       :limit="1"
                        uploadFileUrl="/system/oss/upload"
                        @getSize="getSize"
           />
-
-          <!--          <file-upload v-model="form.sysApk"/>-->
         </el-form-item>
         <el-form-item label="安装包大小" prop="sysApkSize">
           <el-input v-model="form.sysApkSize" placeholder="请输入安装包大小" readonly/>
@@ -260,6 +244,7 @@
 
 <script>
 import { addINFO, delINFO, getINFO, listINFO, updateINFO } from '@/api/FDS/installList'
+import Cookies from 'js-cookie'
 
 export default {
   name: 'INFO',
@@ -274,7 +259,7 @@ export default {
         sysApk: null,
         sysApkSize: undefined,
         sysType: '',
-        appCode: '000000'
+        appCode: Cookies.get('Admin-Application-Id')
       },
 
       // 遮罩层
@@ -354,7 +339,7 @@ export default {
         sysApk: null,
         sysApkSize: undefined,
         sysType: '',
-        appCode: '000000'
+        appCode: Cookies.get('Admin-Application-Id')
       }
       this.resetForm('form')
     },
@@ -409,9 +394,8 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             let data = Object.assign({}, this.form)
-            console.log(data)
-            data.appCode = '000000'
-            delete data.explain
+            data.appCode = Cookies.get('Admin-Application-Id'),
+              delete data.explain
             updateINFO(data).then(response => {
               this.$modal.msgSuccess('修改成功')
               this.open = false
diff --git a/sf-ui/src/views/FDS/publishList/components/addPack.vue b/sf-ui/src/views/FDS/publishList/components/addPack.vue
index e612f5d..65430db 100644
--- a/sf-ui/src/views/FDS/publishList/components/addPack.vue
+++ b/sf-ui/src/views/FDS/publishList/components/addPack.vue
@@ -45,6 +45,7 @@
 <script>
 
 import { listINFO } from '@/api/FDS/installList'
+import Cookies from 'js-cookie'
 
 export default {
   name: 'AddPack',
@@ -72,7 +73,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         sysApkName: null,
-        appCode: '000000'
+        appCode: Cookies.get('Admin-Application-Id')
       }
     }
   },
diff --git a/sf-ui/src/views/deployment/module/index.vue b/sf-ui/src/views/deployment/module/index.vue
index 6117843..0c06322 100644
--- a/sf-ui/src/views/deployment/module/index.vue
+++ b/sf-ui/src/views/deployment/module/index.vue
@@ -158,9 +158,9 @@
         </el-form-item>
         <el-form-item label="安装包" prop="moduleUrl">
 
-          <file-upload v-model="form.moduleUrl" :fileSize="20" :fileType="['zip']"
+          <file-upload v-model="form.moduleUrl" :accept="['.zip']" :fileSize="20"
+                       :fileType="['zip']"
                        :limit="1"
-
                        @getSize="getSize"
           />
         </el-form-item>
@@ -268,6 +268,7 @@
 
 <script>
 import { addModule, delModule, getModule, listModule, updateModule } from '@/api/deployment/module'
+import Cookies from 'js-cookie'
 
 export default {
   name: 'Module',
@@ -369,7 +370,7 @@ export default {
         modified: null,
         createTime: null,
         updateTime: null,
-        appCode: '000000'
+        appCode: Cookies.get('Admin-Application-Id')
       }
       this.resetForm('form')
     },
@@ -424,8 +425,8 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             let data = Object.assign({}, this.form)
-            data.appCode = '000000'
-            delete data.explain
+            data.appCode = Cookies.get('Admin-Application-Id'),
+              delete data.explain
             updateModule(data).then(response => {
               this.$modal.msgSuccess('修改成功')
               this.open = false
diff --git a/sf-ui/src/views/deployment/publish/index.vue b/sf-ui/src/views/deployment/publish/index.vue
index 456cb98..bd941a7 100644
--- a/sf-ui/src/views/deployment/publish/index.vue
+++ b/sf-ui/src/views/deployment/publish/index.vue
@@ -98,27 +98,26 @@
       <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">
+      <el-table-column align="center" label="公开版" prop="publicVersion">
         <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 :show-overflow-tooltip="true" align="center" label="强制更新" prop="forceUpdate" width="90">
+      <el-table-column :show-overflow-tooltip="true" align="center" label="强制更新" prop="forceUpdate">
         <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 :show-overflow-tooltip="true" align="center" label="上传时间" prop="updateTime" width="120">
+      <el-table-column :show-overflow-tooltip="true" align="center" label="上传时间" prop="updateTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" align="center" label="发布环境" prop="publishEnvironment"
-                       width="180"
       >
         <template slot-scope="scope">
           <div v-for="item in environmentList" :key="item.id">
@@ -129,7 +128,6 @@
       </el-table-column>
 
       <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"/>
@@ -138,7 +136,7 @@
 
       <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">
+      <el-table-column :show-overflow-tooltip="true" align="center" label="公开时间" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -464,7 +462,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         sysApkName: null,
-        appCode: '000000'
+        appCode: Cookies.get('Admin-Application-Id')
       },
       // 表单校验
       rules: {
diff --git a/sf-ui/src/views/system/user/index.vue b/sf-ui/src/views/system/user/index.vue
index bfd8720..d644ab0 100644
--- a/sf-ui/src/views/system/user/index.vue
+++ b/sf-ui/src/views/system/user/index.vue
@@ -667,4 +667,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>