Skip to content

fix(Steps): selected error in sequence='reverse' and optimize code #3700

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(Steps): selected error in sequence='reverse' and optimize code #3700

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 15 additions & 26 deletions src/steps/steps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default mixins(getConfigReceiverMixins('steps')).extend({
props: { ...props },
data() {
return {
indexMap: {},
indexMap: {} as { [key: string]: number },
};
},
provide(): { steps: any } {
Expand Down Expand Up @@ -48,35 +48,22 @@ export default mixins(getConfigReceiverMixins('steps')).extend({
},
},
render() {
const nodes = this.$scopedSlots?.default && this.$scopedSlots.default(null);
const options = this.getOptions();
const content = options.map((item, index) => {
const stepIndex = this.sequence === 'reverse' ? options.length - index - 1 : index;
const propsData = {
...item,
index: stepIndex,
status: this.handleStatus(item, index),
};
const optionsDisplayListLength = options.length;

const content = options.map((item, index) => {
const stepIndex = this.sequence === 'reverse' ? optionsDisplayListLength - index - 1 : index;
const stepItem = (
<t-step-item
props={{
...item,
index: stepIndex,
status: this.handleStatus(item, index),
status: this.handleStatus(item, stepIndex),
}}
key={item.value || index}
></t-step-item>
);

if (nodes && nodes[index]) {
const vnode = nodes[index];
if (vnode.componentOptions) {
vnode.componentOptions.propsData = propsData;
return vnode;
}
return stepItem;
}
return stepItem;
});
return <div class={this.baseClass}>{content}</div>;
Expand All @@ -86,7 +73,7 @@ export default mixins(getConfigReceiverMixins('steps')).extend({
const nodes = this.$scopedSlots?.default && this.$scopedSlots.default(null);
let options: Array<TdStepItemProps>;
if (this.options && this.options.length) {
options = this.sequence === 'reverse' ? this.options.reverse() : this.options;
options = this.sequence === 'reverse' ? [...this.options].reverse() : this.options;
} else {
options = this.getOptionListBySlots(nodes);
}
Expand Down Expand Up @@ -115,10 +102,13 @@ export default mixins(getConfigReceiverMixins('steps')).extend({
handleStatus(item: TdStepItemProps, index: number) {
if (item.status && item.status !== 'default') return item.status;
if (this.current === 'FINISH') return 'finish';

// value 不存在时，使用 index 进行区分每一个步骤
if (item.value === undefined) {
if (this.sequence === 'positive' && index < this.current) return 'finish';
if (this.sequence === 'reverse' && index > this.current) return 'finish';

if (item.value === undefined && typeof this.current === 'number') {
if (index < this.current) return 'finish';
if (index === this.current) return 'process';
return 'default';
}
// value 存在，找匹配位置
if (item.value !== undefined) {
Expand All @@ -127,11 +117,10 @@ export default mixins(getConfigReceiverMixins('steps')).extend({
console.warn('TDesign Steps Warn: The current `value` is not exist.');
return 'default';
}
if (this.sequence === 'positive' && index < matchIndex) return 'finish';
if (this.sequence === 'reverse' && index > matchIndex) return 'finish';
if (index < matchIndex) return 'finish';
if (index === matchIndex) return 'process';
return 'default';
}
const key = item.value === undefined ? index : item.value;
if (key === this.current) return 'process';
return 'default';
},
handleChange(cur: TdStepsProps['current'], prev: TdStepsProps['current'], e: MouseEvent) {
Expand Down
Loading