Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(badge): use composition api to refactor badge component #402

Merged
merged 3 commits into from Mar 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/_common
Submodule _common updated 57 files
+0 −21 docs/mobile/api/list.md
+0 −41 docs/mobile/api/loading.md
+2 −2 docs/mobile/api/preview.md
+12 −0 docs/mobile/api/segmented-control.md
+1 −7 docs/web/api/form.md
+1 −9 docs/web/api/input.md
+3 −12 docs/web/api/select-input.md
+0 −3 docs/web/api/tag-input.md
+0 −5 docs/web/api/upload.md
+0 −14 docs/web/overview.md
+0 −4 js/locale/en_US.ts
+0 −4 js/locale/zh_CN.ts
+16 −12 js/tree/tree-store.ts
+2 −8 js/upload/types.ts
+5 −20 js/upload/xhr.ts
+0 −1 js/utils/calcTextareaHeight.ts
+4 −5 package.json
+42 −42 style/mobile/_variables.less
+3 −1 style/mobile/components/_index.less
+2 −5 style/mobile/components/action-sheet/_index.less
+1 −3 style/mobile/components/action-sheet/_var.less
+4 −1 style/mobile/components/avatar-group/_index.less
+0 −18 style/mobile/components/avatar-group/_mixin.less
+0 −5 style/mobile/components/avatar-group/_var.less
+0 −1 style/mobile/components/button-group/_index.less
+0 −2 style/mobile/components/button-group/_var.less
+2 −2 style/mobile/components/button/_index.less
+0 −2 style/mobile/components/button/_var.less
+62 −29 style/mobile/components/checkbox/_index.less
+22 −9 style/mobile/components/checkbox/_var.less
+1 −1 style/mobile/components/collapse/_var.less
+0 −5 style/mobile/components/image-viewer/_var.less
+1 −1 style/mobile/components/input/_index.less
+0 −35 style/mobile/components/list/_index.less
+0 −5 style/mobile/components/list/_var.less
+0 −200 style/mobile/components/loading/_index.less
+0 −35 style/mobile/components/loading/_var.less
+3 −4 style/mobile/components/navbar/_index.less
+3 −5 style/mobile/components/navbar/_var.less
+8 −8 style/mobile/components/preview/_index.less
+5 −0 style/mobile/components/preview/_var.less
+0 −0 style/mobile/components/preview/index.html
+55 −0 style/mobile/components/segmented-control/_index.less
+11 −0 style/mobile/components/segmented-control/_var.less
+7 −23 style/mobile/components/steps/_index.less
+9 −25 style/mobile/components/steps/_mixin.less
+4 −0 style/mobile/components/steps/_var.less
+5 −9 style/mobile/components/switch/_index.less
+14 −5 style/mobile/components/switch/_var.less
+0 −1 style/mobile/components/tab-bar/_index.less
+0 −2 style/web/components/_index.less
+0 −1 style/web/components/input/_index.less
+12 −16 style/web/components/select-input/_index.less
+1 −5 style/web/components/slider/_index.less
+0 −29 style/web/components/tree-select/_index.less
+0 −4 style/web/components/upload/_index.less
+0 −20 tsconfig.json
117 changes: 64 additions & 53 deletions src/badge/badge.tsx
@@ -1,73 +1,84 @@
import { defineComponent, ComponentPublicInstance } from 'vue';
import { prefix } from '../config';
import { defineComponent, computed } from 'vue';
import props from './props';
import { renderTNodeJSX } from '../utils/render-tnode';

const name = `${prefix}-badge`;
import { useTNodeJSX } from '../hooks/tnode';
import { useConfig } from '../config-provider/useConfig';

export default defineComponent({
name: 'TBadge',

props: { ...props },

methods: {
getContent() {
if (this.dot) return '';
if (typeof this.count === 'function') {
return renderTNodeJSX(this, 'count');
setup(props) {
const renderTNodeJSX = useTNodeJSX();

/** 内容计算相关逻辑 start */
const content = computed(() => {
if (props.dot) return '';
if (typeof props.count === 'function') {
return renderTNodeJSX('count');
}
if (Number.isNaN(Number(this.count))) {
return this.count;
if (Number.isNaN(Number(props.count))) {
return props.count;
}
const count = Number(this.count);
return count > this.maxCount ? `${this.maxCount}+` : count;
},
isSmall() {
return this.size === 'small';
},
isZero() {
const content = this.getContent();
return content === 0 || content === '0';
},
isHidden() {
return !this.showZero && this.isZero();
},
getOffset() {
if (!this.offset) return {};
let [xOffset, yOffset]: Array<string | number> = this.offset;
const count = Number(props.count);
return count > props.maxCount ? `${props.maxCount}+` : count;
});

const renderChildren = () => renderTNodeJSX('default');

const getOffset = () => {
if (!props.offset) return {};
let [xOffset, yOffset]: Array<string | number> = props.offset;
xOffset = Number.isNaN(Number(xOffset)) ? xOffset : `${xOffset}px`;
yOffset = Number.isNaN(Number(yOffset)) ? yOffset : `${yOffset}px`;
return { xOffset, yOffset };
},
},
};
/** 内容计算相关逻辑 end */

render() {
const { dot, shape, color } = this.$props;
/** 样式计算相关逻辑 start */
const { classPrefix } = useConfig('classPrefix');
const name = `${classPrefix.value}-badge`;
const isHidden = computed(() => {
return !props.showZero && (content.value === 0 || content.value === '0');
});

const badgeClassNames = computed(() => {
return [
{
[`${name}--dot`]: !!props.dot,
[`${name}--circle`]: !props.dot && props.shape === 'circle',
[`${name}--round`]: props.shape === 'round',
't-size-s': props.size === 'small',
},
];
});

const content = this.getContent();
const isHidden = this.isHidden();
const children = this.$slots.default ? this.$slots.default(null) : '';
const { xOffset, yOffset } = this.getOffset();
const badgeClassNames = [
{
[`${name}--dot`]: !!dot,
[`${name}--circle`]: !dot && shape === 'circle',
[`${name}--round`]: shape === 'round',
't-size-s': this.isSmall(),
},
];
const inlineStyle = {
background: `${color}`,
right: xOffset,
top: yOffset,
const inlineStyle = computed(() => {
const { xOffset, yOffset } = getOffset();
return {
background: `${props.color}`,
right: xOffset,
top: yOffset,
};
});
/** 样式计算相关逻辑 end */
return {
content,
inlineStyle,
badgeClassNames,
isHidden,
renderChildren,
name,
};
},

render() {
return (
<div class={name} {...this.$attrs}>
{children || null}
{isHidden ? null : (
<sup class={badgeClassNames} style={inlineStyle}>
{content}
<div class={this.name} {...this.$attrs}>
{this.renderChildren()}
{this.isHidden ? null : (
<sup class={this.badgeClassNames} style={this.inlineStyle}>
{this.content}
</sup>
)}
</div>
Expand Down