Merge remote-tracking branch 'origin/dev' into dev

src/components/Table/index.tsx

@@ -337,6 +337,14 @@ const JTable = defineComponent<JTableProps>({
                                         rowSelection={props.rowSelection}
                                         scroll={props.scroll}
                                         v-slots={{
+                                            headerCell: (dt: Record<string, any>) => {
+                                                const { column, title } = dt;
+                                                if (column?.headerCell) {
+                                                    return slots?.[column?.headerCell]!(column.title)
+                                                } else {
+                                                    return title || ''
+                                                }
+                                            },
                                             bodyCell: (dt: Record<string, any>) => {
                                                 const { column, record } = dt;
                                                 if ((column?.key || column?.dataIndex) && column?.scopedSlots && (slots?.[column?.dataIndex] || slots?.[column?.key])) {

src/views/media/Cascade/Channel/index.vue

@@ -40,6 +40,16 @@
                     </a-popconfirm>
                 </a-space>
             </template>
+            <template #gbChannelIdHeader="title">
+                <a-tooltip
+                    title="国标级联有16位、20位两种格式。在当前页面修改不会修改视频设备-通道页面中的国标ID"
+                >
+                    <a-space>
+                        <span>{{ title }}</span>
+                        <AIcon type="InfoCircleOutlined" />
+                    </a-space>
+                </a-tooltip>
+            </template>
             <template #gbChannelId="slotProps">
                 <a-space>
                     <Ellipsis>
@@ -172,6 +182,7 @@ const columns = [
         dataIndex: 'gbChannelId',
         key: 'gbChannelId',
         scopedSlots: true,
+        headerCell: 'gbChannelIdHeader', // 表头单元格插槽
         search: {
             type: 'string',
         },