github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-07-24 08:31:45 +08:00
Code Issues Releases Wiki Activity

https://github.com/chatopera/cskefu/issues/703 enable ctrl + enter send message, remove iframe bind in the old way

Browse Source
This commit is contained in:
Hai Liang Wang 2022-04-29 00:14:45 +08:00
parent fad9d7c293
commit 2d11e37c57
4 changed files with 28 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contact-center/app/src/main/java/com/chatopera/cc/config/CSKeFuWebAppConfigurer.java
View File

@ -21,23 +21,21 @@ import com.chatopera.cc.interceptor.LogIntercreptorHandler;
import com.chatopera.cc.interceptor.UserExperiencePlanInterceptorHandler; import com.chatopera.cc.interceptor.UserExperiencePlanInterceptorHandler;
import com.chatopera.cc.interceptor.UserInterceptorHandler; import com.chatopera.cc.interceptor.UserInterceptorHandler;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.*;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@Configuration @Configuration
public class CSKeFuWebAppConfigurer public class CSKeFuWebAppConfigurer
extends WebMvcConfigurerAdapter { extends WebMvcConfigurerAdapter {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
}
/**
* https://www.baeldung.com/spring-cors
* @param registry
*/
@Override @Override
public void addCorsMappings(CorsRegistry registry) { public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**"); // enables CORS requests from any origin to any endpoint in the application.
registry.addMapping("/**").allowedOrigins("*");
} }
@Override @Override

20
contact-center/app/src/main/java/com/chatopera/cc/interceptor/CrossInterceptorHandler.java
View File

@ -29,16 +29,16 @@ import javax.servlet.http.HttpServletResponse;
public class CrossInterceptorHandler extends HandlerInterceptorAdapter { public class CrossInterceptorHandler extends HandlerInterceptorAdapter {
private final static Logger logger = LoggerFactory.getLogger(CrossInterceptorHandler.class); private final static Logger logger = LoggerFactory.getLogger(CrossInterceptorHandler.class);
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) // public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
throws Exception { // throws Exception {
response.setHeader("Access-Control-Allow-Origin", "*"); // response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT"); // response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
response.setHeader("Access-Control-Max-Age", "3600"); // response.setHeader("Access-Control-Max-Age", "3600");
response.setHeader("Access-Control-Allow-Headers", "x-requested-with,accept,authorization,content-type"); // response.setHeader("Access-Control-Allow-Headers", "x-requested-with,accept,authorization,content-type");
response.setHeader("Access-Control-Allow-Credentials", "true"); // response.setHeader("Access-Control-Allow-Credentials", "true");
// response.setHeader("X-Frame-Options", "SAMEORIGIN"); //// response.setHeader("X-Frame-Options", "SAMEORIGIN");
return true; // return true;
} // }
@Override @Override
public void postHandle(HttpServletRequest arg0, HttpServletResponse response, Object arg2, public void postHandle(HttpServletRequest arg0, HttpServletResponse response, Object arg2,

16
contact-center/app/src/main/resources/templates/apps/im/chatbot/index.pug
View File

@ -107,22 +107,14 @@ html
sendMessage(); sendMessage();
}); });
} else { } else {
var kindEditorIframe = $("iframe").contents().find("body"); // Ctrl+Enter 提交表单
kindEditorIframe.keydown(function (event) { K.ctrl(document, 13, function () {
if (event.keyCode == 13 && !event.ctrlKey) {
self.sync(); self.sync();
sendMessage(); sendMessage();
return false;
} else if (event.keyCode == 13 && event.ctrlKey) {
editor.insertHtml('<br/>');
}
});
//Ctrl+Enter提交表单
K.ctrl(document, 13, function () {
editor.insertHtml('<br/>');
}); });
K.ctrl(self.edit.doc, 13, function () { K.ctrl(self.edit.doc, 13, function () {
editor.insertHtml('<br/>'); self.sync();
sendMessage();
}); });
} }
} }

18
contact-center/app/src/main/resources/templates/apps/im/index.pug
View File

@ -64,7 +64,6 @@ html
br: [] br: []
}, },
afterChange: function () { afterChange: function () {
var message = document.getElementById('message').value; var message = document.getElementById('message').value;
var imgReg = /<img.*?(?:>|\/>)/gi; var imgReg = /<img.*?(?:>|\/>)/gi;
var imgnumber = 0; var imgnumber = 0;
@ -119,22 +118,15 @@ html
sendMessage(); sendMessage();
}); });
} else { } else {
var kindEditorIframe = $("iframe").contents().find("body"); // Ctrl+Enter 提交表单
kindEditorIframe.keydown(function (event) { K.ctrl(document, 13, function () {
if (event.keyCode == 13 && !event.ctrlKey) {
self.sync(); self.sync();
sendMessage(); sendMessage();
return false;
} else if (event.keyCode == 13 && event.ctrlKey) {
editor.insertHtml('<br/>');
}
});
//Ctrl+Enter提交表单
K.ctrl(document, 13, function () {
editor.insertHtml('<br/>');
}); });
// Ctrl+Enter 提交表单
K.ctrl(self.edit.doc, 13, function () { K.ctrl(self.edit.doc, 13, function () {
editor.insertHtml('<br/>'); self.sync();
sendMessage();
}); });
} }
} }