diff --git a/aurelia_project/tasks/run.js b/aurelia_project/tasks/run.js
index baaca561a8b24bbd0c2efa972293b52f6305742c..0e264bdae9eb6fc7d0be3c9b8105002c560703ee 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 2980f14286cfd0563b4d76325f9353b8ef770f92..526e54fcc3892330973c383fc70a366799d50d7b 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 695eaac5474e7502232560423e083db72de120a1..7c5bfe3221ab16214618d23de24e5cb7f655e464 100644
--- a/src/resources/elements/em-blog-left-sidebar.html
+++ b/src/resources/elements/em-blog-left-sidebar.html
@@ -25,6 +25,27 @@
+
+
+
+
+
+ ${spaceRecent.name}
+
+
+
+
diff --git a/src/resources/elements/em-blog-left-sidebar.js b/src/resources/elements/em-blog-left-sidebar.js
index 13850c9988586010a4a7d0d2ab547a5f13e4350c..0e22cfe9ce485ca3b2f4d99b797edaaf7f29d3b9 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 6d9a8badf597020201664fe1bf8b9bffe78f66c0..c6bda454411325f79933fe1333bacb402ae0577f 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 b09e0daaa7424d0472e2cb9b98bf45154ebfa7de..2816b9fb2ca28d34a86aa2925ca1f62b3926afd7 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;
}
}