(Enhancement:Modules:FileManager) 编辑文件窗口将「编码」按钮替换为「用此编码打开」

CHANGELOG.md

@@ -8,6 +8,10 @@
 
  * 优化返回包解码流程,增加自动猜解编码功能,该功能在中文较少时容易出错,出错了使用用户设置的字符编码
 
+### 文件管理
+
+ * 编辑文件窗口将「编码」按钮替换为「用此编码打开」, 若打开文件之后乱码，不妨试试切换编码
+
 ### Other
 
  * 新增 Python2 Custom CGI shell 示例

README.md

-# AntSword [![release](https://img.shields.io/badge/release-v2.0.3.1-blue.svg?style=flat-square)][url-release]
+# AntSword [![release](https://img.shields.io/badge/release-v2.0.3.2-blue.svg?style=flat-square)][url-release]
 
 > AntSword in your hands, no worries in your mind！
 

README_CN.md

-# 中国蚁剑 [![release](https://img.shields.io/badge/release-v2.0.3.1-blue.svg?style=flat-square)][url-release]
+# 中国蚁剑 [![release](https://img.shields.io/badge/release-v2.0.3.2-blue.svg?style=flat-square)][url-release]
 
 > 一剑在手，纵横无忧！
 

package-lock.json

 {
   "name": "antsword",
-  "version": "2.0.3.1",
+  "version": "2.0.3.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

 {
   "name": "antsword",
-  "version": "2.0.3.1",
+  "version": "2.0.3.2",
   "description": "中国蚁剑是一款跨平台的开源网站管理工具",
   "main": "app.js",
   "dependencies": {

source/language/en.js

@@ -333,7 +333,7 @@ module.exports = {
       toolbar: {
         save: 'Save',
         mode: 'Mode',
-        encode: 'Encode'
+        encode: 'Open with Encoding'
       },
       loadErr: (err) => antSword.noxss(`Load file error!\n${err}`),
       success: (path) => antSword.noxss(`Save the file success!\n${path}`),

source/language/zh.js

@@ -334,7 +334,7 @@ module.exports = {
       toolbar: {
         save: '保存',
         mode: '高亮',
-        encode: '编码'
+        encode: '用此编码打开'
       },
       loadErr: (err) => antSword.noxss(`加载文件出错！\n${err}`),
       success: (path) => antSword.noxss(`保存文件成功！\n${path}`),

source/modules/filemanager/index.js

@@ -881,7 +881,7 @@ class FileManager {
         editor.session.setMode(`ace/mode/${mode}`);
       }else if (id.startsWith('encode_')) {
         let encode = id.split('_')[1];
-        editor.session.setValue(iconv.encode(codes, encode).toString());
+        editor.session.setValue(iconv.decode(new Buffer(codes), encode).toString());
       }else{
         console.info('toolbar.onClick', id);
       }
@@ -894,7 +894,7 @@ class FileManager {
       })
     ).then((res) => {
       let ret = res['text'];
-      codes = ret;
+      codes = res['buff'];
       let encoding = res['encoding'] || this.opts['encode'];
       if(encoding.toUpperCase() == "UTF-8") {
         encoding = "UTF8";