From 0834266bddfacaf24aa18770c26d51eece2dfff3 Mon Sep 17 00:00:00 2001 From: ro4 Date: Thu, 10 May 2018 14:17:36 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2018_05_10_105015_create_tags_table.php | 32 +++++++++++++++++ ...018_05_10_105629_create_page_tag_table.php | 34 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 database/migrations/2018_05_10_105015_create_tags_table.php create mode 100644 database/migrations/2018_05_10_105629_create_page_tag_table.php diff --git a/database/migrations/2018_05_10_105015_create_tags_table.php b/database/migrations/2018_05_10_105015_create_tags_table.php new file mode 100644 index 00000000..11d0250f --- /dev/null +++ b/database/migrations/2018_05_10_105015_create_tags_table.php @@ -0,0 +1,32 @@ +increments('id'); + $table->string('name', 255)->comment('用户ID')->unique(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('wz_tags'); + } +} diff --git a/database/migrations/2018_05_10_105629_create_page_tag_table.php b/database/migrations/2018_05_10_105629_create_page_tag_table.php new file mode 100644 index 00000000..8deae320 --- /dev/null +++ b/database/migrations/2018_05_10_105629_create_page_tag_table.php @@ -0,0 +1,34 @@ +increments('id'); + $table->unsignedInteger('page_id')->comment('页面 ID'); + $table->unsignedInteger('tag_id')->comment('标签 ID'); + $table->index('page_id', 'idx_page_id'); + $table->index('tag_id', 'idx_tag_id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('wz_page_tag'); + } +} From 6a8529e45c248254a21c7ef3355f840a2a85143c Mon Sep 17 00:00:00 2001 From: ro4 Date: Fri, 11 May 2018 17:41:17 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E6=80=A7=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Repositories/Document.php | 10 ++++++++ app/Repositories/PageTag.php | 19 ++++++++++++++ app/Repositories/Tag.php | 31 +++++++++++++++++++++++ resources/views/components/tags.blade.php | 5 ++++ resources/views/project/project.blade.php | 4 +-- 5 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 app/Repositories/PageTag.php create mode 100644 app/Repositories/Tag.php create mode 100644 resources/views/components/tags.blade.php diff --git a/app/Repositories/Document.php b/app/Repositories/Document.php index 52676d96..613be8a0 100644 --- a/app/Repositories/Document.php +++ b/app/Repositories/Document.php @@ -147,4 +147,14 @@ public function attachments() { return $this->hasMany(Attachment::class, 'page_id', 'id'); } + + /** + * 页面的标签 + * + * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany + */ + public function tags() + { + return $this->belongsToMany(Tag::class, 'wz_page_tag', 'page_id', 'tag_id'); + } } \ No newline at end of file diff --git a/app/Repositories/PageTag.php b/app/Repositories/PageTag.php new file mode 100644 index 00000000..f286d4b9 --- /dev/null +++ b/app/Repositories/PageTag.php @@ -0,0 +1,19 @@ +belongsToMany(Document::class, 'wz_page_tag', 'tag_id', 'page_id'); + } +} \ No newline at end of file diff --git a/resources/views/components/tags.blade.php b/resources/views/components/tags.blade.php new file mode 100644 index 00000000..b8520efc --- /dev/null +++ b/resources/views/components/tags.blade.php @@ -0,0 +1,5 @@ +

+ @foreach($pageItem->tags as $tag) + {{$tag->name}} + @endforeach +

\ No newline at end of file diff --git a/resources/views/project/project.blade.php b/resources/views/project/project.blade.php index 2e569064..c3645d81 100644 --- a/resources/views/project/project.blade.php +++ b/resources/views/project/project.blade.php @@ -45,9 +45,9 @@ @endif - + @include('components.tags') @include('components.document-info') - +
@if($type == 'markdown') From f120e889cb97ad51b35dbd799c137a103bb0ec0a Mon Sep 17 00:00:00 2001 From: ro4 Date: Tue, 15 May 2018 17:42:11 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E6=80=A7=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/TagController.php | 24 +++++++++++++++++++++++ resources/views/project/project.blade.php | 2 +- routes/web.php | 4 ++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 app/Http/Controllers/TagController.php diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php new file mode 100644 index 00000000..74b2073c --- /dev/null +++ b/app/Http/Controllers/TagController.php @@ -0,0 +1,24 @@ +input('p')); + + $names = $request->input('tags'); + + $tags = Tag::whereIn('name', $names)->get(); + + dd($tags); + } + +} \ No newline at end of file diff --git a/resources/views/project/project.blade.php b/resources/views/project/project.blade.php index c3645d81..5c480c23 100644 --- a/resources/views/project/project.blade.php +++ b/resources/views/project/project.blade.php @@ -45,7 +45,6 @@ @endif - @include('components.tags') @include('components.document-info')
@@ -76,6 +75,7 @@
@endif + @include('components.tags') @else
    diff --git a/routes/web.php b/routes/web.php index 0209716e..b7d521be 100644 --- a/routes/web.php +++ b/routes/web.php @@ -173,5 +173,9 @@ // ajax获取操作历史 Route::get('/operations/recently', 'OperationLogController@recently')->name('operation-log:recently'); + + Route::group(['prefix' => 'tag', 'as' => 'tag:'], function () { + + }); }); }); From a658fe75ae1c8278157ee910ec3cd9a8d9fc6322 Mon Sep 17 00:00:00 2001 From: ro4 Date: Thu, 24 May 2018 18:13:43 +0800 Subject: [PATCH 04/12] add tags ajax api --- app/Http/Controllers/TagController.php | 14 +++++++++----- routes/web.php | 3 ++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 74b2073c..c33a609c 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -12,13 +12,17 @@ class TagController extends Controller public function store(Request $request) { + /** @var Document $page */ $page = Document::findOrFail($request->input('p')); - $names = $request->input('tags'); - - $tags = Tag::whereIn('name', $names)->get(); - - dd($tags); + $tags = []; + foreach ($names as $name) { + $tags[] = Tag::firstOrCreate(['name' => $name])->toArray(); + } + $page->tags()->detach(); + $page->tags()->attach(array_pluck($tags, 'id')); + + return $tags; } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index b7d521be..7214f45f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -175,7 +175,8 @@ Route::group(['prefix' => 'tag', 'as' => 'tag:'], function () { - + // 创建标签 + Route::post('/', 'TagController@store')->name('tag:store'); }); }); }); From eeb7345da9daf455799e7153f47febbe8c52f684 Mon Sep 17 00:00:00 2001 From: ro4 Date: Fri, 25 May 2018 15:03:33 +0800 Subject: [PATCH 05/12] add tags ajax api --- app/Http/Controllers/TagController.php | 2 +- public/assets/css/tagmanager.css | 102 +++++ public/assets/js/tagmanager.js | 528 ++++++++++++++++++++++ resources/views/components/tags.blade.php | 30 +- resources/views/layouts/default.blade.php | 4 +- 5 files changed, 660 insertions(+), 6 deletions(-) create mode 100644 public/assets/css/tagmanager.css create mode 100644 public/assets/js/tagmanager.js diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index c33a609c..db4f040b 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -14,7 +14,7 @@ public function store(Request $request) { /** @var Document $page */ $page = Document::findOrFail($request->input('p')); - $names = $request->input('tags'); + $names = explode(',', $request->input('tags')); $tags = []; foreach ($names as $name) { $tags[] = Tag::firstOrCreate(['name' => $name])->toArray(); diff --git a/public/assets/css/tagmanager.css b/public/assets/css/tagmanager.css new file mode 100644 index 00000000..837df626 --- /dev/null +++ b/public/assets/css/tagmanager.css @@ -0,0 +1,102 @@ +/* + * DO NOT EDIT THIS FILE DIRECTLY + * Compiled from bootstrap-tagmanager.less based on Bootstrap 2.3.1 variables + * https://github.com/twitter/bootstrap/blob/master/less/variables.less + */ +.tm-tag { + color: #555555; + background-color: #f5f5f5; + border: #bbbbbb 1px solid; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset; + display: inline-block; + border-radius: 3px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + margin: 0 5px 5px 0; + padding: 4px; + text-decoration: none; + transition: border 0.2s linear 0s, box-shadow 0.2s linear 0s; + -moz-transition: border 0.2s linear 0s, box-shadow 0.2s linear 0s; + -webkit-transition: border 0.2s linear 0s, box-shadow 0.2s linear 0s; + vertical-align: middle; +} +.tm-tag .tm-tag-remove { + color: #000000; + font-weight: bold; + margin-left: 4px; + opacity: 0.2; +} +.tm-tag .tm-tag-remove:hover { + color: #000000; + text-decoration: none; + opacity: 0.4; +} +.tm-tag.tm-tag-warning { + color: #945203; + background-color: #f2c889; + border-color: #f0a12f; +} +.tm-tag.tm-tag-error { + color: #84212e; + background-color: #e69ca6; + border-color: #d24a5d; +} +.tm-tag.tm-tag-success { + color: #638421; + background-color: #cde69c; + border-color: #a5d24a; +} +.tm-tag.tm-tag-info { + color: #4594b5; + background-color: #c5eefa; + border-color: #5dc8f7; +} +.tm-tag.tm-tag-inverse { + color: #cccccc; + background-color: #555555; + border-color: #333333; + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2) inset; +} +.tm-tag.tm-tag-inverse .tm-tag-remove { + color: #ffffff; +} +.tm-tag.tm-tag-large { + font-size: 16.25px; + border-radius: 4px; + padding: 11px 7px; +} +.tm-tag.tm-tag-small { + font-size: 11.049999999999999px; + border-radius: 3px; + padding: 2px 4px; +} +.tm-tag.tm-tag-mini { + font-size: 9.75px; + border-radius: 2px; + padding: 0px 2px; +} +.tm-tag.tm-tag-plain { + color: #333333; + box-shadow: none; + background: none; + border: none; +} +.tm-tag.tm-tag-disabled { + color: #aaaaaa; + background-color: #e6e6e6; + border-color: #cccccc; + box-shadow: none; +} +.tm-tag.tm-tag-disabled .tm-tag-remove { + display: none; +} +input[type="text"].tm-input { + margin-bottom: 5px; + vertical-align: middle !important; +} +.control-group.tm-group { + margin-bottom: 5px; +} +.form-horizontal .control-group.tm-group { + margin-bottom: 15px; +} diff --git a/public/assets/js/tagmanager.js b/public/assets/js/tagmanager.js new file mode 100644 index 00000000..5ba63790 --- /dev/null +++ b/public/assets/js/tagmanager.js @@ -0,0 +1,528 @@ +/* =================================================== + * tagmanager.js v3.0.2 + * http://welldonethings.com/tags/manager + * =================================================== + * Copyright 2012 Max Favilli + * + * Licensed under the Mozilla Public License, Version 2.0 You may not use this work except in compliance with the License. + * + * http://www.mozilla.org/MPL/2.0/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ +(function ($) { + + "use strict"; + + var defaults = { + prefilled: null, + CapitalizeFirstLetter: false, + preventSubmitOnEnter: true, // deprecated + isClearInputOnEsc: true, // deprecated + externalTagId: false, + prefillIdFieldName: 'Id', + prefillValueFieldName: 'Value', + AjaxPush: null, + AjaxPushAllTags: null, + AjaxPushParameters: null, + delimiters: [9, 13, 44], // tab, enter, comma + backspace: [8], + maxTags: 0, + hiddenTagListName: null, // deprecated + hiddenTagListId: null, // deprecated + replace: true, + output: null, + deleteTagsOnBackspace: true, // deprecated + tagsContainer: null, + tagCloseIcon: 'x', + tagClass: '', + validator: null, + onlyTagList: false, + tagList: null, + fillInputOnTagRemove: false, + AjaxPushDataType: 'json' //allow plugin to send data using different encodings (xml, json, script, text, html) + }, + + publicMethods = { + pushTag: function (tag, ignoreEvents, externalTagId, ignoreValidator) { + var $self = $(this), opts = $self.data('opts'), alreadyInList, tlisLowerCase, max, tagId, + tlis = $self.data("tlis"), tlid = $self.data("tlid"), idx, newTagId, newTagRemoveId, escaped, + html, $el, lastTagId, lastTagObj; + + tag = privateMethods.trimTag(tag, opts.delimiterChars); + + if (!tag || tag.length <= 0) { return; } + + // check if restricted only to the tagList suggestions + if (opts.onlyTagList && undefined !== opts.tagList) { + + //if the list has been updated by look pushed tag in the tagList. if not found return + if (opts.tagList) { + var $tagList = opts.tagList; + + // change each array item to lower case + $.each($tagList, function (index, item) { + $tagList[index] = item.toLowerCase(); + }); + var suggestion = $.inArray(tag.toLowerCase(), $tagList); + + if (-1 === suggestion) { + //console.log("tag:" + tag + " not in tagList, not adding it"); + return; + } + } + + } + + if (opts.CapitalizeFirstLetter && tag.length > 1) { + tag = tag.charAt(0).toUpperCase() + tag.slice(1).toLowerCase(); + } + + // call the validator (if any) and do not let the tag pass if invalid + if (!ignoreValidator && opts.validator && !opts.validator(tag)) { + $self.trigger('tm:invalid', tag) + return; + } + + // dont accept new tags beyond the defined maximum + if (opts.maxTags > 0 && tlis.length >= opts.maxTags) { return; } + + alreadyInList = false; + //use jQuery.map to make this work in IE8 (pure JS map is JS 1.6 but IE8 only supports JS 1.5) + tlisLowerCase = jQuery.map(tlis, function (elem) { + return elem.toLowerCase(); + }); + + idx = $.inArray(tag.toLowerCase(), tlisLowerCase); + + if (-1 !== idx) { + // console.log("tag:" + tag + " !!already in list!!"); + alreadyInList = true; + } + + if (alreadyInList) { + $self.trigger('tm:duplicated', tag); + if (opts.blinkClass) { + for (var i = 0; i < 6; ++i) { + $("#" + $self.data("tm_rndid") + "_" + tlid[idx]).queue(function (next) { + $(this).toggleClass(opts.blinkClass); + next(); + }).delay(100); + } + } else { + $("#" + $self.data("tm_rndid") + "_" + tlid[idx]).stop() + .animate({ backgroundColor: opts.blinkBGColor_1 }, 100) + .animate({ backgroundColor: opts.blinkBGColor_2 }, 100) + .animate({ backgroundColor: opts.blinkBGColor_1 }, 100) + .animate({ backgroundColor: opts.blinkBGColor_2 }, 100) + .animate({ backgroundColor: opts.blinkBGColor_1 }, 100) + .animate({ backgroundColor: opts.blinkBGColor_2 }, 100); + } + } else { + if (opts.externalTagId === true) { + if (externalTagId === undefined) { + $.error('externalTagId is not passed for tag -' + tag); + } + tagId = externalTagId; + } else { + max = Math.max.apply(null, tlid); + max = max === -Infinity ? 0 : max; + + tagId = ++max; + } + if (!ignoreEvents) { $self.trigger('tm:pushing', [tag, tagId]); } + tlis.push(tag); + tlid.push(tagId); + + if (!ignoreEvents) + if (opts.AjaxPush !== null && opts.AjaxPushAllTags == null) { + if ($.inArray(tag, opts.prefilled) === -1) { + $.post(opts.AjaxPush, $.extend({ tag: tag }, opts.AjaxPushParameters), null, opts.AjaxPushDataType); + } + } + + // console.log("tagList: " + tlis); + + newTagId = $self.data("tm_rndid") + '_' + tagId; + newTagRemoveId = $self.data("tm_rndid") + '_Remover_' + tagId; + escaped = $("").text(tag).html(); + + html = ''; + html += '' + escaped + ''; + html += ''; + html += opts.tagCloseIcon + ' '; + $el = $(html); + + + var typeAheadMess = $self.parents('.twitter-typeahead')[0] !== undefined; + if (opts.tagsContainer !== null) { + $(opts.tagsContainer).append($el); + } else { + if (tlid.length > 1) { + if (typeAheadMess) { + var lastTagId = $self.data("tm_rndid") + '_' + --tagId; + jQuery('#' + lastTagId).after($el); + } else { + lastTagObj = $self.siblings("#" + $self.data("tm_rndid") + "_" + tlid[tlid.length - 2]); + lastTagObj.after($el); + } + } else { + if (typeAheadMess) { + $self.parents('.twitter-typeahead').before($el); + } else { + $self.before($el); + } + } + } + + $el.find("#" + newTagRemoveId).on("click", $self, function (e) { + e.preventDefault(); + var TagIdToRemove = parseInt($(this).attr("TagIdToRemove")); + privateMethods.spliceTag.call($self, TagIdToRemove, e.data); + }); + + privateMethods.refreshHiddenTagList.call($self); + + if (!ignoreEvents) { $self.trigger('tm:pushed', [tag, tagId]); } + + privateMethods.showOrHide.call($self); + //if (tagManagerOptions.maxTags > 0 && tlis.length >= tagManagerOptions.maxTags) { + // obj.hide(); + //} + } + $self.val(""); + }, + + popTag: function () { + var $self = $(this), tagId, tagBeingRemoved, + tlis = $self.data("tlis"), + tlid = $self.data("tlid"); + + if (tlid.length > 0) { + tagId = tlid.pop(); + + tagBeingRemoved = tlis[tlis.length - 1]; + $self.trigger('tm:popping', [tagBeingRemoved, tagId]); + tlis.pop(); + + // console.log("TagIdToRemove: " + tagId); + $("#" + $self.data("tm_rndid") + "_" + tagId).remove(); + privateMethods.refreshHiddenTagList.call($self); + $self.trigger('tm:popped', [tagBeingRemoved, tagId]); + + privateMethods.showOrHide.call($self); + // console.log(tlis); + } + }, + + empty: function () { + var $self = $(this), tlis = $self.data("tlis"), tlid = $self.data("tlid"), tagId; + + while (tlid.length > 0) { + tagId = tlid.pop(); + tlis.pop(); + // console.log("TagIdToRemove: " + tagId); + $("#" + $self.data("tm_rndid") + "_" + tagId).remove(); + privateMethods.refreshHiddenTagList.call($self); + // console.log(tlis); + } + $self.trigger('tm:emptied', null); + + privateMethods.showOrHide.call($self); + //if (tagManagerOptions.maxTags > 0 && tlis.length < tagManagerOptions.maxTags) { + // obj.show(); + //} + }, + + tags: function () { + var $self = this, tlis = $self.data("tlis"); + return tlis; + } + }, + + privateMethods = { + showOrHide: function () { + var $self = this, opts = $self.data('opts'), tlis = $self.data("tlis"); + + if (opts.maxTags > 0 && tlis.length < opts.maxTags) { + $self.show(); + $self.trigger('tm:show'); + } + + if (opts.maxTags > 0 && tlis.length >= opts.maxTags) { + $self.hide(); + $self.trigger('tm:hide'); + } + }, + + tagClasses: function () { + var $self = $(this), opts = $self.data('opts'), tagBaseClass = opts.tagBaseClass, + inputBaseClass = opts.inputBaseClass, cl; + // 1) default class (tm-tag) + cl = tagBaseClass; + // 2) interpolate from input class: tm-input-xxx --> tm-tag-xxx + if ($self.attr('class')) { + $.each($self.attr('class').split(' '), function (index, value) { + if (value.indexOf(inputBaseClass + '-') !== -1) { + cl += ' ' + tagBaseClass + value.substring(inputBaseClass.length); + } + }); + } + // 3) tags from tagClass option + cl += (opts.tagClass ? ' ' + opts.tagClass : ''); + return cl; + }, + + trimTag: function (tag, delimiterChars) { + var i; + tag = $.trim(tag); + // truncate at the first delimiter char + i = 0; + for (i; i < tag.length; i++) { + if ($.inArray(tag.charCodeAt(i), delimiterChars) !== -1) { break; } + } + return tag.substring(0, i); + }, + + refreshHiddenTagList: function () { + var $self = $(this), tlis = $self.data("tlis"), lhiddenTagList = $self.data("lhiddenTagList"); + + if (lhiddenTagList) { + $(lhiddenTagList).val(tlis.join($self.data('opts').baseDelimiter)).change(); + } + + $self.trigger('tm:refresh', tlis.join($self.data('opts').baseDelimiter)); + }, + + killEvent: function (e) { + e.cancelBubble = true; + e.returnValue = false; + e.stopPropagation(); + e.preventDefault(); + }, + + keyInArray: function (e, ary) { + return $.inArray(e.which, ary) !== -1; + }, + + applyDelimiter: function (e) { + var $self = $(this); + publicMethods.pushTag.call($self, $(this).val()); + e.preventDefault(); + }, + + prefill: function (pta) { + var $self = $(this); + var opts = $self.data('opts') + $.each(pta, function (key, val) { + if (opts.externalTagId === true) { + publicMethods.pushTag.call($self, val[opts.prefillValueFieldName], true, val[opts.prefillIdFieldName], true); + } else { + publicMethods.pushTag.call($self, val, true, false, true); + } + }); + }, + + pushAllTags: function (e, tag) { + var $self = $(this), opts = $self.data('opts'), tlis = $self.data("tlis"); + if (opts.AjaxPushAllTags) { + if (e.type !== 'tm:pushed' || $.inArray(tag, opts.prefilled) === -1) { + $.post(opts.AjaxPush, $.extend({ tags: tlis.join(opts.baseDelimiter) }, opts.AjaxPushParameters)); + } + } + }, + + spliceTag: function (tagId) { + var $self = this, tlis = $self.data("tlis"), tlid = $self.data("tlid"), idx = $.inArray(tagId, tlid), + tagBeingRemoved; + + // console.log("TagIdToRemove: " + tagId); + // console.log("position: " + idx); + + if (-1 !== idx) { + tagBeingRemoved = tlis[idx]; + $self.trigger('tm:splicing', [tagBeingRemoved, tagId]); + $("#" + $self.data("tm_rndid") + "_" + tagId).remove(); + tlis.splice(idx, 1); + tlid.splice(idx, 1); + privateMethods.refreshHiddenTagList.call($self); + $self.trigger('tm:spliced', [tagBeingRemoved, tagId]); + // console.log(tlis); + } + + privateMethods.showOrHide.call($self); + //if (tagManagerOptions.maxTags > 0 && tlis.length < tagManagerOptions.maxTags) { + // obj.show(); + //} + }, + + init: function (options) { + var opts = $.extend({}, defaults, options), delimiters, keyNums; + + opts.hiddenTagListName = (opts.hiddenTagListName === null) + ? 'hidden-' + this.attr('name') + : opts.hiddenTagListName; + + delimiters = opts.delimeters || opts.delimiters; // 'delimeter' is deprecated + keyNums = [9, 13, 17, 18, 19, 37, 38, 39, 40]; // delimiter values to be handled as key codes + opts.delimiterChars = []; + opts.delimiterKeys = []; + + $.each(delimiters, function (i, v) { + if ($.inArray(v, keyNums) !== -1) { + opts.delimiterKeys.push(v); + } else { + opts.delimiterChars.push(v); + } + }); + + opts.baseDelimiter = String.fromCharCode(opts.delimiterChars[0] || 44); + opts.tagBaseClass = 'tm-tag'; + opts.inputBaseClass = 'tm-input'; + + if (!$.isFunction(opts.validator)) { opts.validator = null; } + + this.each(function () { + var $self = $(this), hiddenObj = '', rndid = '', albet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + + // prevent double-initialization of TagManager + if ($self.data('tagManager')) { return false; } + $self.data('tagManager', true); + + for (var i = 0; i < 5; i++) { + rndid += albet.charAt(Math.floor(Math.random() * albet.length)); + } + + $self.data("tm_rndid", rndid); + + // store instance-specific data in the DOM object + $self.data('opts', opts) + .data('tlis', []) //list of string tags + .data('tlid', []); //list of ID of the string tags + + if (opts.output === null) { + hiddenObj = $('', { + type: 'hidden', + name: opts.hiddenTagListName + }); + $self.after(hiddenObj); + $self.data("lhiddenTagList", hiddenObj); + } else { + $self.data("lhiddenTagList", $(opts.output)); + } + + if (opts.AjaxPushAllTags) { + $self.on('tm:spliced', privateMethods.pushAllTags); + $self.on('tm:popped', privateMethods.pushAllTags); + $self.on('tm:pushed', privateMethods.pushAllTags); + } + + // hide popovers on focus and keypress events + $self.on('focus keypress', function (e) { + if ($(this).popover) { $(this).popover('hide'); } + }); + + // handle ESC (keyup used for browser compatibility) + if (opts.isClearInputOnEsc) { + $self.on('keyup', function (e) { + if (e.which === 27) { + // console.log('esc detected'); + $(this).val(''); + privateMethods.killEvent(e); + } + }); + } + + $self.on('keypress', function (e) { + // push ASCII-based delimiters + if (privateMethods.keyInArray(e, opts.delimiterChars)) { + privateMethods.applyDelimiter.call($self, e); + } + }); + + $self.on('keydown', function (e) { + // disable ENTER + if (e.which === 13) { + if (opts.preventSubmitOnEnter) { + privateMethods.killEvent(e); + } + } + + // push key-based delimiters (includes by default) + if (privateMethods.keyInArray(e, opts.delimiterKeys)) { + privateMethods.applyDelimiter.call($self, e); + } + }); + + // BACKSPACE (keydown used for browser compatibility) + if (opts.deleteTagsOnBackspace) { + $self.on('keydown', function (e) { + if (privateMethods.keyInArray(e, opts.backspace)) { + // console.log("backspace detected"); + if ($(this).val().length <= 0) { + publicMethods.popTag.call($self); + privateMethods.killEvent(e); + } + } + }); + } + + // on tag pop fill back the tag's content to the input field + if (opts.fillInputOnTagRemove) { + $self.on('tm:popped', function (e, tag) { + $(this).val(tag); + }); + } + + $self.change(function (e) { + if (!/webkit/.test(navigator.userAgent.toLowerCase())) { + $self.focus(); + } // why? + + /* unimplemented mode to push tag on blur + else if (tagManagerOptions.pushTagOnBlur) { + console.log('change: pushTagOnBlur ' + tag); + pushTag($(this).val()); + } */ + privateMethods.killEvent(e); + }); + + if (opts.prefilled !== null) { + if (typeof (opts.prefilled) === "object") { + privateMethods.prefill.call($self, opts.prefilled); + } else if (typeof (opts.prefilled) === "string") { + privateMethods.prefill.call($self, opts.prefilled.split(opts.baseDelimiter)); + } else if (typeof (opts.prefilled) === "function") { + privateMethods.prefill.call($self, opts.prefilled()); + } + } else if (opts.output !== null) { + if ($(opts.output) && $(opts.output).val()) { var existing_tags = $(opts.output); } + privateMethods.prefill.call($self, $(opts.output).val().split(opts.baseDelimiter)); + } + + }); + + return this; + } + }; + + $.fn.tagsManager = function (method) { + var $self = $(this); + + if (!(0 in this)) { return this; } + + if (publicMethods[method]) { + return publicMethods[method].apply($self, Array.prototype.slice.call(arguments, 1)); + } else if (typeof method === 'object' || !method) { + return privateMethods.init.apply(this, arguments); + } else { + $.error('Method ' + method + ' does not exist.'); + return false; + } + }; + +}(jQuery)); diff --git a/resources/views/components/tags.blade.php b/resources/views/components/tags.blade.php index b8520efc..cbb5a164 100644 --- a/resources/views/components/tags.blade.php +++ b/resources/views/components/tags.blade.php @@ -1,5 +1,27 @@

    - @foreach($pageItem->tags as $tag) - {{$tag->name}} - @endforeach -

    \ No newline at end of file + +

    + +@push('script') + +@endpush \ No newline at end of file diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 6de5260c..5ffda6f4 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -15,6 +15,8 @@ @yield('title') - {{ config('app.name', 'Wizard API') }} + + {{----}} @@ -80,7 +82,7 @@ - + +@if(!Auth::guest()) + +@else + +@endif @endpush \ No newline at end of file From d9f98bc1646b2128c1c02cbaa95ee1bdf46eb0db Mon Sep 17 00:00:00 2001 From: ro4 Date: Fri, 25 May 2018 18:14:01 +0800 Subject: [PATCH 07/12] add tags ajax api --- resources/views/components/tags.blade.php | 70 ++++++++++++----------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/resources/views/components/tags.blade.php b/resources/views/components/tags.blade.php index 37353c99..34cdbabb 100644 --- a/resources/views/components/tags.blade.php +++ b/resources/views/components/tags.blade.php @@ -5,43 +5,47 @@ @push('script') @if(!Auth::guest()) @else @endif From f28dd47eee23973f648b8e0ea9e9456aef782d2f Mon Sep 17 00:00:00 2001 From: ro4 Date: Tue, 29 May 2018 17:57:50 +0800 Subject: [PATCH 08/12] done --- public/assets/js/tagmanager.js | 7 +++--- resources/views/components/tags.blade.php | 27 ++++++++++++++--------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/public/assets/js/tagmanager.js b/public/assets/js/tagmanager.js index 5ba63790..fe3c91c5 100644 --- a/public/assets/js/tagmanager.js +++ b/public/assets/js/tagmanager.js @@ -157,7 +157,7 @@ html += opts.tagCloseIcon + '     '; $el = $(html); - + var typeAheadMess = $self.parents('.twitter-typeahead')[0] !== undefined; if (opts.tagsContainer !== null) { $(opts.tagsContainer).append($el); @@ -167,8 +167,9 @@ var lastTagId = $self.data("tm_rndid") + '_' + --tagId; jQuery('#' + lastTagId).after($el); } else { - lastTagObj = $self.siblings("#" + $self.data("tm_rndid") + "_" + tlid[tlid.length - 2]); - lastTagObj.after($el); + $self.before($el); + // lastTagObj = $self.siblings("#" + $self.data("tm_rndid") + "_" + tlid[tlid.length - 2]); + // lastTagObj.after($el); } } else { if (typeAheadMess) { diff --git a/resources/views/components/tags.blade.php b/resources/views/components/tags.blade.php index 34cdbabb..38c719e4 100644 --- a/resources/views/components/tags.blade.php +++ b/resources/views/components/tags.blade.php @@ -1,17 +1,16 @@ -
    - +
    + id) style="display: none;" @endcannot/>
    + @push('script') -@if(!Auth::guest()) +@cannot('project-edit', $pageItem->id) -@else +@endcannot + +@can('project-edit', $pageItem->id) -@endif +@endcan + @endpush \ No newline at end of file From da098c9da86a6d34faa1fede5ca355c4c7bbda68 Mon Sep 17 00:00:00 2001 From: ro4 Date: Tue, 29 May 2018 18:26:18 +0800 Subject: [PATCH 09/12] done --- app/Http/Controllers/TagController.php | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index db4f040b..53f949b0 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -12,10 +12,26 @@ class TagController extends Controller public function store(Request $request) { + $page_id = $request->input('p'); + $tags = $request->input('tags'); + $this->validateParameters( + [ + 'page_id' => $page_id, + 'tags' => $tags, + ], + [ + 'page_id' => "required|integer", + 'tags' => 'nullable|max:500', + ], + [ + 'tags.required' => '标签不能为空', + 'tags.between' => '标签最大不能超过500字符', + ] + ); /** @var Document $page */ - $page = Document::findOrFail($request->input('p')); - $names = explode(',', $request->input('tags')); - $tags = []; + $page = Document::findOrFail($page_id); + $names = explode(',', $tags); + $tags = []; foreach ($names as $name) { $tags[] = Tag::firstOrCreate(['name' => $name])->toArray(); } From bce420544c9d1fa1106ba0959ae7c5301e988fd7 Mon Sep 17 00:00:00 2001 From: ro4 Date: Tue, 29 May 2018 18:28:35 +0800 Subject: [PATCH 10/12] done --- app/Http/Controllers/TagController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 53f949b0..bfb2e4fd 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -6,6 +6,7 @@ use App\Repositories\Document; use App\Repositories\Tag; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Gate; class TagController extends Controller { @@ -13,6 +14,9 @@ class TagController extends Controller public function store(Request $request) { $page_id = $request->input('p'); + if (Gate::denies('project-edit', $page_id)) { + return []; + } $tags = $request->input('tags'); $this->validateParameters( [ From 48199e51e3b6f907fcd8fb5c44ed93ab9b43c2eb Mon Sep 17 00:00:00 2001 From: ro4 Date: Wed, 30 May 2018 14:03:29 +0800 Subject: [PATCH 11/12] done --- app/Http/Controllers/TagController.php | 9 ++++++++- public/assets/css/style.css | 12 +++++++++++- resources/views/components/tags.blade.php | 2 +- resources/views/project/project.blade.php | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index bfb2e4fd..cffc3ae7 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -11,13 +11,20 @@ class TagController extends Controller { + /** + * store the tags + * + * @param Request $request + * + * @return array|string + */ public function store(Request $request) { $page_id = $request->input('p'); if (Gate::denies('project-edit', $page_id)) { return []; } - $tags = $request->input('tags'); + $tags = $request->input('tags'); $this->validateParameters( [ 'page_id' => $page_id, diff --git a/public/assets/css/style.css b/public/assets/css/style.css index 0fd3a2b7..aa30e640 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -796,4 +796,14 @@ tr.warning { margin-right: 5px; display: inline-block; vertical-align: middle; -} \ No newline at end of file +} + +.wz-tag { + padding: 1.5rem; + margin-right: 0; + margin-bottom: 0; + margin-left: 0; + border-width: .2rem; + position: relative; + max-width: 960px; +} diff --git a/resources/views/components/tags.blade.php b/resources/views/components/tags.blade.php index 38c719e4..46e1fb78 100644 --- a/resources/views/components/tags.blade.php +++ b/resources/views/components/tags.blade.php @@ -1,4 +1,4 @@ -
    +
    id) style="display: none;" @endcannot/>
    diff --git a/resources/views/project/project.blade.php b/resources/views/project/project.blade.php index 5c480c23..a50e3af1 100644 --- a/resources/views/project/project.blade.php +++ b/resources/views/project/project.blade.php @@ -75,7 +75,6 @@
@endif - @include('components.tags') @else
    @@ -128,6 +127,7 @@ @includeIf("components.{$type}-show") @push('page-panel') + @include('components.tags') @if($pageID != 0 && !(Auth::guest() && count($pageItem->comments) === 0)) @include('components.comment') @endif From 7691326efbe0ab6dadd3cbfbde47df086e882652 Mon Sep 17 00:00:00 2001 From: ro4 Date: Wed, 30 May 2018 14:18:29 +0800 Subject: [PATCH 12/12] style conflict --- app/helpers.php | 15 +++++++++++---- public/assets/css/style.css | 9 +++++++++ resources/views/layouts/navbar.blade.php | 4 ++-- resources/views/layouts/project-setting.blade.php | 2 +- resources/views/layouts/single.blade.php | 2 +- resources/views/layouts/user.blade.php | 2 +- resources/views/project/project.blade.php | 2 +- resources/views/search.blade.php | 2 +- resources/views/share-show.blade.php | 4 +++- 9 files changed, 30 insertions(+), 12 deletions(-) diff --git a/app/helpers.php b/app/helpers.php index 588368ed..4e97be69 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -209,16 +209,23 @@ function userHasNotifications() /** * 用户通知消息数 + * + * @param int $limit 显示限制数量，如果提供了，则返回string类型的数量展示，最大值为$limit，超过数量显示为"$limit+" * - * @return int + * @return int|string */ -function userNotificationCount() +function userNotificationCount($limit = 0) { if (Auth::guest()) { return 0; } - return count(Auth::user()->unreadNotifications); + $unreadCount = count(Auth::user()->unreadNotifications); + if ($limit > 0) { + return $unreadCount > $limit ? "{$limit}+" : $unreadCount; + } + + return $unreadCount; } /** @@ -393,4 +400,4 @@ function comment_filter(string $comment): string return $matches[0]; }, $comment); -} \ No newline at end of file +} diff --git a/public/assets/css/style.css b/public/assets/css/style.css index aa30e640..2bd3b9c0 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -37,6 +37,9 @@ form { .container-small { max-width: 960px; } + .container-medium { + max-width: 1140px; + } } .container-narrow > hr { @@ -562,8 +565,14 @@ a:hover { font-weight: bold; } +/* 消息数量提示气泡 */ .wz-message-tip { font-weight: bold; + border: 1px solid #f00; + padding: 2px 5px; + border-radius: 56px; + color: #fff; + background: #f00; } @-webkit-keyframes twinkling { diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php index 7e2b34db..d7dd6c98 100644 --- a/resources/views/layouts/navbar.blade.php +++ b/resources/views/layouts/navbar.blade.php @@ -14,7 +14,7 @@
    @@ -45,4 +45,4 @@
    @endif -
\ No newline at end of file +
diff --git a/resources/views/layouts/project-setting.blade.php b/resources/views/layouts/project-setting.blade.php index 2052535f..e2304081 100644 --- a/resources/views/layouts/project-setting.blade.php +++ b/resources/views/layouts/project-setting.blade.php @@ -1,7 +1,7 @@ @extends('layouts.default') @section('title', $project->name) -@section('container-style', 'container container-small') +@section('container-style', 'container container-medium') @section('content')
diff --git a/resources/views/layouts/single.blade.php b/resources/views/layouts/single.blade.php index 61128e9e..fe610553 100644 --- a/resources/views/layouts/single.blade.php +++ b/resources/views/layouts/single.blade.php @@ -1,5 +1,5 @@ @extends('layouts.default') -@section('container-style', 'container container-small') +@section('container-style', 'container container-medium') @section('content')
diff --git a/resources/views/layouts/user.blade.php b/resources/views/layouts/user.blade.php index 74793a32..88e0c7f1 100644 --- a/resources/views/layouts/user.blade.php +++ b/resources/views/layouts/user.blade.php @@ -1,6 +1,6 @@ @extends('layouts.default') -@section('container-style', 'container container-small') +@section('container-style', 'container container-medium') @section('content')
diff --git a/resources/views/project/project.blade.php b/resources/views/project/project.blade.php index a50e3af1..3588ae60 100644 --- a/resources/views/project/project.blade.php +++ b/resources/views/project/project.blade.php @@ -156,4 +156,4 @@ }); @endif -@endpush \ No newline at end of file +@endpush diff --git a/resources/views/search.blade.php b/resources/views/search.blade.php index 3136ecb6..b5a6fe80 100644 --- a/resources/views/search.blade.php +++ b/resources/views/search.blade.php @@ -68,4 +68,4 @@ }); -@endpush \ No newline at end of file +@endpush diff --git a/resources/views/share-show.blade.php b/resources/views/share-show.blade.php index e177f530..070e5941 100644 --- a/resources/views/share-show.blade.php +++ b/resources/views/share-show.blade.php @@ -12,6 +12,8 @@ @endif
+ +
~ END ~
@endsection -@includeIf("components.{$type}-show") \ No newline at end of file +@includeIf("components.{$type}-show")