From d8900152bd457b177e0d1c71d25db8cc01e12687 Mon Sep 17 00:00:00 2001 From: luchenqun Date: Fri, 16 Jun 2017 10:51:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B9=A6=E7=AD=BE=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E9=A1=B5=E9=9D=A2=E9=80=89=E6=8B=A9=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E3=80=82=E7=94=B1=E4=BB=A5=E5=89=8D?= =?UTF-8?q?=E5=9C=A8=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E9=80=89=E5=88=86?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E6=94=B9=E4=B8=BA=E6=9B=B4=E7=9B=B4=E8=A7=82?= =?UTF-8?q?=E5=9C=B0=E9=80=89=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/scripts/controllers/edit-controller.js | 117 ++++++------------ .../scripts/controllers/menus-controller.js | 12 +- public/scripts/controllers/tags-controller.js | 9 ++ public/views/edit.html | 34 ++--- public/views/menus.html | 2 +- public/views/settings.html | 6 + 6 files changed, 69 insertions(+), 111 deletions(-) diff --git a/public/scripts/controllers/edit-controller.js b/public/scripts/controllers/edit-controller.js index 09d2f68..2dac41c 100644 --- a/public/scripts/controllers/edit-controller.js +++ b/public/scripts/controllers/edit-controller.js @@ -35,52 +35,8 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo }); }); - $scope.addTags = function() { - console.log('Hello , you have click add tag btn......'); - - // 先将中文逗号替换成英文逗号，然后将多个英文逗号换成一个英文逗号 - $scope.newTags = $scope.newTags.replace(/，/g, ",").replace(/,+/g, ","); - var tags = $scope.newTags.split(","); - var params = []; - tags.forEach(function(tag) { - tag = tag.replace(/(^\s*)|(\s*$)/g, '').replace(/\s+/g, ' '); // 去除前后空格，多个空格转为一个空格; - // 过滤是""的情况 - if (tag) { - params.push(tag); - } - }); - - if (tags.length + $scope.tags.length >= 30) { - toastr.error('标签个数总数不能超过30个！不允许再添加新分类，如有需求，请联系管理员。', "提示"); - return; - } - - bookmarkService.addTags(params) - .then((data) => { - $scope.tags = data; - pubSubService.publish('EditCtr.addTagsSuccess', data); - $scope.newTags = ''; - toastr.success('[ ' + params.toString() + ' ]分类添加成功！', "提示"); - $timeout(() => { - // 将新增加的分类自动添加到下啦列表中 - var count = 0; - params.forEach((tagName) => { - data.forEach((tag) => { - if (tagName == tag.name) { - if (count < maxSelections) { - $('.ui.fluid.search.dropdown').dropdown('set selected', tag.id); - } - count++; - } - }); - }); - }); - }) - .catch((err) => console.log('addTags err', err)); - } $scope.cancel = function() { $('.ui.modal.js-add-bookmark').modal('hide'); - $('.ui.modal.js-add-bookmark .ui.dropdown').dropdown('clear'); init(); } @@ -121,7 +77,6 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo .then((data) => { $('.ui.modal.js-add-bookmark').modal('hide'); pubSubService.publish('EditCtr.inserBookmarsSuccess', data); - console.log(JSON.stringify(data)); if (data.title) { toastr.success('[ ' + data.title + ' ] 添加成功，将自动重新更新书签！
' + (data.update ? '系统检测到该书签之前添加过，只更新链接，描述，标题，分类。创建日期与最后点击日期不更新！' : ''), "提示"); } else { @@ -166,7 +121,17 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo toastr.error('标签个数总数不能超过30个！不允许再添加新分类，如有需求，请联系管理员。', "提示"); return; } + tag = tag.replace(/(^\s*)|(\s*$)/g, '').replace(/\s+/g, ' '); // 去除前后空格，多个空格转为一个空格; + + var exist = $scope.tags.some((item) => { + return item.name == tag; + }) + if (exist) { + toastr.error('该分类【' + tag + '】已存在！', "提示"); + return; + } + if (tag) { ngDialog.close(dialog); @@ -174,9 +139,23 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo tags.push(tag); bookmarkService.addTags(tags) .then((data) => { - console.log(JSON.stringify(data)); - toastr.success('[ ' + tag + ' ]插入分类成功！将自动更新分类信息', "提示"); - // getTags({}); + + // 获取已经选择的个数 + var clickedCount = $scope.tags.filter((item) => { + return item.clicked; + }).length + + // 获取新增的tag(由于这里只增加一个，所以弹出数组最后一个即可) + var newTag = data.filter((item) => { + return item.name == tag; + }).pop(); + + if (newTag) { + newTag.clicked = clickedCount <= 2; + $scope.tags.push(newTag); + } + + toastr.success('[ ' + tag + ' ]插入分类成功！', "提示"); }) .catch((err) => { toastr.warning('[ ' + tag + ' ]插入分类失败：' + JSON.stringify(err), "提示"); @@ -203,7 +182,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo } currCntTag += Number(clicked); - if (currCntTag <= 3) { + if (currCntTag <= 3 && currCntTag >= 1) { if (clickTag) { clickTag.clicked = clicked; } @@ -218,8 +197,6 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo $('.ui.modal.js-add-bookmark').modal({ closable: false, }).modal('setting', 'transition', dataService.animation()).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'); cancelDefault = true; init(); @@ -234,9 +211,9 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo setTimeout(function() { $('.ui.modal.js-add-bookmark').modal("refresh"); }, 500); - $('.ui.modal.js-add-bookmark .ui.dropdown').dropdown('clear'); - $('.ui.modal.js-add-bookmark .ui.dropdown').addClass('loading'); $scope.add = false; + $scope.loadTags = true; + cancelDefault = false; bookmarkService.getBookmark(params) .then((data) => { console.log('getBookmark ', data); @@ -263,8 +240,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo }) }); }); - - $('.ui.modal.js-add-bookmark .ui.dropdown').removeClass('loading'); + $scope.loadTags = false; }) .catch((err) => console.log('updateBookmark err', err)); }); @@ -274,17 +250,13 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo $('.ui.modal.js-add-bookmark').modal({ closable: false, }).modal('setting', 'transition', dataService.animation()).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'); + cancelDefault = false; init(); getTags({}); $scope.autoGettitle = false; $scope.url = bookmark.url; $scope.title = bookmark.title; - if (bookmark.tags && bookmark.tags.length >= 1) { - $scope.newTags = bookmark.tags.map((item) => item.name).toString(); - } }); // 在输入文字的时候也会触发，所以不要用Ctrl,Shift之类的按键 @@ -300,8 +272,6 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo $('.ui.modal.js-add-bookmark').modal({ closable: false, }).modal('setting', 'transition', dataService.animation()).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'); cancelDefault = true; init(); @@ -326,41 +296,24 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo data.forEach((tag) => { tag.clicked = false; }) + if ($scope.add && data.length >= 1) { data[0].clicked = true; } $scope.tags = data; - initJsTags(); - $('.ui.modal.js-add-bookmark .ui.dropdown').removeClass('loading'); + $scope.loadTags = false; }) .catch((err) => console.log('getTags err', err)); } - function initJsTags() { - setTimeout(function() { - $('.ui.modal.js-add-bookmark .ui.dropdown').removeClass('loading'); - $('.ui.dropdown.js-tags').dropdown({ - forceSelection: false, - maxSelections: maxSelections, - action: 'combo', - onChange: function(value, text, $choice) { - var selectedTags = $('.ui.modal.js-add-bookmark .ui.dropdown').dropdown('get value'); - $timeout(function() { - $scope.tagsError = (selectedTags.length == 0 || selectedTags.length > maxSelections) && ($('.ui.modal.js-add-bookmark').modal('is active')); - }); - } - }); - }, 1000) - } - function init() { $scope.add = true; + $scope.loadTags = true; $scope.autoGettitle = true; $scope.id = ''; $scope.url = ''; $scope.title = ''; $scope.description = ''; - $scope.newTags = ''; $scope.tags = []; // tag = {id:xxx, name:'yyy'} $scope.urlError = false; diff --git a/public/scripts/controllers/menus-controller.js b/public/scripts/controllers/menus-controller.js index e9ecf7f..f6cc807 100644 --- a/public/scripts/controllers/menus-controller.js +++ b/public/scripts/controllers/menus-controller.js @@ -140,6 +140,16 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time .catch((err) => console.log('logout err', err)); } + $scope.showUpdate = function () { + $state.go('settings', { + formIndex: 5, + }); + pubSubService.publish('Common.menuActive', { + login: true, + index: dataService.LoginIndexSettings + }); + } + function updateMenuActive(index) { $('.ui.menu a.item').removeClass('selected'); $('.ui.menu a.item:eq(' + index + ')').addClass('selected'); @@ -197,7 +207,7 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time title: '操作提示', position: 'bottom center', variation: "very wide", - html: '特别提示：如果功能不正常，请先尝试清除浏览器缓存！
1、在任意页面，按A键添加备忘录。
2、在热门收藏页面，按R键随机查看热门收藏。
3、在任意页面，按数字键切换菜单栏。
4、在书签页面鼠标放在书签上，按C复制书签链接
5、在书签页面鼠标放在书签上，按E编辑书签
6、在书签页面鼠标放在书签上，按D删除书签
7、在书签页面鼠标放在书签上，按I查看书签详情
8、在任意页面，按INSERT做添加书签
9、在任意页面，按ESC退出弹窗
' + html: '特别提示：如果功能不正常，请先尝试清除浏览器缓存！点击查看更新日志！
1、在任意页面，按A键添加备忘录。
2、在热门收藏页面，按R键随机查看热门收藏。
3、在任意页面，按数字键切换菜单栏。
4、在书签页面鼠标放在书签上，按C复制书签链接
5、在书签页面鼠标放在书签上，按E编辑书签
6、在书签页面鼠标放在书签上，按D删除书签
7、在书签页面鼠标放在书签上，按I查看书签详情
8、在任意页面，按INSERT做添加书签
9、在任意页面，按ESC退出弹窗
' }); }, 1000) diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js index 225eccf..4624744 100644 --- a/public/scripts/controllers/tags-controller.js +++ b/public/scripts/controllers/tags-controller.js @@ -346,6 +346,15 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim return; } tag = tag.replace(/(^\s*)|(\s*$)/g, '').replace(/\s+/g, ' '); // 去除前后空格，多个空格转为一个空格; + + var exist = $scope.tags.some((item) => { + return item.name == tag; + }) + if (exist) { + toastr.error('该分类【' + tag + '】已存在！', "提示"); + return; + } + if (tag) { ngDialog.close(dialog); diff --git a/public/views/edit.html b/public/views/edit.html index 3556feb..23f0ee1 100644 --- a/public/views/edit.html +++ b/public/views/edit.html @@ -17,43 +17,23 @@ -
-
{{ tag.name }}
-
+
+
正在获取分类...
+
+
{{ tag.name }}
+
-
diff --git a/public/views/menus.html b/public/views/menus.html index 1b1d1ff..710c4a8 100644 --- a/public/views/menus.html +++ b/public/views/menus.html @@ -72,7 +72,7 @@
-
+
diff --git a/public/views/settings.html b/public/views/settings.html index 8e565a8..e2ba54a 100644 --- a/public/views/settings.html +++ b/public/views/settings.html @@ -202,6 +202,12 @@

更新日志

+
+
2017-06-16
+
    +
  • 修改书签操作页面选择分类的逻辑。由以前在下拉列表选分类，改为更直观地选标签。
    • +
+
2017-06-14