From 219c5214378b63bb0379aed2b2121b95360b662b Mon Sep 17 00:00:00 2001 From: wangdan-fit2cloud Date: Fri, 27 Oct 2023 17:49:06 +0800 Subject: [PATCH 01/18] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/components/back-button/index.vue | 25 ++++++++ .../content-container/LayoutContent.vue | 14 +++-- ui/src/components/index.ts | 3 +- ui/src/styles/app.scss | 22 +++++++ ui/src/styles/element-plus.scss | 5 +- ui/src/views/dataset/CreateDataset.vue | 56 ++++++++++++++--- ui/src/views/dataset/component/BaseForm.vue | 52 ++++++++++++++++ .../dataset/component/UploadDocument.vue | 60 +++++++++++++++++++ ui/src/views/dataset/index.vue | 27 +++++---- 9 files changed, 237 insertions(+), 27 deletions(-) create mode 100644 ui/src/components/back-button/index.vue create mode 100644 ui/src/views/dataset/component/BaseForm.vue create mode 100644 ui/src/views/dataset/component/UploadDocument.vue diff --git a/ui/src/components/back-button/index.vue b/ui/src/components/back-button/index.vue new file mode 100644 index 000000000..abaf1651d --- /dev/null +++ b/ui/src/components/back-button/index.vue @@ -0,0 +1,25 @@ + + + + + diff --git a/ui/src/components/content-container/LayoutContent.vue b/ui/src/components/content-container/LayoutContent.vue index 20db34851..c99e9064d 100644 --- a/ui/src/components/content-container/LayoutContent.vue +++ b/ui/src/components/content-container/LayoutContent.vue @@ -2,7 +2,8 @@
- {{ header }} + + {{ header }}
@@ -14,11 +15,16 @@ diff --git a/ui/src/components/index.ts b/ui/src/components/index.ts index 247f74e51..370f1a95a 100644 --- a/ui/src/components/index.ts +++ b/ui/src/components/index.ts @@ -7,7 +7,7 @@ import LayoutContent from './content-container/LayoutContent.vue' import TagsInput from './tags-input/index.vue' import CardBox from './card-box/index.vue' import CardAdd from './card-add/index.vue' - +import BackButton from './back-button/index.vue' export default { @@ -20,5 +20,6 @@ export default { app.component(TagsInput.name, TagsInput) app.component(CardBox.name, CardBox) app.component(CardAdd.name, CardAdd) + app.component(BackButton.name, BackButton) } } diff --git a/ui/src/styles/app.scss b/ui/src/styles/app.scss index 5437b05b9..c4488ac9e 100644 --- a/ui/src/styles/app.scss +++ b/ui/src/styles/app.scss @@ -144,6 +144,10 @@ h4 { text-align: right; } +.vertical-middle { + vertical-align: middle; +} + .border-b { border-bottom: 1px solid var(--el-border-color); } @@ -173,4 +177,22 @@ h4 { // 内容部分 自适应高度 .main-calc-height { height: calc(100vh - 125px); + box-sizing: border-box; +} + +// 标题前带竖线样式 +.title-decoration-1 { + position: relative; + padding-left: 15px; + &:before { + position: absolute; + left: 2px; + top: 50%; + transform: translate(-50%, -50%); + width: 4px; + height: 90%; + content: ''; + background: var(--el-color-primary); + border-radius: 10px; + } } diff --git a/ui/src/styles/element-plus.scss b/ui/src/styles/element-plus.scss index c98ca44b5..b6efe3b86 100644 --- a/ui/src/styles/element-plus.scss +++ b/ui/src/styles/element-plus.scss @@ -2,6 +2,10 @@ --el-menu-item-height: 45px; --el-text-color-primary: '#1F2329'; } + +.el-button { + padding: 5px 12px; +} .el-avatar { --el-avatar-bg-color: var(--el-color-primary); --el-avatar-size-small: 33px; @@ -41,7 +45,6 @@ } } - .el-message-box__content { padding: 24px; color: var(--el-text-color-primary); diff --git a/ui/src/views/dataset/CreateDataset.vue b/ui/src/views/dataset/CreateDataset.vue index 82884bc2c..438ff2b82 100644 --- a/ui/src/views/dataset/CreateDataset.vue +++ b/ui/src/views/dataset/CreateDataset.vue @@ -1,21 +1,59 @@ - + diff --git a/ui/src/views/dataset/component/BaseForm.vue b/ui/src/views/dataset/component/BaseForm.vue new file mode 100644 index 000000000..c2cdf882b --- /dev/null +++ b/ui/src/views/dataset/component/BaseForm.vue @@ -0,0 +1,52 @@ + + + diff --git a/ui/src/views/dataset/component/UploadDocument.vue b/ui/src/views/dataset/component/UploadDocument.vue new file mode 100644 index 000000000..c28da3657 --- /dev/null +++ b/ui/src/views/dataset/component/UploadDocument.vue @@ -0,0 +1,60 @@ + + + diff --git a/ui/src/views/dataset/index.vue b/ui/src/views/dataset/index.vue index 4546c71bb..4073426a6 100644 --- a/ui/src/views/dataset/index.vue +++ b/ui/src/views/dataset/index.vue @@ -55,8 +55,8 @@ import { ref, onMounted } from 'vue' import datasetApi from '@/api/dataset' import type { datasetListRequest } from '@/api/type/dataset' import { MsgSuccess, MsgConfirm } from '@/utils/message' -import { useRouter } from 'vue-router'; -const router = useRouter(); +import { useRouter } from 'vue-router' +const router = useRouter() const loading = ref(false) const filterText = ref('') @@ -68,20 +68,23 @@ const pageConfig = ref({ search_text: '' }) -function loadDataset() { } - +function loadDataset() {} function deleteDateset(row: any) { - MsgConfirm({ - title: `是否删除数据集:${row.name}?`, - decription: '此数据集关联2个应用,删除后无法恢复,请谨慎操作。', - confirmButtonText: '删除', - }, { - confirmButtonClass: 'danger', - }) + MsgConfirm( + { + title: `是否删除数据集:${row.name}?`, + decription: '此数据集关联2个应用,删除后无法恢复,请谨慎操作。', + confirmButtonText: '删除' + }, + { + confirmButtonClass: 'danger' + } + ) .then(() => { loading.value = true - datasetApi.delDateset(row.id) + datasetApi + .delDateset(row.id) .then(() => { MsgSuccess('删除成功') getList() From 34aad04edd2fe7e65e7f2f02b45096cfb5beb227 Mon Sep 17 00:00:00 2001 From: wangdan-fit2cloud Date: Thu, 2 Nov 2023 09:56:14 +0800 Subject: [PATCH 02/18] =?UTF-8?q?feat:=20=E5=88=9B=E5=BB=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/api/dataset.ts | 42 +++++++- ui/src/api/type/dataset.ts | 8 +- ui/src/components/card-add/index.vue | 2 +- ui/src/components/card-box/index.vue | 2 +- ui/src/stores/index.ts | 4 +- ui/src/stores/modules/dataset.ts | 26 +++++ ui/src/stores/modules/user.ts | 4 +- ui/src/styles/element-plus.scss | 6 ++ ui/src/views/dataset/CreateDataset.vue | 26 +++-- ui/src/views/dataset/component/BaseForm.vue | 15 ++- .../dataset/component/SegmentPreview.vue | 30 ++++++ ...UploadDocument.vue => UploadComponent.vue} | 18 ++-- ui/src/views/dataset/index.vue | 97 +++++++++---------- ui/src/views/dataset/step/SetRules.vue | 64 ++++++++++++ ui/src/views/dataset/step/UploadDocument.vue | 35 +++++++ 15 files changed, 299 insertions(+), 80 deletions(-) create mode 100644 ui/src/stores/modules/dataset.ts create mode 100644 ui/src/views/dataset/component/SegmentPreview.vue rename ui/src/views/dataset/component/{UploadDocument.vue => UploadComponent.vue} (80%) create mode 100644 ui/src/views/dataset/step/SetRules.vue create mode 100644 ui/src/views/dataset/step/UploadDocument.vue diff --git a/ui/src/api/dataset.ts b/ui/src/api/dataset.ts index ef5f09fb1..caee05921 100644 --- a/ui/src/api/dataset.ts +++ b/ui/src/api/dataset.ts @@ -32,9 +32,49 @@ const delDateset: (dataset_id: String) => Promise> = (dataset_id return del(`${prefix}/${dataset_id}`) } +/** + * 创建数据集 + * @param 参数 + * { + "name": "string", + "desc": "string", + "documents": [ + { + "name": "string", + "paragraphs": [ + { + "content": "string", + "title": "string", + "is_active": true, + "problem_list": [ + { + "id": "string", + "content": "string" + } + ] + } + ] + } + ] +} + */ +const postDateset: (data: any) => Promise> = (data) => { + return post(`${prefix}`, data) +} + +/** + * 分段预览(上传文档) + * @param 参数 file:file,limit:number,patterns:array,with_filter:boolean + */ +const postSplitDocument: (data: any) => Promise> = (data) => { + console.log(data) + return post(`${prefix}/document/split`, data) +} export default { getDateset, getAllDateset, - delDateset + delDateset, + postDateset, + postSplitDocument } diff --git a/ui/src/api/type/dataset.ts b/ui/src/api/type/dataset.ts index f8247e1ac..becec96d7 100644 --- a/ui/src/api/type/dataset.ts +++ b/ui/src/api/type/dataset.ts @@ -4,4 +4,10 @@ interface datasetListRequest { search_text: string } -export type { datasetListRequest } +interface datasetData { + name: String + desc: String + documents?: Array +} + +export type { datasetListRequest, datasetData } diff --git a/ui/src/components/card-add/index.vue b/ui/src/components/card-add/index.vue index c6f7673be..678322484 100644 --- a/ui/src/components/card-add/index.vue +++ b/ui/src/components/card-add/index.vue @@ -1,5 +1,5 @@