diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 000f6ac012..fa4d359aa5 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -1526,3 +1526,49 @@ div:focus {
background: rgba(51, 112, 255, 0.1) !important;
}
}
+
+.de-status {
+ position: relative;
+ margin-left: 15px;
+ &::before {
+ content: '';
+ position: absolute;
+ top: 50%;
+ left: -13px;
+ transform: translateY(-50%);
+ width: 5px;
+ height: 5px;
+ border-radius: 50%;
+ }
+}
+
+.de-Pending-result,
+.de-Underway-result {
+ &::before {
+ background: var(--deTextPlaceholder, #8f959e);
+ }
+}
+
+.de-Exec-result,
+.de-Underway-pre {
+ &::before {
+ background: var(--primary, #3370ff);
+ }
+}
+
+.de-Stopped-result,
+.de-Completed-pre {
+ &::before {
+ background: var(--deSuccess, #34C724);
+ }
+}
+
+.de-Error-pre {
+ &::before {
+ background: var(--deDanger, #F54A45);
+ }
+ .el-icon-s-order {
+ color: var(--primary, #3370ff);
+ cursor: pointer;
+ }
+}
diff --git a/frontend/src/views/dataset/add/AddApi.vue b/frontend/src/views/dataset/add/AddApi.vue
index a9436e8f4f..218ec5e87d 100644
--- a/frontend/src/views/dataset/add/AddApi.vue
+++ b/frontend/src/views/dataset/add/AddApi.vue
@@ -31,7 +31,12 @@
prefix-icon="el-icon-search"
clearable
/>
-
+
+
-
+
+
{
+ this.$refs.plxTable?.reloadData(datas)
+ })
})
.catch((err) => {
this.errMsg = true
@@ -747,7 +749,9 @@ export default {
.sql-dataset-drawer {
.el-drawer__body {
padding: 16px 24px;
- position: relative;
+ position: unset;
+ overflow-y: auto;
+ padding-bottom: 80px;
}
.el-date-editor {
diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue
index d35b7bcc97..1a8e0e2b76 100644
--- a/frontend/src/views/dataset/data/UpdateInfo.vue
+++ b/frontend/src/views/dataset/data/UpdateInfo.vue
@@ -71,7 +71,7 @@
{{
$t(`dataset.${scope.row.lastExecStatus.toLocaleLowerCase()}`)
}}
@@ -110,7 +110,7 @@
:label="$t('dataset.task.task_status')"
>
- {{ $t(`dataset.task.${scope.row.status.toLocaleLowerCase()}`) }}
@@ -223,23 +223,16 @@
- {{ $t('dataset.completed') }}
-
-
- {{ $t('dataset.underway') }}
-
-
- {{ $t('dataset.error') }}
-
-
+ {{
+ $t(`dataset.${scope.row.status.toLocaleLowerCase()}`)
+ }}
+
+
+ -
+
@@ -1165,61 +1158,4 @@ export default {
}
}
}
-
-
\ No newline at end of file
diff --git a/frontend/src/views/dataset/form.vue b/frontend/src/views/dataset/form.vue
index 507340230f..383d137111 100644
--- a/frontend/src/views/dataset/form.vue
+++ b/frontend/src/views/dataset/form.vue
@@ -25,7 +25,7 @@
class="table-num"
v-if="['db', 'excel', 'api'].includes(datasetType)"
>{{ $t('deDataset.selected') }} {{ tableNum }}
- {{ $t('deDataset.table') }}
{{
$t('commons.save')
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index e14574edbc..bbab6be283 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -305,7 +305,7 @@
@keypress.enter.native="saveGroup(groupForm)"
>
-
+
-
+
@@ -575,8 +575,15 @@
{{ $t('dataset.data_preview') }}
-
+
@@ -71,6 +71,9 @@
label-width="180px"
label-position="right"
>
+
+ 基本信息
+
type === ele.type ) || {}).name
this.$router.push({
path: '/ds-form',
- query: { type }
+ query: { type, name }
})
},
addFolderWithType(data) {
@@ -494,9 +495,10 @@ export default {
this.dialogTitle = this.$t('datasource.add_driver')
this.editDriver = true
} else {
+ const name = (this.dsTypes.find(ele => data.id === ele.type ) || {}).name
this.$router.push({
path: '/ds-form',
- query: { type: data.id }
+ query: { type: data.id, name }
})
}
},
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index 3c99b740f2..c6db0b4784 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -169,7 +169,7 @@
{{
$t(`dataset.${scope.row.lastExecStatus.toLocaleLowerCase()}`)
}}
@@ -209,7 +209,7 @@
:label="$t('dataset.task.task_status')"
>
- {{ $t(`dataset.task.${scope.row.status.toLocaleLowerCase()}`) }}
@@ -865,59 +865,4 @@ export default {
display: none !important;
}
}
-.de-status {
- position: relative;
- margin-left: 15px;
- &::before {
- content: "";
- position: absolute;
- top: 50%;
- left: -13px;
- transform: translateY(-50%);
- width: 5px;
- height: 5px;
- border-radius: 50%;
- }
-}
-
-.de-Completed {
- &::before {
- background: var(--deSuccess, #3370ff);
- }
-}
-
-.de-Underway {
- &::before {
- background: #8f959e;
- }
-}
-
-.de-Pending {
- &::before {
- background: #8f959e;
- }
-}
-
-.de-Exec {
- &::before {
- background: var(--primary, #3370ff);
- }
-}
-
-.de-Stopped {
- &::before {
- background: var(--deSuccess, #3370ff);
- }
-}
-
-.de-Error {
- &::before {
- background: var(--deDanger, #3370ff);
- }
-
- .el-icon-s-order {
- color: var(--primary, #3370ff);
- cursor: pointer;
- }
-}
\ No newline at end of file
diff --git a/frontend/src/views/system/task/TaskRecord.vue b/frontend/src/views/system/task/TaskRecord.vue
index da8f158aea..f26205b02d 100644
--- a/frontend/src/views/system/task/TaskRecord.vue
+++ b/frontend/src/views/system/task/TaskRecord.vue
@@ -98,7 +98,7 @@
{{ $t(`dataset.${scope.row.status.toLocaleLowerCase()}`) }}
@@ -593,60 +593,3 @@ span {
}
}
-