From 66cac98d73fb86d72dcc35ac30a3399ae5ce9160 Mon Sep 17 00:00:00 2001
From: Longgererer <2072451919@qq.com>
Date: Wed, 10 Jul 2024 14:29:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=BA=94=E7=94=A8=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=87=AA=E5=8A=A8=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modals/template-modal/hooks/use-template.ts   | 15 +++++++++------
 .../modals/template-modal/template-modal.vue      |  3 +++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/components/modals/template-modal/hooks/use-template.ts b/src/views/components/modals/template-modal/hooks/use-template.ts
index 6269f53..16ba5ef 100644
--- a/src/views/components/modals/template-modal/hooks/use-template.ts
+++ b/src/views/components/modals/template-modal/hooks/use-template.ts
@@ -1,3 +1,4 @@
+import useCodeFormatting from "@hooks/use-code-formatting"
 import useEditorWrapperState from "@hooks/use-editor-wrapper-state"
 import { useEditorConfigStore } from "@store/editor-config"
 import { useEditorWrapperStore } from "@store/editor-wrapper"
@@ -13,6 +14,7 @@ const useTemplate = () => {
   const editorWrapperStore = useEditorWrapperStore()
   const editorConfigStore = useEditorConfigStore()
   const { initDefaultWrapper, initComponentWrapper } = useEditorWrapperState()
+  const { formatEditorCode } = useCodeFormatting()
 
   const getTemplateBaseInfo = () => {
     const { codeMap, tabMap, isComponentMode } = editorWrapperStore
@@ -55,7 +57,7 @@ const useTemplate = () => {
 
   /** 应用模板 */
   const applyTemplate = async (template: ITemplateBase) => {
-    const { codeMap, editorConfig: { libraries = {}, prepMap }, isComponent } = template
+    const { codeMap, editorConfig: { libraries = {}, prepMap = {} }, isComponent } = template
     const { batchUpdateEditorConfig } = editorConfigStore
     const { batchUpdateEditorWrapper } = editorWrapperStore
     const { origin2TabIdMap } = storeToRefs(editorWrapperStore)
@@ -66,11 +68,12 @@ const useTemplate = () => {
     } else {
       await initDefaultWrapper()
     }
-    // 设置代码内容
-    const finalCodeMap = Object.entries(origin2TabIdMap.value).reduce((acc, [origin, tabId]) => {
-      acc[tabId] = codeMap[origin as OriginLang] || ""
-      return acc
-    }, {} as Record<number, string>)
+    const finalCodeMap: Record<number, string> = {}
+    for (const [origin, tabId] of Object.entries(origin2TabIdMap.value)) {
+      const code = codeMap[origin as OriginLang] || ""
+      const prep = prepMap[origin as OriginLang]
+      finalCodeMap[tabId] = await formatEditorCode(code, prep!)
+    }
     batchUpdateEditorWrapper({ codeMap: finalCodeMap })
     // 设置编辑器预处理、库等配置
     batchUpdateEditorConfig({
diff --git a/src/views/components/modals/template-modal/template-modal.vue b/src/views/components/modals/template-modal/template-modal.vue
index 7f08556..11a185e 100644
--- a/src/views/components/modals/template-modal/template-modal.vue
+++ b/src/views/components/modals/template-modal/template-modal.vue
@@ -9,6 +9,7 @@
     :confirm-btn-opts="{
       customClass: 'p-l',
       disabled: !currTemplate,
+      loading: isConfirmLoading,
     }"
     @close="updateDisplayModal(null)"
     @confirm="handleConfirmModal">
@@ -220,7 +221,9 @@ const handleConfirmModal = () => {
 const handleUseTemplate = () => {
   processUseTemplate()
 }
+const isConfirmLoading = ref<boolean>(false)
 const processUseTemplate = async () => {
+  isConfirmLoading.value = true
   await applyTemplate(currTemplate.value!)
   isShowEditTipModal.value = false
   updateDisplayModal(null)

From 1cda21684f08faeca342dd71fcb48789ac9e51ab Mon Sep 17 00:00:00 2001
From: Longgererer <2072451919@qq.com>
Date: Wed, 10 Jul 2024 14:56:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?enh:=20=E5=8A=A8=E6=80=81=E6=8F=92=E5=85=A5?=
 =?UTF-8?q?google=E5=88=86=E6=9E=90=E8=84=9A=E6=9C=AC=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E9=98=BB=E5=A1=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index e2e8c44..37841ef 100644
--- a/index.html
+++ b/index.html
@@ -17,25 +17,28 @@
     <!-- end style -->
 
     <!-- start script -->
-    <!-- Google tag -->
-    <script src="https://www.googletagmanager.com/gtag/js?id=G-NRZR81NZRZ" async></script>
-    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag(){dataLayer.push(arguments);}
-      gtag('js', new Date());
-
-      gtag('config', 'G-NRZR81NZRZ');
-    </script>
-    <script src="https://cdn.bootcdn.net/ajax/libs/typescript/5.2.2/typescript.min.js" defer></script>
     <!-- end script -->
   </head>
   <body>
     <div id="app"></div>
     <script src="https://at.alicdn.com/t/c/font_3456619_mjzgx4y7hs.js?spm=a313x.manage_type_myprojects.i1.10.500f3a81nBhv5R&file=font_3456619_mjzgx4y7hs.js"></script>
+    <script src="https://cdn.bootcdn.net/ajax/libs/typescript/5.2.2/typescript.min.js" defer></script>
     <script>
       // 初始化主题
       document.documentElement.setAttribute("theme", "dark")
     </script>
     <script type="module" src="/src/main.ts"></script>
+    <!-- Google tag -->
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag("js", new Date());
+      gtag("config", "G-NRZR81NZRZ");
+      window.addEventListener("load", () => {
+        const scriptEle = document.createElement("script")
+        scriptEle.src = "https://www.googletagmanager.com/gtag/js?id=G-NRZR81NZRZ"
+        document.body.appendChild(scriptEle)
+      })
+    </script>
   </body>
 </html>

From 65097b3d3b95a291fedb4c5eb28b5bf64fc9c212 Mon Sep 17 00:00:00 2001
From: Longgererer <2072451919@qq.com>
Date: Wed, 10 Jul 2024 14:59:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editor-keeper/editor-keeper.vue | 5 ++++-
 src/views/components/result/result.vue               | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/components/editor-keeper/editor-keeper.vue b/src/views/components/editor-keeper/editor-keeper.vue
index 699e4e8..b72d84b 100644
--- a/src/views/components/editor-keeper/editor-keeper.vue
+++ b/src/views/components/editor-keeper/editor-keeper.vue
@@ -11,7 +11,10 @@ interface IProps extends IEditorProps {
   tabId: number
 }
 
-const props = defineProps<IProps>()
+const props = withDefaults(defineProps<IProps>(), {
+  code: "",
+  modelValue: "",
+})
 const editorKeeperService = new EditorKeeperService()
 const attrs = useAttrs()
 
diff --git a/src/views/components/result/result.vue b/src/views/components/result/result.vue
index 7709b6a..292b86f 100644
--- a/src/views/components/result/result.vue
+++ b/src/views/components/result/result.vue
@@ -123,7 +123,7 @@ const processRefreshIframe = () => {
     codeMap,
     prepMap,
     libraries,
-    settings.value.other.headTags,
+    () => settings.value.other.headTags,
   ], () => {
     if (settings.value.execute.autoExecute) {
       previewService.refreshIframe()