From 6e10401de33bcf788031e11883f4d5755be9376c Mon Sep 17 00:00:00 2001
From: OceanH <1404939185@qq.com>
Date: Mon, 10 Apr 2023 23:55:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(custom):=20=E5=B7=A6=E5=8F=B3=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E5=88=A0=E9=99=A4=E6=A8=A1=E5=9D=97=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E6=9C=AA=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/custom/components/ModelBox.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/custom/components/ModelBox.vue b/src/views/custom/components/ModelBox.vue
index ac72bf05..87fb6311 100644
--- a/src/views/custom/components/ModelBox.vue
+++ b/src/views/custom/components/ModelBox.vue
@@ -18,7 +18,7 @@
         </div>
       </el-tooltip>
       <el-tooltip class="box-item" effect="dark" content="删除当前模块">
-        <div class="delete" @click.stop="useDeleteModel(item)">
+        <div class="delete" @click.stop="delModel">
           <svg-icon
             icon-name="icon-shanchu"
             class-name="icon icon-shanchu"
@@ -114,7 +114,7 @@
     }
   };
 
-  // 传统布局删除
+  // 传统布局添加
   const classicalAdd = () => {
     let index: number = resumeJsonNewStore.value.COMPONENTS.findIndex(
       (item) => item.keyId === props.item.keyId
@@ -123,6 +123,19 @@
     insert.keyId = getUuid();
     resumeJsonNewStore.value.COMPONENTS.splice(index, 0, insert);
   };
+
+  // 删除当前模块
+  const delModel = () => {
+    if (resumeJsonNewStore.value.LAYOUT === 'classical') {
+      classicalDelete();
+    } else {
+      emit('leftRightDelete', props.item);
+    }
+  };
+  // 传统布局删除模块
+  const classicalDelete = () => {
+    useDeleteModel(props.item);
+  };
 </script>
 <style lang="scss" scoped>
   .material-model-box {

From c3efaffb00b2598258120c75338daa160ded70ac Mon Sep 17 00:00:00 2001
From: OceanH <1404939185@qq.com>
Date: Tue, 11 Apr 2023 00:47:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(template):=20=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E5=90=8C=E7=B1=BB=E5=9E=8B=E6=A8=A1=E5=9D=97=E6=97=B6=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E5=A4=9A=E4=B8=AA=E9=80=89=E4=B8=AD=E6=BF=80=E6=B4=BB?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/template/custom/ModelBox.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/template/custom/ModelBox.vue b/src/template/custom/ModelBox.vue
index 0033d0ce..df28c807 100644
--- a/src/template/custom/ModelBox.vue
+++ b/src/template/custom/ModelBox.vue
@@ -2,7 +2,10 @@
   <div
     v-if="item.show"
     :ref="(el) => setRefItem(el, item.keyId)"
-    class="material-model-box"
+    :class="[
+      'material-model-box',
+      { 'is-have-border': item.keyId === appStore.useSelectMaterialStore.cptKeyId }
+    ]"
     @click="selectModel"
     @mouseover="handleMouseover"
     @mouseleave="handleMouseleave"
@@ -52,15 +55,10 @@
   const { cptKeyId } = storeToRefs(appStore.useSelectMaterialStore);
   watch(
     () => cptKeyId.value,
-    (newVal, oldVal) => {
-      // 判断是否选中复选框
-      if (oldVal && modelObj[oldVal]) {
-        modelObj[oldVal].el.style.borderColor = 'transparent';
-      }
+    (newVal) => {
       // 如果选中了模块
       if (newVal && modelObj[newVal]) {
         modelObj[newVal].el.scrollIntoView({ behavior: 'smooth', block: 'center' }); // 该模块显示在可视区域内
-        modelObj[newVal].el.style.borderColor = '#7ec97e';
       }
     },
     {
@@ -189,4 +187,7 @@
       }
     }
   }
+  .is-have-border {
+    border-color: #7ec97e;
+  }
 </style>

From 18ed1760018a5f256d343ad8c70c41db82992912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BC=9A=E9=A3=9E=E7=9A=84=E7=8C=AA?= <lhqhacker@163.com>
Date: Thu, 13 Apr 2023 04:25:39 +0800
Subject: [PATCH 3/3] docs(README): update contributors

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index a59e7981..63a855e2 100644
--- a/README.md
+++ b/README.md
@@ -192,6 +192,13 @@ pnpm build
             <sub style="font-size:14px"><b>张雨凡</b></sub>
         </a>
     </td>
+    <td align="center" style="word-wrap: break-word; width: 75.0; height: 75.0">
+        <a href=https://github.com/Ocean-H1>
+            <img src=https://avatars.githubusercontent.com/u/74898523?v=4 width="50;"  style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=OceanH/>
+            <br />
+            <sub style="font-size:14px"><b>OceanH</b></sub>
+        </a>
+    </td>
     <td align="center" style="word-wrap: break-word; width: 75.0; height: 75.0">
         <a href=https://github.com/daluozha>
             <img src=https://avatars.githubusercontent.com/u/35727398?v=4 width="50;"  style="border-radius:50%;align-items:center;justify-content:center;overflow:hidden;padding-top:10px" alt=- luozha -/>