Skip to content

P
poc-fe
Commit cc524aea authored by nick zheng's avatar nick zheng
Browse files
Options

Merge branch 'beta' into 'master' 

chore: 应用设置目录调整

See merge request !96
parents 3afaed6c fb9c501e
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 42 deletions
src/views/personal-space/personal-app-setting/components/config/config.vue 0 → 100644
View file @ cc524aea
<script setup lang="ts">
import Setting from './setting/setting.vue'
import Preview from './preview/preview.vue'
</script>
<template>
<div class="flex h-full w-full flex-1">
<Setting />
<Preview />
</div>
</template>
src/views/personal-space/personal-app-setting/components/memory-preview-modal.vue → src/views/personal-space/personal-app-setting/components/config/preview/components/memory-preview-modal.vue
View file @ cc524aea
......@@ -3,7 +3,7 @@ import { usePersonalAppConfigStore } from '@/store/modules/personal-app-config'
import { Close, Delete } from '@icon-park/vue-next'
import { DataTableColumns } from 'naive-ui'
import { ref, watch } from 'vue'
import { MemoryVariableForm } from './memory-variable-modal.vue'
import { MemoryVariableForm } from '../../components/memory-variable-modal.vue'
import { useI18n } from 'vue-i18n'
import {
fetchDeleteAllLongMemory,
......
src/views/personal-space/personal-app-setting/components/app-preview.vue → src/views/personal-space/personal-app-setting/components/config/preview/preview.vue
View file @ cc524aea
<script setup lang="ts">
import { computed, inject, onMounted, onUnmounted, ref, shallowRef } from 'vue'
import Preamble from './preamble.vue'
import Preamble from './components/preamble.vue'
import { useI18n } from 'vue-i18n'
import { useRouter } from 'vue-router'
import { Emitter } from 'mitt'
import { Howl } from 'howler'
import MessageList from './message-list.vue'
import FooterInput from './footer-input.vue'
import MessageList from './components/message-list.vue'
import FooterInput from './components/footer-input.vue'
import { fetchCreateContinueQuestions } from '@/apis/agent-application'
import { usePersonalAppConfigStore } from '@/store/modules/personal-app-config'
import { useSystemLanguageStore } from '@/store/modules/system-language'
import { Brain, Down } from '@icon-park/vue-next'
import MemoryPreviewModal from './memory-preview-modal.vue'
import MemoryPreviewModal from './components/memory-preview-modal.vue'
import { validBrowser } from '@/utils/browser-detection'
const { t } = useI18n()
......
src/views/personal-space/personal-app-setting/components/agent-associated-knowledge.vue → src/views/personal-space/personal-app-setting/components/config/setting/components/agent-associated-knowledge.vue
View file @ cc524aea
......@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n'
import { Plus, RightOne } from '@icon-park/vue-next'
import { fetchGetKnowledgeListByKdIds } from '@/apis/knowledge'
import AssociatedKnowledgeModal from './associated-knowledge-modal.vue'
import { KnowledgeItem } from '../../personal-knowledge/types'
import { KnowledgeItem } from '@/views/personal-space/personal-knowledge/types'
import { PersonalAppConfigState } from '@/store/types/personal-app-config'
const { t } = useI18n()
......
src/views/personal-space/personal-app-setting/components/agent-memory-setting.vue → src/views/personal-space/personal-app-setting/components/config/setting/components/agent-memory-setting.vue
View file @ cc524aea
......@@ -2,7 +2,7 @@
import { onMounted, ref } from 'vue'
import { useI18n } from 'vue-i18n'
import { Plus, Help, MoreOne, Edit, Copy, ReduceOne, RightOne } from '@icon-park/vue-next'
import MemoryVariableModal, { MemoryVariableForm } from './memory-variable-modal.vue'
import MemoryVariableModal, { MemoryVariableForm } from '../../components/memory-variable-modal.vue'
import { VariableStructureItem } from '@/store/types/personal-app-config'
import { copyToClip } from '@/utils/copy'
......
src/views/personal-space/personal-app-setting/components/agent-model-setting.vue → src/views/personal-space/personal-app-setting/components/config/setting/components/agent-model-setting.vue
View file @ cc524aea
......@@ -4,11 +4,14 @@ import { SelectOption } from 'naive-ui'
import { useI18n } from 'vue-i18n'
import { Help, Down } from '@icon-park/vue-next'
import { PersonalAppConfigState } from '@/store/types/personal-app-config'
import { useSystemLanguageStore } from '@/store/modules/system-language'
import { DiversityModeItem, diversityModeList } from '@/data/agent-setting-data'
import { fetchGetLargeModelInfo, fetchGetLargeModelList } from '@/apis/agent-application'
const { t } = useI18n()
const systemLanguageStore = useSystemLanguageStore()
let modalListOptions = reactive<SelectOption[]>([])
let modalListRenderLabel: (option: SelectOption) => VNodeChild
......@@ -17,6 +20,13 @@ const commModelConfig = defineModel<PersonalAppConfigState['commModelConfig']>('
const currentLargeModelIcon = ref('')
const currentDiversityMode = ref('balance')
const modelSettingWidth = ref(systemLanguageStore.currentLanguageInfo.key === 'en' ? '508px' : '420px')
const sliderLabelWidth = ref(systemLanguageStore.currentLanguageInfo.key === 'en' ? '158px' : '105px')
const isEnLanguage = computed(() => {
return systemLanguageStore.currentLanguageInfo.key === 'en'
})
const isDisabledCommModelConfig = computed(() => {
return currentDiversityMode.value !== 'custom'
})
......@@ -107,7 +117,7 @@ function handleDiversityModeChange(diversityModeItem: DiversityModeItem) {
<template>
<div>
<NPopover placement="bottom" trigger="click" style="width: 420px">
<NPopover placement="bottom" trigger="click" :style="{ width: modelSettingWidth }">
<template #trigger>
<div
class="hover:border-theme-color flex cursor-pointer items-center justify-between rounded-md border border-[#d4d6d9] px-3 py-[7px]"
......@@ -119,11 +129,14 @@ function handleDiversityModeChange(diversityModeItem: DiversityModeItem) {
<Down theme="outline" size="16" fill="#333" class="ml-1.5 text-base outline-none" />
</div>
</template>
<div class="mb-2 mt-[6px] flex items-center">
<div class="flex items-center" :class="isEnLanguage ? 'my-[18px] justify-between' : 'mb-2 mt-1.5 justify-start'">
<span class="font-500 mr-3 text-sm text-[#151b26]">
{{ t('personal_space_module.agent_module.agent_setting_module.agent_config_module.question_answer_model') }}
</span>
<span class="rounded bg-[#f2f5f9] px-1 text-xs text-[#5c5f66]">
<span
class="rounded-theme bg-[#f2f5f9] text-xs text-[#5c5f66]"
:class="isEnLanguage ? 'px-[13px] py-2' : 'px-1'"
>
{{
t('personal_space_module.agent_module.agent_setting_module.agent_config_module.question_answer_model_desc')
}}
......@@ -141,7 +154,7 @@ function handleDiversityModeChange(diversityModeItem: DiversityModeItem) {
<span>
{{ t('personal_space_module.agent_module.agent_setting_module.agent_config_module.generate_diversity') }}
</span>
<ul class="rounded-theme mt-2 grid grid-cols-4 overflow-hidden">
<ul class="rounded-theme grid grid-cols-4 overflow-hidden" :class="isEnLanguage ? 'mt-3' : 'mt-2'">
<li
v-for="(diversityModeItem, index) in diversityModeList"
:key="index"
......@@ -159,8 +172,8 @@ function handleDiversityModeChange(diversityModeItem: DiversityModeItem) {
</div>
<div class="mt-4 text-xs">
<div class="mb-2.5 flex h-[34px] items-center justify-between">
<div class="flex w-[105px] items-center">
<div class="flex h-[34px] items-center justify-between" :class="isEnLanguage ? 'mb-3.5' : 'mb-2.5'">
<div class="flex items-center" :style="{ width: sliderLabelWidth }">
<span>
{{ t('personal_space_module.agent_module.agent_setting_module.agent_config_module.topP') }}
</span>
......@@ -202,12 +215,12 @@ function handleDiversityModeChange(diversityModeItem: DiversityModeItem) {
:max="1"
:disabled="isDisabledCommModelConfig"
size="small"
class="w-[90px]! text-xs!"
class="common-model-config-input-number w-[90px]!"
/>
</div>
<div class="mb-2.5 flex h-[34px] items-center justify-between">
<div class="flex w-[105px] items-center">
<div class="flex h-[34px] items-center justify-between" :class="isEnLanguage ? 'mb-3.5' : 'mb-2.5'">
<div class="flex items-center" :style="{ width: sliderLabelWidth }">
<span>
{{ t('personal_space_module.agent_module.agent_setting_module.agent_config_module.temperature') }}
</span>
......@@ -251,12 +264,12 @@ function handleDiversityModeChange(diversityModeItem: DiversityModeItem) {
:max="1"
:disabled="isDisabledCommModelConfig"
size="small"
class="w-[90px]! text-xs!"
class="common-model-config-input-number w-[90px]!"
/>
</div>
<div class="mb-2.5 flex h-[34px] items-center justify-between">
<div class="flex w-[105px] items-center">
<div class="flex h-[34px] items-center justify-between" :class="isEnLanguage ? 'mb-3.5' : 'mb-2.5'">
<div class="flex items-center" :style="{ width: sliderLabelWidth }">
<span>
{{ t('personal_space_module.agent_module.agent_setting_module.agent_config_module.communication_turn') }}
</span>
......@@ -296,7 +309,7 @@ function handleDiversityModeChange(diversityModeItem: DiversityModeItem) {
:min="0"
:max="100"
size="small"
class="w-[90px]!"
class="common-model-config-input-number w-[90px]!"
placeholder=""
/>
</div>
......@@ -312,4 +325,10 @@ function handleDiversityModeChange(diversityModeItem: DiversityModeItem) {
border-radius: 6px;
}
}
.common-model-config-input-number {
:deep(.n-input__input) {
font-size: 12px;
}
}
</style>
src/views/personal-space/personal-app-setting/components/agent-role-setting.vue → src/views/personal-space/personal-app-setting/components/config/setting/components/agent-role-setting.vue
View file @ cc524aea
......@@ -4,7 +4,7 @@ import { storeToRefs } from 'pinia'
import { useI18n } from 'vue-i18n'
import { Plus, RightOne, MoreOne, Edit, ReduceOne } from '@icon-park/vue-next'
import TimbreSettingModal from './timbre-setting-modal.vue'
import { TimbreLanguageInfoItem } from '../types'
import { TimbreLanguageInfoItem } from '../../types'
import { usePersonalAppConfigStore } from '@/store/modules/personal-app-config'
import { fetchGetTimbreInfoDetail } from '@/apis/timber'
......
src/views/personal-space/personal-app-setting/components/associated-knowledge-modal.vue → src/views/personal-space/personal-app-setting/components/config/setting/components/associated-knowledge-modal.vue
View file @ cc524aea
......@@ -10,7 +10,7 @@ import { KnowledgeDocumentItem, KnowledgeItem } from '@/views/personal-space/per
import { formatDateTime } from '@/utils/date-formatter'
import CreateKnowledgeModal, {
KnowledgeFormDataInterface,
} from '../../personal-knowledge/components/create-knowledge-modal.vue'
} from '@/views/personal-space/personal-knowledge/components/create-knowledge-modal.vue'
interface Props {
isShowModal: boolean
......
src/views/personal-space/personal-app-setting/components/timbre-setting-modal.vue → src/views/personal-space/personal-app-setting/components/config/setting/components/timbre-setting-modal.vue
View file @ cc524aea
......@@ -6,7 +6,7 @@ import { Howl } from 'howler'
import { useSystemLanguageStore } from '@/store/modules/system-language'
import CustomModal from '@/components/custom-modal/custom-modal.vue'
import { fetchGetTimbreList } from '@/apis/timber'
import { TimbreLanguageInfoItem, TimbreInfoItem } from '../types'
import { TimbreLanguageInfoItem, TimbreInfoItem } from '../../types'
import { validBrowser } from '@/utils/browser-detection'
interface Props {
......
src/views/personal-space/personal-app-setting/components/app-setting.vue → src/views/personal-space/personal-app-setting/components/config/setting/setting.vue
View file @ cc524aea
......@@ -8,8 +8,8 @@ import { useThrottleFn } from '@vueuse/core'
import CustomIcon from '@/components/custom-icon/custom-icon.vue'
import { Help, People, RightOne } from '@icon-park/vue-next'
import UploadImage from '@/components/upload-image/upload-image.vue'
import AutoConfigModal from './auto-config-modal.vue'
import OptimizeSystemModal from './optimize-system-modal.vue'
import AutoConfigModal from './components/auto-config-modal.vue'
import OptimizeSystemModal from './components/optimize-system-modal.vue'
import { usePersonalAppConfigStore } from '@/store/modules/personal-app-config'
import { PersonalAppConfigState } from '@/store/types/personal-app-config'
import {
......@@ -20,11 +20,11 @@ import {
fetchSaveAgentApplication,
} from '@/apis/agent-application'
import { fetchCustomEventSource } from '@/composables/useEventSource'
import AgentModelSetting from './agent-model-setting.vue'
import AgentAssociatedKnowledge from './agent-associated-knowledge.vue'
import AgentMemorySetting from './agent-memory-setting.vue'
import AgentDialogueSetting from './agent-dialogue-setting.vue'
import AgentRoleSetting from './agent-role-setting.vue'
import AgentModelSetting from './components/agent-model-setting.vue'
import AgentAssociatedKnowledge from './components/agent-associated-knowledge.vue'
import AgentMemorySetting from './components/agent-memory-setting.vue'
import AgentDialogueSetting from './components/agent-dialogue-setting.vue'
import AgentRoleSetting from './components/agent-role-setting.vue'
const { t } = useI18n()
......
src/views/personal-space/personal-app-setting/components/app-publish.vue → src/views/personal-space/personal-app-setting/components/publish/publish.vue
View file @ cc524aea
......@@ -2,21 +2,19 @@
import { useRouter } from 'vue-router'
import { useI18n } from 'vue-i18n'
import { Computer, PreviewOpen, AllApplication, SettingOne } from '@icon-park/vue-next'
import useTableScrollY from '@/composables/useTableScrollY'
import { copyToClip } from '@/utils/copy'
import { formatDateTime } from '@/utils/date-formatter'
import { ref, watch } from 'vue'
import { PersonalAppConfigState } from '@/store/types/personal-app-config'
import SaleApplicationsConfigurationModal from '../../personal-app/sale-applications-configuration-modal.vue'
import SaleApplicationsConfigurationModal from '@/views/personal-space/personal-app/sale-applications-configuration-modal.vue'
import {
fetchGetApplicationInfo,
fetchGetApplicationMallInfo,
fetchRemoveSalePublishApplication,
} from '@/apis/agent-application'
import { defaultPersonalAppConfigState, usePersonalAppConfigStore } from '@/store/modules/personal-app-config'
import { ApplicationMallInfo } from '../../personal-app/types'
import { ApplicationMallInfo } from '../../../personal-app/types'
const { t } = useI18n()
......
src/views/personal-space/personal-app-setting/personal-app-setting.vue
View file @ cc524aea
......@@ -3,10 +3,9 @@ import { inject, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
import { useRouter } from 'vue-router'
import { Emitter } from 'mitt'
import { useI18n } from 'vue-i18n'
import PageNarBar from './components/page-narbar.vue'
import AppSetting from './components/app-setting.vue'
import AppPreview from './components/app-preview.vue'
import AppPublish from './components/app-publish.vue'
import PageNarBar from './components/page-narBar/page-narBar.vue'
import AgentConfig from './components/config/config.vue'
import AgentPublish from './components/publish/publish.vue'
import { usePersonalAppConfigStore } from '@/store/modules/personal-app-config'
import { PersonalAppConfigState } from '@/store/types/personal-app-config'
import { fetchGetDebugApplicationInfo } from '@/apis/agent-application'
......@@ -79,13 +78,11 @@ function handleChangeAgentAppTabKey(currentTabKey: string) {
<div class="h-content flex w-full flex-1">
<div v-if="currentAgentAppTabKey === 'config'" class="flex h-full w-full flex-1">
<AppSetting />
<AppPreview />
<AgentConfig />
</div>
<div v-if="currentAgentAppTabKey === 'publish'" class="flex h-full w-full flex-1">
<AppPublish />
<AgentPublish />
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment