Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
a118738d
Commit
a118738d
authored
Jan 05, 2021
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
单图上传组件添加移除
parent
56fa3912
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
15 deletions
+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
No files found.
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
View file @
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
View file @
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
View file @
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
View file @
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
>
...
...
Write
Preview
Markdown
is supported
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