[VersionBeta] V.1.0.0.0

[Adds]
1.修改实时属性卡顿问题

src/views/main_web/workspace.vue

@@ -33,21 +33,6 @@
         <div class="pxline"></div>
         <div class="flex_right_pain_body">
           <div class="yiyun_app_itemClasss" v-show="nowFolderName != '公共文件夹'">
-            <!-- <span class="yiyun_yinyongname">通用</span>
-            <ul class="yiyun_app_info_box">
-              <li @click="projectEdit">
-                <span class="fl">项目概况</span>
-                <i class="el-collapse-item__arrow el-icon-arrow-right right-list_btn"></i>
-              </li>
-              <li @click="projectFoldeEdit" v-if="isProjectManager">
-                <span class="fl">项目编辑</span>
-                <i class="el-collapse-item__arrow el-icon-arrow-right right-list_btn"></i>
-              </li>
-              <li @click="EditStaffAndTip" v-if="isFolderManager">
-                <span class="fl">工作指派</span>
-                <i class="el-collapse-item__arrow el-icon-arrow-right right-list_btn"></i>
-              </li>
-            </ul>-->
             <span class="yiyun_yinyongname" v-if="isUseFolderChange">协同设置</span>
             <ul class="yiyun_app_info_box" v-if="isUseFolderChange">
               <li @click="FileShareSet">
@@ -55,13 +40,6 @@
                 <i class="el-collapse-item__arrow el-icon-arrow-right right-list_btn"></i>
               </li>
             </ul>
-            <!-- <span class="yiyun_yinyongname">通知</span>
-            <ul class="yiyun_app_info_box">
-              <li>
-                <span class="fl">管理文件更新通知</span>
-                <i class="el-collapse-item__arrow el-icon-arrow-right right-list_btn"></i>
-              </li>
-            </ul>-->
           </div>
           <div class="yiyun_app_itemClasss" v-show="nowFolderName == '公共文件夹'">
             <span class="yiyun_yinyongname">通用</span>
@@ -258,14 +236,6 @@
                       工作文件
                       <i class="el-icon-arrow-left"></i>
                     </a>
-                    <!-- <a class="yywenjiantitle-text" 
-                        v-for="item in folderGroupBreads" 
-                        v-bind:key="item.foldergroupID" 
-                        href="javascript:;"
-                        @click="breadNodeClickEvent(item,false)">
-                      {{ item.folderGroupName }}
-                      <i class="el-icon-arrow-left"></i>
-                    </a>-->
                     <draggable
                       class="list-group"
                       :list="folderGroupBreads"
@@ -299,14 +269,6 @@
                       工作文件
                       <i class="el-icon-arrow-left"></i>
                     </a>
-                    <!-- <a class="yywenjiantitle-text" 
-                        v-for="item in folderGroupBreads" 
-                        v-bind:key="item.foldergroupID" 
-                        href="javascript:;"
-                        @click="breadNodeClickEvent(item,false)">
-                      {{ item.folderGroupName }}
-                      <i class="el-icon-arrow-left"></i>
-                    </a>-->
                     <draggable
                       class="list-group"
                       :list="folderGroupBreads"
@@ -377,218 +339,6 @@
                     <span class="newbtn_label">新建文件</span>
                   </div>
                 </div>
-                <!--zxm 注释 start-->
-                <!--<div
-                  v-for="(file, index) in myFilesList"
-                  :key="index"
-                  @dblclick="fileClick(file)"
-                  @mouseover="isShowIcon"
-                  @mouseout="ishideIcon">
-                  <div class="yiyun_wenjian_list" v-if="file.isShowFile == true">
-                    <div class>
-                      <div
-                        class="defultImage-mid"
-                        :class="file.extension+'-mid'"
-                        v-if="
-                          file.extension != 'jpg' &&
-                            file.extension != 'png' &&
-                            file.extension != 'bmp' &&
-                            file.extension != 'gif' &&
-                            file.extension != 'jpeg'
-                        "
-                        @contextmenu.prevent="rightShowMenu($event, file, 1)"
-                      ></div>
-                      <div
-                        class="defultImage-mid img_bg-mid"
-                        v-if="
-                          file.extension == 'jpg' ||
-                            file.extension == 'png' ||
-                            file.extension == 'bmp' ||
-                            file.extension == 'gif' ||
-                            file.extension == 'jpeg'
-                        "
-                        @contextmenu.prevent="rightShowMenu($event, file, 1)"
-                      >
-                        <div class="file_Imgbox-mid">
-                          <img v-lazy="imgSrc + file.alias" alt class="file_Img" />
-                        </div>
-                </div>-->
-                <!-- 標簽 -->
-                <!--<div class="eidtTip" v-if=" file.status == 1">工作中</div>
-
-                      <div v-if="file.status == 0" class="yijianxietong isonselect_defual">
-                        <i
-                          class="icon font_family icon-icon_status_wenjianbiaojiwancheng yijianIcon"
-                          title="工作中"
-                          @click="setFileStatus(file, 2, '更新为已完成',1)"
-                        ></i>
-                      </div>
-                      <div v-if="file.status == 1" class="yijianxietong isonselect_update">
-                        <i
-                          class="icon font_family icon-icon_status_wenjianbiaojigengxin yijianIcon"
-                          title="已更新"
-                          @click="setFileStatus(file, 0, '文件已更新',1)"
-                        ></i>
-                      </div>
-                      <div v-if="file.status == 2" class="yijianxietong isonselect">
-                        <i
-                          class="icon font_family icon-icon_status_wenjianbiaojiwancheng yijianIcon"
-                          title="已完成"
-                          @click="setFileStatus(file, 0, '更新为工作中',1)"
-                        ></i>
-                      </div>
-                      <div v-if="file.status == 3" class="yijianxietong isonselect_err">
-                        <i
-                          class="icon font_family icon-icon_status_wenjianbiaojiquxiao yijianIcon"
-                          title="已取消协同"
-                          @click="setFileStatus(file, 0, '已开启文件协同',2)"
-                        ></i>
-                      </div>
-                      <div class="top_optionBar">
-                        <el-dropdown>
-                          <span class="el-dropdown-link">
-                            <i
-                              class="icon iconfont icon_small-icon_small_wenjianshezhi settingIcon"
-                            ></i>
-                          </span>
-                          <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item
-                              @click.native="openOffice(file)"
-                              v-if="
-                                file.extension == 'pdf' ||
-                                  file.extension == 'xls' ||
-                                  file.extension == 'xlsx' ||
-                                  file.extension == 'doc' ||
-                                  file.extension == 'docx' ||
-                                  file.extension == 'ppt' ||
-                                  file.extension == 'pptx' ||
-                                  file.extension == 'txt'
-                              "
-                            >
-                              <span>在线查看</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item @click.native="fileClick(file)" v-if="isClient">
-                              <span>打开</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item @click.native="fileClickSelect(file)" v-if="isClient">
-                              <span>打开方式</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item
-                              @click.native="
-                                setFileStatus(file, 2, '更新为已完成',1)
-                              "
-                              divided
-                              v-if="file.status == 1 || file.status == 0"
-                            >
-                              <span>搞定</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item
-                              @click.native="
-                                setFileStatus(file, 0, '已开启文件协同',2)
-                              "
-                              v-if="isUseShare && file.status == 3"
-                            >
-                              <span>开启协同</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item
-                              @click.native="
-                                setFileStatus(file, 3, '文件已取消协同',1)
-                              "
-                              v-if="isUseShare && file.status != 3"
-                            >
-                              <span>取消协同</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item
-                              @click.native="createMilestone(file)"
-                              divided
-                            >
-                              <span>保存历史文件</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item
-                              @click.native="showFileMilestone(file)"
-                            >
-                              <span>选择历史文件</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item @click.native="copyFile(file)" divided>
-                              <span>建立副本</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item
-                              v-if="isUseCommon && file.commonStatus == 0 && nowFolderName != '公共文件夹'"
-                              @click.native="updateToPublicFile(file,0)"
-                              divided
-                            >
-                              <span>提交至项目公共文件夹</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item
-                              v-if="isUseCommon && file.commonStatus == 1"
-                              @click.native="updateToPublicFile(file,1)"
-                              divided
-                            >
-                              <span>取消至项目公共文件夹</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item @click.native="copyAndMoveFolder(file, 'move')">
-                              <span>转移至其他工作</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item @click.native="copyAndMoveFolder(file, 'copy')">
-                              <span>复制至其他工作</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item
-                              divided
-                              @click.native="downLoadMyFile(file)"
-                              v-if="file.extension !='map' && file.extension !='supermap' "
-                            >
-                              <span>下载至本地</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item v-if="file.extension == 'svfzip' "  @click.native="shareMyFile(file)">
-                              <span>分享</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item @click.native="reNameyMyFile(file)">
-                              <span>重命名</span>
-                            </el-dropdown-item>
-                            <el-dropdown-item @click.native="delMyFile(file)">
-                              <span>移到回收站</span>
-                            </el-dropdown-item>
-                          </el-dropdown-menu>
-                        </el-dropdown>
-                      </div>
-                      <strong
-                        class="yiyunwenjian_name"
-                        :title="file.archName + '.' + file.extension"
-                >{{ file.archName }}</strong>-->
-                <!-- <span class="yiyunwenjian_infodesc">{{file.strCreateTime}}</span> -->
-                <!--<span
-                        v-if="nowFolderName == '公共文件夹' && file.createUserID == userId"
-                        class="yiyunwenjian_infodesc"
-                      >由我创建</span>
-                      <span
-                        v-if="nowFolderName == '公共文件夹' && file.createUserID != userId"
-                        class="yiyunwenjian_infodesc"
-                >{{file.cnName}}创建</span>-->
-                <!--span 本来就注视着呢-->
-                <!-- <span
-                        v-if="nowFolderName != '公共文件夹' && file.createUserID == userId"
-                        class="yiyunwenjian_infodesc"
-                >由我创建</span>-->
-                <!--<span
-                        v-if="nowFolderName != '公共文件夹' && file.createUserID != userId"
-                        class="yiyunwenjian_infodesc"
-                      >{{file.cnName}}创建</span>
-                </div>-->
-                <!-- 文件状态显示 -->
-                <!--<div class="filestate" v-if="false">
-                      <span>文件编辑中</span>
-                    </div>
-                    <span
-                      v-if="file.version != 1"
-                      class="visontext"
-                      @click="showFileMilestone(file)"
-                    >
-                      版本
-                      {{ file.version }}
-                    </span>
-                  </div>
-                </div>-->
-                <!--zxm 注释 end-->
                 <!-- zxm修改托拽 start -->
                 <!--显示文件 -->
                 <draggable
@@ -2319,7 +2069,6 @@ export default {
       strFileOrFoldergroup: "", //右键菜单 移动/复制到其他工作 是文件还是文件分组标记
       draggableData: {}, //记录要移动的数据
       timer:{},//文件计时器对象
-      timer1:{},//文件分组分组计时器
       /**新建文件夹 end*/
     };
   },
@@ -2364,6 +2113,7 @@ export default {
      * 0:我的文件   1：工作文件
      */
     changeWorkdata(i) {
+      clearInterval(this.timer)
       this.currentPageType = i;
       this.dbClickSelectedFolderGroupData = {}; //切换我的文件和工作文件 清空双击的文件分组对象
       if (this.currentPageType == 0) {
@@ -2692,7 +2442,6 @@ export default {
                       offset: 100,
                       duration: 2500
                     });
-                    //thisApp.listFiles();//zxm注释11
                     if (
                       thisApp.dbClickSelectedFolderGroupData == null ||
                       JSON.stringify(thisApp.dbClickSelectedFolderGroupData) ==
@@ -2752,7 +2501,6 @@ export default {
                           offset: 100,
                           duration: 2500
                         });
-                        //thisApp.listFiles();//zxm注释11
                         if (
                           thisApp.dbClickSelectedFolderGroupData == null ||
                           JSON.stringify(
@@ -2808,7 +2556,6 @@ export default {
                       offset: 100,
                       duration: 2500
                     });
-                    //thisApp.listFiles();//zxm注释11
                     if (
                       thisApp.dbClickSelectedFolderGroupData == null ||
                       JSON.stringify(thisApp.dbClickSelectedFolderGroupData) ==
@@ -2867,7 +2614,6 @@ export default {
                           offset: 100,
                           duration: 2500
                         });
-                        //thisApp.listFiles();//zxm注释11
                         if (
                           thisApp.dbClickSelectedFolderGroupData == null ||
                           JSON.stringify(
@@ -2973,8 +2719,10 @@ export default {
             }
             thisApp.nowFolder = thisApp.listUserFolders[thisApp.nowFolderIndex];
             thisApp.listFiles();
-            thisApp.timer=setInterval(()=>{thisApp.listFiles()}, 3 * 1000); 
-            // thisApp.loadMyAppInstanceList();
+            if(thisApp.dbClickSelectedFolderGroupData==null || JSON.stringify(thisApp.dbClickSelectedFolderGroupData)=='{}')  
+            {
+              thisApp.timer=setInterval(()=>{thisApp.listFiles()}, 3 * 1000);    
+            }
           }
         })
         .catch(error => {
@@ -3100,7 +2848,6 @@ export default {
               }
             }
             thisApp.listCollaborationFiles();
-            //thisApp.listCollaborationApps();
           })
           .catch(error => {
             console.log(error);
@@ -4935,7 +4682,6 @@ export default {
      * 当前工作点击
      */
     nowFolderClick(index) {
-      console.log("zxm点击当前节点")
       this.isShowRightManager = false;
       this.nowFolderIndex = index;
       sessionStorage.nowFolderIndex = index;
@@ -4944,9 +4690,9 @@ export default {
       this.folderGroupBreads = []; //zxm+ 点击工作链节点时 清空面包屑
       this.isShowWorkt = true; //zxm+ 点击工作链节点时 显示我的文件和工作文件
       this.isShowBread = false; //zxm+ 点击工作链节点时 隐藏面包屑
-      clearInterval(this.timer)//zxm+ 切换节点清空一下文件定时器 避免加载数据乱跳
-      clearInterval(this.timer1)//zxm+ 切换节点清空一下文件文件分组定时器 避免加载数据乱跳
-      this.timer1 = setInterval(()=>{this.listFiles()}, 3 * 1000);   
+      clearInterval(this.timer)
+      this.listFiles();   
+      this.timer=setInterval(()=>{this.listFiles()}, 3 * 1000);   
       // this.loadMyAppInstanceList();//zxm
     },
     /**
@@ -4962,10 +4708,9 @@ export default {
         this.folderGroupBreads = []; //zxm+ 点击工作链节点时 清空面包屑
         this.isShowWorkt = true; //zxm+ 点击工作链节点时 显示我的文件和工作文件
         this.isShowBread = false; //zxm+ 点击工作链节点时 隐藏面包屑
-        clearInterval(this.timer)//zxm+ 切换节点清空一下文件定时器 避免加载数据乱跳
-        clearInterval(this.timer1)//zxm+ 切换节点清空一下文件文件分组定时器 避免加载数据乱跳
-        this.timer1 = setInterval(()=>{this.listFiles()}, 3 * 1000);  
-        // this.loadMyAppInstanceList();
+        clearInterval(this.timer)
+        this.listFiles();  
+        this.timer=setInterval(()=>{this.listFiles()}, 3 * 1000);   
       } else {
         this.$notify({
           title: "温馨提示",
@@ -4983,7 +4728,6 @@ export default {
       this.nowFolderIndex = index;
       this.nowFolder = this.listUserFolders[this.nowFolderIndex];
       this.listFiles();
-      // this.loadMyAppInstanceList();
       this.closeAppManagePain();
       sessionStorage.nowFolderIndex = index;
     },
@@ -5250,7 +4994,6 @@ export default {
         thisApp.listUserFolders[thisApp.nowFolderIndex].folderID;
       if (openFolderId !== null) {
         var foldergroupId = "";
-        //zxm+ foldergroupId
         if (
           this.dbClickSelectedFolderGroupData != null &&
           JSON.stringify(this.dbClickSelectedFolderGroupData) != "{}"
@@ -5273,7 +5016,6 @@ export default {
           .then(response => {
             // this.isShowNewFiledialog = false;
             if (response.data.state == 1) {
-              //this.listFiles();
               //zxm修改 如果直接在工作节点下上传文件走listFiles获取数据，否则在文件分组下上传文件则走intoFoldergroup获取数据
               if (foldergroupId == null || foldergroupId == "") {
                 this.listFiles();
@@ -5609,7 +5351,6 @@ export default {
         .then(response => {
           this.dialogNewFolderGroup = false;
           if (response.data.state == 1) {
-            //this.listFiles();
             if (
               this.dbClickSelectedFolderGroupData == null ||
               JSON.stringify(this.dbClickSelectedFolderGroupData) == "{}"
@@ -5650,8 +5391,8 @@ export default {
     /**
      * 双击文件夹组名称 进入文件夹
      */
-    intoFoldergroup: function(foldergroup) {
-      console.log("zxm-文件分组 ")
+    intoFoldergroup: function(foldergroup) {      
+      console.log("zxm-文件分組")
       this.dbClickSelectedFolderGroupData = foldergroup;
       this.isShowWorkt = false;
       this.isShowBread = true;
@@ -5686,14 +5427,7 @@ export default {
             this.folderGroupBreads = response.data.data.listBreadFolderGroups;
           } 
           clearInterval(this.timer)
-          clearInterval(this.timer1)
-          this.timer1 = setInterval(()=>{this.intoFoldergroup(foldergroup)}, 3 * 1000);   
-          // // 加载我的文件
-          // this.myFilesList = response.data.data.listMyFiles;
-          // //zxm+ 加载我的文件夹组
-          // this.myListFolderGroups = response.data.data.listFolderGroups
-          // //zxm+ 加载文件分组面包屑
-          // this.folderGroupBreads = response.data.data.listBreadFolderGroups
+          this.timer = setInterval(()=>{this.intoFoldergroup(foldergroup)}, 3 * 1000);
         }
       });
     },
@@ -5705,15 +5439,16 @@ export default {
     breadNodeClickEvent: function(obj, isBreadFirstNode) {
       var thisApp = this;
       clearInterval(thisApp.timer)
-      clearInterval(thisApp.timer1)
       thisApp.folderGroupBreads = [];
       if (isBreadFirstNode) {
         thisApp.isShowWorkt = true;
         thisApp.isShowBread = false;
         thisApp.dbClickSelectedFolderGroupData = {};
-        thisApp.timer1 = setInterval(()=>{this.listFiles()}, 3 * 1000);  
+        this.listFiles()
+        thisApp.timer = setInterval(()=>{this.listFiles()}, 3 * 1000);  
       } else {
         thisApp.intoFoldergroup(obj);
+        thisApp.timer = setInterval(()=>{thisApp.intoFoldergroup(obj)}, 3 * 1000);  
       }
     },
     /**
@@ -6044,7 +5779,6 @@ export default {
   destroyed: function() {
     window.removeEventListener("scroll", this.onscroll);
     clearInterval(this.timer)
-    clearInterval(this.timer1)
   },
   components: {
     Forgeview: forgeview,