Merge branch 'i18n' into deploy

2019-05-05 17:21:36 +08:00 · 2019-05-05 17:21:36 +08:00 · c2063f95fd
parent b303d02783 6346ab3d80
commit c2063f95fd
13 changed files with 51 additions and 23 deletions
--- a/README.ja.md
+++ b/README.ja.md
@ -26,7 +26,7 @@
  </a>
 </p>

-日本語 | [English](./README.md) | [简体中文](./README.zh-CN.md) 
+日本語 | [English](./README.md) | [简体中文](./README.zh-CN.md)

 ## 概要

@ -46,6 +46,8 @@
 - デスクトップバージョン: [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
 - Typescriptバージョン: [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (鸣谢: [@Armour](https://github.com/Armour))

+**After the `v4.1.0+` version, the default master branch will not support i18n. Please use [i18n Branch](https://github.com/PanJiaChen/vue-element-admin/tree/i18n), it will keep up with the master update**
+
 **現在のバージョン `v4.0+` は `vue-cli` で構築，バグ報告は[issue](https://github.com/PanJiaChen/vue-element-admin/issues/new)のissueでお願いします。旧バージョン[tag/3.11.0](https://github.com/PanJiaChen/vue-element-admin/tree/tag/3.11.0)もあります。`vue-cli`に依存しないです。**

 **低いバージョンのブラウザはサーポートしないです(例えば ie)，必要があれば polyfill を追加してください。 [詳細はこちら](https://github.com/PanJiaChen/vue-element-admin/wiki#babel-polyfill)**
@ -135,7 +137,7 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s

 ```bash
 # clone the project
-git clone https://github.com/PanJiaChen/vue-element-admin.git
+git clone -b i18n git@github.com:PanJiaChen/vue-element-admin.git

 # enter the project directory
 cd vue-element-admin
@ -207,4 +209,4 @@ Modern browsers and Internet Explorer 10+.

 [MIT](https://github.com/PanJiaChen/vue-element-admin/blob/master/LICENSE)

-Copyright (c) 2017-present PanJiaChen
+Copyright (c) 2017-present PanJiaChen
--- a/README.md
+++ b/README.md
@ -26,7 +26,7 @@
  </a>
 </p>

-English | [简体中文](./README.zh-CN.md) | [日本語](./README.ja.md) 
+English | [简体中文](./README.zh-CN.md) | [日本語](./README.ja.md)

 ## Introduction

@ -50,7 +50,9 @@ It is a magical vue admin based on the newest development stack of vue, built-in
 - Desktop: [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
 - Typescript: [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (Credits: [@Armour](https://github.com/Armour))

-**The current version is `v4.0+` build on `vue-cli`. If you find a problem, please put [issue](https://github.com/PanJiaChen/vue-element-admin/issues/new). If you want to use the old version , you can switch branch to [tag/3.11.0](https://github.com/PanJiaChen/vue-element-admin/tree/tag/3.11.0), it does not rely on `vue-cli'**
+**After the `v4.1.0+` version, the default master branch will not support i18n. Please use [i18n Branch](https://github.com/PanJiaChen/vue-element-admin/tree/i18n), it will keep up with the master update**
+
+**The current version is `v4.0+` build on `vue-cli`. If you find a problem, please put [issue](https://github.com/PanJiaChen/vue-element-admin/issues/new). If you want to use the old version , you can switch branch to [tag/3.11.0](https://github.com/PanJiaChen/vue-element-admin/tree/tag/3.11.0), it does not rely on `vue-cli`**

 **This project does not support low version browsers (e.g. IE). Please add polyfill by yourself.**

@ -139,7 +141,7 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s

 ```bash
 # clone the project
-git clone https://github.com/PanJiaChen/vue-element-admin.git
+git clone -b i18n git@github.com:PanJiaChen/vue-element-admin.git

 # enter the project directory
 cd vue-element-admin
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@ -50,10 +50,12 @@
 - 桌面端: [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
 - Typescript 版: [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (鸣谢: [@Armour](https://github.com/Armour))

-**目前版本为 `v4.0+` 基于 `vue-cli` 进行构建，若发现问题，欢迎提[issue](https://github.com/PanJiaChen/vue-element-admin/issues/new)。若你想使用旧版本，可以切换分支到[tag/3.11.0](https://github.com/PanJiaChen/vue-element-admin/tree/tag/3.11.0)，它不依赖 `vue-cli`**
+**`v4.1.0+`版本之后默认 master 分支将不支持国际化，有需要的请使用[i18n](https://github.com/PanJiaChen/vue-element-admin/tree/i18n)分支，它会和 master 保持同步更新**

 **该项目不支持低版本浏览器(如 ie)，有需求请自行添加 polyfill [详情](https://github.com/PanJiaChen/vue-element-admin/wiki#babel-polyfill)**

+**目前版本为 `v4.0+` 基于 `vue-cli` 进行构建，若发现问题，欢迎提[issue](https://github.com/PanJiaChen/vue-element-admin/issues/new)。若你想使用旧版本，可以切换分支到[tag/3.11.0](https://github.com/PanJiaChen/vue-element-admin/tree/tag/3.11.0)，它不依赖 `vue-cli`**
+
 群主 **[圈子](https://jianshiapp.com/circles/1209)** 群主会经常分享一些技术相关的东西，或者加入 [qq 群](https://github.com/PanJiaChen/vue-element-admin/issues/602) 或者关注 [微博](https://weibo.com/u/3423485724?is_all=1)

 ## 前序准备
@ -153,7 +155,7 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s

 ```bash
 # 克隆项目
-git clone https://github.com/PanJiaChen/vue-element-admin.git
+git clone -b i18n git@github.com:PanJiaChen/vue-element-admin.git

 # 进入项目目录
 cd vue-element-admin
--- a/src/icons/index.js
+++ b/src/icons/index.js
@ -1,5 +1,5 @@
 import Vue from 'vue'
-import SvgIcon from '@/components/SvgIcon'// svg组件
+import SvgIcon from '@/components/SvgIcon'// svg component

 // register globally
 Vue.component('svg-icon', SvgIcon)
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@ -33,6 +33,8 @@ export default {

 .fixed-header+.app-main {
  padding-top: 50px;
+  height: 100vh;
+  overflow: auto;
 }

 .hasTagsView {
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@ -97,7 +97,7 @@ const actions = {
    })
  },

-  // Dynamically modify permissions
+  // dynamically modify permissions
  changeRoles({ commit, dispatch }, role) {
    return new Promise(async resolve => {
      const token = role + '-token'
--- a/src/utils/index.js
+++ b/src/utils/index.js
@ -1,5 +1,5 @@
 /**
- * Created by jiachenpan on 16/11/18.
+ * Created by PanJiaChen on 16/11/18.
 */

 /**
--- a/src/utils/open-window.js
+++ b/src/utils/open-window.js
@ -1,5 +1,5 @@
 /**
- *Created by jiachenpan on 16/11/29.
+ *Created by PanJiaChen on 16/11/29.
 * @param {Sting} url
 * @param {Sting} title
 * @param {Number} w
--- a/src/utils/request.js
+++ b/src/utils/request.js
@ -16,8 +16,9 @@ service.interceptors.request.use(
    // do something before request is sent

    if (store.getters.token) {
-      // let each request carry token --['X-Token'] as a custom key.
-      // please modify it according to the actual situation.
+      // let each request carry token
+      // ['X-Token'] is a custom headers key
+      // please modify it according to the actual situation
      config.headers['X-Token'] = getToken()
    }
    return config
@ -32,14 +33,14 @@ service.interceptors.request.use(
 // response interceptor
 service.interceptors.response.use(
  /**
-   * If you want to get information such as headers or status
+   * If you want to get http information such as headers or status
   * Please return  response => response
  */

  /**
   * Determine the request status by custom code
   * Here is just an example
-   * You can also judge the status by HTTP Status Code.
+   * You can also judge the status by HTTP Status Code
   */
  response => {
    const res = response.data
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@ -1,5 +1,5 @@
 /**
- * Created by jiachenpan on 16/11/18.
+ * Created by PanJiaChen on 16/11/18.
 */

 /**
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@ -9,7 +9,6 @@

        <el-col :span="18">
          <el-card>
-
            <el-tabs v-model="activeTab">
              <el-tab-pane label="Activity" name="activity">
                <activity />
@ -21,7 +20,6 @@
                <account :user="user" />
              </el-tab-pane>
            </el-tabs>
-
          </el-card>
        </el-col>

--- a/src/views/table/inline-edit-table.vue
+++ b/src/views/table/inline-edit-table.vue
@ -37,7 +37,13 @@
        <template slot-scope="{row}">
          <template v-if="row.edit">
            <el-input v-model="row.title" class="edit-input" size="small" />
-            <el-button class="cancel-btn" size="small" icon="el-icon-refresh" type="warning" @click="cancelEdit(row)">
+            <el-button
+              class="cancel-btn"
+              size="small"
+              icon="el-icon-refresh"
+              type="warning"
+              @click="cancelEdit(row)"
+            >
              cancel
            </el-button>
          </template>
@ -47,10 +53,22 @@

      <el-table-column align="center" label="Actions" width="120">
        <template slot-scope="{row}">
-          <el-button v-if="row.edit" type="success" size="small" icon="el-icon-circle-check-outline" @click="confirmEdit(row)">
+          <el-button
+            v-if="row.edit"
+            type="success"
+            size="small"
+            icon="el-icon-circle-check-outline"
+            @click="confirmEdit(row)"
+          >
            Ok
          </el-button>
-          <el-button v-else type="primary" size="small" icon="el-icon-edit" @click="row.edit=!row.edit">
+          <el-button
+            v-else
+            type="primary"
+            size="small"
+            icon="el-icon-edit"
+            @click="row.edit=!row.edit"
+          >
            Edit
          </el-button>
        </template>
--- a/vue.config.js
+++ b/vue.config.js
@ -7,6 +7,9 @@ function resolve(dir) {
 }

 const name = defaultSettings.title || 'vue Element Admin' // page title
+// If your port is set to 80,
+// use administrator privileges to execute the command line.
+// For example, Mac: sudo npm run
 const port = 9527 // dev port

 // All configuration item explanations can be find in https://cli.vuejs.org/config/
@ -96,7 +99,7 @@ module.exports = {
      .end()

    config
-    // https://webpack.js.org/configuration/devtool/#development
+      // https://webpack.js.org/configuration/devtool/#development
      .when(process.env.NODE_ENV === 'development',
        config => config.devtool('cheap-source-map')
      )