diff --git a/package-lock.json b/package-lock.json index a88b6d5..e478222 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "ant-design-vue": "^4.2.3", "axios": "^1.7.2", "core-js": "^3.8.3", + "echarts": "^5.5.1", "vue": "^3.2.13", "vue-router": "^4.4.0" }, @@ -5548,6 +5549,20 @@ "node": ">=6.0.0" } }, + "node_modules/echarts": { + "version": "5.5.1", + "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.1.tgz", + "integrity": "sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==", + "dependencies": { + "tslib": "2.3.0", + "zrender": "5.6.0" + } + }, + "node_modules/echarts/node_modules/tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz", @@ -12650,6 +12665,19 @@ "resolved": "https://registry.npmmirror.com/yallist/-/yallist-2.1.2.tgz", "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==", "dev": true + }, + "node_modules/zrender": { + "version": "5.6.0", + "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz", + "integrity": "sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==", + "dependencies": { + "tslib": "2.3.0" + } + }, + "node_modules/zrender/node_modules/tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" } }, "dependencies": { @@ -16755,6 +16783,22 @@ "integrity": "sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==", "dev": true }, + "echarts": { + "version": "5.5.1", + "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.5.1.tgz", + "integrity": "sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==", + "requires": { + "tslib": "2.3.0", + "zrender": "5.6.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + } + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz", @@ -21942,6 +21986,21 @@ "dev": true } } + }, + "zrender": { + "version": "5.6.0", + "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.0.tgz", + "integrity": "sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==", + "requires": { + "tslib": "2.3.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + } + } } } } diff --git a/package.json b/package.json index 6eb74d1..6bbaa2e 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "ant-design-vue": "^4.2.3", "axios": "^1.7.2", "core-js": "^3.8.3", + "echarts": "^5.5.1", "vue": "^3.2.13", "vue-router": "^4.4.0" }, @@ -41,7 +42,7 @@ }, "rules": { "no-debugger": "off", - "no-undef" : "off" + "no-undef": "off" } }, "browserslist": [ diff --git a/src/components/ServiceConfiguration.vue b/src/components/ServiceConfiguration.vue index bcb40f7..6bf7869 100644 --- a/src/components/ServiceConfiguration.vue +++ b/src/components/ServiceConfiguration.vue @@ -23,6 +23,7 @@
+ 重置 刷新 保存
@@ -31,12 +32,12 @@
{{ group.name }}
- {{ action.name }} -
- {{ action.name }} +
+ {{ action.name }}
{{ actionParam.name }} : @@ -47,7 +48,6 @@ {{ actionParam }}
- 执行
@@ -149,6 +149,15 @@ async function actionServiceParamSave() { } catch ( e ) {/** nothing to do here */} } +// service param reset +async function actionServiceParamReset() { + try { + let client = ApiClient.getClient(); + await client.call('service-config/service-params-reset', {serviceKey:props.serviceKey}); + await actionServiceParamReload(); + } catch ( e ) {/** nothing to do here */} +} + // service actions reload async function serviceActionReload() { try { @@ -162,7 +171,7 @@ async function serviceActionReload() { actions.value.push(group); } group.items.push(item); - group.items.sort((a,b) => a.params.length - b.params.length); + group.items.sort((a,b) => b.order - a.order || a.params.length - b.params.length); } actions.value.sort((a,b) => a.name.localeCompare(b.name)); } catch ( e ) {/** nothing to do here */} diff --git a/src/components/ServiceConfigurationActionLog.vue b/src/components/ServiceConfigurationActionLog.vue index bb8aac9..f27aa6d 100644 --- a/src/components/ServiceConfigurationActionLog.vue +++ b/src/components/ServiceConfigurationActionLog.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/src/utils/ApiClient.js b/src/utils/ApiClient.js index 5f178ac..d16c9cb 100644 --- a/src/utils/ApiClient.js +++ b/src/utils/ApiClient.js @@ -29,6 +29,7 @@ export default class ApiClient { Modal.error({title: '请求错误',content:content,width:800}); throw new Error(`API【${name}】调用失败 : ${response.data}`); } + response.data.data.$dataType = response.data.dataType; return response.data.data; } } \ No newline at end of file