Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions components/progress/progress.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ import useConfigInject from '../config-provider/hooks/useConfigInject';
import devWarning from '../vc-util/devWarning';
import { progressProps, progressStatuses } from './props';
import type { VueNode } from '../_util/type';
import useStyle from './style';
import classNames from '../_util/classNames';

export default defineComponent({
compatConfig: { MODE: 3 },
name: 'AProgress',
inheritAttrs: false,
props: initDefaultProps(progressProps(), {
type: 'line',
percent: 0,
Expand All @@ -26,8 +29,9 @@ export default defineComponent({
strokeLinecap: 'round',
}),
slots: ['format'],
setup(props, { slots }) {
setup(props, { slots, attrs }) {
const { prefixCls, direction } = useConfigInject('progress', props);
const [wrapSSR, hashId] = useStyle(prefixCls);
devWarning(
props.successPercent == undefined,
'Progress',
Expand All @@ -37,6 +41,7 @@ export default defineComponent({
const { type, showInfo, size } = props;
const pre = prefixCls.value;
return {
[hashId.value]: true,
[pre]: true,
[`${pre}-${(type === 'dashboard' && 'circle') || type}`]: true,
[`${pre}-show-info`]: showInfo,
Expand Down Expand Up @@ -93,6 +98,7 @@ export default defineComponent({

return () => {
const { type, steps, strokeColor, title } = props;
const { class: cls, ...restAttrs } = attrs;
const progressInfo = renderProcessInfo();

let progress: VueNode;
Expand Down Expand Up @@ -120,15 +126,14 @@ export default defineComponent({
);
}

const classNames = {
...classString.value,
const classes = classNames(classString.value, {
[`${prefixCls.value}-status-${progressStatus.value}`]: true,
};
});

return (
<div class={classNames} title={title}>
return wrapSSR(
<div {...restAttrs} class={[classes, cls]} title={title}>
{progress}
</div>
</div>,
);
};
},
Expand Down
210 changes: 0 additions & 210 deletions components/progress/style/index.less

This file was deleted.

Loading