接口联调

src/api/modules/sheetApi.js

@@ -492,5 +492,48 @@ export const sheetAnalysisInterface = {
 	 */
 	checkSheetRepeat: params => {
 		return http.get('/custom_analysis/excel_by_name',params)
-	}
+	},
+	/**
+	 * 全分类列表
+	 * @param {Object} params
+	 * @param {Boolean} params.IsShare 是否是共享列表
+	 * @returns 
+	 */
+	getSheetTreeList:params=>{
+		return http.get('/custom_analysis/excel_classify/list',params)
+	},
+	/**
+	 * 搜索和分类列表
+	 * @param {Object} params 
+	 * @param {Number} params.PageSize
+	 * @param {Number} params.CurrentIndex
+	 * @param {Number} params.ExcelClassifyId
+	 * @param {String} params.Keyword
+	 * @param {String} params.IsShare
+	 * @returns 
+	 */
+	getSheetList:params=>{
+		return http.get('/custom_analysis/excel/list',params)
+	},
+	/**
+	 * 设置表格分享
+	 * @param {Object} params 
+	 * @param {Number} params.ExcelInfoId
+	 * @param {Number[]} params.ViewUserIds
+	 * @param {Number[]} params.EditUserIds
+	 * @returns 
+	 */
+	setSheetShare:params=>{
+		return http.post('/custom_analysis/excel/share',params)
+	},
+	/**
+	 * 获取表格分享详情
+	 * @param {Object} params 
+	 * @param {Number} params.ExcelInfoId
+	 * @returns 
+	 */
+	getSheetShareDetail:params=>{
+		return http.get('/custom_analysis/excel/share_detail',params)
+	},
+
 }

src/views/datasheet_manage/customAnalysis/addAnalysisSheet.vue

@@ -133,12 +133,26 @@ export default {
 
     /* 获取分类 */
     getClassify() {
-      sheetInterface.excelClassifyOne({Source: 4}).then(res => {
+        sheetInterface.sheetAnalysisInterface.getSheetTreeList({IsShare:false}).then((res) => {
         if(res.Ret !==200) return
-        
-        this.classifyArr = res.Data.AllNodes || [];
+        this.classifyArr = this.formatTreeData(_.cloneDeep(res.Data.AllNodes || []))
+
       })
     },
+    formatTreeData(tree){
+        function dfs(node){
+            if (Array.isArray(node.Children)) {
+                node.Children = node.Children.filter(dfs)
+                if(node.Children.length===0) delete node.Children
+            }
+            
+            if(node.ExcelInfoId) {
+                return null
+            }
+            return node
+        }
+        return tree.filter(dfs)
+    },
 
     loadDataSync() {
       let len = this.sheetConfig.data.length;

src/views/datasheet_manage/customAnalysis/components/shareTableDia.vue

@@ -25,6 +25,7 @@
                                 v-model="shareDataList[index].selectList"
                                 :options="shareDataList[index].userList"
                                 :show-all-levels="false"
+                                :key="shareDataList[index].selectKey"
                                 filterable
                                 :props="{
                                     value:'NodeId',
@@ -41,7 +42,7 @@
                         <div class="list-box">
                             <div class="list-item" v-for="item in shareDataList[index].selectShowList" :key="item.userId">
                                 {{ item.label }}
-                                <span class="close-btn">
+                                <span class="close-btn" @click.stop="cancelSelectUser(index,item)">
                                     <i class="el-icon-error"></i>
                                 </span>
                             </div>
@@ -59,6 +60,7 @@
 
 <script>
 import { departInterence } from "@/api/api.js";
+import * as sheetInterface from "@/api/modules/sheetApi.js";
 export default {
     props:{
         isOpenDialog:{
@@ -85,6 +87,7 @@ export default {
                     selectList:[],//选择的用户id 
                     selectShowList:[],//选择的用户
                     userList:[],//用户列表
+                    selectKey:0,
                 },//可查看
                 {
                     isExpand:true,
@@ -140,12 +143,16 @@ export default {
         },
         //获取表格权限列表
         getTableInfo(){
-            this.shareDataList[0].selectList = [36558]
-            this.shareDataList[1].selectList = [27]
-            //接口获取
-            //设置选中状态
-            this.selectListChange(0)
-            this.selectListChange(1)
+            sheetInterface.sheetAnalysisInterface.getSheetShareDetail({
+                ExcelInfoId:this.tableInfo.ExcelInfoId
+            }).then(res=>{
+                const {ViewUserIds=[],EditUserIds=[]} = res.Data||{}
+                this.shareDataList[0].selectList = ViewUserIds||[]
+                this.shareDataList[1].selectList = EditUserIds||[]
+                //设置选中状态
+                this.selectListChange(0)
+                this.selectListChange(1)
+            })
         },
         //筛选框选中变化
         selectListChange(index){
@@ -165,6 +172,15 @@ export default {
                 this.setListDisabled(nodes.map(i=>i.value),this.shareDataList[otherIndex].userList)
             })
         },
+        //取消选择
+        cancelSelectUser(index,user){
+            const selectIndex = this.shareDataList[index].selectList.findIndex(i=>i===user.userId)
+            selectIndex!==-1&&this.shareDataList[index].selectList.splice(selectIndex,1)
+            this.shareDataList[index].selectKey++
+            this.$nextTick(()=>{
+                this.selectListChange(index)
+            })
+        },
         saveHandle(){
             //两个都没选,提示
             const {selectList:checkList=[]} = this.shareDataList[0]
@@ -172,6 +188,15 @@ export default {
             if(!checkList.length&&!editList.length){
                 return this.$message.warning(/* '未选择用户,请检查' */ this.$t('CustomAnalysisPage.share_set_hint'))
             }
+            sheetInterface.sheetAnalysisInterface.setSheetShare({
+                ExcelInfoId:this.tableInfo.ExcelInfoId,
+                ViewUserIds:checkList,
+                EditUserIds:editList
+            }).then(res=>{
+                if(res.Ret!==200) return 
+                this.$message.success(`设置共享成功`)
+                this.$emit('setShare')
+            })
         },
     },
 };

src/views/datasheet_manage/customAnalysis/list.vue

@@ -20,7 +20,7 @@
           >{{$t('CustomAnalysisPage.up_file_btn')}}</el-button>
           <input type="file" @change="fileSelected" id="file"  style="display: none;">
           <!-- 只看我的 -->
-          <el-checkbox v-model="isShowMe"  @change="() => { getTreeData();getPublicList() }">{{$t('Chart.only_see_mine')}}</el-checkbox>
+          <!-- <el-checkbox v-model="isShowMe"  @change="() => { getTreeData();getPublicList() }">{{$t('Chart.only_see_mine')}}</el-checkbox> -->
         </div>
         <div class="search-cont">
           <el-select
@@ -147,12 +147,12 @@
                   v-if="!data.ExcelInfoId&&isSheetBtnShow('classifyOpt_delete')"
                 />
                 <!-- 表格操作：共享/取消共享 -->
-                <span v-if="data.ExcelInfoId">
+                <span v-if="data.ExcelInfoId&&data.ShowShareBtn">
                     <el-dropdown @command="handleShareCommand">
                         <i class="el-icon-share" style="color:#5cb6ff;"></i>
                         <el-dropdown-menu slot="dropdown">
                             <!-- 表格为已共享，有取消共享按钮 -->
-                            <el-dropdown-item v-if="classify_tab===1||data.isShare===1"
+                            <el-dropdown-item v-if="(classify_tab===1||data.HasShare)"
                                 :command="{key:'cancel',item:data}"
                                 class="treenode-dropdown-item"
                                 :class="data.isShare===0?'treenode-dropdown-item-act':''" 
@@ -212,10 +212,10 @@
                 @blur="changeValue(sheetDetailInfo, 'edit-tit')"
               />
               <div class="sheet-name"
-                @click="()=>{sheetDetailInfo.CanEdit&&editNodeLabel(sheetDetailInfo, 'edit-tit')}"
+                @click="()=>{sheetDetailInfo.Button.OpButton&&editNodeLabel(sheetDetailInfo, 'edit-tit')}"
                 v-else>
                 {{ sheetDetailInfo.ExcelName }}
-                <i class="el-icon-edit" v-if="sheetDetailInfo.CanEdit"/>
+                <i class="el-icon-edit" v-if="sheetDetailInfo.Button.OpButton"/>
               </div>
               <div class="sheet-anothor-info">
                 <span class="author">{{$t('OnlineExcelPage.author_info')}}{{ sheetDetailInfo.SysUserRealName }}</span>
@@ -369,7 +369,9 @@
     <!-- 设置共享弹窗 -->
     <shareTableDia
         :isOpenDialog="isShowShareDia"
+        :tableInfo="currentTable"
         @close="isShowShareDia=false"
+        @setShare="isShowShareDia=false;getTreeData();"
     />
   </div>
 </template>
@@ -387,6 +389,12 @@ export default {
   name: "",
   components: { mDialog, classifyDia, Sheet, sheetListWrap, shareTableDia },
   mixins: [leftMixin],
+  beforeRouteLeave(to,from,next){
+    if(from.path=='/sheetAnalysisList'){
+      this.markFinishStatus(this.select_id)
+    }
+    next()
+  },
   computed: {
     downExcelFileUrl() {
       let url = `${
@@ -394,14 +402,6 @@ export default {
       }/datamanage/excel_info/table/download?${localStorage.getItem("auth")}`;
       return url;
     },
-    classifyOptions() {
-      let options = this.treeData.map((_) => ({
-        ExcelClassifyId: _.ExcelClassifyId,
-        ExcelClassifyName: _.ExcelClassifyName,
-      }));
-
-      return options;
-    },
     saveOtherFormRule(){
       return {
         name: [
@@ -480,6 +480,8 @@ export default {
         disabled:true
       },
       editButtonText:"",
+      currentTable:{},
+      classifyOptions:[]
     };
   },
   watch: {
@@ -529,9 +531,44 @@ export default {
     },
   },
   methods: {
+    formatTreeData(tree){
+        function dfs(node){
+            if (Array.isArray(node.Children)) {
+                node.Children = node.Children.filter(dfs)
+                if(node.Children.length===0) delete node.Children
+            }
+            
+            if(node.ExcelInfoId) {
+                return null
+            }
+            return node
+        }
+        return tree.filter(dfs)
+    },
+    unloadMark(){
+        if(!this.select_id)return
+
+        let url = process.env.VUE_APP_API_ROOT + "/datamanage/excel_info/mark"
+        let params={ExcelInfoId: this.select_id,Status:2}
+        const uuid = localStorage.getItem("uuid") || "";
+        fetch(url, {
+        method: 'POST',
+        headers:{
+            Authorization:localStorage.getItem("auth"),
+            Uuid:uuid,
+            AccessToken:uuid + "--zheshiyigename"
+        },
+        body:JSON.stringify(params),
+        // 保持连接 让请求不会因为页面关闭而中断
+        keepalive: true
+        });
+    },
     //取消标记表格的编辑状态
     markFinishStatus(sheet_id){
-
+        if(!sheet_id)return
+        sheetInterface.markSheetEditStatus({ExcelInfoId: sheet_id,Status:2}).then(res=>{
+            if(res.Ret!==200) return
+        })
     },
     //标记表格的编辑状态
     goEditHandle(){
@@ -542,22 +579,41 @@ export default {
     //切换表格tab
     changeTab(index){
         this.classify_tab = index
+        this.select_classify = 0
+        this.select_id = 0
+        this.sheetList = []
+        this.getTreeData()
+        this.getPublicList()
     },
     //表格 设置共享/取消共享
     handleShareCommand(command){
         if(command.key==='share'){
             this.currentTable = command.item
             this.isShowShareDia = true
+        }else{
+            //取消共享就是 两个权限列表都为空
+            sheetInterface.sheetAnalysisInterface.setSheetShare({
+                ExcelInfoId:command.item.ExcelInfoId,
+                ViewUserIds:[],
+                EditUserIds:[]
+            }).then(res=>{
+                if(res.Ret!==200) return 
+                this.$message.success(`取消共享成功`)
+                this.getTreeData();
+            })
         }
     },
     /* 获取表格分类 */
     getTreeData(params = null) {
-      sheetInterface.classifyList({Source: this.sourceMap[this.$route.path],IsShowMe: this.isShowMe}).then((res) => {
+      sheetInterface.sheetAnalysisInterface.getSheetTreeList({IsShare:Boolean(this.classify_tab)}).then((res) => {
         const { Ret, Data } = res;
         if (Ret !== 200) return;
 
         this.showData = true;
         this.treeData = Data.AllNodes || [];
+        if(!this.classify_tab){
+            this.classifyOptions = this.formatTreeData(_.cloneDeep(this.treeData))
+        }
         this.$nextTick(() => {
           /* 新增完成后 处理树展开和选中 */
           params && this.selectCurrentNode(params);
@@ -569,12 +625,12 @@ export default {
     searchHandle(query) {
       if (query) {
         /* 查找列表 */
-        sheetInterface
-          .sheetList({
+        sheetInterface.sheetAnalysisInterface
+          .getSheetList({
             Keyword: query,
             CurrentIndex: 1,
             PageSize: 10000,
-            Source: this.sourceMap[this.$route.path]
+            IsShare:Boolean(this.classify_tab)
           })
           .then((res) => {
             if (res.Ret !== 200) return;
@@ -794,13 +850,12 @@ export default {
     },
     /* 获取表格列表 */
     getPublicList() {
-      sheetInterface
-        .sheetList({
+      sheetInterface.sheetAnalysisInterface
+        .getSheetList({
           CurrentIndex: this.sheet_page,
           PageSize: this.sheet_pages_size,
           ExcelClassifyId: this.select_classify || 0,
-          Source: this.sourceMap[this.$route.path],
-          IsShowMe: this.isShowMe 
+          IsShare:Boolean(this.classify_tab)
         })
         .then((res) => {
           if (res.Ret !== 200) return;
@@ -847,8 +902,8 @@ export default {
         this.getCellData(res.Data.SheetList)
         //判断表格权限
         //有编辑权限且无人编辑,标记编辑
-        this.limit.disabled = !this.sheetDetailInfo.CanEdit
-        //!this.sheetDetailInfo.Editor&&this.goEditHandle()
+        this.limit.disabled = !this.sheetDetailInfo.Button.OpButton
+        this.sheetDetailInfo.Button.OpButton&&!this.sheetDetailInfo.Editor&&this.goEditHandle()
         this.editButtonText = this.sheetDetailInfo.CanEdit?'':`${this.sheetDetailInfo.Editor}${this.$t('OnlineExcelPage.editing_msg')}...`
       });
     },
@@ -1029,13 +1084,14 @@ export default {
       this.getTreeData();
       this.getPublicList();
     }
-
     window.addEventListener("resize", this.reloadRightWid);
     document.addEventListener("click", this.closeHint);
+    window.addEventListener('beforeunload',this.unloadMark)
   },
   destroyed() {
     window.removeEventListener("resize", this.reloadRightWid);
     document.removeEventListener("click", this.closeHint);
+    window.removeEventListener('beforeunload',this.unloadMark)
   },
 };
 </script>