This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-rocketbot-ui.git
The following commit(s) were added to refs/heads/master by this push:
new bc0fa5a Fix: Override & bug display (#273)
bc0fa5a is described below
commit bc0fa5a71572b269a6b3e3ae2ad81f3435b0d3dd
Author: Allen Wang <[email protected]>
AuthorDate: Wed Mar 18 15:35:02 2020 +0800
Fix: Override & bug display (#273)
* Fix: override & bug display
* Update prort
---
src/views/components/topology/chart-line.vue | 24 +++++++++++++------
.../components/topology/dependency-sankey.vue | 24 +++++++++++++------
src/views/components/topology/radial.vue | 25 ++++++++++++-------
src/views/components/topology/topo-aside.vue | 25 ++++++++++++-------
src/views/components/topology/topo-chart.vue | 24 +++++++++++++------
.../topology/topo-group/create-group.vue | 2 +-
.../components/topology/topo-group/group-item.vue | 24 +++++++++++++------
src/views/components/topology/topo-group/index.vue | 28 +++++++++++-----------
src/views/containers/topology/alarm/alarm-tool.vue | 23 ++++++++++++------
src/views/containers/topology/alarm/index.vue | 24 ++++++++++++-------
.../topology/endpoint/endpoints-survey.vue | 24 +++++++++++++------
src/views/containers/topology/endpoint/index.vue | 3 ++-
src/views/containers/topology/topology.vue | 26 +++++++++++++-------
13 files changed, 186 insertions(+), 90 deletions(-)
diff --git a/src/views/components/topology/chart-line.vue
b/src/views/components/topology/chart-line.vue
index cd8b0d3..2eba672 100644
--- a/src/views/components/topology/chart-line.vue
+++ b/src/views/components/topology/chart-line.vue
@@ -1,10 +1,20 @@
-/** * Licensed to the Apache Software Foundation (ASF) under one or more *
contributor license agreements. See the
-NOTICE file distributed with * this work for additional information regarding
copyright ownership. * The ASF licenses
-this file to You under the Apache License, Version 2.0 * (the "License"); you
may not use this file except in compliance
-with * the License. You may obtain a copy of the License at * *
http://www.apache.org/licenses/LICENSE-2.0 * * Unless
-required by applicable law or agreed to in writing, software * distributed
under the License is distributed on an "AS
-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. * See the License for the specific
-language governing permissions and * limitations under the License. */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
<template>
<div>
<div class="grey sm mb-5">{{ title }}</div>
diff --git a/src/views/components/topology/dependency-sankey.vue
b/src/views/components/topology/dependency-sankey.vue
index a12a1db..14fa78f 100644
--- a/src/views/components/topology/dependency-sankey.vue
+++ b/src/views/components/topology/dependency-sankey.vue
@@ -1,10 +1,20 @@
-/** * Licensed to the Apache Software Foundation (ASF) under one or more *
contributor license agreements. See the
-NOTICE file distributed with * this work for additional information regarding
copyright ownership. * The ASF licenses
-this file to You under the Apache License, Version 2.0 * (the "License"); you
may not use this file except in compliance
-with * the License. You may obtain a copy of the License at * *
http://www.apache.org/licenses/LICENSE-2.0 * * Unless
-required by applicable law or agreed to in writing, software * distributed
under the License is distributed on an "AS
-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. * See the License for the specific
-language governing permissions and * limitations under the License. */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
<template>
<RkEcharts height="100%" :option="optionConfigs" :clickEvent="clickLinks" />
</template>
diff --git a/src/views/components/topology/radial.vue
b/src/views/components/topology/radial.vue
index 694dc6c..8edfd3d 100644
--- a/src/views/components/topology/radial.vue
+++ b/src/views/components/topology/radial.vue
@@ -1,13 +1,22 @@
-/** * Licensed to the Apache Software Foundation (ASF) under one or more *
contributor license agreements. See the
-NOTICE file distributed with * this work for additional information regarding
copyright ownership. * The ASF licenses
-this file to You under the Apache License, Version 2.0 * (the "License"); you
may not use this file except in compliance
-with * the License. You may obtain a copy of the License at * *
http://www.apache.org/licenses/LICENSE-2.0 * * Unless
-required by applicable law or agreed to in writing, software * distributed
under the License is distributed on an "AS
-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. * See the License for the specific
-language governing permissions and * limitations under the License. */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
<template>
<div class="micro-radil-chart">
- <!-- <div class="micro-radil-chart-btn rk-btn ghost cp"
@click="$emit('showRadial', false)">X</div> -->
<RkEcharts height="100%" :option="responseConfig" ref="radial" />
</div>
</template>
diff --git a/src/views/components/topology/topo-aside.vue
b/src/views/components/topology/topo-aside.vue
index 9c7744b..2ccf7ec 100644
--- a/src/views/components/topology/topo-aside.vue
+++ b/src/views/components/topology/topo-aside.vue
@@ -1,10 +1,20 @@
-/** * Licensed to the Apache Software Foundation (ASF) under one or more *
contributor license agreements. See the
-NOTICE file distributed with * this work for additional information regarding
copyright ownership. * The ASF licenses
-this file to You under the Apache License, Version 2.0 * (the "License"); you
may not use this file except in compliance
-with * the License. You may obtain a copy of the License at * *
http://www.apache.org/licenses/LICENSE-2.0 * * Unless
-required by applicable law or agreed to in writing, software * distributed
under the License is distributed on an "AS
-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. * See the License for the specific
-language governing permissions and * limitations under the License. */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
<template>
<aside class="link-topo-aside">
<Radial v-if="radioStatus" :datas="{ nodes: stateTopo.nodes, calls:
stateTopo.calls }" />
@@ -45,7 +55,6 @@ language governing permissions and * limitations under the
License. */
v-if="rocketDashboard.serviceSLA.SLA.length"
:data="rocketDashboard.serviceSLA.SLA"
:intervalTime="intervalTime"
- :precent="true"
title="Service SLA"
unit="%"
/>
diff --git a/src/views/components/topology/topo-chart.vue
b/src/views/components/topology/topo-chart.vue
index 3e20d0b..91f46f9 100644
--- a/src/views/components/topology/topo-chart.vue
+++ b/src/views/components/topology/topo-chart.vue
@@ -1,10 +1,20 @@
-/** * Licensed to the Apache Software Foundation (ASF) under one or more *
contributor license agreements. See the
-NOTICE file distributed with * this work for additional information regarding
copyright ownership. * The ASF licenses
-this file to You under the Apache License, Version 2.0 * (the "License"); you
may not use this file except in compliance
-with * the License. You may obtain a copy of the License at * *
http://www.apache.org/licenses/LICENSE-2.0 * * Unless
-required by applicable law or agreed to in writing, software * distributed
under the License is distributed on an "AS
-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. * See the License for the specific
-language governing permissions and * limitations under the License. */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
<template>
<div>
diff --git a/src/views/components/topology/topo-group/create-group.vue
b/src/views/components/topology/topo-group/create-group.vue
index ffdfa7d..f816d15 100644
--- a/src/views/components/topology/topo-group/create-group.vue
+++ b/src/views/components/topology/topo-group/create-group.vue
@@ -29,8 +29,8 @@ language governing permissions and * limitations under the
License. */
private handleCreateGroup() {
this.CREATE_GROUP(this.name);
- this.name = '';
this.create = false;
+ this.name = '';
}
}
</script>
diff --git a/src/views/components/topology/topo-group/group-item.vue
b/src/views/components/topology/topo-group/group-item.vue
index 6a44e95..e90ae1f 100644
--- a/src/views/components/topology/topo-group/group-item.vue
+++ b/src/views/components/topology/topo-group/group-item.vue
@@ -1,10 +1,20 @@
-/** * Licensed to the Apache Software Foundation (ASF) under one or more *
contributor license agreements. See the
-NOTICE file distributed with * this work for additional information regarding
copyright ownership. * The ASF licenses
-this file to You under the Apache License, Version 2.0 * (the "License"); you
may not use this file except in compliance
-with * the License. You may obtain a copy of the License at * *
http://www.apache.org/licenses/LICENSE-2.0 * * Unless
-required by applicable law or agreed to in writing, software * distributed
under the License is distributed on an "AS
-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. * See the License for the specific
-language governing permissions and * limitations under the License. */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
<template>
<div class="group-wrapper">
<div class="group-item ell" :class="{ active: active }"
@click="$emit('select', data.id)">
diff --git a/src/views/components/topology/topo-group/index.vue
b/src/views/components/topology/topo-group/index.vue
index d101aaa..e4e3242 100644
--- a/src/views/components/topology/topo-group/index.vue
+++ b/src/views/components/topology/topo-group/index.vue
@@ -60,12 +60,12 @@ language governing permissions and * limitations under the
License. */
private fetchData() {
return Axios.post('/graphql', {
query: `
- query queryServices($duration: Duration!) {
- services: getAllServices(duration: $duration) {
- key: id
- label: name
- }
- }`,
+ query queryServices($duration: Duration!) {
+ services: getAllServices(duration: $duration) {
+ key: id
+ label: name
+ }
+ }`,
variables: {
duration: this.durationTime,
},
@@ -75,12 +75,12 @@ language governing permissions and * limitations under the
License. */
}
private initGroupTopo() {
let serviceOld = localStorage.getItem('topology-group-history') || '';
- if (!this.rocketTopoGroup.groups.length) {
- return;
- }
+ if (!this.rocketTopoGroup.groups.length) { return; }
if (
!this.rocketTopoGroup.groups
- .some((i: { id: string; name: string; services: Array<{label: string,
key: string}> }) => i.id === serviceOld)
+ .some((i: {
+ id: string; name: string; services: Array<{label: string, key:
string}>
+ }) => i.id === serviceOld)
) {
serviceOld = this.rocketTopoGroup.groups[0].id;
this.handleSelectGroup(serviceOld);
@@ -90,10 +90,10 @@ language governing permissions and * limitations under the
License. */
}
private created() {
this.INIT_GROUPS();
- this.fetchData().then(() => {
- this.initGroupTopo();
- this.SET_EVENTS([this.initGroupTopo]);
- });
+ this.fetchData()
+ .then(() => {
+ this.initGroupTopo();
+ });
}
}
</script>
diff --git a/src/views/containers/topology/alarm/alarm-tool.vue
b/src/views/containers/topology/alarm/alarm-tool.vue
index c9844fe..f75cbef 100644
--- a/src/views/containers/topology/alarm/alarm-tool.vue
+++ b/src/views/containers/topology/alarm/alarm-tool.vue
@@ -1,10 +1,19 @@
-/** * Licensed to the Apache Software Foundation (ASF) under one or more *
contributor license agreements. See the
-NOTICE file distributed with * this work for additional information regarding
copyright ownership. * The ASF licenses
-this file to You under the Apache License, Version 2.0 * (the "License"); you
may not use this file except in compliance
-with * the License. You may obtain a copy of the License at * *
http://www.apache.org/licenses/LICENSE-2.0 * * Unless
-required by applicable law or agreed to in writing, software * distributed
under the License is distributed on an "AS
-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. * See the License for the specific
-language governing permissions and * limitations under the License. */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
<template>
<nav class="rk-alarm-tool flex-h">
diff --git a/src/views/containers/topology/alarm/index.vue
b/src/views/containers/topology/alarm/index.vue
index 7eb5991..08fd3d5 100644
--- a/src/views/containers/topology/alarm/index.vue
+++ b/src/views/containers/topology/alarm/index.vue
@@ -1,11 +1,19 @@
-/** * Licensed to the Apache Software Foundation (ASF) under one or more *
contributor license agreements. See the
-NOTICE file distributed with * this work for additional information regarding
copyright ownership. * The ASF licenses
-this file to You under the Apache License, Version 2.0 * (the "License"); you
may not use this file except in compliance
-with * the License. You may obtain a copy of the License at * *
http://www.apache.org/licenses/LICENSE-2.0 * * Unless
-required by applicable law or agreed to in writing, software * distributed
under the License is distributed on an "AS
-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. * See the License for the specific
-language governing permissions and * limitations under the License. */
-
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
<template>
<div class="rk-alarm flex-v">
<AlarmTool :keyword="current.label" :total="rocketAlarm.total" />
diff --git a/src/views/containers/topology/endpoint/endpoints-survey.vue
b/src/views/containers/topology/endpoint/endpoints-survey.vue
index 52dc8f2..77ee3bf 100644
--- a/src/views/containers/topology/endpoint/endpoints-survey.vue
+++ b/src/views/containers/topology/endpoint/endpoints-survey.vue
@@ -1,10 +1,20 @@
-/** * Licensed to the Apache Software Foundation (ASF) under one or more *
contributor license agreements. See the
-NOTICE file distributed with * this work for additional information regarding
copyright ownership. * The ASF licenses
-this file to You under the Apache License, Version 2.0 * (the "License"); you
may not use this file except in compliance
-with * the License. You may obtain a copy of the License at * *
http://www.apache.org/licenses/LICENSE-2.0 * * Unless
-required by applicable law or agreed to in writing, software * distributed
under the License is distributed on an "AS
-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. * See the License for the specific
-language governing permissions and * limitations under the License. */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
<template>
<div class="dashboard-container clear">
<DashboardItem
diff --git a/src/views/containers/topology/endpoint/index.vue
b/src/views/containers/topology/endpoint/index.vue
index 73af5e3..be61486 100644
--- a/src/views/containers/topology/endpoint/index.vue
+++ b/src/views/containers/topology/endpoint/index.vue
@@ -60,7 +60,8 @@ language governing permissions and * limitations under the
License. */
private beforeMount() {
this.SET_CURRENT_SERVICE(this.current);
this.MIXHANDLE_CHANGE_GROUP_WITH_CURRENT({ index: 0, current: 2 });
- this.GET_SERVICE_ENDPOINTS({ duration: this.durationTime, serviceId:
this.current.key }).then(() => {
+ this.GET_SERVICE_ENDPOINTS({ duration: this.durationTime, serviceId:
this.current.key })
+ .then(() => {
this.selectEndpoint(this.stateDashboardOption.endpoints[0]);
});
}
diff --git a/src/views/containers/topology/topology.vue
b/src/views/containers/topology/topology.vue
index 985e729..2979351 100644
--- a/src/views/containers/topology/topology.vue
+++ b/src/views/containers/topology/topology.vue
@@ -1,10 +1,20 @@
-/** * Licensed to the Apache Software Foundation (ASF) under one or more *
contributor license agreements. See the
-NOTICE file distributed with * this work for additional information regarding
copyright ownership. * The ASF licenses
-this file to You under the Apache License, Version 2.0 * (the "License"); you
may not use this file except in compliance
-with * the License. You may obtain a copy of the License at * *
http://www.apache.org/licenses/LICENSE-2.0 * * Unless
-required by applicable law or agreed to in writing, software * distributed
under the License is distributed on an "AS
-IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied. * See the License for the specific
-language governing permissions and * limitations under the License. */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
<template>
<div class="rk-topo">
<Topo
@@ -28,6 +38,7 @@ language governing permissions and * limitations under the
License. */
import { Vue, Component } from 'vue-property-decorator';
import { State, Action, Getter, Mutation } from 'vuex-class';
import { AxiosResponse } from 'axios';
+ import { State as topoState } from '@/store/modules/topology';
import WindowEndpoint from '@/views/containers/topology/endpoint/index.vue';
import WindowInstance from '@/views/containers/topology/instance/index.vue';
import WindowTrace from '@/views/containers/topology/trace/index.vue';
@@ -35,7 +46,6 @@ language governing permissions and * limitations under the
License. */
import Topo from '../../components/topology/chart/topo.vue';
import TopoAside from '../../components/topology/topo-aside.vue';
import TopoGroup from '../../components/topology/topo-group/index.vue';
- import { State as topoState } from '@/store/modules/topology';
@Component({
components: {
