diff --git a/src/card/test/__snapshots__/demo.spec.js.snap b/src/card/test/__snapshots__/demo.spec.js.snap index 61968b1b7..fbf760721 100644 --- a/src/card/test/__snapshots__/demo.spec.js.snap +++ b/src/card/test/__snapshots__/demo.spec.js.snap @@ -6,7 +6,7 @@ exports[`renders demo correctly 1`] = `
-
+
@@ -29,7 +29,7 @@ exports[`renders demo correctly 1`] = `
-
+
标签
@@ -54,7 +54,7 @@ exports[`renders demo correctly 1`] = `
-
+
diff --git a/src/grid/test/__snapshots__/demo.spec.js.snap b/src/grid/test/__snapshots__/demo.spec.js.snap index 69390c9b1..4a56f7803 100644 --- a/src/grid/test/__snapshots__/demo.spec.js.snap +++ b/src/grid/test/__snapshots__/demo.spec.js.snap @@ -55,7 +55,7 @@ exports[`renders demo correctly 1`] = `
-
+
@@ -63,7 +63,7 @@ exports[`renders demo correctly 1`] = `
-
+
@@ -71,7 +71,7 @@ exports[`renders demo correctly 1`] = `
-
+
diff --git a/src/image/index.js b/src/image/index.js index 70dfa62b0..873b6f29d 100644 --- a/src/image/index.js +++ b/src/image/index.js @@ -108,7 +108,9 @@ export default createComponent({ if (this.loading && this.showLoading) { return (
- {this.slots('loading') || } + {this.slots('loading') || ( + + )}
); } @@ -116,7 +118,9 @@ export default createComponent({ if (this.error && this.showError) { return (
- {this.slots('error') || } + {this.slots('error') || ( + + )}
); } @@ -142,14 +146,23 @@ export default createComponent({ } return ( - + ); } }, render() { return ( -
+
{this.genImage()} {this.genPlaceholder()}
diff --git a/src/image/index.less b/src/image/index.less index 3adb70d0d..5f5af3f91 100644 --- a/src/image/index.less +++ b/src/image/index.less @@ -34,4 +34,12 @@ font-size: @image-placeholder-font-size; background-color: @image-placeholder-background-color; } + + &__loading-icon { + font-size: @image-loading-icon-size; + } + + &__error-icon { + font-size: @image-error-icon-size; + } } diff --git a/src/image/test/__snapshots__/demo.spec.js.snap b/src/image/test/__snapshots__/demo.spec.js.snap index 9885d6156..333d10b86 100644 --- a/src/image/test/__snapshots__/demo.spec.js.snap +++ b/src/image/test/__snapshots__/demo.spec.js.snap @@ -5,7 +5,7 @@ exports[`renders demo correctly 1`] = `
-
+
@@ -14,35 +14,35 @@ exports[`renders demo correctly 1`] = `
-
+
contain
-
+
cover
-
+
fill
-
+
none
-
+
scale-down
@@ -53,35 +53,35 @@ exports[`renders demo correctly 1`] = `
-
+
contain
-
+
cover
-
+
fill
-
+
none
-
+
scale-down
@@ -92,7 +92,7 @@ exports[`renders demo correctly 1`] = `
-
+
默认提示
@@ -111,14 +111,14 @@ exports[`renders demo correctly 1`] = `
-
+
默认提示
-
+
自定义提示
diff --git a/src/image/test/__snapshots__/index.spec.js.snap b/src/image/test/__snapshots__/index.spec.js.snap index e0d8bbf5a..42f8c4acb 100644 --- a/src/image/test/__snapshots__/index.spec.js.snap +++ b/src/image/test/__snapshots__/index.spec.js.snap @@ -2,14 +2,14 @@ exports[`lazy load 1`] = `
-
+
`; exports[`lazy-load error event 1`] = `
-
+
`; @@ -20,14 +20,14 @@ exports[`load event 1`] = `
-
+
`; exports[`radius prop 1`] = `
-
+
`; diff --git a/src/style/var.less b/src/style/var.less index 5a319e163..f4297e3d3 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -395,6 +395,8 @@ @image-placeholder-text-color: @gray-6; @image-placeholder-font-size: @font-size-md; @image-placeholder-background-color: @background-color; +@image-loading-icon-size: 22px; +@image-error-icon-size: 22px; // ImagePreview @image-preview-index-text-color: @white; diff --git a/src/tree-select/test/__snapshots__/demo.spec.js.snap b/src/tree-select/test/__snapshots__/demo.spec.js.snap index 8274ed099..305e340ce 100644 --- a/src/tree-select/test/__snapshots__/demo.spec.js.snap +++ b/src/tree-select/test/__snapshots__/demo.spec.js.snap @@ -64,7 +64,7 @@ exports[`renders demo correctly 1`] = `
-
+
diff --git a/src/uploader/test/__snapshots__/demo.spec.js.snap b/src/uploader/test/__snapshots__/demo.spec.js.snap index d0de4aaaf..d87fd8a52 100644 --- a/src/uploader/test/__snapshots__/demo.spec.js.snap +++ b/src/uploader/test/__snapshots__/demo.spec.js.snap @@ -15,14 +15,14 @@ exports[`renders demo correctly 1`] = `
-
+
-
+
@@ -37,7 +37,7 @@ exports[`renders demo correctly 1`] = `
-
+
diff --git a/src/uploader/test/__snapshots__/index.spec.js.snap b/src/uploader/test/__snapshots__/index.spec.js.snap index d7bd236ac..24b2e601b 100644 --- a/src/uploader/test/__snapshots__/index.spec.js.snap +++ b/src/uploader/test/__snapshots__/index.spec.js.snap @@ -23,7 +23,7 @@ exports[`image-fit prop 1`] = `
-
+
@@ -39,7 +39,7 @@ exports[`max-count prop 1`] = `
-
+
@@ -53,7 +53,7 @@ exports[`preview-size prop 1`] = `
-
+
@@ -69,7 +69,7 @@ exports[`render preview image 1`] = `
-
+
@@ -90,7 +90,7 @@ exports[`render preview image 1`] = `
-
+