From 4b6dad1f0b7be7ce1354fa2e5cf3f385734c89f8 Mon Sep 17 00:00:00 2001 From: wujingjing <gersonwu@qq.com> Date: 星期五, 08 十一月 2024 11:19:17 +0800 Subject: [PATCH] 操作 bug --- src/components/drawer/CustomDrawer.vue | 240 ++++++++++++++++++++++++++---------------------------------- 1 files changed, 104 insertions(+), 136 deletions(-) diff --git a/src/components/drawer/CustomDrawer.vue b/src/components/drawer/CustomDrawer.vue index 05156ab..e6f1c27 100644 --- a/src/components/drawer/CustomDrawer.vue +++ b/src/components/drawer/CustomDrawer.vue @@ -1,64 +1,50 @@ <template> <div class="relative h100" v-loading="loadingData" :style="`width: ${rightBox}px;transition: 0.7s ease-in;`"> - <div class="retract_icon" @click="toggleShow"> + <div class="retract_icon" @click="toggleShow" v-if="!isSharePage"> <i class="text-[#fff] transition-all" :class="isShow ? 'ywifont ywicon-zuoyoujiantou1' : 'ywifont ywicon-zuoyoujiantou'"></i> </div> <div class="pc-mouldboard column exampleSlide"> <div class="header flex items-center justify-center"> - <div - class="box-border flex w-[203px] h-[32px] rounded-md items-center justify-between cursor-pointer relative border border-solid border-[#2c2d33]" - > - <div - class="tabbar-item" - :class="state.activeName === item.ID ? 'set-tabbar-active' : ''" - @click="handleTabClick(item)" - v-for="item in state.tabNameList" - :key="item.ID" - > - {{ item.Name }} - </div> - </div> <i class="ywifont ywicon-guanbi text-[#999] text-[18px] absolute right-[14px] top-5 cursor-pointer" @click="handleCloseTemplate" ></i> </div> - <div class="box-border w-[354px] flex-1 min-h-0 bg-[#e0e7fb]" v-show="state.activeName == 1"> - <div class="flex flex-col w100 h100 pt-0 pr-[15px] pb-0 pl-[20px] overflow-auto"> + <div class="box-border w-[354px] flex-1 min-h-0 bg-[#e0e7fb]" v-show="activeGroupType == '涓氬姟鍦烘櫙'"> + <div class="flex flex-col w100 h100 pt-0 pr-[15px] pb-0 pl-[20px]"> <div class="flex items-center w100 h-[30px] border border-solid border-[#b2b2b2] transition-[border-color 1s] rounded-2xl"> <el-input v-model="queryParams.sample_title" placeholder="鎼滅储鏇村" class="set-input" :prefix-icon="Search" clearable> </el-input> </div> - <div class="mt20 w100 relative" v-show="state.customBusinessList.length > 0"> + <div class="mt10 w100 h100 relative" v-show="state.customBusinessList.length > 0"> <div class="set_custom_label"> <div class="chanel-tags"> <div v-for="(item, index) in state.customBusinessList" :key="index" :class="{ 'set-group-label-active': state.activeBusinessName === item.group_id }" - class="flex items-center" + class="flex items-center border border-solid border-[#b2b2b2] rounded-xl mx-[3px] leading-6" @click="handleBusinessClick(item)" > - <span class="set-group-name">{{ item.group_name }}</span - ><el-divider direction="vertical" /> + <span class="set-group-name">{{ item.group_name }}</span> </div> </div> </div> <div - class="overflow-hidden min-h-[43px] transition-[max-height 0.2s] w100 flex flex-wrap text-xs leading-[14px] items-center pt-2" + class="overflow-hidden min-h-[34px] transition-[max-height 0.2s] w100 flex flex-wrap text-xs leading-[14px] items-center bg-[#f5f7fd]" > <div v-for="(itemChildren, index) in state.customBusinessChildList" :key="index" :class="{ 'set-label-active': state.activeBusinessChildName === itemChildren.group_id }" @click="handleLabelChildClick(itemChildren)" - class="cursor-pointer m-[5px] py-[5px] pl-[10px] pr-[14px] rounded-xl border border-solid border-[#b2b2b2] bg-[#e0e7f] text-[#4c4c4c] transition-[background-color .1s, color .1s, border-color .1s]" + class="cursor-pointer m-[5px] py-[5px] pl-[10px] rounded-xl border transition-[background-color .1s, color .1s, border-color .1s] text-[#999]" > {{ itemChildren.group_name }} </div> </div> - <div class="mt20 w100" v-show="finalSampleList.length > 0"> + <div class="mt10 overflow-auto set-height-custom" v-show="finalSampleList.length > 0"> <div class="w100 pb-[20px]" v-for="item in finalSampleList" :key="item.sample_id"> <div class="cursor-pointer flex box-border p-[12px] w100 rounded bg-[#f5f7fd] transition-[background-color .2s]" @@ -77,51 +63,50 @@ </div> </div> </div> - <div class="mt20 w100" v-show="finalSampleList.length == 0"><el-empty description="鏆傛棤鏁版嵁" /></div> + <div class="mt10 w100" v-show="finalSampleList.length == 0"><el-empty description="鏆傛棤鏁版嵁" /></div> </div> </div> </div> - <div class="box-border w-[354px] flex-1 min-h-0 bg-[#e0e7fb]" v-show="state.activeName == 2"> - <div class="flex flex-col w100 h100 pt-0 pr-[15px] pb-0 pl-[20px] overflow-auto"> + <div class="box-border w-[354px] flex-1 min-h-0 bg-[#e0e7fb]" v-show="activeGroupType == '鍔炲叕鍔╂墜'"> + <div class="flex flex-col w100 h100 pt-0 pr-[15px] pb-0 pl-[20px]"> <div class="flex items-center w100 h-[30px] border border-solid border-[#b2b2b2] transition-[border-color 1s] rounded-2xl"> - <el-input v-model="officeParams.template_title" placeholder="鎼滅储鏇村" class="set-input" :prefix-icon="Search" clearable> + <el-input v-model="officeParams.sample_title" placeholder="鎼滅储鏇村" class="set-input" :prefix-icon="Search" clearable> </el-input> </div> - <div class="mt20 w100 relative" v-show="state.customOfficeList.length > 0"> + <div class="mt10 w100 relative h100" v-show="state.customOfficeList.length > 0"> <div class="set_custom_label"> <div class="chanel-tags"> <div v-for="(item, index) in state.customOfficeList" :key="index" :class="{ 'set-group-label-active': state.activeOfficeName === item.group_id }" - class="flex items-center" + class="flex items-center border border-solid border-[#b2b2b2] rounded-xl mx-[3px] leading-6" @click="handleOfficeClick(item)" > - <span class="set-group-name">{{ item.group_name }}</span - ><el-divider direction="vertical" /> + <span class="set-group-name">{{ item.group_name }}</span> </div> </div> </div> <div - class="overflow-hidden min-h-[43px] transition-[max-height 0.2s] w100 flex flex-wrap text-xs leading-[14px] items-center pt-2" + class="overflow-hidden min-h-[34px] transition-[max-height 0.2s] w100 flex flex-wrap text-xs leading-[14px] items-center bg-[#f5f7fd]" > <div v-for="(itemChildren, index) in state.customOfficeChildList" :key="index" :class="{ 'set-label-active': state.activeOfficeChildName === itemChildren.group_id }" @click="handleOfficeChildClick(itemChildren)" - class="cursor-pointer m-[5px] py-[5px] pl-[10px] pr-[14px] rounded-xl border border-solid border-[#b2b2b2] bg-[#e0e7f] text-[#4c4c4c] transition-[background-color .1s, color .1s, border-color .1s]" + class="cursor-pointer m-[5px] py-[5px] pl-[10px] text-[#999] transition-[background-color .1s, color .1s, border-color .1s]" > {{ itemChildren.group_name }} </div> </div> - <div class="mt20 w100"> - <div class="w100 pb-[20px] flex overflow-auto flex-col" v-for="item in finalOfficeList" :key="item.group_id"> + <div class="mt10 w100 overflow-auto set-height-custom"> + <div class="w100 pb-[20px] flex flex-col" v-for="item in finalOfficeList" :key="item.sample_id"> <div class="bg-[#f5f7fd] p-[12px] transition-[background-color .2s] flex flex-col rounded-2xl"> <div class="flex justify-between"> - <span class="set-title">{{ item.template_title }}</span> + <span class="set-title">{{ item.sample_title }}</span> </div> - <div class="example-body ellipsis">{{ item.template_value }}</div> + <div class="example-body ellipsis">{{ item.sample_question }}</div> <div class="example-bottom"> <span class="example-item">{{ item.template_type }}</span> <el-button type="primary" class="set-button" @click="templateUseClick(item)">浣跨敤</el-button> @@ -132,41 +117,40 @@ </div> </div> </div> - <div class="box-border w-[354px] flex-1 min-h-0 bg-[#e0e7fb]" v-show="state.activeName == 3"> - <div class="flex flex-col w100 h100 pt-0 pr-[15px] pb-0 pl-[20px] overflow-auto"> + <div class="box-border w-[354px] flex-1 min-h-0 bg-[#e0e7fb]" v-show="activeGroupType == '鐭ヨ瘑搴�'"> + <div class="flex flex-col w100 h100 pt-0 pr-[15px] pb-0 pl-[20px]"> <div class="flex items-center w100 h-[30px] border border-solid border-[#b2b2b2] transition-[border-color 1s] rounded-2xl"> - <el-input v-model="queryParams.sample_title" placeholder="鎼滅储鏇村" class="set-input" :prefix-icon="Search" clearable> + <el-input v-model="knowledgeParams.sample_title" placeholder="鎼滅储鏇村" class="set-input" :prefix-icon="Search" clearable> </el-input> </div> - <div class="mt20 w100 relative" v-show="state.knowledgeBaseList.length > 0"> + <div class="mt10 w100 relative h100" v-show="state.knowledgeBaseList.length > 0"> <div class="set_custom_label"> <div class="chanel-tags"> <div v-for="(item, index) in state.knowledgeBaseList" :key="index" :class="{ 'set-group-label-active': state.activeKnowledgeName === item.group_id }" - class="flex items-center" + class="flex items-center border border-solid border-[#b2b2b2] rounded-xl mx-[3px] leading-6" @click="handleKnowledgeClick(item)" > - <span class="set-group-name">{{ item.group_name }}</span - ><el-divider direction="vertical" /> + <span class="set-group-name">{{ item.group_name }}</span> </div> </div> </div> <div - class="overflow-hidden min-h-[43px] transition-[max-height 0.2s] w100 flex flex-wrap text-xs leading-[14px] items-center pt-2" + class="overflow-hidden min-h-[34px] transition-[max-height 0.2s] w100 flex flex-wrap text-xs leading-[14px] items-center bg-[#f5f7fd]" > <div v-for="(itemChildren, index) in state.customKnowledgeChildList" :key="index" :class="{ 'set-label-active': state.activeKnowledgeChildName === itemChildren.group_id }" @click="handleKnowledgeChildClick(itemChildren)" - class="cursor-pointer m-[5px] py-[5px] pl-[10px] pr-[14px] rounded-xl border border-solid border-[#b2b2b2] bg-[#e0e7f] text-[#4c4c4c] transition-[background-color .1s, color .1s, border-color .1s]" + class="cursor-pointer m-[5px] py-[5px] pl-[10px] text-[#999] transition-[background-color .1s, color .1s, border-color .1s]" > {{ itemChildren.group_name }} </div> </div> - <div class="mt20 w100" v-show="finalKnowledgeList.length > 0"> + <div class="mt10 w100 overflow-auto set-height-custom" v-show="finalKnowledgeList.length > 0"> <div class="w100 pb-[20px]" v-for="item in finalKnowledgeList" :key="item.sample_id"> <div class="cursor-pointer flex box-border p-[12px] w100 rounded bg-[#f5f7fd] transition-[background-color .2s]" @@ -185,11 +169,11 @@ </div> </div> </div> - <div class="mt20 w100" v-show="finalKnowledgeList.length == 0"><el-empty description="鏆傛棤鏁版嵁" /></div> + <div class="mt10 w100" v-show="finalKnowledgeList.length == 0"><el-empty description="鏆傛棤鏁版嵁" /></div> </div> </div> </div> - <el-dialog v-model="state.useInstructDialog" :title="state.instructInfo?.template_title" width="500" :before-close="handleClose"> + <el-dialog v-model="state.useInstructDialog" :title="state.instructInfo?.sample_title" width="500" :before-close="handleClose"> <el-input v-model="state.inputInstruct" :rows="10" type="textarea"></el-input> <template #footer> <div class="dialog-footer"> @@ -205,18 +189,21 @@ <script setup lang="ts"> import { Search } from '@element-plus/icons-vue'; import { computed, reactive, ref, watch } from 'vue'; -import { getSectionList, getSelectSample, getUserTemplateList } from '/@/api/ai/chat'; import { useSearch } from '/@/hooks/useSearch'; -import { activeRoomId, activeSampleId, activeSectionAId, sectionAList, setRoomConfig } from '/@/stores/chatRoom'; +import { + activeGroupType, + activeRoomId, + activeSampleId, + activeSectionAId, + exampleSceneList, + isSharePage, + sceneGroupList, + sectionAList, + setRoomConfig, +} from '/@/stores/chatRoom'; import { convertListToTree, debounce } from '/@/utils/util'; import { OptClassificationMap, classificationEnum } from '/@/views/types/processDrawing/index'; let state = reactive({ - tabNameList: [ - { ID: 1, Name: '涓氬姟鍦烘櫙' }, - { ID: 2, Name: '鍔炲叕鍔╂墜' }, - { ID: 3, Name: '鐭ヨ瘑搴�' }, - ], - activeName: 1, activeBusinessName: '', //鍦烘櫙 activeBusinessChildName: '', customBusinessList: [], @@ -235,9 +222,6 @@ exampleRandomContent: [], exampleContent: [], listSampleLoading: false, - listInstructLoading: false, - listSampleExpand: false, - listInstructExpand: false, }); //#region ====================== 浼犲弬 ====================== const isShow = defineModel('isShow', { @@ -251,28 +235,9 @@ const exampleList = ref([]); //绀轰緥鍒楄〃 //鑾峰彇妯$増鍒楄〃 const getSelectListSample = async () => { - state.listSampleLoading = true; - const res = await getSelectSample({}).finally(() => { - state.listSampleLoading = false; - }); - state.exampleRandomContent = res.samples; - const array = []; - res.samples.forEach((sample, index) => { - sample.Icon = '/static/images/wave/ChatImg.png'; - sample.BgColor = randomHexColor(); - if (index < 4) { - array.push(sample); - } - }); - exampleList.value = res.samples; - state.exampleContent = array; + exampleList.value = exampleSceneList.value; }; -//闅忔満鐢熸垚棰滆壊 -const randomHexColor = () => { - return `#${Math.floor(Math.random() * 16777215) - .toString(16) - .padEnd(6, '0')}`; -}; + const changeExample = (item) => { emit('updateChatInput', item.sample_question); setRoomConfig(activeRoomId.value, 'isAnswerByLLM', false); @@ -281,24 +246,11 @@ }; //鑾峰彇鐢ㄦ埛妯℃澘 const getUserTemplate = async () => { - state.listInstructLoading = true; - const res = await getUserTemplateList().finally(() => { - state.listInstructLoading = false; - }); - instructContentList.value = res.templates; + instructContentList.value = exampleSceneList.value; }; //#endregion //#region ====================== 榛樿閫夋嫨绗竴涓殑鍦烘櫙鐨勫瓙鍦烘櫙 ====================== -//tags鏍囩鍒囨崲 -const handleTabClick = async (item) => { - state.activeName = item.ID; - if (state.activeName == 2) { - if (state.listInstructExpand) return; - await getUserTemplate(); - state.listInstructExpand = true; - } - tagListClick(sectionAList.value); -}; + //鍦烘櫙瀛愬満鏅� const handleBusinessClick = (item) => { state.activeBusinessName = item.group_id; @@ -353,7 +305,6 @@ }; //鑾峰彇涓诲満鏅垪琛� const getMainSectionList = async () => { - const res = await getSectionList(); const iconList = [ 'biaodan', 'putong', @@ -365,10 +316,10 @@ 'jinridaiban', 'gongju', ]; - res.groups.forEach((sectionItem, index) => { + await sceneGroupList.value.forEach((sectionItem, index) => { sectionItem.Icon = iconList[index]; }); - sectionAList.value = res.groups; + sectionAList.value = sceneGroupList.value; tagListClick(sectionAList.value); }; const loadingData = ref(false); @@ -378,10 +329,8 @@ await getMainSectionList().finally(() => { loadingData.value = false; }); - if (state.activeName == 1 || state.activeName == 3) { - if (state.listSampleExpand) return; + if (activeGroupType.value == '涓氬姟鍦烘櫙' || activeGroupType.value == '鐭ヨ瘑搴�') { await getSelectListSample(); - state.listSampleExpand = true; } } }; @@ -390,7 +339,7 @@ const templateUseClick = (row) => { state.useInstructDialog = true; state.instructInfo = row; - state.inputInstruct = row.template_value; + state.inputInstruct = row.sample_question; }; const handleClose = () => { state.useInstructDialog = false; @@ -419,24 +368,24 @@ ); //鍔炲叕 const officeParams = ref({ - template_title: '', + sample_title: '', }); const { query: queryInstruct, queryData: showInstructList } = useSearch(instructContentList, officeParams); const finalOfficeList = computed(() => { - const result = showInstructList.value.filter((item) => item.template_group == state.activeOfficeChildName); + const result = showInstructList.value.filter((item) => item.group_id == state.activeOfficeChildName); return result ?? []; }); const instructQuery = debounce(queryInstruct); watch( - () => officeParams.value.template_title, + () => officeParams.value.sample_title, (val) => { instructQuery(); } ); //鐭ヨ瘑搴� const knowledgeParams = ref({ - template_title: '', + sample_title: '', }); const { query: queryKnowledge, queryData: showKnowledgeList } = useSearch(exampleList, knowledgeParams); const finalKnowledgeList = computed(() => { @@ -446,7 +395,7 @@ const knowledgeQuery = debounce(queryKnowledge); watch( - () => officeParams.value.template_title, + () => knowledgeParams.value.sample_title, (val) => { knowledgeQuery(); } @@ -472,39 +421,39 @@ officeList.push(item); } }); - switch (state.activeName) { - case 1: + switch (activeGroupType.value) { + case '涓氬姟鍦烘櫙': const treeBusinessList = convertListToTree(businessList, { ID: 'group_id', Children: 'Children', ParentID: 'p_group_id', }); - state.customBusinessList = treeBusinessList; //涓氬姟鍦烘櫙鏁版嵁婧� - state.activeBusinessName = treeBusinessList[0].group_id; //榛樿閫変腑绗竴涓笟鍔″満鏅� - state.customBusinessChildList = treeBusinessList[0].Children; //榛樿閫変腑绗竴涓笟鍔″満鏅殑绗竴涓瓙鍦烘櫙鐨勬暟鎹簮 - state.activeBusinessChildName = treeBusinessList[0].Children[0].group_id; + state.customBusinessList = treeBusinessList ?? []; //涓氬姟鍦烘櫙鏁版嵁婧� + state.activeBusinessName = treeBusinessList[0]?.group_id; //榛樿閫変腑绗竴涓笟鍔″満鏅� + state.customBusinessChildList = treeBusinessList[0]?.Children; //榛樿閫変腑绗竴涓笟鍔″満鏅殑绗竴涓瓙鍦烘櫙鐨勬暟鎹簮 + state.activeBusinessChildName = treeBusinessList[0]?.Children[0]?.group_id; break; - case 2: + case '鍔炲叕鍔╂墜': const treeOfficeList = convertListToTree(officeList, { ID: 'group_id', Children: 'Children', ParentID: 'p_group_id', }); - state.customOfficeList = treeOfficeList; //鍔炲叕鍔╂墜鏁版嵁婧� - state.activeOfficeName = treeOfficeList[0].group_id; //榛樿閫変腑绗竴涓姙鍏姪鎵� - state.customOfficeChildList = treeOfficeList[0].Children; //榛樿閫変腑绗竴涓姙鍏姪鎵嬬殑绗竴涓瓙鍦烘櫙鐨勬暟鎹簮 - state.activeOfficeChildName = treeOfficeList[0].Children[0].group_id; //榛樿閫変腑绗竴涓姙鍏姪鎵嬬殑绗竴涓瓙鍦烘櫙 + state.customOfficeList = treeOfficeList ?? []; //鍔炲叕鍔╂墜鏁版嵁婧� + state.activeOfficeName = treeOfficeList[0]?.group_id; //榛樿閫変腑绗竴涓姙鍏姪鎵� + state.customOfficeChildList = treeOfficeList[0]?.Children; //榛樿閫変腑绗竴涓姙鍏姪鎵嬬殑绗竴涓瓙鍦烘櫙鐨勬暟鎹簮 + state.activeOfficeChildName = treeOfficeList[0]?.Children[0]?.group_id; //榛樿閫変腑绗竴涓姙鍏姪鎵嬬殑绗竴涓瓙鍦烘櫙 break; - case 3: + case '鐭ヨ瘑搴�': const treeTagList = convertListToTree(selectTagList, { ID: 'group_id', Children: 'Children', ParentID: 'p_group_id', }); - state.knowledgeBaseList = treeTagList; //鐭ヨ瘑搴撴暟鎹簮 - state.activeKnowledgeName = treeTagList[0].group_id; //榛樿閫変腑绗竴涓煡璇嗗簱 - state.customKnowledgeChildList = treeTagList[0].Children; //榛樿閫変腑绗竴涓煡璇嗗簱鐨勭涓�涓瓙鍦烘櫙鐨勬暟鎹簮 - state.activeKnowledgeChildName = treeTagList[0].Children[0].group_id; //榛樿閫変腑绗竴涓煡璇嗗簱鐨勭涓�涓瓙鍦烘櫙 + state.knowledgeBaseList = treeTagList ?? []; //鐭ヨ瘑搴撴暟鎹簮 + state.activeKnowledgeName = treeTagList[0]?.group_id; //榛樿閫変腑绗竴涓煡璇嗗簱 + state.customKnowledgeChildList = treeTagList[0]?.Children; //榛樿閫変腑绗竴涓煡璇嗗簱鐨勭涓�涓瓙鍦烘櫙鐨勬暟鎹簮 + state.activeKnowledgeChildName = treeTagList[0]?.Children[0]?.group_id; //榛樿閫変腑绗竴涓煡璇嗗簱鐨勭涓�涓瓙鍦烘櫙 break; } } else { @@ -524,6 +473,20 @@ }; //#endregion +watch( + () => activeGroupType.value, + async (val) => { + if (val == '鍔炲叕鍔╂墜') { + await getUserTemplate(); + } else { + await getSelectListSample(); + } + tagListClick(sectionAList.value); + }, + { + immediate: true, + } +); defineExpose({ getTableData }); </script> <style scoped lang="scss"> @@ -536,9 +499,9 @@ z-index: 100; } .set_custom_label { - min-height: 38px; + min-height: 32px; box-sizing: border-box; - background-color: #f2f4f8; + // background-color: #f2f4f8; border-bottom: 1px solid #eee; .chanel-tags { width: 100%; @@ -548,16 +511,17 @@ display: flex; flex-wrap: wrap; line-height: 26px; - padding: 6px; - color: #4c4c4c; + color: #999; cursor: pointer; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; box-sizing: border-box; height: 100%; .set-group-name { margin: 0px 7px; white-space: nowrap; + // border: 1px solid #999; + // border-radius: 0.75rem; + // padding: 0 6px; + // line-height: 22px; } } } @@ -586,7 +550,7 @@ font-size: 14px; -webkit-animation: right-c650b75e 0.2s; animation: right-c650b75e 0.2s; - + overflow: hidden; .header { box-sizing: border-box; width: 100%; @@ -595,7 +559,7 @@ position: relative; } .tabbar-item { - width: 108px; + width: 78px; height: 30px; font-size: 13px; font-weight: 400; @@ -642,12 +606,11 @@ max-height: 180px; } .set-group-label-active { - border-color: #1c86ff; - color: #1c86ff; + border-color: #161616; + color: #000; } .set-label-active { - border-color: #1c86ff; - background-color: #ccdcfb; + // background-color: #ccdcfb; color: #1c86ff; } .example-body { @@ -673,6 +636,7 @@ -webkit-box-pack: justify; -ms-flex-pack: justify; justify-content: space-between; + overflow: hidden; .example-item { background-color: #f0f2f3; color: #8b939e; @@ -704,5 +668,9 @@ -webkit-box-direction: normal; -ms-flex-direction: column; flex-direction: column; + overflow: hidden; +} +.set-height-custom { + height: calc(100% - 120px); } </style> -- Gitblit v1.9.3