wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 

 Conflicts:
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-ui/src/components/Editor/index.vue
This commit is contained in:
疯狂的狮子li 2020-08-10 09:38:28 +08:00
parent a9f4a4e111 a7eb07c7a0
commit 4044ed23ea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
View File

@ -147,10 +147,10 @@ public class GenUtils
*/
public static String getBusinessName(String tableName)
{
int lastIndex = tableName.indexOf("_");
int lastIndex = tableName.lastIndexOf("_");
int nameLength = tableName.length();
String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
return StringUtils.toCamelCase(businessName);
return businessName;
}
/**
@ -195,7 +195,7 @@ public class GenUtils
/**
* 关键字替换
*
* @param name 需要被替换的名字
* @param text 需要被替换的名字
* @return 替换后的名字
*/
public static String replaceText(String text)

2
ruoyi-ui/src/components/Editor/index.vue
View File

@ -66,7 +66,6 @@ export default {
content: this.value,
uploadImgUrl: "",
editorOption: {
placeholder: "",
theme: "snow", // or 'bubble'
placeholder: "请输入内容",
modules: {
@ -146,6 +145,7 @@ export default {
<style>
.editor {
white-space: pre-wrap!important;
line-height: normal !important;
height: 192px;
}