From e06001dba8de6082e405ca53b1567cf76a9bdfcf Mon Sep 17 00:00:00 2001
From: gaoshuaixing <530353222@qq.com>
Date: Tue, 28 Sep 2021 19:20:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/.eslintrc.js                      |  1 +
 frontend/src/views/demo/file/Index.vue     | 28 ++++++++++++----------
 frontend/src/views/demo/shortcut/Index.vue |  6 ++---
 frontend/src/views/demo/socket/Index.vue   |  6 ++---
 frontend/src/views/demo/software/Index.vue | 11 ++++++---
 frontend/src/views/demo/system/Index.vue   |  2 +-
 frontend/src/views/other/Index.vue         |  2 +-
 frontend/vue.config.js                     |  2 +-
 package.json                               |  2 +-
 9 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index da21df9..44734f9 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -14,6 +14,7 @@ module.exports = {
     'no-console': 'off',
     "no-unused-vars":"off", //重要 var 变量为引入
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    "no-tabs":"off",
     'generator-star-spacing': 'off',
     'no-mixed-operators': 0,
     "vue/max-attributes-per-line": [2, {
diff --git a/frontend/src/views/demo/file/Index.vue b/frontend/src/views/demo/file/Index.vue
index 89cbeb0..17435f9 100644
--- a/frontend/src/views/demo/file/Index.vue
+++ b/frontend/src/views/demo/file/Index.vue
@@ -2,7 +2,7 @@
   <div id="app-demo-file">
     <div class="one-block-1">
       <span>
-        上传文件到sm图床
+        1. 上传文件到sm图床
       </span>
     </div>  
     <div class="one-block-2">
@@ -35,7 +35,7 @@
     </div>
     <div class="one-block-1">
       <span>
-        打开文件夹
+        2. 打开文件夹
       </span>
     </div>  
     <div class="one-block-2">
@@ -51,19 +51,20 @@
     </div>
     <div class="one-block-1">
       <span>
-        保存到目录
+        3. 选择保存目录
       </span>
     </div>  
     <div class="one-block-2">
-			<a-input addon-before="保存目录" v-model="dir_path" :value="dir_path" />
-			<a-button @click="selectDir">修改目录</a-button>
-      <!-- <a-card hoverable style="width: 100%">
-        <template slot="actions" class="ant-card-actions">
-          <a @click="selectDir">修改目录</a>
-        </template>
-        <a-card-meta v-model="dir_path" title="保存目录" :description="dir_path">
-        </a-card-meta>
-      </a-card> -->
+      <a-row>
+        <a-col :span="12">
+          <a-input v-model="dir_path" :value="dir_path" addon-before="保存目录" />
+        </a-col>
+        <a-col :span="12">
+          <a-button @click="selectDir">
+            修改目录
+          </a-button>
+        </a-col>
+      </a-row>
     </div>
   </div>
 </template>
@@ -141,6 +142,7 @@ export default {
         if (res.code !== 0) {
           return false
         }
+				console.log('res.data.dir:', res.data.dir)
         this.dir_path = res.data.dir;
       }).catch(err => {
         this.$message.error('异常')
@@ -152,7 +154,7 @@ export default {
 <style lang="less" scoped>
 #app-demo-file {
   padding: 0px 10px;
-  text-align: center;
+  text-align: left;
   width: 100%;
   .one-block-1 {
     font-size: 16px;
diff --git a/frontend/src/views/demo/shortcut/Index.vue b/frontend/src/views/demo/shortcut/Index.vue
index 6d42e2d..3f00cb7 100644
--- a/frontend/src/views/demo/shortcut/Index.vue
+++ b/frontend/src/views/demo/shortcut/Index.vue
@@ -2,13 +2,13 @@
   <div id="app-demo-shortcut">
     <div class="one-block-1">
       <span>
-        快捷键
+        1. 快捷键
       </span>
     </div>  
     <div class="one-block-2">
       <a-row :gutter="[16,16]">
         <a-col :span="24">
-          1. 窗口最小化
+          【窗口最小化】
           <a-form :form="form" @submit="handleSubmit">
             <a-form-item>
               <hot-key-input
@@ -86,7 +86,7 @@ export default {
 <style lang="less" scoped>
 #app-demo-shortcut {
   padding: 0px 10px;
-  text-align: center;
+  text-align: left;
   width: 100%;
   .one-block-1 {
     font-size: 16px;
diff --git a/frontend/src/views/demo/socket/Index.vue b/frontend/src/views/demo/socket/Index.vue
index 802830e..4f54434 100644
--- a/frontend/src/views/demo/socket/Index.vue
+++ b/frontend/src/views/demo/socket/Index.vue
@@ -2,7 +2,7 @@
   <div id="app-demo-socket-ipc">
     <div class="one-block-1">
       <span>
-        渲染进程与主进程IPC通信
+        1. 渲染进程与主进程IPC通信
       </span>
     </div>  
     <div class="one-block-2">
@@ -16,7 +16,7 @@
     </div>
     <div class="one-block-1">
       <span>
-        主进程API执行网页函数
+        2. 主进程API执行网页函数
       </span>
     </div>  
     <div class="one-block-2">
@@ -62,7 +62,7 @@ export default {
 <style lang="less" scoped>
 #app-demo-socket-ipc {
   padding: 0px 10px;
-  text-align: center;
+  text-align: left;
   width: 100%;
   .one-block-1 {
     font-size: 16px;
diff --git a/frontend/src/views/demo/software/Index.vue b/frontend/src/views/demo/software/Index.vue
index c92d6e5..b70cbda 100644
--- a/frontend/src/views/demo/software/Index.vue
+++ b/frontend/src/views/demo/software/Index.vue
@@ -2,10 +2,12 @@
   <div id="app-demo-software-open">
     <div class="one-block-1">
       <span>
-        调用其它软件（exe、bash等可执行程序）
+        1. 调用其它软件（exe、bash等可执行程序）
       </span>
       <p/>
-      注：请先将【powershell.exe】复制到【electron-egg/build/extraResources】目录中
+      <span class="sub-content">
+        注：请先将【powershell.exe】复制到【electron-egg/build/extraResources】目录中
+      </span> 
     </div>  
     <div class="one-block-2">
       <a-list bordered :data-source="data">
@@ -52,11 +54,14 @@ export default {
 <style lang="less" scoped>
 #app-demo-software-open {
   padding: 0px 10px;
-  text-align: center;
+  text-align: left;
   width: 100%;
   .one-block-1 {
     font-size: 16px;
     padding-top: 10px;
+    .sub-content {
+      font-size: 14px;
+    }
   }
   .one-block-2 {
     padding-top: 10px;
diff --git a/frontend/src/views/demo/system/Index.vue b/frontend/src/views/demo/system/Index.vue
index 078b7e3..0cc70f3 100644
--- a/frontend/src/views/demo/system/Index.vue
+++ b/frontend/src/views/demo/system/Index.vue
@@ -74,7 +74,7 @@ export default {
 <style lang="less" scoped>
 #app-demo-system-launch {
   padding: 0px 10px;
-  text-align: center;
+  text-align: left;
   width: 100%;
   .one-block-1 {
     font-size: 16px;
diff --git a/frontend/src/views/other/Index.vue b/frontend/src/views/other/Index.vue
index d728b28..4c84d19 100644
--- a/frontend/src/views/other/Index.vue
+++ b/frontend/src/views/other/Index.vue
@@ -33,7 +33,7 @@ export default {
 <style lang="less" scoped>
 #app-other {
   padding: 0px 10px;
-  text-align: center;
+  text-align: left;
   width: 100%;
   .one-block-1 {
     font-size: 16px;
diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index 5b7a0a2..af0d70e 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -12,7 +12,7 @@ module.exports = {
       config
         .plugin('html')
         .tap(args => {
-          args[0].title= 'electron-egg'
+          args[0].title= 'electron-egg' // 设置title
           return args
         })
     },
diff --git a/package.json b/package.json
index a18dc63..48c9b0f 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron-egg",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "A fast, desktop software development framework",
   "main": "main.js",
   "softName": "electron-egg",