解决合并冲突

src/views/chat/index.vue

@@ -431,7 +431,7 @@ function handleEdit(index: number) {
 		return h(NInput, {
 			value: editedMessage.value,
 			type: "textarea",
-			autosize: { minRows: 1, maxRows: 8 },
+			autosize: { minRows: 1, maxRows: 12 },
 			showCount: true,
 			"onUpdate:value": (v: string) => {
 				editedMessage.value = v;
@@ -441,6 +441,7 @@ function handleEdit(index: number) {
 
 	dialog.warning({
 		title: t("common.edit"),
+		style: { width: "1000px" },
 		content: inputNode,
 		positiveText: t("common.yes"),
 		negativeText: t("common.no"),

src/views/mj/aiGptInput.vue

@@ -354,7 +354,7 @@ function handleClear() {
 		>
 			<div class="top-bar" v-if="!isMobile">
 				<div class="left" v-if="st">
-					<!-- <div
+					<div
 						v-if="homeStore.myData.local != 'draw'"
 						class="chage-model-select"
 						@click="st.isShow = true"
@@ -362,17 +362,26 @@ function handleClear() {
 						<template v-if="nGptStore.gpts">
 							<SvgIcon icon="ri:apps-fill" />
 							<span class="line-clamp-1 overflow-hidden">{{
-									nGptStore.gpts.name
-								}}</span>
+								nGptStore.gpts.name
+							}}</span>
 						</template>
 						<template v-else>
 							<SvgIcon icon="heroicons:sparkles" />
-							<span>模型:{{
-									nGptStore.modelLabel ? truncateText(nGptStore.modelLabel,20) : "deepseek-r1:1.5b"
-								}} {{nGptStore.kid?'知识库:'+truncateText(nGptStore.kName,10):''}}</span>
+							<span
+								>模型:{{
+									nGptStore.modelLabel
+										? truncateText(nGptStore.modelLabel, 20)
+										: "deepseek-r1:1.5b"
+								}}
+								{{
+									nGptStore.kid
+										? "知识库:" + truncateText(nGptStore.kName, 10)
+										: ""
+								}}</span
+							>
 						</template>
 						<SvgIcon icon="icon-park-outline:right" />
-					</div> -->
+					</div>
 					<!-- @select="handleSelectASR" -->
 					<n-dropdown trigger="hover" :options="drOption">
 						<div class="relative; w-[22px]" style="margin: 0 25px">