diff --git a/ui/src/api/dataset.ts b/ui/src/api/dataset.ts index 9247e4e4a..a75b0a254 100644 --- a/ui/src/api/dataset.ts +++ b/ui/src/api/dataset.ts @@ -2,6 +2,7 @@ import { Result } from '@/request/Result' import { get, post, del, put } from '@/request/index' import type { datasetData } from '@/api/type/dataset' import type { pageRequest } from '@/api/type/common' +import { type Ref } from 'vue' const prefix = '/dataset' /** @@ -23,8 +24,8 @@ const getDateset: (param: pageRequest) => Promise> = (param) => { * 获取全部数据集 * @param 参数 */ -const getAllDateset: () => Promise> = () => { - return get(`${prefix}`) +const getAllDateset: (loading?: Ref) => Promise> = (loading) => { + return get(`${prefix}`, undefined, loading) } /** diff --git a/ui/src/components/card-checkbox/index.vue b/ui/src/components/card-checkbox/index.vue index 7d4e9f408..bf8fc431b 100644 --- a/ui/src/components/card-checkbox/index.vue +++ b/ui/src/components/card-checkbox/index.vue @@ -1,51 +1,90 @@ diff --git a/ui/src/components/dynamics-form/items/radio/RadioCard.vue b/ui/src/components/dynamics-form/items/radio/RadioCard.vue index 6029b90b7..492cff408 100644 --- a/ui/src/components/dynamics-form/items/radio/RadioCard.vue +++ b/ui/src/components/dynamics-form/items/radio/RadioCard.vue @@ -70,8 +70,8 @@ watch( .active { border-radius: 4px; - background: rgba(51, 112, 255, 0.1); - color: #3370ff; + background: var(--el-color-primary-light-9); + color: var(--el-color-primary); } .item { cursor: pointer; diff --git a/ui/src/components/dynamics-form/items/table/TableCheckbox.vue b/ui/src/components/dynamics-form/items/table/TableCheckbox.vue index 4a51f2131..8c26ae9dc 100644 --- a/ui/src/components/dynamics-form/items/table/TableCheckbox.vue +++ b/ui/src/components/dynamics-form/items/table/TableCheckbox.vue @@ -205,7 +205,7 @@ const activeText = computed(() => { color: rgba(100, 106, 115, 1); .active { margin-left: 3px; - color: rgba(51, 112, 255, 1); + color: var(--el-color-primary); } } diff --git a/ui/src/components/dynamics-form/items/table/TableRadio.vue b/ui/src/components/dynamics-form/items/table/TableRadio.vue index c9230ef96..63d58cc87 100644 --- a/ui/src/components/dynamics-form/items/table/TableRadio.vue +++ b/ui/src/components/dynamics-form/items/table/TableRadio.vue @@ -193,7 +193,7 @@ const activeText = computed(() => { color: rgba(100, 106, 115, 1); .active { margin-left: 3px; - color: rgba(51, 112, 255, 1); + color: var(--el-color-primary); } } diff --git a/ui/src/stores/modules/dataset.ts b/ui/src/stores/modules/dataset.ts index 0ea9217ca..ca4219b86 100644 --- a/ui/src/stores/modules/dataset.ts +++ b/ui/src/stores/modules/dataset.ts @@ -2,6 +2,7 @@ import { defineStore } from 'pinia' import type { datasetData } from '@/api/type/dataset' import type { UploadUserFile } from 'element-plus' import datasetApi from '@/api/dataset' +import { type Ref } from 'vue' export interface datasetStateTypes { baseInfo: datasetData | null @@ -21,10 +22,10 @@ const useDatasetStore = defineStore({ saveDocumentsFile(file: UploadUserFile[]) { this.documentsFiles = file }, - async asyncGetAllDateset() { + async asyncGetAllDateset(loading?: Ref) { return new Promise((resolve, reject) => { datasetApi - .getAllDateset() + .getAllDateset(loading) .then((data) => { resolve(data) }) diff --git a/ui/src/views/application/CreateAndSetting.vue b/ui/src/views/application/CreateAndSetting.vue index 98f15cf32..cf9b0cdf1 100644 --- a/ui/src/views/application/CreateAndSetting.vue +++ b/ui/src/views/application/CreateAndSetting.vue @@ -155,7 +155,14 @@ - + {{ datasetLoading }} + diff --git a/ui/src/views/template/component/CreateModel.vue b/ui/src/views/template/component/CreateModel.vue index 978224100..336285497 100644 --- a/ui/src/views/template/component/CreateModel.vue +++ b/ui/src/views/template/component/CreateModel.vue @@ -191,7 +191,7 @@ defineExpose({ open, close }) line-height: 24px; cursor: pointer; &:hover { - color: rgba(51, 112, 255, 1); + color: var(--el-color-primary); } } .active-breadcrumb {