合并冲突

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -1144,16 +1144,6 @@ export default {
       return {result:true,hintText:''}
     },
     async handlePublish(){
-      if(!this.isSave){
-        this.$message.warning(this.$t('Slides.please_save_first')+'!' )
-        return
-      }else{
-        const {result,hintText} = this.checkPPT()
-        if(!result){
-          this.$message.warning(hintText)
-          return
-        }
-      }
       //ETA1.7.5更改发布逻辑,点击发布时,自动执行保存操作,若可保存,则跳转发布页
       await this.handleSave('pub')
       //ppt4.0后,合并后的PPT可能会超出页数or图表限制,在这里做个校验

src/views/ppt_manage/newVersion/pptEnEditor.vue

@@ -1130,16 +1130,6 @@ export default {
       return {result:true,hintText:''}
     },
     async handlePublish(){
-      if(!this.isSave){
-        this.$message.warning(this.$t('Slides.please_save_first') )
-        return
-      }else{
-        const {result,hintText} = this.checkPPT()
-        if(!result){
-          this.$message.warning(hintText)
-          return
-        }
-      }
       //ETA1.7.5更改发布逻辑,点击发布时,自动执行保存操作,若可保存,则跳转发布页
       await this.handleSave('pub')
       //ppt4.0后,合并后的PPT可能会超出页数or图表限制,在这里做个校验