From 18bd0e9f19341e7f8f4d864384b691a8b81fdf89 Mon Sep 17 00:00:00 2001 From: sj <1304317391@qq.com> Date: Fri, 28 Oct 2022 19:39:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=84=E6=B5=8B=E5=B9=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81=E5=8F=82=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/UEditor/ueditor.all.js | 35 +++++----- public/UEditor/ueditor.config.js | 4 +- src/components/editorMaterial/index.vue | 2 +- src/components/material/index.vue | 3 +- src/views/bxg/shop/goods/attr.vue | 2 + src/views/bxg/shop/goods/form.vue | 57 ++++++++++++++- src/views/bxg/shop/goods/index.vue | 4 +- src/views/bxg/shop/goods/index2.vue | 1 + src/views/bxg/shop/goods/index3.vue | 1 + src/views/bxg/yxEvaluation/index.vue | 92 ++++++++++++++----------- 10 files changed, 136 insertions(+), 65 deletions(-) diff --git a/public/UEditor/ueditor.all.js b/public/UEditor/ueditor.all.js index ff41942..4a17c35 100644 --- a/public/UEditor/ueditor.all.js +++ b/public/UEditor/ueditor.all.js @@ -12673,7 +12673,7 @@ UE.plugins['paragraph'] = function() { } ); } tmpRange.setEndAfter( tmpNode ); - + para = range.document.createElement( style ); if(attrs){ domUtils.setAttributes(para,attrs); @@ -12685,7 +12685,7 @@ UE.plugins['paragraph'] = function() { //需要内容占位 if(domUtils.isEmptyNode(para)){ domUtils.fillChar(range.document,para); - + } tmpRange.insertNode( para ); @@ -12809,7 +12809,7 @@ UE.plugins['paragraph'] = function() { }, doDirectionality = function(range,editor,forward){ - + var bookmark, filterFn = function( node ) { return node.nodeType == 1 ? !domUtils.isBookmarkNode(node) : !domUtils.isWhitespace(node); @@ -22731,7 +22731,7 @@ UE.plugins['formatmatch'] = function(){ }); function addList(type,evt){ - + if(browser.webkit){ var target = evt.target.tagName == 'IMG' ? evt.target : null; } @@ -22797,7 +22797,7 @@ UE.plugins['formatmatch'] = function(){ me.commands['formatmatch'] = { execCommand : function( cmdName ) { - + if(flag){ flag = 0; list = []; @@ -22806,7 +22806,7 @@ UE.plugins['formatmatch'] = function(){ } - + var range = me.selection.getRange(); img = range.getClosedNode(); if(!img || img.tagName != 'IMG'){ @@ -25082,10 +25082,11 @@ UE.ui = baidu.editor.ui = {}; } else { layer.style.position = 'fixed'; } - layer.style.left = '0'; + layer.style.left = '30'; layer.style.top = '0'; - layer.style.width = '0'; + layer.style.width = '50'; layer.style.height = '0'; + layer.style.zIndex="5000!important;" } return layer; }, @@ -25113,8 +25114,8 @@ UE.ui = baidu.editor.ui = {}; function updateFixedOffset(){ var layer = document.getElementById('edui_fixedlayer'); uiUtils.setViewportOffset(layer, { - left: 0, - top: 0 + left: 666, + top: 888 }); // layer.style.display = 'none'; // layer.style.display = 'block'; @@ -25245,7 +25246,7 @@ UE.ui = baidu.editor.ui = {}; domUtils = baidu.editor.dom.domUtils, UIBase = baidu.editor.ui.UIBase, uiUtils = baidu.editor.ui.uiUtils; - + var Mask = baidu.editor.ui.Mask = function (options){ this.initOptions(options); this.initUIBase(); @@ -25541,7 +25542,7 @@ UE.ui = baidu.editor.ui = {}; } }; utils.inherits(Popup, UIBase); - + domUtils.on( document, 'mousedown', function ( evt ) { var el = evt.target || evt.srcElement; closeAllPopup( evt,el ); @@ -25637,7 +25638,7 @@ UE.ui = baidu.editor.ui = {}; var utils = baidu.editor.utils, uiUtils = baidu.editor.ui.uiUtils, UIBase = baidu.editor.ui.UIBase; - + var TablePicker = baidu.editor.ui.TablePicker = function (options){ this.initOptions(options); this.initTablePicker(); @@ -25721,7 +25722,7 @@ UE.ui = baidu.editor.ui = {}; var browser = baidu.editor.browser, domUtils = baidu.editor.dom.domUtils, uiUtils = baidu.editor.ui.uiUtils; - + var TPL_STATEFUL = 'onmousedown="$$.Stateful_onMouseDown(event, this);"' + ' onmouseup="$$.Stateful_onMouseUp(event, this);"' + ( browser.ie ? ( @@ -25730,7 +25731,7 @@ UE.ui = baidu.editor.ui = {}; : ( ' onmouseover="$$.Stateful_onMouseOver(event, this);"' + ' onmouseout="$$.Stateful_onMouseOut(event, this);"' )); - + baidu.editor.ui.Stateful = { alwalysHoverable: false, target:null,//目标元素和this指向dom不一样 @@ -27355,7 +27356,7 @@ UE.ui = baidu.editor.ui = {}; setValue : function(value){ this._value = value; } - + }; utils.inherits(MenuButton, SplitButton); })(); @@ -28985,7 +28986,7 @@ UE.ui = baidu.editor.ui = {}; // } // }); - + for(var key in UE._customizeUI){ var obj = UE._customizeUI[key] var itemUI,index; diff --git a/public/UEditor/ueditor.config.js b/public/UEditor/ueditor.config.js index e35d1d9..5e21c14 100644 --- a/public/UEditor/ueditor.config.js +++ b/public/UEditor/ueditor.config.js @@ -62,7 +62,7 @@ //,theme:'default' //,themePath:URL +"themes/" - ,zIndex : 9999 //编辑器层级的基数,默认是900 + // ,zIndex : 9999 //编辑器层级的基数,默认是900 //针对getAllHtml方法，会在对应的head标签中增加该编码设置。 //,charset:"utf-8" @@ -88,7 +88,7 @@ //indentValue //首行缩进距离,默认是2em - //,indentValue:'2em' + // ,indentValue:'2em' //,initialFrameWidth:1000 //初始化编辑器宽度,默认1000 //,initialFrameHeight:320 //初始化编辑器高度,默认320 diff --git a/src/components/editorMaterial/index.vue b/src/components/editorMaterial/index.vue index 3ed6346..ffc788e 100644 --- a/src/components/editorMaterial/index.vue +++ b/src/components/editorMaterial/index.vue @@ -40,7 +40,7 @@ width="100%" > - +
@@ -468,6 +468,7 @@ export default {