diff --git a/public/UEditor/lang/zh-cn/zh-cn.js b/public/UEditor/lang/zh-cn/zh-cn.js index 00ea1bc..239a9da 100644 --- a/public/UEditor/lang/zh-cn/zh-cn.js +++ b/public/UEditor/lang/zh-cn/zh-cn.js @@ -8,15 +8,15 @@ UE.I18N['zh-cn'] = { 'labelMap':{ 'anchor':'锚点', 'undo':'撤销', 'redo':'重做', 'bold':'加粗', 'indent':'首行缩进', 'snapscreen':'截图', - 'italic':'斜体', 'underline':'下划线', 'strikethrough':'删除线', 'subscript':'下标','fontborder':'字符边框', - 'superscript':'上标', 'formatmatch':'格式刷', 'source':'Code', 'blockquote':'引用', + 'italic':'italic', 'underline':'下划线', 'strikethrough':'删除线', 'subscript':'subscript','fontborder':'字符边框', + 'superscript':'superscript', 'formatmatch':'格式刷', 'source':'Code', 'blockquote':'引用', 'pasteplain':'纯文本粘贴模式', 'selectall':'全选', 'print':'打印', 'preview':'预览', 'horizontal':'分隔线', 'removeformat':'清除格式', 'time':'时间', 'date':'日期', - 'unlink':'取消链接', 'insertrow':'前插入行', 'insertcol':'前插入列', 'mergeright':'右合并单元格', 'mergedown':'下合并单元格', + 'unlink':'unlink', 'insertrow':'前插入行', 'insertcol':'前插入列', 'mergeright':'右合并单元格', 'mergedown':'下合并单元格', 'deleterow':'删除行', 'deletecol':'删除列', 'splittorows':'拆分成行', 'splittocols':'拆分成列', 'splittocells':'完全拆分单元格','deletecaption':'删除表格标题','inserttitle':'插入标题', 'mergecells':'合并多个单元格', 'deletetable':'删除表格', 'cleardoc':'清空文档','insertparagraphbeforetable':"表格前插入行",'insertcode':'代码语言', - 'fontfamily':'字体', 'fontsize':'字号', 'paragraph':'段落格式', 'simpleupload':'单图上传', 'insertimage':'多图上传','edittable':'表格属性','edittd':'单元格属性', 'link':'超链接', + 'fontfamily':'字体', 'fontsize':'字号', 'paragraph':'段落格式', 'simpleupload':'单图上传', 'insertimage':'多图上传','edittable':'表格属性','edittd':'单元格属性', 'link':'link', 'emotion':'表情', 'spechars':'特殊字符', 'searchreplace':'查询替换', 'map':'Baidu地图', 'gmap':'Google地图', 'insertvideo':'视频', 'help':'帮助', 'justifyleft':'居左对齐', 'justifyright':'居右对齐', 'justifycenter':'居中对齐', 'justifyjustify':'两端对齐', 'forecolor':'字体颜色', 'backcolor':'背景色', 'insertorderedlist':'有序列表', @@ -555,13 +555,15 @@ UE.I18N['zh-cn'] = { }, 'link':{ 'static':{ - 'lang_input_text':'文本内容：', - 'lang_input_url':'链接地址：', - 'lang_input_title':'标题：', - 'lang_input_target':'是否在新窗口打开：' + 'lang_input_text':'Text：', + 'lang_input_url':'Link：', + 'lang_input_title':'Title：', + 'lang_input_target':'Open in a new window：' }, - 'validLink':'只支持选中一个链接时生效', - 'httpPrompt':'您输入的超链接中不包含http等协议名称，默认将为您添加http://前缀' + // 'validLink':'只支持选中一个链接时生效', + 'validLink':'Only one link is selected to take effect', + // 'httpPrompt':'您输入的超链接中不包含http等协议名称，默认将为您添加http://前缀' + 'httpPrompt':'The hyperlink you enter does not contain a protocol name such as http, and a "http:// prefix" will be added by default' }, 'map':{ 'static':{ diff --git a/public/UEditor/ueditor.config.js b/public/UEditor/ueditor.config.js index 2d0fdbf..58bac03 100644 --- a/public/UEditor/ueditor.config.js +++ b/public/UEditor/ueditor.config.js @@ -37,14 +37,17 @@ 'fullscreen', 'source', // '|', 'undo', 'redo', '|', 'bold', 'italic', - // 'underline', 'fontborder', 'strikethrough', 'superscript', 'subscript', + // 'underline', 'fontborder', 'strikethrough', + 'superscript', 'subscript', // 'removeformat', 'formatmatch', 'autotypeset', 'blockquote', 'pasteplain', '|', 'forecolor', 'backcolor', 'insertorderedlist', 'insertunorderedlist', // 'selectall', 'cleardoc', '|', // 'rowspacingtop', 'rowspacingbottom', 'lineheight', '|', - // 'customstyle', 'paragraph', 'fontfamily', 'fontsize', '|', - // 'directionalityltr', 'directionalityrtl', 'indent', '|', + // 'customstyle', 'paragraph', 'fontfamily', + 'fontsize', + // '|', 'directionalityltr', 'directionalityrtl', 'indent', '|', // 'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'touppercase', 'tolowercase', '|', - // 'link', 'unlink', 'anchor', '|', 'imagenone', 'imageleft', 'imageright', 'imagecenter', '|', + 'link', 'unlink', + // 'anchor', '|', 'imagenone', 'imageleft', 'imageright', 'imagecenter', '|', // 'simpleupload', 'insertimage', 'emotion', 'scrawl', 'insertvideo', 'music', 'attachment', 'map', 'gmap', 'insertframe', 'insertcode', 'webapp', 'pagebreak', 'template', 'background', '|', // 'horizontal', 'date', 'time', 'spechars', 'snapscreen', 'wordimage', '|', // 'inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols', 'charts', '|', diff --git a/src/components/page/articleListEditor_E.vue b/src/components/page/articleListEditor_E.vue index db531b4..f71dd89 100644 --- a/src/components/page/articleListEditor_E.vue +++ b/src/components/page/articleListEditor_E.vue @@ -234,6 +234,10 @@ style="margin-left: 20px;"> Edit Html Proofread + + Remove Html Proofread +
@@ -426,6 +430,29 @@ import { watch } from 'vue'; loading.close(); }); }, + // 清空html + clearHtmlLayout(){ + this.$confirm('You are Removing Html Proofread, do you want to continue?', 'Tips', { + confirmButtonText: 'Sure', + cancelButtonText: 'Cancle', + type: 'warning' + }).then(() => { + this.$api + .post('api/Production/clearWebMains', { + 'article_id': this.articleId, + }) + .then(res => { + if(res.code == 0){ + this.getDate() + }else{ + this.$message.error(res.msg) + } + }) + .catch(err => { + console.log(err); + }); + }).catch(() => {}); + }, // 跳转到引用编辑页面 goEditRefernces(){ // let pid = null diff --git a/src/components/page/comArtHtmlEdit.vue b/src/components/page/comArtHtmlEdit.vue index 5e969b9..0280043 100644 --- a/src/components/page/comArtHtmlEdit.vue +++ b/src/components/page/comArtHtmlEdit.vue @@ -207,7 +207,7 @@ -
@@ -317,15 +317,17 @@ import VueUeditorWrap from 'vue-ueditor-wrap'; // ES6 Module saveMultAdd(){ var pp = this.wordText.split('

') var ss = [] - var re = /<[^>]+>/gi; - var nbsp = / /gi; + var re = /<[^>]+>/gi; + var noP = /

/gi; + // var nbsp = / /gi; pp.forEach(element => { - element = element.replace(re, "") - element = element.replace(nbsp,"") - ss.push(element) + // element = element.replace(re, "") + // element = element.replace(nbsp,"") + element = element.replace(noP,"") + ss.push(element) }); // 去掉最后一个数据 - // console.log(ss[ss.length-1].length) + console.log(ss[ss.length-1].length) if(ss[ss.length-1].length <= 0){ this.multAdd.contents = ss.slice(0,-1) }else{ @@ -335,7 +337,7 @@ import VueUeditorWrap from 'vue-ueditor-wrap'; // ES6 Module }, // 发送后台 wordSubmit(){ - // console.log(this.multAdd.contents) + console.log(this.multAdd.contents) this.$api .post('api/Production/addWebMains', { 'article_id': this.multAdd.article_id, diff --git a/src/components/page/editPublicRefRdit.vue b/src/components/page/editPublicRefRdit.vue index 46e688e..be34a1a 100644 --- a/src/components/page/editPublicRefRdit.vue +++ b/src/components/page/editPublicRefRdit.vue @@ -227,7 +227,7 @@ - +

Paste the contents of the wold file here, delete the carriage return at the end and click "Submit".