Merge branch 'master' into fix-origin

Author: demonray

.gitignore

@@ -6,5 +6,5 @@
 node_modules/
 dist/
 
-.package-lock.json
+package-lock.json
 .env.development

README.md

@@ -36,11 +36,9 @@ Read the Quick Start [Quick Start](/docs/en_US/ch3/Scriptis_Quick_Start.md)
 ![Comparison](/docs/en_US/images/readme/Comparison.png)
 
 ## Community
-If you desire immediate response, please kindly raise issues to us or scan the below QR code by WeChat to join our group:
+If you desire immediate response, please kindly raise issues to us or scan the below QR code by WeChat and QQ to join our group:
 
-![WeChat](/docs/en_US/images/wechat.jpg)
-
-QQ  Group:872767532
+![WeChatQQ](/docs/en_US/images/wechatQQ.png)
 
 ## License
 

docs/en_US/images/wechatQQ.png

@@ -44,6 +44,11 @@ Scriptis是一款支持在线写SQL、Pyspark、HiveQL等脚本，提交给**Lin
 ### 同类系统对比：
 ![对比图](images/readme/对比.png)
 
+## 社区
+如果您想得到最快的响应，请给我们提issue，或者您也可以扫码进群：
+
+![WeChatQQ](/docs/en_US/images/wechatQQ.png)
+
 ### 文档：
 * [部署手册](ch1/前台部署文档.md)
 * [前台编译手册](ch2/编译文档.md)

docs/zh_CN/README.md

@@ -9,7 +9,7 @@
     "fix": "eslint --ext .js,.vue src --fix"
   },
   "dependencies": {
-    "axios": "^0.16.2",
+    "axios": "^0.19.0",
     "babel-polyfill": "^6.26.0",
     "core-js": "^2.6.5",
     "dexie": "^2.0.4",

package.json

@@ -135,10 +135,10 @@ export default {
             current: '',
             closeModal: {
                 text: '',
-                cancel: new Function(),
-                close: new Function(),
-                save: new Function(),
-                saveAs: new Function(),
+                cancel: function() {},
+                close: function() {},
+                save: function() {},
+                saveAs: function() {},
             },
             showCloseModal: false,
             userName: '',
@@ -565,13 +565,14 @@ export default {
                 if (work.unsave) {
                     this.chooseWork(work);
                     this.showCloseModal = true;
+                    // eslint-disable-next-line no-unused-expressions
                     this.closeModal.cancel = () => {
                         this.showCloseModal = false;
-                        this.close = new Function();
-                        this.save = new Function();
-                        this.saveAs = new Function();
+                        this.close = function() {};
+                        this.save = function() {};
+                        this.saveAs = function() {};
                         resolve();
-                    },
+                    };
                     this.closeModal.close = () => {
                         this.showCloseModal = false;
                         doRemove();