From 0671e2d357a93d753d0f32b030ab286f6b03bd0f Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Thu, 23 Mar 2023 17:41:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E8=BF=9C=E7=A8=8B=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E8=8E=B7=E5=8F=96base-path?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/Firmware/Save/FileUpload.vue | 15 +++++++++------
 src/views/link/Protocol/Save/FileUpload.vue   | 15 +++++++++------
 src/views/link/Protocol/Save/index.vue        |  1 +
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/views/device/Firmware/Save/FileUpload.vue b/src/views/device/Firmware/Save/FileUpload.vue
index ad623ca2..defb69c6 100644
--- a/src/views/device/Firmware/Save/FileUpload.vue
+++ b/src/views/device/Firmware/Save/FileUpload.vue
@@ -31,10 +31,11 @@
 <script setup lang="ts" name="FileUpload">
 import { LocalStore } from '@/utils/comm';
 import { TOKEN_KEY } from '@/utils/variable';
-import { FIRMWARE_UPLOAD, querySystemApi } from '@/api/device/firmware';
+import { FIRMWARE_UPLOAD } from '@/api/device/firmware';
 import { onlyMessage } from '@/utils/comm';
 import type { UploadChangeParam } from 'ant-design-vue';
 import { notification as Notification } from 'ant-design-vue';
+import { useSystem } from '@/store/system';
 
 const emit = defineEmits(['update:modelValue', 'update:extraValue', 'change']);
 
@@ -45,6 +46,10 @@ const props = defineProps({
     },
 });
 
+const paths: string = useSystem().$state.configInfo.paths?.[
+    'base-path'
+] as string;
+
 const fileValue = ref(props.modelValue);
 const loading = ref(false);
 
@@ -53,11 +58,9 @@ const handleChange = async (info: UploadChangeParam) => {
     if (info.file.status === 'done') {
         loading.value = false;
         const result = info.file.response?.result;
-        const api: any = await querySystemApi(['paths']); // todo base-path在pinia获取系统配置的
-        const path = api.result[0]?.properties
-            ? api.result[0]?.properties['base-path']
-            : '';
-        const f = `${path}/file/${result.id}?accessKey=${result.others.accessKey}`;
+        const f = `${paths || ''}/file/${result.id}?accessKey=${
+            result.others.accessKey
+        }`;
         onlyMessage('上传成功！', 'success');
         fileValue.value = f;
         emit('update:modelValue', f);
diff --git a/src/views/link/Protocol/Save/FileUpload.vue b/src/views/link/Protocol/Save/FileUpload.vue
index 8bb467ea..fa4b9c69 100644
--- a/src/views/link/Protocol/Save/FileUpload.vue
+++ b/src/views/link/Protocol/Save/FileUpload.vue
@@ -27,10 +27,11 @@
 <script setup lang="ts" name="FileUpload">
 import { LocalStore } from '@/utils/comm';
 import { TOKEN_KEY } from '@/utils/variable';
-import { PROTOCOL_UPLOAD, querySystemApi } from '@/api/link/protocol';
+import { PROTOCOL_UPLOAD } from '@/api/link/protocol';
 import { onlyMessage } from '@/utils/comm';
 import type { UploadChangeParam, UploadProps } from 'ant-design-vue';
 import { notification as Notification } from 'ant-design-vue';
+import { useSystem } from '@/store/system';
 
 const emit = defineEmits(['update:modelValue', 'change']);
 
@@ -41,6 +42,10 @@ const props = defineProps({
     },
 });
 
+const paths: string = useSystem().$state.configInfo.paths?.[
+    'base-path'
+] as string;
+
 const value = ref(props.modelValue);
 const loading = ref(false);
 
@@ -58,11 +63,9 @@ const handleChange = async (info: UploadChangeParam) => {
     if (info.file.status === 'done') {
         loading.value = false;
         const result = info.file.response?.result;
-        const api: any = await querySystemApi(['paths']); // todo base-path在pinia获取系统配置的
-        const path = api.result[0]?.properties
-            ? api.result[0]?.properties['base-path']
-            : '';
-        const f = `${path}/file/${result.id}?accessKey=${result.others.accessKey}`;
+        const f = `${paths || ''}/file/${result.id}?accessKey=${
+            result.others.accessKey
+        }`;
         onlyMessage('上传成功！', 'success');
         value.value = f;
         emit('update:modelValue', f);
diff --git a/src/views/link/Protocol/Save/index.vue b/src/views/link/Protocol/Save/index.vue
index 832e8bc0..171c8b98 100644
--- a/src/views/link/Protocol/Save/index.vue
+++ b/src/views/link/Protocol/Save/index.vue
@@ -37,6 +37,7 @@
                     :disabled="!!id"
                     v-model:value="formData.type"
                     :options="options"
+                    :column="2"
                     @change="changeType"
                 />
             </j-form-item>