update 2025-01-22 20:13:01

luci-app-store/Makefile

@@ -11,7 +11,7 @@ LUCI_DEPENDS:=+curl +opkg +luci-base +tar +libuci-lua +mount-utils +luci-lib-tas
 LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.19)
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=0.1.27-3
+PKG_VERSION:=0.1.27-4
 # PKG_RELEASE MUST be empty for luci.mk
 PKG_RELEASE:=
 

luci-app-store/luasrc/view/store/main.htm

@@ -36,6 +36,7 @@
 <script>
     (function() {
         let beforeunloadRegistered = false;
+        taskd.show_mask_on_stopped = true;
         window.istore_log = function(flush_menu_onclose, onExit) {
             if (flush_menu_onclose && !beforeunloadRegistered) {
                 beforeunloadRegistered = true;

luci-lib-taskd/Makefile

@@ -11,7 +11,7 @@ LUCI_DEPENDS:=+luci-lib-xterm +taskd
 LUCI_EXTRA_DEPENDS:=taskd (>=1.0.3-1)
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=1.0.20
+PKG_VERSION:=1.0.22
 PKG_RELEASE:=
 PKG_MAINTAINER:=jjm2473 <jjm2473@gmail.com>
 

luci-lib-taskd/htdocs/luci-static/resources/tasks/tasks.css

@@ -45,6 +45,7 @@
     overflow: hidden;
 }
 .dialog-content {
+    position: relative;
     max-height: 500px;
     overflow-y: scroll;
     margin-right: -10px;
@@ -109,4 +110,42 @@
     border-color: darkorange;
 }
 
+#tasks_result_mask {
+    display: none;
+    background-color: #000d;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 100;
+    width: 100%;
+    height: 100%;
+
+    cursor: default;
+    user-select: none;
+
+    font-size: small;
+}
+
+.tasks_stopped #tasks_result_mask {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+
+.tasks_result_success, .tasks_stopped.tasks_failed .tasks_result_success, .tasks_result_failed {
+    display: none;
+    font-size: xx-large;
+}
+
+.tasks_stopped .tasks_result_success {
+    display: initial;
+    color: #27c840;
+}
+
+.tasks_failed .tasks_result_failed {
+    display: initial;
+    color: darkorange;
+}
+
 @keyframes border-blink { 50% { border-color:#fff ; }  }

luci-lib-taskd/htdocs/luci-static/resources/tasks/tasks.js

@@ -66,6 +66,14 @@
                 return false;
             };
         }
+        const tasks_result_mask = container.querySelector("#tasks_result_mask");
+        if (taskd.show_mask_on_stopped) {
+            tasks_result_mask.onclick = function(){
+                tasks_result_mask.hidden=true;
+            };
+        } else {
+            tasks_result_mask.hidden=true;
+        }
         term.open(document.getElementById("tasks_xterm_log"));
 
         return {term,container};

luci-lib-taskd/luasrc/view/tasks/embed.htm

@@ -28,6 +28,12 @@
         </div>
         <div class="dialog-content">
             <div id="tasks_xterm_log"></div>
+            <div id="tasks_result_mask">
+                <span class="tasks_result_success"><%:Task execution successful !%></span>
+                <span class="tasks_result_failed"><%:Task execution failed !%></span>
+                <br/>
+                <span><%:Click the button in the upper right corner of the dialog box to close it, or click here to view the log%></span>
+            </div>
         </div>
     </div>
     `;

luci-lib-taskd/src/po/zh-cn/lib-tasks.po

@@ -39,3 +39,12 @@ msgstr "点此查看运行中的任务"
 
 msgid "Task Running"
 msgstr "任务执行中"
+
+msgid "Task execution successful !"
+msgstr "任务执行成功！"
+
+msgid "Task execution failed !"
+msgstr "任务执行失败！"
+
+msgid "Click the button in the upper right corner of the dialog box to close it, or click here to view the log"
+msgstr "点击对话框右上角按钮关闭，或者点此查看日志"