diff --git a/src/circle/index.js b/src/circle/index.js index f26f2adc0..b2ce174c6 100644 --- a/src/circle/index.js +++ b/src/circle/index.js @@ -1,5 +1,5 @@ import { watch, computed } from 'vue'; -import { createNamespace, isObject, addUnit } from '../utils'; +import { createNamespace, isObject, getSizeStyle } from '../utils'; import { raf, cancelRaf } from '../utils/dom/raf'; import { BLUE, WHITE } from '../utils/constant'; @@ -69,14 +69,6 @@ export default createComponent({ const path = computed(() => getPath(props.clockwise, viewBoxSize.value)); - const rootStyle = computed(() => { - const size = addUnit(props.size); - return { - width: size, - height: size, - }; - }); - watch( () => props.rate, (rate) => { @@ -172,7 +164,7 @@ export default createComponent({ }; return () => ( -
+
{renderGradient()} {renderHover()} diff --git a/src/skeleton/index.js b/src/skeleton/index.js index 83aedd3bf..49f72e4a6 100644 --- a/src/skeleton/index.js +++ b/src/skeleton/index.js @@ -1,4 +1,4 @@ -import { createNamespace, addUnit } from '../utils'; +import { createNamespace, addUnit, getSizeStyle } from '../utils'; const [createComponent, bem] = createNamespace('skeleton'); const DEFAULT_ROW_WIDTH = '100%'; @@ -42,11 +42,10 @@ export default createComponent({ setup(props, { slots }) { const renderAvatar = () => { if (props.avatar) { - const size = addUnit(props.avatarSize); return (
); } diff --git a/src/slider/index.js b/src/slider/index.js index c788fb0af..2ccd632fd 100644 --- a/src/slider/index.js +++ b/src/slider/index.js @@ -1,5 +1,5 @@ import { ref, computed } from 'vue'; -import { createNamespace, addUnit } from '../utils'; +import { createNamespace, addUnit, getSizeStyle } from '../utils'; import { preventDefault } from '../utils/dom/event'; // Mixins @@ -51,16 +51,6 @@ export default createComponent({ const range = computed(() => props.max - props.min); - const buttonStyle = computed(() => { - if (props.buttonSize) { - const size = addUnit(props.buttonSize); - return { - width: size, - height: size, - }; - } - }); - const wrapperStyle = computed(() => { const crossAxis = props.vertical ? 'width' : 'height'; return { @@ -177,7 +167,7 @@ export default createComponent({ {slots.button ? ( slots.button() ) : ( -
+
)}
); diff --git a/src/stepper/index.js b/src/stepper/index.js index 4212756bd..8f3a4b8ed 100644 --- a/src/stepper/index.js +++ b/src/stepper/index.js @@ -1,4 +1,4 @@ -import { createNamespace, isDef, addUnit } from '../utils'; +import { createNamespace, isDef, addUnit, getSizeStyle } from '../utils'; import { resetScroll } from '../utils/dom/reset-scroll'; import { preventDefault } from '../utils/dom/event'; import { formatNumber } from '../utils/format/number'; @@ -124,14 +124,7 @@ export default createComponent({ }, buttonStyle() { - if (this.buttonSize) { - const size = addUnit(this.buttonSize); - - return { - width: size, - height: size, - }; - } + return getSizeStyle(this.buttonSize); }, }, diff --git a/src/uploader/index.js b/src/uploader/index.js index cd3a7dc0d..2fe2067c9 100644 --- a/src/uploader/index.js +++ b/src/uploader/index.js @@ -1,5 +1,12 @@ // Utils -import { createNamespace, addUnit, noop, isPromise, isDef } from '../utils'; +import { + noop, + isDef, + addUnit, + isPromise, + getSizeStyle, + createNamespace, +} from '../utils'; import { toArray, readFile, isOversize, isImageFile } from './utils'; // Mixins @@ -346,13 +353,7 @@ export default createComponent({ {PreviewCover} ) : ( -
+
{item.file ? item.file.name : item.url} @@ -408,17 +409,8 @@ export default createComponent({ ); } - let style; - if (this.previewSize) { - const size = this.previewSizeWithUnit; - style = { - width: size, - height: size, - }; - } - return ( -
+
{this.uploadText && ( {this.uploadText} diff --git a/src/utils/format/unit.ts b/src/utils/format/unit.ts index 9b2de011d..941a3261c 100644 --- a/src/utils/format/unit.ts +++ b/src/utils/format/unit.ts @@ -10,6 +10,16 @@ export function addUnit(value?: string | number): string | undefined { return isNumeric(value) ? `${value}px` : value; } +export function getSizeStyle(originSize?: string | number) { + if (isDef(originSize)) { + const size = addUnit(originSize); + return { + width: size, + height: size, + }; + } +} + // cache let rootFontSize: number; diff --git a/src/utils/index.ts b/src/utils/index.ts index 03976bbd3..e461e855a 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,4 +1,4 @@ -export { addUnit } from './format/unit'; +export { addUnit, getSizeStyle } from './format/unit'; export { createNamespace } from './create'; // eslint-disable-next-line @typescript-eslint/no-empty-function