quguofeng 2 years ago
parent
commit
a6f3d38434

+ 3 - 2
public/UEditor/dialogs/background/background.css

@@ -3,7 +3,8 @@
 .tabbody .panel { position: absolute;width:100%; height:100%;background: #fff; display: none;}
 .tabbody .focus { display: block;}
 
-body{font-size: 12px;color: #888;overflow: hidden;}
+body{font-size: 12px;color: #888;}
+  /*overflow: hidden;}*/
 input,label{vertical-align:middle}
 .clear{clear: both;}
 .pl{padding-left: 18px;padding-left: 23px\9;}
@@ -91,4 +92,4 @@ div.alignment,#custom{margin-left: 23px;margin-left: 28px\9;}
     height: 107px;
     border: 3px solid #1094fa;
     background-position: 72px 72px;
-}
+}

+ 3 - 8
public/UEditor/dialogs/charts/charts.css

@@ -1,16 +1,11 @@
-body {
+html, body {
     width: 100%;
     height: 100%;
     margin: 0;
     padding: 0;
     overflow-x: hidden;
 }
-html{
-  width: 100%;
-  margin: 0;
-  padding: 0;
-  overflow-x: hidden;
-}
+
 .main {
     width: 100%;
     overflow: hidden;
@@ -167,4 +162,4 @@ html{
     height: 100px;
     line-height: 100px;
     text-align: center;
-}
+}

+ 1 - 1
public/UEditor/dialogs/video/video.html

@@ -83,4 +83,4 @@
 <!-- video -->
 <script type="text/javascript" src="video.js"></script>
 </body>
-</html>
+</html>

+ 1 - 1
public/UEditor/index.html

@@ -19,7 +19,7 @@
 <body>
 <div>
     <h1>完整demo</h1>
-    <script id="editor" type="text/plain" style="width:1024px;height:500px;">{$food[content]}</script>
+    <script id="editor" type="text/plain" style="width:1024px;height:500px;">${store.summary}</script>
 </div>
 <div id="btns">
     <div>

+ 3 - 2
public/UEditor/themes/default/css/ueditor.css

@@ -61,7 +61,7 @@ div.edui-box {
 }
 
 .edui-default .edui-popup {
-    position: absolute;
+    position: relative;
     -webkit-user-select: none;
     -moz-user-select: none;
 }
@@ -270,7 +270,7 @@ div.edui-box {
     position: absolute;
     bottom: -25px;
     left: 0;
-    z-index: 1009;
+    z-index: 2009;
     width: 99.9%;
 }
 
@@ -1060,6 +1060,7 @@ div.edui-box {
     background-clip: padding-box;
     padding: 5px;
     background:#ffffff;
+  width: 200px;
 }
 
 .edui-default .edui-popup .edui-bordereraser {

File diff suppressed because it is too large
+ 0 - 0
public/UEditor/themes/default/css/ueditor.min.css


+ 2 - 2
public/UEditor/third-party/SyntaxHighlighter/shCore.js

@@ -2435,7 +2435,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter :
         // http://davidchambersdesign.com/
         var keywords   = 'after before beginning continue copy each end every from return get global in local named of set some that the then times to where whose with without';
         var ordinals   = 'first second third fourth fifth sixth seventh eighth ninth tenth last front back middle';
-        var specials   = 'activate add alias AppleScript ask attachment boolean class constant delete duplicate empty exists false id integer list make message modal modified new no paragraph pi properties quit real record remove rest result reveal reverse run running save string true word yes';
+        var specials   = 'activate add alias AppleScript ask attachment boolean class constant delete duplicate empty exists false id integer list make message modal modified new no paragraph pi properties quit real reconciliation remove rest result reveal reverse run running save string true word yes';
 
         this.regexList = [
 
@@ -2830,7 +2830,7 @@ typeof(exports) != 'undefined' ? exports.SyntaxHighlighter = SyntaxHighlighter :
 						'of on or packed pansichar pansistring pchar pcurrency pdatetime pextended ' +
 						'pint64 pointer private procedure program property pshortstring pstring ' +
 						'pvariant pwidechar pwidestring protected public published raise real real48 ' +
-						'record repeat set shl shortint shortstring shr single smallint string then ' +
+						'reconciliation repeat set shl shortint shortstring shr single smallint string then ' +
 						'threadvar to true try type unit until uses val var varirnt while widechar ' +
 						'widestring with word write writeln xor';
 

+ 1 - 1
public/UEditor/third-party/highcharts/adapters/mootools-adapter.src.js

@@ -151,7 +151,7 @@ win.HighchartsAdapter = {
 		// run
 		effect.start(params);
 
-		// record for use in stop method
+		// reconciliation for use in stop method
 		el.fx = effect;
 	},
 

+ 10 - 10
public/UEditor/third-party/highcharts/highcharts.src.js

@@ -807,7 +807,7 @@ function getTimeTicks(normalizedInterval, min, max, startOfWeek) {
 	}
 
 
-	// record information on the chosen unit - for dynamic label formatter
+	// reconciliation information on the chosen unit - for dynamic label formatter
 	tickPositions.info = extend(normalizedInterval, {
 		higherRanks: higherRanks,
 		totalRange: interval * count
@@ -2647,7 +2647,7 @@ SVGElement.prototype = {
 					});
 				}
 
-				// record correction
+				// reconciliation correction
 				wrapper.xCorr = xCorr;
 				wrapper.yCorr = yCorr;
 			}
@@ -2663,7 +2663,7 @@ SVGElement.prototype = {
 				height = elem.offsetHeight; // assigned to height for JSLint purpose
 			}
 
-			// record current text transform
+			// reconciliation current text transform
 			wrapper.cTT = currentTextTransform;
 		}
 	},
@@ -4331,7 +4331,7 @@ SVGRenderer.prototype = {
 				});
 			}
 
-			// record current values
+			// reconciliation current values
 			text.x = x;
 			text.y = y;
 		}
@@ -5062,7 +5062,7 @@ Highcharts.VMLElement = VMLElement = {
 					element.parentNode.insertBefore(shadow, element);
 				}
 
-				// record it
+				// reconciliation it
 				shadows.push(shadow);
 
 			}
@@ -7750,7 +7750,7 @@ Axis.prototype = {
 			// get fixed positions based on tickInterval
 			axis.setTickPositions();
 
-			// record old values to decide whether a rescale is necessary later on (#540)
+			// reconciliation old values to decide whether a rescale is necessary later on (#540)
 			axis.oldUserMin = axis.userMin;
 			axis.oldUserMax = axis.userMax;
 
@@ -9549,7 +9549,7 @@ Pointer.prototype = {
 			// a selection has been made
 			if (this.hasDragged || hasPinched) {
 
-				// record each axis' min and max
+				// reconciliation each axis' min and max
 				each(chart.axes, function (axis) {
 					if (axis.zoomEnabled) {
 						var horiz = axis.horiz,
@@ -12479,7 +12479,7 @@ Point.prototype = {
 				}
 			}
 
-			// record changes in the parallel arrays
+			// reconciliation changes in the parallel arrays
 			i = inArray(point, data);
 			series.xData[i] = point.x;
 			series.yData[i] = series.toYData ? series.toYData(point) : point.y;
@@ -15499,7 +15499,7 @@ var SplineSeries = extendClass(Series, {
 				leftContY = 2 * plotY - rightContY;
 			}
 
-			// record for drawing in next point
+			// reconciliation for drawing in next point
 			point.rightContX = rightContX;
 			point.rightContY = rightContY;
 
@@ -15744,7 +15744,7 @@ var ColumnSeries = extendClass(Series, {
 
 		Series.prototype.translate.apply(series);
 
-		// record the new values
+		// reconciliation the new values
 		each(series.points, function (point) {
 			var yBottom = pick(point.yBottom, translatedThreshold),
 				plotY = mathMin(mathMax(-999 - yBottom, point.plotY), yAxis.len + 999 + yBottom), // Don't draw too far outside plot area (#1303, #2241)

+ 1 - 1
public/UEditor/third-party/highcharts/modules/data.src.js

@@ -290,7 +290,7 @@
 						// Create new columns with the length of either end-start or rowCount
 						columns[i - startColumn] = [];
 
-						// SettingMer the length to avoid jslint warning
+						// Setting the length to avoid jslint warning
 						columns[i - startColumn].length = Math.min(rowCount, endRow - startRow);
 					}
 				}

+ 3 - 3
public/UEditor/third-party/jquery-1.10.2.js

@@ -4429,7 +4429,7 @@ jQuery.extend({
 		type: {
 			set: function( elem, value ) {
 				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// SettingMer the type on a radio button after the value resets the value in IE6-9
+					// Setting the type on a radio button after the value resets the value in IE6-9
 					// Reset value to default in case type is set after value during creation
 					var val = elem.value;
 					elem.setAttribute( "type", value );
@@ -4597,7 +4597,7 @@ if ( !getSetAttribute ) {
 	};
 
 	// Set contenteditable to false on removals(#10429)
-	// SettingMer to empty string throws an error as an invalid value
+	// Setting to empty string throws an error as an invalid value
 	jQuery.attrHooks.contenteditable = {
 		set: function( elem, value, name ) {
 			nodeHook.set( elem, value === "" ? false : value, name );
@@ -7356,7 +7356,7 @@ if ( !jQuery.support.opacity ) {
 					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
 					style.removeAttribute ) {
 
-				// SettingMer style.filter to null, "" & " " still leave "filter:" in the cssText
+				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
 				// if "filter:" is present at all, clearType is disabled, we want to avoid this
 				// style.removeAttribute is IE Only, but so apparently is this code path...
 				style.removeAttribute( "filter" );

File diff suppressed because it is too large
+ 0 - 0
public/UEditor/third-party/jquery-1.10.2.min.map


+ 3 - 4
public/UEditor/third-party/video-js/video.dev.js

@@ -372,7 +372,7 @@ vjs.cleanUpEvents = function(elem, type) {
   if (data.handlers[type].length === 0) {
     delete data.handlers[type];
     // data.handlers[type] = null;
-    // SettingMer to null was causing an error with data.handlers
+    // Setting to null was causing an error with data.handlers
 
     // Remove the meta-handler from the element
     if (document.removeEventListener) {
@@ -3923,7 +3923,7 @@ vjs.Player.prototype.listenForUserActivity = function(){
     // we consider them active even if they're not moving their finger or mouse.
     // So we want to continue to update that they are active
     clearInterval(mouseInProgress);
-    // SettingMer userActivity=true now and setting the interval to the same time
+    // Setting userActivity=true now and setting the interval to the same time
     // as the activityCheck interval (250) should ensure we never miss the
     // next activityCheck
     mouseInProgress = setInterval(vjs.bind(this, onMouseActivity), 250);
@@ -4415,7 +4415,6 @@ vjs.SeekBar.prototype.onMouseMove = function(event){
 
 vjs.SeekBar.prototype.onMouseUp = function(event){
   vjs.Slider.prototype.onMouseUp.call(this, event);
-
   this.player_.scrubbing = false;
   if (this.videoWasPlaying) {
     this.player_.play();
@@ -5532,7 +5531,7 @@ vjs.Flash = vjs.MediaTechController.extend({
         // Not sure why that's a security issue, but apparently it is.
         iDoc.write(vjs.Flash.getEmbedCode(options['swf'], flashVars, params, attributes));
 
-        // SettingMer variables on the window needs to come after the doc write because otherwise they can get reset in some browsers
+        // Setting variables on the window needs to come after the doc write because otherwise they can get reset in some browsers
         // So far no issues with swf ready event being called before it's set on the window.
         iWin['player'] = this.player_;
 

+ 14 - 21
public/UEditor/ueditor.all.js

@@ -179,6 +179,7 @@ var browser = UE.browser = function(){
          */
         browser.ie7Compat = ( ( version == 7 && !document.documentMode )
                 || document.documentMode == 7 );
+
         /**
          * @property { boolean } ie6Compat 检测浏览器模式是否为 IE6 模式 或者怪异模式
          * @warning 如果浏览器不是IE, 则该值为undefined
@@ -12672,7 +12673,7 @@ UE.plugins['paragraph'] = function() {
                         } );
                     }
                     tmpRange.setEndAfter( tmpNode );
-
+                    
                     para = range.document.createElement( style );
                     if(attrs){
                         domUtils.setAttributes(para,attrs);
@@ -12684,7 +12685,7 @@ UE.plugins['paragraph'] = function() {
                     //需要内容占位
                     if(domUtils.isEmptyNode(para)){
                         domUtils.fillChar(range.document,para);
-
+                        
                     }
 
                     tmpRange.insertNode( para );
@@ -12808,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);
@@ -20026,14 +20027,6 @@ UE.plugins['table'] = function () {
 
                 var caption = domUtils.findParentByTagName(me.selection.getStart(), 'caption', true),
                     range = me.selection.getRange();
-
-                var child = range.startContainer;
-                if (child != null) {
-                  if (child.tagName == "VIDEO") {
-                    domUtils.remove(child);
-                  }
-                }
-
                 if (range.collapsed && caption && isEmptyBlock(caption)) {
                     me.fireEvent('saveScene');
                     var table = caption.parentNode;
@@ -22738,7 +22731,7 @@ UE.plugins['formatmatch'] = function(){
      });
 
     function addList(type,evt){
-
+        
         if(browser.webkit){
             var target = evt.target.tagName == 'IMG' ? evt.target : null;
         }
@@ -22804,7 +22797,7 @@ UE.plugins['formatmatch'] = function(){
 
     me.commands['formatmatch'] = {
         execCommand : function( cmdName ) {
-
+          
             if(flag){
                 flag = 0;
                 list = [];
@@ -22813,7 +22806,7 @@ UE.plugins['formatmatch'] = function(){
             }
 
 
-
+              
             var range = me.selection.getRange();
             img = range.getClosedNode();
             if(!img || img.tagName != 'IMG'){
@@ -25252,7 +25245,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();
@@ -25548,7 +25541,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 );
@@ -25644,7 +25637,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();
@@ -25728,7 +25721,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 ? (
@@ -25737,7 +25730,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不一样
@@ -27362,7 +27355,7 @@ UE.ui = baidu.editor.ui = {};
         setValue : function(value){
             this._value = value;
         }
-
+        
     };
     utils.inherits(MenuButton, SplitButton);
 })();
@@ -28992,7 +28985,7 @@ UE.ui = baidu.editor.ui = {};
             //     }
             // });
 
-
+            
             for(var key in UE._customizeUI){
                 var obj = UE._customizeUI[key]
                 var itemUI,index;

File diff suppressed because it is too large
+ 0 - 0
public/UEditor/ueditor.all.min.js


+ 7 - 10
public/UEditor/ueditor.config.js

@@ -34,17 +34,17 @@
 
         // 工具栏上的所有的功能按钮和下拉框,可以在new编辑器的实例时选择自己需要的重新定义
         toolbars: [[
-            'source', '|', 'undo', 'redo', '|',
+          'previewmobile', 'source', '|', 'undo', 'redo', '|',
             'bold', 'italic', 'underline', 'strikethrough', '|', 'superscript', 'subscript', '|', 'forecolor', 'backcolor', '|',
             'removeformat', '|', 'insertorderedlist', 'insertunorderedlist', '|', 'selectall', 'cleardoc', 'paragraph', '|',
             'fontfamily', 'fontsize', '|', 'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|',
-            'horizontal', 'print',  'drafts', 'formula',
+            '|', 'horizontal', 'print',  'drafts', 'formula'
             // 'preview',
         ]],
         // 当鼠标放在工具栏上时显示的tooltip提示,留空支持自动多语言配置,否则以配置值为准
-        //, labelMap:{
-        //    'anchor':'', 'undo':''
-        // }
+         labelMap:{
+           'previewmobile':'手机预览'
+        },
 
         // 语言配置项,默认是zh-cn。有需要的话也可以使用如下这样的方式来自动多语言切换,当然,前提条件是lang文件夹下存在对应的语言文件:
         // lang值也可以通过自动获取 (navigator.language||navigator.browserLanguage ||navigator.userLanguage).toLowerCase()
@@ -56,7 +56,7 @@
         //, theme:'default'
         //, themePath:URL +"themes/"
 
-         zIndex : 2008,     //编辑器层级的基数,默认是900
+        //, zIndex : 900     //编辑器层级的基数,默认是900
 
         // 针对getAllHtml方法,会在对应的head标签中增加该编码设置。
         //, charset:"utf-8"
@@ -418,10 +418,7 @@
             tt: [],
             u: [],
             ul: ['class', 'style'],
-            video: ['autoplay', 'controls', 'loop', 'preload', 'src', 'height', 'width', 'class', 'style'],
-            source: ['src', 'type'],
-            embed: ['type', 'class', 'pluginspage', 'src', 'width', 'height', 'align', 'style', 'wmode', 'play',  'autoplay','loop', 'menu', 'allowscriptaccess', 'allowfullscreen', 'controls', 'preload'],
-            iframe: ['src', 'class', 'height', 'width', 'max-width', 'max-height', 'align', 'frameborder', 'allowfullscreen']
+            video: ['autoplay', 'controls', 'loop', 'preload', 'src', 'height', 'width', 'class', 'style']
         }
     };
 

File diff suppressed because it is too large
+ 0 - 0
public/system.html


+ 1 - 0
public/system/css/chunk-2ed0e70c.e2a96567.css

@@ -0,0 +1 @@
+.projectInfo[data-v-1e82037e] .el-dialog__body{padding-top:0!important}.projectInfo[data-v-1e82037e] .el-tabs__content{padding-left:10px!important}.tabPic[data-v-1e82037e]{width:40px!important;height:40px!important}.tabPic img[data-v-1e82037e]{width:100%;height:100%}.sp[data-v-1e82037e]{display:block;width:33%;font-size:12px;margin-bottom:20px}.sp100[data-v-1e82037e]{width:100%;margin-bottom:15px;display:inline-block}.third[data-v-1e82037e]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.pictrue[data-v-1e82037e]{width:60px;height:60px;border:1px dotted rgba(0,0,0,.1);margin-right:10px;position:relative;cursor:pointer;display:inline-block}.pictrue img[data-v-1e82037e]{width:100%;height:100%}.demo-image__preview[data-v-1e82037e]{display:inline-block}[data-v-648b1c52] .el-select-dropdown__item{max-width:350px!important}.template[data-v-648b1c52]{overflow:hidden}.label-list[data-v-648b1c52]{height:100%}.bg[data-v-648b1c52]{z-index:100;position:fixed;left:0;top:0;width:100%;height:100%;background:rgba(0,0,0,.5)}.rate_star[data-v-648b1c52]{position:relative;top:5px}table .el-image[data-v-648b1c52]{display:inline-block}.demo-table-expand[data-v-648b1c52]{font-size:0}.demo-table-expand[data-v-648b1c52] label{width:105px;color:#99a9bf}.demo-table-expand .el-form-item[data-v-648b1c52]{margin-right:0;margin-bottom:0;width:33.33%}.selWidth[data-v-648b1c52]{width:350px!important}.seachTiele[data-v-648b1c52]{line-height:35px}

+ 1 - 0
public/system/css/chunk-75ceb5e5.7f8e4525.css

@@ -0,0 +1 @@
+.avatar[data-v-33922957]{width:60px;height:60px;margin-left:18px}.avatar img[data-v-33922957]{width:100%;height:100%}.dashboard-workplace-header-avatar[data-v-33922957]{margin-right:16px;font-weight:600}.dashboard-workplace-header-tip[data-v-33922957]{width:82%;display:inline-block;vertical-align:middle;margin-top:-12px}.dashboard-workplace-header-tip-title[data-v-33922957]{font-size:13px;color:#000;margin-bottom:12px}.dashboard-workplace-header-tip-desc-sp[data-v-33922957]{width:32%;color:#17233d;font-size:13px;display:inline-block}.dashboard-workplace-header-extra .ivu-col p[data-v-33922957]{text-align:right}.dashboard-workplace-header-extra .ivu-col p:first-child span[data-v-33922957]:first-child{margin-right:4px}.dashboard-workplace-header-extra .ivu-col p:first-child span[data-v-33922957]:last-child{color:#808695}.dashboard-workplace-header-extra .ivu-col p[data-v-33922957]:last-child{font-size:22px}.selWidth[data-v-0bb9d05e]{width:219px!important}.seachTiele[data-v-0bb9d05e]{line-height:35px}.fr[data-v-0bb9d05e]{float:right}.check[data-v-6f8346d2]{color:#00a2d4}.dia[data-v-6f8346d2] .el-dialog__body{height:700px!important}.text-right[data-v-6f8346d2]{text-align:right}.container[data-v-6f8346d2]{min-width:821px}.container[data-v-6f8346d2] .el-form-item{width:100%}.container[data-v-6f8346d2] .el-form-item__content{width:72%}.vipName[data-v-6f8346d2]{color:#dab176}.el-dropdown-link[data-v-6f8346d2]{cursor:pointer;color:#409eff;font-size:12px}.el-icon-arrow-down[data-v-6f8346d2]{font-size:12px}.demo-table-expand[data-v-6f8346d2]{font-size:0}.demo-table-expand label[data-v-6f8346d2]{width:90px;color:#99a9bf}.demo-table-expand .el-form-item[data-v-6f8346d2]{margin-right:0;margin-bottom:0;width:33.33%}[data-v-6f8346d2] [type=reset],[type=submit][data-v-6f8346d2],button[data-v-6f8346d2],html [type=button][data-v-6f8346d2]{-webkit-appearance:none!important}

File diff suppressed because it is too large
+ 0 - 0
public/system/js/app.7ec335c0.js


File diff suppressed because it is too large
+ 0 - 0
public/system/js/app.cc4b7832.js


File diff suppressed because it is too large
+ 0 - 0
public/system/js/chunk-2ed0e70c.5a34049c.js


File diff suppressed because it is too large
+ 0 - 0
public/system/js/chunk-75ceb5e5.5c79dac9.js


Some files were not shown because too many files changed in this diff