From ea73feba202f2c6bcbf341ba7ba07c4e415580d8 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Thu, 1 Aug 2024 16:36:45 +0800
Subject: [PATCH] 1

---
 src/components/ServiceConfiguration.vue            |  2 +-
 src/components/ServiceConfigurationActionLog.vue   |  4 ++-
 src/components/ServiceConfigurationActions.vue     | 11 +++++---
 .../ServiceConfigurationStatusViewer.vue           |  1 -
 src/utils/ApiClient.js                             | 29 +++++++++++++++++++---
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/components/ServiceConfiguration.vue b/src/components/ServiceConfiguration.vue
index 96e31d9..31c7105 100644
--- a/src/components/ServiceConfiguration.vue
+++ b/src/components/ServiceConfiguration.vue
@@ -24,7 +24,7 @@
               </fieldset>
             </div>
           </div>
-          <div class="p-1">
+          <div class="p-1 text-right">
             <a-button class="mr-1" @click="actionServiceParamReset">重置</a-button>
             <a-button class="mr-1" @click="actionServiceParamReload">刷新</a-button>
             <a-button @click="actionServiceParamSave">保存</a-button>
diff --git a/src/components/ServiceConfigurationActionLog.vue b/src/components/ServiceConfigurationActionLog.vue
index bc2e118..f9fbb81 100644
--- a/src/components/ServiceConfigurationActionLog.vue
+++ b/src/components/ServiceConfigurationActionLog.vue
@@ -45,7 +45,9 @@ async function handleLogChange() {
         chart = null;
     }
 
-    if ( null === props.log || null === props.log.response ) {
+    if ( null === props.log 
+    || undefined === props.log.response 
+    || null === props.log.response ) {
         return ;
     }
 
diff --git a/src/components/ServiceConfigurationActions.vue b/src/components/ServiceConfigurationActions.vue
index d820838..5236de9 100644
--- a/src/components/ServiceConfigurationActions.vue
+++ b/src/components/ServiceConfigurationActions.vue
@@ -35,7 +35,7 @@
   </div>
 </template>
 <script setup>
-import { ref, watch } from 'vue';
+import { nextTick, ref, watch } from 'vue';
 import ApiClient from '@/utils/ApiClient';
 import ServiceConfigurationActionParamFile from './ServiceConfigurationActionParamFile.vue'
 const emits = defineEmits(['update:actionLog']);
@@ -49,8 +49,6 @@ const actions = ref([]);
 const actionLog = ref(null);
 // watch service key
 watch(() => props.serviceKey, handleServiceKeyChange);
-// watch log
-watch(actionLog, () => emits('update:actionLog', actionLog.value), {deep:true});
 
 // on mounted
 async function handleServiceKeyChange() {
@@ -101,13 +99,18 @@ async function actionServiceExecute(action) {
             params.paramTypes.push(type);
         }
 
+        emits('update:actionLog', null);
+        await nextTick();
         actionLog.value = {};
         actionLog.value.action = params.action;
         actionLog.value.params = params.params;
-        actionLog.value.response = null;
         action.isExecuting = true;
+        emits('update:actionLog', structuredClone(actionLog.value));
+        await nextTick();
         actionLog.value.response = await client.call('service-config/service-action-exec',params);
         action.isExecuting = false;
+        emits('update:actionLog', structuredClone(actionLog.value));
+        await nextTick();
     } catch ( e ) {
         /** nothing to do here */
     } finally {
diff --git a/src/components/ServiceConfigurationStatusViewer.vue b/src/components/ServiceConfigurationStatusViewer.vue
index ddc5f18..7efe6be 100644
--- a/src/components/ServiceConfigurationStatusViewer.vue
+++ b/src/components/ServiceConfigurationStatusViewer.vue
@@ -71,7 +71,6 @@ async function refreshServiceStatusList() {
             group.items.sort((a,b) => a.order - b.order);
         }
         statuses.value.sort((a,b) => a.order - b.order);
-        console.log(statuses.value);
         if ( false !== statusRefreshTimer ) {
             statusRefreshTimer = setTimeout(refreshServiceStatusList, 1000);
         }
diff --git a/src/utils/ApiClient.js b/src/utils/ApiClient.js
index 3222f59..9d30539 100644
--- a/src/utils/ApiClient.js
+++ b/src/utils/ApiClient.js
@@ -22,15 +22,36 @@ export default class ApiClient {
             data: params
         });
         if ( !response.data.success ) {
+            let errorInfo = response.data.ecode;
+            delete errorInfo.codeChName;
             let content = h('div', {}, [
-                h('p',{class:'mb-5 text-red-400'},response.data.message),
-                h('pre', JSON.stringify(response.data.ecode, null, 2)),
-                h('pre', {class:'overflow-auto h-96 mt-5'}, response.data.traceInfo),
+                h('p',{class:'mb-5 text-red-400 white-space-pre'},response.data.message),
+                h('div', {
+                    style:{height:'20px',overflow:'hidden'}, 
+                    onClick:(event) => {
+                        let elem = event.target.parentElement;
+                        if ( '20px' === elem.style.height ) {
+                            elem.style.height = '600px';
+                            elem.style.overflow = 'auto';
+                        } else {
+                            elem.style.height = '20px';
+                            elem.scrollTop = 0;
+                            elem.style.overflow = 'hidden';
+                        }
+                    }
+                }, [
+                    h('div','详情'),
+                    h('pre', JSON.stringify(errorInfo, null, 2)),
+                    h('pre', {class:'overflow-auto h-96 mt-5'}, response.data.traceInfo),
+                ]),
             ]);
             Modal.error({title: '请求错误',content:content,width:800});
             throw new Error(`API【${name}】调用失败 : ${response.data}`);
         }
-        if ( 'object' === typeof(response.data.data) ) {
+        if ( 'MESSAGE' === response.data.appRetType ) {
+            Modal.info({title:'通知', contnet:response.data.message});
+        }
+        if ( null !== response.data.data && 'object' === typeof(response.data.data) ) {
             response.data.data.$dataType = response.data.dataType;
         }
         return response.data.data;