diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml index 3f4a01c..5275165 100644 --- a/Api/Ewide.Core/Ewide.Core.xml +++ b/Api/Ewide.Core/Ewide.Core.xml @@ -680,16 +680,6 @@ 字典类型表 - - - 父Id - - - - - 父Ids - - 名称 @@ -4004,11 +3994,6 @@ 状态(字典 0正常 1停用 2删除) - - - 父id - - 名称 @@ -4177,22 +4162,6 @@ - - - 创建Pids格式 - 如果pid是0顶级节点,pids就是 [0]; - 如果pid不是顶级节点,pids就是 pid菜单的 pids + [pid] + , - - - - - - - 根据节点Id获取所有子节点Id集合,包含自己 - - - - 附属机构和职位参数 diff --git a/Api/Ewide.Core/Extension/PageExtensions.cs b/Api/Ewide.Core/Extension/PageExtensions.cs index bf16fd2..c71b777 100644 --- a/Api/Ewide.Core/Extension/PageExtensions.cs +++ b/Api/Ewide.Core/Extension/PageExtensions.cs @@ -23,12 +23,12 @@ namespace Ewide.Core.Extension var defaultField = hasSort ? "Sort" : (hasId ? "Id" : ""); // 约定默认每张表都有Id排序 - var orderStr = string.IsNullOrEmpty(defaultField) ? "" : defaultField + (descSort ? " Desc" : " Asc"); + var orderStr = string.IsNullOrEmpty(defaultField) ? "" : defaultField + (descSort ? " Asc" : " Desc"); // 排序是否可用-排序字段和排序顺序都为非空才启用排序 if (!string.IsNullOrEmpty(pageInput.SortField) && !string.IsNullOrEmpty(pageInput.SortOrder)) { - orderStr = $"{pageInput.SortField} {(pageInput.SortOrder == pageInput.DescStr ? "Desc" : "Asc")}"; + orderStr = $"{pageInput.SortField} {(pageInput.SortOrder == pageInput.DescStr ? "Asc" : "Desc")}"; } return orderStr; } diff --git a/Api/Ewide.Core/applicationconfig.json b/Api/Ewide.Core/applicationconfig.json index 97ad50d..19135e6 100644 --- a/Api/Ewide.Core/applicationconfig.json +++ b/Api/Ewide.Core/applicationconfig.json @@ -25,7 +25,7 @@ "WriteXmlPath": { "SeedData": "SeedDataXml", "DataBase": "DataBaseXml", - "ReadSelect": "DataBase" // SeedData 和 DataBase 两个中间选 + "ReadSelect": "SeedData" // SeedData 和 DataBase 两个中间选 }, "RSA": { "publickey": "tu98wMoo297l+juulU4a3Xx7c2SZ93f0gTPKohE0uz4o8jWN8zXnAAfhf6MMTlkgf+qIwaORLtBQohDcX6Xp02Qe7Cq2LujVR+YJHxy2uo8+KTc5Rj/d0OkTjeCozGaJQH0XrwUO7w+rDnyXzA52IvMZPnUV3KnOj1mPH0IhrOU=AQAB", diff --git a/Web/.env.production b/Web/.env.production index d4173eb..13b6a6b 100644 --- a/Web/.env.production +++ b/Web/.env.production @@ -1,3 +1,3 @@ VUE_APP_NODE_ENV=production -VUE_APP_BASE_URL=http://localhost:60161 +VUE_APP_BASE_URL=http://localhost:5566 VUE_APP_DEV_KEY=%0!qF2BpcVorlNceu#kP4SVS1bPiMUqI71%rITatPIosNOCrot@mV7PJ&br$CVvF \ No newline at end of file diff --git a/Web/public/doc-code/seed/form-page/tab-form/tab.vue b/Web/public/doc-code/seed/form-page/tab-form/tab.vue index 52585a4..bfa678b 100644 --- a/Web/public/doc-code/seed/form-page/tab-form/tab.vue +++ b/Web/public/doc-code/seed/form-page/tab-form/tab.vue @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/Web/public/index.html b/Web/public/index.html index 8e7c4be..23b4ccb 100644 --- a/Web/public/index.html +++ b/Web/public/index.html @@ -6,7 +6,7 @@ <%= htmlWebpackPlugin.options.title %> - +