From a14b9dd1dc1830b002a379ad77b9fba4a8a99020 Mon Sep 17 00:00:00 2001
From: zhangqi <395733086@qq.com>
Date: Thu, 20 Mar 2025 15:17:48 +0800
Subject: [PATCH] =?UTF-8?q?refine:=20=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Yys.vue | 40 ++++++++++++++++++++++++++++++----------
 src/locales/zh.json    |  2 ++
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/components/Yys.vue b/src/components/Yys.vue
index 66a0bbc..ef7daae 100644
--- a/src/components/Yys.vue
+++ b/src/components/Yys.vue
@@ -16,8 +16,6 @@
 
   <draggable :list="groups" item-key="group" style="display: flex; flex-direction: column; width: 100%;"
              handle=".drag-handle">
-
-
     <template class="group" #item="{ element: group, index: groupIndex }">
       <el-row :span="24">
         <div class="group-item">
@@ -33,7 +31,8 @@
               </div>
               <div class="opt-right">
                 <el-button class="drag-handle" type="primary" icon="Rank" circle></el-button>
-                <el-button type="primary" icon="Plus" circle @click="addGroup"></el-button>
+                <el-button type="primary" @click="addGroup">{{t('AddGroup')}}</el-button>
+                <el-button type="primary" @click="addGroupElement(groupIndex)">{{t('AddShikigami')}}</el-button>
                 <el-button type="danger" icon="Delete" circle @click="removeGroup(groupIndex)"></el-button>
               </div>
             </div>
@@ -42,12 +41,13 @@
           <div class="group-body">
             <draggable :list="group.groupInfo" item-key="name" class="body-content">
               <template #item="{element : position, index:positionIndex}">
-                  <el-col>
+                  <div>
+                    <el-col>
                     <el-card class="group-card" shadow="never">
                       <div class="opt-btn" data-html2canvas-ignore="true">
                         <!-- Add delete button here -->
                         <el-button type="danger" icon="Delete" circle @click="removeGroupElement(groupIndex, positionIndex)"/>
-                        <el-button type="primary" icon="Plus" circle @click="addGroupElement(groupIndex)"/>
+                        <!-- <el-button type="primary" icon="Plus" circle @click="addGroupElement(groupIndex)"/> -->
                       </div>
                       <div class="avatar-container">
                         <!-- 头像图片 -->
@@ -87,11 +87,9 @@
                       </div>
                     </el-card>
                   </el-col>
+                  </div>
               </template>
             </draggable>
-            <!-- <div class="add-btn" data-html2canvas-ignore="true">
-              <el-button type="primary" icon="Plus" circle @click="addGroupElement(groupIndex)"></el-button>
-            </div> -->
           </div>
           <div class="group-footer">
             <div class="group-opt" data-html2canvas-ignore="true">
@@ -106,13 +104,14 @@
             <QuillEditor ref="detailsEditor" v-model:content="group.details" contentType="html" theme="snow" :toolbar="toolbarOptions" />
           </div>
         </div>
+        <div class="divider-horizontal"></div>
       </el-row>
     </template>
   </draggable>
 </template>
 
 <script setup lang="ts">
-import {ref, reactive, toRefs} from 'vue';
+import {ref, reactive, toRefs, nextTick} from 'vue';
 import draggable from 'vuedraggable';
 import ShikigamiSelect from './ShikigamiSelect.vue';
 import ShikigamiProperty from './ShikigamiProperty.vue';
@@ -213,7 +212,7 @@ const editShikigami = (groupIndex, positionIndex) => {
 };
 
 const updateShikigami = (shikigami) => {
-  console.log("parent====> ", shikigami);
+  console.log("parent====> ", shikigami, state);
   state.showSelectShikigami = false;
 
   const oldProperties = props.groups[state.groupIndex].groupInfo[state.positionIndex].properties;
@@ -284,10 +283,21 @@ const addGroup = () => {
     groupInfo: [{}, {}, {}, {}, {}],
     details: ''
   });
+
+  const container = document.getElementById('main-container');
+
+
+  nextTick(() => {
+    container.scrollTo({
+      top: container.scrollHeight,
+      behavior: 'smooth' // 可选平滑滚动
+    });
+  })
 };
 
 const addGroupElement = (groupIndex) => {
   props.groups[groupIndex].groupInfo.push({});
+  editShikigami(groupIndex, props.groups[groupIndex].groupInfo.length - 1);
 };
 
 
@@ -440,6 +450,15 @@ defineExpose({
   width: 80%;
 }
 
+/* 水平分割线 */
+.divider-horizontal {
+  border: 0;
+  height: 1px;
+  background: #e0e0e0;
+  margin: 24px 0;
+  width: 100%;
+}
+
 .body-content {
   display: flex;
   flex-direction: row;
@@ -477,6 +496,7 @@ defineExpose({
   .opt-btn {
     position: absolute;
     top: 0px;
+    right: 0px;
     z-index: 10;
     opacity: 0;
   }
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 35217d5..19da193 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -4,6 +4,8 @@
   "setWatermark": "设置水印",
   "Copy": "复制",
   "Paste": "粘贴",
+  "AddGroup": "新增小队",
+  "AddShikigami": "新增式神",
   "editProperties": "配置属性",
   "prepareCapture": "生成截图",
   "yuhunSelect": "请选择御魂",