diff --git a/istoreenhance/Makefile b/istoreenhance/Makefile index 80bbbe1..d81dc63 100644 --- a/istoreenhance/Makefile +++ b/istoreenhance/Makefile @@ -11,7 +11,7 @@ PKG_ARCH_ISTOREENHANCE:=$(ARCH) PKG_NAME:=istoreenhance # use PKG_SOURCE_DATE instead of PKG_VERSION for compitable -PKG_SOURCE_DATE:=0.4.1 +PKG_SOURCE_DATE:=0.5.0 PKG_RELEASE:=5 ARCH_HEXCODE:= ifeq ($(ARCH),x86_64) @@ -26,7 +26,7 @@ endif PKG_SOURCE_VERSION:=$(ARCH_HEXCODE) PKG_SOURCE:=iStoreEnhance-binary-$(PKG_SOURCE_DATE).tar.gz PKG_SOURCE_URL:=http://dl.istoreos.com/binary/iStoreEnhance/ -PKG_HASH:=cfe68c3de5a74c1e0eaf699a6eed08c04e018bb0793f299285a37657ce0726aa +PKG_HASH:=e871447d6522f27881a25b59fb44d3f1582af73b06803704e3cab43b456d8894 PKG_BUILD_DIR:=$(BUILD_DIR)/iStoreEnhance-binary-$(PKG_SOURCE_DATE) diff --git a/luci-app-bandix/Makefile b/luci-app-bandix/Makefile index 1584576..60787a8 100644 --- a/luci-app-bandix/Makefile +++ b/luci-app-bandix/Makefile @@ -10,7 +10,7 @@ LUCI_DEPENDS:=+luci-base +luci-lib-jsonc +curl +bandix PKG_MAINTAINER:=timsaya -PKG_VERSION:=0.11.0 +PKG_VERSION:=0.11.1 PKG_RELEASE:=1 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-bandix/htdocs/luci-static/resources/view/bandix/index.js b/luci-app-bandix/htdocs/luci-static/resources/view/bandix/index.js index 2d1deb4..4d344cc 100644 --- a/luci-app-bandix/htdocs/luci-static/resources/view/bandix/index.js +++ b/luci-app-bandix/htdocs/luci-static/resources/view/bandix/index.js @@ -6179,6 +6179,12 @@ return view.extend({ callGetTrafficUsageIncrements(startMs, endMs, selectedAggregation, selectedMac).then(function (result) { if (!result || !result.increments) { + var container = document.getElementById('traffic-increments-container'); + if (container) { + container.innerHTML = '
' + _('No data') + '
'; + } + // 调用回调函数以移除 loading 状态 + if (callback) callback(); return; } @@ -6203,10 +6209,16 @@ return view.extend({ } var container = document.getElementById('traffic-increments-container'); - if (!container) return; + if (!container) { + // 调用回调函数以移除 loading 状态 + if (callback) callback(); + return; + } if (result.increments.length === 0) { container.innerHTML = '
' + _('No data') + '
'; + // 调用回调函数以移除 loading 状态 + if (callback) callback(); return; } @@ -6949,8 +6961,16 @@ return view.extend({ // 初始化:默认选择最近一年 var oneYearAgo = new Date(today.getFullYear() - 1, today.getMonth(), today.getDate()); setDateRange(oneYearAgo, today, '1year'); - // 初始化时也查询一次数据 - queryData(); + + // 设置初始时间范围并自动加载数据(不显示 loading) + var startMs = oneYearAgo.getTime(); + var endMs = today.getTime(); + trafficIncrementsCustomRange = { + start_ms: startMs, + end_ms: endMs + }; + // 自动加载数据,但不设置 loading 状态 + updateTrafficIncrements(startMs, endMs, null, null); }, 700); // 异步加载版本信息(不阻塞主流程) diff --git a/xray-core/Makefile b/xray-core/Makefile index 4957050..e89af3c 100644 --- a/xray-core/Makefile +++ b/xray-core/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-core -PKG_VERSION:=25.12.2 +PKG_VERSION:=25.12.8 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=e39c40b85decddea0b59719dae33df26aa149ac6fc673e7db9266e731cc2b3ad +PKG_HASH:=d4519b2d9bb1871f4d7612aa7a8db1c451573b5a44ac824219bb44d63f404e61 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0