From d2c4a58b8032533c17c845dde8546a352adc7f38 Mon Sep 17 00:00:00 2001
From: baiy <wo@baiy.org>
Date: Fri, 26 Feb 2021 10:09:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/code.vue             | 152 ++++++++++++++--------------
 src/views/tool/library/formatter.js |  15 +++
 2 files changed, 90 insertions(+), 77 deletions(-)
 create mode 100644 src/views/tool/library/formatter.js

diff --git a/src/views/tool/code.vue b/src/views/tool/code.vue
index 34d560a..fbbdd32 100644
--- a/src/views/tool/code.vue
+++ b/src/views/tool/code.vue
@@ -1,88 +1,86 @@
 <template>
-  <div>
-    <div style="border: 1px solid #dcdee2;border-radius: 4px;">
-      <codemirror ref="code" v-model="current.content" :options="options"></codemirror>
+    <div>
+        <div style="border: 1px solid #dcdee2;border-radius: 4px;">
+            <codemirror ref="code" v-model="current.content" :options="options"></codemirror>
+        </div>
+        <option-block>
+            <FormItem>
+                <ButtonGroup>
+                    <Button type="primary" @click="handle(k,v)" v-for="(v,k) in lang" :key="k">{{ k }}</Button>
+                </ButtonGroup>
+            </FormItem>
+            <FormItem>
+                <Checkbox v-model="current.isCompress">压缩</Checkbox>
+            </FormItem>
+        </option-block>
     </div>
-    <option-block>
-      <FormItem>
-        <ButtonGroup>
-          <Button type="primary" @click="handle(k,v)" v-for="(v,k) in lang" :key="k">{{k}}</Button>
-        </ButtonGroup>
-      </FormItem>
-      <FormItem>
-        <Checkbox v-model="current.isCompress">压缩</Checkbox>
-      </FormItem>
-    </option-block>
-  </div>
 </template>
 <script>
-    import { codemirror } from 'vue-codemirror'
-    import formatter from 'code-formatter'
-    import 'codemirror/lib/codemirror.css'
-    import 'codemirror/mode/javascript/javascript.js'
-    import 'codemirror/mode/htmlmixed/htmlmixed.js'
-    import 'codemirror/mode/css/css.js'
-    import 'codemirror/mode/xml/xml.js'
-    import 'codemirror/mode/sql/sql.js'
-    import 'codemirror/addon/fold/foldcode.js'
-    import 'codemirror/addon/fold/foldgutter.js'
-    import 'codemirror/addon/fold/brace-fold.js'
-    import 'codemirror/addon/fold/comment-fold.js'
-    import 'codemirror/addon/fold/foldgutter.css'
+import {codemirror} from 'vue-codemirror'
+import formatter from './library/formatter'
+import 'codemirror/lib/codemirror.css'
+import 'codemirror/mode/javascript/javascript.js'
+import 'codemirror/mode/htmlmixed/htmlmixed.js'
+import 'codemirror/mode/css/css.js'
+import 'codemirror/mode/xml/xml.js'
+import 'codemirror/mode/sql/sql.js'
+import 'codemirror/addon/fold/foldcode.js'
+import 'codemirror/addon/fold/foldgutter.js'
+import 'codemirror/addon/fold/brace-fold.js'
+import 'codemirror/addon/fold/comment-fold.js'
+import 'codemirror/addon/fold/foldgutter.css'
 
-    export default {
-        components: {
-            codemirror,
+export default {
+    components: {
+        codemirror,
+    },
+    created() {
+        this.current = Object.assign(this.current, this.$getToolData('content'))
+    },
+    mounted() {
+        this.codemirror.setSize(null, 350)
+        if (this.current.lang) {
+            this.codemirror.setOption('mode', this.options[this.current.lang])
+        }
+    },
+    computed: {
+        codemirror() {
+            return this.$refs.code.codemirror
         },
-        created () {
-            this.current = Object.assign(this.current, this.$getToolData('content'))
-        },
-        mounted () {
-            this.codemirror.setSize(null, 350)
-            if (this.current.lang) {
-                this.codemirror.setOption('mode', this.options[this.current.lang])
+    },
+    methods: {
+        handle(lang, mode) {
+            if (this.current.content) {
+                this.current.content = formatter(this.current.content, lang, this.current.isCompress)
+                this.codemirror.setOption('mode', mode)
+                this.current.lang = lang
+                this.$saveToolData(this.current)
             }
         },
-        computed: {
-            codemirror () {
-                return this.$refs.code.codemirror
+    },
+    data() {
+        return {
+            current: {
+                content: '',
+                lang: '',
+                isCompress: false,
             },
-        },
-        methods: {
-            handle (lang, mode) {
-                if (this.current.content) {
-                    this.current.content = formatter(this.current.content, {
-                        method: this.current.isCompress ? lang+"min" : lang
-                    })
-                    this.codemirror.setOption('mode', mode)
-                    this.current.lang = lang
-                    this.$saveToolData(this.current)
-                }
+            options: {
+                mode: null,
+                lineNumbers: true,
+                lineWrapping: false,
+                foldGutter: true,
+                indentUnit: 4,
+                gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
             },
-        },
-        data () {
-            return {
-                current: {
-                    content: '',
-                    lang: '',
-                    isCompress: false,
-                },
-                options: {
-                    mode: null,
-                    lineNumbers: true,
-                    lineWrapping: false,
-                    foldGutter: true,
-                    indentUnit: 4,
-                    gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
-                },
-                lang: {
-                    'js': 'text/javascript',
-                    'html': 'text/html',
-                    'css': 'text/css',
-                    'xml': 'application/xml',
-                    'sql': 'text/x-mysql',
-                },
-            }
-        },
-    }
+            lang: {
+                'js': 'text/javascript',
+                'html': 'text/html',
+                'css': 'text/css',
+                'xml': 'application/xml',
+                'sql': 'text/x-mysql',
+            },
+        }
+    },
+}
 </script>
\ No newline at end of file
diff --git a/src/views/tool/library/formatter.js b/src/views/tool/library/formatter.js
new file mode 100644
index 0000000..6c1ed91
--- /dev/null
+++ b/src/views/tool/library/formatter.js
@@ -0,0 +1,15 @@
+import codeFormatter from 'code-formatter'
+import xmlFormatter from "xml-formatter"
+
+export default (code, type, isCompress = false) => {
+    if (type === "xml") {
+        return xmlFormatter(code, {
+            indentation: isCompress ? '' : '  ',
+            collapseContent: true,
+            lineSeparator: isCompress ? '' : '\n'
+        });
+    }
+    return codeFormatter(code, {
+        method: isCompress ? type + "min" : type
+    })
+}
\ No newline at end of file
-- 
GitLab