Operator task list 'execution' status issue

frontend/src/components/dataflow_config/dataAcquisition/formatConversion/newFormatConversion.vue

@@ -249,6 +249,19 @@
             </el-input>
           </el-form-item>
         </el-col>
+        <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
+          <el-form-item prop="skip_meta" class="mt-[12px]">
+            <template #label>
+              <p class="text-gray-500 text-xs">
+                {{ t("dataPipelines.skipMeta") }}
+              </p>
+            </template>
+            <el-radio-group v-model="form.skip_meta">
+              <el-radio :label="true">{{ t("dataPipelines.yes") }}</el-radio>
+              <el-radio :label="false">{{ t("dataPipelines.no") }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
 
@@ -285,6 +298,7 @@ const formLoading = ref(false);
 const userStore = useUserStore();
 // 表单
 const form = ref({
+  skip_meta: true,
   // from_format_types: null,
   // to_data_type: null,
 });

frontend/src/components/dataflow_config/dataflow/index.vue

@@ -151,10 +151,7 @@
 
                 <el-popconfirm
                   :title="
-                    scope.row.status === 'Failed' ||
-                    scope.row.status === 'Timeout' ||
-                    scope.row.status === 'Finished' ||
-                    scope.row.status === 'Canceled' ? `${t('dataPipelines.executeConfirm')}?` : `${t('dataPipelines.cancelExecute')}?`
+                    scope.row.status === 'Processing' ? `${t('dataPipelines.cancelExecute')}?` : `${t('dataPipelines.executeConfirm')}?`
                     "
                   :confirm-button-text="t('dataPipelines.confirm')"
                   :cancel-button-text="t('dataPipelines.cancel')"
@@ -164,12 +161,14 @@
                   <template #reference>
                     <el-button
                       type="text"
-                      class="flex items-center justify-start cursor-pointer"
+                      :class="[
+                        'flex items-center justify-start cursor-pointer',
+                        scope.row.status === 'Finished' ? 'text-gray-400' : ''
+                      ]"
+                      :disabled="scope.row.status === 'Finished'"
                     >
                       {{
-                        scope.row.status === 'Failed' ||
-                        scope.row.status === 'Timeout' ||
-                        scope.row.status === 'Finished' ? t("dataPipelines.execute") : t("dataPipelines.cancel")
+                        scope.row.status === 'Processing' ? t("dataPipelines.cancel") : t("dataPipelines.execute")
                       }}
                     </el-button>
                   </template>
@@ -275,8 +274,7 @@ const handleSearch = () => {
 };
 
 const openExecuteDialog = async (job_id, status) => {
-  if (status === 'Failed' || status === 'Timeout' || status === 'Finished') {
-    console.log('执行', job_id)
+  if (status === 'Failed' || status === 'Timeout' || status === 'Finished' || status === 'Queued') {
     const url = `/dataflow/jobs/job/execute/${job_id}`;
     const { data } = await useFetchApi(url).post().json();
     if (data.value.code === 200) {
@@ -395,6 +393,9 @@ onMounted(() => {
   .el-button--text {
     border: none;
   }
+  .el-button--text.is-disabled {
+    color: #9ca3af !important;
+  }
   .el-table__cell {
     font-size: 14px;
     color: #101828;

frontend/src/components/dataflow_config/newTask/ModelSelectItem.vue

@@ -0,0 +1,144 @@
+<template>
+  <div :class="[
+       `${repoType}-card`,
+       repoType === 'model' ? 'bg-gradient-to-r from-[#fafefe] to-white' : '',
+       repoType === 'dataset' ? 'bg-gradient-to-r from-[#fbfaff] to-white' : '',
+       repoType === 'code' ? 'bg-gradient-to-r from-[#F9FAFA] to-white' : ''
+     ]"
+     class="flex flex-col justify-between focus:outline focus:outline-4 focus:outline-gray-200 hover:shadow-md p-4 gap-1 md:w-full border border-gray-200 rounded-md flex-grow xl:basis-full min-w-[250px] xl:max-w-full h-fit  cursor-pointer"
+     :style="isCollection ? 'width:100%' : ''"
+  >
+    <div class="flex items-center justify-between mb-1 gap-2 w-full">
+      <SvgIcon v-if="repoType === 'model'" name="models" width="18" height="18" />
+      <SvgIcon v-if="repoType === 'dataset'" name="datasets" width="18" height="18" />
+      <SvgIcon v-if="repoType === 'code'" name="codes" width="18" height="18" />
+      <SvgIcon v-if="repoType === 'space'" name="spaces" width="18" height="18" />
+      <div :class="`${repoType}-path`"
+           class="text-sm font-medium text-gray-700 text-ellipsis overflow-hidden whitespace-nowrap w-full flex items-center gap-2"
+      >
+        <div :class="showNewTag ? 'max-w-[80%] overflow-hidden text-ellipsis' : 'w-full'">{{ getComputed.path }}</div>
+        <div v-if="showNewTag">
+          <el-tooltip :content="$t(`${repoType}s.newTips`)" placement="top">
+            <NewTag />
+          </el-tooltip>
+        </div>
+      </div>
+      <RepoItemSyncIcon
+        :source="repo.source"
+        :syncStatus="repo.sync_status"
+        :httpCloneUrl="repo.repository && repo.repository.http_clone_url"
+      />
+    </div>
+
+    <p v-if="getComputed.showDescription"
+      class="w-full min-h-[18px] leading-[18px] mb-1.5 text-gray-500 text-sm font-normal overflow-hidden text-ellipsis line-clamp-1 text-left"
+      :class="isCollection ? 'hidden' : ''"
+     >
+      {{ repo.description || '\u00A0' }}
+    </p>
+
+    <div class="flex flex-nowrap overflow-hidden text-ellipsis items-center gap-2 text-xs text-gray-500">
+      <span v-if="getComputed.taskTag"
+            class="w-fit xl:max-w-full overflow-hidden text-ellipsis whitespace-nowrap flex items-center gap-1"
+      >
+            <img v-if="getComputed.taskTagIconPath && taskTagIconExists" :src="getComputed.taskTagIconPath" class="w-3 h-3 text-gray-500 filter-gray" alt="" />
+            {{ getComputed.taskTag }}
+      </span>
+
+      <span v-if="getComputed.taskTag">
+        <SvgIcon name="vertical_divider" />
+      </span>
+
+      <div class="overflow-hidden text-ellipsis whitespace-nowrap flex gap-1 items-center">
+        <SvgIcon name="clock" />
+        {{$t('all.lastTime')}}：{{ repo.updated_at.substring(0, 10) }}
+      </div>
+
+      <template v-if="getComputed.visibility">
+        <span> <SvgIcon name="vertical_divider" /> </span>
+        <span class="visibility-label">{{ getComputed.visibility }}</span>
+      </template>
+
+      <span> <SvgIcon name="vertical_divider" /> </span>
+
+      <span class="whitespace-nowrap flex gap-1 items-center">
+        <SvgIcon name="download2" />
+        {{ repo.downloads }}
+      </span>
+    </div>
+  </div>
+</template>
+
+<script setup>
+  import RepoItemSyncIcon from '../../shared/RepoItemSyncIcon.vue';
+  import { computed, ref, watch } from 'vue'
+  import { useI18n } from 'vue-i18n'
+  import NewTag from '../../shared/NewTag.vue'
+  import { isWithinTwoWeeks } from '../../../packs/datetimeUtils'
+
+  const props = defineProps({
+    repo: Object,
+    repoType: String,
+    isCollection: Boolean,
+    cardType: {
+      type: String,
+      default: 'index'
+    }
+  })
+  const { t, locale } = useI18n()
+  const taskTagIconExists = ref(false)
+  const showNewTag = computed(() => {
+    return ((props.repoType === 'model' || props.repoType === 'dataset')) && (isWithinTwoWeeks(props.repo.created_at) || isWithinTwoWeeks(props.repo.updated_at));
+  });
+
+  const getComputed = computed(() => {
+    const path = props.repo.path
+
+    const visibility = props.repo.private ? t('all.private') : ''
+    const showDescription = props.cardType === 'index' || !!props.repo.description?.trim()
+
+    const taskTagObj = (props.repo.tags || []).find(tag => tag.category === "task")
+    let taskTag = null
+    if (taskTagObj) {
+      if (locale.value === 'en') {
+        taskTag = taskTagObj["name"].replace(/-/g, ' ')
+      } else {
+        taskTag = taskTagObj["show_name"]
+      }
+
+      // 获取标签对应的图标路径，图标文件名与标签名完全一致
+      const taskTagIconPath = taskTagObj.name ? `/images/tags/${taskTagObj.name}.svg` : null
+      return { path, visibility, taskTag, showDescription, taskTagIconPath }
+    }
+
+    return { path, visibility, taskTag: null, showDescription, taskTagIconPath: null }
+
+  })
+
+  // 检查图标是否存在的函数
+  const checkIconExists = (iconPath) => {
+    if (!iconPath) {
+      taskTagIconExists.value = false
+      return
+    }
+
+    const img = new Image()
+    img.onload = () => { 
+      taskTagIconExists.value = true 
+    }
+    img.onerror = () => { 
+      taskTagIconExists.value = false 
+    }
+    img.src = iconPath
+  }
+
+  watch(() => getComputed.value.taskTagIconPath, (newIconPath) => {
+    checkIconExists(newIconPath)
+  }, { immediate: true }) // immediate: true to run on initial load
+</script>
+
+<style scoped>
+.filter-gray {
+  filter: invert(56%) sepia(11%) saturate(207%) hue-rotate(176deg) brightness(93%) contrast(84%);
+}
+</style>

frontend/src/components/dataflow_config/newTask/index.vue

@@ -677,10 +677,13 @@
           <div
             v-for="model in modelList"
             :key="model.id"
-            @click="selectModel(model)"
-            class="cursor-pointer model-select-item"
+            @click="!modelValidating && selectModel(model)"
+            :class="[
+              'model-select-item',
+              modelValidating ? 'cursor-not-allowed opacity-60' : 'cursor-pointer'
+            ]"
           >
-            <repo-item
+            <ModelSelectItem
               :repo="model"
               repo-type="model"
             />
@@ -720,7 +723,7 @@
   import Sortable from 'sortablejs'
   import { useI18n } from 'vue-i18n'
   import { Search } from '@element-plus/icons-vue'
-  import RepoItem from '../../shared/RepoItem.vue'
+  import ModelSelectItem from './ModelSelectItem.vue'
   import CsgPagination from '../../shared/CsgPagination.vue'
 
   const userStore = useUserStore()
@@ -1135,6 +1138,11 @@
 
   // 选择模型
   const selectModel = async (model) => {
+    // 正在验证中
+    if (modelValidating.value) {
+      return
+    }
+
     if (!currentSelectModelItem.value) {
       return
     }

frontend/src/locales/en_js/datapipelines.js

@@ -13,6 +13,9 @@ export const dataPipelines = {
   "sourceFormat": "Source Format",
   "targetFormat": "Target Format",
   "dataFlowBranch": "Data Flow Branch",
+  "skipMeta": "Generate Meta File",
+  "yes": "Yes",
+  "no": "No",
   "startExecution": "Start Execution",
   "searchTaskName": "Search Task Name",
   "confirmTermination": "Confirm Termination",

frontend/src/locales/zh_hant_js/datapipelines.js

@@ -13,6 +13,9 @@ export const dataPipelines = {
   "sourceFormat": "來源格式",
   "targetFormat": "目標格式",
   "dataFlowBranch": "資料流向分支",
+  "skipMeta": "是否生成Meta文件",
+  "yes": "是",
+  "no": "否",
   "startExecution": "開始執行",
   "searchTaskName": "搜尋任務名稱",
   "confirmTermination": "確認終止",

frontend/src/locales/zh_js/datapipelines.js

@@ -13,6 +13,9 @@ export const dataPipelines = {
   "sourceFormat": "源格式",
   "targetFormat": "目标格式",
   "dataFlowBranch": "数据流向分支",
+  "skipMeta": "是否生成Meta文件",
+  "yes": "是",
+  "no": "否",
   "startExecution": "开始执行",
   "searchTaskName": "搜索任务名称",
   "confirmTermination": "确认终止",