From 822a3485e3c3147ea8da2dc7c42cf5c2a5f00525 Mon Sep 17 00:00:00 2001
From: "guoqi.sun" <sun412926@gmail.com>
Date: Sun, 9 Jul 2023 08:26:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E9=A1=B5=E9=9D=A2=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8F=AF=E7=BC=A9=E6=94=BE?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=EF=BC=88=E5=BC=83=E7=94=A8=E9=9D=99=E6=80=81?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=96=B9=E5=BC=8F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml                                 | 89 ++++++++++---------
 .../widgets/about-widgets/statistics-map.html | 46 ++++++++--
 2 files changed, 87 insertions(+), 48 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index 97e464a1..a01fab38 100644
--- a/settings.yaml
+++ b/settings.yaml
@@ -1298,48 +1298,53 @@ spec:
           label: 51la 网站统计
           help: 统计ID
           placeholder: 请输入内容
-        - $formkit: group
-          name: map
-          label: 地图相关配置
-          value:
-            StrengthenTitle:
-            background:
-            backgroundDark:
-            authorInfo:
-          children:
-            - $formkit: text
-              name: StrengthenTitle
-              label: 居住地
-              placeholder: 请输入内容
-            - $formkit: attachment
-              name: background
-              label: 地图亮色模式背景
-              placeholder: 请输入内容
-            - $formkit: attachment
-              name: backgroundDark
-              label: 地图暗色模式背景
-              placeholder: 请输入内容
-            - $formkit: repeater
-              name: authorInfo
-              label: 个人信息
-              min: 3
-              max: 3
-              children:
-                - $formkit: text
-                  name: authorInfoTitle
-                  label: 标题
-                  placeholder: 请输入内容
-                  value: 标题
-                - $formkit: text
-                  name: authorInfoContent
-                  label: 内容
-                  placeholder: 请输入内容
-                  value: 内容
-                - $formkit: color
-                  name: authorInfoColor
-                  label: 内容颜色
-                  placeholder: 请输入内容
-                  value: '#ffffff'
+        - $formkit: text
+          name: mapLocation
+          label: 居住地坐标
+          help: 示例：22.5824,113.2154
+          placeholder: 请输入经纬度坐标
+        # - $formkit: group
+        #   name: map
+        #   label: 地图相关配置
+        #   value:
+        #     StrengthenTitle:
+        #     background:
+        #     backgroundDark:
+        #     authorInfo:
+        #   children:
+        #     - $formkit: text
+        #       name: StrengthenTitle
+        #       label: 居住地
+        #       placeholder: 请输入内容
+        #     - $formkit: attachment
+        #       name: background
+        #       label: 地图亮色模式背景
+        #       placeholder: 请输入内容
+        #     - $formkit: attachment
+        #       name: backgroundDark
+        #       label: 地图暗色模式背景
+        #       placeholder: 请输入内容
+        #     - $formkit: repeater
+        #       name: authorInfo
+        #       label: 个人信息
+        #       min: 3
+        #       max: 3
+        #       children:
+        #         - $formkit: text
+        #           name: authorInfoTitle
+        #           label: 标题
+        #           placeholder: 请输入内容
+        #           value: 标题
+        #         - $formkit: text
+        #           name: authorInfoContent
+        #           label: 内容
+        #           placeholder: 请输入内容
+        #           value: 内容
+        #         - $formkit: color
+        #           name: authorInfoColor
+        #           label: 内容颜色
+        #           placeholder: 请输入内容
+        #           value: '#ffffff'
         - $formkit: textarea
           name: xjlc
           label: 心路历程
diff --git a/templates/modules/widgets/about-widgets/statistics-map.html b/templates/modules/widgets/about-widgets/statistics-map.html
index 42be2e96..3f6912fc 100644
--- a/templates/modules/widgets/about-widgets/statistics-map.html
+++ b/templates/modules/widgets/about-widgets/statistics-map.html
@@ -18,7 +18,8 @@
 
 
     <div class="author-content-item-group column mapAndInfo">
-        <div class="author-content-item map single">
+        <div class="author-content-item map single" style="padding: 0;">
+            <div id="mapContainer" style="height: 120%;"></div>
             <span class="map-title">我现在住在
                 <b>[[${theme.config.about.map.StrengthenTitle}]]</b></span>
         </div>
@@ -39,7 +40,7 @@
                     th:text="${texts[2].authorInfoContent}">BI工程师</span>
             </div>
         </div>
-        <style>
+        <!-- <style>
             .author-content-item.map {
                 background: url([[${theme.config.about.map.background}]]) no-repeat center;
                 min-height: 160px;
@@ -56,7 +57,7 @@
                 background: url([[${theme.config.about.map.backgroundDark}]]) no-repeat center;
                 background-size: 100%;
             }
-        </style>
+        </style> -->
     </div>
     <script th:src="@{/assets/libs/countup/countup.js}"></script>
     <script>
@@ -122,12 +123,45 @@
                     };
                     const observer = new IntersectionObserver(callback, options);
                     observer.observe(statisticElement);
-                }
-
+                }            
                 statisticUP()
-
             });
     </script>
+    <script>
+        var e = document.createElement("script");
+        e.type = "text/javascript",
+        e.defer = !0,
+        e.src = "https://map.qq.com/api/gljs?v=1.exp&key=YZOBZ-34HLF-K3OJV-JV6IN-OALJ5-7MBAC",
+        document.body.appendChild(e);
+        var t = new TMap.LatLng([[${theme.config.about.mapLocation}]])
+            , n = new TMap.Map(document.getElementById("mapContainer"),{
+            center: t,
+            zoom: 12,
+            // pitch: 43.5,
+            // rotation: 45
+        });
+        n.removeControl(TMap.constants.DEFAULT_CONTROL_ID.ZOOM),
+        n.removeControl(TMap.constants.DEFAULT_CONTROL_ID.ROTATION),
+        n.removeControl(TMap.constants.DEFAULT_CONTROL_ID.SCALE),
+        new TMap.MultiMarker({
+            map: n,
+            styles: {
+                marker: new TMap.MarkerStyle({
+                    width: 20,
+                    height: 30,
+                    anchor: {
+                        x: 10,
+                        y: 30
+                    }
+                })
+            },
+            geometries: [{
+                id: "marker",
+                position: t
+            }]
+        }),
+        document.querySelector("mapContainer div").querySelectorAll("div")[1].remove()
+    </script>
 </div>
 
 </html>
\ No newline at end of file