From 8dc3e53dfddcc112303d42214400ec97565a8999 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Thu, 15 Jun 2017 22:57:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=96=84=E6=96=B0=E5=A2=9E=E4=B9=A6?=
 =?UTF-8?q?=E7=AD=BE=E5=BC=B9=E7=AA=97=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/edit-controller.js | 55 ++++++++++++++++---
 public/views/edit.html                        | 12 ++--
 2 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/public/scripts/controllers/edit-controller.js b/public/scripts/controllers/edit-controller.js
index a23b032..09d2f68 100644
--- a/public/scripts/controllers/edit-controller.js
+++ b/public/scripts/controllers/edit-controller.js
@@ -2,6 +2,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo
     console.log("Hello editCtr");
     var maxSelections = 3;
     var dialog = null;
+    var cancelDefault = false;
     init();
 
     $scope.$watch('url', function(newUrl, oldUrl, scope) {
@@ -84,8 +85,13 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo
         init();
     }
     $scope.ok = function() {
-        var selectedTags = $('.ui.modal.js-add-bookmark .ui.dropdown').dropdown('get value');
-        // console.log('Hello ok clicked', $scope.url, $scope.title, $scope.description, $scope.public, selectedTags);
+        var selectedTags = [];
+        $scope.tags.forEach((tag) => {
+            if (tag.clicked) {
+                selectedTags.push(tag.id);
+            }
+        });
+        // console.log('Hello ok clicked', $scope.url, $scope.title, $scope.description, $scope.public, selectedTags, $scope.tags);
         $scope.urlError = $scope.url == '';
         $scope.titleError = $scope.title == '';
         $scope.tagsError = (selectedTags.length == 0 || selectedTags.length > maxSelections);
@@ -156,7 +162,6 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo
 
     $scope.addTag = function(tag) {
         console.log(tag);
-        return;
         if ($scope.tags.length >= 30) {
             toastr.error('标签个数总数不能超过30个！不允许再添加新分类，如有需求，请联系管理员。', "提示");
             return;
@@ -169,8 +174,9 @@ 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({});
+                    // getTags({});
                 })
                 .catch((err) => {
                     toastr.warning('[ ' + tag + ' ]插入分类失败：' + JSON.stringify(err), "提示");
@@ -180,8 +186,31 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo
         }
     }
 
-    $scope.addTagsToBookmark = function(id){
-        
+    $scope.clickTag = function(id, clicked) {
+        var clickTag = null;
+        var currCntTag = 0;
+        $scope.tags.forEach((tag) => {
+                if (tag.id == id) {
+                    clickTag = tag;
+                }
+                currCntTag += Number(tag.clicked);
+            })
+            // 如果是新增书签，而且是第一次点其他选项，那么取消默认选中的分类
+        if (cancelDefault && $scope.add && clicked && currCntTag == 1) {
+            $scope.tags[0].clicked = false;
+            currCntTag -= 1;
+            cancelDefault = false; // 后面在点就不取消默认的了
+        }
+
+        currCntTag += Number(clicked);
+        if (currCntTag <= 3) {
+            if (clickTag) {
+                clickTag.clicked = clicked;
+            }
+        } else {
+            toastr.error('您至少要选择一个分类！最多选择三个分类！' + currCntTag, "错误");
+        }
+
     }
 
     pubSubService.subscribe('MenuCtr.showAddBookmarkMoadl', $scope, function(event, params) {
@@ -192,6 +221,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo
         $('.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();
         getTags({});
     });
@@ -217,14 +247,20 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo
                 $scope.url = (bookmark && bookmark.url) || '';
                 $scope.title = (bookmark && bookmark.title) || '';
                 $scope.description = (bookmark && bookmark.description) || '';
-                $scope.tags = data.tags;
+                $scope.tags = data.tags.map((tag) => {
+                    tag.clicked = false;
+                    return tag;
+                });
                 $scope.public = (bookmark && bookmark.id) || '1';
                 $('.ui.checkbox.js-public').checkbox((bookmark && bookmark.public && bookmark.public == '1') ? 'set checked' : 'set unchecked')
 
-
                 $timeout(function() {
                     data.bookmarkTags.forEach((tagId) => {
-                        $('.ui.fluid.search.dropdown').dropdown('set selected', tagId);
+                        $scope.tags.forEach((tag) => {
+                            if (tag.id == tagId) {
+                                tag.clicked = true;
+                            }
+                        })
                     });
                 });
 
@@ -267,6 +303,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo
                     $('.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();
                     getTags({});
                 }
diff --git a/public/views/edit.html b/public/views/edit.html
index 5105896..3556feb 100644
--- a/public/views/edit.html
+++ b/public/views/edit.html
@@ -34,22 +34,26 @@
                     </div>
                 </div>
             </div> -->
-
             <div class="required field">
                 <label>已有书签分类选择
                     <span title="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;友情提示：&#10;1、添加新书签，根据使用经验，默认会选择最后一次使用分类。&#10;2、如果不是的，直接去选择其他的就好，系统会自动取消。&#10;3、如果你想同时选默认与其他的分类，你选了其他分类之后，再来选中取消的默认分类即可。">
                         <i class="info circle icon"></i>
                     </span>
                 </label>
-                <div class="ui label" style="margin:3px 10px 8px 0px;cursor:default;" ng-class="{green:tag.clicked}" ng-repeat="tag in tags" ng-click="addTagsToBookmark(tag.id)">{{ tag.name }}</div>
+                <div class="ui label" style="margin:3px 10px 8px 0px;cursor:default;" ng-class="{green:tag.clicked}" ng-repeat="tag in tags" ng-click="clickTag(tag.id, !tag.clicked)">{{ tag.name }}</div>
                 <div class="ui label" style="margin:3px 10px 8px 0px;cursor:default;" title="添加新分类" ng-click="showAddTag()">
                     <i style="margin-left:10px;" class="plus icon"></i>
                 </div>
             </div>
-
             <div class="field">
                 <label>描述</label>
-                <div style="border-radius:4px;border:1px solid #DEDEDE;min-height:88px;" name="text" ng-model="description" required medium-editor bind-options="{'placeholder': {text: '可以是网站的说明，也可以备忘一下账号或者摘抄内容，就算公开你的链接，这个也只有自己能在详情里面看到'},
+                <div
+                    style="border-radius:4px;border:1px solid #DEDEDE;min-height:88px;"
+                    name="text"
+                    ng-model="description"
+                    required
+                    medium-editor
+                    bind-options="{'placeholder': {text: '可以是网站的说明，也可以备忘一下账号或者摘抄内容，就算公开你的链接，这个也只有自己能在详情里面看到'},
                     'buttons': ['bold', 'italic', 'underline', 'header1', 'header2', 'quote', 'orderedlist', 'unorderedlist']}"></div>
             </div>
             <div class="field">