From a67bf57136b72c45d3dc7d79179c1f6e2f729247 Mon Sep 17 00:00:00 2001 From: RB Date: Mon, 16 Oct 2023 11:52:04 +0800 Subject: [PATCH] inTriggerTime2 --- @rbv | 2 +- src/main/java/com/rebuild/web/commons/FileDownloader.java | 2 +- src/main/resources/web/assets/js/trigger/trigger-design.js | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/@rbv b/@rbv index f4407dda6..3ed0213d2 160000 --- a/@rbv +++ b/@rbv @@ -1 +1 @@ -Subproject commit f4407dda6b0cdb4b21131d5ca1505337b605cc29 +Subproject commit 3ed0213d29ff62d48f03e04e0f2b5d24aeb9f33d diff --git a/src/main/java/com/rebuild/web/commons/FileDownloader.java b/src/main/java/com/rebuild/web/commons/FileDownloader.java index 09861a684..6b4c6f2e2 100644 --- a/src/main/java/com/rebuild/web/commons/FileDownloader.java +++ b/src/main/java/com/rebuild/web/commons/FileDownloader.java @@ -160,7 +160,7 @@ public void download(HttpServletRequest request, HttpServletResponse response) t if (QiniuCloud.instance().available() && !temp) { String privateUrl = QiniuCloud.instance().makeUrl(filePath); - privateUrl += "&attname=" + CodecUtils.urlEncode(attname); + if (!INLINE_FORCE.equals(attname)) privateUrl += "&attname=" + CodecUtils.urlEncode(attname); response.sendRedirect(privateUrl); } else { diff --git a/src/main/resources/web/assets/js/trigger/trigger-design.js b/src/main/resources/web/assets/js/trigger/trigger-design.js index 46238818a..6aa39e66a 100644 --- a/src/main/resources/web/assets/js/trigger/trigger-design.js +++ b/src/main/resources/web/assets/js/trigger/trigger-design.js @@ -22,9 +22,11 @@ $(document).ready(() => { .val('0') .on('change', function () { const start = ~~this.value + const end = ~~$('.J_startHour2').val() $('.J_startHour2 option').each(function () { $(this).attr('disabled', ~~$(this).val() < start) }) + if (end < start) $('.J_startHour2').val(start) }) $('.J_startHour2').val('23')