From 9d5c1009607acd9a3e81049c1dcf3ed1f6460ef2 Mon Sep 17 00:00:00 2001
From: iczer <1126263215@qq.com>
Date: Fri, 10 Jul 2020 11:56:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20add=20the=20configuration=20of=20disabl?=
 =?UTF-8?q?e=20animation;=20:star2:=20=E6=96=B0=E5=A2=9E=EF=BC=9A=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E9=A1=B5=E9=9D=A2=E5=88=87=E6=8D=A2=E5=8A=A8=E7=94=BB?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/setting/Setting.vue                 | 10 +++++++---
 src/components/setting/i18n.js                     |  3 +++
 src/components/transition/PageToggleTransition.vue |  8 ++++++--
 src/config/config.js                               |  2 +-
 src/config/default/setting.config.js               |  1 +
 src/layouts/BlankView.vue                          |  2 +-
 src/layouts/PageView.vue                           |  2 +-
 src/layouts/TabsView.vue                           |  2 +-
 8 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/components/setting/Setting.vue b/src/components/setting/Setting.vue
index 960d958..1753c99 100644
--- a/src/components/setting/Setting.vue
+++ b/src/components/setting/Setting.vue
@@ -67,6 +67,10 @@
     <a-divider />
     <setting-item :title="$t('animate.title')">
       <a-list :split="false">
+        <a-list-item>
+          {{$t('animate.disable')}}
+          <a-switch :checked="animate.disabled" slot="actions" size="small" @change="val => setAnimate({...animate, disabled: val})" />
+        </a-list-item>
         <a-list-item>
           {{$t('animate.effect')}}
           <a-select
@@ -139,17 +143,17 @@ export default {
         const dftValue = setting[key], myValue = mySetting[key]
         // 只提取与默认配置不同的配置项
         if (dftValue != undefined && !fastEqual(dftValue, myValue)) {
-          console.log(myValue)
           config[key] = myValue
         }
       })
-      this.copyConfig = '// 自定义配置，参考 ./default/setting.js，需要自定义的属性在这里配置即可\n'
+      this.copyConfig = '// 自定义配置，参考 ./default/setting.config.js，需要自定义的属性在这里配置即可\n'
       this.copyConfig += 'module.exports = '
       this.copyConfig += formatConfig(config)
+
       let clipboard = new Clipboard('#copyBtn')
       const _this = this
       clipboard.on('success', function () {
-        _this.$message.success(`复制成功`)
+        _this.$message.success(`复制成功，覆盖文件 src/config/config.js 然后重启项目即可生效`)
         clipboard.destroy()
       })
     },
diff --git a/src/components/setting/i18n.js b/src/components/setting/i18n.js
index 1ced7d0..602df6d 100644
--- a/src/components/setting/i18n.js
+++ b/src/components/setting/i18n.js
@@ -28,6 +28,7 @@ module.exports = {
       },
       animate: {
         title: '页面切换动画',
+        disable: '禁用动画',
         effect: '动画效果',
         direction: '动画方向'
       },
@@ -62,6 +63,7 @@ module.exports = {
       },
       animate: {
         title: '頁面切換動畫',
+        disable: '禁用動畫',
         effect: '動畫效果',
         direction: '動畫方向'
       },
@@ -96,6 +98,7 @@ module.exports = {
       },
       animate: {
         title: 'Page Toggle Animation',
+        disable: 'Disable',
         effect: 'Effect',
         direction: 'Direction'
       },
diff --git a/src/components/transition/PageToggleTransition.vue b/src/components/transition/PageToggleTransition.vue
index 67bb9d5..a92d5b6 100644
--- a/src/components/transition/PageToggleTransition.vue
+++ b/src/components/transition/PageToggleTransition.vue
@@ -1,7 +1,7 @@
 <template>
   <transition
-    :enter-active-class="`animated ${enterAnimate} page-toggle-enter-active`"
-    :leave-active-class="`animated ${leaveAnimate} page-toggle-leave-active`"
+    :enter-active-class="disabled ? 'animate-disabled' : `animated ${enterAnimate} page-toggle-enter-active`"
+    :leave-active-class="disabled ? 'animate-disabled' : `animated ${leaveAnimate} page-toggle-leave-active`"
   >
     <slot></slot>
   </transition>
@@ -13,6 +13,10 @@
   export default {
     name: 'PageToggleTransition',
     props: {
+      disabled: {
+        type: Boolean,
+        default: false
+      },
       animate: {
         type: String,
         validator(value) {
diff --git a/src/config/config.js b/src/config/config.js
index 6f1f53d..d985f96 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -1,4 +1,4 @@
-// 自定义配置，参考 ./default/setting.js，需要自定义的属性在这里配置即可
+// 自定义配置，参考 ./default/setting.config.js，需要自定义的属性在这里配置即可
 module.exports = {
   theme: {
     color: '#13c2c2',
diff --git a/src/config/default/setting.config.js b/src/config/default/setting.config.js
index 997a9fb..a1b3e97 100644
--- a/src/config/default/setting.config.js
+++ b/src/config/default/setting.config.js
@@ -14,6 +14,7 @@ module.exports = {
   systemName: 'Vue Antd Admin',         //系统名称
   copyright: '2018 ICZER 工作室出品',    //copyright
   animate: {                            //动画设置
+    disabled: false,                    //禁用动画，true:禁用，false:启用
     name: 'bounce',                     //动画效果，支持的动画效果可参考 ./animate.config.js
     direction: 'left'                   //动画方向，切换页面时动画的方向，参考 ./animate.config.js
   },
diff --git a/src/layouts/BlankView.vue b/src/layouts/BlankView.vue
index 2ddd4ed..0e3acbf 100644
--- a/src/layouts/BlankView.vue
+++ b/src/layouts/BlankView.vue
@@ -1,5 +1,5 @@
 <template>
-  <page-toggle-transition :animate="animate.name" :direction="animate.direction">
+  <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
     <keep-alive v-if="multiPage">
       <router-view />
     </keep-alive>
diff --git a/src/layouts/PageView.vue b/src/layouts/PageView.vue
index a189bf2..c969cf9 100644
--- a/src/layouts/PageView.vue
+++ b/src/layouts/PageView.vue
@@ -3,7 +3,7 @@
     <div v-if="this.extraImage && !isMobile" slot="extra" class="extraImg">
       <img :src="extraImage"/>
     </div>
-    <page-toggle-transition :animate="animate.name" :direction="animate.direction">
+    <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
       <keep-alive v-if="multiPage">
         <router-view ref="page" />
       </keep-alive>
diff --git a/src/layouts/TabsView.vue b/src/layouts/TabsView.vue
index abe08d4..bb3334f 100644
--- a/src/layouts/TabsView.vue
+++ b/src/layouts/TabsView.vue
@@ -15,7 +15,7 @@
       </a-tab-pane>
     </a-tabs>
     <div class="tabs-view-content">
-      <page-toggle-transition :animate="animate.name" :direction="animate.direction">
+      <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
         <keep-alive v-if="multiPage">
           <router-view />
         </keep-alive>