Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
T
topology
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
姜立玮
topology
Commits
a118738d
提交
a118738d
authored
1月 05, 2021
作者:
RuoYi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
单图上传组件添加移除
上级
56fa3912
变更
4
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
45 行增加
和
15 行删除
+45
-15
index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+6
-6
index.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+6
-6
index.vue
ruoyi-ui/src/components/ImageUpload/index.vue
+32
-2
editTable.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
+1
-1
没有找到文件。
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
浏览文件 @
a118738d
...
@@ -153,9 +153,9 @@
...
@@ -153,9 +153,9 @@
<el-form-item label="${comment}" prop="${field}">
<el-form-item label="${comment}" prop="${field}">
<el-input v-model="form.${field}" placeholder="请输入${comment}" />
<el-input v-model="form.${field}" placeholder="请输入${comment}" />
</el-form-item>
</el-form-item>
#elseif($column.htmlType == "
uploadImage
")
#elseif($column.htmlType == "
imageUpload
")
<el-form-item label="${comment}">
<el-form-item label="${comment}">
<
uploadImage
v-model="form.${field}"/>
<
imageUpload
v-model="form.${field}"/>
</el-form-item>
</el-form-item>
#elseif($column.htmlType == "editor")
#elseif($column.htmlType == "editor")
<el-form-item label="${comment}">
<el-form-item label="${comment}">
...
@@ -244,8 +244,8 @@ import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${Busin
...
@@ -244,8 +244,8 @@ import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${Busin
import Treeselect from "@riophae/vue-treeselect";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
#foreach($column in $columns)
#foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "
uploadImage
")
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "
imageUpload
")
import
UploadImage from '@/components/UploadImage
';
import
ImageUpload from '@/components/ImageUpload
';
#break
#break
#end
#end
#end
#end
...
@@ -260,8 +260,8 @@ export default {
...
@@ -260,8 +260,8 @@ export default {
name: "${BusinessName}",
name: "${BusinessName}",
components: {
components: {
#foreach($column in $columns)
#foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "
uploadImage
")
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "
imageUpload
")
UploadImage
,
ImageUpload
,
#break
#break
#end
#end
#end
#end
...
...
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
浏览文件 @
a118738d
...
@@ -185,9 +185,9 @@
...
@@ -185,9 +185,9 @@
<el-form-item label="${comment}" prop="${field}">
<el-form-item label="${comment}" prop="${field}">
<el-input v-model="form.${field}" placeholder="请输入${comment}" />
<el-input v-model="form.${field}" placeholder="请输入${comment}" />
</el-form-item>
</el-form-item>
#elseif($column.htmlType == "
uploadImage
")
#elseif($column.htmlType == "
imageUpload
")
<el-form-item label="${comment}">
<el-form-item label="${comment}">
<
uploadImage
v-model="form.${field}"/>
<
imageUpload
v-model="form.${field}"/>
</el-form-item>
</el-form-item>
#elseif($column.htmlType == "editor")
#elseif($column.htmlType == "editor")
<el-form-item label="${comment}">
<el-form-item label="${comment}">
...
@@ -274,8 +274,8 @@
...
@@ -274,8 +274,8 @@
<script>
<script>
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
#foreach($column in $columns)
#foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "
uploadImage
")
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "
imageUpload
")
import
UploadImage from '@/components/UploadImage
';
import
ImageUpload from '@/components/ImageUpload
';
#break
#break
#end
#end
#end
#end
...
@@ -290,8 +290,8 @@ export default {
...
@@ -290,8 +290,8 @@ export default {
name: "${BusinessName}",
name: "${BusinessName}",
components: {
components: {
#foreach($column in $columns)
#foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "
uploadImage
")
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "
imageUpload
")
UploadImage
,
ImageUpload
,
#break
#break
#end
#end
#end
#end
...
...
ruoyi-ui/src/components/
UploadImage
/index.vue
→
ruoyi-ui/src/components/
ImageUpload
/index.vue
浏览文件 @
a118738d
...
@@ -11,8 +11,21 @@
...
@@ -11,8 +11,21 @@
:headers=
"headers"
:headers=
"headers"
style=
"display: inline-block; vertical-align: top"
style=
"display: inline-block; vertical-align: top"
>
>
<img
v-if=
"value"
:src=
"value"
class=
"avatar"
/>
<el-image
v-if=
"!value"
:src=
"value"
>
<i
v-else
class=
"el-icon-plus avatar-uploader-icon"
></i>
<div
slot=
"error"
class=
"image-slot"
>
<i
class=
"el-icon-plus"
/>
</div>
</el-image>
<div
v-else
class=
"image"
>
<el-image
:src=
"value"
/>
<div
class=
"mask"
>
<div
class=
"actions"
>
<span
title=
"移除"
@
click
.
stop=
"removeImage"
>
<i
class=
"el-icon-delete"
/>
</span>
</div>
</div>
</div>
</el-upload>
</el-upload>
</div>
</div>
</
template
>
</
template
>
...
@@ -37,6 +50,9 @@ export default {
...
@@ -37,6 +50,9 @@ export default {
},
},
},
},
methods
:
{
methods
:
{
removeImage
()
{
this
.
$emit
(
"input"
,
""
);
},
handleUploadSuccess
(
res
)
{
handleUploadSuccess
(
res
)
{
this
.
$emit
(
"input"
,
res
.
url
);
this
.
$emit
(
"input"
,
res
.
url
);
this
.
loading
.
close
();
this
.
loading
.
close
();
...
@@ -65,4 +81,18 @@ export default {
...
@@ -65,4 +81,18 @@ export default {
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
}
}
.image
{
position
:
relative
;
.mask
{
opacity
:
0
;
position
:
absolute
;
top
:
0
;
width
:
100%
;
background-color
:
rgba
(
0
,
0
,
0
,
0
.5
);
transition
:
all
0
.3s
;
}
&
:hover
.mask
{
opacity
:
1
;
}
}
</
style
>
</
style
>
\ No newline at end of file
ruoyi-ui/src/views/tool/gen/editTable.vue
浏览文件 @
a118738d
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
<el-option
label=
"单选框"
value=
"radio"
/>
<el-option
label=
"单选框"
value=
"radio"
/>
<el-option
label=
"复选框"
value=
"checkbox"
/>
<el-option
label=
"复选框"
value=
"checkbox"
/>
<el-option
label=
"日期控件"
value=
"datetime"
/>
<el-option
label=
"日期控件"
value=
"datetime"
/>
<el-option
label=
"
上传控件"
value=
"uploadImage
"
/>
<el-option
label=
"
单图上传"
value=
"imageUpload
"
/>
<el-option
label=
"富文本控件"
value=
"editor"
/>
<el-option
label=
"富文本控件"
value=
"editor"
/>
</el-select>
</el-select>
</
template
>
</
template
>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论