From 703a9a427d24f3c3cef6fb7eba0b563cdfdf17ac Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Mon, 31 Oct 2022 17:18:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=A6=E4=BE=A7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98/?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/repository/RepositoryList.vue   | 28 +++++++++++--------
 .../src/views/repository/RepositoryMain.vue   |  2 +-
 2 files changed, 17 insertions(+), 13 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 afbf864..2e21273 100644
--- a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryList.vue
+++ b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryList.vue
@@ -1097,22 +1097,22 @@
             break;
           }
         }
-        if(this.singleSelectedRepository.folder==true && this.crrentUserId!='admin'){
-          this.$message({message: '文件夹不可进行移动操作！！',type: 'warning'});
-          return;
-        }
-        if(this.singleSelectedRepository.versionStatus!="") {
-          if (this.singleSelectedRepository.versionStatus.isPublish == true) {
-            this.$message({message: '当前文件已处于发布状态，不可进行移动文件操作！！', type: 'warning'});
-            return;
 
-          }
-        }
         console.log(this.singleSelectedRepository)
         //主repository移动文件
         if(undefined == this.singleSelectedRepository.id || null == this.singleSelectedRepository.id){
           this.singleSelectedRepository = this.mainRepository;
         }
+        if(this.singleSelectedRepository.folder==true && this.crrentUserId!='admin'){
+          this.$message({message: '文件夹不可进行移动操作！！',type: 'warning'});
+          return;
+        }
+        if (this.singleSelectedRepository.isPublish == true) {
+          this.$message({message: '当前文件已处于发布状态，不可进行移动文件操作！！', type: 'warning'});
+          return;
+        }
+
+
         this.moveRepository.visible = true;
       },
       moveFiles() {// 移动文件（多选批量）
@@ -1131,15 +1131,14 @@
                 this.$message({message: '当前文件已处于发布状态，不可进行移动文件操作！！',type: 'warning'});
                 return;
               }
-
             }
           }
 
-
         }
         this.moveRepository.visible = true;
       },
       saveMoveRepositoryResult(data) {// 移动文件之后获取确定结果
+
         if (data.length == 0) {
           this.$message({message: '未选择要移入的目标文件，移动操作被取消',type: 'warning'});
           return;
@@ -1147,6 +1146,8 @@
         this.moveRepository.visible = false;
         // 移动
         const that = this;
+
+        that.tableLoading = true;
         let sourceData = JSON.stringify(that.checkedRepositorys);
         if (this.moveRepository.type == 'single') {
           let tmpArr = [];
@@ -1196,6 +1197,7 @@
                 params.data.sourceData = JSON.stringify(tempArr);
                 // 查询数据
                 awsuiAxios.post(params).then(function (ro) {
+                  that.tableLoading = false;
                   if(ro.result == 'ok') {
                     that.$message({
                       message: '移动成功',
@@ -1225,6 +1227,7 @@
         }else{
           // 查询数据
           awsuiAxios.post(params).then(function (ro) {
+            that.tableLoading = false;
             if(ro.result == 'ok') {
               that.$message({
                 message: '移动成功',
@@ -1806,6 +1809,7 @@
             }
           };
           awsuiAxios.post(data).then(function (ro) {
+            debugger;
             if(ro.result == 'ok') {
               that.$refs.repositoryInfo.openRepositoryInfoDlg(that, mainRepository.id, mainRepository.version, type, mainRepository.isUse, mainRepository.isPublish, mainRepository.isStop, mainRepository.isApproval, mainRepository.methodId);
             }else{
diff --git a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMain.vue b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMain.vue
index 22819ea..d38579f 100644
--- a/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMain.vue
+++ b/com.actionsoft.apps.coe.pal/src/views/repository/RepositoryMain.vue
@@ -927,7 +927,7 @@
             openNode(obj, node, tree) {// 打开一只模型文件
                 if(obj.folder==false){
                     // window.open(node.data.url, '_blank'); //在新窗口显示目标网页
-                    openDesigner(this.$store.getters.getTeamIdFn, node.data.id, this.$store.state.sessionId);
+                    openDesigner(this.$store.getters.getTeamIdFn, node.data.currId, this.$store.state.sessionId);
                 }else{
                     this.closeCreatePopover();
                     this.openRepositoryList(node.data.currId);