Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
RuoYi Vue
Commits
a948affb
Commit
a948affb
authored
Sep 15, 2020
by
RuoYi
Browse files
代码生成支持富文本控件
parent
57b49dd5
Changes
6
Hide whitespace changes
Inline
Side-by-side
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
View file @
a948affb
...
...
@@ -74,6 +74,9 @@ public class GenConstants
/** 日期控件 */
public
static
final
String
HTML_DATETIME
=
"datetime"
;
/** 富文本控件 */
public
static
final
String
HTML_EDITOR
=
"editor"
;
/** 字符串类型 */
public
static
final
String
TYPE_STRING
=
"String"
;
...
...
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
View file @
a948affb
...
...
@@ -59,7 +59,7 @@ public class GenTableColumn extends BaseEntity
/** 查询方式(EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围) */
private
String
queryType
;
/** 显示类型(input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件) */
/** 显示类型(input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件
、editor富文本控件
) */
private
String
htmlType
;
/** 字典类型 */
...
...
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
View file @
a948affb
...
...
@@ -111,6 +111,11 @@ public class GenUtils
{
column
.
setHtmlType
(
GenConstants
.
HTML_SELECT
);
}
// 内容字段设置富文本控件
else
if
(
StringUtils
.
endsWithIgnoreCase
(
columnName
,
"content"
))
{
column
.
setHtmlType
(
GenConstants
.
HTML_EDITOR
);
}
}
/**
...
...
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
View file @
a948affb
...
...
@@ -139,6 +139,10 @@
<el-form-item
label=
"
${
comment
}
"
prop=
"
${
field
}
"
>
<el-input
v-model=
"form.
${
field
}
"
placeholder=
"请输入
${
comment
}
"
/>
</el-form-item>
#
elseif
($
column
.
htmlType
==
"editor"
)
<el-form-item
label=
"
${
comment
}
"
>
<editor
v-model=
"form.
${
field
}
"
:min-height=
"192"
/>
</el-form-item>
#
elseif
($
column
.
htmlType
==
"select"
&&
""
!=
$
dictType
)
<el-form-item
label=
"
${
comment
}
"
prop=
"
${
field
}
"
>
<el-select
v-model=
"form.
${
field
}
"
placeholder=
"请选择
${
comment
}
"
>
...
...
@@ -221,10 +225,24 @@
import
{
list
${
BusinessName
},
get
${
BusinessName
},
del
${
BusinessName
},
add
${
BusinessName
},
update
${
BusinessName
},
export
${
BusinessName
}
}
from
"
@/api/
${
moduleName
}
/
${
businessName
}
"
;
import
Treeselect
from
"
@riophae/vue-treeselect
"
;
import
"
@riophae/vue-treeselect/dist/vue-treeselect.css
"
;
#
foreach
($
column
in
$
columns
)
#
if
($
column
.
insert
&&
!
$
column
.
superColumn
&&
!
$
column
.
pk
&&
$
column
.
htmlType
==
"editor"
)
import
Editor
from
'
@/components/Editor
'
;
#
break
#
end
#
end
export
default
{
name
:
"
${
BusinessName
}
"
,
components
:
{
Treeselect
},
components
:
{
#
foreach
($
column
in
$
columns
)
#
if
($
column
.
insert
&&
!
$
column
.
superColumn
&&
!
$
column
.
pk
&&
$
column
.
htmlType
==
"editor"
)
Editor
,
#
break
#
end
#
end
Treeselect
},
data
()
{
return
{
// 遮罩层
...
...
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View file @
a948affb
...
...
@@ -168,6 +168,10 @@
<el-form-item
label=
"
${
comment
}
"
prop=
"
${
field
}
"
>
<el-input
v-model=
"form.
${
field
}
"
placeholder=
"请输入
${
comment
}
"
/>
</el-form-item>
#
elseif
($
column
.
htmlType
==
"editor"
)
<el-form-item
label=
"
${
comment
}
"
>
<editor
v-model=
"form.
${
field
}
"
:min-height=
"192"
/>
</el-form-item>
#
elseif
($
column
.
htmlType
==
"select"
&&
""
!=
$
dictType
)
<el-form-item
label=
"
${
comment
}
"
prop=
"
${
field
}
"
>
<el-select
v-model=
"form.
${
field
}
"
placeholder=
"请选择
${
comment
}
"
>
...
...
@@ -248,9 +252,21 @@
<script>
import
{
list
${
BusinessName
},
get
${
BusinessName
},
del
${
BusinessName
},
add
${
BusinessName
},
update
${
BusinessName
},
export
${
BusinessName
}
}
from
"
@/api/
${
moduleName
}
/
${
businessName
}
"
;
#
foreach
($
column
in
$
columns
)
#
if
($
column
.
insert
&&
!
$
column
.
superColumn
&&
!
$
column
.
pk
&&
$
column
.
htmlType
==
"editor"
)
import
Editor
from
'
@/components/Editor
'
;
#
break
#
end
#
end
export
default
{
name
:
"
${
BusinessName
}
"
,
#
foreach
($
column
in
$
columns
)
#
if
($
column
.
insert
&&
!
$
column
.
superColumn
&&
!
$
column
.
pk
&&
$
column
.
htmlType
==
"editor"
)
components
:
{
Editor
},
#
break
#
end
#
end
data
()
{
return
{
// 遮罩层
...
...
ruoyi-ui/src/views/tool/gen/editTable.vue
View file @
a948affb
...
...
@@ -90,6 +90,7 @@
<el-option
label=
"单选框"
value=
"radio"
/>
<el-option
label=
"复选框"
value=
"checkbox"
/>
<el-option
label=
"日期控件"
value=
"datetime"
/>
<el-option
label=
"富文本控件"
value=
"editor"
/>
</el-select>
</
template
>
</el-table-column>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment