From 96a62b5aec1f70119aceb0db1a6a3b0342f5d205 Mon Sep 17 00:00:00 2001
From: wayne <seriawei@outlook.com>
Date: Thu, 28 Dec 2023 21:18:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=92=A4=E9=94=80=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Database/Update/3.9.3/MsSql.sql               |   7 ++
 Database/Update/3.9.3/MySql.sql               |   5 +
 Database/Update/3.9.3/Sqlite.sql              |   5 +
 Database/Update/3.9.3/package.zip             | Bin 0 -> 853 bytes
 Database/index.json                           |   4 +
 .../ViewPort/Descriptor/SelectDescriptor.cs   |   2 +-
 src/ZKEACMS.WebHost/Locale/zh-CN.yml          |   3 +-
 src/ZKEACMS.WebHost/Locale/zh-TW.yml          |   3 +-
 src/ZKEACMS.WebHost/Views/Page/Design.cshtml  |   2 +
 src/ZKEACMS.WebHost/Views/Page/Index.cshtml   |  21 ++--
 .../Views/Page/PageZones.cshtml               |   4 +-
 src/ZKEACMS.WebHost/wwwroot/css/admin.css     |  25 +++--
 src/ZKEACMS.WebHost/wwwroot/css/admin.min.css |   2 +-
 src/ZKEACMS.WebHost/wwwroot/js/PageDesign.js  |   7 +-
 .../wwwroot/js/PageDesign.min.js              |   2 +-
 src/ZKEACMS/Constant.cs                       |  12 ++-
 src/ZKEACMS/Controllers/WidgetController.cs   |  17 +++-
 src/ZKEACMS/Filter/WidgetAttribute.cs         |  92 +++++++++---------
 src/ZKEACMS/MetaData/WidgetMetaData.cs        |   2 +-
 src/ZKEACMS/Page/PageService.cs               |  21 ++--
 20 files changed, 150 insertions(+), 86 deletions(-)
 create mode 100644 Database/Update/3.9.3/MsSql.sql
 create mode 100644 Database/Update/3.9.3/MySql.sql
 create mode 100644 Database/Update/3.9.3/Sqlite.sql
 create mode 100644 Database/Update/3.9.3/package.zip

diff --git a/Database/Update/3.9.3/MsSql.sql b/Database/Update/3.9.3/MsSql.sql
new file mode 100644
index 00000000..83cfac7c
--- /dev/null
+++ b/Database/Update/3.9.3/MsSql.sql
@@ -0,0 +1,7 @@
+if not exists(select 1 from DataDictionary where DicName=N'WidgetStatus')
+begin
+	insert into DataDictionary(DicName,Title,DicValue,[Order],Pid,IsSystem,[Status])
+	select N'WidgetStatus',N'Visible',1,1,0,1,1 union all
+	select N'WidgetStatus',N'Hidden',2,2,0,1,1 union all
+	select N'WidgetStatus',N'Deleted',3,3,0,1,1
+end
\ No newline at end of file
diff --git a/Database/Update/3.9.3/MySql.sql b/Database/Update/3.9.3/MySql.sql
new file mode 100644
index 00000000..2e34be62
--- /dev/null
+++ b/Database/Update/3.9.3/MySql.sql
@@ -0,0 +1,5 @@
+delete from `DataDictionary` where `DicName`='WidgetStatus';
+insert into `DataDictionary`(`DicName`,`Title`,`DicValue`,`Order`,`Pid`,`IsSystem`,`Status`)
+select 'WidgetStatus','Visible',1,1,0,1,1 union all
+select 'WidgetStatus','Hidden',2,2,0,1,1 union all
+select 'WidgetStatus','Deleted',3,3,0,1,1
\ No newline at end of file
diff --git a/Database/Update/3.9.3/Sqlite.sql b/Database/Update/3.9.3/Sqlite.sql
new file mode 100644
index 00000000..3f36d1a6
--- /dev/null
+++ b/Database/Update/3.9.3/Sqlite.sql
@@ -0,0 +1,5 @@
+delete from DataDictionary where DicName='WidgetStatus';
+insert into DataDictionary(DicName,Title,DicValue,[Order],Pid,IsSystem,[Status])
+select 'WidgetStatus','Visible',1,1,0,1,1 union all
+select 'WidgetStatus','Hidden',2,2,0,1,1 union all
+select 'WidgetStatus','Deleted',3,3,0,1,1
\ No newline at end of file
diff --git a/Database/Update/3.9.3/package.zip b/Database/Update/3.9.3/package.zip
new file mode 100644
index 0000000000000000000000000000000000000000..a0f2d67ea148195d61bc0198dedb24c91a89f722
GIT binary patch
literal 853
zcmWIWW@Zs#U|`^2NSQGwoXPW^=V2hvgOP!O6G;0O2N&k(6&L1A?c3PJ<S5{hEdEX2
zO1hQrobkRKX5VYfuFQrKbBl6k%x#?+cO~EW!{m43dFPCc1ePpVxVkd*Z}HxfjZVv3
zHmmp^X6fI1X$IfM?3J6cv~R91Ie3hFZePcOoGaUohUZ>;B=y2+?YEOXr;^&;oFaKt
zR9sX!Z`r!?$Q$Up+FImmzpnm}CMWx7+Ww;-b#(PSFMfJvUpad+d;k7<Ry)nKJvV(e
zusQeZ$LuTZF>cp>hu;aA<81I}=2y0`r_F~X=cU};xyhkme*oO4Z&uC;pPHl2x(Vn*
zLzqu1p+4=MaGvXs0nf4b&3m2mLth-UcmKGpIWA<zne5k6rWeXCq@9>|wz>a__6%PE
z7nYw2@f?3Xwc6yBbMtW=(KL&DacF|(2DO}~&beaOxm_L@UXy<8sQ;Alt>g+7=iEu%
zHisuDOgi9jR@}C#*z5honD;g-d$NC*N$a|NlZ{&UI;5=gK=JQe>yB4W`>}1-k@QuQ
zMAdApCS;wO^(AymqjPKFJM}G2*@_;f$$w9a9L`@8QhbfUmJ#8x9-zk_uTn2w2lSXC
z&|_Rc8tARel2lL}_D<N(b;yCI{kzkB#oL-GAI@v!$(95z3~Imh@XI2$b>Ta_C)&*h
zd95N$oYm2eL*>I$@uL0rcp`<G7UyT3*z%%>|4{Gcea)w5+BnLrDe*1dnp~`O($!n~
zijMCM)=x}tmi#ng&u8DRGtHo^b(?PD&Tnlst<q*Ycq+wPvUK95S0~PDsW|QUz?d`i
zVB_~`B7Mq>(_60{Rk?8O-xRSN9?RCrC-(bY`+rDdj$74BpsyI2L>O=<O`z8p7#S2m
z6cE4@DzY|g@eEQ7(e?_Y4HoOj+OUNpLfc_rxFW(dz?+o~B*zSd%YgJuCJ+w*=(R%Y

literal 0
HcmV?d00001

diff --git a/Database/index.json b/Database/index.json
index 4f99a880..ca395457 100644
--- a/Database/index.json
+++ b/Database/index.json
@@ -52,6 +52,10 @@
         {
             "Version": "3.9",
             "Resolved": "Update/3.9/package.zip"
+        },
+        {
+            "Version": "3.9.3",
+            "Resolved": "Update/3.9.3/package.zip"
         }
     ]
 }
\ No newline at end of file
diff --git a/src/EasyFrameWork/ViewPort/Descriptor/SelectDescriptor.cs b/src/EasyFrameWork/ViewPort/Descriptor/SelectDescriptor.cs
index 3d00b4f8..a14c05cf 100644
--- a/src/EasyFrameWork/ViewPort/Descriptor/SelectDescriptor.cs
+++ b/src/EasyFrameWork/ViewPort/Descriptor/SelectDescriptor.cs
@@ -56,7 +56,7 @@ public SourceType SourceType
                     {
                         Dictionary<string, string> data = new Dictionary<string, string>();
                         IDataDictionaryService dicService = ServiceLocator.GetService<IDataDictionaryService>();
-                        var dicts = dicService.Get(m => m.DicName == this.SourceKey);
+                        var dicts = dicService.Get(m => m.DicName == this.SourceKey).OrderBy(m => m.Order);
                         foreach (DataDictionaryEntity item in dicts)
                         {
                             data[item.DicValue] = item.Title;
diff --git a/src/ZKEACMS.WebHost/Locale/zh-CN.yml b/src/ZKEACMS.WebHost/Locale/zh-CN.yml
index f5762e01..a00db3c3 100644
--- a/src/ZKEACMS.WebHost/Locale/zh-CN.yml
+++ b/src/ZKEACMS.WebHost/Locale/zh-CN.yml
@@ -1541,4 +1541,5 @@ View Video Category: 查看视频类别
 Manage Video Category: 管理视频类别
 Video(Embed): 视频（嵌入）
 Name already exists: 名称已存在
-Please upload video or input video code: 请上传视频或者输入视频代码
\ No newline at end of file
+Please upload video or input video code: 请上传视频或者输入视频代码
+Deleted: 已删除
\ No newline at end of file
diff --git a/src/ZKEACMS.WebHost/Locale/zh-TW.yml b/src/ZKEACMS.WebHost/Locale/zh-TW.yml
index 32fce54b..8acac839 100644
--- a/src/ZKEACMS.WebHost/Locale/zh-TW.yml
+++ b/src/ZKEACMS.WebHost/Locale/zh-TW.yml
@@ -1542,4 +1542,5 @@ View Video Category: 查看視頻類別
 Manage Video Category: 管理視頻類別
 Video(Embed): 視頻（嵌入）
 Name already exists: 名稱已存在
-Please upload video or input video code: 請上傳視頻或者輸入視頻程式碼
\ No newline at end of file
+Please upload video or input video code: 請上傳視頻或者輸入視頻程式碼
+Deleted: 已删除
\ No newline at end of file
diff --git a/src/ZKEACMS.WebHost/Views/Page/Design.cshtml b/src/ZKEACMS.WebHost/Views/Page/Design.cshtml
index d9e376b5..616b23b9 100644
--- a/src/ZKEACMS.WebHost/Views/Page/Design.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Page/Design.cshtml
@@ -28,6 +28,8 @@
             {
                 foreach (var widgetPart in Model.ZoneWidgets[zoneId].OrderBy(m => m.Widget.Position).ThenBy(m => m.Widget.WidgetName))
                 {
+                    if (widgetPart.Widget.Status == (int)WidgetStatus.Deleted) continue;
+
                     if (widgetPart.Widget.ID.IsNotNullAndWhiteSpace())
                     {
                         @await Html.DesignWidget(new DesignWidgetViewModel(widgetPart, Model.Page.ID))
diff --git a/src/ZKEACMS.WebHost/Views/Page/Index.cshtml b/src/ZKEACMS.WebHost/Views/Page/Index.cshtml
index 967eb103..d94787ec 100644
--- a/src/ZKEACMS.WebHost/Views/Page/Index.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Page/Index.cshtml
@@ -107,7 +107,7 @@
 </div><!-- /.modal -->
 @using (Script.AtFoot())
 {
-<script type="text/javascript">
+    <script type="text/javascript">
         function Create(node) {
             var parent = node.reference.attr("id");
             window.location.href = '@Url.Action("Create", "Page")' + '?ParentID=' + parent;
@@ -139,9 +139,10 @@
                 Easy.Block();
                 $.post('@Url.Action("Publish")', { id: id }, function (data) {
                     if (data.errorMessage) {
-                        Easy.ShowMessageBox("@L("Notice")",data.errorMessage);
+                        Easy.ShowMessageBox("@L("Notice")", data.errorMessage);
                     }
                     $(".jstree").jstree().refresh();
+                    $(".simplePreview .widget.disabled").remove();
                     Easy.UnBlock();
                 });
             }, true);
@@ -172,24 +173,28 @@
         $(document).on("click", ".fullRowList .delete", function () {
             var id = $(this).data("widgetid");
             Easy.ShowMessageBox("@L("Notice")", "@L("Do you want to delete?")", function () {
-                $.post("@Url.Action("DeleteWidget", "Widget")", { ID: id }, function (data) {
-                    if (data) {
+                $.post("@Url.Action("DeleteWidget", "Widget")", { ID: id, permanent: true }, function (data) {
+                    if (data.actionType == @((int)ActionType.Delete)) {
                         $("#widget_" + id).remove();
+                    } else if (data.actionType == @((int)ActionType.Update)) {
+                        $("#widget_" + id).addClass("disabled");
                     }
                 }, "json");
             }, true, 10);
-        }).on("click", ".publish-page",function() {
+        }).on("click", ".publish-page", function () {
             var btn = $(this);
             Publish({
                 reference: {
                     attr: function (id) {
-                return btn.data(id);
-            }}});
+                        return btn.data(id);
+                    }
+                }
+            });
         });
         if (!location.hash) {
             location.hash = '@(pageId)';
         }
-</script>
+    </script>
     <script type="text/javascript">
         $(function () {
             $(".jstree").css("max-height", $(window).height() - 200).css("overflow", "auto");
diff --git a/src/ZKEACMS.WebHost/Views/Page/PageZones.cshtml b/src/ZKEACMS.WebHost/Views/Page/PageZones.cshtml
index 6ae95945..1400e58d 100644
--- a/src/ZKEACMS.WebHost/Views/Page/PageZones.cshtml
+++ b/src/ZKEACMS.WebHost/Views/Page/PageZones.cshtml
@@ -62,7 +62,7 @@
                             <ul data-zoneid="@item.HeadingCode" class="fullRowList widgets connectedSortable">
                                 @foreach (var widget in Model.Widgets.Where(m => m.IsInZone(item.HeadingCode)).OrderBy(m => m.Position).ThenBy(m => m.WidgetName))
                                 {
-                                    <li id="widget_@widget.ID" class="widget" data-widgetid="@widget.ID" data-position="@(widget.LayoutId.IsNotNullAndWhiteSpace()||widget.RuleID.HasValue?widget.Position:0)">
+                                    <li title="@(widget.Status == (int)WidgetStatus.Deleted ? L("Deleted"):widget.WidgetName)" id="widget_@widget.ID" class="widget @(widget.Status == (int)WidgetStatus.Deleted? "disabled":"")" data-widgetid="@widget.ID" data-position="@(widget.LayoutId.IsNotNullAndWhiteSpace() || widget.RuleID.HasValue ? widget.Position : 0)">
                                         @if (widget.LayoutId.IsNotNullAndWhiteSpace())
                                         {
                                             <a class="badge" href="@Url.Action("LayoutWidget","Layout",new{ layoutId = widget.LayoutId })">@L("Layout")</a>
@@ -80,7 +80,7 @@
                                                 <img class="icon" src="~/images/icons/delete.svg" />
                                             </a>
                                         }
-                                        @if (widget.Status == (int)RecordStatus.InActive)
+                                        @if (widget.Status == (int)WidgetStatus.Hidden)
                                         {
                                             <a style="cursor:default"><img class="icon" src="~/images/icons/invisible.svg" title="@L("Invisible")" /></a>
                                         }
diff --git a/src/ZKEACMS.WebHost/wwwroot/css/admin.css b/src/ZKEACMS.WebHost/wwwroot/css/admin.css
index 3b0b27a4..7d82b365 100644
--- a/src/ZKEACMS.WebHost/wwwroot/css/admin.css
+++ b/src/ZKEACMS.WebHost/wwwroot/css/admin.css
@@ -350,8 +350,9 @@ a.badge:hover {
     .fullRowList .glyphicon {
         font-size: 12px;
     }
-    .fullRowList .icon{
-        width:16px;
+
+    .fullRowList .icon {
+        width: 16px;
     }
 
     .fullRowList.tags input {
@@ -391,6 +392,15 @@ a.badge:hover {
         color: #E28271;
     }
 
+    .fullRowList li.disabled {
+        border-left: 5px solid #ddd;
+        color: #ccc;
+    }
+
+        .fullRowList li.disabled .icon {
+            opacity: 0.2;
+        }
+
 #layouts.fullRowList li {
     cursor: pointer;
 }
@@ -577,7 +587,7 @@ a.badge:hover {
     text-align: center;
 }
 
-    #media-list .thumbnail > a.img-link.confirm img{
+    #media-list .thumbnail > a.img-link.confirm img {
         background: url(../images/opacity-dotted.png);
     }
 
@@ -782,9 +792,9 @@ a.pack-theme {
     }
 }
 
-    .seach-terms .form-control.required {
-        background-color: #fff;
-    }
+.seach-terms .form-control.required {
+    background-color: #fff;
+}
 
 .dataTable tfoot .search {
     display: none;
@@ -793,6 +803,7 @@ a.pack-theme {
 .select2-container--default .select2-selection--single {
     border-color: #ccc;
 }
+
 .opacity-dotted {
     background: url(../images/opacity-dotted.png);
-}
\ No newline at end of file
+}
diff --git a/src/ZKEACMS.WebHost/wwwroot/css/admin.min.css b/src/ZKEACMS.WebHost/wwwroot/css/admin.min.css
index f960467d..3ab32428 100644
--- a/src/ZKEACMS.WebHost/wwwroot/css/admin.min.css
+++ b/src/ZKEACMS.WebHost/wwwroot/css/admin.min.css
@@ -1,4 +1,4 @@
 /*! http://www.zkea.net/ 
  * Copyright (c) ZKEASOFT. All rights reserved. 
  * http://www.zkea.net/licenses */
-body{background:url(../images/dotted.png)}img{max-width:100%}#wrap{height:100%}#wrap .navbar-fixed-top{z-index:1}.tab-content.panel{border-top-color:#fff;border-top-left-radius:0;border-top-right-radius:0}.form-horizontal{padding-left:15px;padding-right:15px}.form-horizontal .control-label{display:block;text-align:right}@media(max-width:1199px){.form-horizontal .control-label{padding-top:0;margin-bottom:7px;text-align:left}}.field-validation-error{top:10px;position:relative;display:block;background:#ca2026;color:#fff;padding:.7rem 1rem;font-size:14px;margin-bottom:10px}.field-validation-error:before{content:" ";display:block;border-top:2px solid transparent;border-left:8px solid transparent;border-right:8px solid transparent;border-bottom:8px solid #ca2026;position:absolute;left:10px;top:-10px}.alert .field-validation-error{position:static;background:none;margin:0;color:inherit}.alert .field-validation-error:before{display:none}@media(min-width:1440px){.form-horizontal{width:85%}}.input-group .form-control{position:static}.input-group.loading::before{display:block;content:" ";position:absolute;height:2px;bottom:0;left:0;width:0;background:#f00}.input-group.loading.processing::before{width:100%;transition:width 2s}form .input-group .layout-item{cursor:pointer}.input-group .layout-item{text-align:center;width:200px;border:1px solid #ddd;padding:5px;margin:5px 10px 5px 0;border-radius:5px}.input-group .layout-item.active{background:#337ab7}.input-group .layout-item .zone-name{font-size:12px}.input-group .layout-item.active .name{color:#fff}.input-group .layout-item .container{width:160px!important}.input-group .layout-item .colContent{border:1px dashed #ddd;margin:2px -13px;background-color:#fff;padding:2px 0}.input-group .layout-item.active .colContent{border:1px solid #337ab7}.form-control.required{background-color:#fff0dd}a.badge:hover{background-color:#1f1f1f}.navbar-fixed-left{border-radius:0;position:fixed;left:0;top:50px;width:190px;height:100%;border:0}.navbar-fixed-left .navbar-header,.navbar-fixed-left .navbar-nav,.navbar-fixed-left .navbar-nav>li{float:none}.navbar-fixed-left .navbar-nav{margin:0}.userInfo{background-color:#424242;height:80px}.userInfo>img{height:60px;margin:10px 0 0 10px}.userInfo>strong{color:#e28271;margin-left:10px}.main-container{padding:65px 0 0 190px}#main-body{overflow:auto;padding:0 15px;position:absolute;left:190px;right:0;bottom:0;top:65px}.accordion-inner{background-color:#3d3e43;border:0;padding:5px 0 5px 0;display:none}.accordion-inner a{border-left:2px solid #3d3e43;display:block;padding:2px 0 2px 10px;text-decoration:none;color:#fff}.accordion-group .group{float:right}.accordion-group .group:after{content:""}.accordion-group .active .group:after{content:""}.b_F79999:hover{border-left:2px solid #f79999!important}.b_C3F7A7:hover{border-left:2px solid #c3f7a7!important}.b_9FDDF6:hover{border-left:2px solid #9fddf6!important}.b_F6F1A2:hover{border-left:2px solid #f6f1a2!important}.b_C1F8A9:hover{border-left:2px solid #c1f8a9!important}.b_F5C294:hover{border-left:2px solid #f5c294!important}#main-menu .menu-item.active{background:#eaeaea;color:#000;text-shadow:none}#main-menu .menu-item,#main-menu .group-item{padding:7px 10px;margin:5px 0;border-left:2px solid transparent}.toolBar{padding:6px 15px;background-color:#f7f7f9;border-top:1px solid #e1e1e8;clear:both;margin:15px -15px -15px -15px}#toolBar{padding-bottom:10px;border-bottom:1px solid #ddd;margin-bottom:10px}.input-group .mce-panel{border:1px solid #ccc;border-radius:0}.input-group-addon .glyphicon{cursor:pointer;font-size:13px;margin-left:5px}.input-group-addon .glyphicon:hover{color:#e28271}.popUpToolBar{background-color:#f7f7f9;border-top:1px solid #e1e1e8;width:100%;position:fixed;bottom:0;padding:5px;left:0;z-index:10}.fullRowList{margin:0;padding:1px 0;list-style:none;color:#717171}.fullRowList li{padding:6px;border:1px solid #ddd;border-left:5px solid #008000;margin:5px;background-color:#fff}.fullRowList li.sorting{height:34px;border:1px solid #ededed;border-left:5px solid #e28271}.fullRowList.widgets li{cursor:move}.fullRowList li ul{list-style:none;padding-left:2.2rem}.fullRowList li:hover,.fullRowList li.actived{border-left:5px solid #e28271;color:#e28271}.fullRowList.droping{background-color:#9fddf6}.fullRowList .glyphicon{font-size:12px}.fullRowList .icon{width:16px}.fullRowList.tags input{border:1px solid #fff;padding:2px 4px}.fullRowList.tags input:hover{border:1px solid #ddd}.fullRowList.tags input:focus{border:1px solid #ddd}.fullRowList.tags input+code{display:none}.fullRowList.tags input:focus+code{display:inline}.fullRowList.ui-sortable li{cursor:move}.fullRowList a{text-decoration:none;outline:0;display:inline-block;margin:0 2px}.fullRowList li:hover a,.fullRowList li.actived a{color:#e28271}#layouts.fullRowList li{cursor:pointer}.input-group-collection{background-color:#fff;border:1px solid #ccc;border-radius:4px;padding-bottom:8px}.input-group-collection .btn.add{margin-top:8px}.input-group-collection .items .item{display:block;position:relative;border-bottom:1px solid #f2f2f2}.input-group-collection .item .form-group{margin:8px 0}.input-group-collection .delete{position:absolute;right:10px;top:10px;color:#f00}.jstree a::after{font-weight:normal;color:#b4b4b4;font-size:11px;line-height:20px}.jstree a[ispublish="false"],.jstree a[publishdate="null"]{color:#008000}.jstree a[ispublish="false"]::after{content:" (已修改"}.jstree a[publishdate="null"]::after{content:" (未发布"}.jstree a[ishomepage="true"],.jstree a[url="~/index"]{font-weight:bold;color:#f00}.form-control[type=checkbox]{width:15px;box-shadow:none;margin:0;padding:0;border-radius:0}.control-label{font-weight:normal}.control-label .glyphicon{cursor:pointer;margin-left:3px}.control-label .glyphicon:hover{color:#f00}.ui-draggable-dragging{z-index:1}.simplePreview .simpleDesign .panel{margin:5px}.simplePreview .panel-relative{position:relative}.simplePreview .panel-toolbar{text-align:center;margin-top:5px;padding:0 0 5px}.simplePreview .simpleDesign>.container{width:auto}.description{font-size:13px}.icon-left{padding-left:70px}.icon-left .icon{margin-left:-70px;font-size:16px}.icon-left .label{float:left;margin:3px 5px 0 0}#section-groups .edit-pragraph{max-height:300px;overflow:hidden;text-overflow:ellipsis}.sort-handle{cursor:n-resize}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0%,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f5f5f5 0%,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#f5f5f5));background-image:linear-gradient(to bottom,#f5f5f5 0%,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff5f5f5',GradientType=0)}.form-group select#ZoneId,.form-group select.select{cursor:pointer}.form-group .mce-tinymce{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.form-group .tox-tinymce{border:1px solid #ccc;border-radius:4px}#media-list .edit{width:100%;line-height:normal;margin:0;padding:0}.thumbnail.active{background:#337ab7;color:#fff}#media-list .thumbnail>a.img-link{display:block;height:130px;overflow:hidden;line-height:130px;text-align:center}#media-list .thumbnail>a.img-link.confirm img{background:url(../images/opacity-dotted.png)}#media-list .thumbnail>a.img-link img{max-height:100%;vertical-align:middle;display:inline-block}#media-list .thumbnail .caption{text-align:center;padding:5px 0;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;position:relative}#media-list .thumbnail.status-2 .caption:after{display:block;content:"Error";color:#fff;position:absolute;left:0;top:0;bottom:0;right:0;background:#ca2026;line-height:30px}#media-list .thumbnail .caption .edit{text-align:center;height:20px;padding:0;line-height:20px;border:1px solid #ddd;outline:0;border-radius:3px}#media-list .thumbnail .close{position:absolute;right:6px;top:-10px;opacity:.7;color:#f00;font-size:21px}#media-list .thumbnail .tool{position:absolute;right:20px;bottom:25px;text-shadow:1px 1px 2px #fff;text-align:left;display:none}#media-list .thumbnail:hover .tool{display:block}#media-list .thumbnail .tool a{margin:0 3px;color:#3d3e43}#media-list .thumbnail .close:hover{opacity:1}#media-list .new-folder .close{display:none}#media-list .thumbnail .multi-select{position:absolute;left:18px;top:unset;bottom:23px;font-size:21px;background:#fff;border-radius:50%;cursor:pointer}#media-list .thumbnail .multi-select:not(.glyphicon-unchecked){color:#f00}.navbar-inverse .navbar-nav>li>a{color:#fff}.navbar-inverse .navbar-nav>li a:hover{background-color:#000}.dataTable{background-color:#fff;border-left:0;border-right:0}.dataTable thead,.dataTable tfoot{background-color:#fff}.dataTable .input-group-addon{cursor:pointer}.dataTable .form-control{font-weight:normal;width:100%}.dataTable .range-search{position:relative}.dataTable .range-search input.max{display:none;position:absolute;left:0;bottom:-100%;width:100%;z-index:2;margin-bottom:-2px}.dataTable .range-search input.max.show{display:block}.dataTable .glyphicon{margin:0 3px}table.table-bordered.dataTable th,table.table-bordered.dataTable td{vertical-align:middle}table.table-bordered.dataTable>thead>tr>th,table.table-bordered.dataTable>tbody>tr>td:first-child{white-space:nowrap}div.dataTables_wrapper>.row>.col-sm-12{padding:0}div.dataTables_wrapper div.dataTables_processing{text-indent:-5000px;background:#fff url('../js/EasyPlug/Css/Images/loader.gif') center center no-repeat;width:50px;margin-left:-25px}div.dataTables_wrapper div.dataTables_paginate ul.pagination{margin:4px 0 0;float:right}.tag-selector .panel:last-child{margin-bottom:0}a[ismobile=true]:after{content:" M"}a.pack-theme{color:#000}@media(min-width:1200px){.template-list .thumb-item{max-width:180px}}.CodeMirror{width:100%;height:100%}.seach-terms .form-group{margin-right:15px;margin-bottom:10px}@media(min-width:768px){.seach-terms.form-inline .form-group{display:block;float:left}.seach-terms .form-control{max-width:160px}}.seach-terms .form-control.required{background-color:#fff}.dataTable tfoot .search{display:none}.select2-container--default .select2-selection--single{border-color:#ccc}.opacity-dotted{background:url(../images/opacity-dotted.png)}
\ No newline at end of file
+body{background:url(../images/dotted.png)}img{max-width:100%}#wrap{height:100%}#wrap .navbar-fixed-top{z-index:1}.tab-content.panel{border-top-color:#fff;border-top-left-radius:0;border-top-right-radius:0}.form-horizontal{padding-left:15px;padding-right:15px}.form-horizontal .control-label{display:block;text-align:right}@media(max-width:1199px){.form-horizontal .control-label{padding-top:0;margin-bottom:7px;text-align:left}}.field-validation-error{top:10px;position:relative;display:block;background:#ca2026;color:#fff;padding:.7rem 1rem;font-size:14px;margin-bottom:10px}.field-validation-error:before{content:" ";display:block;border-top:2px solid transparent;border-left:8px solid transparent;border-right:8px solid transparent;border-bottom:8px solid #ca2026;position:absolute;left:10px;top:-10px}.alert .field-validation-error{position:static;background:none;margin:0;color:inherit}.alert .field-validation-error:before{display:none}@media(min-width:1440px){.form-horizontal{width:85%}}.input-group .form-control{position:static}.input-group.loading::before{display:block;content:" ";position:absolute;height:2px;bottom:0;left:0;width:0;background:#f00}.input-group.loading.processing::before{width:100%;transition:width 2s}form .input-group .layout-item{cursor:pointer}.input-group .layout-item{text-align:center;width:200px;border:1px solid #ddd;padding:5px;margin:5px 10px 5px 0;border-radius:5px}.input-group .layout-item.active{background:#337ab7}.input-group .layout-item .zone-name{font-size:12px}.input-group .layout-item.active .name{color:#fff}.input-group .layout-item .container{width:160px!important}.input-group .layout-item .colContent{border:1px dashed #ddd;margin:2px -13px;background-color:#fff;padding:2px 0}.input-group .layout-item.active .colContent{border:1px solid #337ab7}.form-control.required{background-color:#fff0dd}a.badge:hover{background-color:#1f1f1f}.navbar-fixed-left{border-radius:0;position:fixed;left:0;top:50px;width:190px;height:100%;border:0}.navbar-fixed-left .navbar-header,.navbar-fixed-left .navbar-nav,.navbar-fixed-left .navbar-nav>li{float:none}.navbar-fixed-left .navbar-nav{margin:0}.userInfo{background-color:#424242;height:80px}.userInfo>img{height:60px;margin:10px 0 0 10px}.userInfo>strong{color:#e28271;margin-left:10px}.main-container{padding:65px 0 0 190px}#main-body{overflow:auto;padding:0 15px;position:absolute;left:190px;right:0;bottom:0;top:65px}.accordion-inner{background-color:#3d3e43;border:0;padding:5px 0 5px 0;display:none}.accordion-inner a{border-left:2px solid #3d3e43;display:block;padding:2px 0 2px 10px;text-decoration:none;color:#fff}.accordion-group .group{float:right}.accordion-group .group:after{content:""}.accordion-group .active .group:after{content:""}.b_F79999:hover{border-left:2px solid #f79999!important}.b_C3F7A7:hover{border-left:2px solid #c3f7a7!important}.b_9FDDF6:hover{border-left:2px solid #9fddf6!important}.b_F6F1A2:hover{border-left:2px solid #f6f1a2!important}.b_C1F8A9:hover{border-left:2px solid #c1f8a9!important}.b_F5C294:hover{border-left:2px solid #f5c294!important}#main-menu .menu-item.active{background:#eaeaea;color:#000;text-shadow:none}#main-menu .menu-item,#main-menu .group-item{padding:7px 10px;margin:5px 0;border-left:2px solid transparent}.toolBar{padding:6px 15px;background-color:#f7f7f9;border-top:1px solid #e1e1e8;clear:both;margin:15px -15px -15px -15px}#toolBar{padding-bottom:10px;border-bottom:1px solid #ddd;margin-bottom:10px}.input-group .mce-panel{border:1px solid #ccc;border-radius:0}.input-group-addon .glyphicon{cursor:pointer;font-size:13px;margin-left:5px}.input-group-addon .glyphicon:hover{color:#e28271}.popUpToolBar{background-color:#f7f7f9;border-top:1px solid #e1e1e8;width:100%;position:fixed;bottom:0;padding:5px;left:0;z-index:10}.fullRowList{margin:0;padding:1px 0;list-style:none;color:#717171}.fullRowList li{padding:6px;border:1px solid #ddd;border-left:5px solid #008000;margin:5px;background-color:#fff}.fullRowList li.sorting{height:34px;border:1px solid #ededed;border-left:5px solid #e28271}.fullRowList.widgets li{cursor:move}.fullRowList li ul{list-style:none;padding-left:2.2rem}.fullRowList li:hover,.fullRowList li.actived{border-left:5px solid #e28271;color:#e28271}.fullRowList.droping{background-color:#9fddf6}.fullRowList .glyphicon{font-size:12px}.fullRowList .icon{width:16px}.fullRowList.tags input{border:1px solid #fff;padding:2px 4px}.fullRowList.tags input:hover{border:1px solid #ddd}.fullRowList.tags input:focus{border:1px solid #ddd}.fullRowList.tags input+code{display:none}.fullRowList.tags input:focus+code{display:inline}.fullRowList.ui-sortable li{cursor:move}.fullRowList a{text-decoration:none;outline:0;display:inline-block;margin:0 2px}.fullRowList li:hover a,.fullRowList li.actived a{color:#e28271}.fullRowList li.disabled{border-left:5px solid #ddd;color:#ccc}.fullRowList li.disabled .icon{opacity:.2}#layouts.fullRowList li{cursor:pointer}.input-group-collection{background-color:#fff;border:1px solid #ccc;border-radius:4px;padding-bottom:8px}.input-group-collection .btn.add{margin-top:8px}.input-group-collection .items .item{display:block;position:relative;border-bottom:1px solid #f2f2f2}.input-group-collection .item .form-group{margin:8px 0}.input-group-collection .delete{position:absolute;right:10px;top:10px;color:#f00}.jstree a::after{font-weight:normal;color:#b4b4b4;font-size:11px;line-height:20px}.jstree a[ispublish="false"],.jstree a[publishdate="null"]{color:#008000}.jstree a[ispublish="false"]::after{content:" (已修改"}.jstree a[publishdate="null"]::after{content:" (未发布"}.jstree a[ishomepage="true"],.jstree a[url="~/index"]{font-weight:bold;color:#f00}.form-control[type=checkbox]{width:15px;box-shadow:none;margin:0;padding:0;border-radius:0}.control-label{font-weight:normal}.control-label .glyphicon{cursor:pointer;margin-left:3px}.control-label .glyphicon:hover{color:#f00}.ui-draggable-dragging{z-index:1}.simplePreview .simpleDesign .panel{margin:5px}.simplePreview .panel-relative{position:relative}.simplePreview .panel-toolbar{text-align:center;margin-top:5px;padding:0 0 5px}.simplePreview .simpleDesign>.container{width:auto}.description{font-size:13px}.icon-left{padding-left:70px}.icon-left .icon{margin-left:-70px;font-size:16px}.icon-left .label{float:left;margin:3px 5px 0 0}#section-groups .edit-pragraph{max-height:300px;overflow:hidden;text-overflow:ellipsis}.sort-handle{cursor:n-resize}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0%,#f5f5f5 100%);background-image:-o-linear-gradient(top,#f5f5f5 0%,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#f5f5f5));background-image:linear-gradient(to bottom,#f5f5f5 0%,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff5f5f5',GradientType=0)}.form-group select#ZoneId,.form-group select.select{cursor:pointer}.form-group .mce-tinymce{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.form-group .tox-tinymce{border:1px solid #ccc;border-radius:4px}#media-list .edit{width:100%;line-height:normal;margin:0;padding:0}.thumbnail.active{background:#337ab7;color:#fff}#media-list .thumbnail>a.img-link{display:block;height:130px;overflow:hidden;line-height:130px;text-align:center}#media-list .thumbnail>a.img-link.confirm img{background:url(../images/opacity-dotted.png)}#media-list .thumbnail>a.img-link img{max-height:100%;vertical-align:middle;display:inline-block}#media-list .thumbnail .caption{text-align:center;padding:5px 0;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;position:relative}#media-list .thumbnail.status-2 .caption:after{display:block;content:"Error";color:#fff;position:absolute;left:0;top:0;bottom:0;right:0;background:#ca2026;line-height:30px}#media-list .thumbnail .caption .edit{text-align:center;height:20px;padding:0;line-height:20px;border:1px solid #ddd;outline:0;border-radius:3px}#media-list .thumbnail .close{position:absolute;right:6px;top:-10px;opacity:.7;color:#f00;font-size:21px}#media-list .thumbnail .tool{position:absolute;right:20px;bottom:25px;text-shadow:1px 1px 2px #fff;text-align:left;display:none}#media-list .thumbnail:hover .tool{display:block}#media-list .thumbnail .tool a{margin:0 3px;color:#3d3e43}#media-list .thumbnail .close:hover{opacity:1}#media-list .new-folder .close{display:none}#media-list .thumbnail .multi-select{position:absolute;left:18px;top:unset;bottom:23px;font-size:21px;background:#fff;border-radius:50%;cursor:pointer}#media-list .thumbnail .multi-select:not(.glyphicon-unchecked){color:#f00}.navbar-inverse .navbar-nav>li>a{color:#fff}.navbar-inverse .navbar-nav>li a:hover{background-color:#000}.dataTable{background-color:#fff;border-left:0;border-right:0}.dataTable thead,.dataTable tfoot{background-color:#fff}.dataTable .input-group-addon{cursor:pointer}.dataTable .form-control{font-weight:normal;width:100%}.dataTable .range-search{position:relative}.dataTable .range-search input.max{display:none;position:absolute;left:0;bottom:-100%;width:100%;z-index:2;margin-bottom:-2px}.dataTable .range-search input.max.show{display:block}.dataTable .glyphicon{margin:0 3px}table.table-bordered.dataTable th,table.table-bordered.dataTable td{vertical-align:middle}table.table-bordered.dataTable>thead>tr>th,table.table-bordered.dataTable>tbody>tr>td:first-child{white-space:nowrap}div.dataTables_wrapper>.row>.col-sm-12{padding:0}div.dataTables_wrapper div.dataTables_processing{text-indent:-5000px;background:#fff url('../js/EasyPlug/Css/Images/loader.gif') center center no-repeat;width:50px;margin-left:-25px}div.dataTables_wrapper div.dataTables_paginate ul.pagination{margin:4px 0 0;float:right}.tag-selector .panel:last-child{margin-bottom:0}a[ismobile=true]:after{content:" M"}a.pack-theme{color:#000}@media(min-width:1200px){.template-list .thumb-item{max-width:180px}}.CodeMirror{width:100%;height:100%}.seach-terms .form-group{margin-right:15px;margin-bottom:10px}@media(min-width:768px){.seach-terms.form-inline .form-group{display:block;float:left}.seach-terms .form-control{max-width:160px}}.seach-terms .form-control.required{background-color:#fff}.dataTable tfoot .search{display:none}.select2-container--default .select2-selection--single{border-color:#ccc}.opacity-dotted{background:url(../images/opacity-dotted.png)}
\ No newline at end of file
diff --git a/src/ZKEACMS.WebHost/wwwroot/js/PageDesign.js b/src/ZKEACMS.WebHost/wwwroot/js/PageDesign.js
index 0d7e79e5..cb2cbcc2 100644
--- a/src/ZKEACMS.WebHost/wwwroot/js/PageDesign.js
+++ b/src/ZKEACMS.WebHost/wwwroot/js/PageDesign.js
@@ -55,10 +55,11 @@ $(function () {
 
     $(".templates ul li").draggable({ helper: "clone", connectToSortable: ".zone" });
     $(document).on("click", ".zoneToolbar .delete", function () {
-        var th = $(this);        
-        $.post(th.data("url"), { ID: th.data("id") }, function (data) {
+        var th = $(this);
+        var id = th.data("id");
+        $.post(th.data("url"), { ID: id }, function (data) {
             if (data) {
-                $("#widget_" + data).parent().remove();
+                $("#widget_" + id).parent().remove();
             }
         }, "json");
     }).on("click", ".zoneToolbar .more", function () {
diff --git a/src/ZKEACMS.WebHost/wwwroot/js/PageDesign.min.js b/src/ZKEACMS.WebHost/wwwroot/js/PageDesign.min.js
index e2c2c453..bed21e7a 100644
--- a/src/ZKEACMS.WebHost/wwwroot/js/PageDesign.min.js
+++ b/src/ZKEACMS.WebHost/wwwroot/js/PageDesign.min.js
@@ -1,4 +1,4 @@
 /*! http://www.zkea.net/
  * Copyright (c) ZKEASOFT. All rights reserved.
  * http://www.zkea.net/licenses */
-$(function(){$(".zone").sortable({items:">div:not(.zoneName)",placeholder:"sorting",handle:".sort-handle",tolerance:"pointer",connectWith:".zone",stop:function(n,t){var r=t.item.parent(),i;return t.item.data("add")&&$.ajax({type:"POST",url:$("#append-widget-url").val(),dataType:"html","async":!1,data:{ID:t.item.data("id"),ZoneId:$("input.zoneId",this).val(),PageId:$("#pageId").val(),AssemblyName:t.item.data("assemblyname"),ServiceTypeName:t.item.data("servicetypename"),Position:1},success:function(n){t.item.replaceWith(n)}}),i=[],r.find(".widget-design").each(function(n,t){i.push({ID:$(t).data("widgetid"),ZoneId:$(".zoneId",r).val(),Position:n+1})}),$.ajax({type:"POST",url:$("#save-widget-zone-url").val(),dataType:"json",contentType:"application/json;charset=utf-8","async":!1,data:JSON.stringify(i),success:function(){}}),!0}});$(".templates ul li").draggable({helper:"clone",connectToSortable:".zone"});$(document).on("click",".zoneToolbar .delete",function(){var n=$(this);$.post(n.data("url"),{ID:n.data("id")},function(n){n&&$("#widget_"+n).parent().remove()},"json")}).on("click",".zoneToolbar .more",function(){$(this).siblings(".toggle-hidden").toggleClass("hidden");$(this).toggleClass("hidden")});$(document).on("click",".templates .tool-open",function(){$(this).parent().toggleClass("active")}).on("click",".templates .delete-template",function(){var n=$(this);Easy.ShowMessageBox("提示","确定要删除该模板吗？",function(){$.post(n.data("url"),{Id:n.data("id")},function(n){n&&$("#template_"+n).remove()},"json")},!0,10)}).on("click",".upload-template",function(){$("#template-file").trigger("click")}).on("change","#template-file",function(){$("#template-form").submit()}).on("click",".zoneToolbar .toggle-widget-class",function(){var n=$(this).data("class");$(this).closest(".widget").toggleClass(n);$.post($(this).data("action"),{clas:n},function(){})}).on("click",".zoneToolbar .custom-style-editor",function(){$(".custom-style-target").removeClass("custom-style-target");var t=$(this).data("action"),n=$(this).closest(".widget").parent();n.toggleClass("custom-style-target");window.top.Easy.ShowUrlWindow({url:"/admin/StyleEditor/Edit",width:1024,title:"编辑样式",onLoad:function(n){n.addClass("loaded")},callBack:function(){$.post(t,{style:n.attr("style")},function(){})},isDialog:!1});$(".WeiWindow.BoxShadow").addClass("StyleEditor")}).on("click",".copy-widget",function(){$.post($(this).data("action"),function(n){Easy.MessageTip.Show(n.message)})}).on("click",".paste-widget",function(){var n=$(this).closest(".zone");return n.data("pasting")||(n.data("pasting",!0),$.post($(this).attr("href"),{Position:$(".widget",n).size()+1},function(t){n.append(t);n.data("pasting",!1)},"html")),!1});$(".helper").click(function(){$("#containers").toggleClass($(this).data("class"))});$(window).width()>1600&&$(".templates").addClass("active");$(document).on("show.bs.modal","#mobile-frame",function(){window.innerHeight<740?$(".mobile",this).addClass("mini"):$(".mobile",this).removeClass("mini");$("iframe",this).attr("src",$(this).data("src"))});$(document).on("hidden.bs.modal","#mobile-frame",function(){$("iframe",this).html("").attr("src","about:blank")})});
\ No newline at end of file
+$(function(){$(".zone").sortable({items:">div:not(.zoneName)",placeholder:"sorting",handle:".sort-handle",tolerance:"pointer",connectWith:".zone",stop:function(n,t){var r=t.item.parent(),i;return t.item.data("add")&&$.ajax({type:"POST",url:$("#append-widget-url").val(),dataType:"html","async":!1,data:{ID:t.item.data("id"),ZoneId:$("input.zoneId",this).val(),PageId:$("#pageId").val(),AssemblyName:t.item.data("assemblyname"),ServiceTypeName:t.item.data("servicetypename"),Position:1},success:function(n){t.item.replaceWith(n)}}),i=[],r.find(".widget-design").each(function(n,t){i.push({ID:$(t).data("widgetid"),ZoneId:$(".zoneId",r).val(),Position:n+1})}),$.ajax({type:"POST",url:$("#save-widget-zone-url").val(),dataType:"json",contentType:"application/json;charset=utf-8","async":!1,data:JSON.stringify(i),success:function(){}}),!0}});$(".templates ul li").draggable({helper:"clone",connectToSortable:".zone"});$(document).on("click",".zoneToolbar .delete",function(){var n=$(this),t=n.data("id");$.post(n.data("url"),{ID:t},function(n){n&&$("#widget_"+t).parent().remove()},"json")}).on("click",".zoneToolbar .more",function(){$(this).siblings(".toggle-hidden").toggleClass("hidden");$(this).toggleClass("hidden")});$(document).on("click",".templates .tool-open",function(){$(this).parent().toggleClass("active")}).on("click",".templates .delete-template",function(){var n=$(this);Easy.ShowMessageBox("提示","确定要删除该模板吗？",function(){$.post(n.data("url"),{Id:n.data("id")},function(n){n&&$("#template_"+n).remove()},"json")},!0,10)}).on("click",".upload-template",function(){$("#template-file").trigger("click")}).on("change","#template-file",function(){$("#template-form").submit()}).on("click",".zoneToolbar .toggle-widget-class",function(){var n=$(this).data("class");$(this).closest(".widget").toggleClass(n);$.post($(this).data("action"),{clas:n},function(){})}).on("click",".zoneToolbar .custom-style-editor",function(){$(".custom-style-target").removeClass("custom-style-target");var t=$(this).data("action"),n=$(this).closest(".widget").parent();n.toggleClass("custom-style-target");window.top.Easy.ShowUrlWindow({url:"/admin/StyleEditor/Edit",width:1024,title:"编辑样式",onLoad:function(n){n.addClass("loaded")},callBack:function(){$.post(t,{style:n.attr("style")},function(){})},isDialog:!1});$(".WeiWindow.BoxShadow").addClass("StyleEditor")}).on("click",".copy-widget",function(){$.post($(this).data("action"),function(n){Easy.MessageTip.Show(n.message)})}).on("click",".paste-widget",function(){var n=$(this).closest(".zone");return n.data("pasting")||(n.data("pasting",!0),$.post($(this).attr("href"),{Position:$(".widget",n).size()+1},function(t){n.append(t);n.data("pasting",!1)},"html")),!1});$(".helper").click(function(){$("#containers").toggleClass($(this).data("class"))});$(window).width()>1600&&$(".templates").addClass("active");$(document).on("show.bs.modal","#mobile-frame",function(){window.innerHeight<740?$(".mobile",this).addClass("mini"):$(".mobile",this).removeClass("mini");$("iframe",this).attr("src",$(this).data("src"))});$(document).on("hidden.bs.modal","#mobile-frame",function(){$("iframe",this).html("").attr("src","about:blank")})});
\ No newline at end of file
diff --git a/src/ZKEACMS/Constant.cs b/src/ZKEACMS/Constant.cs
index 04d6bb8c..69d28e38 100644
--- a/src/ZKEACMS/Constant.cs
+++ b/src/ZKEACMS/Constant.cs
@@ -14,7 +14,10 @@ public class Const
     {
         public const string CopyWidgetCookie = "F84DBA";
     }
-
+    public class DictionaryKeys
+    {
+        public const string WidgetStatus = "WidgetStatus";
+    }
     public class Layouts
     {
         /// <summary>
@@ -103,7 +106,12 @@ public enum MediaType
         Ppt = 9,
         Other = 100
     }
-
+    public enum WidgetStatus
+    {
+        Visible = 1,
+        Hidden = 2,
+        Deleted = 3
+    }
     public static class FileExtensions
     {
         public static HashSet<string> Video = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".mp4", ".avi", ".rmvb", ".flv", ".wmv", ".asf", ".asx", ".rm", ".3gp", ".mov", ".m4v", ".mkv", ".vob" };
diff --git a/src/ZKEACMS/Controllers/WidgetController.cs b/src/ZKEACMS/Controllers/WidgetController.cs
index 28848253..29948f7b 100644
--- a/src/ZKEACMS/Controllers/WidgetController.cs
+++ b/src/ZKEACMS/Controllers/WidgetController.cs
@@ -219,15 +219,22 @@ public JsonResult SaveWidgetZone([FromBody] List<WidgetBase> widgets)
             return Json(true);
         }
         [HttpPost]
-        public JsonResult DeleteWidget(string ID)
+        public JsonResult DeleteWidget(string ID, bool? permanent)
         {
-            WidgetBase widget = _widgetService.Get(ID);
-            if (widget != null)
+            var widget = _widgetService.Get(ID);
+            if (widget == null) return Json(new { ActionType = (int)ActionType.UnAttach });
+
+            if (widget.Status == (int)WidgetStatus.Deleted || permanent == true)
             {
                 _widgetActivator.Create(widget).DeleteWidget(ID);
-                return Json(ID);
+                return Json(new { ActionType = (int)ActionType.Delete });
+            }
+            else
+            {
+                widget.Status = (int)WidgetStatus.Deleted;
+                _widgetService.Update(widget);
+                return Json(new { ActionType = (int)ActionType.Update });
             }
-            return Json(false);
         }
 
         public PartialViewResult Templates()
diff --git a/src/ZKEACMS/Filter/WidgetAttribute.cs b/src/ZKEACMS/Filter/WidgetAttribute.cs
index 86a2db29..4f9b1cb4 100644
--- a/src/ZKEACMS/Filter/WidgetAttribute.cs
+++ b/src/ZKEACMS/Filter/WidgetAttribute.cs
@@ -107,32 +107,32 @@ public override void OnActionExecuted(ActionExecutedContext filterContext)
                 layout.ZoneWidgets = new ZoneWidgetCollection();
                 widgetService.GetAllByPage(page).Each(widget =>
                 {
-                    if (widget != null && widget.Status != (int)RecordStatus.InActive)
+                    if (widget == null || widget.Status == (int)WidgetStatus.Hidden || widget.Status == (int)WidgetStatus.Deleted) return;
+
+                    DateTime startTime = DateTime.Now;
+                    IWidgetPartDriver partDriver = widgetActivator.Create(widget);
+                    object viewModel = partDriver.Display(new WidgetDisplayContext
                     {
-                        DateTime startTime = DateTime.Now;
-                        IWidgetPartDriver partDriver = widgetActivator.Create(widget);
-                        object viewModel = partDriver.Display(new WidgetDisplayContext
+                        PageLayout = layout,
+                        ActionContext = filterContext,
+                        Widget = widget,
+                        FormModel = viewResult?.Model
+                    });
+                    WidgetViewModelPart part = new WidgetViewModelPart(widget, viewModel);
+                    logger.LogInformation("{0}.Display(): {1}ms", widget.ServiceTypeName, (DateTime.Now - startTime).TotalMilliseconds);
+                    if (part != null)
+                    {
+                        if (layout.ZoneWidgets.ContainsKey(part.Widget.ZoneId ?? UnknownZone))
                         {
-                            PageLayout = layout,
-                            ActionContext = filterContext,
-                            Widget = widget,
-                            FormModel = viewResult?.Model
-                        });
-                        WidgetViewModelPart part = new WidgetViewModelPart(widget, viewModel);
-                        logger.LogInformation("{0}.Display(): {1}ms", widget.ServiceTypeName, (DateTime.Now - startTime).TotalMilliseconds);
-                        if (part != null)
+                            layout.ZoneWidgets[part.Widget.ZoneId ?? UnknownZone].TryAdd(part);
+                        }
+                        else
                         {
-                            if (layout.ZoneWidgets.ContainsKey(part.Widget.ZoneId ?? UnknownZone))
-                            {
-                                layout.ZoneWidgets[part.Widget.ZoneId ?? UnknownZone].TryAdd(part);
-                            }
-                            else
-                            {
-                                layout.ZoneWidgets.Add(part.Widget.ZoneId ?? UnknownZone, new WidgetCollection { part });
-                            }
+                            layout.ZoneWidgets.Add(part.Widget.ZoneId ?? UnknownZone, new WidgetCollection { part });
                         }
-                        partDriver.Dispose();
                     }
+                    partDriver.Dispose();
+
                 });
 
                 var ruleWorkContext = new RuleWorkContext
@@ -148,37 +148,37 @@ public override void OnActionExecuted(ActionExecutedContext filterContext)
                 {
                     widgetService.GetAllByRule(rulesID, !IsPreView(filterContext)).Each(widget =>
                     {
-                        if (widget != null && widget.Status != (int)RecordStatus.InActive)
+                        if (widget == null || widget.Status == (int)WidgetStatus.Hidden || widget.Status == (int)WidgetStatus.Deleted) return;
+
+                        DateTime startTime = DateTime.Now;
+                        IWidgetPartDriver partDriver = widgetActivator.Create(widget);
+                        object viewModel = partDriver.Display(new WidgetDisplayContext
                         {
-                            DateTime startTime = DateTime.Now;
-                            IWidgetPartDriver partDriver = widgetActivator.Create(widget);
-                            object viewModel = partDriver.Display(new WidgetDisplayContext
-                            {
-                                PageLayout = layout,
-                                ActionContext = filterContext,
-                                Widget = widget,
-                                FormModel = viewResult?.Model
-                            });
-                            WidgetViewModelPart part = new WidgetViewModelPart(widget, viewModel);
-                            logger.LogInformation("{0}.Display(): {1}ms", widget.ServiceTypeName, (DateTime.Now - startTime).TotalMilliseconds);
-                            if (part != null)
+                            PageLayout = layout,
+                            ActionContext = filterContext,
+                            Widget = widget,
+                            FormModel = viewResult?.Model
+                        });
+                        WidgetViewModelPart part = new WidgetViewModelPart(widget, viewModel);
+                        logger.LogInformation("{0}.Display(): {1}ms", widget.ServiceTypeName, (DateTime.Now - startTime).TotalMilliseconds);
+                        if (part != null)
+                        {
+                            var availableZones = layout.Zones.Where(z => ruleDic[widget.RuleID.Value].ZoneNames.Contains(z.ZoneName));
+                            foreach (var zone in availableZones)
                             {
-                                var availableZones = layout.Zones.Where(z => ruleDic[widget.RuleID.Value].ZoneNames.Contains(z.ZoneName));
-                                foreach (var zone in availableZones)
+                                part.Widget.SetZone(zone.HeadingCode);
+                                if (layout.ZoneWidgets.ContainsKey(zone.HeadingCode ?? UnknownZone))
                                 {
-                                    part.Widget.SetZone(zone.HeadingCode);
-                                    if (layout.ZoneWidgets.ContainsKey(zone.HeadingCode ?? UnknownZone))
-                                    {
-                                        layout.ZoneWidgets[zone.HeadingCode ?? UnknownZone].TryAdd(part);
-                                    }
-                                    else
-                                    {
-                                        layout.ZoneWidgets.Add(zone.HeadingCode ?? UnknownZone, new WidgetCollection { part });
-                                    }
+                                    layout.ZoneWidgets[zone.HeadingCode ?? UnknownZone].TryAdd(part);
+                                }
+                                else
+                                {
+                                    layout.ZoneWidgets.Add(zone.HeadingCode ?? UnknownZone, new WidgetCollection { part });
                                 }
                             }
-                            partDriver.Dispose();
                         }
+                        partDriver.Dispose();
+
                     });
                 }
 
diff --git a/src/ZKEACMS/MetaData/WidgetMetaData.cs b/src/ZKEACMS/MetaData/WidgetMetaData.cs
index 317b2756..e1b6f1f9 100644
--- a/src/ZKEACMS/MetaData/WidgetMetaData.cs
+++ b/src/ZKEACMS/MetaData/WidgetMetaData.cs
@@ -40,7 +40,7 @@ private void InitViewBase()
             ViewConfig(m => m.Title).AsTextBox().Order(NextOrder());
             ViewConfig(m => m.Position).AsTextBox().Order(NextOrder()).RegularExpression(RegularExpression.Integer).Required();
             ViewConfig(m => m.ZoneId).AsDropDownList().Order(NextOrder()).DataSource(ViewDataKeys.Zones, SourceType.ViewData).Required();
-            ViewConfig(m => m.Status).AsDropDownList().DataSource(DicKeys.RecordStatus, SourceType.Dictionary).Order(NextOrder());
+            ViewConfig(m => m.Status).AsDropDownList().DataSource(DictionaryKeys.WidgetStatus, SourceType.Dictionary).Order(NextOrder());
             ViewConfig(m => m.IsTemplate).AsCheckBox().Order(NextOrder());
             ViewConfig(m => m.Thumbnail).AsTextBox().Order(NextOrder()).MediaSelector();
             ViewConfig(m => m.StyleClass).AsTextBox()
diff --git a/src/ZKEACMS/Page/PageService.cs b/src/ZKEACMS/Page/PageService.cs
index 5585f77e..8e0f62ca 100644
--- a/src/ZKEACMS/Page/PageService.cs
+++ b/src/ZKEACMS/Page/PageService.cs
@@ -130,15 +130,22 @@ private void PublishAsNew(PageEntity item)
                 m.PageId = item.ID;
                 _layoutHtmlService.Add(m);
             });
-            widgets.Each(m =>
+            foreach (var widget in widgets)
             {
-                using (var widgetService = _widgetActivator.Create(m))
+                using (var widgetService = _widgetActivator.Create(widget))
                 {
-                    m = widgetService.GetWidget(m);
-                    m.PageId = item.ID;
-                    widgetService.Publish(m);
+                    if (widget.Status == (int)WidgetStatus.Visible)
+                    {
+                        var fullFillWidget = widgetService.GetWidget(widget);
+                        fullFillWidget.PageId = item.ID;
+                        widgetService.Publish(fullFillWidget);
+                    }
+                    else if (widget.Status == (int)WidgetStatus.Deleted)
+                    {
+                        widgetService.DeleteWidget(widget.ID);
+                    }
                 }
-            });
+            }
         }
 
         public override DbSet<PageEntity> CurrentDbSet
@@ -219,7 +226,7 @@ public ServiceResult<PageEntity> Publish(PageEntity item)
                     }, item);
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 result.AddRuleViolation("Title", ex.Message);
             }