From 2a3ca9f552d96594ec6690a1c4c91f598451b9a1 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 10 Oct 2024 14:28:46 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=AE=9D=E5=A1=94?=
 =?UTF-8?q?=E7=BD=91=E7=AB=99=E9=83=A8=E7=BD=B2=E6=8F=92=E4=BB=B6=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8B=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E7=9A=84=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/ui/certd-client/src/api/service.ts   |  8 ++-
 .../plugins/common/cert-domains-getter.vue    | 10 ++--
 .../plugins/common/remote-select.vue          | 51 +++++++++++--------
 .../src/components/plugins/lib/index.ts       |  2 +-
 .../plugins/synology/device-id-getter.vue     |  2 +-
 .../ui/certd-client/src/style/common.less     |  5 +-
 6 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/packages/ui/certd-client/src/api/service.ts b/packages/ui/certd-client/src/api/service.ts
index 412b35cab..b5285cf27 100644
--- a/packages/ui/certd-client/src/api/service.ts
+++ b/packages/ui/certd-client/src/api/service.ts
@@ -47,7 +47,13 @@ function createService() {
             return dataAxios.data;
           default:
             // 不是正确的 code
-            errorCreate(`${dataAxios.msg}: ${response.config.url}`);
+            const errorMessage = dataAxios.msg;
+            // @ts-ignore
+            if (response?.config?.onError) {
+              // @ts-ignore
+              response.config.onError(new Error(errorMessage));
+            }
+            errorCreate(`${errorMessage}: ${response.config.url}`);
             return dataAxios;
         }
       }
diff --git a/packages/ui/certd-client/src/components/plugins/common/cert-domains-getter.vue b/packages/ui/certd-client/src/components/plugins/common/cert-domains-getter.vue
index 0f40a0175..1b088c107 100644
--- a/packages/ui/certd-client/src/components/plugins/common/cert-domains-getter.vue
+++ b/packages/ui/certd-client/src/components/plugins/common/cert-domains-getter.vue
@@ -1,3 +1,8 @@
+<template>
+  <a-select mode="tags" readonly :value="modelValue" />
+  <div>{{ errorRef }}</div>
+</template>
+
 <script setup lang="ts">
 import { inject, ref, watch } from "vue";
 
@@ -57,9 +62,4 @@ watch(
 );
 </script>
 
-<template>
-  <a-select mode="tags" readonly :value="modelValue" />
-  <div>{{ errorRef }}</div>
-</template>
-
 <style lang="less"></style>
diff --git a/packages/ui/certd-client/src/components/plugins/common/remote-select.vue b/packages/ui/certd-client/src/components/plugins/common/remote-select.vue
index d2bbd2c7a..0b1541eb5 100644
--- a/packages/ui/certd-client/src/components/plugins/common/remote-select.vue
+++ b/packages/ui/certd-client/src/components/plugins/common/remote-select.vue
@@ -1,6 +1,28 @@
+<template>
+  <div class="remote-select">
+    <div class="flex flex-row">
+      <a-select
+        class="remote-select-input"
+        show-search
+        :filter-option="filterOption"
+        :options="optionsRef"
+        :value="value"
+        v-bind="attrs"
+        @click="onClick"
+        @update:value="emit('update:value', $event)"
+      />
+      <div class="ml-5">
+        <fs-button title="刷新选项" icon="ion:refresh-outline" @click="refreshOptions"></fs-button>
+      </div>
+    </div>
+    <div class="helper error">
+      {{ message }}
+    </div>
+  </div>
+</template>
 <script setup lang="ts">
 import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
-import { ref, watch } from "vue";
+import { ref, useAttrs, watch } from "vue";
 
 defineOptions({
   name: "RemoteSelect"
@@ -16,6 +38,8 @@ const emit = defineEmits<{
   "update:value": any;
 }>();
 
+const attrs = useAttrs();
+
 const optionsRef = ref([]);
 const message = ref("");
 const getOptions = async () => {
@@ -27,8 +51,8 @@ const getOptions = async () => {
       input: props.form
     },
     {
-      onError(err) {
-        message.value = err.message;
+      onError(err: any) {
+        message.value = `获取选项出错：${err.message}`;
       }
     }
   );
@@ -44,6 +68,10 @@ async function onClick() {
     return;
   }
   isFirst = false;
+  await refreshOptions();
+}
+
+async function refreshOptions() {
   optionsRef.value = await getOptions();
 }
 
@@ -64,21 +92,4 @@ watch(
 );
 </script>
 
-<template>
-  <div>
-    <a-select
-      class="remote-select"
-      show-search
-      :filter-option="filterOption"
-      :options="optionsRef"
-      :value="value"
-      @click="onClick"
-      @update:value="emit('update:value', $event)"
-    />
-    <div class="helper">
-      {{ message }}
-    </div>
-  </div>
-</template>
-
 <style lang="less"></style>
diff --git a/packages/ui/certd-client/src/components/plugins/lib/index.ts b/packages/ui/certd-client/src/components/plugins/lib/index.ts
index b338d562c..abbfb3f61 100644
--- a/packages/ui/certd-client/src/components/plugins/lib/index.ts
+++ b/packages/ui/certd-client/src/components/plugins/lib/index.ts
@@ -14,7 +14,7 @@ export type RequestHandleReq<T = any> = {
   input: T;
 };
 
-export async function doRequest(req: RequestHandleReq, opts?: any = {}) {
+export async function doRequest(req: RequestHandleReq, opts: any = {}) {
   const url = req.type === "access" ? "/pi/handle/access" : "/pi/handle/plugin";
   const { typeName, action, data, input } = req;
   const res = await request({
diff --git a/packages/ui/certd-client/src/components/plugins/synology/device-id-getter.vue b/packages/ui/certd-client/src/components/plugins/synology/device-id-getter.vue
index c7aca5338..e80dc8893 100644
--- a/packages/ui/certd-client/src/components/plugins/synology/device-id-getter.vue
+++ b/packages/ui/certd-client/src/components/plugins/synology/device-id-getter.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <contextHolder />
-    <a-input v-bind="attrs" :value="value" :allow-clear="true" @update:value="emit('update:value', $event)">
+    <a-input :value="value" :allow-clear="true" v-bind="attrs" @update:value="emit('update:value', $event)">
       <template #suffix>
         <a-tag class="cursor-pointer" @click="getDeviceId">获取设备ID</a-tag>
       </template>
diff --git a/packages/ui/certd-client/src/style/common.less b/packages/ui/certd-client/src/style/common.less
index 632e6c2c2..28783bc05 100644
--- a/packages/ui/certd-client/src/style/common.less
+++ b/packages/ui/certd-client/src/style/common.less
@@ -203,9 +203,12 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 .helper {
-  display: inline-block;
   color: #aeaeae;
   font-size: 12px;
+
+  &.error{
+    color: #ff4d4f;
+  }
 }