From 7ea24707b9567f67dd8e97e2caf64bbf46e32eaf Mon Sep 17 00:00:00 2001 From: luchenqun Date: Wed, 1 Mar 2017 20:27:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=AC=E5=AD=98=E5=85=B1?= =?UTF-8?q?=E5=AB=A9=EF=BC=8C=E8=83=BD=E5=B0=86=E6=90=9C=E7=B4=A2=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E4=B9=A6=E7=AD=BE=E8=BD=AC=E4=B8=BA=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E7=9A=84=E4=B9=A6=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/db.js | 2 +- public/images/store-bookmark-hover.png | Bin 0 -> 805 bytes public/images/store-bookmark.png | Bin 0 -> 808 bytes public/scripts/controllers/edit-controller.js | 20 +++++++++++++++++- .../scripts/controllers/search-controller.js | 5 +++++ public/views/search.html | 3 +++ routes/api.js | 13 ++++++------ 7 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 public/images/store-bookmark-hover.png create mode 100644 public/images/store-bookmark.png diff --git a/database/db.js b/database/db.js index f2ed244..56e9e52 100644 --- a/database/db.js +++ b/database/db.js @@ -505,7 +505,7 @@ db.getBookmarksNavigate = function(tags) { } sql += "(SELECT * FROM ((SELECT t.id AS tag_id, t.`name` as tag_name, t.sort, b.* FROM `tags` as t, `bookmarks`as b, `tags_bookmarks` as tb WHERE t.id = tb.tag_id AND b.id = tb.bookmark_id AND t.id = " + tag.id + " ORDER BY b.click_count DESC LIMIT 0, 16) UNION (SELECT t.id AS tag_id, t.`name` as tag_name, t.sort, b.* FROM `tags` as t, `bookmarks`as b, `tags_bookmarks` as tb WHERE t.id = tb.tag_id AND b.id = tb.bookmark_id AND t.id = " + tag.id + " ORDER BY b.created_at DESC LIMIT 0, 16)) as " + t + " ORDER BY " + t + ".click_count DESC, " + t + ".created_at DESC)"; }) - console.log(sql); + // console.log('getBookmarksNavigate ', sql); return new Promise(function(resolve, reject) { client.query(sql, (err, result) => { diff --git a/public/images/store-bookmark-hover.png b/public/images/store-bookmark-hover.png new file mode 100644 index 0000000000000000000000000000000000000000..9966297e05256b6c07e1b452236ac57df58ffb57 GIT binary patch literal 805 zcmV+=1KRwFP)KnF1uU^*}bSSS@hDoD5mW~60S zNJ9Slwj`SgI(aPpzi)TnzJ0_yKYZu-s0E;XCI=$eCEyCsB+$$yFcTn%99#w`45}tp z3cx*=oyH>$1?U+8m&Op_p2Tq8=Vcj?l>poy;yMwoss`3zBKQqrN@5mnVHOW z0klTaCGoQ?1M__-*b6+)s-Cj~s1jU&Ul63(HA#F*Dsbw19P015f`WYt+;AI5wrUgr zDA6FevSkpL7Z^q#Ff}hzt~gKVGJ-qz*wypxu}lH%CwB$mHulVO3jpFv9&u~yxe&*G zpBGh2tKYTGq({Mdc1CcSf=mBf0MHuC1%YoykcUukP^Yiyd3Pku2630a&*Vr3Aj$rY zz)t>v2#$P@lRBB_zio{~M>6I|^33J~?iDIvBc2Fue2<-VgU4;KR5cWQ4m{rL`>X;6 zVd9u|N6H4&M(RADG5}_&l<~gDywt8$2rGbGWnTe|B_Qx6jk0O)Ga|l7`5%Ka-G-Z@NVaLU7UX48$HyPA zw<&-+B)o_mOw>%YM=}9%2;%Fe?a1!RWwLAxyCBX9=qf$1saD-;*rYhom!c3Qy;61h zxG*wnETQy#%NT9_U)Q)lpj(jQST;v8B=OzMbe*w`cgsKYNN6yX^OwYow%XQltOW%S z#L(~av~C;p`}SDWxF~?@`G9GA6FkO^>S7uZZf${5vl(vTx?o6j^*Y#%i2K_U-egMn zx{@ElZ8TRJlB{>t{GeLz*pgW+I#Q)e#&8lk=-BLfnJHBVv_Q%#Ey%BN1+dB;SFz<2 z8z)u)5kY25%K%rBVl^vjMh$1P{O%e8RtZ3kP#x!Gq&gsW(#m8O-N7`9FiqV~S@!>B j8I^&kRe`e0)_MO7L*R5UB4k`}00000NkvXXu0mjfK6__z literal 0 HcmV?d00001 diff --git a/public/images/store-bookmark.png b/public/images/store-bookmark.png new file mode 100644 index 0000000000000000000000000000000000000000..1b5715b3ef950ccc9208159b5a7948ae997cc3e6 GIT binary patch literal 808 zcmV+@1K0eCP)-GB2DG<2;IOn$j@V#gUj^_g*L{v7;37|}JMEn5&$?g;%-l?SbLWnW_rV0YUN5)uh zyWQTos&NE>i01qLlWPZ5Ug~We$5VST;!2~@xTR!LO8O=MQw4xP&f+*8*l`&EYLQo0 z&k^y9l=7i$X%zq>?l&ESh%_MyIDKURbi3UL&+|T8Nj8kJVU@n>_;$M;)M~Y#)_NI^ zqyW^o(aS9}01@w`l#?nuH{a!)uK_^wgC0dfh`~_>a)|dLgy^4}oZ?(n-S7ABSF06i z#Xlu931cLzG*T|0E>fF(N?Tx;iWo1YG^O^eLgY+UT3Hjo3;;eDjJ>G$dL6~B-xm5~ z0BQsy0&ywv>{5kci1s}pM6&rK9jMpq{pE5wJ*(b1K@I>LAw)85g{R@AKq|Gslt~(& z#bPnK6hLVbQbGWjkeT3|PXOTNa5#Lrv>kdaOWaafH>ZG(U(#(lN{1>Sqgqv~kt4;- zDMYGQq)u0PXsZI?oM%Rx;^`QdQj*b0t_%soFr;(*tDWeau~ZuxAtHGKlJjI^c3WM? zaiRr|-HwG2_f@Mv?}uSX#^nkTpQV(#y~h=xJIckpx)N!#8OQOnZ7itYzVBaqp0}RQ z=Px?m;K63Q-3BKOi4H1h$*8}kCCi)}TItjnP7ty0vg<{rlpIiolqFk`YCQos<&MkP za?%7BCr)8WjcF0!Qc_GUAv0<@o7}al2v{iqI#U>iG)~C}5nH-4+M?4RlEdLJ)o!O~ m_y6TEDgsfd0!53R^ZYOV6PGXvgFyoT0000 console.log('updateBookmark err', err)); }); + pubSubService.subscribe('TagCtr.storeBookmark', $scope, function(event, bookmark) { + console.log('TagCtr.storeBookmark', bookmark); + $('.ui.modal.js-add-bookmark').modal({ + closable: false, + }).modal('show'); + $('.ui.modal.js-add-bookmark .ui.dropdown').dropdown('clear'); + $('.ui.modal.js-add-bookmark .ui.dropdown').addClass('loading'); + $('.ui.checkbox.js-public').checkbox('set checked'); + init(); + getTags({}); + $scope.autoGettitle = false; + $scope.url = bookmark.url; + $scope.title = bookmark.title; + $scope.newTags = bookmark.tags.map((item) => item.name).toString(); + }); + function getTags(params) { bookmarkService.getTags(params) .then((data) => { @@ -202,6 +219,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', 'bookmarkService', 'p function init() { $scope.add = true; + $scope.autoGettitle = true; $scope.id = ''; $scope.url = ''; $scope.title = ''; diff --git a/public/scripts/controllers/search-controller.js b/public/scripts/controllers/search-controller.js index e33f9d5..36fe28c 100644 --- a/public/scripts/controllers/search-controller.js +++ b/public/scripts/controllers/search-controller.js @@ -103,6 +103,11 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi pubSubService.publish('TagCtr.showBookmarkInfo', bookmark); } + $scope.storeBookmark = function(bookmark) { + var b = $.extend(true, {}, bookmark); // 利用jQuery执行深度拷贝 + pubSubService.publish('TagCtr.storeBookmark', b); + } + $scope.search = function(page) { var params = {} params.userRange = $('.js-user-range').dropdown('get value'); diff --git a/public/views/search.html b/public/views/search.html index c3f053c..17af20f 100644 --- a/public/views/search.html +++ b/public/views/search.html @@ -153,6 +153,9 @@ + + + diff --git a/routes/api.js b/routes/api.js index d4daeda..00fd1c1 100644 --- a/routes/api.js +++ b/routes/api.js @@ -231,6 +231,7 @@ api.get('/bookmarks', function(req, res) { db.getTags(userId) .then((tags) => db.getBookmarksNavigate(tags)) .then((result) => { + console.log('ddddddddddddd') var data = []; var tag = { id: result && result[0] && result[0].tag_id, @@ -547,13 +548,13 @@ api.post('/uploadBookmarkFile', upload.single('bookmark'), function(req, res) { var tags = []; item.tags.forEach((tag) => { - allTags.forEach((at) => { - if (at.name == tag) { - tags.push(at.id); - } - }) + allTags.forEach((at) => { + if (at.name == tag) { + tags.push(at.id); + } }) - // 插入书签 + }) + // 插入书签 db.addBookmark(userId, bookmark) // 插入书签 .then((bookmark_id) => { db.delBookmarkTags(bookmark_id); // 不管3721，先删掉旧的分类