允许撤销删除组件

SeriaWei · Dec 28, 2023 · 96a62b5 · 96a62b5
1 parent af58b9d
commit 96a62b5
Show file tree

Hide file tree

Showing 20 changed files with 150 additions and 86 deletions.
diff --git a/Database/Update/3.9.3/MsSql.sql 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
diff --git a/Database/Update/3.9.3/MySql.sql 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
diff --git a/Database/Update/3.9.3/Sqlite.sql 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
diff --git a/Database/Update/3.9.3/package.zip b/Database/Update/3.9.3/package.zip
diff --git 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"
         }
     ]
 }
diff --git 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
@@ -1541,4 +1541,5 @@ View Video Category: 查看视频类别
 Manage Video Category: 管理视频类别
 Video(Embed): 视频（嵌入）
 Name already exists: 名称已存在
-Please upload video or input video code: 请上传视频或者输入视频代码
+Please upload video or input video code: 请上传视频或者输入视频代码
+Deleted: 已删除
diff --git 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: 請上傳視頻或者輸入視頻程式碼
+Please upload video or input video code: 請上傳視頻或者輸入視頻程式碼
+Deleted: 已删除
diff --git 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
@@ -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
@@ -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="[email protected]" 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="[email protected]" 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
@@ -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);
-}
+}
diff --git a/src/ZKEACMS.WebHost/wwwroot/css/admin.min.css b/src/ZKEACMS.WebHost/wwwroot/css/admin.min.css
diff --git 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
diff --git 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
@@ -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()