From 8858aeebb60214cab5c740bd96a7f1c433fb93dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=94=AF?= <997132391@qq.com>
Date: Tue, 13 Oct 2020 23:18:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=BC=96=E8=BE=91=E5=99=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE):=20=E6=9B=B4=E6=96=B0vscode=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .editorconfig                              | 27 ++++++++++++++++++----
 .github/{workflow => workflows}/deploy.yml |  0
 2 files changed, 22 insertions(+), 5 deletions(-)
 rename .github/{workflow => workflows}/deploy.yml (100%)

diff --git a/.editorconfig b/.editorconfig
index 7053c49..fb6e575 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,22 @@
-[*.{js,jsx,ts,tsx,vue}]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-insert_final_newline = true
+# top-most EditorConfig file 表示是最顶层的配置文件，发现设为true时，才会停止查找.editorconfig文件
+root = true
+[*.{js,jsx,ts,tsx,vue}]
+charset = utf-8
+indent_style = tab
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true
+ 
+# Unix-style newlines with a newline ending every file 对于所有的文件 始终在文件末尾插入一个新行
+[*]
+end_of_line = crlf
+insert_final_newline = true
+ 
+# 对于所有的js文件，设置文件字符集为utf-8
+[*.js]
+charset = utf-8
+ 
+# 设置所有JS,vue的缩进为
+[*.{js,vue}]
+ 
+indent_style = tab
diff --git a/.github/workflow/deploy.yml b/.github/workflows/deploy.yml
similarity index 100%
rename from .github/workflow/deploy.yml
rename to .github/workflows/deploy.yml