From 6a6e7d0cd851402b5cc6ae596f291b48a80342d2 Mon Sep 17 00:00:00 2001
From: anhc <3442943606@qq.com>
Date: Fri, 22 Jul 2022 15:42:02 +0800
Subject: [PATCH] =?UTF-8?q?pal=E8=B5=84=E4=BA=A7=E5=BA=93=20=E5=B0=8F?=
 =?UTF-8?q?=E7=BB=84=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=93=8D=E4=BD=9C=E5=88=97=E8=A1=A8=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/repository/RepositoryList.vue   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryList.vue b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryList.vue
index 81eace5..236e1b6 100644
--- a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryList.vue
+++ b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryList.vue
@@ -26,14 +26,14 @@
                                     <i class="iconfont icon-operate" style="cursor: pointer;">&#xe63c;</i>
                                 </span>
                                 <el-dropdown-menu slot="dropdown" style="min-width: 200px;">
-                                  <el-dropdown-item v-if="mainRepository.folder && havingWritePerm" class="el-dropdown-row" @click.native="openUpdateFolder(mainRepository.id,mainRepository.name,mainRepository.desc,mainRepository.methodId,mainRepository.methodName)">
+                                  <el-dropdown-item v-if="mainRepository.folder && (isOlderVersion ? havingWritePerm : mainRepository.havingWritePerm) " class="el-dropdown-row" @click.native="openUpdateFolder(mainRepository.id,mainRepository.name,mainRepository.desc,mainRepository.methodId,mainRepository.methodName)">
                                       <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"></span><span style="font-size: 12px;">修改{{mainRepository.methodName}}</span></div>
                                   </el-dropdown-item>
                                   <el-dropdown-item v-if="!mainRepository.folder" class="el-dropdown-row" @click.native="openDesigner(mainRepository.id)">
                                       <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"></span><span style="font-size: 12px;">打开模型</span></div>
                                   </el-dropdown-item>
                                   
-                                  <el-dropdown-item v-if="(mainRepository.methodId =='default' && havingWritePerm) || mainRepository.methodId !='default'" divided/>
+                                  <el-dropdown-item v-if="(mainRepository.methodId =='default' && (isOlderVersion ? havingWritePerm : mainRepository.havingWritePerm)) || mainRepository.methodId !='default'" divided/>
                                   
                                   <el-dropdown-item v-if="mainRepository.isFavorite" class="el-dropdown-row" @click.native="setFavorite('0', mainRepository.versionId, mainRepository.id)">
                                     <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"><i class="iconfont" style="font-size: 12px;color: #FFB800;">&#xe618;</i></span><span style="font-size: 12px;">取消收藏</span></div>
@@ -42,16 +42,16 @@
                                     <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"><i class="iconfont" style="font-size: 12px;">&#xe630;</i></span><span style="font-size: 12px;">收藏</span></div>
                                   </el-dropdown-item>
                                   
-                                  <el-dropdown-item v-if="havingWritePerm" class="el-dropdown-row" @click.native="moveFile(mainRepository.id)">
+                                  <el-dropdown-item v-if="(isOlderVersion ? havingWritePerm : mainRepository.havingWritePerm)" class="el-dropdown-row" @click.native="moveFile(mainRepository.id)">
                                     <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"></span><span style="font-size: 12px;">移动至</span></div>
                                   </el-dropdown-item>
-                                  <el-dropdown-item v-if="havingWritePerm" class="el-dropdown-row" @click.native="copyFiles(mainRepository.id)">
+                                  <el-dropdown-item v-if="(isOlderVersion ? havingWritePerm : mainRepository.havingWritePerm)" class="el-dropdown-row" @click.native="copyFiles(mainRepository.id)">
                                     <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"></span><span style="font-size: 12px;">创建副本</span></div>
                                   </el-dropdown-item>
                                   <el-dropdown-item class="el-dropdown-row" @click.native="exportFiles(mainRepository.id)">
                                     <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"></span><span style="font-size: 12px;">导出</span></div>
                                   </el-dropdown-item>
-                                  <el-dropdown-item v-if="isOlderVersion ? havingRemovePerm : filePerm.havingRemovePerm" divided style="height: 30px;line-height: 30px;" @click.native="removeFiles(mainRepository.id)">
+                                  <el-dropdown-item v-if="(isOlderVersion ? havingWritePerm : mainRepository.havingWritePerm)" divided style="height: 30px;line-height: 30px;" @click.native="removeFiles(mainRepository.id)">
                                     <div class="text-important-color" style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"><i class="iconfont icon-lajitong1" style="font-size: 12px;"></i></span><span style="font-size: 12px;">删除模型</span></div>
                                   </el-dropdown-item>
                                   
@@ -136,7 +136,7 @@
                     <template slot-scope="scope">
                       <div style="width: 16px;display: inline-block;">
                         <div class="operate-icon-display">
-                          <el-tooltip v-if="scope.row.folder && havingWritePerm" placement="bottom" :hide-after=2000>
+                          <el-tooltip v-if="scope.row.folder && (isOlderVersion ? havingWritePerm : scope.row.havingWritePerm) " placement="bottom" :hide-after=2000>
                             <span slot="content">修改{{scope.row.methodName}}</span>
                             <i class="iconfont icon-operate" style="display: inline-block;cursor: pointer;" @click="openUpdateFolder(scope.row.id, scope.row.name, scope.row.desc, scope.row.methodId, scope.row.methodName)">&#xe8b5;</i>
                           </el-tooltip>
@@ -167,29 +167,29 @@
                             <i class="iconfont icon-operate" style="cursor: pointer;">&#xe63c;</i>
                           </span>
                             <el-dropdown-menu slot="dropdown" style="min-width: 200px;">
-                              <el-dropdown-item v-if="scope.row.folder && havingWritePerm" class="el-dropdown-row" @click.native="openUpdateFolder(scope.row.id, scope.row.name, scope.row.desc, scope.row.methodId, scope.row.methodName)">
+                              <el-dropdown-item v-if="scope.row.folder && (isOlderVersion ? havingWritePerm : scope.row.havingWritePerm)" class="el-dropdown-row" @click.native="openUpdateFolder(scope.row.id, scope.row.name, scope.row.desc, scope.row.methodId, scope.row.methodName)">
                                 <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"></span><span style="font-size: 12px;">修改{{scope.row.methodName}}</span></div>
                               </el-dropdown-item>
                               <el-dropdown-item v-if="!scope.row.folder" class="el-dropdown-row" @click.native="openDesigner(scope.row.id)">
                                 <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"></span><span style="font-size: 12px;">打开模型</span></div>
                               </el-dropdown-item>
-                              <el-dropdown-item v-if="(scope.row.methodId=='default' && havingWritePerm) || scope.row.methodId!='default'" divided/>
+                              <el-dropdown-item v-if="(scope.row.methodId=='default' && (isOlderVersion ? havingWritePerm : scope.row.havingWritePerm)) || scope.row.methodId!='default'" divided/>
                               <el-dropdown-item v-if="scope.row.isFavorite" class="el-dropdown-row" @click.native="setFavorite('0', scope.row.versionId, scope.row.id)">
                                 <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"><i class="iconfont" style="font-size: 12px;color: #FFB800;">&#xe618;</i></span><span style="font-size: 12px;">取消收藏</span></div>
                               </el-dropdown-item>
                               <el-dropdown-item v-else class="el-dropdown-row" @click.native="setFavorite('1', scope.row.versionId, scope.row.id)">
                                 <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"><i class="iconfont" style="font-size: 12px;">&#xe630;</i></span><span style="font-size: 12px;">收藏</span></div>
                               </el-dropdown-item>
-                              <el-dropdown-item v-if="havingWritePerm" class="el-dropdown-row" @click.native="moveFile(scope.row.id)">
+                              <el-dropdown-item v-if="(isOlderVersion ? havingWritePerm : scope.row.havingWritePerm)" class="el-dropdown-row" @click.native="moveFile(scope.row.id)">
                                 <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"></span><span style="font-size: 12px;">移动至</span></div>
                               </el-dropdown-item>
-                              <el-dropdown-item v-if="havingWritePerm" class="el-dropdown-row" @click.native="copyFiles(scope.row.id)">
+                              <el-dropdown-item v-if="(isOlderVersion ? havingWritePerm : scope.row.havingWritePerm)" class="el-dropdown-row" @click.native="copyFiles(scope.row.id)">
                                 <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"></span><span style="font-size: 12px;">创建副本</span></div>
                               </el-dropdown-item>
                               <el-dropdown-item class="el-dropdown-row" @click.native="exportFiles(scope.row.id)">
                                 <div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"></span><span style="font-size: 12px;">导出</span></div>
                               </el-dropdown-item>
-                              <el-dropdown-item v-if="isOlderVersion ? havingRemovePerm : filePerm.havingRemovePerm" divided style="height: 30px;line-height: 30px;" @click.native="removeFiles(scope.row.id)">
+                              <el-dropdown-item v-if="(isOlderVersion ? havingWritePerm : scope.row.havingWritePerm)" divided style="height: 30px;line-height: 30px;" @click.native="removeFiles(scope.row.id)">
                                 <div class="text-important-color" style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"><i class="iconfont icon-lajitong1" style="font-size: 12px;"></i></span><span style="font-size: 12px;">删除模型</span></div>
                               </el-dropdown-item>
                             </el-dropdown-menu>