From 4e98bbb98883eda44a9eb6829d539d64701b5afb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Wed, 17 Jan 2018 10:19:35 +0800
Subject: [PATCH] no message

Former-commit-id: 9e432e4a181c3f92f1e4b4475a1dc14aff9694d4
Former-commit-id: 4de6ab768a01bc2a4147178d40ff7404bf4f2237
Former-commit-id: 70a50252bf172dd7ae87565e121f1cc565afb000
---
 .../icon.js.REMOVED.git-id                    |  1 +
 src/pages/demo/plugins/font-awesome/index.vue | 21 +++++++++++++++++++
 src/pages/demo/plugins/timeago/demo.vue       |  8 ++++++-
 src/router/menu/_plugin.js                    | 14 +++++++++++++
 .../markdownFiles/article/timeago演示代码.md  |  8 ++++++-
 5 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/library/font-awesome-4.7.0-icon/icon.js.REMOVED.git-id
 create mode 100644 src/pages/demo/plugins/font-awesome/index.vue

diff --git a/src/assets/library/font-awesome-4.7.0-icon/icon.js.REMOVED.git-id b/src/assets/library/font-awesome-4.7.0-icon/icon.js.REMOVED.git-id
new file mode 100644
index 00000000..bf812954
--- /dev/null
+++ b/src/assets/library/font-awesome-4.7.0-icon/icon.js.REMOVED.git-id
@@ -0,0 +1 @@
+d22b6dcdd003a008903fbb724373ac10b4e3a0f8
\ No newline at end of file
diff --git a/src/pages/demo/plugins/font-awesome/index.vue b/src/pages/demo/plugins/font-awesome/index.vue
new file mode 100644
index 00000000..f0f7f074
--- /dev/null
+++ b/src/pages/demo/plugins/font-awesome/index.vue
@@ -0,0 +1,21 @@
+<template>
+  <Container>
+    <div v-for="(item, index) in icon" :key="index">
+      <h1>{{item.title}}</h1>
+      <div>
+        <span v-for="(iconItem, iconIndex) in item.icon" :key="iconIndex" :class="'fa fa-' + iconItem"></span>
+      </div>
+    </div>
+  </Container>
+</template>
+
+<script>
+import icon from '@/assets/library/font-awesome-4.7.0-icon/icon.js'
+export default {
+  data () {
+    return {
+      icon
+    }
+  }
+}
+</script>
diff --git a/src/pages/demo/plugins/timeago/demo.vue b/src/pages/demo/plugins/timeago/demo.vue
index 6bd9f96a..2301690e 100644
--- a/src/pages/demo/plugins/timeago/demo.vue
+++ b/src/pages/demo/plugins/timeago/demo.vue
@@ -39,6 +39,8 @@ export default {
       openPageDate: new Date(),
       // 打开页面已经过去的时间
       openPageDateAgo: '',
+      // 打开页面时间计时器
+      dateTimeRangeTimer: null,
       // 起止时间
       dateTimeRange: [new Date(2018, 0, 1, 0, 0), new Date()],
       // 上面起止时间的计算结果
@@ -48,10 +50,14 @@ export default {
   mounted () {
     // 刷新打开页面过去的时间
     this.refreshOpenPageDateAgo()
-    setInterval(this.refreshOpenPageDateAgo, 1000)
+    this.dateTimeRangeTimer = setInterval(this.refreshOpenPageDateAgo, 1000)
     // 刷新起止时间的计算结果
     this.refreshDateTimeRangeAgo()
   },
+  beforeDestroy () {
+    // 清空计时器
+    clearInterval(this.dateTimeRangeTimer)
+  },
   watch: {
     dateTimeRange () {
       // 刷新起止时间的计算结果
diff --git a/src/router/menu/_plugin.js b/src/router/menu/_plugin.js
index 374f2b3d..21b87d9c 100644
--- a/src/router/menu/_plugin.js
+++ b/src/router/menu/_plugin.js
@@ -57,6 +57,20 @@ export const pluginMenu = {
         }
       ]
     },
+    // font-awesome
+    {
+      title: '图标库',
+      icon: 'edit',
+      children: [
+        {
+          title: '索引',
+          icon: 'file-o',
+          path: 'font-awesome',
+          name: 'demo-font-awesome',
+          component: resolve => { require(['@/pages/demo/plugins/font-awesome/index.vue'], resolve) }
+        }
+      ]
+    },
     // 拖拽网格布局组件
     {
       title: '网格布局',
diff --git a/static/markdownFiles/article/timeago演示代码.md b/static/markdownFiles/article/timeago演示代码.md
index d6ca37c5..f0bbd90f 100644
--- a/static/markdownFiles/article/timeago演示代码.md
+++ b/static/markdownFiles/article/timeago演示代码.md
@@ -7,6 +7,8 @@ export default {
       openPageDate: new Date(),
       // 打开页面已经过去的时间
       openPageDateAgo: '',
+      // 打开页面时间计时器
+      dateTimeRangeTimer: null,
       // 起止时间
       dateTimeRange: [new Date(2018, 0, 1, 0, 0), new Date()],
       // 上面起止时间的计算结果
@@ -16,10 +18,14 @@ export default {
   mounted () {
     // 刷新打开页面过去的时间
     this.refreshOpenPageDateAgo()
-    setInterval(this.refreshOpenPageDateAgo, 1000)
+    this.dateTimeRangeTimer = setInterval(this.refreshOpenPageDateAgo, 1000)
     // 刷新起止时间的计算结果
     this.refreshDateTimeRangeAgo()
   },
+  beforeDestroy () {
+    // 清空计时器
+    clearInterval(this.dateTimeRangeTimer)
+  },
   watch: {
     dateTimeRange () {
       // 刷新起止时间的计算结果