diff --git a/database/db.js b/database/db.js index 62906d8..5479c29 100644 --- a/database/db.js +++ b/database/db.js @@ -414,7 +414,7 @@ db.getUser = function(username) { }; db.getTags = function(user_id) { - var sql = "SELECT t.id, t.user_id, t.name, DATE_FORMAT(t.last_use, '%Y-%m-%d %H:%i:%s') as last_use, t.sort, tb.cnt, tg.ncnt FROM `tags` as t LEFT OUTER JOIN ( SELECT `tag_id`, COUNT(tag_id) as cnt FROM tags_bookmarks GROUP BY tag_id ) tb ON t.id = tb.tag_id LEFT OUTER JOIN ( SELECT `tag_id`, COUNT(tag_id) as ncnt FROM notes GROUP BY tag_id ) tg ON t.id = tg.tag_id "; + var sql = "SELECT t.id, t.user_id, t.name, DATE_FORMAT(t.last_use, '%Y-%m-%d %H:%i:%s') as last_use, t.sort, t.show, tb.cnt, tg.ncnt FROM `tags` as t LEFT OUTER JOIN ( SELECT `tag_id`, COUNT(tag_id) as cnt FROM tags_bookmarks GROUP BY tag_id ) tb ON t.id = tb.tag_id LEFT OUTER JOIN ( SELECT `tag_id`, COUNT(tag_id) as ncnt FROM notes GROUP BY tag_id ) tg ON t.id = tg.tag_id "; if (user_id) { sql += "WHERE t.user_id = '" + user_id + "' "; } @@ -446,6 +446,21 @@ db.updateTagName = function(tag) { }); }; +db.updateTagShow = function(tag) { + console.log('updateTagShow'); + var sql = "UPDATE `tags` SET `show`='" + tag.show + "' WHERE (`id`='" + tag.id + "')"; + console.log(sql); + return new Promise(function(resolve, reject) { + client.query(sql, (err, result) => { + if (err) { + reject(err); + } else { + resolve(result.affectedRows); + } + }); + }); +}; + db.updateTagsIndex = function(tagsIndex) { console.log('updateTagsIndex'); var sql = "UPDATE tags SET sort = CASE id "; diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js index aa540d9..037635b 100644 --- a/public/scripts/controllers/tags-controller.js +++ b/public/scripts/controllers/tags-controller.js @@ -273,6 +273,26 @@ app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$statePara tag.oldName = tag.name; tag.edit = true; } + + $scope.updateTagShow = function (tag, show) { + var params = { + id: tag.id, + show: show, + } + bookmarkService.updateTagShow(params) + .then((data) => { + if (data.retCode == 0) { + toastr.success(tag.name + ' 更新成功!', "提示"); + tag.show = show; + } else { + toastr.error(tag.name + ' 更新失败!错误提示:' + data.msg, "提示"); + } + }) + .catch((err) => { + toastr.error(tag.name + ' 更新失败!错误提示:' + err, "提示"); + }); + } + $scope.updateTag = function (tag) { if (tag.name == tag.oldName) { toastr.warning('您没有编辑分类', "警告"); diff --git a/public/scripts/services/bookmark-service.js b/public/scripts/services/bookmark-service.js index d78ef4d..97da610 100644 --- a/public/scripts/services/bookmark-service.js +++ b/public/scripts/services/bookmark-service.js @@ -300,6 +300,19 @@ app.factory('bookmarkService', ['$http', '$q', function($http, $q) { }); return def.promise; }, + updateTagShow: function(params) { + var def = $q.defer(); + $http.post('/api/updateTagShow/', { + params: params + }) + .success(function(data) { + def.resolve(data); + }) + .error(function(data) { + def.reject(data); + }); + return def.promise; + }, updateTagsIndex: function(params) { var def = $q.defer(); $http.post('/api/updateTagsIndex/', { diff --git a/public/views/tags.html b/public/views/tags.html index 0e5fe76..bb6b20d 100644 --- a/public/views/tags.html +++ b/public/views/tags.html @@ -3,7 +3,7 @@