diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index 9bdace73..119ac04b 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -18,9 +18,9 @@
-
-
-
+
+
+
diff --git a/Admin.NET/Admin.NET.Core/Utils/YitIdInitHelper.cs b/Admin.NET/Admin.NET.Core/Utils/YitIdInitHelper.cs
new file mode 100644
index 00000000..4eaa6d24
--- /dev/null
+++ b/Admin.NET/Admin.NET.Core/Utils/YitIdInitHelper.cs
@@ -0,0 +1,56 @@
+//// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+////
+//// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+////
+//// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
+
+//namespace Admin.NET.Core;
+
+/////
+///// 使用Redis自动注册雪花Id的 WorkerId
+/////
+//public class YitIdInitHelper
+//{
+// // 定义dll路径
+// public const string RegWorkerId_DLL_NAME = "lib\\regworkerid_lib_v1.3.1\\yitidgengo.dll";
+
+// // 注册一个 WorkerId，会先注销所有本机已注册的记录
+// // ip: redis 服务器地址
+// // port: redis 端口
+// // password: redis 访问密码，可为空字符串“”
+// // maxWorkerId: 最大 WorkerId
+// [DllImport(RegWorkerId_DLL_NAME, EntryPoint = "RegisterOne", CallingConvention = CallingConvention.Cdecl, ExactSpelling = false)]
+// private static extern ushort RegisterOne(string ip, int port, string password, int maxWorkerId);
+
+// // 注销本机已注册的 WorkerId
+// [DllImport(RegWorkerId_DLL_NAME, EntryPoint = "UnRegister", CallingConvention = CallingConvention.Cdecl, ExactSpelling = false)]
+// private static extern void UnRegister();
+
+// // 检查本地WorkerId是否有效（0-有效，其它-无效）
+// [DllImport(RegWorkerId_DLL_NAME, EntryPoint = "Validate", CallingConvention = CallingConvention.Cdecl, ExactSpelling = false)]
+// private static extern int Validate(int workerId);
+
+// public static long NextId()
+// {
+// // 此判断在高并发的情况下可能会有问题
+// if (YitIdHelper.IdGenInstance == null)
+// {
+// UnRegister();
+
+// // 如果不用自动注册WorkerId的话，直接传一个数值就可以了
+// var workerId = RegisterOne("127.0.0.1", 6379, "", 63);
+// // 创建 IdGeneratorOptions 对象，可在构造函数中输入 WorkerId：
+// var options = new IdGeneratorOptions(workerId);
+// // options.WorkerIdBitLength = 10; // 默认值6，限定 WorkerId 最大值为2^6-1，即默认最多支持64个节点。
+// // options.SeqBitLength = 6; // 默认值6，限制每毫秒生成的ID个数。若生成速度超过5万个/秒，建议加大 SeqBitLength 到 10。
+// // options.BaseTime = Your_Base_Time; // 如果要兼容老系统的雪花算法，此处应设置为老系统的BaseTime。
+// // ...... 其它参数参考 IdGeneratorOptions 定义。
+
+// // 保存参数（务必调用，否则参数设置不生效）：
+// YitIdHelper.SetIdGenerator(options);
+
+// // 以上过程只需全局一次，且应在生成ID之前完成。
+// }
+// return YitIdHelper.NextId();
+// }
+//}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_index.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_index.vue.vm
index bed4dced..17bf0457 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_index.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_index.vue.vm
@@ -25,20 +25,20 @@
@if(Model.QueryWhetherList.Count > 0){
-
+
foreach (var column in Model.QueryWhetherList) {
if(@column.EffectType == "Input" || @column.EffectType == "InputTextArea") {
-
+
} else if(@column.EffectType == "InputNumber") {
-
+
} else if(@column.EffectType == "fk") {
@@ -52,7 +52,7 @@
} else if(@column.EffectType == "Select") {
-
+
@@ -60,7 +60,7 @@
} else if(@column.EffectType == "EnumSelector") {
-
+
@@ -342,7 +342,7 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
// 查询操作
const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/package.json b/Web/package.json
index ba6cd971..e0c9ed7c 100644
--- a/Web/package.json
+++ b/Web/package.json
@@ -21,7 +21,7 @@
"@vue-office/docx": "^1.6.2",
"@vue-office/excel": "^1.7.11",
"@vue-office/pdf": "^2.0.7",
- "@vueuse/core": "^11.1.0",
+ "@vueuse/core": "^11.2.0",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"animate.css": "^4.1.1",
@@ -35,7 +35,7 @@
"echarts-wordcloud": "^2.1.0",
"element-plus": "^2.8.6",
"exceljs": "^4.4.0",
- "ezuikit-js": "^8.1.1-alpha.1",
+ "ezuikit-js": "^8.1.1-alpha.2",
"gcoord": "^1.0.6",
"js-cookie": "^3.0.5",
"js-table2excel": "^1.1.2",
@@ -71,7 +71,7 @@
"vue-router": "^4.4.5",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
- "vxe-pc-ui": "^4.2.33",
+ "vxe-pc-ui": "^4.2.34",
"vxe-table": "^4.7.59",
"vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7",
diff --git a/Web/src/views/home/notice/index.vue b/Web/src/views/home/notice/index.vue
index 050e6b9a..2cc10f5b 100644
--- a/Web/src/views/home/notice/index.vue
+++ b/Web/src/views/home/notice/index.vue
@@ -5,7 +5,7 @@
-
+
@@ -146,10 +146,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
- // 调用vxe-grid的commitProxy(query)方法，触发表格重新加载数据
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/codeGen/index.vue b/Web/src/views/system/codeGen/index.vue
index 8e7a170c..5d81e595 100644
--- a/Web/src/views/system/codeGen/index.vue
+++ b/Web/src/views/system/codeGen/index.vue
@@ -5,12 +5,12 @@
-
+
-
+
@@ -158,9 +158,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/config/index.vue b/Web/src/views/system/config/index.vue
index 6614afab..a74cdac3 100644
--- a/Web/src/views/system/config/index.vue
+++ b/Web/src/views/system/config/index.vue
@@ -5,12 +5,12 @@
-
+
-
+
@@ -146,10 +146,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
- // 调用vxe-grid的commitProxy(query)方法，触发表格重新加载数据
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/dict/index.vue b/Web/src/views/system/dict/index.vue
index 25dc4c67..5e3657c5 100644
--- a/Web/src/views/system/dict/index.vue
+++ b/Web/src/views/system/dict/index.vue
@@ -7,12 +7,12 @@
-
+
-
+
@@ -63,12 +63,12 @@
-
+
-
+
@@ -216,8 +216,8 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
- await xGridDictType.value?.commitProxy('query');
+const handleQuery = async (reset = false) => {
+ reset ? await xGridDictType.value?.commitProxy('reload') : await xGridDictType.value?.commitProxy('query');
};
// 重置操作
@@ -320,8 +320,8 @@ const handleQueryDictDataApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageP
};
// 查询操作
-const handleQueryDictData = async () => {
- await xGridDictData.value?.commitProxy('query');
+const handleQueryDictData = async (reset = false) => {
+ reset ? await xGridDictData.value?.commitProxy('reload') : await xGridDictData.value?.commitProxy('query');
};
// 重置操作
diff --git a/Web/src/views/system/file/index.vue b/Web/src/views/system/file/index.vue
index ff3faf91..36bb501b 100644
--- a/Web/src/views/system/file/index.vue
+++ b/Web/src/views/system/file/index.vue
@@ -5,7 +5,7 @@
-
+
@@ -230,9 +230,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/job/index.vue b/Web/src/views/system/job/index.vue
index 31c5135e..fb5bd82b 100644
--- a/Web/src/views/system/job/index.vue
+++ b/Web/src/views/system/job/index.vue
@@ -5,7 +5,7 @@
-
+
@@ -17,7 +17,7 @@
-
+
@@ -342,8 +342,8 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
- await xGridJob.value?.commitProxy('query');
+const handleQuery = async (reset = false) => {
+ reset ? await xGridJob.value?.commitProxy('reload') : await xGridJob.value?.commitProxy('query');
};
// 重置操作
diff --git a/Web/src/views/system/ldap/index.vue b/Web/src/views/system/ldap/index.vue
index 7f90e492..4ed3b0b9 100644
--- a/Web/src/views/system/ldap/index.vue
+++ b/Web/src/views/system/ldap/index.vue
@@ -5,7 +5,7 @@
-
+
@@ -35,7 +35,7 @@
-
+
@@ -163,9 +163,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/log/logdiff/index.vue b/Web/src/views/system/log/logdiff/index.vue
index 52f6d4e5..f917ee38 100644
--- a/Web/src/views/system/log/logdiff/index.vue
+++ b/Web/src/views/system/log/logdiff/index.vue
@@ -166,9 +166,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/log/logex/index.vue b/Web/src/views/system/log/logex/index.vue
index a26212b8..972922a7 100644
--- a/Web/src/views/system/log/logex/index.vue
+++ b/Web/src/views/system/log/logex/index.vue
@@ -217,9 +217,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/log/logop/index.vue b/Web/src/views/system/log/logop/index.vue
index 8cec99ed..7a4d337c 100644
--- a/Web/src/views/system/log/logop/index.vue
+++ b/Web/src/views/system/log/logop/index.vue
@@ -210,9 +210,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/log/logvis/index.vue b/Web/src/views/system/log/logvis/index.vue
index da7924ea..305054f2 100644
--- a/Web/src/views/system/log/logvis/index.vue
+++ b/Web/src/views/system/log/logvis/index.vue
@@ -161,9 +161,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/menu/index.vue b/Web/src/views/system/menu/index.vue
index 6375aae5..b999a5f2 100644
--- a/Web/src/views/system/menu/index.vue
+++ b/Web/src/views/system/menu/index.vue
@@ -5,7 +5,7 @@
-
+
@@ -140,10 +140,9 @@ const handleQueryApi = async () => {
};
// 查询操作
-const handleQuery = async () => {
- // 调用vxe-grid的commitProxy(query)方法，触发表格重新加载数据
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/notice/index.vue b/Web/src/views/system/notice/index.vue
index 91aa2a94..4cdcb3a6 100644
--- a/Web/src/views/system/notice/index.vue
+++ b/Web/src/views/system/notice/index.vue
@@ -5,7 +5,7 @@
-
+
@@ -144,9 +144,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/oAuthUser/index.vue b/Web/src/views/system/oAuthUser/index.vue
index f5b3dd08..2ee9d5a2 100644
--- a/Web/src/views/system/oAuthUser/index.vue
+++ b/Web/src/views/system/oAuthUser/index.vue
@@ -5,12 +5,12 @@
-
+
-
+
@@ -146,9 +146,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/onlineUser/index.vue b/Web/src/views/system/onlineUser/index.vue
index 754669f5..8cb73dfd 100644
--- a/Web/src/views/system/onlineUser/index.vue
+++ b/Web/src/views/system/onlineUser/index.vue
@@ -12,12 +12,12 @@
-
+
-
+
@@ -178,9 +178,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/openAccess/index.vue b/Web/src/views/system/openAccess/index.vue
index 0928cdb9..2f238087 100644
--- a/Web/src/views/system/openAccess/index.vue
+++ b/Web/src/views/system/openAccess/index.vue
@@ -5,7 +5,7 @@
-
+
@@ -131,9 +131,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/plugin/index.vue b/Web/src/views/system/plugin/index.vue
index ddf76b45..defd467d 100644
--- a/Web/src/views/system/plugin/index.vue
+++ b/Web/src/views/system/plugin/index.vue
@@ -5,7 +5,7 @@
-
+
@@ -125,9 +125,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/pos/index.vue b/Web/src/views/system/pos/index.vue
index d8ac2ce6..f5b5316e 100644
--- a/Web/src/views/system/pos/index.vue
+++ b/Web/src/views/system/pos/index.vue
@@ -5,12 +5,12 @@
-
+
-
+
@@ -128,10 +128,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
- // 调用vxe-grid的commitProxy(query)方法，触发表格重新加载数据
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/print/index.vue b/Web/src/views/system/print/index.vue
index 4be0470d..573f5700 100644
--- a/Web/src/views/system/print/index.vue
+++ b/Web/src/views/system/print/index.vue
@@ -5,7 +5,7 @@
-
+
@@ -127,9 +127,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/region/index.vue b/Web/src/views/system/region/index.vue
index 67d700bf..977db691 100644
--- a/Web/src/views/system/region/index.vue
+++ b/Web/src/views/system/region/index.vue
@@ -10,12 +10,12 @@
-
+
-
+
@@ -168,9 +168,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/role/index.vue b/Web/src/views/system/role/index.vue
index 04affc76..04b7a553 100644
--- a/Web/src/views/system/role/index.vue
+++ b/Web/src/views/system/role/index.vue
@@ -5,12 +5,12 @@
-
+
-
+
@@ -152,9 +152,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/tenant/index.vue b/Web/src/views/system/tenant/index.vue
index b46d9e2f..bc55962d 100644
--- a/Web/src/views/system/tenant/index.vue
+++ b/Web/src/views/system/tenant/index.vue
@@ -5,12 +5,12 @@
-
+
-
+
@@ -184,9 +184,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};
diff --git a/Web/src/views/system/user/index.vue b/Web/src/views/system/user/index.vue
index e89af1fe..0abe66db 100644
--- a/Web/src/views/system/user/index.vue
+++ b/Web/src/views/system/user/index.vue
@@ -10,12 +10,12 @@
-
+
-
+
@@ -25,7 +25,7 @@
-
+
@@ -191,9 +191,9 @@ const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, s
};
// 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
options.loading = true;
- await xGrid.value?.commitProxy('query');
+ reset ? await xGrid.value?.commitProxy('reload') : await xGrid.value?.commitProxy('query');
options.loading = false;
};