预提测

src/api/modules/sheetApi.js

@@ -98,6 +98,16 @@ export const sheetEdit = params => {
 	return http.post('/datamanage/excel_info/edit',params)
 }
 
+/**
+ * 标记表格的编辑状态 
+ * @param {*} params ExcelInfoId 
+ * @param {*} params Status  1：编辑中，2：编辑完成
+ * @returns 
+ */
+export const markSheetEditStatus = params => {
+	return http.post('/datamanage/excel_info/mark',params)
+}
+
 /**
  * 获取表格详情
  * @param {*} params ExcelInfoId 

src/routes/modules/chartRoutes.js

@@ -130,6 +130,11 @@ export default [
 				name:"添加混合表格",
 				component:()=>import('@/views/datasheet_manage/mixedSheetEdit.vue')
 			},
+			{
+				path:"editSheetAnalysis",
+				name:"编辑表格",
+				component:()=>import('@/views/datasheet_manage/customAnalysis/edit.vue')
+			},
 			{
 				path:"sheetAnalysisList",
 				name:"自定义分析",

src/utils/buttonConfig.js

@@ -383,7 +383,8 @@ export const etaTablePermission = {
     etaTable_excel_classifyOpt_delete:'etaTable:excel:classifyOpt:delete',//删除表格
     etaTable_excel_del:'etaTable:excel:del',
     etaTable_excel_download:'etaTable:excel:download',
-    etaTable_excel_save:'etaTable:excel:save',
+    // etaTable_excel_save:'etaTable:excel:save',//保存
+    etaTable_excel_edit:'etaTable:excel:edit',
 
     //自定义分析表格页面
     // etaTable_analysis_sheetAdd: 'etaTable:analysis:sheetAdd',//添加数据表格按钮
@@ -396,6 +397,7 @@ export const etaTablePermission = {
     etaTable_analysis_download:'etaTable:analysis:download',//下载
     etaTable_analysis_del:'etaTable:analysis:del',//删除
     etaTable_analysis_save:'etaTable:analysis:save',//保存
+    etaTable_analysis_edit:'etaTable:analysis:edit',//编辑
 }
 /*
  * --------------------------------------------------------------------------ETA逻辑------------------------------------------------

src/views/datasheet_manage/addSheet.vue

@@ -28,6 +28,7 @@
 						</el-select>
         </li>
       </ul>
+      <div v-if="updateTime" style="color:#999999;margin-right: 40px;">最近保存时间：{{ updateTime }}</div>
       <div>
         <el-button type="primary" size="medium" @click="saveSheetHandle">保存</el-button>
         <el-button type="primary" size="medium" plain @click="backHandle">返回</el-button>
@@ -35,7 +36,7 @@
     </div>
     
     <div class="main">
-      <Sheet ref="sheetRef"/>
+      <Sheet ref="sheetRef" :limit="{disabled:false}" :option="this.option" v-if="sheetInit" @updated="autoSaveFun" />
     </div>
   </div>
 </template>
@@ -48,14 +49,46 @@ export default {
   components: { Sheet },
   data() {
     return {
+      sheetId: this.$route.query.id || '',
+      isCanEdit:false,
       sheetForm: {},
-      classifyArr: []
+      classifyArr: [],
+      sheetInit:false,
+      option:{},
+      updateTime:'',
+    }
+  },
+  beforeRouteEnter(to, from, next) {
+    if(to.query.id){
+      to.matched[1].name=`编辑表格`
+    }else{
+      to.matched[1].name='添加表格'
+    }
+    next()
+  },
+  beforeRouteLeave(to,from,next){
+    if(to.path!='/addsheet'){
+      this.markFinishStatus()
+    }
+    next()
+  },
+  watch:{
+    sheetForm:{
+      handler(newVal){
+        console.log(this.sheetInit,this.sheetId);
+        if(this.sheetId && this.sheetInit) this.autoSaveFun()
+      },
+      deep:true
     }
   },
   methods: {
 
     backHandle() {
-      window.close();
+      if(this.sheetId){
+        this.$router.back()
+      }else{
+        window.close();
+      }
     },
 
     /* 获取分类 */
@@ -67,7 +100,68 @@ export default {
       })
     },
 
+    /* 获取表格详情 */
+    async getDetail() {
+      if(!this.sheetId){
+        this.sheetInit=true
+        return
+      }
+
+      const res = await sheetInterface.sheetDetail({
+				ExcelInfoId: Number(this.sheetId)
+			})
+
+      if(res.Ret !== 200)  return
 
+      this.isCanEdit = res.Data.CanEdit
+      if(!res.Data.CanEdit){
+        this.$message.warning(`${res.Data.Editor}正在编辑中`)
+        setTimeout(()=>{
+          this.backHandle()
+        },1000)
+        return 
+      }
+      const { ExcelName,ExcelClassifyId,ExcelType,ModifyTime,Content} = res.Data;
+      
+      this.sheetForm = {
+        name: ExcelName,
+        classify: ExcelClassifyId,
+        sheetType: ExcelType
+      }
+      this.updateTime =  this.$moment(ModifyTime).format('YYYY-MM-DD HH:mm:ss')
+
+      this.option={
+        data: [{
+          ...JSON.parse(Content),
+          scrollTop: 0,
+          scrollLeft: 0
+        }]
+      }
+
+      this.$nextTick(()=>{
+        this.sheetInit=true
+      })
+
+    },
+    autoSaveFun:_.debounce(async function(){
+      if(!this.sheetId && this.sheetInit) return
+      const { name,classify } = this.sheetForm;
+      luckysheet.exitEditMode()
+      let data = luckysheet.getAllSheets()[0];
+      if(!name || !classify) return this.$message.warning(name ? '请选择表格分类' : '请输入表格名称')
+      if(!data.celldata.length) return this.$message.warning('请输入表格内容');
+      let params={
+        ExcelName: name,
+        ExcelClassifyId: classify,
+        ExcelImage: "",
+        Content: JSON.stringify(data)
+      }
+      const res = await sheetInterface.sheetEdit({ ExcelInfoId: Number(this.sheetId),...params })
+      if(res.Ret !==200) return
+      this.updateTime = this.$moment().format('YYYY-MM-DD HH:mm:ss')
+
+      // console.log("自动保存");
+    },2000),
     /* 保存表格 */
     saveSheetHandle: _.debounce(async function() {
       const { name,classify } = this.sheetForm;
@@ -89,31 +183,49 @@ export default {
 			const { Data } = await sheetInterface.uploadImg(form)
 
       data.luckysheet_select_save = [];
-      const res = await sheetInterface.sheetAdd({
+      let params={
         ExcelName: name,
         ExcelClassifyId: classify,
         ExcelImage: Data.ResourceUrl,
         Content: JSON.stringify(data)
-      })
-      this.loading.close()
-      if(res.Ret !== 200) return
+      }
+      let isAdd = this.sheetId?false:true
+      const res = this.sheetId
+      ? await sheetInterface.sheetEdit({ ExcelInfoId: Number(this.sheetId),...params })
+      : await sheetInterface.sheetAdd(params)
 
+      this.loading.close()
+      if(res.Ret !==200) return
+      this.updateTime = this.$moment().format('YYYY-MM-DD HH:mm:ss')
+      
+      this.sheetId = this.sheetId || res.Data.ExcelInfoId;
       this.$message.success(res.Msg);
+      isAdd && this.$router.replace({path:'/addsheet',query:{id:this.sheetId}})
 
-      const { ExcelInfoId, UniqueCode } = res.Data;
+      // const { ExcelInfoId, UniqueCode } = res.Data;
       
-      this.$router.replace({
-        path: '/sheetList',
-        query: {
-          code: UniqueCode,
-          id: ExcelInfoId
-        }
-      })
+      // this.$router.replace({
+      //   path: '/sheetList',
+      //   query: {
+      //     code: UniqueCode,
+      //     id: ExcelInfoId
+      //   }
+      // })
     },300),
-    
+    markFinishStatus(){
+      if((!this.sheetId) || (!this.isCanEdit)) return
+      sheetInterface.markSheetEditStatus({ExcelInfoId: +this.sheetId,Status:2}).then(res=>{
+        if(res.Ret != 200) return 
+      })
+    }
   },
   mounted() {
+    this.getDetail()
     this.getClassify();
+    window.addEventListener('beforeunload',this.markFinishStatus)
+  },
+  beforeDestroy(){
+    window.removeEventListener('beforeunload',this.markFinishStatus)
   }
 }
 </script>

src/views/datasheet_manage/common/option.js

@@ -2,9 +2,13 @@
 /*  初始化  
   options 其他配置 包括初始化数据 data:[{ celldata:[] }]
   sheetInfo 表格id相关信息 用来内容hooks变化时保存草稿
+  limit 限制性数据
+  callbackItems 回调函数
 */
 import * as sheetInterface from '@/api/modules/sheetApi.js';
-export function initSheet(container,options={},sheetInfo={}) {
+import { Message } from 'element-ui';
+
+export function initSheet(container,options={},sheetInfo={},limit,callbackItems) {
   const configOpt = {
     container,
     lang: 'zh', // 设定表格语言
@@ -22,20 +26,35 @@ export function initSheet(container,options={},sheetInfo={}) {
       link: false, // 插入链接
     },
     hook: {
+      cellEditBefore:(range)=>{
+        if(limit.disabled){
+          Message.warning("当前不可编辑")
+          setTimeout(()=>{
+            luckysheet.exitEditMode();
+          },0)
+        }
+      },
+      
       updated: (a,b,c,d,e)=> {
-
-        if(sheetInfo.Source&&sheetInfo.Source===1) {
-          let data = luckysheet.getAllSheets()[0];
-          data.luckysheet_select_save = [];
-          const { ExcelInfoId,ExcelName,ExcelClassifyId } = sheetInfo;
-          ExcelInfoId && sheetInterface.sheetDrafSave({
-            ExcelInfoId,
-            ExcelName,
-            ExcelClassifyId,
-            Content: JSON.stringify(data)
-          })
+        if(limit.disabled){
+          Message.warning("当前不可编辑")
+          luckysheet.undo()
+          return 
         }
-      }
+        // console.log(callbackItems);
+        callbackItems.updated()
+        // if(sheetInfo.Source&&sheetInfo.Source===1) {
+        //   let data = luckysheet.getAllSheets()[0];
+        //   data.luckysheet_select_save = [];
+        //   const { ExcelInfoId,ExcelName,ExcelClassifyId } = sheetInfo;
+        //   ExcelInfoId && sheetInterface.sheetDrafSave({
+        //     ExcelInfoId,
+        //     ExcelName,
+        //     ExcelClassifyId,
+        //     Content: JSON.stringify(data)
+        //   })
+        // }
+      },
     },
     ...options
   }

src/views/datasheet_manage/components/CustomTable.vue

@@ -418,6 +418,30 @@ export default {
       this.$nextTick(() => {
         resetStyle();
       })
+    },
+    'config.data':{
+      handler(value){
+        if(!this.disabled && this.hasInit){
+          this.$emit("autoSave")
+        }
+      },
+      deep:true
+    },
+    'config.textRowData':{
+      handler(value){
+        if(!this.disabled && this.hasInit){
+          this.$emit("autoSave")
+        }
+
+      },
+      deep:true
+    },
+    'config.order':{
+      handler(value){
+        if(!this.disabled && this.hasInit){
+          this.$emit("autoSave")
+        }
+      }
     }
   },
   components: {addDateCellDia,mDialog},
@@ -467,7 +491,9 @@ export default {
 
       //指标别名弹窗
       isEditEdbAliasDialog: false,
-      editEdb: {}
+      editEdb: {},
+
+      hasInit:false
     };
   },
   methods: {
@@ -745,6 +771,7 @@ export default {
 
     /* 详情initData */
     initSheetData(initData) {
+      this.hasInit=false
       if(initData.Data) {
         const { Data,Sort,TextRowData } = initData;
 
@@ -752,6 +779,9 @@ export default {
         this.config.data = Data;
         this.config.textRowData = TextRowData;
       }
+      this.$nextTick(()=>{
+        this.hasInit=true
+      })
     },
 
     /* 跳转到指标库 */

src/views/datasheet_manage/components/MixedTable.vue

@@ -171,6 +171,24 @@ export default {
       return getRowHeaderCode(total_length);
     },
   },
+  watch:{
+    'config.data':{
+      handler(newVal){
+        if(!this.disabled && this.hasInit){
+          this.$emit("autoSave")
+        }
+      },
+      deep:true
+    },
+    insertRelationArr:{
+      handler(newVal){
+        if(!this.disabled && this.hasInit){
+          this.$emit("autoSave")
+        }
+      },
+      deep:true
+    },
+  },
   data() {
     return {
       config: {
@@ -188,7 +206,8 @@ export default {
 
       isSelectTargetValueDialog: false,
 
-      cellrelationEdbInfo: {}
+      cellrelationEdbInfo: {},
+      hasInit:false,
     };
   },
   mounted() {
@@ -685,6 +704,8 @@ export default {
 
     /* 初始化8行5列 */
     initData(initData=null) {
+      console.log('initData');
+      this.hasInit=false
       if(initData) {
         const { CellRelation,Data } = initData;
         this.config.data = Data;
@@ -702,6 +723,9 @@ export default {
           }));
         });
       }
+      this.$nextTick(()=>{
+        this.hasInit=true
+      })
     },
   },
 };

src/views/datasheet_manage/components/SheetExcel.vue

@@ -14,7 +14,13 @@ export default {
     sheetInfo: {
       type: Object,
       default: ()=>{}
-    }
+    },
+    limit: {
+      type: Boolean,
+      default: ()=>{
+        return {disabled:false}
+      }
+    },
   },
   data() {
     return {
@@ -24,8 +30,11 @@ export default {
   methods: {
     init() {
       let optionData = this.option ? this.option : {};
-
-      initSheet('sheet-container',optionData,this.sheetInfo)
+      let callbackItems={updated:this.updateEmit}
+      initSheet('sheet-container',optionData,this.sheetInfo,this.limit,callbackItems)
+    },
+    updateEmit(){
+      this.$emit("updated")
     }
   },
   destroyed() {

src/views/datasheet_manage/customAnalysis/addAnalysisSheet.vue

@@ -22,7 +22,7 @@
           />
         </el-tabs>
         <div class="sheet-wrapper">
-          <Sheet ref="sheetRef" :option="sheetConfig" v-if="sheetConfig.data"/>
+          <Sheet ref="sheetRef" :option="sheetConfig" v-if="sheetConfig.data" :limit="{disabled:false}"/>
 
           <dataLoading :loading="isLoading"/>
         </div>

src/views/datasheet_manage/customAnalysis/edit.vue

@@ -0,0 +1,262 @@
+<template>
+  <div class="sheet-detail-wrapper" >
+    <div class="detail-top">
+      <span class="author"
+        >作者：{{ sheetDetailInfo.SysUserRealName }}</span
+      >
+      <el-input
+        ref="sheetEditTitRef"
+        style="width: 400px"
+        placeholder="请输入表格名称"
+        class="label-input"
+        v-model="sheet_title"
+        v-if="sheetDetailInfo.isEditTit"
+        @blur="changeValue(sheetDetailInfo, 'edit-tit')"
+      />
+      <span
+        class="sheet-name"
+        @click="editNodeLabel(sheetDetailInfo, 'edit-tit')"
+        v-else
+      >
+        {{ sheetDetailInfo.ExcelName }}
+        <i class="el-icon-edit"/>
+      </span>
+      <ul class="action-ul" v-if="sheetDetailInfo.Button">
+        <div v-if="updateTime" style="color:#999999;">最近保存时间：{{ updateTime }}</div>
+        <el-tooltip effect="dark" content="在当前表格选择日期列和数据列生成指标" placement="top-start">
+            <li class="editsty" @click="HandleToPath" v-if="isSheetBtnShow('createedb')&&sheetDetailInfo.Button.OpEdbButton">生成指标</li>
+        </el-tooltip>
+
+        <el-tooltip effect="dark" content="根据表格保存的最新内容，更新当前表格生成的所有指标" placement="top-start">
+            <li class="editsty" @click="refreshSheet" v-if="isSheetBtnShow('refresh')&&sheetDetailInfo.Button.RefreshEdbButton">刷新指标</li>
+        </el-tooltip>
+        <li class="editsty" @click="saveHandle" v-if="isSheetBtnShow('save')&&sheetDetailInfo.Button.OpButton">保存</li>
+        <li
+          class="editsty"
+          @click="backHandle"
+        >
+          返回
+        </li>
+      </ul>
+    </div>
+
+    <dataLoading :loading="isSheetLoading"/>
+
+    <!-- 表格 -->
+    <div class="sheet-wrap">
+      <Sheet
+        ref="sheetRef"
+        v-if="sheetConfigOpt.data"
+        :option="sheetConfigOpt"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import * as sheetInterface from "@/api/modules/sheetApi.js";
+import Sheet from "../components/SheetExcel.vue";
+import leftMixin from "../mixins/classifyMixin";
+import { getSheetImage } from "../common/option";
+
+  export default {
+    components:{Sheet},
+    mixins: [leftMixin],
+    data() {
+      return {
+        sheetDataPage: 2,
+        sheetAllcellData:[],//全部单元格数据 分页push
+        dataToalPage: 0,
+        isSheetLoading: false,
+        code:'',
+        sheetConfigOpt: {
+          showsheetbar: true,
+          data: null
+        },
+        sheet_title: "", //表格标题 双击标题修改时来存储最新值
+        sheetDetailInfo:{},
+        isCanEdit:false,
+        sheetId:'',
+        loading:null,
+        updateTime:''
+      }
+    },
+    beforeRouteLeave(to,from,next){
+      if(to.path!='/editSheetAnalysis'){
+        this.markFinishStatus()
+      }
+      next()
+    },
+    created(){
+      // console.log(this.$route.query.code);
+      if(!this.$route.query.code){
+        this.$message.warning("参数丢失")
+        this.backHandle()
+      }else{
+        this.code = this.$route.query.code
+        this.getDetailHandle()
+      }
+    },
+    mounted() {
+      window.addEventListener('beforeunload',this.markFinishStatus)
+    },
+    beforeDestroy(){
+      window.removeEventListener('beforeunload',this.markFinishStatus)
+    },
+    methods:{
+      /* 获取表格详情 */
+      getDetailHandle() {
+
+        this.isSheetLoading = true;
+        sheetInterface.sheetAnalysisInterface.getExcelDetail({
+          UniqueCode:this.code,
+        }).then((res) => {
+          if (res.Ret !== 200) return;
+          this.isCanEdit = res.Data.ExcelInfo.CanEdit
+          if(!this.isCanEdit){
+            this.$message.warning(`${res.Data.ExcelInfo.Editor}正在编辑中`)
+            setTimeout(()=>{
+              this.backHandle()
+            },1000)
+            return 
+          }
+          this.sheetDetailInfo = res.Data.ExcelInfo;
+          this.updateTime = this.$moment(this.sheetDetailInfo.ModifyTime).format('YYYY-MM-DD HH:mm:ss')||''
+          this.sheetId = this.sheetId || res.Data.ExcelInfo.ExcelInfoId;
+          this.dataToalPage =  Math.max(...res.Data.SheetList.map(_ => _.PageNum));
+          this.sheetAllcellData = res.Data.SheetList.map(_ => _.Data ? JSON.parse(_.Data.Data) : []);
+
+          this.getCellData(res.Data.SheetList)
+        });
+      },
+      //分页获取表格数据
+      async getCellData(sheets) {
+
+        let res = await sheetInterface.sheetAnalysisInterface.getExcelDataByPage({
+          UniqueCode: this.code,
+          Page: this.sheetDataPage
+        })
+
+        if(res.Ret !== 200) return
+        console.log(this.sheetAllcellData)
+
+        for(let i = 0;i<this.sheetAllcellData.length;i++) {
+          if(res.Data[i].Data) {
+            this.sheetAllcellData[i] = [...this.sheetAllcellData[i],...JSON.parse(res.Data[i].Data.Data)]
+          }
+
+          continue
+        }
+        
+        //数据继续加载或渲染表格.
+        if(this.sheetDataPage < this.dataToalPage) {
+          this.sheetDataPage++;
+          this.getCellData(sheets)
+        }else {
+          this.sheetConfigOpt.data = sheets.map((_,index) => ({
+            index: _.Index, //工作表id
+            order: _.Sort, //工作表的下标
+            name: _.SheetName,
+            calcChain: _.CalcChain?JSON.parse(_.CalcChain):[],
+            config: JSON.parse(_.Config),
+            celldata: this.sheetAllcellData[index],
+          }))
+
+          console.log(this.sheetConfigOpt)
+
+          this.isSheetLoading = false;
+        }
+      },
+      backHandle(){
+        this.$router.back()
+      },
+      //跳转生成指标
+      HandleToPath() {
+        this.$router.push({ path: '/createTaregtBySheet',query: {
+          code: this.sheetDetailInfo.UniqueCode 
+        }});
+      },
+      /* 刷新表格 */
+      refreshSheet: _.debounce(async function() {
+        let res = await sheetInterface.sheetAnalysisInterface.sheetRefresh({ExcelInfoId: this.sheetDetailInfo.ExcelInfoId})
+
+        if(res.Ret !== 200) return 
+        this.$message.success(res.Msg)
+      },300),
+      /* 保存表格 */
+      saveHandle: _.debounce(async function () {
+        luckysheet.exitEditMode();
+        let data = luckysheet.getAllSheets();
+
+        this.loading = this.$loading({
+          target: ".sheet-detail-wrapper",
+          lock: true,
+          text: "保存中...",
+          spinner: "el-icon-loading",
+          background: "rgba(255, 255, 255, 0.6)",
+        });
+
+        let img = getSheetImage(data[0]);
+        const form = new FormData();
+        form.append("Image", img);
+        const { Data } = await sheetInterface.uploadImg(form);
+
+        data.luckysheet_select_save = [];
+        const { ExcelInfoId, ExcelName, ExcelClassifyId } = this.sheetDetailInfo;
+        const res = await sheetInterface.sheetAnalysisInterface.sheetEdit({
+          ExcelInfoId,
+          ExcelName,
+          ExcelClassifyId,
+          ExcelImage: Data.ResourceUrl,
+          Content: JSON.stringify(data),
+        });
+        this.loading.close();
+        if (res.Ret !== 200) return;
+        this.$message.success("保存成功");
+        this.$router.back()
+      }, 300),
+      markFinishStatus(){
+        if((!this.sheetId) || (!this.isCanEdit)) return
+        sheetInterface.markSheetEditStatus({ExcelInfoId: +this.sheetId,Status:2}).then(res=>{
+          if(res.Ret != 200) return 
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .sheet-detail-wrapper {
+    height: 100%;
+    border: 1px solid #ececec;
+    border-radius: 4px;
+    box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.05);
+    overflow: auto;
+    background: #fff;
+    .detail-top {
+      padding: 20px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      border-bottom: 1px solid #ececec;
+      .sheet-name {
+        font-size: 17px;
+        cursor: pointer;
+        max-width: 450px;
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+      .action-ul {
+        display: flex;
+        li {
+          margin: 0 10px;
+        }
+      }
+    }
+    .sheet-wrap {
+      position: relative;
+      height: calc(100vh - 190px);
+    }
+  }
+</style>

src/views/datasheet_manage/customAnalysis/list.vue

@@ -145,7 +145,7 @@
             <span class="author"
               >作者：{{ sheetDetailInfo.SysUserRealName }}</span
             >
-            <el-input
+            <!-- <el-input
               ref="sheetEditTitRef"
               style="width: 400px"
               placeholder="请输入表格名称"
@@ -153,17 +153,15 @@
               v-model="sheet_title"
               v-if="sheetDetailInfo.isEditTit"
               @blur="changeValue(sheetDetailInfo, 'edit-tit')"
-            />
+            /> -->
             <span
               class="sheet-name"
-              @click="editNodeLabel(sheetDetailInfo, 'edit-tit')"
-              v-else
             >
               {{ sheetDetailInfo.ExcelName }}
-              <i class="el-icon-edit"/>
+              <!-- <i class="el-icon-edit"/> -->
             </span>
             <ul class="action-ul" v-if="sheetDetailInfo.Button">
-
+              <li style="color:#999999 ;">最近保存时间：{{ saveTime }}</li>
               <el-tooltip effect="dark" content="在当前表格选择日期列和数据列生成指标" placement="top-start">
                   <li class="editsty" @click="HandleToPath" v-if="isSheetBtnShow('createedb')&&sheetDetailInfo.Button.OpEdbButton">生成指标</li>
               </el-tooltip>
@@ -171,7 +169,15 @@
               <el-tooltip effect="dark" content="根据表格保存的最新内容，更新当前表格生成的所有指标" placement="top-start">
                   <li class="editsty" @click="refreshSheet" v-if="isSheetBtnShow('refresh')&&sheetDetailInfo.Button.RefreshEdbButton">刷新指标</li>
               </el-tooltip>
-              <li class="editsty" @click="saveHandle" v-if="isSheetBtnShow('save')&&sheetDetailInfo.Button.OpButton">保存</li>
+              <!-- <li class="editsty" @click="saveHandle" v-if="isSheetBtnShow('save')&&sheetDetailInfo.Button.OpButton">保存</li> -->
+              <li
+                class="editsty"
+                @click="goEdit"
+                v-if="isCreator || 
+                (sheetDetailInfo.Button && sheetDetailInfo.Button.OpButton&&isSheetBtnShow('edit'))"
+              >
+                {{ editButtonText?editButtonText:'编辑' }}
+              </li>
               <li
                 class="editsty"
                 @click="saveOtherHandle"
@@ -185,7 +191,7 @@
               </li>
               <li
                 class="deletesty"
-                v-if="isSheetBtnShow('del')&&sheetDetailInfo.Button.DeleteButton"
+                v-if="isCreator || (isSheetBtnShow('del')&&sheetDetailInfo.Button&&sheetDetailInfo.Button.DeleteButton)"
                 @click="delSheetHandle({cell:sheetDetailInfo, type:'del'})"
               >
                 删除
@@ -201,12 +207,7 @@
               ref="sheetRef"
               v-if="sheetConfigOpt.data"
               :option="sheetConfigOpt"
-              :sheetInfo="{
-                ExcelInfoId: sheetDetailInfo.ExcelInfoId,
-                ExcelName: sheetDetailInfo.ExcelName,
-                ExcelClassifyId: sheetDetailInfo.ExcelClassifyId,
-                Source: sheetDetailInfo.Source
-              }"
+              :limit="{disabled:true}"
             />
           </div>
         </div>
@@ -317,6 +318,9 @@ export default {
 
       return options;
     },
+    isCreator(){
+      return this.adminId==this.excelAdminId
+    }
   },
   data() {
     return {
@@ -380,6 +384,10 @@ export default {
       sourceMap: {
         '/sheetAnalysisList': 4,
       },
+      saveTime:"",
+      editButtonText:'',
+      adminId:localStorage.getItem("AdminId") || '0',
+      excelAdminId:""
     };
   },
   watch: {
@@ -600,39 +608,54 @@ export default {
       };
       request.send();
     },
+    goEdit(){
+      sheetInterface.markSheetEditStatus({ExcelInfoId: this.select_id,Status:1}).then(res=>{
+        if(res.Ret != 200) return 
+        if(res.Data.Status==0){
+          this.$router.push({
+            path: '/editSheetAnalysis',
+            query: { code: this.sheetDetailInfo.UniqueCode },
+          });
 
+        }else if(res.Data.Status==1){
+          this.editButtonText = `${res.Data.Editor}编辑中`
+          this.$message.warning('当前'+this.editButtonText)
+        }
+      })
+    },
     /* 保存表格 */
-    saveHandle: _.debounce(async function () {
-      luckysheet.exitEditMode();
-      let data = luckysheet.getAllSheets();
-
-      this.loading = this.$loading({
-        target: ".dataSheet-container",
-        lock: true,
-        text: "保存中...",
-        spinner: "el-icon-loading",
-        background: "rgba(255, 255, 255, 0.6)",
-      });
-
-      let img = getSheetImage(data[0]);
-      const form = new FormData();
-      form.append("Image", img);
-      const { Data } = await sheetInterface.uploadImg(form);
-
-      data.luckysheet_select_save = [];
-      const { ExcelInfoId, ExcelName, ExcelClassifyId } = this.sheetDetailInfo;
-      const res = await sheetInterface.sheetAnalysisInterface.sheetEdit({
-        ExcelInfoId,
-        ExcelName,
-        ExcelClassifyId,
-        ExcelImage: Data.ResourceUrl,
-        Content: JSON.stringify(data),
-      });
-      this.loading.close();
-      if (res.Ret !== 200) return;
-      this.$message.success("保存成功");
-      this.getTreeData();
-    }, 300),
+    // saveHandle: _.debounce(async function () {
+    //   luckysheet.exitEditMode();
+    //   let data = luckysheet.getAllSheets();
+
+    //   this.loading = this.$loading({
+    //     target: ".dataSheet-container",
+    //     lock: true,
+    //     text: "保存中...",
+    //     spinner: "el-icon-loading",
+    //     background: "rgba(255, 255, 255, 0.6)",
+    //   });
+
+    //   let img = getSheetImage(data[0]);
+    //   const form = new FormData();
+    //   form.append("Image", img);
+    //   const { Data } = await sheetInterface.uploadImg(form);
+
+    //   data.luckysheet_select_save = [];
+    //   const { ExcelInfoId, ExcelName, ExcelClassifyId } = this.sheetDetailInfo;
+
+    //   const res = await sheetInterface.sheetAnalysisInterface.sheetEdit({
+    //     ExcelInfoId,
+    //     ExcelName,
+    //     ExcelClassifyId,
+    //     ExcelImage: Data.ResourceUrl,
+    //     Content: JSON.stringify(data),
+    //   });
+    //   this.loading.close();
+    //   if (res.Ret !== 200) return;
+    //   this.$message.success("保存成功");
+    //   this.getTreeData();
+    // }, 300),
 
     /* 获取表格列表 */
     getPublicList() {
@@ -682,6 +705,9 @@ export default {
         if (res.Ret !== 200) return;
 
         this.sheetDetailInfo = res.Data.ExcelInfo;
+        this.saveTime = this.$moment(this.sheetDetailInfo.ModifyTime).format('YYYY-MM-DD HH:mm:ss')||''
+        this.excelAdminId = this.sheetDetailInfo.SysUserId
+        this.editButtonText = this.sheetDetailInfo.CanEdit?'':`${this.sheetDetailInfo.Editor}编辑中`
         this.dataToalPage =  Math.max(...res.Data.SheetList.map(_ => _.PageNum));
         this.sheetAllcellData = res.Data.SheetList.map(_ => _.Data ? JSON.parse(_.Data.Data) : []);
 
@@ -956,11 +982,11 @@ $normal-font: 14px;
           border-bottom: 1px solid #ececec;
           .sheet-name {
             font-size: 17px;
-            cursor: pointer;
+            // cursor: pointer;
             max-width: 450px;
-            &:hover {
-              text-decoration: underline;
-            }
+            // &:hover {
+            //   text-decoration: underline;
+            // }
           }
           .action-ul {
             display: flex;

src/views/datasheet_manage/customSheetEdit.vue

@@ -60,6 +60,9 @@
             <i class="el-icon-question" />
           </el-tooltip>
         </li>
+        <li v-if="saveTime" style="color:#999999 ;">
+          最近保存时间：{{ saveTime }}
+        </li>
       </ul>
       <div>
         <el-button type="primary" size="medium" @click="saveSheetHandle">保存</el-button>
@@ -70,6 +73,7 @@
     <CustomTable
       :sheetType="sheetForm.sheetType"
       ref="customTableRef"
+      @autoSave="autoSaveFun"
     />
   </div>
 </template>
@@ -90,6 +94,22 @@ export default {
     }
     next()
   },
+  watch:{
+    sheetForm:{
+      handler(newVal){
+        console.log(newVal,'newVal','newVal');
+        if(this.sheetInit && this.sheetId) this.autoSaveFun()
+        
+      },
+      deep:true
+    }
+  },
+  beforeRouteLeave(to,from,next){
+    if(to.path!='/addMixedSheet'){
+      this.markFinishStatus()
+    }
+    next()
+  },
   data() {
     return {
       sheetId: this.$route.query.id || '',
@@ -103,13 +123,15 @@ export default {
         { key: 1,label: '指标列+日期行' },
         { key: 2,label: '指标行+日期列' },
       ],
-
+      saveTime:"",
+      sheetInit:false,
+      isCanEdit:false
     }
   },
   methods: {
 
     backHandle() {
-      this.$router.go(-1)
+      this.$router.back()
     },
 
     /* 获取表格详情 */
@@ -121,14 +143,26 @@ export default {
 			})
 
       if(res.Ret !== 200)  return
-      const { ExcelName,ExcelClassifyId,ExcelType,TableData } = res.Data;
+      this.isCanEdit = res.Data.CanEdit
+      if(!res.Data.CanEdit){
+        this.$message.warning(`${res.Data.Editor}正在编辑中`)
+        setTimeout(()=>{
+          this.backHandle()
+        },1000)
+        return 
+      }
+      const { ExcelName,ExcelClassifyId,ExcelType,TableData,ModifyTime} = res.Data;
       
       this.sheetForm = {
         name: ExcelName,
         classify: ExcelClassifyId,
         sheetType: ExcelType
       }
+      this.saveTime =  this.$moment(ModifyTime).format('YYYY-MM-DD HH:mm:ss')
 
+      this.$nextTick(()=>{
+        this.sheetInit=true
+      })
       this.$refs.customTableRef.initSheetData(TableData);
     },
 
@@ -172,7 +206,24 @@ export default {
       })
     },
 
-
+    autoSaveFun:_.debounce(async function(){
+      if(!this.sheetId) return 
+      const { name,classify,sheetType } = this.sheetForm;
+      if(!name || !classify) return this.$message.warning(name ? '请选择表格分类' : '请输入表格名称')
+      if(!document.getElementsByClassName('table')[0]) return this.$message.warning('请添加表格')
+      let params = {
+        ExcelName: name,
+        ExcelType: sheetType,
+        ExcelClassifyId: classify,
+        ExcelImage:'',
+        Source: 3,
+        TableData: this.$refs.customTableRef.getSaveParams()
+      };
+      console.log("自动保存");
+      const res = await sheetInterface.sheetEdit({ ExcelInfoId: Number(this.sheetId),...params })
+      if(res.Ret !==200) return
+      this.updateTime = this.$moment().format('YYYY-MM-DD HH:mm:ss')
+    },1500),
     /* 保存表格 */
     saveSheetHandle: _.debounce(async function() {
       const { name,classify,sheetType } = this.sheetForm;
@@ -203,15 +254,20 @@ export default {
         TableData: this.$refs.customTableRef.getSaveParams()
       };
 
+      let isAdd = this.sheetId?false:true
+
       const res = this.sheetId
       ? await sheetInterface.sheetEdit({ ExcelInfoId: Number(this.sheetId),...params })
       : await sheetInterface.sheetAdd(params)
 
       if(res.Ret !==200) return
-      
+
       this.sheetId = this.sheetId || res.Data.ExcelInfoId;
       this.$message.success('保存成功')
+      this.saveTime =  this.$moment().format('YYYY-MM-DD HH:mm:ss')
       
+      isAdd && this.$router.replace({path:'/addCustomSheet',query:{id:this.sheetId}})
+
       // this.$router.replace({
       //   path: '/sheetList',
       //   query: {
@@ -220,11 +276,22 @@ export default {
       //   }
       // })
     },300),
-    
+    markFinishStatus(){
+      if((!this.sheetId) || (!this.isCanEdit)) return
+      sheetInterface.markSheetEditStatus({ExcelInfoId: +this.sheetId,Status:2}).then(res=>{
+        if(res.Ret != 200) return 
+      })
+    }
   },
   created() {
     this.getClassify();
     this.getDetail();
+  },
+  mounted(){
+    window.addEventListener('beforeunload',this.markFinishStatus)
+  },
+  beforeDestroy(){
+    window.removeEventListener('beforeunload',this.markFinishStatus)
   }
 }
 </script>

src/views/datasheet_manage/mixedSheetEdit.vue

@@ -41,13 +41,13 @@
         </li>
       </ul>
       <div>
-        <span v-if="updateTime">上次保存时间：{{updateTime}}</span>
+        <span v-if="updateTime" style="color:#999999 ;">最近保存时间：{{updateTime}}</span>
         <el-button type="primary" size="medium" @click="saveSheetHandle" style="margin-left:10px">保存</el-button>
         <el-button type="primary" size="medium" plain @click="backHandle">返回</el-button>
       </div>
     </div>
     
-    <MixedTable
+    <MixedTable @autoSave="autoSaveFun"
       ref="mixedTableRef"
     />
   </div>
@@ -69,6 +69,22 @@ export default {
     }
     next()
   },
+  watch:{
+    sheetForm:{
+      handler(newVal){
+        console.log(newVal,'newVal','newVal');
+        if(this.sheetInit && this.sheetId) this.autoSaveFun()
+        
+      },
+      deep:true
+    }
+  },
+  beforeRouteLeave(to,from,next){
+    if(to.path!='/addMixedSheet'){
+      this.markFinishStatus()
+    }
+    next()
+  },
   data() {
     return {
       sheetId: this.$route.query.id || '',
@@ -80,19 +96,20 @@ export default {
       sheetForm: {
         sheetType: 1
       },
+      sheetInit:false,
       sheetTypeOption: [
         { key: 1,label: '指标列+日期行' },
         { key: 2,label: '指标行+日期列' },
       ],
 
-      updateTime: ''
-
+      updateTime: '',
+      isCanEdit:false
     }
   },
   methods: {
 
     backHandle() {
-      this.$router.go(-1)
+      this.$router.back()
     },
 
     /* 获取表格详情 */
@@ -104,12 +121,24 @@ export default {
 			})
 
       if(res.Ret !== 200)  return
+      this.isCanEdit = res.Data.CanEdit
+      if(!res.Data.CanEdit){
+        this.$message.warning(`${res.Data.Editor}正在编辑中`)
+        setTimeout(()=>{
+          this.backHandle()
+        },2000)
+        return 
+      }
+
       const { ExcelName,ExcelClassifyId,TableData,ModifyTime } = res.Data;
-      
+
       this.sheetForm = {
         name: ExcelName,
         classify: ExcelClassifyId
       }
+      this.$nextTick(()=>{
+        this.sheetInit=true
+      })
       this.updateTime =  this.$moment(ModifyTime).format('YYYY-MM-DD HH:mm:ss')
 
       this.$refs.mixedTableRef.initData(TableData);
@@ -123,8 +152,28 @@ export default {
         this.classifyArr = res.Data.AllNodes || [];
       })
     },
-
-
+    autoSaveFun:_.debounce(async function(){
+      if(!this.sheetId) return 
+      const { name,classify,sheetType } = this.sheetForm;
+      if(!name || !classify) return this.$message.warning(name ? '请选择表格分类' : '请输入表格名称')
+      let checkAllEmpty = this.$refs.mixedTableRef.config.data.flat(1).some(_ => _.ShowValue);
+      if(!checkAllEmpty) return this.$message.warning('请输入表格内容')
+      let params = {
+        ExcelName: name,
+        ExcelType: 1,
+        ExcelClassifyId: classify,
+        ExcelImage:'',
+        Source: 3,
+        TableData: {
+          CellRelation: JSON.stringify(this.$refs.mixedTableRef.insertRelationArr),
+          Data: this.$refs.mixedTableRef.config.data
+        }
+      };
+      console.log("自动保存");
+      const res = await sheetInterface.sheetEdit({ ExcelInfoId: Number(this.sheetId),...params })
+      if(res.Ret !==200) return
+      this.updateTime = this.$moment().format('YYYY-MM-DD HH:mm:ss')
+    },1500),
     /* 保存表格 */
     saveSheetHandle: _.debounce(async function() {
 
@@ -158,7 +207,7 @@ export default {
           Data: this.$refs.mixedTableRef.config.data
         }
       };
-
+      let isAdd = this.sheetId?false:true
       const res = this.sheetId
       ? await sheetInterface.sheetEdit({ ExcelInfoId: Number(this.sheetId),...params })
       : await sheetInterface.sheetAdd(params)
@@ -168,13 +217,24 @@ export default {
       
       this.sheetId = this.sheetId || res.Data.ExcelInfoId;
       this.$message.success('保存成功')
-
+      isAdd && this.$router.replace({path:'/addMixedSheet',query:{id:this.sheetId}})
     },300),
-    
+    markFinishStatus(){
+      if((!this.sheetId) || (!this.isCanEdit)) return
+      sheetInterface.markSheetEditStatus({ExcelInfoId: +this.sheetId,Status:2}).then(res=>{
+        if(res.Ret != 200) return 
+      })
+    }
   },
   created() {
     this.getClassify();
     this.getDetail();
+  },
+  mounted(){
+    window.addEventListener('beforeunload',this.markFinishStatus)
+  },
+  beforeDestroy(){
+    window.removeEventListener('beforeunload',this.markFinishStatus)
   }
 }
 </script>

src/views/datasheet_manage/mixins/classifyMixin.js

@@ -110,6 +110,7 @@ export default {
         if(!this.sheet_title) return this.$message.warning('表格名称不能为空');
         data.isEditTit = false;
         data.ExcelName = this.sheet_title;
+        console.log(data,'data');
       }else {
         if(!this.new_label) return this.$message.warning('名称不能为空');
         this.$set(data,'isEdit',false)
@@ -318,7 +319,8 @@ export default {
         '/sheetList': 'etaTable_excel',
         '/sheetTimeList': 'etaTable_customize_data',
         '/sheetMixedList': 'etaTable_customize_mix',
-        '/sheetAnalysisList': 'etaTable_analysis'
+        '/sheetAnalysisList': 'etaTable_analysis',
+        '/editSheetAnalysis': 'etaTable_analysis'
       }
       return this.permissionBtn.isShowBtn('etaTablePermission',`${sheetType[this.$route.path]}_${type}`)
     }

src/views/datasheet_manage/sheetList.vue

@@ -139,7 +139,7 @@
             <span class="author"
               >作者：{{ sheetDetailInfo.SysUserRealName }}</span
             >
-            <el-input
+            <!-- <el-input
               ref="sheetEditTitRef"
               style="width: 400px"
               placeholder="请输入表格名称"
@@ -147,34 +147,29 @@
               v-model="sheet_title"
               v-if="sheetDetailInfo.isEditTit"
               @blur="changeValue(sheetDetailInfo, 'edit-tit')"
-            />
-            <span
+            /> -->
+            <!-- <span
               class="sheet-name"
               @click="editNodeLabel(sheetDetailInfo, 'edit-tit')"
               v-else
             >
               {{ sheetDetailInfo.ExcelName }}
               <i class="el-icon-edit" v-if="sheetDetailInfo.Source === 1" />
+            </span> -->
+            <span class="sheet-name">
+              {{ sheetDetailInfo.ExcelName }}
             </span>
             <ul class="action-ul">
+              <li style="color:#999999 ;">最近保存时间：{{ saveTime }}</li>
               <li
                 class="editsty"
-                @click="saveHandle"
-                v-if="
-                  sheetDetailInfo.Source === 1 &&
-                  sheetDetailInfo.Button.OpButton&&isSheetBtnShow('save')
-                "
+                @click="goEditHandle"
+                v-if="isCreator || 
+                (sheetDetailInfo.Button && sheetDetailInfo.Button.OpButton&&isSheetBtnShow('edit'))"
               >
-                保存
+                {{ editButtonText?editButtonText:'编辑' }}
               </li>
               <template v-if="[2, 3].includes(sheetDetailInfo.Source)">
-                <li
-                  class="editsty"
-                  @click="goEditHandle"
-                  v-if="sheetDetailInfo.Button.OpButton&&isSheetBtnShow('edit')"
-                >
-                  编辑
-                </li>
                 <li
                   class="editsty"
                   @click="refreshSheetEdb"
@@ -197,8 +192,8 @@
               <li
                 class="deletesty"
                 v-if="
-                  sheetDetailInfo.Button && sheetDetailInfo.Button.DeleteButton
-                  &&isDeleteShow(sheetDetailInfo)
+                  isCreator || (sheetDetailInfo.Button && sheetDetailInfo.Button.DeleteButton
+                  &&isDeleteShow(sheetDetailInfo))
                 "
                 @click="delSheetHandle({cell:sheetDetailInfo, type:'del'})"
               >
@@ -225,6 +220,7 @@
                 ExcelClassifyId: sheetDetailInfo.ExcelClassifyId,
                 Source: sheetDetailInfo.Source
               }"
+              :limit="{disabled:true}"
             />
 
             <!-- 自定义表格  -->
@@ -360,6 +356,10 @@ export default {
         const cell = {Source:3}
         return this.isSheetBtnShow(cell,'edit')||this.isSheetBtnShow(cell,'refresh')||this.isSheetBtnShow(cell,'otherSave')
             || this.isSheetBtnShow(cell,'download')||this.isSheetBtnShow(cell,'del')
+    },
+
+    isCreator(){
+      return this.adminId==this.excelAdminId
     }
   },
   data() {
@@ -410,12 +410,15 @@ export default {
           { required: true, message: "表格分类不能为空", trigger: "blur" },
         ],
       },
-
       sourceMap: {
         '/sheetList': 1,
         '/sheetTimeList': 2,
         '/sheetMixedList': 3,
-      }
+      },
+      saveTime:"",
+      editButtonText:"",
+      adminId:localStorage.getItem("AdminId") || '0',
+      excelAdminId:""
     };
   },
   watch: {
@@ -513,6 +516,7 @@ export default {
 
     /* 选中分类变化时 */
     nodeChange({ UniqueCode, ExcelInfoId, ExcelClassifyId }, node) {
+      console.log(this.select_id,ExcelInfoId,'UniqueCode');
       this.search_txt = "";
       this.select_node = UniqueCode;
       this.select_classify = !ExcelInfoId ? ExcelClassifyId : 0;
@@ -737,15 +741,16 @@ export default {
 
     /* 获取表格详情 */
     getDetailHandle() {
-      sheetInterface
-        .sheetDetail({
+      sheetInterface.sheetDetail({
           ExcelInfoId: this.select_id,
         })
         .then((res) => {
           if (res.Ret !== 200) return;
 
           this.sheetDetailInfo = res.Data;
-
+          this.saveTime = this.$moment(this.sheetDetailInfo.ModifyTime).format('YYYY-MM-DD HH:mm:ss')||''
+          this.excelAdminId = this.sheetDetailInfo.SysUserId
+          this.editButtonText = this.sheetDetailInfo.CanEdit?'':`${this.sheetDetailInfo.Editor}编辑中`
           this.$nextTick(() => {
             this.sheetDetailInfo.Source === 1 && this.$refs.sheetRef.init();
 
@@ -771,17 +776,33 @@ export default {
         })
         .catch(() => {});
     },
-
     /* 编辑 */
     goEditHandle() {
-      let path = {
-        2: "/addCustomSheet",
-        3: "addMixedSheet",
-      };
-      this.$router.push({
-        path: path[this.sheetDetailInfo.Source],
-        query: { id: this.sheetDetailInfo.ExcelInfoId },
-      });
+      // 标记
+      sheetInterface.markSheetEditStatus({ExcelInfoId: this.select_id,Status:1}).then(res=>{
+        if(res.Ret != 200) return 
+        if(res.Data.Status==0){
+          let path = {
+            1:"/addsheet",
+            2: "/addCustomSheet",
+            3: "/addMixedSheet",
+          };
+          if(this.sheetDetailInfo.Source === 1) {
+            const { href } = this.$router.resolve({ path: path[this.sheetDetailInfo.Source],query: { id: this.sheetDetailInfo.ExcelInfoId } });
+            window.open(href, "_blank");
+          }else {
+            this.$router.push({
+              path: path[this.sheetDetailInfo.Source],
+              query: { id: this.sheetDetailInfo.ExcelInfoId },
+            });
+          }
+
+        }else if(res.Data.Status==1){
+          this.editButtonText = `${res.Data.Editor}编辑中`
+          this.$message.warning('当前'+this.editButtonText)
+        }
+      })
+
     },
 
     /* 刷新表格 */
@@ -971,11 +992,11 @@ $normal-font: 14px;
           border-bottom: 1px solid #ececec;
           .sheet-name {
             font-size: 17px;
-            cursor: pointer;
+            // cursor: pointer;
             max-width: 450px;
-            &:hover {
-              text-decoration: underline;
-            }
+            // &:hover {
+            //   text-decoration: underline;
+            // }
           }
           .action-ul {
             display: flex;

src/vuex/modules/permissionButton.js

@@ -16,6 +16,7 @@ const permissionButtons = {
             return new Promise((resolve,reject)=>{
                 departInterence.getRoleBtnAuth().then(res=>{
                     const buttons = res.Data || []
+                    // console.log(buttons.find(it => it.ButtonCode=="etaTable:analysis:edit"),'buttons');
                     commit('SET_PERMISSION_BUTTONS',buttons)
                     
                     let trialUserPermisson = !!buttons.find(item => item.ButtonCode =="trialUserAction")