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

src/components/Player/ScreenPlayer.vue

@@ -123,7 +123,7 @@
                             @click="playerActive = index"
                         >
                             <div
-                                class="media-btn-refresh"
+                                class="media-btn-refresh refreshBtn"
                                 :style="{
                                     display: item.url ? 'block' : 'none',
                                 }"
@@ -464,4 +464,10 @@ defineExpose({
 :deep(.vjs-icon-spinner){
   display: none;
 }
+.refreshBtn{
+   opacity: 0;
+}
+.refreshBtn:hover{
+    opacity: 1;
+}
 </style>

src/views/device/Firmware/Task/Detail/index.vue

@@ -66,6 +66,7 @@
                     model="TABLE"
                     :columns="columns"
                     :request="history"
+                    :scroll="{ x: 1500 }"
                     :defaultParams="{
                         sorts: [{ name: 'createTime', order: 'desc' }],
                         terms: defaultParams,
@@ -74,9 +75,8 @@
                 >
                   <template #completeTime="slotProps">
                         <span>{{
-                            moment(slotProps.completeTime).format(
+                           slotProps?.completeTime ? moment(slotProps.completeTime).format(
-                              'YYYY-MM-DD HH:mm:ss',
+                              'YYYY-MM-DD HH:mm:ss') : ""
-                            )
                           }}</span>
                   </template>
                     <template #createTime="slotProps">

src/views/device/Firmware/index.vue

@@ -207,6 +207,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             popConfirm: {
                 title: '确认删除?',
                 okText: ' 确定',
+                placement: 'topLeft',
                 cancelText: '取消',
                 onConfirm: async () => {
                     handlDelete(data.id);

src/views/media/Cascade/index.vue

@@ -53,9 +53,9 @@
                         </template>
                         <template #content>
                             <Ellipsis style="width: calc(100% - 100px);">
-                            <h3 style="font-size: 16px;font-weight: 700;color: #315efb;">
+                            <span style="font-size: 16px;font-weight: 700">
                                 {{ slotProps.name }}
-                            </h3>
+                            </span>
                             </Ellipsis>
                             <p>通道数量：{{ slotProps.count || 0 }}</p>
                             <j-badge

src/views/media/Device/index.vue

@@ -47,9 +47,9 @@
                         </template>
                         <template #content>
                             <Ellipsis style="width: calc(100% - 100px);">
-                            <h3 style="font-size: 16px;font-weight: 700;color: #315efb;">
+                            <span style="font-size: 16px;font-weight: 700">
                                 {{ slotProps.name }}
-                            </h3>
+                            </span>
                             </Ellipsis>
                             <j-row>
                                 <j-col :span="12">