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

Steps: fixes issue #14502 #14596

Merged
merged 3 commits into from
Mar 9, 2019
Merged

Steps: fixes issue #14502 #14596

merged 3 commits into from
Mar 9, 2019

Conversation

sinchang
Copy link
Contributor

@sinchang sinchang commented Mar 6, 2019

Please make sure these boxes are checked before submitting your PR, thank you!

  • Make sure you follow Element's contributing guide (中文 | English | Español | Français).
  • Make sure you are merging your commits to dev branch.
  • Add some descriptions and refer relative issues for you PR.

Fixes #14502

@element-bot
Copy link
Member

element-bot commented Mar 6, 2019

Deploy preview for element ready!

Built with commit 12caaee

https://deploy-preview-14596--element.netlify.com

@island205 island205 requested a review from wacky6 March 6, 2019 09:53
@island205
Copy link
Contributor

island205 commented Mar 6, 2019

More good fix?:

  mounted() {
    const unwatch = this.$watch('index', val => {
      this.$watch('$parent.active', this.updateStatus, { immediate: true });
      this.$watch('$parent.processStatus', () => {
        let val = this.$parent.active
        if (val > this.index) {
          this.internalStatus = this.$parent.finishStatus;
        } else if (val === this.index && this.prevStatus !== 'error') {
          this.internalStatus = this.$parent.processStatus;
        } else {
          this.internalStatus = 'wait';
        }
      }, { immediate: true });
      unwatch();
    });
  }

@sinchang
Copy link
Contributor Author

sinchang commented Mar 6, 2019

@island205 good point! thank you.

@island205 island205 self-assigned this Mar 7, 2019
@island205 island205 added this to the 2.7.0 milestone Mar 7, 2019
@island205
Copy link
Contributor

@wacky6 Would you like to review this PR?

@island205 island205 merged commit d125568 into ElemeFE:dev Mar 9, 2019
@sinchang sinchang deleted the patch-1137 branch March 9, 2019 13:36
isaaxite pushed a commit to isaaxite/element that referenced this pull request Mar 10, 2019
@island205 island205 modified the milestones: 2.7.0, 2.6.2 Mar 18, 2019
weisiren168 pushed a commit to weisiren168/element that referenced this pull request Jun 20, 2019
lzq4047 pushed a commit to lzq4047/element that referenced this pull request May 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants