Ver código fonte

富文本问题优化

黄勇成 1 ano atrás
pai
commit
455f86eab4

+ 65 - 65
src/main/webapp/WEB-INF/pages/admin/notice/noticeAppPublish.jsp

@@ -19,8 +19,8 @@
 				<link href="<c:url value='/scripts/lib/plugins/noticePhotoClip/myCrop.css'/>" rel="stylesheet" type="text/css" />
 
 				<script type="text/javascript" src="<c:url value='/scripts/lib/jquery-1.8.2.min.js'/>"></script>
-				<script type="text/javascript" src="<c:url value='/scripts/lib/ueditor/ueditor.config.js?v=1.4'/>"></script>
-				<script type="text/javascript" src="<c:url value='/scripts/lib/ueditor/ueditor.all.js'/>"></script>
+				<script type="text/javascript" src="<c:url value='/scripts/lib/ueditor/ueditor.config.js?v=202305291231'/>"></script>
+				<script type="text/javascript" src="<c:url value='/scripts/lib/ueditor/ueditor.all.js?v=202305291231'/>"></script>
 				<script type="text/javascript" src="<c:url value='/scripts/lib/layui/layui.js'/>"></script>
 				<script type="text/javascript" src="<c:url value='/scripts/lib/template-native.js'/>"></script>
 
@@ -149,15 +149,15 @@
 					height: 18px;
 					margin-right: 10px;
 				}
-				
+
 				.tv-choose-content{
 					margin-top:5px;
 					color: #333;
 					font-size: 15px;
 					max-width: 600px;
-					word-break:break-all;       
-					word-wrap:break-word; 
-					line-height: 25px;   
+					word-break:break-all;
+					word-wrap:break-word;
+					line-height: 25px;
 				}
 				.submit-btn{
 					margin-left: 20px;
@@ -274,15 +274,15 @@
 		              					<div class="sortOrg_search_div">
 		              						<input class="default-select sortOrg_search" type="text" autocomplete="off" id='sortOrg_search'/>
 			              					<span class="sortOrg_search_btn">
-			              						
+
 			              					</span>
 		              					</div>
 		              					<div class="orgName_div">
-		              						<span>已选项目:</span>	
-		              					</div>	
+		              						<span>已选项目:</span>
+		              					</div>
 		              					<div class="sortOrg_cheak_all_wrap">
 		              						<span class="item_cheak item_cheak_all"></span>
-		              						<span>所有项目</span>		
+		              						<span>所有项目</span>
 		              					</div>
 		              					<ul class="org_list">
 		              					</ul>
@@ -320,7 +320,7 @@
 						</form:form>
 					</div>
 					<div>
-						
+
 						<!-- 公告 -->
 						<div id="announcement" class=" app-publish-wrapper clearfloat">
 							<div class="announcement-left main-content-mode-wp">
@@ -410,7 +410,7 @@
 													</span>
 													<label class="checkbox-con" for="wx" >小程序端</label>
 												</div>
-												
+
 												<div class="checkbox-wp" >
 													<span class="checkbox-input">
 														<input type="checkbox" id="public" class="check-item" data-type="3" name="public" />
@@ -426,7 +426,7 @@
 												</span>
 												<label class="checkbox-con" for="pushMsg">模板消息</label>
 											</div>
-											
+
 										</div>
 									</div>
 									<div class="public-item-wp clearfloat public-extra-wp">
@@ -436,29 +436,29 @@
 												<span class="radio-input">
 													<input type="radio" id="pb-all" data-type="1"  class="radio-item" name="public"  checked="checked" >
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="pb-all">公众号所有粉丝<span style="font-weight:normal">(公众号所有粉丝会受到公众号推送)</span></label>
 											</div>
 											<div class="radio-wp radio-block" >
 												<span class="radio-input">
 													<input type="radio" id="pb-item" data-type="2"  class="radio-item" name="public" >
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="pb-item">项目所有用户<span style="font-weight:normal">(登录过楼宇之窗的用户才会受到公众号推送)</span></label>
 											</div>
 											<div class="radio-wp radio-block" >
 												<span class="radio-input">
 													<input type="radio" id="pb-some" data-type="3" class="radio-item" name="public" >
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="pb-some">项目部分用户</label>
-												
+
 											</div>
 											<div class="radio-wp radio-block" >
 												<span class="radio-input">
 													<input type="radio" id="pb-some" data-type="4" class="radio-item" name="public" >
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="pb-some">部门/分组发送</label>
 												<button class="btn-blue-stp choose-dep-stp" @click="chooseHandler">选择部门/分组</button>
 											</div>
@@ -484,14 +484,14 @@
 													<span class="radio-input">
 														<input type="radio" id="msg-yes" data-type="1" class="radio-item" name="msg" >
 														<span class="radio-inner"></span>
-													</span>		
+													</span>
 													<label class="radio-con" for="msg-yes">是</label>
 												</div>
 												<div class="radio-wp " style="margin-right: 15px;">
 													<span class="radio-input">
 														<input type="radio" id="msg-no" data-type="0" class="radio-item" name="msg" >
 														<span class="radio-inner"></span>
-													</span>		
+													</span>
 													<label class="radio-con" for="msg-no">否</label>
 												</div>
 											</div>
@@ -499,7 +499,7 @@
 										<div class="msg-tips-list">注:加入消息列表后会在公众号消息列表展示,加入列表发送微信推送每日只能发送一次。</div>
 									</div>
 									</div>
-									
+
 									<div class="approve-type-edit">
 									<div class="msg-list-wp clearfloat approvael-result">
 										<span class="tips">审核结果</span>
@@ -509,7 +509,7 @@
 													<span class="radio-input">
 														<input type="radio" id="status-pass" class="radio-item" data-type="1" name="approveStatus" />
 														<span class="radio-inner"></span>
-													</span>		
+													</span>
 													<label class="radio-con" for="status-pass">通过</label>
 
 												</div>
@@ -517,7 +517,7 @@
 													<span class="radio-input">
 														<input type="radio" id="status-fail" class="radio-item status" data-type="2" name="approveStatus" />
 														<span class="radio-inner"></span>
-													</span>		
+													</span>
 													<label class="radio-con" for="status-fail">不通过</label>
 												</div>
 											</div>
@@ -548,8 +548,8 @@
 										<button class="btn-yellow-110 submit-btn">提交发送</button>
 									</div>
 							</div>
-						
-							
+
+
 						</div>
 						<!-- 生成链接 -->
 						<div id="line" class="main-content-mode-wp app-publish-wrapper">
@@ -574,7 +574,7 @@
 												<span class="radio-input">
 													<input type="radio" id="status-pass" class="radio-item" data-type="1" name="approveStatus" />
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="status-pass">通过</label>
 
 											</div>
@@ -582,7 +582,7 @@
 												<span class="radio-input">
 													<input type="radio" id="status-fail" class="radio-item status" data-type="2" name="approveStatus" />
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="status-fail">不通过</label>
 											</div>
 										</div>
@@ -667,29 +667,29 @@
 										<span class="radio-input">
 											<input type="radio" id="pb-all" data-type="1"  class="radio-item" name="publicLink"  checked="checked" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-all">公众号所有粉丝<span style="font-weight:normal">(公众号所有粉丝会受到公众号推送)</span></label>
 									</div>
 									<div class="radio-wp radio-block" >
 										<span class="radio-input">
 											<input type="radio" id="pb-item" data-type="2"  class="radio-item" name="publicLink" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-item">项目所有用户<span style="font-weight:normal">(登录过楼宇之窗的用户才会受到公众号推送)</span></label>
 									</div>
 									<div class="radio-wp radio-block" >
 										<span class="radio-input">
 											<input type="radio" id="pb-some" data-type="3" class="radio-item" name="publicLink" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-some">项目部分用户</label>
-										
+
 									</div>
 									<div class="radio-wp radio-block" >
 										<span class="radio-input">
 											<input type="radio" id="pb-some" data-type="4" class="radio-item" name="publicLink" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-some">部门/分组发送</label>
 										<button class="btn-blue-stp choose-dep-stp" @click="chooseHandler">选择部门/分组</button>
 									</div>
@@ -716,7 +716,7 @@
 												<span class="radio-input">
 													<input type="radio" id="status-pass" class="radio-item" data-type="1" name="approveStatus" />
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="status-pass">通过</label>
 
 											</div>
@@ -724,7 +724,7 @@
 												<span class="radio-input">
 													<input type="radio" id="status-fail" class="radio-item status" data-type="2" name="approveStatus" />
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="status-fail">不通过</label>
 											</div>
 										</div>
@@ -746,7 +746,7 @@
 										<label class="checkbox-con" for="pushMsg">开启</label>
 									</div>
 								</div>
-								
+
 							</div>
 							<div class="msg-temples-tips">开启后会给公众号所有粉丝发送微信模版消息通知</div> -->
 							<div class="btns-wp">
@@ -792,7 +792,7 @@
 										</span>
 										<label class="checkbox-con" for="app2">APP端</label>
 									</div>
-									<div class="checkbox-wp" 
+									<div class="checkbox-wp"
 									v-if="contextBasePath=='wx.palmnest.com' || contextBasePath=='superdesk.avic-s.com' || contextBasePath=='localhost:8085'">
 										<span class="checkbox-input">
 											<input type="checkbox" id="wx2" class="check-item" data-type="2" name="wx2" />
@@ -815,7 +815,7 @@
 										<label class="checkbox-con" for="pushBannerImage">模板消息</label>
 									</div>
 
-									
+
 								</div>
 							</div>
 							 <div class="public-item-wp clearfloat public-extra-banner-wp">
@@ -825,28 +825,28 @@
 										<span class="radio-input">
 											<input type="radio" id="pb-all1" data-type="1"  class="radio-item" name="publicBanner" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-all1">公众号所有粉丝<span style="font-weight:normal">(公众号所有粉丝会受到公众号推送)</span></label>
 									</div>
 									<div class="radio-wp radio-block" >
 										<span class="radio-input">
 											<input type="radio" id="pb-item1" data-type="2"  class="radio-item" name="publicBanner" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-item1">项目所有用户<span style="font-weight:normal">(登录过楼宇之窗的用户才会受到公众号推送)</span></label>
 									</div>
 									<div class="radio-wp radio-block" >
 										<span class="radio-input">
 											<input type="radio" id="pb-some1" data-type="3" class="radio-item" name="publicBanner" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-some1">项目部分用户</label>
 									</div>
 									<div class="radio-wp radio-block" >
 										<span class="radio-input">
 											<input type="radio" id="pb-some" data-type="4" class="radio-item" name="publicBanner" >
 											<span class="radio-inner"></span>
-										</span>		
+										</span>
 										<label class="radio-con" for="pb-some">部门/分组发送</label>
 										<button class="btn-blue-stp choose-dep-stp" @click="chooseHandler">选择部门/分组</button>
 									</div>
@@ -862,7 +862,7 @@
 									  </el-tag>
 									  </div>
 								</div>
-							</div> 
+							</div>
 						<!--	<div class="msg-list-wp clearfloat public-extra-wp">
 								<span class="tips">加入消息列表</span>
 								<div class="msg-list-con">
@@ -871,14 +871,14 @@
 											<span class="radio-input">
 												<input type="radio" id="msg-yes" data-type="1" class="radio-item" name="msg1" >
 												<span class="radio-inner"></span>
-											</span>		
+											</span>
 											<label class="radio-con" for="msg-yes">是</label>
 										</div>
 										<div class="radio-wp " style="margin-right: 15px;">
 											<span class="radio-input">
 												<input type="radio" id="msg-no" data-type="0" class="radio-item" name="msg1" >
 												<span class="radio-inner"></span>
-											</span>		
+											</span>
 											<label class="radio-con" for="msg-no">否</label>
 										</div>
 									</div>
@@ -895,7 +895,7 @@
 												<span class="radio-input">
 													<input type="radio" id="status-pass" class="radio-item" data-type="1" name="approveStatus" />
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="status-pass">通过</label>
 
 											</div>
@@ -903,7 +903,7 @@
 												<span class="radio-input">
 													<input type="radio" id="status-fail" class="radio-item status" data-type="2" name="approveStatus" />
 													<span class="radio-inner"></span>
-												</span>		
+												</span>
 												<label class="radio-con" for="status-fail">不通过</label>
 											</div>
 										</div>
@@ -976,7 +976,7 @@
 						  <div style="overflow-y: scroll;height: 440px;">
 							<div v-if=" searchDataList.deptList && searchDataList.deptList.length>0">
 							<div class="search-rs-title">部门</div>
-							<div class="list-box click-cursor" v-for="(item, index) in searchDataList.deptList" :key="item.id" 
+							<div class="list-box click-cursor" v-for="(item, index) in searchDataList.deptList" :key="item.id"
 							  :class="{'line-top': index != 0}">
 							  <div class="cell-box">
 								<div class="tag-size" v-on:click="searchDataHandler(item)">
@@ -989,7 +989,7 @@
 						  </div>
 							<div v-if="searchDataList.groupList&&searchDataList.groupList.length>0">
 							<div class="search-rs-title" >分组</div>
-							<div class="list-box click-cursor" v-for="(item, index) in searchDataList.groupList" :key="item.id" 
+							<div class="list-box click-cursor" v-for="(item, index) in searchDataList.groupList" :key="item.id"
 							  :class="{'line-top': index != 0}">
 							  <div class="cell-box">
 								<div class="tag-size" v-on:click="searchDataHandler(item)">
@@ -1002,7 +1002,7 @@
 						  </div>
 						  </div>
 						</div>
-					   <div class="default-data-wrap" v-show="true"> 
+					   <div class="default-data-wrap" v-show="true">
 					  <div class="tree-group-box box-top10 box-right15">
 						<el-menu :default-active="activeIndex" mode="horizontal" @select="handleSelect">
 						  <el-menu-item index="1" v-if="indexType == 1||indexType == 0">部门</el-menu-item>
@@ -1012,7 +1012,7 @@
 					  <div style="overflow-y: scroll;height: 400px;" v-if="activeIndex == 1">
 						  <el-tree :data="dataTree"  default-expand-all node-key="id" @node-click="handleNodeClick"
 						  :filter-node-method="filterNodeHandler"  :expand-on-click-node="false"
-							  ref="tree" highlight-current  :props="defaultProps"> 
+							  ref="tree" highlight-current  :props="defaultProps">
 						<span class="custom-tree-node" slot-scope="{node, data}">
 						<span @mouseover="showTip(data.id)" @mouseout="hideTip"  class="el-tree-node-name">
 						  <span v-if="data.childList&&data.childList.length>0||data.levels==0"
@@ -1020,12 +1020,12 @@
 						  <span v-else class="span-button ico_docu"></span>
 						  <span>{{node.label}}</span>
 						  </span>
-						  <span v-if="backSelectedDepHandler(data.id)" class="radio-icon el-icon-check icon-check-item"></span> 
+						  <span v-if="backSelectedDepHandler(data.id)" class="radio-icon el-icon-check icon-check-item"></span>
 						</span>
 						</el-tree>
 					  </div>
 					  <div style="overflow-y: scroll;height: 385px;" v-if="activeIndex == 2">
-						<div class="list-box click-cursor" v-for="(item, index) in tagList" :key="item.id" 
+						<div class="list-box click-cursor" v-for="(item, index) in tagList" :key="item.id"
 							  :class="{'line-top': index != 0}">
 						  <div class="cell-box">
 							<div class="tag-size" v-on:click="tagBtnHandler(item)">
@@ -1036,7 +1036,7 @@
 						  </div>
 						</div>
 					  </div>
-					 </div>  
+					 </div>
 					</div>
 					<div style="margin-left:10px;float: left;width: 1px;height: 480px; background: #F3F3F3"></div>
 					<div style="margin-left:10px;float:left;width: 250px;">
@@ -1196,9 +1196,9 @@
 							newArr.push(resultObj)
 							}
 					   this.identityList=[...newArr]
-					
+
 					  console.log("最后选中11111",this.identityList)
-				
+
 					 });
 					},
 
@@ -1313,7 +1313,7 @@
 									} else {
 									return isYN;
 									}
-									} ,  
+									} ,
 									backSelectedHandler(id, isIndex = false) {
 									let isYN = false;
 									let seleIndex = -1;
@@ -1331,7 +1331,7 @@
 									} else {
 									return isYN;
 									}
-								}, 
+								},
 								chooseHandler(){
 									var $dom =$("#announcement");
 									var $domBanner=$("#graphic");
@@ -1353,9 +1353,9 @@
 										}
 										this.identityList=newArr
 										$(".dialog-pop").show();
-										
+
 									}
-									
+
 								},
 								// 分组
 							tagBtnHandler(data) {
@@ -1386,7 +1386,7 @@
 								type: "POST",
 								dataType: "json",
 								data: {
-									orgId:_this.dataForm.orgId,//项目Id 
+									orgId:_this.dataForm.orgId,//项目Id
 									virtId: _this.inputUser,//
 								},
 								success: function (data) {
@@ -1437,7 +1437,7 @@
 										if (data.code == 200) {
 											var result=data.data
 											_this.chooseDepList=result.deptGroupJson
-										} 
+										}
 									}
 								});
 						},
@@ -1469,7 +1469,7 @@
 								},
 								error: function(err){
 
-								} 
+								}
 							});
 							},
 						},
@@ -1481,7 +1481,7 @@
 							 if (id) {
 								this.ajaxDetail(id)
 							}
-						 	
+
 						},
 					})
 				})
@@ -1496,7 +1496,7 @@
 				</script>
 				<script type="text/javascript" src="${ctx }/scripts/admin/cjqt.js"></script>
 				<script type="text/javascript" src="<c:url value='/scripts/lib/plugins/noticePhotoClip/base64Tool.js?v=1.0.4'/>"></script>
-				
+
 				<script type="text/javascript" src="<c:url value='/scripts/lib/plugins/noticePhotoClip/jquery.min.js'/>"></script>
 				<script type="text/javascript" src="<c:url value='/scripts/lib/plugins/noticePhotoClip/exif.js'/>"></script>
 				<script type="text/javascript" src="<c:url value='/scripts/lib/plugins/noticePhotoClip/bootstrap.min.js'/>"></script>
@@ -1505,4 +1505,4 @@
 				<script type="text/javascript" src="<c:url value='/scripts/admin/notice/noticeAppPublish.js?v=2222222'/>"></script>
 			</body>
 
-			</html>
+			</html>

+ 29 - 22
src/main/webapp/scripts/lib/ueditor/ueditor.all.js

@@ -6914,7 +6914,7 @@ var fillCharReg = new RegExp(domUtils.fillChar, 'g');
                 container.style.zIndex = options.zIndex;
 
                 var html = ( ie && browser.version < 9  ? '' : '<!DOCTYPE html>') +
-                    '<html xmlns=\'http://www.w3.org/1999/xhtml\' class=\'view\' style=\'overflow:hidden\'><head>' +
+                    '<html xmlns=\'http://www.w3.org/1999/xhtml\' class=\'view\' style=\'overflow:auto\'><head>' +
                     '<style type=\'text/css\'>' +
                     //设置四周的留边
                     '.view{padding:0;word-wrap:break-word;cursor:text;height:90%}\n' +
@@ -6941,7 +6941,7 @@ var fillCharReg = new RegExp(domUtils.fillChar, 'g');
                         'document.write("' + html + '");document.close();}())'
                 }));
                 container.style.overflow = 'hidden';
-                
+
                 //解决如果是给定的百分比,会导致高度算不对的问题
                 setTimeout(function(){
                     if( /%$/.test(options.initialFrameWidth)){
@@ -12667,7 +12667,7 @@ UE.plugins['paragraph'] = function() {
                         } );
                     }
                     tmpRange.setEndAfter( tmpNode );
-                    
+
                     para = range.document.createElement( style );
                     if(attrs){
                         domUtils.setAttributes(para,attrs);
@@ -12679,7 +12679,7 @@ UE.plugins['paragraph'] = function() {
                     //需要内容占位
                     if(domUtils.isEmptyNode(para)){
                         domUtils.fillChar(range.document,para);
-                        
+
                     }
 
                     tmpRange.insertNode( para );
@@ -12803,7 +12803,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);
@@ -17988,6 +17988,9 @@ UE.plugins['video'] = function (){
     UETable.prototype = {
         getMaxRows:function () {
             var rows = this.table.rows, maxLen = 1;
+            if (rows.length===0) {
+              return maxLen;
+            }
             for (var i = 0, row; row = rows[i]; i++) {
                 var currentMax = 1;
                 for (var j = 0, cj; cj = row.cells[j++];) {
@@ -20249,10 +20252,10 @@ UE.plugins['table'] = function () {
                         // domUtils.removeAttributes(table, ['style', 'border']);
 
                         //2021-09-30修改 如下   参照https://www.cnblogs.com/xiangsj/p/6244794.html
-                
+
                         domUtils.setAttributes(table, {
                             style:'border-left:1px solid #666; border-top:1px solid #666;',
-                        }); 
+                        });
                         removeStyleSize(table, true);
 
                         utils.each(domUtils.getElementsByTagName(table, "td"), function (td) {
@@ -20260,7 +20263,7 @@ UE.plugins['table'] = function () {
                               //粘贴进来的表格td定义属性
                               domUtils.setAttributes(td, {
                                 style:'border-bottom:1px solid #666; border-right:1px solid #666; padding:5px;',
-                            }); 
+                            });
                             if (isEmptyBlock(td)) {
                                 domUtils.fillNode(me.document, td);
                             }
@@ -21132,11 +21135,11 @@ UE.plugins['table'] = function () {
 
         //是否正在等待resize的缓冲中
         isInResizeBuffer = true;
+        tableBorderDrag( evt );
 
-        tableDragTimer = setTimeout(function(){
-            tableBorderDrag( evt );
-        }, dblclickTime);
-
+        // tableDragTimer = setTimeout(function(){
+        //    tableBorderDrag( evt );
+        // }, dblclickTime);
     }
 
     function extractArray( originArr, key ) {
@@ -21195,7 +21198,7 @@ UE.plugins['table'] = function () {
         }
         hideDragLine(me);
         getDragLine(me, me.document);
-        me.fireEvent('saveScene');
+        // me.fireEvent('saveScene');
         showDragLineAt(state, startTd);
         mousedown = true;
         //拖动开始
@@ -22744,7 +22747,7 @@ UE.plugins['formatmatch'] = function(){
      });
 
     function addList(type,evt){
-        
+
         if(browser.webkit){
             var target = evt.target.tagName == 'IMG' ? evt.target : null;
         }
@@ -22810,7 +22813,7 @@ UE.plugins['formatmatch'] = function(){
 
     me.commands['formatmatch'] = {
         execCommand : function( cmdName ) {
-          
+
             if(flag){
                 flag = 0;
                 list = [];
@@ -22819,7 +22822,7 @@ UE.plugins['formatmatch'] = function(){
             }
 
 
-              
+
             var range = me.selection.getRange();
             img = range.getClosedNode();
             if(!img || img.tagName != 'IMG'){
@@ -23996,6 +23999,10 @@ UE.plugin.register('autosave', function (){
 
             'contentchange': function () {
 
+                if (!me.getOpt('enableAutoSave')) {
+                  return;
+                }
+
                 if ( !saveKey ) {
                     return;
                 }
@@ -25294,7 +25301,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();
@@ -25590,7 +25597,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 );
@@ -25686,7 +25693,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();
@@ -25770,7 +25777,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 ? (
@@ -25779,7 +25786,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不一样
@@ -27404,7 +27411,7 @@ UE.ui = baidu.editor.ui = {};
         setValue : function(value){
             this._value = value;
         }
-        
+
     };
     utils.inherits(MenuButton, SplitButton);
 })();

+ 23 - 23
src/main/webapp/scripts/lib/ueditor/ueditor.config.js

@@ -101,7 +101,7 @@
         //,autoClearEmptyNode : true //getContent时,是否删除空的inlineElement节点(包括嵌套的情况)
 
         //启用自动保存
-        //,enableAutoSave: true
+        ,enableAutoSave: false
         //自动保存间隔时间, 单位ms
         //,saveInterval: 500
 
@@ -148,31 +148,31 @@
 
         //insertorderedlist
         //有序列表的下拉配置,值留空时支持多语言自动识别,若配置值,则以此值为准
-        //,'insertorderedlist':{
-        //      //自定的样式
-        //        'num':'1,2,3...',
-        //        'num1':'1),2),3)...',
-        //        'num2':'(1),(2),(3)...',
-        //        'cn':'一,二,三....',
-        //        'cn1':'一),二),三)....',
-        //        'cn2':'(一),(二),(三)....',
-        //     //系统自带
-        //     'decimal' : '' ,         //'1,2,3...'
-        //     'lower-alpha' : '' ,    // 'a,b,c...'
-        //     'lower-roman' : '' ,    //'i,ii,iii...'
-        //     'upper-alpha' : '' , lang   //'A,B,C'
-        //     'upper-roman' : ''      //'I,II,III...'
-        //}
+        ,'insertorderedlist':{
+             // //自定的样式
+             //   'num':'1,2,3...',
+             //   'num1':'1),2),3)...',
+             //   'num2':'(1),(2),(3)...',
+             //   'cn':'一,二,三....',
+             //   'cn1':'一),二),三)....',
+             //   'cn2':'(一),(二),(三)....',
+            //系统自带
+            'decimal' : '' ,         //'1,2,3...'
+            'lower-alpha' : '' ,    // 'a,b,c...'
+            'lower-roman' : '' ,    //'i,ii,iii...'
+            'upper-alpha' : '' ,    //'A,B,C'
+            'upper-roman' : ''      //'I,II,III...'
+        }
 
         //insertunorderedlist
         //无序列表的下拉配置,值留空时支持多语言自动识别,若配置值,则以此值为准
-        //,insertunorderedlist : { //自定的样式
-        //    'dash' :'— 破折号', //-破折号
-        //    'dot':' 。 小圆圈', //系统自带
-        //    'circle' : '',  // '○ 小圆圈'
-        //    'disc' : '',    // '● 小圆点'
-        //    'square' : ''   //'■ 小方块'
-        //}
+        ,insertunorderedlist : { //自定的样式
+           // 'dash' :'— 破折号', //-破折号
+           // 'dot':' 。 小圆圈', //系统自带
+           'circle' : '',  // '○ 小圆圈'
+           'disc' : '',    // '● 小圆点'
+           'square' : ''   //'■ 小方块'
+        }
         //,listDefaultPaddingLeft : '30'//默认的左边缩进的基数倍
         //,listiconpath : 'http://bs.baidu.com/listicon/'//自定义标号的路径
         //,maxListLevel : 3 //限制可以tab的级数, 设置-1为不限制