Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
前端资源
RuoYi-Vue
提交
a118738d
R
RuoYi-Vue
项目概览
前端资源
/
RuoYi-Vue
11 个月 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
RuoYi-Vue
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
a118738d
编写于
1月 05, 2021
作者:
R
RuoYi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
单图上传组件添加移除
上级
56fa3912
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
45 addition
and
15 deletion
+45
-15
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+6
-6
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+6
-6
ruoyi-ui/src/components/ImageUpload/index.vue
ruoyi-ui/src/components/ImageUpload/index.vue
+32
-2
ruoyi-ui/src/views/tool/gen/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 @@
<el-form-item
label=
"
${
comment
}
"
prop=
"
${
field
}
"
>
<el-input
v-model=
"form.
${
field
}
"
placeholder=
"请输入
${
comment
}
"
/>
</el-form-item>
#
elseif
($
column
.
htmlType
==
"
uploadImage
"
)
#
elseif
($
column
.
htmlType
==
"
imageUpload
"
)
<el-form-item
label=
"
${
comment
}
"
>
<
uploadImage
v-model=
"form.
${
field
}
"
/>
<
imageUpload
v-model=
"form.
${
field
}
"
/>
</el-form-item>
#
elseif
($
column
.
htmlType
==
"editor"
)
<el-form-item
label=
"
${
comment
}
"
>
...
...
@@ -244,8 +244,8 @@ import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${Busin
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
==
"
uploadImage
"
)
import
UploadImage
from
'
@/components/UploadImage
'
;
#
if
($
column
.
insert
&&
!
$
column
.
superColumn
&&
!
$
column
.
pk
&&
$
column
.
htmlType
==
"
imageUpload
"
)
import
ImageUpload
from
'
@/components/ImageUpload
'
;
#
break
#
end
#
end
...
...
@@ -260,8 +260,8 @@ export default {
name
:
"
${
BusinessName
}
"
,
components
:
{
#
foreach
($
column
in
$
columns
)
#
if
($
column
.
insert
&&
!
$
column
.
superColumn
&&
!
$
column
.
pk
&&
$
column
.
htmlType
==
"
uploadImage
"
)
UploadImage
,
#
if
($
column
.
insert
&&
!
$
column
.
superColumn
&&
!
$
column
.
pk
&&
$
column
.
htmlType
==
"
imageUpload
"
)
ImageUpload
,
#
break
#
end
#
end
...
...
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
浏览文件 @
a118738d
...
...
@@ -185,9 +185,9 @@
<el-form-item
label=
"
${
comment
}
"
prop=
"
${
field
}
"
>
<el-input
v-model=
"form.
${
field
}
"
placeholder=
"请输入
${
comment
}
"
/>
</el-form-item>
#
elseif
($
column
.
htmlType
==
"
uploadImage
"
)
#
elseif
($
column
.
htmlType
==
"
imageUpload
"
)
<el-form-item
label=
"
${
comment
}
"
>
<
uploadImage
v-model=
"form.
${
field
}
"
/>
<
imageUpload
v-model=
"form.
${
field
}
"
/>
</el-form-item>
#
elseif
($
column
.
htmlType
==
"editor"
)
<el-form-item
label=
"
${
comment
}
"
>
...
...
@@ -274,8 +274,8 @@
<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
==
"
uploadImage
"
)
import
UploadImage
from
'
@/components/UploadImage
'
;
#
if
($
column
.
insert
&&
!
$
column
.
superColumn
&&
!
$
column
.
pk
&&
$
column
.
htmlType
==
"
imageUpload
"
)
import
ImageUpload
from
'
@/components/ImageUpload
'
;
#
break
#
end
#
end
...
...
@@ -290,8 +290,8 @@ export default {
name
:
"
${
BusinessName
}
"
,
components
:
{
#
foreach
($
column
in
$
columns
)
#
if
($
column
.
insert
&&
!
$
column
.
superColumn
&&
!
$
column
.
pk
&&
$
column
.
htmlType
==
"
uploadImage
"
)
UploadImage
,
#
if
($
column
.
insert
&&
!
$
column
.
superColumn
&&
!
$
column
.
pk
&&
$
column
.
htmlType
==
"
imageUpload
"
)
ImageUpload
,
#
break
#
end
#
end
...
...
ruoyi-ui/src/components/
UploadImage
/index.vue
→
ruoyi-ui/src/components/
ImageUpload
/index.vue
浏览文件 @
a118738d
...
...
@@ -11,8 +11,21 @@
:headers=
"headers"
style=
"display: inline-block; vertical-align: top"
>
<img
v-if=
"value"
:src=
"value"
class=
"avatar"
/>
<i
v-else
class=
"el-icon-plus avatar-uploader-icon"
></i>
<el-image
v-if=
"!value"
:src=
"value"
>
<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>
</div>
</
template
>
...
...
@@ -37,6 +50,9 @@ export default {
},
},
methods
:
{
removeImage
()
{
this
.
$emit
(
"
input
"
,
""
);
},
handleUploadSuccess
(
res
)
{
this
.
$emit
(
"
input
"
,
res
.
url
);
this
.
loading
.
close
();
...
...
@@ -65,4 +81,18 @@ export default {
width
:
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
>
\ No newline at end of file
ruoyi-ui/src/views/tool/gen/editTable.vue
浏览文件 @
a118738d
...
...
@@ -90,7 +90,7 @@
<el-option
label=
"单选框"
value=
"radio"
/>
<el-option
label=
"复选框"
value=
"checkbox"
/>
<el-option
label=
"日期控件"
value=
"datetime"
/>
<el-option
label=
"
上传控件"
value=
"uploadImage
"
/>
<el-option
label=
"
单图上传"
value=
"imageUpload
"
/>
<el-option
label=
"富文本控件"
value=
"editor"
/>
</el-select>
</
template
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录