From b485837fc8764af887072a37278561ca24892a20 Mon Sep 17 00:00:00 2001 From: owenchen Date: Fri, 4 Sep 2026 11:43:11 +0800 Subject: [PATCH] ow --- .../FamilyGroupService.auto.cs | 2 +- .../FolderProfile3.pubxml.user | 2 +- .../src/views/master/DmsFileDeleteEnquiry.vue | 912 ++++++++++++ WebVue/src/views/master/DmsFileEnquiry.vue | 20 +- .../src/views/master/FamilyGroupEnquiry.vue | 412 ++++++ .../src/views/master/FamilyGroupOperation.vue | 1063 ++++++++++++++ WebVue/src/views/master/FamilyGroupShare.vue | 1274 +++++++++++++++++ .../src/views/master/FamilyGroupUserModal.vue | 248 ++++ .../src/views/master/FamilyShareOperation.vue | 316 ++++ .../master/{VideoPlay.vue => PlayVideo.vue} | 0 WebVue/src/views/master/Preview.vue | 190 +++ WebVue/src/views/master/PreviewAudio.vue | 148 ++ WebVue/src/views/master/PreviewVideo.vue | 177 +++ .../views/master/PublishAudioOperation.vue | 812 +++++++++++ .../views/master/PublishVideoOperation.vue | 812 +++++++++++ 15 files changed, 6377 insertions(+), 11 deletions(-) create mode 100644 WebVue/src/views/master/DmsFileDeleteEnquiry.vue create mode 100644 WebVue/src/views/master/FamilyGroupEnquiry.vue create mode 100644 WebVue/src/views/master/FamilyGroupOperation.vue create mode 100644 WebVue/src/views/master/FamilyGroupShare.vue create mode 100644 WebVue/src/views/master/FamilyGroupUserModal.vue create mode 100644 WebVue/src/views/master/FamilyShareOperation.vue rename WebVue/src/views/master/{VideoPlay.vue => PlayVideo.vue} (100%) create mode 100644 WebVue/src/views/master/Preview.vue create mode 100644 WebVue/src/views/master/PreviewAudio.vue create mode 100644 WebVue/src/views/master/PreviewVideo.vue create mode 100644 WebVue/src/views/master/PublishAudioOperation.vue create mode 100644 WebVue/src/views/master/PublishVideoOperation.vue diff --git a/CloudBuilder/CloudBuilder.Master.Service/FamilyGroupService.auto.cs b/CloudBuilder/CloudBuilder.Master.Service/FamilyGroupService.auto.cs index 09dc83d..ce9b160 100644 --- a/CloudBuilder/CloudBuilder.Master.Service/FamilyGroupService.auto.cs +++ b/CloudBuilder/CloudBuilder.Master.Service/FamilyGroupService.auto.cs @@ -529,7 +529,7 @@ namespace CloudBuilder.Master.Service } familyGroup = repository.DetachedEntities.Where(x => x.FamilyName != data.FamilyGroup.FamilyName && x.FamilyLocalName == data.FamilyGroup.FamilyLocalName).FirstOrDefault(); - if (familyGroup == null) + if (familyGroup != null) { throw new ValidatedException("群组名称已存在."); } diff --git a/CloudBuilder/CloudBuilder.Web.Entry/Properties/PublishProfiles/FolderProfile3.pubxml.user b/CloudBuilder/CloudBuilder.Web.Entry/Properties/PublishProfiles/FolderProfile3.pubxml.user index ffd60c3..6b60c79 100644 --- a/CloudBuilder/CloudBuilder.Web.Entry/Properties/PublishProfiles/FolderProfile3.pubxml.user +++ b/CloudBuilder/CloudBuilder.Web.Entry/Properties/PublishProfiles/FolderProfile3.pubxml.user @@ -3,7 +3,7 @@ <_PublishTargetUrl>C:\inetpub\wwwroot\dockwebapi2 - True|2026-09-03T08:05:52.5270232Z||;True|2026-09-03T14:52:56.8559144+08:00||;True|2026-09-02T11:08:23.8720038+08:00||;True|2026-09-02T10:58:16.8081797+08:00||;True|2026-08-26T13:34:12.3805892+08:00||;True|2026-08-25T08:31:30.7787234+08:00||;True|2026-08-20T13:10:46.4725468+08:00||;True|2026-08-20T13:10:28.3142576+08:00||;True|2026-08-19T16:10:27.3362887+08:00||;True|2026-08-19T16:01:12.6234971+08:00||;True|2026-08-19T15:42:46.6576265+08:00||;True|2026-08-19T13:39:59.9363522+08:00||;True|2026-08-19T13:36:53.0379313+08:00||;True|2026-08-19T13:31:36.0841398+08:00||;True|2026-08-19T11:44:37.5319626+08:00||;True|2026-08-19T09:36:45.6000047+08:00||;True|2026-08-19T09:34:36.8468631+08:00||;True|2026-08-19T08:35:41.2202300+08:00||;True|2026-08-18T16:20:59.0170916+08:00||; + True|2026-09-04T03:42:59.9356436Z||;True|2026-09-03T16:05:52.5270232+08:00||;True|2026-09-03T14:52:56.8559144+08:00||;True|2026-09-02T11:08:23.8720038+08:00||;True|2026-09-02T10:58:16.8081797+08:00||;True|2026-08-26T13:34:12.3805892+08:00||;True|2026-08-25T08:31:30.7787234+08:00||;True|2026-08-20T13:10:46.4725468+08:00||;True|2026-08-20T13:10:28.3142576+08:00||;True|2026-08-19T16:10:27.3362887+08:00||;True|2026-08-19T16:01:12.6234971+08:00||;True|2026-08-19T15:42:46.6576265+08:00||;True|2026-08-19T13:39:59.9363522+08:00||;True|2026-08-19T13:36:53.0379313+08:00||;True|2026-08-19T13:31:36.0841398+08:00||;True|2026-08-19T11:44:37.5319626+08:00||;True|2026-08-19T09:36:45.6000047+08:00||;True|2026-08-19T09:34:36.8468631+08:00||;True|2026-08-19T08:35:41.2202300+08:00||;True|2026-08-18T16:20:59.0170916+08:00||; \ No newline at end of file diff --git a/WebVue/src/views/master/DmsFileDeleteEnquiry.vue b/WebVue/src/views/master/DmsFileDeleteEnquiry.vue new file mode 100644 index 0000000..1179624 --- /dev/null +++ b/WebVue/src/views/master/DmsFileDeleteEnquiry.vue @@ -0,0 +1,912 @@ + + + diff --git a/WebVue/src/views/master/DmsFileEnquiry.vue b/WebVue/src/views/master/DmsFileEnquiry.vue index e8e30e5..cea6801 100644 --- a/WebVue/src/views/master/DmsFileEnquiry.vue +++ b/WebVue/src/views/master/DmsFileEnquiry.vue @@ -129,7 +129,7 @@ (false); +// 点击「内部分享」时所在行的 record,供 handleSelectShare 使用 +const sharedFileRecord = ref(null); const showModalPublishPhoto = ref(false); const showModalPublishAudio = ref(false); const showModalPublishVideo = ref(false); @@ -1016,7 +1017,8 @@ const onPublishVideo = async (fid: number) => { showModalPublishVideo.value = true; }; -const onShareFamily = async () => { +const onShareFamily = async (record: Record) => { + sharedFileRecord.value = toUploadView(record); showModalShare.value = true; }; @@ -1378,7 +1380,7 @@ const onReSearch = async () => { }; const onReload = async () => { - let cfp:string=currFilePath.value; + let cfp: string = currFilePath.value; await initBindOption(); setBindOptionValue( DmsFileUploadViewDisplayData.DB_FILE_PATH, @@ -1400,8 +1402,8 @@ const handleSelectShare = async () => { fgp = new FamilyGroupFolderEntity(); fgp.FamilyName = element.FamilyName; fgp.TopFolderName = element.TopFolderName; - fgp.FolderName = keys.value[0].FileName; - fgp.FolderLocalName = keys.value[0].OrgFileName; + fgp.FolderName = sharedFileRecord.value?.FileName ?? ""; + fgp.FolderLocalName = sharedFileRecord.value?.OrgFileName ?? ""; fgp.FilePath = element.FolderName; fgps.push(fgp); diff --git a/WebVue/src/views/master/FamilyGroupEnquiry.vue b/WebVue/src/views/master/FamilyGroupEnquiry.vue new file mode 100644 index 0000000..79fbce6 --- /dev/null +++ b/WebVue/src/views/master/FamilyGroupEnquiry.vue @@ -0,0 +1,412 @@ + + diff --git a/WebVue/src/views/master/FamilyGroupOperation.vue b/WebVue/src/views/master/FamilyGroupOperation.vue new file mode 100644 index 0000000..0f661f0 --- /dev/null +++ b/WebVue/src/views/master/FamilyGroupOperation.vue @@ -0,0 +1,1063 @@ + + + diff --git a/WebVue/src/views/master/FamilyGroupShare.vue b/WebVue/src/views/master/FamilyGroupShare.vue new file mode 100644 index 0000000..1f9fc8e --- /dev/null +++ b/WebVue/src/views/master/FamilyGroupShare.vue @@ -0,0 +1,1274 @@ + + + + diff --git a/WebVue/src/views/master/FamilyGroupUserModal.vue b/WebVue/src/views/master/FamilyGroupUserModal.vue new file mode 100644 index 0000000..3455cef --- /dev/null +++ b/WebVue/src/views/master/FamilyGroupUserModal.vue @@ -0,0 +1,248 @@ + + diff --git a/WebVue/src/views/master/FamilyShareOperation.vue b/WebVue/src/views/master/FamilyShareOperation.vue new file mode 100644 index 0000000..7c82a94 --- /dev/null +++ b/WebVue/src/views/master/FamilyShareOperation.vue @@ -0,0 +1,316 @@ + + diff --git a/WebVue/src/views/master/VideoPlay.vue b/WebVue/src/views/master/PlayVideo.vue similarity index 100% rename from WebVue/src/views/master/VideoPlay.vue rename to WebVue/src/views/master/PlayVideo.vue diff --git a/WebVue/src/views/master/Preview.vue b/WebVue/src/views/master/Preview.vue new file mode 100644 index 0000000..c010030 --- /dev/null +++ b/WebVue/src/views/master/Preview.vue @@ -0,0 +1,190 @@ + + + + + diff --git a/WebVue/src/views/master/PreviewAudio.vue b/WebVue/src/views/master/PreviewAudio.vue new file mode 100644 index 0000000..5639026 --- /dev/null +++ b/WebVue/src/views/master/PreviewAudio.vue @@ -0,0 +1,148 @@ + + + + diff --git a/WebVue/src/views/master/PreviewVideo.vue b/WebVue/src/views/master/PreviewVideo.vue new file mode 100644 index 0000000..b77c48c --- /dev/null +++ b/WebVue/src/views/master/PreviewVideo.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/WebVue/src/views/master/PublishAudioOperation.vue b/WebVue/src/views/master/PublishAudioOperation.vue new file mode 100644 index 0000000..99179e0 --- /dev/null +++ b/WebVue/src/views/master/PublishAudioOperation.vue @@ -0,0 +1,812 @@ + + + \ No newline at end of file diff --git a/WebVue/src/views/master/PublishVideoOperation.vue b/WebVue/src/views/master/PublishVideoOperation.vue new file mode 100644 index 0000000..30b8a66 --- /dev/null +++ b/WebVue/src/views/master/PublishVideoOperation.vue @@ -0,0 +1,812 @@ + + + \ No newline at end of file