This is an automated email from the ASF dual-hosted git repository.
wu-sheng pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-horizon-ui.git
from 416c0ad admin: local-vs-remote conflict resolution for diverged
templates
new 357fdd9 dashboard(table): one column per label dimension, not a
joined string
new a3a4f73 admin(conflict): confirm step before choosing the live
(remote) version
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apps/bff/src/http/query/dashboard.ts | 19 +++++++------
apps/ui/src/render/widgets/TableWidget.vue | 40 +++++++++++++++++++++-------
apps/ui/src/shell/TemplateConflictPrompt.vue | 32 ++++++++++++++++++----
packages/api-client/src/dashboard.ts | 7 ++---
4 files changed, 73 insertions(+), 25 deletions(-)
