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

orion-ops-ui/src/components/view/chart/index.vue

@@ -6,13 +6,13 @@
 </template>
 
 <script lang="ts" setup>
-  import type { ECBasicOption } from 'echarts/types/src/util/types';
+  import type { EChartsOption } from 'echarts';
   import { computed, nextTick, ref } from 'vue';
   import { useAppStore } from '@/store';
   import VCharts from 'vue-echarts';
 
   const props = withDefaults(defineProps<{
-    options: ECBasicOption,
+    options: EChartsOption,
     autoResize: boolean,
     width: string,
     height: string,

orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue

@@ -207,7 +207,7 @@
 
 <script lang="ts" setup>
   import type { TableData } from '@arco-design/web-vue/es/table/interface';
-  import type { ExecLogQueryResponse,ExecLogQueryRequest } from '@/api/exec/exec-log';
+  import type { ExecLogQueryResponse, ExecLogQueryRequest } from '@/api/exec/exec-log';
   import { reactive, ref, onMounted, onUnmounted } from 'vue';
   import {
     batchDeleteExecCommandLog,
@@ -240,7 +240,7 @@
   const tableRef = ref();
   const selectedKeys = ref<number[]>([]);
   const tableRenderData = ref<ExecLogQueryResponse[]>([]);
-  const formModel = reactive<ExecLogQueryResponse>({
+  const formModel = reactive<ExecLogQueryRequest>({
     id: undefined,
     userId: undefined,
     description: undefined,

orion-ops-ui/src/views/exec/exec-job/components/exec-job-table.vue

@@ -109,8 +109,7 @@
       </template>
       <!-- 最近任务 -->
       <template #recentLog="{ record }">
-        <!-- 最近任务 -->
-        <div class="flex-center" v-if="record.recentLogId">
+        <div class="flex-center" v-if="record.recentLogId && record.recentLogStatus">
           <!-- 执行状态 -->
           <a-tag class="mr8" :color="getDictValue(execStatusKey, record.recentLogStatus, 'color')">
             {{ getDictValue(execStatusKey, record.recentLogStatus) }}