From f85bb9fc82ac5575ce6954d5a31206be817178e1 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Fri, 17 Mar 2023 09:54:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=90=E7=BB=B4=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=AE=A1=E7=90=86=E4=BF=AE=E5=A4=8D=E9=83=A8?=
 =?UTF-8?q?=E5=88=86bug=EF=BC=8C=E8=BF=9C=E7=A8=8B=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Collector/Point/Scan/Table.vue            |  8 ++--
 src/views/device/Firmware/Save/index.vue      |  2 +-
 .../Firmware/Task/Save/SelectDevices.vue      |  9 +++-
 src/views/device/Firmware/Task/index.vue      |  2 +-
 .../Certificate/Detail/CertificateFile.vue    | 44 +++++++++----------
 src/views/link/Certificate/Detail/index.vue   | 17 +++----
 src/views/link/Certificate/index.vue          |  6 ++-
 7 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/src/views/DataCollect/Collector/Point/Scan/Table.vue b/src/views/DataCollect/Collector/Point/Scan/Table.vue
index 9db4a2f3..6cb9accf 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Table.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Table.vue
@@ -225,9 +225,9 @@ const changeValue = (index: number, type: string) => {
     }
 };
 
-const changeCheckbox = (index: number, type: string) => {
+const changeCheckbox = async (index: number, type: string) => {
     // console.log(1, getTargetData(index, type).check,getTargetData(index, type));
-    //如果不使用setTimeout，会导致值更新不及时
+    //Dom未更新完成，需要用 setTimeout 或者 await nextTick() 处理
     setTimeout(() => {
         // console.log(2, getTargetData(index, type).check,getTargetData(index, type));
         let startIndex = 0;
@@ -235,8 +235,8 @@ const changeCheckbox = (index: number, type: string) => {
         const currentCheck = getTargetData(index, type).check;
         if (!currentCheck) return;
         for (let i = index; i >= 0; i--) {
-            const preDatCheck = getTargetData(i, type).check;
-            if (!preDatCheck) {
+            const preDataCheck = getTargetData(i, type).check;
+            if (!preDataCheck) {
                 startIndex = i;
                 break;
             }
diff --git a/src/views/device/Firmware/Save/index.vue b/src/views/device/Firmware/Save/index.vue
index df4b2730..00c7ef33 100644
--- a/src/views/device/Firmware/Save/index.vue
+++ b/src/views/device/Firmware/Save/index.vue
@@ -269,7 +269,7 @@ const validatorVersionOrder = async (_: Record<string, any>, value: string) => {
         if (value && !!signMethod && productId) {
             const res = await validateVersion(productId, value);
             if (res.status === 200) {
-                Promise.reject(res.result ? '版本序号已存在' : '');
+                return Promise.reject(res.result ? '版本序号已存在' : '');
             }
         }
     }
diff --git a/src/views/device/Firmware/Task/Save/SelectDevices.vue b/src/views/device/Firmware/Task/Save/SelectDevices.vue
index 0b8adf82..325bb871 100644
--- a/src/views/device/Firmware/Task/Save/SelectDevices.vue
+++ b/src/views/device/Firmware/Task/Save/SelectDevices.vue
@@ -22,7 +22,7 @@
         @cancel="handleCancel"
         @ok="handleOk"
     >
-        <Search
+        <pro-search
             :columns="columns"
             target="search"
             @search="handleSearch"
@@ -44,6 +44,7 @@
         >
             <template #headerTitle>
                 <j-checkbox
+                    v-if="checkAllData.length !== 0"
                     v-model:checked="state.checkAll"
                     :indeterminate="state.indeterminate"
                     @change="onCheckAllChange"
@@ -194,7 +195,11 @@ const onCheckAllChange = (e: any) => {
     _selectedRowKeys.value = state.checkedList;
 };
 
-const onSelectChange = (record: T[], selected: boolean, selectedRows: T[]) => {
+const onSelectChange = (
+    record: T[any],
+    selected: boolean,
+    selectedRows: T[any],
+) => {
     _selectedRowKeys.value = selected
         ? [...getSetRowKey(selectedRows)]
         : _selectedRowKeys.value.filter((item: T) => item !== record?.id);
diff --git a/src/views/device/Firmware/Task/index.vue b/src/views/device/Firmware/Task/index.vue
index 8308d7f4..480966c1 100644
--- a/src/views/device/Firmware/Task/index.vue
+++ b/src/views/device/Firmware/Task/index.vue
@@ -1,6 +1,6 @@
 <template>
     <page-container>
-        <Search :columns="columns" target="search" @search="handleSearch" />
+        <pro-search :columns="columns" target="search" @search="handleSearch" />
         <j-pro-table
             ref="tableRef"
             model="TABLE"
diff --git a/src/views/link/Certificate/Detail/CertificateFile.vue b/src/views/link/Certificate/Detail/CertificateFile.vue
index dbc1c8cf..f97176e5 100644
--- a/src/views/link/Certificate/Detail/CertificateFile.vue
+++ b/src/views/link/Certificate/Detail/CertificateFile.vue
@@ -1,39 +1,35 @@
 <template>
     <j-spin :spinning="loading">
-        <div>
-            <j-textarea
-                :rows="4"
-                @change="textChange"
-                v-model:value="keystoreBase64"
-                :placeholder="placeholder"
-            />
-            <j-upload
-                accept=".pem"
-                listType="text"
-                :action="NETWORK_CERTIFICATE_UPLOAD"
-                :headers="{
-                    [TOKEN_KEY]: LocalStore.get(TOKEN_KEY),
-                }"
-                :showUploadList="false"
-                @change="handleChange"
+        <j-textarea
+            :rows="4"
+            @change="textChange"
+            v-model:value="keystoreBase64"
+            :placeholder="placeholder"
+        />
+        <j-upload
+            accept=".pem"
+            listType="text"
+            :action="NETWORK_CERTIFICATE_UPLOAD"
+            :headers="{
+                [TOKEN_KEY]: LocalStore.get(TOKEN_KEY),
+            }"
+            :showUploadList="false"
+            @change="handleChange"
+        >
+            <j-button style="margin-top: 10px">
+                <AIcon type="UploadOutlined" />
+                上传文件</j-button
             >
-                <j-button style="margin-top: 10px">
-                    <upload-outlined />
-                    上传文件</j-button
-                >
-            </j-upload>
-        </div>
+        </j-upload>
     </j-spin>
 </template>
 
 <script setup lang="ts" name="CertificateFile">
-import { UploadOutlined } from '@ant-design/icons-vue';
 import { message } from 'ant-design-vue';
 import type { UploadChangeParam } from 'ant-design-vue';
 import { LocalStore } from '@/utils/comm';
 import { TOKEN_KEY } from '@/utils/variable';
 import { NETWORK_CERTIFICATE_UPLOAD } from '@/api/link/certificate';
-import type { UploadProps } from 'ant-design-vue';
 
 const emit = defineEmits(['update:modelValue', 'change']);
 
diff --git a/src/views/link/Certificate/Detail/index.vue b/src/views/link/Certificate/Detail/index.vue
index aa57ace0..e8e57fae 100644
--- a/src/views/link/Certificate/Detail/index.vue
+++ b/src/views/link/Certificate/Detail/index.vue
@@ -25,7 +25,6 @@
                                 </j-radio-button>
                             </j-radio-group>
                         </j-form-item>
-
                         <j-form-item
                             label="证书名称"
                             v-bind="validateInfos.name"
@@ -154,9 +153,9 @@ const onSubmit = () => {
             loading.value = true;
             const response =
                 id === ':id'
-                    ? await save(params)
-                    : await update({ ...params, id });
-            if (response.status === 200) {
+                    ? await save(params).catch(() => {})
+                    : await update({ ...params, id }).catch(() => {});
+            if (response?.status === 200) {
                 message.success('操作成功');
                 router.push('/iot/link/certificate');
             }
@@ -180,9 +179,9 @@ const handleChange = (info: UploadChangeParam) => {
 const detail = async (id: string) => {
     if (id !== ':id') {
         loading.value = true;
-        const res = await queryDetail(id);
+        const res: any = await queryDetail(id);
         if (res.success) {
-            const result = res.result as FormDataType;
+            const result: any = res.result;
             const type = result.type.value as TypeObjType;
             formData.value = {
                 ...result,
@@ -207,12 +206,6 @@ detail(id);
             height: 100%;
         }
     }
-    .form-upload-button {
-        margin-top: 10px;
-    }
-    .form-submit {
-        background-color: @primary-color !important;
-    }
 }
 
 .doc {
diff --git a/src/views/link/Certificate/index.vue b/src/views/link/Certificate/index.vue
index 7cb773ca..16a28c63 100644
--- a/src/views/link/Certificate/index.vue
+++ b/src/views/link/Certificate/index.vue
@@ -1,7 +1,11 @@
 <template>
     <page-container>
         <div>
-            <Search :columns="columns" target="search" @search="handleSearch" />
+            <pro-search
+                :columns="columns"
+                target="search"
+                @search="handleSearch"
+            />
             <j-pro-table
                 ref="tableRef"
                 model="TABLE"