mod:编辑器

CallCenterWeb.UI/.project

@@ -204,5 +204,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1709110519801</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

CallCenterWeb.UI/Announcement/Add.html

@@ -177,7 +177,7 @@
     <!--<script src="../css/laydate/laydate.js"></script>-->
     <script src="../js/zTree/jquery.ztree.core.js"></script>
     <script src="../js/zTree/jquery.ztree.excheck.min.js"></script>
-    <script src="../js/kindeditor/kindeditor-all-min.js"></script>
+    <script src="../js/kindeditor/kindeditor-all.js"></script>
     <script src="../js/kindeditor/lang/zh-CN.js"></script>
     <script>
         laydate.render({

CallCenterWeb.UI/js/kindeditor/kindeditor-all.js

@@ -4531,6 +4531,27 @@ function _ajax(url, fn, method, param, dataType) {
 		xhr.send(null);
 	}
 }
+function _ajaxForm(url, fn, method, param, dataType) {
+    method = method || 'GET';
+    dataType = dataType || 'json';
+    var xhr = window.XMLHttpRequest ? new window.XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP');
+
+    xhr.open(method, url, true);
+    xhr.onreadystatechange = function () {
+        if (xhr.readyState == 4 && xhr.status == 200) {
+            if (fn) {
+                var data = _trim(xhr.responseText);
+                if (dataType == 'json') {
+                    data = _json(data);
+                }
+                fn(data);
+            }
+        }
+    };
+    xhr.send(param);
+}
+K.ajaxForm=_ajaxForm;
+
 K.loadScript = _loadScript;
 K.loadStyle = _loadStyle;
 K.ajax = _ajax;
@@ -7234,6 +7255,8 @@ KindEditor.plugin('image', function(K) {
 						}
 						dialog.showLoading(self.lang('uploadLoading'));
 						uploadbutton.submit();
+					
+						
 						localUrlBox.val('');
 						return;
 					}
@@ -7466,6 +7489,8 @@ KindEditor.plugin('insertfile', function(K) {
 		var fileUrl = K.undef(options.fileUrl, 'http://'),
 			fileTitle = K.undef(options.fileTitle, ''),
 			clickFn = options.clickFn;
+			
+			console.log('adfasdf')
 		var html = [
 			'<div style="padding:20px;">',
 			'<div class="ke-dialog-row">',
@@ -7491,6 +7516,7 @@ KindEditor.plugin('insertfile', function(K) {
 			yesBtn : {
 				name : self.lang('yes'),
 				click : function(e) {
+					
 					var url = K.trim(urlBox.val()),
 						title = titleBox.val();
 					if (url == 'http://' || K.invalidUrl(url)) {
@@ -7537,8 +7563,36 @@ KindEditor.plugin('insertfile', function(K) {
 				}
 			});
 			uploadbutton.fileBox.change(function(e) {
+				console.log('change')
 				dialog.showLoading(self.lang('uploadLoading'));
-				uploadbutton.submit();
+				// uploadbutton.submit();
+				
+				var formData = new FormData();
+var file=uploadbutton.fileBox[0].files[0];
+formData.append('imgFile', file);
+//console.log(file,formData)
+K.ajaxForm(self.options.uploadJson + '?dir=fujian', function(data) {
+    dialog.hideLoading();
+    //console.log(data);
+    if (data.error==0) {
+        //console.log(self.options);
+//      var html = '<img src="' + self.options.basePath + data.url + '" />';
+//      //console.log(html)
+//      self.appendHtml(html).hideDialog().focus();
+
+var url = data.url;
+						if (formatUploadUrl) {
+							url = K.formatUrl(url, 'absolute');
+						}
+						urlBox.val(url);
+						if (self.afterUpload) {
+							self.afterUpload.call(self, url, data, name);
+						}
+
+    }
+},'POST',formData,'json');
+
+				
 			});
 		} else {
 			K('.ke-upload-button', div).hide();