From 29666c21ab1ba8403e36958878aba89980f93492 Mon Sep 17 00:00:00 2001
From: xiweicheng <xiweicheng@yeah.net>
Date: Wed, 14 Feb 2018 11:53:46 +0800
Subject: [PATCH] =?UTF-8?q?#IHIS4=20=E5=8D=9A=E6=96=87=E6=9C=80=E8=BF=91?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=96=87=E7=AB=A0=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=E6=89=BE=E5=88=B0=E6=9C=80=E8=BF=91=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=88=9B=E5=BB=BA=E7=9A=84=E6=96=87=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 aurelia_project/tasks/run.js                  |  7 ++++---
 src/init/config.js                            |  3 ++-
 .../elements/em-blog-left-sidebar.html        | 21 +++++++++++++++++++
 .../elements/em-blog-left-sidebar.js          |  5 +++++
 src/resources/elements/em-blog-save.js        |  2 ++
 src/resources/value-converters/vc-common.js   | 10 +++++++--
 6 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/aurelia_project/tasks/run.js b/aurelia_project/tasks/run.js
index baaca56..0e264bd 100644
--- a/aurelia_project/tasks/run.js
+++ b/aurelia_project/tasks/run.js
@@ -33,11 +33,12 @@ let serve = gulp.series(
                         next();
                     },
                     proxyMiddleware(['/free', '/admin', '/upload', '/lib'], {
-                        target: 'http://translation.sh1.newtouch.com',
+                        // target: 'http://translation.sh1.newtouch.com',
                         // target: 'http://tms000.sh1.newtouch.com',
-                        // target: 'https://xiweicheng.com',
+                        target: 'https://xiweicheng.com',
                         // target: 'http://localhost',
-                        changeOrigin: true
+                        changeOrigin: true,
+                        secure: false
                     }),
                 ]
             }
diff --git a/src/init/config.js b/src/init/config.js
index 2980f14..526e54f 100644
--- a/src/init/config.js
+++ b/src/init/config.js
@@ -70,7 +70,7 @@ export class Config {
                             });
 
                             if (resp.status == 401) {
-                                toastr.error('用户未登录!');
+                                toastr.error('用户未登录或者会话超时!');
                                 utils.redirect2Login();
                                 return;
                             }
@@ -207,6 +207,7 @@ export class Config {
         // });
         $(document).ajaxError(function(event, xhr, settings) {
             if (xhr && xhr.status == 401) {
+                toastr.error('用户未登录或者会话超时!');
                 utils.redirect2Login();
             }
         });
diff --git a/src/resources/elements/em-blog-left-sidebar.html b/src/resources/elements/em-blog-left-sidebar.html
index 695eaac..7c5bfe3 100644
--- a/src/resources/elements/em-blog-left-sidebar.html
+++ b/src/resources/elements/em-blog-left-sidebar.html
@@ -25,6 +25,27 @@
                             </div>
                         </div>
                     </div>
+                    <div class="item" style="padding-top: 0.214286em;">
+                        <i click.delegate="spaceToggleHandler(spaceRecent)" class="angle ${spaceRecent.open ? 'down' : 'right'} link icon"></i>
+                        <div class="content">
+                            <span style="cursor: pointer;" click.delegate="spaceToggleHandler(spaceRecent)">
+                                    <i class="history icon" style="margin-right: 0; position: relative; left: -2px;"></i>
+                                    ${spaceRecent.name}
+                                </span>
+                            <div show.bind="spaceRecent.open" class="ui bulleted list">
+                                <template repeat.for="blog of blogs | sort:'updateDate':true | take:20">
+                                    <div if.bind="blog.status != 'Deleted'" show.bind="!blog._hidden" class="item ${blog.id == $parent.blog.id ? 'active' : ''}">
+                                        <a title="${blog.title}" href="#/blog/${blog.id}">
+                                            <i class="icons">
+                                                <i class="file outline icon"></i>
+                                            <i show.bind="blog.privated" class="corner lock icon"></i>
+                                            </i>
+                                            ${blog.title}</a>
+                                    </div>
+                                </template>
+                            </div>
+                        </div>
+                    </div>
                     <template repeat.for="space of spaces | sort:'name'">
                         <div class="item" show.bind="!space._hidden">
                             <i click.delegate="spaceToggleHandler(space)" class="angle ${space.open ? 'down' : 'right'} link icon"></i>
diff --git a/src/resources/elements/em-blog-left-sidebar.js b/src/resources/elements/em-blog-left-sidebar.js
index 13850c9..0e22cfe 100644
--- a/src/resources/elements/em-blog-left-sidebar.js
+++ b/src/resources/elements/em-blog-left-sidebar.js
@@ -18,6 +18,11 @@ export class EmBlogLeftSidebar {
         open: false
     };
 
+    spaceRecent = {
+        name: '最近更新',
+        open: false
+    };
+
     /**
      * 构造函数
      */
diff --git a/src/resources/elements/em-blog-save.js b/src/resources/elements/em-blog-save.js
index 6d9a8ba..c6bda45 100644
--- a/src/resources/elements/em-blog-save.js
+++ b/src/resources/elements/em-blog-save.js
@@ -50,6 +50,8 @@ export class EmBlogSave {
             if (data.success) {
                 this.spaces = data.data;
             }
+        }).fail(() => {
+            this.emModal.hide();
         });
     }
 
diff --git a/src/resources/value-converters/vc-common.js b/src/resources/value-converters/vc-common.js
index b09e0da..2816b9f 100644
--- a/src/resources/value-converters/vc-common.js
+++ b/src/resources/value-converters/vc-common.js
@@ -78,8 +78,14 @@ export class ParseMdValueConverter {
 }
 
 export class SortValueConverter {
-    toView(value, prop) {
-        return _.isArray(value) ? _.sortBy(value, prop) : value;
+    toView(value, prop, reverse = false) {
+        return _.isArray(value) ? (!reverse ? _.sortBy(value, prop) : _.reverse(_.sortBy(value, prop))) : value;
+    }
+}
+
+export class TakeValueConverter {
+    toView(value, count, tail = false) {
+        return _.isArray(value) ? (!tail ? _.take(value, count) : _.takeRight(value, count)) : value;
     }
 }
 
-- 
Gitee