From 6bb5f5926bf8b51fcab3b459634f32e39d6ea0a6 Mon Sep 17 00:00:00 2001
From: wayne <wayne_wei@kingston.com.cn>
Date: Thu, 8 Aug 2019 15:44:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=AE=BE=E8=AE=A1=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=88=87=E6=8D=A2=E5=88=97=E5=AE=BD=20#328?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                                  |  6 +++---
 src/ZKEACMS.SectionWidget/Models/SectionGroup.cs   | 10 ++++++++++
 src/ZKEACMS.WebHost/wwwroot/js/LayoutDesign.js     |  2 +-
 src/ZKEACMS.WebHost/wwwroot/js/LayoutDesign.min.js |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 61958cfff..ace930bf5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2704,9 +2704,9 @@
       "dev": true
     },
     "lodash.merge": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
-      "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
     "lodash.partialright": {
diff --git a/src/ZKEACMS.SectionWidget/Models/SectionGroup.cs b/src/ZKEACMS.SectionWidget/Models/SectionGroup.cs
index 9a049fe4b..0218101ee 100644
--- a/src/ZKEACMS.SectionWidget/Models/SectionGroup.cs
+++ b/src/ZKEACMS.SectionWidget/Models/SectionGroup.cs
@@ -137,6 +137,16 @@ protected override void ViewConfigure()
             });
             ViewConfig(m => m.Title).AsHidden();
             ViewConfig(m => m.Description).AsHidden();
+
+            ViewConfig(m => m.SectionContents).AsHidden().Ignore();
+            ViewConfig(m => m.SectionTitle).AsHidden().Ignore();
+            ViewConfig(m => m.SectionTitles).AsHidden().Ignore();
+            ViewConfig(m => m.CallToAction).AsHidden().Ignore();
+            ViewConfig(m => m.CallToActions).AsHidden().Ignore();
+            ViewConfig(m => m.SectionImage).AsHidden().Ignore();
+            ViewConfig(m => m.SectionImages).AsHidden().Ignore();
+            ViewConfig(m => m.Paragraph).AsHidden().Ignore();
+            ViewConfig(m => m.Paragraphs).AsHidden().Ignore();
         }
     }
 }
\ No newline at end of file
diff --git a/src/ZKEACMS.WebHost/wwwroot/js/LayoutDesign.js b/src/ZKEACMS.WebHost/wwwroot/js/LayoutDesign.js
index c3fe74b12..c7bc6d908 100644
--- a/src/ZKEACMS.WebHost/wwwroot/js/LayoutDesign.js
+++ b/src/ZKEACMS.WebHost/wwwroot/js/LayoutDesign.js
@@ -34,7 +34,7 @@
         zoneParent.append(zone);
         return zoneParent;
     }
-    $(document).on("click", ".dropdown-menu.col-size a", function () {
+    $(document).on("click", "#toolBar .col-size a", function () {
         $("#add-col-handle").attr("data-val", $(this).data("val")).find(".col-size-info").text($(this).text());
         $(this).parent().parent().find(".active").removeClass("active");
         $(this).parent().addClass("active");
diff --git a/src/ZKEACMS.WebHost/wwwroot/js/LayoutDesign.min.js b/src/ZKEACMS.WebHost/wwwroot/js/LayoutDesign.min.js
index 630530ceb..cf998fb9e 100644
--- a/src/ZKEACMS.WebHost/wwwroot/js/LayoutDesign.min.js
+++ b/src/ZKEACMS.WebHost/wwwroot/js/LayoutDesign.min.js
@@ -1 +1 @@
-$(function(){function s(){var t=$('<div class="additional zone"><\/div>'),n=$("<zone><\/zone>");return n.append('<input class="form-control" type="text" name="ZoneName" placeholder="输入名称" value="区域 '+($("#containers input[type=text]").size()+1)+'" />'),n.append('<input class="form-control" type="hidden" name="LayoutId" value="'+$("#LayoutId").val()+'" />'),n.append('<input class="form-control" type="hidden" name="ID" value="" />'),n.append('<input class="form-control" type="hidden" name="HeadingCode" value="" />'),t.append(n),t}function h(){$("#containers").sortable({placeholder:"design",axis:"y",tolerance:"pointer",start:function(n,t){t.helper.hasClass("container")?(t.placeholder.addClass("container"),t.helper.css("left",t.placeholder.offset().left)):t.placeholder.addClass("container-fluid")},handle:".glyphicon-sort"});$("#containers>div").sortable(f).append(e).addClass("design main custom-style");$(".additional.row").sortable(i).append(o).children(".additional").append(u)}var n=$("#containers"),r,i,f,t;n.children().size()>0&&n.children(".container").size()===0&&n.children(".container-fluid").size()===0&&(r=$('<div class="container"><\/div>'),n.children().appendTo(r),n.append(r));var e='<div class="tools"><i class="glyphicon glyphicon-resize-horizontal" title="拉伸"><\/i><i class="glyphicon glyphicon-resize-small" title="居中"><\/i><i class="glyphicon glyphicon-sort" title="拖动排序"><\/i><i class="glyphicon glyphicon-erase custom-style-editor" title="编辑样式"><\/i><i class="glyphicon glyphicon-remove-circle" title="删除"><\/i><\/div>',o='<div class="tools"><i class="glyphicon glyphicon-remove-circle" title="删除"><\/i><\/div>',u='<div class="tools"><i class="glyphicon glyphicon-menu-left" title="宽度 - 1"><\/i><i class="glyphicon glyphicon glyphicon-menu-right" title="宽度 + 1"><\/i><i class="glyphicon glyphicon-remove-circle" title="删除"><\/i><\/div>';$(document).on("click",".dropdown-menu.col-size a",function(){$("#add-col-handle").attr("data-val",$(this).data("val")).find(".col-size-info").text($(this).text());$(this).parent().parent().find(".active").removeClass("active");$(this).parent().addClass("active")});$(".AddContainer").draggable({helper:"clone"});$(".AddRow").draggable({helper:"clone",revert:"invalid",connectToSortable:".container,.container-fluid"});$(".AddCol").draggable({helper:"clone",connectToSortable:".additional.row"});$(".templates ul li").draggable({helper:"clone",connectToSortable:"#containers>div"});i={placeholder:"additional",tolerance:"pointer",connectWith:".additional.row",over:function(n,t){t.item.hasClass("AddCol")?t.placeholder.addClass(t.item.data("col")+t.item.data("val")).html('<div class="colContent row muted"><\/div>'):t.placeholder.addClass(t.item.attr("class")).html('<div class="colContent row muted"><\/div>')},stop:function(n,t){if(t.item.hasClass("AddCol")){var i=$('<div class="additional '+t.item.data("col")+t.item.data("val")+' ui-sortable-handle">'+u+'<div class="colContent row"><\/div><\/div>');i.find(".colContent").append(s());t.item.replaceWith(i)}}};f={placeholder:"additional row muted",tolerance:"pointer",connectWith:".container,.container-fluid",items:".additional.row",stop:function(n,t){var r=$('<div class="additional row">'+o+"<\/div>"),f;t.item.hasClass("AddRow")?t.item.replaceWith(r):t.item.data("add")&&(f=$(t.item.find(".row").html()),f.find(".border-helper").remove(),r.append(f),t.item.replaceWith(r),f.each(function(){$(this).addClass("additional");$(this).append(u);$(this).append($('<div class="colContent row"><\/div>').append(s()))}));r.sortable(i)}};h();$("body").droppable({greedy:!0,accept:".AddContainer",hoverClass:"dropWarning",drop:function(){var n=$('<div class="container design main">'+e+"<\/div>");n.sortable(f);$(".additional.row",n).sortable(i);$("#containers").append(n)}});$(document).on("click",".container.design .glyphicon-resize-horizontal",function(){$(this).closest(".container").removeClass("container").addClass("container-fluid")});$(document).on("click",".container-fluid.design .glyphicon-resize-small",function(){$(this).closest(".container-fluid").removeClass("container-fluid").addClass("container")});$(document).on("click","#containers .glyphicon-remove-circle",function(){var n=$(this).parent().parent();Easy.ShowMessageBox("提示","确定要删除吗？",function(){n.remove()},!0,10)});$(document).on("click","#containers .glyphicon-menu-left",function(){var n=$(this).parent().parent().attr("class");n=n.replace(/col-md-(\d+)/g,function(n,t){return t=parseInt(t),t>1&&t--,"col-md-"+t});$(this).parent().parent().attr("class",n)});$(document).on("click","#containers .glyphicon-menu-right",function(){var n=$(this).parent().parent().attr("class");n=n.replace(/col-md-(\d+)/g,function(n,t){return t=parseInt(t),t<12&&t++,"col-md-"+t});$(this).parent().parent().attr("class",n)});$(document).on("click",".custom-style-editor",function(){$(".custom-style-target").removeClass("custom-style-target");$(this).parents(".main").addClass("custom-style-target")});$(window).width()>1600&&$(".templates").addClass("active");$(document).on("click",".templates .tool-open",function(){$(this).parent().toggleClass("active")});n.removeClass("hide");$(document).on("click","#save",function(){var i,f,r,o,u,t,h;if($('input[name="ZoneName"]').each(function(){$.trim($(this).val())||$(this).val("未命名");$(this).attr("value",$(this).val())}),!$(this).data("done")){$(this).data("done",!0);i=$("#LayoutInfo");$("zone").each(function(n){$("input",this).each(function(){$(this).attr("name","zones["+n+"]."+$(this).attr("name")).addClass("hide")}).appendTo(i)});f=$('<div id="containers"/>').append(n.html());$("div",f).removeClass("ui-droppable").removeClass("ui-sortable").removeClass("ui-sortable-handle").removeClass("active").removeClass("design").removeClass("custom-style-target").not(".custom-style").removeAttr("style");$(".tools",f).remove();var c=f.html(),s=c.split("<zone>"),e=[];for(t=0;t<s.length;t++)e.push(s[t]),t<s.length-1&&e.push("<zone>");for(r=[],t=0;t<e.length;t++)for(o=e[t].split("<\/zone>"),u=0;u<o.length;u++)r.push(o[u]),u<o.length-1&&r.push("<\/zone>");for($(".layout-html",i).remove(),t=0;t<r.length;t++)(h=$.trim(r[t]),h)&&i.append($('<textarea name="html" class="layout-html hide"><\/textarea>').val(h));return i.submit(),!1}});$(document).on("click","#show-source-code",function(){var i,r;$('input[name="ZoneName"]').each(function(){$.trim($(this).val())||$(this).val("未命名");$(this).attr("value",$(this).val())});i=$('<div id="containers"/>').append(n.html());$("div",i).removeClass("ui-droppable").removeClass("ui-sortable").removeClass("ui-sortable-handle").removeClass("active").removeClass("design").removeClass("custom-style-target").not(".custom-style").removeAttr("style");$(".tools",i).remove();r=i.html().replace(new RegExp("><div","g"),">\n<div").replace(new RegExp("><\/div","g"),">\n<\/div").replace(new RegExp("><zone>","g"),">\n<zone>\n").replace(new RegExp("><\/zone","g"),">\n<\/zone").replace(new RegExp("><input","g"),">\n<input");t.setValue(r);setTimeout(function(){t.refresh();var n=t.lineCount();t.autoFormatRange({line:0,ch:0},{line:n})},500)});$(document).on("click","#save-layout-code",function(){var i=t.getValue();n.html(i);$("input[name=LayoutId]",n).val($("#LayoutId").val());h()});t=CodeMirror.fromTextArea(document.getElementById("layout-code"),{lineNumbers:!0,mode:"htmlmixed",theme:"monokai",lineWrapping:!0,autofocus:!0,tabSize:2,extraKeys:{"Ctrl-J":"autocomplete"},autoCloseTags:!0});$(".CodeMirror").height($(window).height()-220);$("#modal-layout-code").css("display","")});
\ No newline at end of file
+$(function(){var e=$("#containers");if(e.children().size()>0&&0===e.children(".container").size()&&0===e.children(".container-fluid").size()){var t=$('<div class="container"></div>');e.children().appendTo(t),e.append(t)}var a=['<div class="tools">','<i class="glyphicon glyphicon-resize-horizontal" title="拉伸"></i>','<i class="glyphicon glyphicon-resize-small" title="居中"></i>','<i class="glyphicon glyphicon-sort" title="拖动排序"></i>','<i class="glyphicon glyphicon-erase custom-style-editor" title="编辑样式"></i>','<i class="glyphicon glyphicon-remove-circle" title="删除"></i>',"</div>"].join(""),n=['<div class="tools">','<i class="glyphicon glyphicon-remove-circle" title="删除"></i>',"</div>"].join(""),o=['<div class="tools">','<i class="glyphicon glyphicon-menu-left" title="宽度 - 1"></i>','<i class="glyphicon glyphicon glyphicon-menu-right" title="宽度 + 1"></i>','<i class="glyphicon glyphicon-remove-circle" title="删除"></i>',"</div>"].join("");function i(){var e=$('<div class="additional zone"></div>'),t=$("<zone></zone>");return t.append('<input class="form-control" type="text" name="ZoneName" placeholder="输入名称" value="区域 '+($("#containers input[type=text]").size()+1)+'" />'),t.append('<input class="form-control" type="hidden" name="LayoutId" value="'+$("#LayoutId").val()+'" />'),t.append('<input class="form-control" type="hidden" name="ID" value="" />'),t.append('<input class="form-control" type="hidden" name="HeadingCode" value="" />'),e.append(t),e}$(document).on("click","#toolBar .col-size a",function(){$("#add-col-handle").attr("data-val",$(this).data("val")).find(".col-size-info").text($(this).text()),$(this).parent().parent().find(".active").removeClass("active"),$(this).parent().addClass("active")}),$(".AddContainer").draggable({helper:"clone"}),$(".AddRow").draggable({helper:"clone",revert:"invalid",connectToSortable:".container,.container-fluid"}),$(".AddCol").draggable({helper:"clone",connectToSortable:".additional.row"}),$(".templates ul li").draggable({helper:"clone",connectToSortable:"#containers>div"});var l={placeholder:"additional",tolerance:"pointer",connectWith:".additional.row",over:function(e,t){t.item.hasClass("AddCol")?t.placeholder.addClass(t.item.data("col")+t.item.data("val")).html('<div class="colContent row muted"></div>'):t.placeholder.addClass(t.item.attr("class")).html('<div class="colContent row muted"></div>')},stop:function(e,t){if(t.item.hasClass("AddCol")){var a=$('<div class="additional '+t.item.data("col")+t.item.data("val")+' ui-sortable-handle">'+o+'<div class="colContent row"></div></div>');a.find(".colContent").append(i()),t.item.replaceWith(a)}}},s={placeholder:"additional row muted",tolerance:"pointer",connectWith:".container,.container-fluid",items:".additional.row",stop:function(e,t){var a=$('<div class="additional row">'+n+"</div>");if(t.item.hasClass("AddRow"))t.item.replaceWith(a);else if(t.item.data("add")){var s=$(t.item.find(".row").html());s.find(".border-helper").remove(),a.append(s),t.item.replaceWith(a),s.each(function(){$(this).addClass("additional"),$(this).append(o),$(this).append($('<div class="colContent row"></div>').append(i()))})}a.sortable(l)}};function r(){$("#containers").sortable({placeholder:"design",axis:"y",tolerance:"pointer",start:function(e,t){t.helper.hasClass("container")?(t.placeholder.addClass("container"),t.helper.css("left",t.placeholder.offset().left)):t.placeholder.addClass("container-fluid")},handle:".glyphicon-sort"}),$("#containers>div").sortable(s).append(a).addClass("design main custom-style"),$(".additional.row").sortable(l).append(n).children(".additional").append(o)}r(),$("body").droppable({greedy:!0,accept:".AddContainer",hoverClass:"dropWarning",drop:function(e,t){var n=$('<div class="container design main">'+a+"</div>");n.sortable(s),$(".additional.row",n).sortable(l),$("#containers").append(n)}}),$(document).on("click",".container.design .glyphicon-resize-horizontal",function(){$(this).closest(".container").removeClass("container").addClass("container-fluid")}),$(document).on("click",".container-fluid.design .glyphicon-resize-small",function(){$(this).closest(".container-fluid").removeClass("container-fluid").addClass("container")}),$(document).on("click","#containers .glyphicon-remove-circle",function(){var e=$(this).parent().parent();Easy.ShowMessageBox("提示","确定要删除吗？",function(){e.remove()},!0,10)}),$(document).on("click","#containers .glyphicon-menu-left",function(){var e=$(this).parent().parent().attr("class");e=e.replace(/col-md-(\d+)/g,function(e,t){return(t=parseInt(t))>1&&t--,"col-md-"+t}),$(this).parent().parent().attr("class",e)}),$(document).on("click","#containers .glyphicon-menu-right",function(){var e=$(this).parent().parent().attr("class");e=e.replace(/col-md-(\d+)/g,function(e,t){return(t=parseInt(t))<12&&t++,"col-md-"+t}),$(this).parent().parent().attr("class",e)}),$(document).on("click",".custom-style-editor",function(){$(".custom-style-target").removeClass("custom-style-target"),$(this).parents(".main").addClass("custom-style-target")}),$(window).width()>1600&&$(".templates").addClass("active"),$(document).on("click",".templates .tool-open",function(){$(this).parent().toggleClass("active")}),e.removeClass("hide"),$(document).on("click","#save",function(){if($('input[name="ZoneName"]').each(function(){$.trim($(this).val())||$(this).val("未命名"),$(this).attr("value",$(this).val())}),!$(this).data("done")){$(this).data("done",!0);var t=$("#LayoutInfo");$("zone").each(function(e){$("input",this).each(function(){$(this).attr("name","zones["+e+"]."+$(this).attr("name")).addClass("hide")}).appendTo(t)});var a=$('<div id="containers"/>').append(e.html());$("div",a).removeClass("ui-droppable").removeClass("ui-sortable").removeClass("ui-sortable-handle").removeClass("active").removeClass("design").removeClass("custom-style-target").not(".custom-style").removeAttr("style"),$(".tools",a).remove();for(var n=a.html().split("<zone>"),o=[],i=0;i<n.length;i++)o.push(n[i]),i<n.length-1&&o.push("<zone>");var l=[];for(i=0;i<o.length;i++)for(var s=o[i].split("</zone>"),r=0;r<s.length;r++)l.push(s[r]),r<s.length-1&&l.push("</zone>");$(".layout-html",t).remove();for(i=0;i<l.length;i++){var c=$.trim(l[i]);c&&t.append($('<textarea name="html" class="layout-html hide"></textarea>').val(c))}return t.submit(),!1}}),$(document).on("click","#show-source-code",function(){$('input[name="ZoneName"]').each(function(){$.trim($(this).val())||$(this).val("未命名"),$(this).attr("value",$(this).val())});var t=$('<div id="containers"/>').append(e.html());$("div",t).removeClass("ui-droppable").removeClass("ui-sortable").removeClass("ui-sortable-handle").removeClass("active").removeClass("design").removeClass("custom-style-target").not(".custom-style").removeAttr("style"),$(".tools",t).remove();var a=t.html().replace(new RegExp("><div","g"),">\n<div").replace(new RegExp("></div","g"),">\n</div").replace(new RegExp("><zone>","g"),">\n<zone>\n").replace(new RegExp("></zone","g"),">\n</zone").replace(new RegExp("><input","g"),">\n<input");c.setValue(a),setTimeout(function(){c.refresh();var e=c.lineCount();c.autoFormatRange({line:0,ch:0},{line:e})},500)}),$(document).on("click","#save-layout-code",function(){var t=c.getValue();e.html(t),$("input[name=LayoutId]",e).val($("#LayoutId").val()),r()});var c=CodeMirror.fromTextArea(document.getElementById("layout-code"),{lineNumbers:!0,mode:"htmlmixed",theme:"monokai",lineWrapping:!0,autofocus:!0,tabSize:2,extraKeys:{"Ctrl-J":"autocomplete"},autoCloseTags:!0});$(".CodeMirror").height($(window).height()-220),$("#modal-layout-code").css("display","")});
\ No newline at end of file