Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

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',
+        dataIndex: 'gbChannelId',
-        key: 'channelId',
+        key: 'gbChannelId',
         scopedSlots: true,
         width: 200,
         headerCell: 'gbChannelIdHeader', // 表头单元格插槽

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({