diff --git a/ui-vue3/src/api/mock/mockCluster.js b/ui-vue3/src/api/mock/mockCluster.ts similarity index 80% rename from ui-vue3/src/api/mock/mockCluster.js rename to ui-vue3/src/api/mock/mockCluster.ts index 7a8b57e23..69f064f13 100644 --- a/ui-vue3/src/api/mock/mockCluster.js +++ b/ui-vue3/src/api/mock/mockCluster.ts @@ -25,13 +25,6 @@ Mock.mock('/mock/metrics/cluster', 'get', { consumers: Mock.mock('@integer(80, 200)'), providers: Mock.mock('@integer(80, 200)'), services: Mock.mock('@integer(80, 200)'), - versions: ["dubbo-golang-3.0.4"], - protocols: ["tri"], - rules: [], - configCenter: "127.0.0.1:2181", - registry: "127.0.0.1:2181", - metadataCenter: "127.0.0.1:2181", - grafana: "127.0.0.1:3000", - prometheus: "127.0.0.1:9090" + } }) diff --git a/ui-vue3/src/api/mock/mockServer.js b/ui-vue3/src/api/mock/mockServer.ts similarity index 70% rename from ui-vue3/src/api/mock/mockServer.js rename to ui-vue3/src/api/mock/mockServer.ts index 4ec47683a..1b12d44f1 100644 --- a/ui-vue3/src/api/mock/mockServer.js +++ b/ui-vue3/src/api/mock/mockServer.ts @@ -22,11 +22,14 @@ Mock.mock('/mock/metrics/metadata', 'get', { code: 200, message: '成功', data: { - versions: [], - configCenter: '127.0.0.1:2181', - registry: '127.0.0.1:2181', - metadataCenter: '127.0.0.1:2181', - protocols: [], - rules: ['DemoService:1.0.0:test.configurators', 'DemoService4:bb:aa.configurators'] + versions: ["dubbo-golang-3.0.4"], + protocols: ["tri"], + rules:["DemoService:1.0.0:test.configurators","DemoService4:bb:aa.configurators"], + configCenter: "127.0.0.1:2181", + registry: "127.0.0.1:2181", + metadataCenter: "127.0.0.1:2181", + // make sure the X-Frame-Options is forbidden + grafana: `http://${window.location.host}/admin/home`, + prometheus: "127.0.0.1:9090" } }) diff --git a/ui-vue3/src/api/mock/mockVersion.js b/ui-vue3/src/api/mock/mockVersion.ts similarity index 100% rename from ui-vue3/src/api/mock/mockVersion.js rename to ui-vue3/src/api/mock/mockVersion.ts diff --git a/ui-vue3/src/api/service/serverInfo.ts b/ui-vue3/src/api/service/serverInfo.ts new file mode 100644 index 000000000..15a7fc059 --- /dev/null +++ b/ui-vue3/src/api/service/serverInfo.ts @@ -0,0 +1,27 @@ +/* + * 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. + */ + + +import request from "@/base/http/request"; + +export const getMetricsMetadata = (params: any):Promise => { + return request({ + url: '/metrics/metadata', + method: 'get', + params + }) +} diff --git a/ui-vue3/src/main.ts b/ui-vue3/src/main.ts index 16fec8c0f..774d6f154 100644 --- a/ui-vue3/src/main.ts +++ b/ui-vue3/src/main.ts @@ -14,17 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { createApp } from 'vue' -import Antd, { notification } from 'ant-design-vue' +import {createApp} from 'vue' +import Antd from 'ant-design-vue' import router from './router' import App from './App.vue' import 'ant-design-vue/dist/reset.css' -import devTool from '@/utils/DevToolUtil' -import { i18n } from '@/base/i18n' -import './api/mock/mockServer.js' -import './api/mock/mockCluster.js' -import './api/mock/mockVersion.js' +import {i18n} from '@/base/i18n' +import './api/mock/mockServer' +import './api/mock/mockCluster' +import './api/mock/mockVersion' import Vue3ColorPicker from 'vue3-colorpicker' import 'vue3-colorpicker/style.css' diff --git a/ui-vue3/src/views/home/index.vue b/ui-vue3/src/views/home/index.vue index 5d5ef5804..a2e36dab2 100644 --- a/ui-vue3/src/views/home/index.vue +++ b/ui-vue3/src/views/home/index.vue @@ -20,7 +20,7 @@ + v-for="(v, k) in clusterInfo.report">