Merge branch 'master' of gitea.release11.com:R11/release11-tools into release

Frontend/src/views/HtmlFormatterView.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+<<<<<<< HEAD
 import InsertTemplateComponent from '@components/common/InsertTemplateComponent.vue';
 import CodeEditorComponent from '@/components/CodeEditorComponent.vue';
 import { ref } from 'vue';
@@ -14,10 +15,14 @@ function clear() {
 function setTextFieldValue(data: string) {
     html.value = data.toString()
 }
+=======
+import FormatterComponent from '@/components/formatter/FormatterComponent.vue';
+>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 
 </script>
 
 <template>
+<<<<<<< HEAD
     <div id="layout" class="flex flex-col w-full h-full gap-4">
         <div id="toolbar" class="flex flex-col gap-4 items-center lg:flex-row place-content-between">
             <span class="dark:text-slate-100">HTML Formatter</span>
@@ -31,4 +36,7 @@ function setTextFieldValue(data: string) {
         </div>
         <CodeEditorComponent @update:updated-code="setTextFieldValue" :code="html" :config="{disabled:false,language:'html'}" />
     </div>
+=======
+    <FormatterComponent formatter-language="HTML"></FormatterComponent>
+>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 </template>