liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新一下分类编辑(没有更新的情况

This commit is contained in:
luchenqun 2017-02-25 23:24:07 +08:00
parent 337867890d
commit d390bc4387
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database/db.js
View File

@ -299,7 +299,7 @@ db.getUser = function(username) {
db.getTags = function(user_id) { db.getTags = function(user_id) {
console.log('getTags'); console.log('getTags');
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 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 WHERE t.user_id = '" + user_id + "' ORDER BY t.last_use DESC"; 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 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 WHERE t.user_id = '" + user_id + "' ORDER BY t.sort, t.last_use DESC";
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
client.query(sql, (err, result) => { client.query(sql, (err, result) => {

5
public/scripts/controllers/tags-controller.js
View File

@ -126,6 +126,10 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
tag.edit = true; tag.edit = true;
} }
$scope.updateTag = function(tag) { $scope.updateTag = function(tag) {
if (tag.name == tag.oldName) {
toastr.warning('您没有编辑分类', "警告");
return;
}
tag.edit = false; tag.edit = false;
var params = { var params = {
id: tag.id, id: tag.id,
@ -191,6 +195,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
// TODO: 我要将编辑按钮固定在容器的右上角 // TODO: 我要将编辑按钮固定在容器的右上角
$(window).resize(updateEditPos); $(window).resize(updateEditPos);
setTimeout(updateEditPos, 100); setTimeout(updateEditPos, 100);
setTimeout(updateEditPos, 500);
setTimeout(updateEditPos, 1000); setTimeout(updateEditPos, 1000);
setTimeout(updateEditPos, 10000); setTimeout(updateEditPos, 10000);

2
public/views/tags.html
View File

@ -10,7 +10,7 @@
</div> </div>
</div> </div>
<div class="ui container" ng-show="edit"> <div class="ui container" ng-show="edit">
<p>操作说明：拖拽分类即可进行排序</p> <p>操作说明：拖拽分类即可进行排序(正在开发中...)</p>
<div class="ui six stackable cards"> <div class="ui six stackable cards">
<div class="card" ng-repeat="tag in tags"> <div class="card" ng-repeat="tag in tags">
<div class="content"> <div class="content">