From 9bd3a53b7fe9ba105093b78aed5e495787c42dc8 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Fri, 14 Jul 2023 13:47:38 +0800
Subject: [PATCH] fix: bug#16329

---
 src/views/media/Cascade/Channel/index.vue               | 6 +++---
 src/views/notice/Config/Detail/components/EditTable.vue | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/media/Cascade/Channel/index.vue b/src/views/media/Cascade/Channel/index.vue
index d6a47db1..18877f32 100644
--- a/src/views/media/Cascade/Channel/index.vue
+++ b/src/views/media/Cascade/Channel/index.vue
@@ -43,7 +43,7 @@
                         </j-space>
                     </j-tooltip>
                 </template>
-                <template #channelId="slotProps">
+                <template #gbChannelId="slotProps">
                     <div style="display: flex; align-items: center;">
                         <Ellipsis style="width: 150px">
                             {{ slotProps.gbChannelId }}
@@ -180,8 +180,8 @@ const columns = [
     },
     {
         title: '国标ID',
-        dataIndex: 'channelId',
-        key: 'channelId',
+        dataIndex: 'gbChannelId',
+        key: 'gbChannelId',
         scopedSlots: true,
         width: 200,
         headerCell: 'gbChannelIdHeader', // 表头单元格插槽
diff --git a/src/views/notice/Config/Detail/components/EditTable.vue b/src/views/notice/Config/Detail/components/EditTable.vue
index cee3652a..3edb6a90 100644
--- a/src/views/notice/Config/Detail/components/EditTable.vue
+++ b/src/views/notice/Config/Detail/components/EditTable.vue
@@ -77,7 +77,7 @@ const handleHeader= (data:any) =>{
     })
 }
 const dataSource = reactive({
-    table:props.headers.length > 0 ? handleHeader(props.headers) : ''
+    table:props.headers.length > 0 ? handleHeader(props.headers) : []
 });
 
 watch(()=>JSON.stringify(props.headers),()=>{
@@ -102,12 +102,17 @@ const handleAdd = () => {
 };
 const validate = () =>{
    return new Promise((resolve:any,reject:any)=>{
-    tableRef.value.validate().then(()=>{
+    if(dataSource.table){
+        tableRef.value.validate().then(()=>{
         valueChange()
         resolve(data.value)
     }).catch((err:any)=>{
+        console.log(err);
         reject(false)
     })
+    }else{
+        resolve([])
+    }
    })
 }
 defineExpose({