From 096c1db65f32a34a05c0007204c19ec2146969cb Mon Sep 17 00:00:00 2001
From: "zhigang.li@tendcloud.com" <zhigang.li@tendcloud.com>
Date: Thu, 1 Nov 2018 18:26:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8Ctitle=E6=94=AF=E6=8C=81=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=AF=AD=E6=B3=95=E5=BD=A2=E5=BC=8F=E5=BC=95=E5=85=A5?=
 =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-bread-crumb/custom-bread-crumb.vue  |  2 +-
 .../main/components/side-menu/mixin.js         |  3 ++-
 src/config/index.js                            |  2 +-
 src/libs/util.js                               | 18 +++++++++++++++---
 src/locale/lang/en-US.js                       |  4 +++-
 src/locale/lang/zh-CN.js                       |  5 +++--
 src/locale/lang/zh-TW.js                       |  4 +++-
 src/router/routers.js                          |  7 ++++---
 src/view/tools-methods/tools-methods.vue       |  1 -
 9 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue b/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue
index c944608a0..51b121d98 100644
--- a/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue
+++ b/src/components/main/components/header-bar/custom-bread-crumb/custom-bread-crumb.vue
@@ -9,7 +9,7 @@
   </div>
 </template>
 <script>
-import { showTitle } from '_c/common/util'
+import { showTitle } from '@/libs/util'
 import CommonIcon from '_c/common-icon'
 import './custom-bread-crumb.less'
 export default {
diff --git a/src/components/main/components/side-menu/mixin.js b/src/components/main/components/side-menu/mixin.js
index f83c02d48..21b618be5 100644
--- a/src/components/main/components/side-menu/mixin.js
+++ b/src/components/main/components/side-menu/mixin.js
@@ -1,11 +1,12 @@
 import CommonIcon from '_c/common-icon'
+import { showTitle } from '@/libs/util'
 export default {
   components: {
     CommonIcon
   },
   methods: {
     showTitle (item) {
-      return this.$config.useI18n ? this.$t(item.name) : ((item.meta && item.meta.title) || item.name)
+      return showTitle(item, this)
     },
     showChildren (item) {
       return item.children && (item.children.length > 1 || (item.meta && item.meta.showAlways))
diff --git a/src/config/index.js b/src/config/index.js
index 4d52e2899..93fc3feec 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -26,7 +26,7 @@ export default {
   plugin: {
     'error-store': {
       showInHeader: true, // 设为false后不会在顶部显示错误日志徽标
-      developmentOff: false // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
+      developmentOff: true // 设为true后在开发环境不会收集错误信息，方便开发中排查错误
     }
   }
 }
diff --git a/src/libs/util.js b/src/libs/util.js
index a01ad4379..13b82b794 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -74,15 +74,27 @@ export const getBreadCrumbList = (route, homeRoute) => {
   return [{...homeItem, to: homeRoute.path}, ...res]
 }
 
-export const getRouteTitleHandled = route => {
+export const getRouteTitleHandled = (route) => {
   let router = {...route}
   let meta = {...route.meta}
-  if (meta.title && typeof meta.title === 'function') meta.title = meta.title(router)
+  let title = ''
+  if (meta.title) {
+    if (typeof meta.title === 'function') title = meta.title(router)
+    else title = meta.title
+  }
+  meta.title = title
   router.meta = meta
   return router
 }
 
-export const showTitle = (item, vm) => vm.$config.useI18n ? vm.$t(item.name) : ((item.meta && item.meta.title) || item.name)
+export const showTitle = (item, vm) => {
+  let title = item.meta.title
+  if (vm.$config.useI18n) {
+    if (title.includes('{{') && title.includes('}}') && vm.$config.useI18n) title = title.replace(/({{[\s\S]+?}})/, (m, str) => str.replace(/{{([\s\S]*)}}/, (m, _) => vm.$t(_.trim())))
+    else title = vm.$t(item.name)
+  } else title = (item.meta && item.meta.title) || item.name
+  return title
+}
 
 /**
  * @description 本地存储和获取标签导航列表
diff --git a/src/locale/lang/en-US.js b/src/locale/lang/en-US.js
index 6eca4fa37..171d3deb8 100644
--- a/src/locale/lang/en-US.js
+++ b/src/locale/lang/en-US.js
@@ -32,5 +32,7 @@ export default {
   buttonText: 'Show Modal',
   'i18n-tip': 'Note: Only this page is multi-language, other pages do not add language content to the multi-language package.',
   error_store_page: 'Error Collection',
-  error_logger_page: 'Error Logger'
+  error_logger_page: 'Error Logger',
+  query: 'Query',
+  params: 'Params'
 }
diff --git a/src/locale/lang/zh-CN.js b/src/locale/lang/zh-CN.js
index 864f19d2b..680653a3a 100644
--- a/src/locale/lang/zh-CN.js
+++ b/src/locale/lang/zh-CN.js
@@ -32,6 +32,7 @@ export default {
   buttonText: '显示模态框',
   'i18n-tip': '注：仅此页做了多语言，其他页面没有在多语言包中添加语言内容',
   error_store_page: '错误收集',
-  error_logger_page: '错误日志'
-
+  error_logger_page: '错误日志',
+  query: '带参路由',
+  params: '动态路由'
 }
diff --git a/src/locale/lang/zh-TW.js b/src/locale/lang/zh-TW.js
index eca990dc3..90ff7ef10 100644
--- a/src/locale/lang/zh-TW.js
+++ b/src/locale/lang/zh-TW.js
@@ -32,5 +32,7 @@ export default {
   buttonText: '顯示模態框',
   'i18n-tip': '注：僅此頁做了多語言，其他頁面沒有在多語言包中添加語言內容',
   error_store_page: '錯誤收集',
-  error_logger_page: '錯誤日誌'
+  error_logger_page: '錯誤日誌',
+  query: '帶參路由',
+  params: '動態路由'
 }
diff --git a/src/router/routers.js b/src/router/routers.js
index ed98efad2..6467ad87b 100644
--- a/src/router/routers.js
+++ b/src/router/routers.js
@@ -4,6 +4,7 @@ import parentView from '@/components/parent-view'
 /**
  * iview-admin中meta除了原生参数外可配置的参数:
  * meta: {
+ *  title: { String|Number|Function } 显示在侧边栏和
  *  hideInMenu: (false) 设为true后在左侧菜单不会显示该页面选项
  *  notCache: (false) 设为true后页面不会缓存
  *  access: (null) 可访问该页面的权限数组，当前路由设置的权限会影响子路由
@@ -235,7 +236,7 @@ export default [
         name: 'i18n_page',
         meta: {
           icon: 'md-planet',
-          title: '国际化'
+          title: 'i18n - {{ i18n_page }}'
         },
         component: () => import('@/view/i18n/i18n-page.vue')
       }
@@ -363,7 +364,7 @@ export default [
         name: 'params',
         meta: {
           icon: 'md-flower',
-          title: route => `动态路由-${route.params.id}`,
+          title: route => `{{ params }}-${route.params.id}`,
           notCache: true,
           beforeCloseName: 'before_close_normal'
         },
@@ -374,7 +375,7 @@ export default [
         name: 'query',
         meta: {
           icon: 'md-flower',
-          title: route => `带参路由-${route.query.id}`,
+          title: route => `{{ query }}-${route.query.id}`,
           notCache: true
         },
         component: () => import('@/view/argu-page/query.vue')
diff --git a/src/view/tools-methods/tools-methods.vue b/src/view/tools-methods/tools-methods.vue
index eb023e217..79ad3b013 100644
--- a/src/view/tools-methods/tools-methods.vue
+++ b/src/view/tools-methods/tools-methods.vue
@@ -39,7 +39,6 @@ export default {
   name: 'tools_methods_page',
   methods: {
     ...mapMutations([
-      'addTag',
       'closeTag'
     ]),
     createTagParams () {

From c45d437d3d4449f9e81650cec46e56bca34acf87 Mon Sep 17 00:00:00 2001
From: "zhigang.li@tendcloud.com" <zhigang.li@tendcloud.com>
Date: Thu, 1 Nov 2018 18:29:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/routers.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/router/routers.js b/src/router/routers.js
index 6467ad87b..3f81176be 100644
--- a/src/router/routers.js
+++ b/src/router/routers.js
@@ -4,7 +4,10 @@ import parentView from '@/components/parent-view'
 /**
  * iview-admin中meta除了原生参数外可配置的参数:
  * meta: {
- *  title: { String|Number|Function } 显示在侧边栏和
+ *  title: { String|Number|Function }
+ *         显示在侧边栏、面包屑和标签栏的文字
+ *         使用'{{ 多语言字段 }}'形式结合多语言使用，例子看多语言的路由配置;
+ *         可以传入一个回调函数，参数是当前路由对象，例子看动态路由和带参路由
  *  hideInMenu: (false) 设为true后在左侧菜单不会显示该页面选项
  *  notCache: (false) 设为true后页面不会缓存
  *  access: (null) 可访问该页面的权限数组，当前路由设置的权限会影响子路由