😎1、修复全局字典错误 2、修复分布式锁错误 3、默认翻译中英文 4、调整暗色模式样式匹配

Admin.NET/Admin.NET.Core/Service/Cache/SysCacheService.cs

@@ -103,11 +103,14 @@ public class SysCacheService : IDynamicApiController, ISingleton
     {
         var key = Key(cacheName, obs);
         // 使用分布式锁
-        using (_cacheProvider.Cache.AcquireLock($@"lock:AdGetAsync:{cacheName}", expiry != null ? (int)expiry.Value.TotalSeconds * 1000 : 1000))
+        using (_cacheProvider.Cache.AcquireLock($@"lock:AdGetAsync:{cacheName}", 1000))
         {
             var value = Get<T>(key);
-            value ??= await ((dynamic)del).DynamicInvokeAsync(obs);
+            if (value == null)
-            Set(key, value);
+            {
+                value = await ((dynamic)del).DynamicInvoke(obs);
+                _ = expiry == null ? Set(key, value) : Set(key, value, (TimeSpan)expiry);
+            }
             return value;
         }
     }

Web/lang/index.js

@@ -60,9 +60,7 @@
     })();
     // 定义语言映射对象
     const langMap = {
-        'zhhk': (globalThis && globalThis.lang && globalThis.lang.zhhk) ? globalThis.lang.zhhk : globalThis._getJSONKey('zh-hk', langJSON),
+        'en': (globalThis && globalThis.lang && globalThis.lang.en) ? globalThis.lang.en : globalThis._getJSONKey('en', langJSON),
-'zhtw': (globalThis && globalThis.lang && globalThis.lang.zhtw) ? globalThis.lang.zhtw : globalThis._getJSONKey('zh-tw', langJSON),
-'en': (globalThis && globalThis.lang && globalThis.lang.en) ? globalThis.lang.en : globalThis._getJSONKey('en', langJSON),
 'zhcn': (globalThis && globalThis.lang && globalThis.lang.zhcn) ? globalThis.lang.zhcn : globalThis._getJSONKey('zh-cn', langJSON)
     };
     globalThis.langMap = langMap;

Web/src/components/sysDict/sysDict.vue

@@ -1,10 +1,13 @@
 <!-- 组件使用文档： https://gitee.com/zuohuaijun/Admin.NET/pulls/1559  -->
+<script lang="ts">
+const renderTypeArray = ['tag', 'select', 'radio', 'checkbox', 'radio-button'] as const;
+</script>
+
 <script setup lang="ts">
 import { reactive, watch, PropType } from 'vue';
 import { useUserInfo } from '/@/stores/userInfo';
 
-const renderTypeArray = ['tag', 'select', 'radio', 'checkbox', 'radio-button'] as const;
+type RenderType = (typeof renderTypeArray)[number];
-type RenderType = typeof renderTypeArray[number];
 type DictItem = {
 	[key: string]: any;
 	tagType?: string;
@@ -84,7 +87,7 @@ const props = defineProps({
 	 */
 	renderAs: {
 		type: String as PropType<RenderType>,
-		default: renderTypeArray[0],
+		default: 'tag',
 		validator(value: any) {
 			return renderTypeArray.includes(value);
 		},

Web/src/theme/dark.scss

@@ -16,6 +16,20 @@
 	--next-color-hover: #3c3c3c;
 	--next-color-hover-rgba: rgba(0, 0, 0, 0.3);
 
+	// Empty
+	.el-empty {
+		--el-empty-fill-color-0: var('(--el-color-black') !important;
+		--el-empty-fill-color-1: #4b4b52 !important;
+		--el-empty-fill-color-2: #36383d !important;
+		--el-empty-fill-color-3: #1e1e20 !important;
+		--el-empty-fill-color-4: #262629 !important;
+		--el-empty-fill-color-5: #202124 !important;
+		--el-empty-fill-color-6: #212224 !important;
+		--el-empty-fill-color-7: #1b1c1f !important;
+		--el-empty-fill-color-8: #1c1d1f !important;
+		--el-empty-fill-color-9: #18181a !important;
+	}
+
 	// root
 	--next-bg-main-color: var(--next-bg-main) !important;
 	--next-bg-topBar: var(--next-color-disabled) !important;

Web/src/theme/element.scss

@@ -368,6 +368,11 @@
 	padding: 8px;
 }
 
+// 由于card没有size属性，所以通过其子元素来判断,当组件大小选择为默认时
+.el-card__body:has(.el-table--default) {
+	padding: 20px;
+}
+
 /* Table 表格 element plus 2.2.0 版本
 ------------------------------- */
 .el-table {
@@ -516,7 +521,7 @@ $--el-table-text-color: #fb6d49;
 
 .default-theme.splitpanes--vertical > .splitpanes__splitter,
 .default-theme .splitpanes--vertical > .splitpanes__splitter {
-	border-left: 1px solid var(--el-bg-color) !important;
+	border-left: 1px solid var(--el-border-color-light) !important;
 }
 
 // hack列表页

Web/vite.config.ts

@@ -67,7 +67,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 				// 源语言
 				originLang: 'zh-cn',
 				// 目标语言列表
-				targetLangList: ['zh-hk', 'zh-tw', 'en'],
+				targetLangList: ['en'], // 'zh-hk', 'zh-tw',
 				// 翻译文件配置生成路径
 				globalPath: './lang',
 				// 指定只翻译某些目录路径（白名单），默认为src