From 3759fcc14a0a39b987cb03c0b1970aba4d1dbc9c Mon Sep 17 00:00:00 2001 From: owenchen Date: Tue, 8 Sep 2026 13:55:01 +0800 Subject: [PATCH] ow --- .../SecurityFunctionService.cs | 7 +- WebVue/public/iconfont.js | 2 +- .../src/components/basic/OperatorStation.vue | 2 +- .../basic/OperatorStationFamily.vue | 6 +- WebVue/src/views/master/DmsFileEnquiry.vue | 67 +-- WebVue/src/views/master/DmsFileShareModal.vue | 10 +- .../src/views/master/FamilyShareOperation.vue | 505 ++++++++++-------- .../src/views/master/OrgFamilyGroupShare.vue | 2 +- 8 files changed, 338 insertions(+), 263 deletions(-) diff --git a/CloudBuilder/CloudBuilder.Security.Service/SecurityFunctionService.cs b/CloudBuilder/CloudBuilder.Security.Service/SecurityFunctionService.cs index 90bc504..e2cbbfb 100644 --- a/CloudBuilder/CloudBuilder.Security.Service/SecurityFunctionService.cs +++ b/CloudBuilder/CloudBuilder.Security.Service/SecurityFunctionService.cs @@ -243,8 +243,11 @@ namespace CloudBuilder.Security.Service IRepository repositoryMapView = repository.GetRepository>(); IRepository repositoryMap = repository.GetRepository>(); SecurityFunctionMapViewEntity[] olds = repositoryMapView.Entities.Where(x => x.SonFunctionName == functionName).ToArray(); + + int oldOrderBy = 0; if (olds != null && olds.Length > 0) { + if (olds.Length == 1) oldOrderBy = olds[0].Orderby; foreach (SecurityFunctionMapViewEntity old in olds) { repositoryMap.DeleteNow(new SecurityFunctionMapEntity() { FunctionNameSon = old.SonFunctionName, FunctionNameParent = old.ParentFunctionName }); @@ -264,7 +267,7 @@ namespace CloudBuilder.Security.Service { FunctionNameSon = functionName, FunctionNameParent = map.ParentFunctionName, - Orderby = oldMaps == null ? 1 : maxOrderBy + 1 + Orderby = oldOrderBy > 0 ? oldOrderBy : (oldMaps == null ? 1 : maxOrderBy + 1) }); } @@ -286,7 +289,7 @@ namespace CloudBuilder.Security.Service if (maps == null || maps.Length == 0) return; int i = 1; - foreach (SecurityFunctionMapViewEntity map in maps.OrderBy(x=>x.Orderby).ToArray()) + foreach (SecurityFunctionMapViewEntity map in maps.OrderBy(x => x.Orderby).ToArray()) { repositoryMap.InsertNow(new SecurityFunctionMapEntity() { diff --git a/WebVue/public/iconfont.js b/WebVue/public/iconfont.js index 2bd0aad..49cbf85 100644 --- a/WebVue/public/iconfont.js +++ b/WebVue/public/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2184398='',function(l){var a=(a=document.getElementsByTagName("script"))[a.length-1],h=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var v,o,i,m,z,t=function(a,h){h.parentNode.insertBefore(a,h)};if(h&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}v=function(){var a,h=document.createElement("div");h.innerHTML=l._iconfont_svg_string_2184398,(h=h.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",h=h,(a=document.body).firstChild?t(h,a.firstChild):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(v,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),v()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=v,m=l.document,z=!1,s(),m.onreadystatechange=function(){"complete"==m.readyState&&(m.onreadystatechange=null,n())})}function n(){z||(z=!0,i())}function s(){try{m.documentElement.doScroll("left")}catch(a){return void setTimeout(s,50)}n()}}(window); +window._iconfont_svg_string_2184398='',function(l){var a=(a=document.getElementsByTagName("script"))[a.length-1],h=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var v,o,i,m,z,t=function(a,h){h.parentNode.insertBefore(a,h)};if(h&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}v=function(){var a,h=document.createElement("div");h.innerHTML=l._iconfont_svg_string_2184398,(h=h.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",h=h,(a=document.body).firstChild?t(h,a.firstChild):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(v,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),v()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=v,m=l.document,z=!1,s(),m.onreadystatechange=function(){"complete"==m.readyState&&(m.onreadystatechange=null,n())})}function n(){z||(z=!0,i())}function s(){try{m.documentElement.doScroll("left")}catch(a){return void setTimeout(s,50)}n()}}(window); diff --git a/WebVue/src/components/basic/OperatorStation.vue b/WebVue/src/components/basic/OperatorStation.vue index 0e2aa9d..3a79bbd 100644 --- a/WebVue/src/components/basic/OperatorStation.vue +++ b/WebVue/src/components/basic/OperatorStation.vue @@ -3,7 +3,7 @@
新增文件夹 + @click="$emit('create-folder')">新增 上传 diff --git a/WebVue/src/components/basic/OperatorStationFamily.vue b/WebVue/src/components/basic/OperatorStationFamily.vue index eb60b4f..64869a4 100644 --- a/WebVue/src/components/basic/OperatorStationFamily.vue +++ b/WebVue/src/components/basic/OperatorStationFamily.vue @@ -1,13 +1,13 @@ diff --git a/WebVue/src/views/master/OrgFamilyGroupShare.vue b/WebVue/src/views/master/OrgFamilyGroupShare.vue index 01a9812..4aa0599 100644 --- a/WebVue/src/views/master/OrgFamilyGroupShare.vue +++ b/WebVue/src/views/master/OrgFamilyGroupShare.vue @@ -19,7 +19,7 @@ v-if="canCreate && !isModal" :icon="h(FolderAddOutlined)" @click.prevent="onCreate" - >新增文件夹新增