Commit d2a6ddc
committed
fix(ui): version-conflict on add + drop double-confirm on rollback
dynamicConfig save dispatched the add branch through .then/.catch
while the update branch used await + notifyRuleVersionError. The add
branch printed 'e.msg' (undefined; the field is e.message) and never
surfaced VERSION_CONFLICT / VERSION_LEDGER_PENDING — the request.ts
interceptor silently swallows those codes since the unified handler
is supposed to take them. Switch the add branch to await + try/catch
so the outer notifyRuleVersionError catches conflicts on add too.
Also remove the popconfirm around the history-drawer Rollback
button. The parent panel already opens a Rollback modal where the
user supplies the required reason; the popconfirm asked "确认回滚到
该版本?" before the reason form, splitting confirmation across two
prompts. The disabled state for delete/current versions is preserved.1 parent d498de1 commit d2a6ddc
3 files changed
Lines changed: 17 additions & 29 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
61 | 62 | | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | 63 | | |
66 | 64 | | |
67 | 65 | | |
| |||
Lines changed: 6 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
172 | 172 | | |
173 | 173 | | |
174 | 174 | | |
175 | | - | |
| 175 | + | |
176 | 176 | | |
177 | 177 | | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
182 | | - | |
183 | | - | |
184 | | - | |
185 | | - | |
186 | | - | |
187 | | - | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
188 | 183 | | |
189 | 184 | | |
190 | 185 | | |
| |||
Lines changed: 6 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
629 | 629 | | |
630 | 630 | | |
631 | 631 | | |
632 | | - | |
| 632 | + | |
633 | 633 | | |
634 | 634 | | |
635 | | - | |
636 | | - | |
637 | | - | |
638 | | - | |
639 | | - | |
640 | | - | |
641 | | - | |
642 | | - | |
643 | | - | |
644 | | - | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
645 | 640 | | |
646 | 641 | | |
647 | 642 | | |
| |||
0 commit comments