Skip to content

Commit 0891654

Browse files
committed
feat(fileupload): [file-upload] 修复上传组件新规范检视 pictrue-card问题
1 parent 5006f2f commit 0891654

File tree

5 files changed

+52
-10
lines changed

5 files changed

+52
-10
lines changed

examples/sites/demos/pc/app/file-upload/picture-card-composition-api.vue

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
:file-list="fileList"
88
@preview="previewPicture"
99
>
10-
<tiny-icon-plus class="tiny-svg-size" />
10+
<tiny-icon-add-picture class="tiny-svg-size" />
1111
</tiny-file-upload>
1212
<tiny-dialog-box v-model:visible="dialogVisible1" width="50%">
1313
<img style="width: 100%" :src="dialogImageUrl1" alt="Preview Image" />
@@ -18,19 +18,36 @@
1818
<script setup>
1919
import { ref } from 'vue'
2020
import { FileUpload as TinyFileUpload, DialogBox as TinyDialogBox } from '@opentiny/vue'
21-
import { iconPlus } from '@opentiny/vue-icon'
21+
import { iconAddPicture } from '@opentiny/vue-icon'
2222
2323
const action = ref('http://localhost:3000/api/upload')
2424
const dialogVisible1 = ref(false)
2525
const dialogImageUrl1 = ref('')
2626
const fileList = ref([
2727
{
2828
name: 'fruit',
29-
url: `${import.meta.env.VITE_APP_BUILD_BASE_URL}static/images/fruit.jpg`
29+
url: `${import.meta.env.VITE_APP_BUILD_BASE_URL}static/images/fruit.jpg`,
30+
status: 'ready'
31+
},
32+
{
33+
name: 'fruit',
34+
url: `${import.meta.env.VITE_APP_BUILD_BASE_URL}static/images/fruit.jpg`,
35+
status: 'uploading',
36+
percentage: 50
37+
},
38+
{
39+
name: 'fruit',
40+
url: `${import.meta.env.VITE_APP_BUILD_BASE_URL}static/images/fruit.jpg`,
41+
status: 'success'
42+
},
43+
{
44+
name: 'fruit',
45+
url: `${import.meta.env.VITE_APP_BUILD_BASE_URL}static/images/fruit.jpg`,
46+
status: 'fail'
3047
}
3148
])
3249
33-
const TinyIconPlus = iconPlus()
50+
const TinyIconAddPicture = iconAddPicture()
3451
3552
function previewPicture(file) {
3653
dialogImageUrl1.value = file.url

examples/sites/demos/pc/app/file-upload/picture-card.vue

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
:file-list="fileList"
88
@preview="previewPicture"
99
>
10-
<icon-plus class="tiny-svg-size" />
10+
<tiny-icon-add-picture class="tiny-svg-size" />
1111
</tiny-file-upload>
1212
<tiny-dialog-box v-model:visible="dialogVisible1" width="50%">
1313
<img style="width: 100%" :src="dialogImageUrl1" alt="Preview Image" />
@@ -17,23 +17,41 @@
1717

1818
<script>
1919
import { FileUpload, DialogBox } from '@opentiny/vue'
20-
import { IconPlus } from '@opentiny/vue-icon'
20+
import { iconAddPicture } from '@opentiny/vue-icon'
2121
2222
export default {
2323
components: {
2424
TinyFileUpload: FileUpload,
2525
TinyDialogBox: DialogBox,
26-
IconPlus: IconPlus()
26+
TinyIconAddPicture: iconAddPicture()
2727
},
2828
data() {
29+
console.log('--ti-upload-list-picture-card-success-border-weight'.length)
2930
return {
3031
action: 'http://localhost:3000/api/upload',
3132
dialogVisible1: false,
3233
dialogImageUrl1: '',
3334
fileList: [
3435
{
3536
name: 'fruit',
36-
url: `${import.meta.env.VITE_APP_BUILD_BASE_URL}static/images/fruit.jpg`
37+
url: `${import.meta.env.VITE_APP_BUILD_BASE_URL}static/images/fruit.jpg`,
38+
status: 'ready'
39+
},
40+
{
41+
name: 'fruit',
42+
url: `${import.meta.env.VITE_APP_BUILD_BASE_URL}static/images/fruit.jpg`,
43+
status: 'uploading',
44+
percentage: 50
45+
},
46+
{
47+
name: 'fruit',
48+
url: `${import.meta.env.VITE_APP_BUILD_BASE_URL}static/images/fruit.jpg`,
49+
status: 'success'
50+
},
51+
{
52+
name: 'fruit',
53+
url: `${import.meta.env.VITE_APP_BUILD_BASE_URL}static/images/fruit.jpg`,
54+
status: 'fail'
3755
}
3856
]
3957
}

packages/theme/src/upload-list/index.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,10 @@
387387
margin: 0 var(--ti-upload-list-picture-card-item-margin-right) 8px 0;
388388
display: inline-block;
389389

390+
&.is-success {
391+
border-width: var(--ti-upload-list-picture-success-border-weight);
392+
}
393+
390394
&.is-fail {
391395
border-color: var(--ti-upload-list-item-fail-text-color);
392396
background-color: #fce3e1;

packages/theme/src/upload-list/smb-theme.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ export const tinyUploadListSmbTheme = {
66
'ti-upload-list-item-line-height': 'var(--ti-common-line-height-1)',
77
'ti-upload-list-item-margin-top': 'var(--ti-common-space-2x)',
88
'ti-upload-list-picture-card-item-margin-right': 'var(--ti-common-space-4x)',
9-
'ti-upload-list-item-border-radius': 'var(--ti-common-border-radius-1)',
9+
'ti-upload-list-item-border-radius': 'var(--ti-common-border-radius-4)',
1010
'ti-upload-picture-card-border-radius': 'var(--ti-common-border-radius-4)',
1111
'ti-upload-list-item-hover-background-color': 'var(--ti-common-bg-color-disabled-transparent-5)',
1212
'ti-upload-list-svg-icon-font-size': 'var(--ti-common-font-size-2)',
1313
'ti-upload-list-svg-refresh-position-right': 'var(--ti-common-space-8x)',
14-
'ti-upload-list-picture-card-item-hover-bg-color': 'var(--ti-common-bg-color-hover-40)'
14+
'ti-upload-list-picture-card-item-hover-bg-color': 'var(--ti-common-bg-color-hover-40)',
15+
'ti-upload-list-picture-success-border-weight': '0'
1516
}

packages/theme/src/upload-list/vars.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
--ti-upload-list-successful-icon-font-size: var(--ti-common-font-size-1, 14px);
3636
// 照片墙上传列表项边框色
3737
--ti-upload-list-picture-card-item-border-color: var(--ti-common-color-border, #adb0b8);
38+
// 照片墙上传成功列表项边框厚度
39+
--ti-upload-list-picture-success-border-weight: var(--ti-common-border-weight-normal, 1px);
3840
// 照片墙上传列表项背景色
3941
--ti-upload-list-picture-card-item-bg-color: var(--ti-common-color-light, #fff);
4042
// 照片墙上传列表项右上角图标填充色

0 commit comments

Comments
 (0)