diff --git a/blog-admin/src/main/resources/static/assets/js/zhyd.core.js b/blog-admin/src/main/resources/static/assets/js/zhyd.core.js index a65b303e8109ca170ed31717437f740f5148c89e..5283b2b49750465a69ac7d41efb48290c9c2b4a0 100644 --- a/blog-admin/src/main/resources/static/assets/js/zhyd.core.js +++ b/blog-admin/src/main/resources/static/assets/js/zhyd.core.js @@ -67,7 +67,7 @@ var zhyd = window.zhyd || { itemValue: 'id', itemText: 'name', maxTags: 3, - maxChars: 10, + maxChars: 20, trimValue: true, focusClass: 'focus' }); @@ -81,20 +81,27 @@ var zhyd = window.zhyd || { var $li = $(this); $li.bind('click', add); }); - - $this.on('itemAdded', function (event) { - var tag = event.item; - if (!event.options) { - $.post('/tag/add', {name: tag, description: tag}, function (response) { + $(".bootstrap-tagsinput input").bind('keydown',function(event){ + var thisVal = $(this).val(); + console.log(event.key); + if(event.key == 'Enter' || event.keyCode == '13') { + $.post('/tag/add', {name: thisVal, description: thisVal}, function (response) { if (response.status !== 200) { - $this.tagsinput('remove', tag, {del: false}); + $.alert.error(response.message); } else { var data = response.data; - $('
  • ' + data.name + '
    • ').bind('click', add).appendTo($($bindBox)); + $this.tagsinput('add', {"id": data.id, "name": data.name}, {addNew: true}); } }); } }); + $this.on('itemAdded', function (event) { + var tag = event.item; + if (event.options && event.options.addNew) { + $(".bootstrap-tagsinput input").val(''); + $('
  • ' + tag.name + '
    • ').bind('click', add).appendTo($($bindBox)); + } + }); }) }, 500); } diff --git a/blog-admin/src/main/resources/static/assets/js/zhyd.publish-article.js b/blog-admin/src/main/resources/static/assets/js/zhyd.publish-article.js index 02611f03ac908e1093283228c42281136d956b5d..d9089ab172e2ff7ec9b869fffa2f2fc77752a0c6 100644 --- a/blog-admin/src/main/resources/static/assets/js/zhyd.publish-article.js +++ b/blog-admin/src/main/resources/static/assets/js/zhyd.publish-article.js @@ -68,7 +68,7 @@ $(".publishBtn").click(function () { return; } if(!$("#description").val() || !$("#keywords").val()) { - $.alert.error("请填写下SEO相关的内容，填写后更容易被收录哦"); + $.alert.error("请填写SEO相关的内容，填写后更容易被收录哦"); return; } var isMarkdown = $("input[name=isMarkdown]").val(); diff --git a/blog-admin/src/main/resources/templates/article/list.ftl b/blog-admin/src/main/resources/templates/article/list.ftl index 8c07c915709109a2b8a78647b35819480cb51469..da0516db1996b0683c0f2cd53673db31aa8116e8 100644 --- a/blog-admin/src/main/resources/templates/article/list.ftl +++ b/blog-admin/src/main/resources/templates/article/list.ftl @@ -83,7 +83,7 @@ var title = code; title = title.length > 20 ? (title.substr(0, 20) + '...') : title; var id = row.id; - var status = row.status ? '已发布' : '草稿'; + var status = row.status ? '已发布' : '草稿'; return status + '' + title + ''; } }, { diff --git a/blog-admin/src/main/resources/templates/article/publish-md.ftl b/blog-admin/src/main/resources/templates/article/publish-md.ftl index 4bb9ce6334d8b08dbd4871448963dad0bded0bf1..735fdb3153361eada136d59fb8eb4f1ae3f7405f 100644 --- a/blog-admin/src/main/resources/templates/article/publish-md.ftl +++ b/blog-admin/src/main/resources/templates/article/publish-md.ftl @@ -62,137 +62,10 @@ - + <@publishmodal> - - - +<@chooseImgModal> <@footer> diff --git a/blog-admin/src/main/resources/templates/article/publish.ftl b/blog-admin/src/main/resources/templates/article/publish.ftl index a75016e7ae9d7550dcade8e64b4991144af95523..640c3e1ab28d0a951035e9f2c0370f9cbe5ca333 100644 --- a/blog-admin/src/main/resources/templates/article/publish.ftl +++ b/blog-admin/src/main/resources/templates/article/publish.ftl @@ -49,134 +49,10 @@ - + <@publishmodal> - + +<@chooseImgModal> <@footer>