Skip to content

Commit 3618aa2

Browse files
z275748353张龙彬LP-J
authored
Operator task list 'execution' status issue (#1454)
* add dataflow * add dataflow * remove antv/x6/lib/registry package * Fix bugs * Fix bugs * add package * add package * add zhHantOps * 1.Adjust the image path for operator management 2.Add permission judgment on whether to display the menu in operator management * Operator Management: Modification of dataflow/operator/ interface * 1.Add the cancellation of execution for internationalization and status verification 2.If a user has no organization or no authorized operators, all public operators will be queried by default * 1.Add the cancellation of execution for internationalization and status verification 2.If a user has no organization or no authorized operators, all public operators will be queried by default * 1.Add the cancellation of execution for internationalization and status verification 2.If a user has no organization or no authorized operators, all public operators will be queried by default * Add newly developed operators, internationalize tools, and supplement the internationalization of statistics. * Add newly developed operators, internationalize tools, and supplement the internationalization of statistics. * 1.Add template deletion function 2.Celery node deletion (admin only, offline status) 3.Block the option of creating tool operators, set tools as default 4.Internationalization update * Fix the bug of dataflow with ID #36 * Fix the bug of dataflow with ID OpenCSGs/csghub-dataflow#31 * Fix the bug of dataflow with ID OpenCSGs/csghub-dataflow#43 * Fix the bug of dataflow with ID OpenCSGs/csghub-dataflow#34 * 1.Fixed the issue where modifying the custom template operator name does not take effect, and added an internationalized name subtitle. 1.Added internationalization to the description of the keyword filtering operator. * 1.Add horizontal and vertical alignment guides for operator task flow filling. 2.Select PDF for format conversion and add the Mineru Backend field. 3.Add model selection and corresponding internationalization to the MD-to-JSONL tool. 4.Implement internationalization for the existing auxiliary reminder words in operator configuration. * 1. When dealing with operator overlap, there may be duplicate connection issues 2. Add internationalization to the generate_code_qa_cir_mapper configuration item * Problem handling of model path display * 1.Add a field for "whether to generate a meta file" and corresponding internationalization support in format conversion. 2.Add a model selection list component. * Operator task list 'execution' status issue --------- Co-authored-by: 张龙彬 <[email protected]> Co-authored-by: Jilp <[email protected]>
1 parent 7fa0de5 commit 3618aa2

File tree

1 file changed

+11
-10
lines changed
  • frontend/src/components/dataflow_config/dataflow

1 file changed

+11
-10
lines changed

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,7 @@
151151

152152
<el-popconfirm
153153
:title="
154-
scope.row.status === 'Failed' ||
155-
scope.row.status === 'Timeout' ||
156-
scope.row.status === 'Finished' ||
157-
scope.row.status === 'Canceled' ? `${t('dataPipelines.executeConfirm')}?` : `${t('dataPipelines.cancelExecute')}?`
154+
scope.row.status === 'Processing' ? `${t('dataPipelines.cancelExecute')}?` : `${t('dataPipelines.executeConfirm')}?`
158155
"
159156
:confirm-button-text="t('dataPipelines.confirm')"
160157
:cancel-button-text="t('dataPipelines.cancel')"
@@ -164,12 +161,14 @@
164161
<template #reference>
165162
<el-button
166163
type="text"
167-
class="flex items-center justify-start cursor-pointer"
164+
:class="[
165+
'flex items-center justify-start cursor-pointer',
166+
scope.row.status === 'Finished' ? 'text-gray-400' : ''
167+
]"
168+
:disabled="scope.row.status === 'Finished'"
168169
>
169170
{{
170-
scope.row.status === 'Failed' ||
171-
scope.row.status === 'Timeout' ||
172-
scope.row.status === 'Finished' ? t("dataPipelines.execute") : t("dataPipelines.cancel")
171+
scope.row.status === 'Processing' ? t("dataPipelines.cancel") : t("dataPipelines.execute")
173172
}}
174173
</el-button>
175174
</template>
@@ -275,8 +274,7 @@ const handleSearch = () => {
275274
};
276275
277276
const openExecuteDialog = async (job_id, status) => {
278-
if (status === 'Failed' || status === 'Timeout' || status === 'Finished') {
279-
console.log('执行', job_id)
277+
if (status === 'Failed' || status === 'Timeout' || status === 'Finished' || status === 'Queued') {
280278
const url = `/dataflow/jobs/job/execute/${job_id}`;
281279
const { data } = await useFetchApi(url).post().json();
282280
if (data.value.code === 200) {
@@ -395,6 +393,9 @@ onMounted(() => {
395393
.el-button--text {
396394
border: none;
397395
}
396+
.el-button--text.is-disabled {
397+
color: #9ca3af !important;
398+
}
398399
.el-table__cell {
399400
font-size: 14px;
400401
color: #101828;

0 commit comments

Comments
 (0)