From 67c632715b1596bdb8d842fc6bdc3af6f1477762 Mon Sep 17 00:00:00 2001
From: owen <itcsx@126.com>
Date: Sat, 5 Sep 2026 23:08:56 +0800
Subject: [PATCH] ow

---
 .../PublishAudioService.auto.cs               |   21 +-
 .../PublishPhotoService.auto.cs               |   17 +-
 .../Policy/FileTypePolicy.cs                  |   13 +-
 WebVue/src/components/basic/MyComputer.vue    |  416 +++++
 .../src/components/basic/OperatorStation.vue  |  257 +++
 WebVue/src/components/basic/Search.vue        |    2 +-
 WebVue/src/components/basic/Toolbar.vue       |  179 ++
 .../security/operation-to-enquiry.ts          |    3 +
 WebVue/src/md/injections.md                   |    2 +-
 WebVue/src/views/login/changeLocalName.vue    |   29 +-
 WebVue/src/views/login/changePassword.vue     |   24 +-
 WebVue/src/views/master/DmsFileEnquiry.vue    |  971 ++++-------
 WebVue/src/views/master/FamilyGroupShare.vue  |    2 +-
 .../src/views/master/FamilyPersonEnquiry.vue  |    2 +-
 WebVue/src/views/master/FamilyTreeEnquiry.vue |    2 +-
 WebVue/src/views/master/OrgDmsFileEnquiry.vue | 1539 +++++++++++++++++
 .../src/views/master/PublishAudioEnquiry.vue  |    8 +-
 .../views/master/PublishAudioOperation.vue    |    8 +-
 .../src/views/master/PublishPhotoEnquiry.vue  |    2 +-
 .../views/master/PublishPhotoOperation.vue    |   13 +-
 .../src/views/master/PublishVideoEnquiry.vue  |    8 +-
 .../views/master/PublishVideoOperation.vue    |    8 +-
 WebVue/src/views/security/ActorEnquiry.vue    |    2 +-
 WebVue/src/views/security/FunctionEnquiry.vue |    2 +-
 WebVue/src/views/security/GroupEnquiry.vue    |    2 +-
 WebVue/src/views/security/MasterEnquiry.vue   |    2 +-
 .../security/PermissionDependentModal.vue     |    2 +-
 .../src/views/security/PermissionEnquiry.vue  |    2 +-
 WebVue/src/views/security/UserEnquiry.vue     |    2 +-
 29 files changed, 2801 insertions(+), 739 deletions(-)
 create mode 100644 WebVue/src/components/basic/MyComputer.vue
 create mode 100644 WebVue/src/components/basic/OperatorStation.vue
 create mode 100644 WebVue/src/components/basic/Toolbar.vue
 create mode 100644 WebVue/src/views/master/OrgDmsFileEnquiry.vue

diff --git a/CloudBuilder/CloudBuilder.Master.Service/PublishAudioService.auto.cs b/CloudBuilder/CloudBuilder.Master.Service/PublishAudioService.auto.cs
index 523fd26..2132780 100644
--- a/CloudBuilder/CloudBuilder.Master.Service/PublishAudioService.auto.cs
+++ b/CloudBuilder/CloudBuilder.Master.Service/PublishAudioService.auto.cs
@@ -76,34 +76,19 @@ namespace CloudBuilder.Master.Service
 
             if (data.Details != null && data.Details.Length > 0)
             {
-                var webRootPath = service.Configuration[ServiceSettingsPolicy.RequestPath];
-                var phy = service.Configuration[ServiceSettingsPolicy.PhysicalFileDirectory];
-                var scale = service.Configuration[ServiceSettingsPolicy.DmsFileScaleDirectory].Replace(phy, "");
-
                 foreach (var item in data.Details)
                 {
                     if (!string.IsNullOrEmpty(item.Pic) && FileTypePolicy.GetType(item.Pic!) == FileTypePolicy.PHOTO)
                     {
-                        var fileExtension = Path.GetExtension(item.Pic);
-                        var filePathRel = Path.Combine(scale, item.CreatedBy, fileExtension.Replace(".", ""), "");
-                        var filePath = filePathRel.Replace(Path.DirectorySeparatorChar, '/');
-                        item.FormattedPic = service.Configuration[AppsettingsPolicy.ApplicationUrl] + webRootPath + filePath + item.Pic;
+                        item.FormattedPic = item.FormattedPic = FileTypePolicy.PackUrl(service, item.CreatedBy, item.Pic, YesNoPolicy.NO);
                     }
                     if (!string.IsNullOrEmpty(item.Url) && FileTypePolicy.GetType(item.Url!) == FileTypePolicy.AUDIO)
                     {
-                        var fileExtension = Path.GetExtension(item.Url);
-                        var backup = service.Configuration[ServiceSettingsPolicy.DmsFileBackupDirectory].Replace(phy, "");
-                        var filePathRel = Path.Combine(backup, item.CreatedBy, fileExtension.Replace(".", ""), "");
-                        var filePath = filePathRel.Replace(Path.DirectorySeparatorChar, '/');
-                        item.FormattedUrl = service.Configuration[AppsettingsPolicy.ApplicationUrl] + webRootPath + filePath + item.Url;
+                        item.FormattedUrl = FileTypePolicy.PackUrl(service, item.CreatedBy, item.Url, YesNoPolicy.NO);
                     }
                     if (!string.IsNullOrEmpty(item.Lrc) && FileTypePolicy.GetType(item.Lrc!) == FileTypePolicy.LYRIC)
                     {
-                        var fileExtension = Path.GetExtension(item.Lrc);
-                        var upload = service.Configuration[ServiceSettingsPolicy.DmsFileUploadDirectory].Replace(phy, "");
-                        var filePathRel = Path.Combine(upload, item.CreatedBy, fileExtension.Replace(".", ""), "");
-                        var filePath = filePathRel.Replace(Path.DirectorySeparatorChar, '/');
-                        item.FormattedLrc = service.Configuration[AppsettingsPolicy.ApplicationUrl] + webRootPath + filePath + item.Lrc;
+                        item.FormattedLrc = FileTypePolicy.PackUrl(service, item.CreatedBy, item.Lrc, YesNoPolicy.NO);
                     }
                 }
 
diff --git a/CloudBuilder/CloudBuilder.Master.Service/PublishPhotoService.auto.cs b/CloudBuilder/CloudBuilder.Master.Service/PublishPhotoService.auto.cs
index e931117..21fc548 100644
--- a/CloudBuilder/CloudBuilder.Master.Service/PublishPhotoService.auto.cs
+++ b/CloudBuilder/CloudBuilder.Master.Service/PublishPhotoService.auto.cs
@@ -80,13 +80,18 @@ namespace CloudBuilder.Master.Service
             if (data.Details != null || data.Details.Length > 0)
                 foreach (var item in data.Details)
                 {
-                    item.FileName = (isAttached ? service.Configuration[AppsettingsPolicy.ApplicationUrl] : "") + item.FileName;
+                    item.FileName = PackImageFileName(isAttached, item.FileName);
                 }
 
 
             return data;
         }
 
+        private string PackImageFileName(bool isAttached,string fileName)
+        {
+           return (isAttached ? service.Configuration[AppsettingsPolicy.ApplicationUrl] : "")
+                        + fileName?.Replace("\\", "/");
+        }
 
         [PermissionOperate(name: MasterPermissionPolicy.PublishPhoto, operate: Operate.Find)]
         public PublishPhotoResultData FindBySearchCriteria(PublishPhotoSearchCriteria criteria)
@@ -352,7 +357,7 @@ namespace CloudBuilder.Master.Service
             {
                 if (item.FileName.ToLower().StartsWith("http")) continue;
 
-                item.FileName = (isAttached ? service.Configuration[AppsettingsPolicy.ApplicationUrl] : "") + item.FileName;
+                item.FileName = PackImageFileName(isAttached, item.FileName);
             }
 
             return dtls;
@@ -416,12 +421,12 @@ namespace CloudBuilder.Master.Service
 
             var webRootPath = service.Configuration[ServiceSettingsPolicy.RequestPath];
             var phy = service.Configuration[ServiceSettingsPolicy.PhysicalFileDirectory];
-            var scale = service.Configuration[ServiceSettingsPolicy.DmsFileScaleDirectory].Replace(phy, "");
+            var backup = service.Configuration[ServiceSettingsPolicy.DmsFileBackupDirectory].Replace(phy, "").Substring(1);
 
             var fileExtension = Path.GetExtension(dmsFile.OrderKey);
-            var filePathRel = Path.Combine(scale, dmsFile.CreatedBy, fileExtension.Replace(".", ""), "");
-            var filePath = filePathRel.Replace(Path.DirectorySeparatorChar, '/');
-            string path = Path.Combine(webRootPath, filePathRel, dmsFile.OrderKey);
+            var filePathRel = Path.Combine(webRootPath.Substring(1), backup, dmsFile.CreatedBy, fileExtension.Replace(".", ""), "");
+            var filePath = '/'+filePathRel.Replace(Path.DirectorySeparatorChar, '/');
+            string path = Path.Combine(filePath, dmsFile.OrderKey);
 
 
             PublishPhotoDetailEntity[] dtls = repositoryPublishPhotoDetail.DetachedEntities.Where(x => x.PublishName == publishName).ToArray();
diff --git a/CloudBuilder/CloudBuilder.Security/Policy/FileTypePolicy.cs b/CloudBuilder/CloudBuilder.Security/Policy/FileTypePolicy.cs
index 80669a2..8197e77 100644
--- a/CloudBuilder/CloudBuilder.Security/Policy/FileTypePolicy.cs
+++ b/CloudBuilder/CloudBuilder.Security/Policy/FileTypePolicy.cs
@@ -80,7 +80,7 @@ namespace CloudBuilder.Security.Policy
             var phy = service.Configuration[ServiceSettingsPolicy.PhysicalFileDirectory] ?? "";
             var fileExtension = Path.GetExtension(orderKey);//获取文件格式，拓展名
 
-            if (GetType(orderKey!) == FileTypePolicy.PHOTO)
+            if (GetType(orderKey!) == PHOTO)
             {
                 if (transcodeIndc == YesNoPolicy.YES)
                 {
@@ -98,14 +98,14 @@ namespace CloudBuilder.Security.Policy
                     url = service.Configuration[AppsettingsPolicy.ApplicationUrl] + webRootPath + filePath + orderKey;
                 }
             }
-            else if (GetType(orderKey!) == FileTypePolicy.AUDIO)
+            else if (GetType(orderKey!) == AUDIO)
             {
                 var backup = (service.Configuration[ServiceSettingsPolicy.DmsFileBackupDirectory] ?? "").Replace(phy ?? "", "");
                 var filePathRel = Path.Combine(backup, createdBy, fileExtension.Replace(".", ""), "");
                 var filePath = filePathRel.Replace(Path.DirectorySeparatorChar, '/') + "/";
                 url = service.Configuration[AppsettingsPolicy.ApplicationUrl] + webRootPath + filePath + orderKey;
             }
-            else if (GetType(orderKey!) == FileTypePolicy.VIDEO)
+            else if (GetType(orderKey!) == VIDEO)
             {
                 if (transcodeIndc == YesNoPolicy.YES)
                 {
@@ -122,6 +122,13 @@ namespace CloudBuilder.Security.Policy
                     url = service.Configuration[AppsettingsPolicy.ApplicationUrl] + webRootPath + filePath + orderKey;
                 }
             }
+            else if (GetType(orderKey!) == LYRIC)
+            {
+                var upload = service.Configuration[ServiceSettingsPolicy.DmsFileUploadDirectory].Replace(phy, "");
+                var filePathRel = Path.Combine(upload, createdBy, fileExtension.Replace(".", ""), "");
+                var filePath = filePathRel.Replace(Path.DirectorySeparatorChar, '/') + "/";
+                url = service.Configuration[AppsettingsPolicy.ApplicationUrl] + webRootPath + filePath + orderKey;
+            }
             return url;
         }
         public static string PackSourceVideoUrl(IApplicationService service, string createdBy, string orderKey)
diff --git a/WebVue/src/components/basic/MyComputer.vue b/WebVue/src/components/basic/MyComputer.vue
new file mode 100644
index 0000000..ec7cc84
--- /dev/null
+++ b/WebVue/src/components/basic/MyComputer.vue
@@ -0,0 +1,416 @@
+<template>
+  <div class="my-computer" ref="containerRef">
+    <div class="my-computer-header">
+      <a-checkbox :checked="isAllChecked" :indeterminate="isIndeterminate" @change="onToggleSelectAll">全选</a-checkbox>
+      <div class="view-toggles">
+        <a-tooltip title="列表视图">
+          <a-button size="small" :type="viewMode === 'list' ? 'primary' : 'default'" @click="viewMode = 'list'">
+            <UnorderedListOutlined />
+          </a-button>
+        </a-tooltip>
+        <a-tooltip title="图标视图">
+          <a-button size="small" :type="viewMode === 'icon' ? 'primary' : 'default'" @click="viewMode = 'icon'">
+            <AppstoreOutlined />
+          </a-button>
+        </a-tooltip>
+      </div>
+    </div>
+
+    <div class="my-computer-body" v-if="viewMode === 'icon'">
+      <div v-for="record in datas" :key="record.FileId + '-' + record.FileName" class="file-card-wrapper"
+        @click="onCardClick(record)" @dblclick="onCardDblClick(record)">
+        <div class="file-checkbox-wrapper">
+          <a-checkbox :checked="isSelected(record)" @click.stop="toggleSelect(record)" />
+        </div>
+        <div class="file-content">
+          <template v-if="record.IsDirectoryIndc == 'Y'">
+            <div class="folder-icon">
+              <FolderOutlined />
+            </div>
+            <div class="file-name" :title="record.OrgFileName">{{ record.OrgFileName }}</div>
+          </template>
+
+          <template v-else-if="isImage(record.OrderKey)">
+            <div class="image-thumb">
+              <img :src="record.Url" :title="record.OrgFileName" @click.stop="$emit('preview-image', record)" />
+            </div>
+            <div class="file-name" :title="record.OrgFileName">{{ record.OrgFileName }}</div>
+          </template>
+
+          <template v-else-if="isVideo(record.OrderKey)">
+            <div class="video-thumb">
+              <img :src="record.FormattedPic.replace('.m3u8', '.png')" :title="record.OrgFileName" />
+              <div class="play-overlay">
+                <PlayCircleOutlined />
+              </div>
+            </div>
+            <div class="file-name" :title="record.OrgFileName">{{ record.OrgFileName }}</div>
+          </template>
+
+          <template v-else-if="isAudio(record.OrderKey)">
+            <div class="audio-icon" :class="{ playing: record.IsPlay == 'Y' && record.IsPause != 'Y' }">
+              <cust-icon-font size="54" type="icon-playmp3" style="color: #ff7878" />
+            </div>
+            <div class="file-name" :title="record.OrgFileName">{{ record.OrgFileName }}</div>
+          </template>
+
+          <template v-else>
+            <div class="file-icon">
+              <FileOutlined />
+            </div>
+            <div class="file-name" :title="record.OrgFileName">{{ record.OrgFileName }}</div>
+          </template>
+        </div>
+      </div>
+
+      <a-empty v-if="!datas || datas.length === 0" description="暂无文件" />
+    </div>
+
+    <div class="my-computer-body list-body" v-else>
+      <div v-for="record in datas" :key="record.FileId + '-' + record.FileName" class="list-item"
+        :class="{ selected: isSelected(record) }" @click="onCardClick(record)" @dblclick="onCardDblClick(record)">
+        <a-checkbox :checked="isSelected(record)" @click.stop="toggleSelect(record)" />
+        <div class="list-icon">
+          <template v-if="record.IsDirectoryIndc == 'Y'">
+            <FolderOutlined style="color: #faad14" />
+          </template>
+          <template v-else-if="isImage(record.OrderKey)">
+            <FileImageOutlined style="color: #52c41a" />
+          </template>
+          <template v-else-if="isVideo(record.OrderKey)">
+            <VideoCameraOutlined style="color: #1890ff" />
+          </template>
+          <template v-else-if="isAudio(record.OrderKey)">
+            <PlayCircleOutlined style="color: #eb2f96" />
+          </template>
+          <template v-else>
+            <FileOutlined style="color: #8c8c8c" />
+          </template>
+        </div>
+        <div class="list-name" :title="record.OrgFileName">{{ record.OrgFileName }}</div>
+        <div class="list-size">{{ formatSize(record.FileSize) }}</div>
+        <div class="list-date">{{ formatDate(record.CreatedDatetime) }}</div>
+      </div>
+
+      <a-empty v-if="!datas || datas.length === 0" description="暂无文件" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from "vue";
+import {
+  FolderOutlined,
+  FileOutlined,
+  FileImageOutlined,
+  VideoCameraOutlined,
+  PlayCircleOutlined,
+  UnorderedListOutlined,
+  AppstoreOutlined,
+} from "@ant-design/icons-vue";
+import { DmsFileUploadViewDisplayData } from "@/data/auto/dmsFileUploadViewDisplayData";
+
+const props = defineProps<{
+  datas: DmsFileUploadViewDisplayData[];
+  selectedKeys: DmsFileUploadViewDisplayData[];
+}>();
+
+const emit = defineEmits([
+  "update:selectedKeys",
+  "select-change",
+  "open-folder",
+  "open-file",
+  "preview-image",
+]);
+
+const viewMode = ref<"icon" | "list">("icon");
+
+const isAllChecked = computed(() => {
+  if (!props.datas || props.datas.length === 0) return false;
+  return props.datas.every((d) => props.selectedKeys.some((s) => s.FileId === d.FileId));
+});
+
+const isIndeterminate = computed(() => {
+  if (!props.datas || props.datas.length === 0) return false;
+  const checkedCount = props.datas.filter((d) =>
+    props.selectedKeys.some((s) => s.FileId === d.FileId),
+  ).length;
+  return checkedCount > 0 && checkedCount < props.datas.length;
+});
+
+const isSelected = (record: DmsFileUploadViewDisplayData) => {
+  return props.selectedKeys.some((s) => s.FileId === record.FileId);
+};
+
+const toggleSelect = (record: DmsFileUploadViewDisplayData) => {
+  let newKeys: DmsFileUploadViewDisplayData[];
+  if (isSelected(record)) {
+    newKeys = props.selectedKeys.filter((s) => s.FileId !== record.FileId);
+  } else {
+    newKeys = [...props.selectedKeys, record];
+  }
+  emit("update:selectedKeys", newKeys);
+  emit("select-change", newKeys);
+};
+
+const onToggleSelectAll = (e: any) => {
+  if (e.target.checked) {
+    emit("update:selectedKeys", [...props.datas]);
+    emit("select-change", [...props.datas]);
+  } else {
+    emit("update:selectedKeys", []);
+    emit("select-change", []);
+  }
+};
+
+const onCardClick = (record: DmsFileUploadViewDisplayData) => {
+  toggleSelect(record);
+};
+
+const onCardDblClick = (record: DmsFileUploadViewDisplayData) => {
+  if (record.IsDirectoryIndc == "Y") {
+    emit("open-folder", record);
+  } else {
+    emit("open-file", record);
+  }
+};
+
+const isImage = (key: string) => {
+  if (!key) return false;
+  return /\.(png|jpe?g|gif|bmp|webp)$/i.test(key);
+};
+
+const isVideo = (key: string) => {
+  if (!key) return false;
+  return /\.(mp4|m3u8|rm|mpeg|mov|wmv|avi)$/i.test(key);
+};
+
+const isAudio = (key: string) => {
+  if (!key) return false;
+  return /\.(mp3|wav|flac|aac|ogg|wma)$/i.test(key);
+};
+
+const formatSize = (size: number) => {
+  size = size * 1024;
+  if (!size) return "-";
+  if (size < 1024) return size + " B";
+  if (size < 1024 * 1024) return (size / 1024).toFixed(1) + " KB";
+  if (size < 1024 * 1024 * 1024)
+    return (size / 1024 / 1024).toFixed(1) + " MB";
+  return (size / 1024 / 1024 / 1024).toFixed(2) + " GB";
+};
+
+const formatDate = (date: any) => {
+  if (!date) return "-";
+  const d = new Date(date);
+  if (isNaN(d.getTime())) return "-";
+  return (
+    d.getFullYear() +
+    "-" +
+    String(d.getMonth() + 1).padStart(2, "0") +
+    "-" +
+    String(d.getDate()).padStart(2, "0") +
+    " " +
+    String(d.getHours()).padStart(2, "0") +
+    ":" +
+    String(d.getMinutes()).padStart(2, "0")
+  );
+};
+</script>
+
+<style scoped>
+.my-computer {
+  padding: 8px;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  overflow: hidden;
+}
+
+.my-computer-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 4px;
+  border-bottom: 1px solid #f0f0f0;
+  margin-bottom: 8px;
+}
+
+.view-toggles {
+  display: flex;
+  gap: 4px;
+}
+
+.my-computer-body {
+  flex: 1;
+  overflow-y: auto;
+  padding: 4px;
+  display: flex;
+  flex-wrap: wrap;
+  align-content: flex-start;
+  gap: 16px;
+}
+
+.my-computer-body.list-body {
+  flex-wrap: nowrap;
+  flex-direction: column;
+  gap: 0;
+}
+
+.file-card-wrapper {
+  width: 120px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  cursor: pointer;
+  padding: 8px;
+  border-radius: 6px;
+  transition: all 0.2s;
+  position: relative;
+}
+
+.file-card-wrapper:hover {
+  background: #f5f5f5;
+}
+
+.file-checkbox-wrapper {
+  position: absolute;
+  top: 2px;
+  left: 4px;
+  z-index: 1;
+}
+
+.file-content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+}
+
+.folder-icon,
+.file-icon,
+.audio-icon {
+  font-size: 56px;
+  color: #faad14;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 80px;
+  height: 80px;
+}
+
+.file-icon {
+  color: #8c8c8c;
+}
+
+.audio-icon {
+  color: #eb2f96;
+}
+
+.audio-icon.playing {
+  animation: rotate 2s linear infinite;
+}
+
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.image-thumb,
+.video-thumb {
+  width: 100px;
+  height: 100px;
+  border-radius: 4px;
+  overflow: hidden;
+  position: relative;
+  background: #f0f0f0;
+}
+
+.image-thumb img,
+.video-thumb img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.video-thumb .play-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: rgba(0, 0, 0, 0.2);
+  font-size: 36px;
+  color: #fff;
+  opacity: 0;
+  transition: opacity 0.2s;
+}
+
+.video-thumb:hover .play-overlay {
+  opacity: 1;
+}
+
+.file-name {
+  font-size: 12px;
+  margin-top: 4px;
+  text-align: center;
+  max-width: 110px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.list-item {
+  display: flex;
+  align-items: center;
+  padding: 8px 12px;
+  border-bottom: 1px solid #f0f0f0;
+  cursor: pointer;
+  border-radius: 4px;
+  transition: background 0.15s;
+  gap: 12px;
+}
+
+.list-item:hover {
+  background: #f5f5f5;
+}
+
+.list-item.selected {
+  background: #e6f4ff;
+}
+
+.list-icon {
+  font-size: 20px;
+  width: 28px;
+  display: flex;
+  justify-content: center;
+}
+
+.list-name {
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.list-size,
+.list-date {
+  color: #8c8c8c;
+  font-size: 13px;
+  width: 120px;
+  text-align: right;
+}
+
+.list-date {
+  width: 160px;
+}
+</style>
diff --git a/WebVue/src/components/basic/OperatorStation.vue b/WebVue/src/components/basic/OperatorStation.vue
new file mode 100644
index 0000000..1be695d
--- /dev/null
+++ b/WebVue/src/components/basic/OperatorStation.vue
@@ -0,0 +1,257 @@
+<template>
+  <div class="operator-station">
+    <div class="operator-group main-actions">
+      <a-tooltip title="新增文件夹">
+        <a-button type="primary" v-if="canCreate" :icon="h(FolderAddOutlined)"
+          @click="$emit('create-folder')">新增文件夹</a-button>
+      </a-tooltip>
+      <a-tooltip title="上传文件">
+        <a-button type="primary" v-if="canCreate" :icon="h(UploadOutlined)" @click="triggerUpload">上传</a-button>
+      </a-tooltip>
+    </div>
+
+    <a-divider type="vertical" v-if="hasSelection" />
+
+    <div class="operator-group selection-actions" v-if="hasSelection">
+      <template v-if="!isDirectorySelected && isSingleItem">
+        <a-tooltip title="下载">
+          <a-button type="text" :icon="h(DownloadOutlined)" :disabled="!canAmend" @click="onDownload" >下载</a-button>
+        </a-tooltip>
+
+        <a-tooltip title="共享">
+          <a-button type="text" :icon="h(ShareAltOutlined)" @click="onShare">共享</a-button>
+        </a-tooltip>
+
+        <a-tooltip :title="publishTooltip">
+          <a-button type="text" :icon="h(NotificationOutlined)" @click="onPublish" >{{ publishTooltip }}</a-button>
+        </a-tooltip>
+
+        <a-tooltip :title="previewTooltip">
+          <a-button type="text" :icon="h(UnorderedListOutlined)" @click="onViewPreview" >{{ previewTooltip }}</a-button>
+        </a-tooltip>
+
+        <template v-if="isSingleVideo">
+          <a-tooltip title="播放">
+            <a-button type="text" :icon="h(PlayCircleOutlined, { style: { color: 'red' } })" @click="onPlayVideo"  >播放</a-button>
+          </a-tooltip>
+        </template>
+
+        <template v-if="isSingleAudio">
+          <a-tooltip v-if="selectedItem.IsPlay != 'Y'" title="播放">
+            <a-button type="text" :icon="h(PlayCircleOutlined, { style: { color: 'red' } })" @click="onPlayAudio"  >播放</a-button>
+          </a-tooltip>
+          <a-tooltip v-else-if="selectedItem.IsPause != 'Y'" title="暂停">
+            <a-button type="text" :icon="h(PauseCircleOutlined)" @click="onPauseAudio" >暂停</a-button>
+          </a-tooltip>
+          <a-tooltip v-else title="继续">
+            <a-button type="text" :icon="h(PlayCircleOutlined, { style: { color: 'red' } })" @click="onContinueAudio" >继续</a-button>
+          </a-tooltip>
+        </template>
+      </template>
+    </div>
+
+    <a-divider type="vertical" v-if="hasSelection" />
+
+    <div class="operator-group more-actions">
+      <a-dropdown>
+        <a-button>
+          更多
+          <DownOutlined />
+        </a-button>
+        <template #overlay>
+          <a-menu>
+            <a-menu-item key="preview" v-if="isImage(selectedOrderKey) && isSingleItem" :disabled="!canAmend" @click="$emit('preview', selectedItems)">
+              <EyeOutlined /> 预览
+            </a-menu-item>
+            <a-menu-item key="rename" v-if="isSingleItem" :disabled="!canAmend" @click="$emit('rename', selectedItems)">
+              <EditOutlined /> 重命名
+            </a-menu-item>
+            <a-menu-item key="move" v-if="isSingleItem" :disabled="!canView" @click="$emit('move', selectedItems)">
+              <ScissorOutlined /> 移动
+            </a-menu-item>
+            <a-menu-divider />
+            <a-menu-item key="delete":disabled="!canDelete" @click="$emit('delete', selectedItems)">
+              <DeleteOutlined /> 删除
+            </a-menu-item>
+          </a-menu>
+        </template>
+      </a-dropdown>
+    </div>
+
+    <div style="display: none">
+      <a-upload v-if="canCreate" v-model:file-list="fileList" name="file" :before-upload="onBeforeUpload"
+        :headers="headers" :show-upload-list="false" :action="uploadUrl" ref="uploadRef">
+      </a-upload>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, h } from "vue";
+import {
+  UploadOutlined,
+  FolderAddOutlined,
+  DownloadOutlined,
+  ShareAltOutlined,
+  NotificationOutlined,
+  UnorderedListOutlined,
+  PlayCircleOutlined,
+  PauseCircleOutlined,
+  EyeOutlined,
+  EditOutlined,
+  ScissorOutlined,
+  DeleteOutlined,
+  DownOutlined,
+} from "@ant-design/icons-vue";
+import { DmsFileUploadViewDisplayData } from "@/data/auto/dmsFileUploadViewDisplayData";
+import type { UploadProps } from "ant-design-vue";
+
+const props = defineProps<{
+  selectedItems: DmsFileUploadViewDisplayData[];
+  uploadUrl: string;
+  headers: any;
+  canCreate: boolean;
+  canAmend: boolean;
+  canDelete: boolean;
+  canView: boolean;
+}>();
+
+const emit = defineEmits([
+  "create-folder",
+  "before-upload",
+  "download",
+  "share",
+  "publish",
+  "view-preview",
+  "play-video",
+  "play-audio",
+  "pause-audio",
+  "continue-audio",
+  "preview",
+  "rename",
+  "move",
+  "delete",
+]);
+
+const fileList = ref<UploadProps["fileList"]>([]);
+const uploadRef = ref<any>(null);
+
+const hasSelection = computed(() => props.selectedItems.length > 0);
+const isDirectorySelected = computed(() =>
+  props.selectedItems.some((s) => s.IsDirectoryIndc == "Y"),
+);
+const isSingleItem = computed(() => props.selectedItems.length === 1);
+
+const selectedItem = computed(() => {
+  return props.selectedItems[0] || ({} as DmsFileUploadViewDisplayData);
+});
+
+const selectedOrderKey = computed(() => {
+  return selectedItem.value?.OrderKey || selectedItem.value?.OrgFileName || "";
+});
+
+const isImage = (key: string) => {
+  if (!key) return false;
+  return /\.(png|jpe?g|gif|bmp|webp)$/i.test(key);
+};
+
+const isVideo = (key: string) => {
+  if (!key) return false;
+  return /\.(mp4|m3u8|rm|mpeg|mov|wmv|avi)$/i.test(key);
+};
+
+const isAudio = (key: string) => {
+  if (!key) return false;
+  return /\.(mp3|wav|flac|aac|ogg|wma)$/i.test(key);
+};
+
+const isSingleVideo = computed(() => {
+  return isSingleItem.value && isVideo(selectedOrderKey.value);
+});
+
+const isSingleAudio = computed(() => {
+  return isSingleItem.value && isAudio(selectedOrderKey.value);
+});
+
+const publishTooltip = computed(() => {
+  if (isImage(selectedOrderKey.value)) return "发布相册";
+  if (isVideo(selectedOrderKey.value)) return "发布影视专辑";
+  if (isAudio(selectedOrderKey.value)) return "发布音乐专辑";
+  return "发布";
+});
+
+const previewTooltip = computed(() => {
+  if (isImage(selectedOrderKey.value)) return "相册展览";
+  if (isVideo(selectedOrderKey.value)) return "影视厅播放";
+  if (isAudio(selectedOrderKey.value)) return "音乐厅播放";
+  return "预览";
+});
+
+const triggerUpload = () => {
+  uploadRef.value?.$el?.querySelector("input")?.click();
+};
+
+const onBeforeUpload: UploadProps["beforeUpload"] = (file) => {
+  emit("before-upload", file);
+  return false;
+};
+
+const onDownload = () => {
+  emit("download", props.selectedItems);
+};
+
+const onShare = () => {
+  emit("share", props.selectedItems);
+};
+
+const onPublish = () => {
+  emit("publish", props.selectedItems);
+};
+
+const onViewPreview = () => {
+  emit("view-preview", props.selectedItems);
+};
+
+const onPlayVideo = () => {
+  emit("play-video", selectedItem.value);
+};
+
+const onPlayAudio = () => {
+  emit("play-audio", selectedItem.value);
+};
+
+const onPauseAudio = () => {
+  emit("pause-audio", selectedItem.value);
+};
+
+const onContinueAudio = () => {
+  emit("continue-audio", selectedItem.value);
+};
+</script>
+
+<style scoped>
+.operator-station {
+  display: flex;
+  align-items: center;
+  padding: 6px 12px;
+  background: #fafafa;
+  border-bottom: 1px solid #e8e8e8;
+  gap: 8px;
+  flex-wrap: wrap;
+}
+
+.operator-group {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.main-actions :deep(.ant-btn) {
+  height: 32px;
+}
+
+.selection-actions :deep(.ant-btn) {
+  padding: 4px 8px;
+  font-size: 16px;
+}
+</style>
diff --git a/WebVue/src/components/basic/Search.vue b/WebVue/src/components/basic/Search.vue
index d0a641e..d171d13 100644
--- a/WebVue/src/components/basic/Search.vue
+++ b/WebVue/src/components/basic/Search.vue
@@ -162,7 +162,7 @@ const paginationJ = ref(props["pagination"]);
 const rowSelectionType = ref(props["rowSelectionType"]);
 const tableY = ref(props["scrolly"]);
 
-const enquiry = inject(enquiryMethodKey);
+const enquiry = inject(enquiryMethodKey, undefined);
 
 const datas = enquiry?.getDatas()!;
 
diff --git a/WebVue/src/components/basic/Toolbar.vue b/WebVue/src/components/basic/Toolbar.vue
new file mode 100644
index 0000000..f7945da
--- /dev/null
+++ b/WebVue/src/components/basic/Toolbar.vue
@@ -0,0 +1,179 @@
+<template>
+  <div class="toolbar">
+    <div class="toolbar-left">
+      <a-tooltip title="返回顶层">
+        <a-button
+          type="text"
+          class="nav-btn"
+          :disabled="!canGoTop"
+          @click="$emit('go-top')"
+        >
+          <HomeOutlined />
+        </a-button>
+      </a-tooltip>
+      <a-tooltip title="返回上层">
+        <a-button
+          type="text"
+          class="nav-btn"
+          :disabled="!canGoBack"
+          @click="$emit('go-back')"
+        >
+          <ArrowLeftOutlined />
+        </a-button>
+      </a-tooltip>
+      <a-tooltip title="刷新">
+        <a-button
+          type="text"
+          class="nav-btn"
+          :loading="loading"
+          @click="$emit('refresh')"
+        >
+          <ReloadOutlined />
+        </a-button>
+      </a-tooltip>
+    </div>
+
+    <div class="toolbar-center">
+      <a-breadcrumb class="breadcrumb">
+        <a-breadcrumb-item
+          v-for="(item, index) in breadcrumbItems"
+          :key="index"
+          @click="onBreadcrumbClick(item, index)"
+          :class="{ clickable: index < breadcrumbItems.length - 1 }"
+        >
+          <template v-if="index === 0">
+            <LaptopOutlined style="margin-right: 4px" />
+          </template>
+         <span :style="{ cursor: index < breadcrumbItems.length - 1 ? 'pointer' : 'default',
+    color: index < breadcrumbItems.length - 1 ? '#1677ff' : '' }">{{ item.displayName }}</span> 
+        </a-breadcrumb-item>
+      </a-breadcrumb>
+    </div>
+
+    <div class="toolbar-right">
+      <a-input-search
+        v-model:value="searchKeyword"
+        placeholder="搜索文件名称"
+        allow-clear
+        style="width: 240px"
+        @search="onSearch"
+        @pressEnter="onSearch"
+      >
+        <template #prefix>
+          <SearchOutlined />
+        </template>
+      </a-input-search>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch } from "vue";
+import {
+  HomeOutlined,
+  ArrowLeftOutlined,
+  ReloadOutlined,
+  LaptopOutlined,
+  SearchOutlined,
+} from "@ant-design/icons-vue";
+
+interface BreadcrumbItem {
+  value: string;
+  displayName: string;
+}
+
+const props = defineProps<{
+  pathStack: BreadcrumbItem[];
+  rootPath: string;
+  loading: boolean;
+}>();
+
+const emit = defineEmits([
+  "go-top",
+  "go-back",
+  "refresh",
+  "search",
+  "breadcrumb-click",
+]);
+
+const searchKeyword = ref("");
+
+const canGoTop = computed(() => {
+  return props.pathStack.length > 1;
+});
+
+const canGoBack = computed(() => {
+  return props.pathStack.length > 1;
+});
+
+const breadcrumbItems = computed(() => {
+  return props.pathStack;
+});
+
+const onSearch = () => {
+  emit("search", searchKeyword.value);
+};
+
+const onBreadcrumbClick = (item: BreadcrumbItem, index: number) => {
+  emit("breadcrumb-click", item, index);
+};
+</script>
+
+<style lang="less">
+.toolbar {
+  display: flex;
+  align-items: center;
+  padding: 6px 12px;
+  background: #fafafa;
+  border-bottom: 1px solid #e8e8e8;
+  gap: 12px;
+}
+
+.toolbar-left {
+  display: flex;
+  gap: 2px;
+  flex-shrink: 0;
+}
+
+.nav-btn {
+  width: 36px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 4px;
+}
+
+.nav-btn:hover:not(:disabled) {
+  background: #e6f4ff;
+  color: #1677ff;
+}
+
+.nav-btn:disabled {
+  color: #bfbfbf;
+}
+
+.toolbar-center {
+  flex: 1;
+  overflow: hidden;
+}
+
+.breadcrumb {
+  margin: 0;
+  font-size: 14px;
+}
+
+.breadcrumb-item.clickable {
+  cursor: pointer;
+}
+.breadcrumb-item.clickable:hover {
+  color: #1677ff;
+}
+
+.toolbar-right {
+  flex-shrink: 0;
+}
+
+
+
+</style>
diff --git a/WebVue/src/injections/security/operation-to-enquiry.ts b/WebVue/src/injections/security/operation-to-enquiry.ts
index 6d3eb9a..399137f 100644
--- a/WebVue/src/injections/security/operation-to-enquiry.ts
+++ b/WebVue/src/injections/security/operation-to-enquiry.ts
@@ -11,6 +11,9 @@ export class OperationToEnquiryModelOption {
   public isModalFunction?: boolean = false;
   public isModalTree?: boolean = false; //家谱树查询
   public isModalPerson?: boolean = false; //族员人员查询
+  public isModalPhoto?: boolean = false; 
+  public isModalVideo?: boolean = false; 
+  public isModalAudio?: boolean = false; 
   public initBindOptionsUser?: BindOption[] = []; //初始化查询条件的值
   public initBindOptionsGroup?: BindOption[] = [];
   public initBindOptionsActor?: BindOption[] = [];
diff --git a/WebVue/src/md/injections.md b/WebVue/src/md/injections.md
index a6384fa..0ccf341 100644
--- a/WebVue/src/md/injections.md
+++ b/WebVue/src/md/injections.md
@@ -14,7 +14,7 @@ provide(
     }
 );
 # 子组件：
-const actorOperationMethod = inject(operationToEnquiryMethodKey);
+const actorOperationMethod =inject(operationToEnquiryMethodKey, undefined);
 const modelOption = actorOperationMethod?.getOperationToEnquiryModelOption() as OperationToEnquiryModelOption;
 
 const isModal = ref(modelOption ? modelOption.isModalActor : false);
diff --git a/WebVue/src/views/login/changeLocalName.vue b/WebVue/src/views/login/changeLocalName.vue
index fd4d2c5..f0caa23 100644
--- a/WebVue/src/views/login/changeLocalName.vue
+++ b/WebVue/src/views/login/changeLocalName.vue
@@ -1,6 +1,6 @@
 <template>
     <a-spin size="large" :spinning="state.loading">
-        <a-modal v-model:open="props.showModel" title="修改用户名称" @cancel="emit('update:showModel', false)"
+        <a-modal v-model:open="innerShow" title="修改用户名称" @cancel="emit('update:showModel', false)"
             @ok="handleSubmit">
             <a-form name="basic" autocomplete="off" :label-col="{ span: 8 }" :rules="rules" :model="state.data"
                 ref="formRef">
@@ -38,15 +38,26 @@ const state = reactive({
 });
 
 const props = defineProps(['showModel']);
-const emit = defineEmits(['update:showModel']);
 
-computed({
-    get() {
-        return props.showModel;
-    },
-    set(value) {
-        emit('update:showModel', value);
-    }
+const emit = defineEmits<{
+  "update:showModel": [val: boolean];
+}>();
+
+// ✅ 内部代理变量，避开直接修改props只读对象
+const innerShow = ref(false);
+
+// props改变同步到内部变量（父组件打开弹窗时同步）
+watch(
+  () => props.showModel,
+  (val) => {
+    innerShow.value = val;
+  },
+  { immediate: true }
+);
+
+// 内部弹窗状态变化，通知父组件更新props
+watch(innerShow, (val) => {
+  emit("update:showModel", val);
 });
 
 const validatePass = async (_rule: Rule, value: string) => {
diff --git a/WebVue/src/views/login/changePassword.vue b/WebVue/src/views/login/changePassword.vue
index 8a1403d..d9d1ddc 100644
--- a/WebVue/src/views/login/changePassword.vue
+++ b/WebVue/src/views/login/changePassword.vue
@@ -1,6 +1,6 @@
 <template>
   <a-spin size="large" :spinning="state.loading">
-    <a-modal v-model:open="props.showModel" :title="t('login.changePassword.changePassword')"
+    <a-modal v-model:open="innerShow" :title="t('login.changePassword.changePassword')"
       @cancel="emit('update:showModel', false)" @ok="handleSubmit">
       <a-form name="basic" autocomplete="off" :label-col="{ span: 8 }" :rules="rules" :model="state.LoginData"
         ref="formRef">
@@ -59,16 +59,22 @@ const state = reactive({
 });
 
 const props = defineProps(['showModel']);
-const emit = defineEmits(['update:showModel']);
 
-computed({
-  get() {
-    return props.showModel;
+const emit = defineEmits<{
+  "update:showModel": [val: boolean];
+}>();
+
+// ✅ 内部代理变量，避开直接修改props只读对象
+const innerShow = ref(false);
+
+// props改变同步到内部变量（父组件打开弹窗时同步）
+watch(
+  () => props.showModel,
+  (val) => {
+    innerShow.value = val;
   },
-  set(value) {
-    emit('update:showModel', value);
-  }
-});
+  { immediate: true }
+);
 
 const validatePass = async (_rule: Rule, value: string) => {
   if (value !== state.LoginData.UserPassword) {
diff --git a/WebVue/src/views/master/DmsFileEnquiry.vue b/WebVue/src/views/master/DmsFileEnquiry.vue
index cea6801..1e96711 100644
--- a/WebVue/src/views/master/DmsFileEnquiry.vue
+++ b/WebVue/src/views/master/DmsFileEnquiry.vue
@@ -1,342 +1,51 @@
 <template>
   <a-spin size="large" :spinning="loading" :tip="spinTip">
-    <search
-      @on-submit="onSubmit"
-      @on-print="onPrint"
-      @on-reset="onReset"
-      @use-pagination="onPagination"
-      rowSelectionType="checkbox"
-      :loading="loading"
-      :pagination="result"
-      @on-select-change="onSelectChange"
-    >
-      <template #control>
-        <a-button
-          type="primary"
-          v-if="canCreate"
-          :icon="h(FolderAddOutlined)"
-          @click.prevent="onCreate"
-          >新增</a-button
-        >
-        <a-upload
-          v-if="canCreate"
-          v-model:file-list="fileList"
-          name="file"
-          :before-upload="beforeUpload"
-          :headers="headers"
-          :showUploadList="false"
-          :action="uploadUrl"
-        >
-          <a-button type="primary">
-            <upload-outlined></upload-outlined>
-            上传
-          </a-button>
-        </a-upload>
-      </template>
+    <div class="dms-file-enquiry">
+      <Toolbar
+        :path-stack="pathStack"
+        :root-path="rootPath"
+        :loading="loading"
+        @go-top="onGoTop"
+        @go-back="onGoBack"
+        @refresh="onReSearch"
+        @search="onSearchByName"
+        @breadcrumb-click="onBreadcrumbClick"
+      />
 
-      <template #headerCell="{ column }">
-        <template v-if="column.dataIndex === DmsFileUploadViewDisplayData.URL">
-          <span
-            style="color: darkgoldenrod; font-size: large; cursor: pointer"
-            @click.prevent="onChangeFolder(rootPath)"
-          >
-            <LaptopOutlined
-              style="color: darkgoldenrod; font-size: larger"
-              title="返回顶层"
-            />返回顶层
-          </span>
-          <span
-            style="color: darkgoldenrod; font-size: large; cursor: pointer"
-            @click.prevent="onLastFolder()"
-          >
-            <ArrowUpOutlined
-              style="color: darkgoldenrod; font-size: larger; margin-left: 16px"
-              title="返回上层"
-            />
-            返回上层
-          </span>
-        </template>
-      </template>
+      <OperatorStation
+        :selected-items="keys"
+        :upload-url="uploadUrl"
+        :headers="headers"
+        :can-create="canCreate"
+        :can-amend="canAmend"
+        :can-delete="canDelete"
+        :can-view="canView"
+        @create-folder="onCreate"
+        @before-upload="beforeUpload"
+        @download="onDownloadSelected"
+        @share="onShareSelected"
+        @publish="onPublishSelected"
+        @view-preview="onViewPreviewSelected"
+        @play-video="onUrlVideoPlayItem"
+        @play-audio="onPlayAudioItem"
+        @pause-audio="onPauseAudio"
+        @continue-audio="onContinueAudio"
+        @preview="onPreviewSelected"
+        @rename="onAmendSelected"
+        @move="onMoveSelected"
+        @delete="onDeleteSelected"
+      />
 
-      <template #bodyCell="{ column, record, index }">
-        <template v-if="column.dataIndex === DmsFileUploadViewDisplayData.URL">
-          <template v-if="!fileTypePolicy.isImage(record.OrderKey)">
-            <template v-if="record.IsDirectoryIndc == 'Y'">
-              <a-card hoverable style="width: 300px">
-                <a-card-meta>
-                  <template #description>
-                    <span
-                      style="
-                        color: darkgoldenrod;
-                        margin-left: 4pxr;
-                        cursor: pointer;
-                        font-size: 26px;
-                      "
-                      @click.prevent="onChangeFolder(record.FileName)"
-                    >
-                      <FolderOutlined
-                        style="color: darkgoldenrod; font-size: 48px"
-                        title="打开文件夹"
-                      />{{ record.OrgFileName }}
-                    </span>
-                  </template>
-                </a-card-meta>
-                <template #actions> </template>
-              </a-card>
-            </template>
-            <template v-else-if="fileTypePolicy.isVideo(record.OrderKey)">
-              <a-card style="width: 300px">
-                <template #cover>
-                  <img
-                    style="height: 200px"
-                    :src="record.FormattedPic.replace('.m3u8', '.png')"
-                    :title="record.OrgFileName"
-                  />
-                </template>
-                <a-card-meta>
-                  <template #description>
-                    <a-flex>
-                      <cust-icon-font
-                        size="26"
-                        type="icon-foldervideo"
-                        v-if="record.TranscodeIndc == 'Y'"
-                        @click.prevent="
-                          onUrlVideoPlay(
-                            record.Url,
-                            record.OrgFileName,
-                            record.FormattedPic.replace('.m3u8', '.png'),
-                          )
-                        "
-                      />
-                      <span
-                        style="
-                          color: darkgoldenrod;
-                          margin-left: 4pxr;
-                          margin-top: 2px;
-                        "
-                      >
-                        {{ record.OrgFileName }}
-                      </span>
-                    </a-flex>
-                  </template>
-                </a-card-meta>
-                <template #actions>
-                  <cust-icon-font
-                    size="26"
-                    type="icon-mp3-play"
-                    @click.prevent="onVideoPlay(record.FileId)"
-                  />
-                  <ShareAltOutlined
-                    style="color: rgb(19, 185, 190); font-size: larger"
-                    title="内部分享"
-                    @click.prevent="onShareFamily(record)"
-                  />
-                  <NotificationOutlined
-                    style="color: rgb(19, 185, 190); font-size: larger"
-                    title="专辑发布"
-                    @click.prevent="onPublishVideo(record.FileId)"
-                  />
-                  <UnorderedListOutlined
-                    style="color: rgb(19, 185, 190); font-size: larger"
-                    title="影视厅"
-                    @click.prevent="onViewVideoPreview(record.FilePath)"
-                  />
-                </template>
-              </a-card>
-            </template>
-            <template v-else-if="fileTypePolicy.isAudio(record.OrderKey)">
-              <a-card hoverable style="width: 300px">
-                <a-flex>
-                  <cust-icon-font
-                    size="60"
-                    type="icon-foldermp3"
-                    @click.prevent="onPlayAudio(toUploadView(record))"
-                  />
-                  <span
-                    style="
-                      color: darkgoldenrod;
-                      margin-left: 4pxr;
-                      margin-top: 10px;
-                    "
-                  >
-                    {{ record.OrgFileName }}
-                  </span>
-                  <div
-                    v-if="record.IsPlay == 'Y'"
-                    style="margin-left: 16px; height: 60px; width: 60px"
-                    :class="record.IsPause == '' ? 'rotating-element' : ''"
-                  >
-                    <cust-icon-font
-                      size="60"
-                      type="icon-playmp3"
-                      v-if="record.IsPause == ''"
-                      @click.prevent="onPauseAudio(toUploadView(record))"
-                    />
-                    <cust-icon-font
-                      size="54"
-                      type="icon-mp3-play"
-                      style="color: #ff7878"
-                      v-if="record.IsPlay == 'Y' && record.IsPause == 'Y'"
-                      @click.prevent="onContinueAudio(toUploadView(record))"
-                    />
-                  </div>
-                </a-flex>
+      <MyComputer
+        :datas="datas"
+        v-model:selected-keys="keys"
+        @select-change="onSelectChange"
+        @open-folder="onOpenFolder"
+        @open-file="onOpenFile"
+        @preview-image="onPreviewOrgFile"
+      />
+    </div>
 
-                <template #actions>
-                  <DownloadOutlined
-                    style="color: rgb(19, 185, 190); font-size: larger"
-                    title="下载"
-                    @click.prevent="
-                      onDownloadFile(record.FileId, record.OrgFileName)
-                    "
-                  />
-                  <ShareAltOutlined
-                    style="color: rgb(19, 185, 190); font-size: larger"
-                    title="内部分享"
-                    @click.prevent="onShareFamily(record)"
-                  />
-                  <NotificationOutlined
-                    style="color: rgb(19, 185, 190); font-size: larger"
-                    title="专辑发布"
-                    @click.prevent="onPublishAudio(record.FileId)"
-                  />
-                  <UnorderedListOutlined
-                    style="color: rgb(19, 185, 190); font-size: larger"
-                    title="音乐厅"
-                    @click.prevent="onViewAudioPreview(record.FilePath)"
-                  />
-                </template>
-              </a-card>
-            </template>
-            <template v-else>
-              <DownloadOutlined
-                style="
-                  color: rgb(19, 185, 190);
-                  font-size: larger;
-                  margin-right: 12px;
-                "
-                title="下载"
-                @click.prevent="
-                  onDownloadFile(record.FileId, record.OrgFileName)
-                "
-              />
-              <span>{{ record.OrgFileName }} </span>
-            </template>
-          </template>
-          <template v-else>
-            <a-card style="width: 300px">
-              <template #cover>
-                <img
-                  style="height: 220px; object-fit: cover"
-                  :src="record.Url"
-                  :title="record.OrgFileName"
-                  @click="onPreviewFile(record.CreatedBy, record.OrderKey)"
-                />
-              </template>
-              <a-card-meta>
-                <template #description>
-                  <span
-                    style="color: darkgoldenrod; margin-left: 4pxr"
-                    @click.prevent="
-                      onViewPictureFile(record.FileId, record.OrgFileName)
-                    "
-                  >
-                    <cust-icon-font size="26" type="icon-source-pic" />
-                    {{ record.OrgFileName }}
-                  </span>
-                </template>
-              </a-card-meta>
-              <template #actions>
-                <DownloadOutlined
-                  style="color: rgb(19, 185, 190); font-size: larger"
-                  title="原图下载"
-                  @click.prevent="
-                    onDownloadFile(record.FileId, record.OrgFileName)
-                  "
-                />
-                <ShareAltOutlined
-                  style="color: rgb(19, 185, 190); font-size: larger"
-                  title="内部分享"
-                  @click.prevent="onShareFamily(record)"
-                />
-                <NotificationOutlined
-                  style="color: rgb(19, 185, 190); font-size: larger"
-                  title="相册发布"
-                  @click.prevent="onPublishPhoto(record.FileId)"
-                />
-                <UnorderedListOutlined
-                  style="color: rgb(19, 185, 190); font-size: larger"
-                  title="相册展览"
-                  @click.prevent="onViewPhotoPreview(record.FilePath)"
-                />
-              </template>
-            </a-card>
-          </template>
-        </template>
-      </template>
-
-      <template #footer>
-        <div class="page-footer">
-          <a-row :gutter="24">
-            <a-col :lg="24" :sm="24">
-              <a-row v-if="isEdit" :gutter="[16, 8]">
-                <a-space>
-                  <a-button type="primary" @click.prevent="onCancel"
-                    >取消</a-button
-                  >
-                  <a-button type="primary" @click.prevent="onSave"
-                    >确定</a-button
-                  >
-                </a-space>
-              </a-row>
-              <a-row v-if="!isEdit" :gutter="[16, 8]">
-                <a-space>
-                  <a-button
-                    type="primary"
-                    v-if="canAmend"
-                    :icon="h(FileImageOutlined)"
-                    :disabled="!(keys && keys.length > 0)"
-                    @click.prevent="onViewPic"
-                    >预览</a-button
-                  >
-                  <a-button
-                    type="primary"
-                    v-if="canAmend"
-                    :icon="h(EditOutlined)"
-                    :disabled="!(keys && keys.length > 0)"
-                    @click.prevent="onAmend"
-                    >重命名</a-button
-                  >
-                  <a-button
-                    type="primary"
-                    v-if="canView"
-                    :icon="h(ScissorOutlined)"
-                    :disabled="!(keys && keys.length > 0)"
-                    @click.prevent="onMove"
-                    >移动</a-button
-                  >
-                  <a-popconfirm
-                    title="确定是否删除这条记录?"
-                    ok-text="是"
-                    cancel-text="否"
-                    @confirm="onDelete"
-                  >
-                    <a-button
-                      type="primary"
-                      danger
-                      :icon="h(DeleteOutlined)"
-                      v-if="canDelete"
-                      :disabled="!(keys && keys.length > 0)"
-                      >删除</a-button
-                    >
-                  </a-popconfirm>
-                </a-space>
-              </a-row>
-            </a-col>
-          </a-row>
-        </div>
-      </template>
-    </search>
     <a-image
       :width="1024"
       :style="{ display: 'none' }"
@@ -345,7 +54,6 @@
         onVisibleChange: setPicVisible,
       }"
       :src="imageSrc"
-      @click="visible = true"
     />
     <dmsFolder @on-submit="onReload"></dmsFolder>
     <videoPlay></videoPlay>
@@ -367,7 +75,7 @@
       :fullscreen="width < 640"
       @ok="handleSelectPublishPhoto"
     >
-      <PublishPhotoEnquiry ref="publishPhotoEnquiry"> </PublishPhotoEnquiry>
+      <PublishPhotoEnquiry ref="publishPhotoEnquiry"></PublishPhotoEnquiry>
     </dragModal>
     <dragModal
       v-model:open="showModalPublishAudio"
@@ -377,7 +85,7 @@
       :fullscreen="width < 640"
       @ok="handleSelectPublishAudio"
     >
-      <PublishAudioEnquiry ref="publishAudioEnquiry"> </PublishAudioEnquiry>
+      <PublishAudioEnquiry ref="publishAudioEnquiry"></PublishAudioEnquiry>
     </dragModal>
     <dragModal
       v-model:open="showModalPublishVideo"
@@ -387,7 +95,7 @@
       :fullscreen="width < 640"
       @ok="handleSelectPublishVideo"
     >
-      <PublishVideoEnquiry ref="publishVideoEnquiry"> </PublishVideoEnquiry>
+      <PublishVideoEnquiry ref="publishVideoEnquiry"></PublishVideoEnquiry>
     </dragModal>
   </a-spin>
 </template>
@@ -395,39 +103,16 @@
 <script setup lang="ts">
 import {
   reactive,
-  inject,
-  defineComponent,
   onMounted,
   onUnmounted,
   ref,
   unref,
-  provide,
   h,
-  computed,
+  provide,
 } from "vue";
 import { BindOption } from "@/data/custom/bindOption";
 import { SelectOption } from "@/data/auto/selectOption";
-import search from "@/components/basic/Search.vue";
-import {
-  DeleteOutlined,
-  EditOutlined,
-  LaptopOutlined,
-  ShareAltOutlined,
-  ScissorOutlined,
-  UploadOutlined,
-  FolderAddOutlined,
-  DownloadOutlined,
-  FolderOutlined,
-  FileImageOutlined,
-  NotificationOutlined,
-  CrownOutlined,
-  ArrowUpOutlined,
-  PictureOutlined,
-  UnorderedListOutlined,
-} from "@ant-design/icons-vue";
-import { DmsFileEntity } from "@/data/auto/dmsFileEntity";
-import { DmsFileResultData } from "@/data/auto/dmsFileResultData";
-
+import { DmsFileUploadViewDisplayData } from "@/data/auto/dmsFileUploadViewDisplayData";
 import { SearchFilter } from "@/data/auto/searchFilter";
 import dmsFileService from "@/service/master/dmsFileService";
 import publishPhotoService from "@/service/master/publishPhotoService";
@@ -438,83 +123,58 @@ import DmsFileShareModal from "./DmsFileShareModal.vue";
 import PublishPhotoEnquiry from "./PublishPhotoEnquiry.vue";
 import PublishAudioEnquiry from "./PublishAudioEnquiry.vue";
 import PublishVideoEnquiry from "./PublishVideoEnquiry.vue";
-import { FamilyFolderFavoriteViewEntity } from "@/data/auto/familyFolderFavoriteViewEntity";
-import { PublishPhotoDetailEntity } from "@/data/auto/publishPhotoDetailEntity";
 import { FamilyGroupFolderEntity } from "@/data/auto/familyGroupFolderEntity";
-import { SearchCriteriaResultData } from "@/data/auto/searchCriteriaResultData";
 import {
   PermissionContext,
   usePermissionContext,
 } from "@/hooks/PermissionContext";
 import { useRoute, useRouter } from "vue-router";
-
 import { useBindOption } from "@/hooks/useBindOption";
 import { SearchFilterOperatorPolicy } from "@/data/custom/searchFilterOperatorPolicy";
 import { SearchFilterTypePolicy } from "@/data/custom/searchFilterTypePolicy";
 import { notification } from "ant-design-vue";
-import { GridColumnInfo } from "@/data/auto/gridColumnInfo";
-import { useGridColumnInfo } from "@/hooks/gridColumnInfo";
+import { SearchCriteriaResultData } from "@/data/auto/searchCriteriaResultData";
 import dmsFolder from "./DmsFolderModal.vue";
-
 import { useLoginProfileStore } from "@/store/modules/loginProfile";
 import type { UploadProps } from "ant-design-vue";
 import { WebSitePolicy } from "@/policy/custom/webSitePolicy";
 import { orderBy } from "lodash-es";
-import { bsInfo } from "@/utils/browser";
 import axios from "axios";
-import { getuid } from "process";
 import VideoPlay from "./PlayVideo.vue";
-import {
-  enquiryMethodKey,
-  searchCriteriaManagerKey,
-  masterOperationToEnquiryMethodKey,
-  MasterOperationToEnquiryModelOption,
-  layoutProviderMethodKey,
-} from "@/injections";
-import { useOrderedChildren } from "@/hooks/use-ordered-children";
-import { SearchCriteriaContext } from "@/injections";
-import { Howl, Howler } from "howler";
-import { on } from "events";
-import { PublishPhotoEntity } from "@/data/auto/publishPhotoEntity";
-import { PublishData } from "@/data/auto/publishData";
+import { Howl } from "howler";
+import { PublishVideoEntity } from "@/data/auto/publishVideoEntity";
+import publishVideoService from "@/service/master/publishVideoService";
 import { useWindowSize } from "@vueuse/core";
 import fileTypePolicy from "@/policy/custom/fileTypePolicy";
 import { PublishAudioEntity } from "@/data/auto/publishAudioEntity";
-import { DmsFileUploadViewDisplayData } from "@/data/auto/dmsFileUploadViewDisplayData";
 import { v4 as uuidv4 } from "uuid";
-import { PublishVideoEntity } from "@/data/auto/publishVideoEntity";
-import publishVideoService from "@/service/master/publishVideoService";
-import { useYesNoPolicy } from "@/hooks/useYesNoPolicy";
+import { FamilyFolderFavoriteViewEntity } from "@/data/auto/familyFolderFavoriteViewEntity";
+import { DmsFileEntity } from "@/data/auto/dmsFileEntity";
+import { PublishData } from "@/data/auto/publishData";
+import { PublishPhotoEntity } from "@/data/auto/publishPhotoEntity";
 
-//page from-----------------------------------------------------------------------------------------------------------------------------------
-//================inject================
-//报表名称
-const layoutProviderMethod = inject(layoutProviderMethodKey);
+import MyComputer from "@/components/basic/MyComputer.vue";
+import Toolbar from "@/components/basic/Toolbar.vue";
+import OperatorStation from "@/components/basic/OperatorStation.vue";
 
-//================inject================
-
-const { width, height } = useWindowSize();
-
-const widthColumn = ref<string>("3%");
-if (bsInfo.size.sm) {
-  widthColumn.value = "8%";
-} else {
-  widthColumn.value = "3%";
+interface BreadcrumbItem {
+  value: string;
+  displayName: string;
 }
+
+const { width } = useWindowSize();
+
 const showModalShare = ref<boolean>(false);
-// 点击「内部分享」时所在行的 record，供 handleSelectShare 使用
 const sharedFileRecord = ref<DmsFileUploadViewDisplayData | null>(null);
 const showModalPublishPhoto = ref<boolean>(false);
 const showModalPublishAudio = ref<boolean>(false);
 const showModalPublishVideo = ref<boolean>(false);
-const spinTip = ref<string>("加載中...");
+const spinTip = ref<string>("加载中...");
 const loading = ref<boolean>(false);
-const isEdit = ref<boolean>(false);
 const canView = ref<boolean>(false);
 const canAmend = ref<boolean>(false);
 const canDelete = ref<boolean>(false);
 const canCreate = ref<boolean>(false);
-const modalTitle = ref<string>("新增文件夹");
 const rootPath = ref<string>("");
 const imageSrc = ref<string>("");
 const route = useRoute();
@@ -537,30 +197,11 @@ const headers = ref({
   FilePath: currFilePath.value,
 });
 
-const columns = ref([
-  {
-    title: "",
-    dataIndex: DmsFileUploadViewDisplayData.URL,
-    sorter: false,
-    width: "50%",
-    sequence: 1,
-    hidden: "N",
-  },
-]);
-
-const viewOption = {
-  Value: "default",
-  SelectOptions: [{ BindValue: "default", DisplayName: "默认" }],
-  Columns: [{ BindValue: "default", BindColumn: columns }],
-};
-
 const bindOptions = ref<BindOption[]>([]);
 const datas = ref<DmsFileUploadViewDisplayData[]>([]);
-const pagingParams = ref<PagingParams>({ pageSize: 20, page: 1 });
+const pagingParams = ref<PagingParams>({ pageSize: 999999, page: 1 });
 const result = ref<SearchCriteriaResultData>(new SearchCriteriaResultData());
 
-const data = ref<DmsFileResultData>(new DmsFileResultData());
-
 const currentFilter = ref<SearchFilter[]>([]);
 const isSearched = ref<boolean>(false);
 const currentSearchCriteria = ref<DmsFileSearchCriteria>(
@@ -580,115 +221,33 @@ const videoType = ref<string>("");
 const videoPlayTitle = ref<string>("");
 const visible = ref<boolean>(false);
 
+const pathStack = ref<BreadcrumbItem[]>([]);
+
 interface PublishPhotoEnquiry {
   keys: PublishPhotoEntity[];
-  setBindOptionValue(
-    bindValue: string,
-    value: string,
-    value1: string,
-    values: string[],
-  ): void;
 }
-
 const publishPhotoEnquiry = ref<PublishPhotoEnquiry | null>(null);
 
 interface PublishAudioEnquiry {
   keys: PublishAudioEntity[];
-  setBindOptionValue(
-    bindValue: string,
-    value: string,
-    value1: string,
-    values: string[],
-  ): void;
 }
-
 const publishAudioEnquiry = ref<PublishAudioEnquiry | null>(null);
 
 interface PublishVideoEnquiry {
   keys: PublishVideoEntity[];
-  setBindOptionValue(
-    bindValue: string,
-    value: string,
-    value1: string,
-    values: string[],
-  ): void;
 }
-
 const publishVideoEnquiry = ref<PublishVideoEnquiry | null>(null);
 
 interface ShareEnquiry {
   keys: FamilyFolderFavoriteViewEntity[];
-  setBindOptionValue(
-    bindValue: string,
-    value: string,
-    value1: string,
-    values: string[],
-  ): void;
 }
-
 const shareEnquiry = ref<ShareEnquiry | null>(null);
 
-const {
-  children: items,
-  addChild: addItem,
-  removeChild: removeItem,
-} = useOrderedChildren<SearchCriteriaContext>();
-
-//================provide================
-//初始化查询条件UI
-provide("dmsFolderModal", dmsFolderModal);
-provide("dmsFolderTitle", dmsFolderTitle);
-provide("dmsFolderIsRename", dmsFolderIsRename);
-provide("dmsFolderIsMove", dmsFolderIsMove);
-provide("DmsFileEntity", entity);
-provide("isModalShare", showModalShare);
-provide("isModalPublishPhoto", showModalPublishPhoto);
-provide("isModalPublishAudio", showModalPublishAudio);
-provide("isModalPublishVideo", showModalPublishVideo);
-provide("selectionTypePublishPhoto", "checkbox");
-
-provide(enquiryMethodKey, {
-  getLayoutSetting: () => {
-    return {
-      controlLeft: 16,
-      controlRight: 8,
-      space: true,
-      soltLeft: 24,
-      soltRight: 24,
-    };
-  },
-  getBindOptions: () => {
-    return unref(bindOptions);
-  },
-  getViewOption: () => {
-    return unref(viewOption);
-  },
-  getDatas: () => {
-    return datas;
-  },
-});
-
-provide(
-  searchCriteriaManagerKey,
-  reactive({
-    items,
-    addItem,
-    removeItem,
-  }),
-);
-
-provide("videoPlayModal", videoPlayModal);
-provide("videoPlayTitle", videoPlayTitle);
-provide("videoSrc", videoSrc);
-provide("videoPoster", videoPoster);
-provide("videoType", videoType);
-//================provide================
-
 const sound = ref();
 
-// 表格 bodyCell 的 record 被透传为 Record<string, any>，转成具体展示类型
-const toUploadView = (r: Record<string, any>): DmsFileUploadViewDisplayData =>
-  r as DmsFileUploadViewDisplayData;
+const toUploadView = (
+  r: Record<string, any>,
+): DmsFileUploadViewDisplayData => r as DmsFileUploadViewDisplayData;
 
 onUnmounted(() => {
   sound.value?.stop();
@@ -707,17 +266,7 @@ const play = (src: string) => {
     loop: false,
     html5: true,
     preload: true,
-    onload: () => {
-      // console.log('loaded');
-    },
-    onplay: () => {
-      // console.log('play');
-    },
-    onpause: () => {
-      // console.log('pause');
-    },
     onend: () => {
-      // console.log('end');
       datas.value.forEach((element) => {
         element.IsPlay = "";
       });
@@ -729,12 +278,12 @@ const play = (src: string) => {
 
 const onPauseAudio = (record: DmsFileUploadViewDisplayData) => {
   record.IsPause = "Y";
-  sound.value.pause();
+  sound.value?.pause();
 };
 
 const onContinueAudio = (record: DmsFileUploadViewDisplayData) => {
   record.IsPause = "";
-  sound.value.play();
+  sound.value?.play();
 };
 
 const onPlayAudio = (record: DmsFileUploadViewDisplayData) => {
@@ -762,6 +311,22 @@ const onPlayAudio = (record: DmsFileUploadViewDisplayData) => {
   play(record.Url);
 };
 
+//================provide================
+provide("dmsFolderModal", dmsFolderModal);
+provide("dmsFolderTitle", dmsFolderTitle);
+provide("dmsFolderIsRename", dmsFolderIsRename);
+provide("dmsFolderIsMove", dmsFolderIsMove);
+provide("DmsFileEntity", entity);
+provide("videoPlayModal", videoPlayModal);
+provide("videoPlayTitle", videoPlayTitle);
+provide("videoSrc", videoSrc);
+provide("videoPoster", videoPoster);
+provide("videoType", videoType);
+provide("isModalPublishVideo", showModalPublishVideo);
+provide("isModalPublishAudio", showModalPublishAudio);
+provide("isModalPublishPhoto", showModalPublishPhoto);
+//================provide================
+
 defineExpose({
   keys,
 });
@@ -775,10 +340,17 @@ onMounted(async () => {
 
   await initBindOption();
 
+  pathStack.value = [
+    { value: rootPath.value, displayName: "我的云盘" },
+  ];
+
   onSearchByFilePath(rootPath.value);
 });
 
 const beforeUpload: UploadProps["beforeUpload"] = async (file) => {
+  if (!file || typeof file.size !== "number") {
+    return false;
+  }
   loading.value = true;
   fileList.value = [...(fileList.value || []), file];
   const chunks = splitFile(file);
@@ -849,10 +421,13 @@ const uploadChunk = async (
   }
 };
 
-const CHUNK_SIZE = 1024 * 1024; // 设置每个分片的大小为1MB
+const CHUNK_SIZE = 1024 * 1024;
 
 const splitFile = (file: any) => {
-  const chunks = [];
+  const chunks: Blob[] = [];
+  if (!file || typeof file.size !== "number" || typeof file.slice !== "function") {
+    return chunks;
+  }
   let start = 0;
   while (start < file.size) {
     const end = Math.min(start + CHUNK_SIZE, file.size);
@@ -867,20 +442,20 @@ const onSelectChange = (selected: DmsFileUploadViewDisplayData[]) => {
   keys.value = selected;
 };
 
-const onViewPhotoPreview = async (filePath: string) => {
-  router.push({ name: "Previews", params: { id: filePath, mode: "list" } });
+const onViewPreviewPhoto = async (filePath: string) => {
+  router.push({ name: "Preview", params: { id: filePath, mode: "list" } });
 };
 
-const onViewAudioPreview = async (filePath: string) => {
+const onViewPreviewAudio = async (filePath: string) => {
   router.push({
-    name: "AudioPreviews",
+    name: "PreviewAudio",
     params: { id: filePath, mode: "list" },
   });
 };
 
-const onViewVideoPreview = async (filePath: string) => {
+const onViewPreviewVideo = async (filePath: string) => {
   router.push({
-    name: "VideoPreviews",
+    name: "PreviewVideo",
     params: { id: filePath, mode: "list" },
   });
 };
@@ -902,7 +477,6 @@ const onUrlVideoPlay = (url: string, title: string, poster: string) => {
 };
 
 const onVideoPlay = async (fid: number) => {
-  //从服务器取出源视频
   dmsFileService
     .FindSourceVideoPath(fid)
     .then((res) => {
@@ -915,9 +489,38 @@ const onVideoPlay = async (fid: number) => {
     });
 };
 
-const onPreviewFile = async (username: string, orderKey: string) => {
+const onPreviewFile = async (
+  usernameOrRecord: any,
+  orderKey?: string,
+) => {
+  let username: string;
+  let fname: string;
+  if (typeof usernameOrRecord === "object") {
+    username = usernameOrRecord.CreatedBy;
+    fname = usernameOrRecord.OrderKey;
+  } else {
+    username = usernameOrRecord;
+    fname = orderKey!;
+  }
   loading.value = true;
-  getPreviewFile(username, orderKey);
+  getPreviewFile(username, fname);
+};
+
+const onPreviewOrgFile = async (
+  usernameOrRecord: any,
+  orderKey?: string,
+) => {
+  let fileId: number;
+  let orgFileName: string;
+  if (typeof usernameOrRecord === "object") {
+    fileId = usernameOrRecord.FileId;
+    orgFileName = usernameOrRecord.OrgFileName;
+  } else {
+    fileId = usernameOrRecord;
+    orgFileName = orderKey!;
+  }
+  loading.value = true;
+  onViewPictureFile(fileId, orgFileName);
 };
 
 const getPreviewFile = (username: string, fname: string) => {
@@ -937,7 +540,6 @@ const getPreviewFile = (username: string, fname: string) => {
     });
 };
 
-// 注意：不写 Uint8Array<ArrayBuffer>，该泛型语法需要 TS 5.7+，本项目实际是 TS 5.4.5
 const DownloadFileCombine = (
   fs: string[],
   mergedData: Uint8Array,
@@ -967,7 +569,6 @@ const DownloadFileCombine = (
       } else if (index == total) {
         loading.value = false;
         spinTip.value = "加载中...";
-        // TS 5.4 与 5.7+ 对 Uint8Array 是否属于 BlobPart 的判定不同，这里做无损断言兼容两者
         const downloadUrl = window.URL.createObjectURL(
           new Blob([mergedData as unknown as BlobPart]),
         );
@@ -1005,15 +606,15 @@ const onPreviousFolder = async () => {
   });
 };
 
-const onPublishPhoto = async (fid: number) => {
+const onPublishPhoto = async () => {
   showModalPublishPhoto.value = true;
 };
 
-const onPublishAudio = async (fid: number) => {
+const onPublishAudio = async () => {
   showModalPublishAudio.value = true;
 };
 
-const onPublishVideo = async (fid: number) => {
+const onPublishVideo = async () => {
   showModalPublishVideo.value = true;
 };
 
@@ -1032,7 +633,6 @@ const GetOrgPictureFile = async (
   preview: boolean,
 ) => {
   if (fileTypePolicy.isVideo(fname)) {
-    // onVideoPlay(keys.value[0].FileId);
     return;
   }
 
@@ -1076,6 +676,7 @@ const onSearchByFilePath = async (fvalue: string) => {
   );
   previousFilePath.value = unref(currFilePath.value);
   currFilePath.value = fvalue;
+  headers.value.FilePath = fvalue;
   isSearched.value = true;
   if (currentSearchCriteria.value && fvalue && fvalue.length > 0) {
     currentSearchCriteria.value.Filter = [];
@@ -1093,18 +694,6 @@ const onSearchByFilePath = async (fvalue: string) => {
   await findBySearchCriteria(unref(currentSearchCriteria));
 };
 
-const onReset = () => {
-  keys.value = [];
-  result.value.Total = 0;
-  setBindOptionValue(
-    DmsFileUploadViewDisplayData.DB_FILE_PATH,
-    rootPath.value,
-    "",
-    [rootPath.value],
-    false,
-  );
-};
-
 const onViewPic = () => {
   if (keys.value.length == 0) return;
   if (keys.value[0].IsDirectoryIndc == "Y") {
@@ -1197,14 +786,6 @@ const onDelete = async () => {
   onReload();
 };
 
-const onSave = () => {
-  isEdit.value = false;
-};
-
-const onCancel = () => {
-  isEdit.value = false;
-};
-
 const setBindOptionValue = (
   bindValue: string,
   value: string,
@@ -1222,7 +803,6 @@ const setBindOptionValue = (
   bindOption.disabled = disabled;
 };
 
-//初始化查询条件
 const initBindOption = async () => {
   let ubo = useBindOption();
   bindOptions.value = [];
@@ -1235,12 +815,9 @@ const initBindOption = async () => {
   );
   bindOptions.value.push(bindOption);
 
-  // bindOption = ubo.getBindOption(DmsFileUploadViewDisplayData.DB_FILE_PATH, '当前目录', SearchFilterTypePolicy.TEXT, SearchFilterOperatorPolicy.CONTAIN);
   let rps: SelectOption[] = await dmsFileService.FindDmsFolders();
   if (rps && rps.length > 1) {
     rootPath.value = rps[1].BindValue;
-    // 仅在首次初始化（还没有当前目录）时设置默认目录；
-    // onReload 等刷新场景保持 currFilePath（"当前目录"）不变
     if (!currFilePath.value) {
       currFilePath.value = rps[1].BindValue;
     }
@@ -1256,9 +833,6 @@ const initBindOption = async () => {
 
   bindOptions.value.push(bindOption);
 
-  // bindOption = ubo.getBindOption(DmsFileUploadViewDisplayData.DB_CREATED_DATETIME, '创建日期', SearchFilterTypePolicy.DATE, SearchFilterOperatorPolicy.DATE_BETWEEN);
-  // bindOptions.value.push(bindOption);
-
   setBindOptionValue(
     DmsFileUploadViewDisplayData.DB_FILE_PATH,
     currFilePath.value,
@@ -1268,8 +842,6 @@ const initBindOption = async () => {
   );
 };
 
-//table from-----------------------------------------------------------------------------------------------------------------------------------
-
 result.value.Page = pagingParams.value.page ?? 1;
 result.value.Limit = pagingParams.value.pageSize;
 
@@ -1287,23 +859,6 @@ const onSubmit = async (filters: SearchFilter[]) => {
   await findBySearchCriteria(c);
 };
 
-const onPrint = async () => {
-  loading.value = true;
-  let c: DmsFileSearchCriteria = new DmsFileSearchCriteria();
-  if (currentFilter.value.length > 0) c.Filter = currentFilter.value;
-  else c.Filter = [];
-
-  c.limit = pagingParams.value.pageSize;
-  c.page = pagingParams.value.page ?? 1;
-  c.GridColumns = useGridColumnInfo().getGridColumnInfo(unref(columns));
-  c.ReportName = layoutProviderMethod?.getLayoutProvider().layoutTitle!;
-  try {
-    let sss = await dmsFileService.PrintBySearchCriteria(c);
-  } catch (error) {
-    console.log(error);
-  }
-};
-
 const findBySearchCriteria = async (c: DmsFileSearchCriteria) => {
   keys.value = [];
   try {
@@ -1311,27 +866,27 @@ const findBySearchCriteria = async (c: DmsFileSearchCriteria) => {
     if (c.page == 0) c.page = pagingParams.value.page ?? 1;
 
     currentFilter.value = c.Filter;
-    data.value = await dmsFileService.FindBySearchCriteria(c);
+    let data = await dmsFileService.FindBySearchCriteria(c);
 
     isSearched.value = true;
-    result.value.Total = data.value.Total;
-    result.value.Page = data.value.Page;
-    result.value.Limit = data.value.Limit;
-    if (data.value.Datas)
-      data.value.Datas = orderBy(
-        data.value.Datas,
-        (x) => x.IsDirectoryIndc,
-        "desc",
-      );
-    datas.value = data.value.Datas;
+    result.value.Total = data.Total;
+    result.value.Page = data.Page;
+    result.value.Limit = data.Limit;
+    const rawList = data.Datas ?? [];
+    // 始终排序，空数组orderBy也安全
+    datas.value = orderBy(
+      rawList,
+      (x: DmsFileUploadViewDisplayData) => x.IsDirectoryIndc,
+      "desc",
+    );
     loading.value = false;
     if (
-      data.value.Datas &&
-      data.value.Datas.length > 0 &&
-      fileTypePolicy.isAudio(data.value.Datas[0].OrderKey)
+      data.Datas &&
+      data.Datas.length > 0 &&
+      fileTypePolicy.isAudio(data.Datas[0].OrderKey)
     ) {
-      onPlayAudio(data.value.Datas[0]);
-      onPauseAudio(data.value.Datas[0]);
+      onPlayAudio(data.Datas[0]);
+      onPauseAudio(data.Datas[0]);
     } else {
       sound.value?.stop();
     }
@@ -1341,31 +896,6 @@ const findBySearchCriteria = async (c: DmsFileSearchCriteria) => {
   }
 };
 
-const onPagination = async (params: PagingParams) => {
-  try {
-    if (!isSearched.value) return;
-
-    let c: DmsFileSearchCriteria = new DmsFileSearchCriteria();
-
-    if (currentFilter.value.length > 0) c.Filter = currentFilter.value;
-    else c.Filter = [];
-
-    c.limit = params.pageSize;
-    c.page = params.page ?? 1;
-    if (params.sortField) c.orderby = params.sortField!;
-    if (params.sortOrder)
-      c.orderbytag = params.sortOrder?.toString().substring(0, 4)!;
-    c.GridColumns = [];
-    loading.value = true;
-    currentSearchCriteria.value = c;
-
-    await findBySearchCriteria(c);
-  } catch (error) {
-    loading.value = false;
-    console.log(error);
-  }
-};
-
 const onReSearch = async () => {
   setBindOptionValue(
     DmsFileUploadViewDisplayData.DB_FILE_PATH,
@@ -1395,7 +925,6 @@ const onReload = async () => {
 const handleSelectShare = async () => {
   if (shareEnquiry.value) {
     if (shareEnquiry.value.keys.length > 0) {
-      //查询弹出
       let fgps: FamilyGroupFolderEntity[] = [];
       let fgp: FamilyGroupFolderEntity;
       shareEnquiry.value.keys.forEach((element) => {
@@ -1424,7 +953,6 @@ const handleSelectShare = async () => {
 const handleSelectPublishPhoto = async () => {
   if (publishPhotoEnquiry.value) {
     if (publishPhotoEnquiry.value.keys.length > 0) {
-      //查询弹出
       let data: PublishData;
       for (let i = 0; i < keys.value.length; i++) {
         data = new PublishData();
@@ -1453,7 +981,6 @@ const handleSelectPublishPhoto = async () => {
 const handleSelectPublishAudio = async () => {
   if (publishAudioEnquiry.value) {
     if (publishAudioEnquiry.value.keys.length > 0) {
-      //查询弹出
       let data: PublishData;
       for (let i = 0; i < keys.value.length; i++) {
         data = new PublishData();
@@ -1482,7 +1009,6 @@ const handleSelectPublishAudio = async () => {
 const handleSelectPublishVideo = async () => {
   if (publishVideoEnquiry.value) {
     if (publishVideoEnquiry.value.keys.length > 0) {
-      //查询弹出
       let data: PublishData;
       for (let i = 0; i < keys.value.length; i++) {
         data = new PublishData();
@@ -1508,32 +1034,163 @@ const handleSelectPublishVideo = async () => {
   }
 };
 
-//table end-----------------------------------------------------------------------------------------------------------------------------------
+const onGoTop = () => {
+  pathStack.value = [{ value: rootPath.value, displayName: "我的文件" }];
+  onSearchByFilePath(rootPath.value);
+};
+
+const onGoBack = () => {
+  if (pathStack.value.length > 1) {
+    pathStack.value.pop();
+    const prev = pathStack.value[pathStack.value.length - 1];
+    onSearchByFilePath(prev.value);
+  }
+};
+
+const onBreadcrumbClick = (item: BreadcrumbItem, index: number) => {
+  pathStack.value = pathStack.value.slice(0, index + 1);
+  onSearchByFilePath(item.value);
+};
+
+const onSearchByName = (keyword: string) => {
+  let c: DmsFileSearchCriteria = new DmsFileSearchCriteria();
+  let filters: SearchFilter[] = [];
+
+  let filePathFilter: SearchFilter = new SearchFilter();
+  filePathFilter.Column = DmsFileUploadViewDisplayData.DB_FILE_PATH;
+  filePathFilter.Type = "SingleSelection";
+  filePathFilter.Operator = "single";
+  filePathFilter.Value = currFilePath.value;
+  filters.push(filePathFilter);
+
+  if (keyword && keyword.trim()) {
+    let nameFilter: SearchFilter = new SearchFilter();
+    nameFilter.Column = DmsFileUploadViewDisplayData.DB_ORG_FILE_NAME;
+    nameFilter.Type = SearchFilterTypePolicy.TEXT;
+    nameFilter.Operator = SearchFilterOperatorPolicy.CONTAIN;
+    nameFilter.Value = keyword.trim();
+    filters.push(nameFilter);
+  }
+
+  c.Filter = filters;
+  c.limit = pagingParams.value.pageSize;
+  c.page = 1;
+  c.GridColumns = [];
+
+  currentSearchCriteria.value = c;
+  setBindOptionValue(
+    DmsFileUploadViewDisplayData.DB_FILE_PATH,
+    currFilePath.value,
+    "",
+    [currFilePath.value],
+    false,
+  );
+  pagingParams.value.page = 1;
+  findBySearchCriteria(c);
+};
+
+const onOpenFolder = (record: DmsFileUploadViewDisplayData) => {
+  if (record.IsDirectoryIndc == "Y") {
+    pathStack.value.push({
+      value: record.FileName,
+      displayName: record.OrgFileName,
+    });
+    onChangeFolder(record.FileName);
+  }
+};
+
+const onOpenFile = (record: DmsFileUploadViewDisplayData) => {
+  if (fileTypePolicy.isImage(record.OrgFileName)) {
+    onPreviewFile(record.CreatedBy, record.OrderKey);
+  } else if (fileTypePolicy.isVideo(record.OrgFileName)) {
+    onVideoPlay(record.FileId);
+  } else if (fileTypePolicy.isAudio(record.OrgFileName)) {
+    onPlayAudio(toUploadView(record));
+  } else {
+    onDownloadFile(record.FileId, record.OrgFileName);
+  }
+};
+
+const onDownloadSelected = (items: DmsFileUploadViewDisplayData[]) => {
+  items.forEach((item) => {
+    if (item.IsDirectoryIndc != "Y") {
+      onDownloadFile(item.FileId, item.OrgFileName);
+    }
+  });
+};
+
+const onShareSelected = (items: DmsFileUploadViewDisplayData[]) => {
+  if (items.length > 0) {
+    onShareFamily(items[0]);
+  }
+};
+
+const onPublishSelected = (items: DmsFileUploadViewDisplayData[]) => {
+  if (items.length === 0) return;
+  const first = items[0];
+  if (fileTypePolicy.isImage(first.OrderKey) || fileTypePolicy.isImage(first.OrgFileName)) {
+    onPublishPhoto();
+  } else if (fileTypePolicy.isVideo(first.OrderKey) || fileTypePolicy.isVideo(first.OrgFileName)) {
+    onPublishVideo();
+  } else if (fileTypePolicy.isAudio(first.OrderKey) || fileTypePolicy.isAudio(first.OrgFileName)) {
+    onPublishAudio();
+  }
+};
+
+const onViewPreviewSelected = (items: DmsFileUploadViewDisplayData[]) => {
+  if (items.length === 0) return;
+  const first = items[0];
+  if (fileTypePolicy.isImage(first.OrderKey) || fileTypePolicy.isImage(first.OrgFileName)) {
+    onViewPreviewPhoto(first.FilePath);
+  } else if (fileTypePolicy.isVideo(first.OrderKey) || fileTypePolicy.isVideo(first.OrgFileName)) {
+    onViewPreviewVideo(first.FilePath);
+  } else if (fileTypePolicy.isAudio(first.OrderKey) || fileTypePolicy.isAudio(first.OrgFileName)) {
+    onViewPreviewAudio(first.FilePath);
+  }
+};
+
+const onUrlVideoPlayItem = (record: DmsFileUploadViewDisplayData) => {
+  onUrlVideoPlay(
+    record.Url,
+    record.OrgFileName,
+    record.FormattedPic.replace(".m3u8", ".png"),
+  );
+};
+
+const onPlayAudioItem = (record: DmsFileUploadViewDisplayData) => {
+  onPlayAudio(record);
+};
+
+const onPreviewSelected = (items: DmsFileUploadViewDisplayData[]) => {
+  if (items.length > 0) {
+    keys.value = items;
+    onViewPic();
+  }
+};
+
+const onAmendSelected = (items: DmsFileUploadViewDisplayData[]) => {
+  if (items.length === 1) {
+    keys.value = items;
+    onAmend();
+  }
+};
+
+const onMoveSelected = (items: DmsFileUploadViewDisplayData[]) => {
+  if (items.length === 1) {
+    keys.value = items;
+    onMove();
+  }
+};
+
+const onDeleteSelected = () => {
+  onDelete();
+};
 </script>
 
 <style scoped>
-.folder-list {
-  height: 80px;
-  width: 90vw;
-  border-bottom: 1px solid #ccc;
-}
-
-.folder-right {
-  position: relative;
-  right: 0;
-}
-
-@keyframes rotate {
-  from {
-    transform: rotate(0deg);
-  }
-
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-.rotating-element {
-  animation: rotate 2s linear infinite;
+.dms-file-enquiry {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - 120px);
 }
 </style>
diff --git a/WebVue/src/views/master/FamilyGroupShare.vue b/WebVue/src/views/master/FamilyGroupShare.vue
index 1f9fc8e..c2cdd4f 100644
--- a/WebVue/src/views/master/FamilyGroupShare.vue
+++ b/WebVue/src/views/master/FamilyGroupShare.vue
@@ -630,7 +630,7 @@ onMounted(async () => {
 
 const onViewPreview = async () => {
   router.push({
-    name: "Previews",
+    name: "Preview",
     params: { id: currentFamilyName.value, mode: "view" },
   });
 };
diff --git a/WebVue/src/views/master/FamilyPersonEnquiry.vue b/WebVue/src/views/master/FamilyPersonEnquiry.vue
index 833ac47..c790dd9 100644
--- a/WebVue/src/views/master/FamilyPersonEnquiry.vue
+++ b/WebVue/src/views/master/FamilyPersonEnquiry.vue
@@ -123,7 +123,7 @@ import {
 } from "@/injections";
 //page from-----------------------------------------------------------------------------------------------------------------------------------
 //================inject================
-const actorOperationMethod = inject(operationToEnquiryMethodKey);
+const actorOperationMethod = inject(operationToEnquiryMethodKey, undefined);
 const modelOption =
   actorOperationMethod?.getOperationToEnquiryModelOption() as OperationToEnquiryModelOption;
 
diff --git a/WebVue/src/views/master/FamilyTreeEnquiry.vue b/WebVue/src/views/master/FamilyTreeEnquiry.vue
index f0235d2..d99fcf4 100644
--- a/WebVue/src/views/master/FamilyTreeEnquiry.vue
+++ b/WebVue/src/views/master/FamilyTreeEnquiry.vue
@@ -68,7 +68,7 @@ import { SearchCriteriaContext } from "@/injections";
 //报表名称(layout)
 const layoutProviderMethod = inject(layoutProviderMethodKey);
 
-const actorOperationMethod = inject(operationToEnquiryMethodKey);
+const actorOperationMethod =inject(operationToEnquiryMethodKey, undefined);
 const modelOption = actorOperationMethod?.getOperationToEnquiryModelOption() as OperationToEnquiryModelOption;
 
 const isModal = ref(modelOption ? modelOption.isModalTree : false);
diff --git a/WebVue/src/views/master/OrgDmsFileEnquiry.vue b/WebVue/src/views/master/OrgDmsFileEnquiry.vue
new file mode 100644
index 0000000..308995f
--- /dev/null
+++ b/WebVue/src/views/master/OrgDmsFileEnquiry.vue
@@ -0,0 +1,1539 @@
+<template>
+  <a-spin size="large" :spinning="loading" :tip="spinTip">
+    <search
+      @on-submit="onSubmit"
+      @on-print="onPrint"
+      @on-reset="onReset"
+      @use-pagination="onPagination"
+      rowSelectionType="checkbox"
+      :loading="loading"
+      :pagination="result"
+      @on-select-change="onSelectChange"
+    >
+      <template #control>
+        <a-button
+          type="primary"
+          v-if="canCreate"
+          :icon="h(FolderAddOutlined)"
+          @click.prevent="onCreate"
+          >新增</a-button
+        >
+        <a-upload
+          v-if="canCreate"
+          v-model:file-list="fileList"
+          name="file"
+          :before-upload="beforeUpload"
+          :headers="headers"
+          :showUploadList="false"
+          :action="uploadUrl"
+        >
+          <a-button type="primary">
+            <upload-outlined></upload-outlined>
+            上传
+          </a-button>
+        </a-upload>
+      </template>
+
+      <template #headerCell="{ column }">
+        <template v-if="column.dataIndex === DmsFileUploadViewDisplayData.URL">
+          <span
+            style="color: darkgoldenrod; font-size: large; cursor: pointer"
+            @click.prevent="onChangeFolder(rootPath)"
+          >
+            <LaptopOutlined
+              style="color: darkgoldenrod; font-size: larger"
+              title="返回顶层"
+            />返回顶层
+          </span>
+          <span
+            style="color: darkgoldenrod; font-size: large; cursor: pointer"
+            @click.prevent="onLastFolder()"
+          >
+            <ArrowUpOutlined
+              style="color: darkgoldenrod; font-size: larger; margin-left: 16px"
+              title="返回上层"
+            />
+            返回上层
+          </span>
+        </template>
+      </template>
+
+      <template #bodyCell="{ column, record, index }">
+        <template v-if="column.dataIndex === DmsFileUploadViewDisplayData.URL">
+          <template v-if="!fileTypePolicy.isImage(record.OrderKey)">
+            <template v-if="record.IsDirectoryIndc == 'Y'">
+              <a-card hoverable style="width: 300px">
+                <a-card-meta>
+                  <template #description>
+                    <span
+                      style="
+                        color: darkgoldenrod;
+                        margin-left: 4pxr;
+                        cursor: pointer;
+                        font-size: 26px;
+                      "
+                      @click.prevent="onChangeFolder(record.FileName)"
+                    >
+                      <FolderOutlined
+                        style="color: darkgoldenrod; font-size: 48px"
+                        title="打开文件夹"
+                      />{{ record.OrgFileName }}
+                    </span>
+                  </template>
+                </a-card-meta>
+                <template #actions> </template>
+              </a-card>
+            </template>
+            <template v-else-if="fileTypePolicy.isVideo(record.OrderKey)">
+              <a-card style="width: 300px">
+                <template #cover>
+                  <img
+                    style="height: 200px"
+                    :src="record.FormattedPic.replace('.m3u8', '.png')"
+                    :title="record.OrgFileName"
+                  />
+                </template>
+                <a-card-meta>
+                  <template #description>
+                    <a-flex>
+                      <cust-icon-font
+                        size="26"
+                        type="icon-foldervideo"
+                        v-if="record.TranscodeIndc == 'Y'"
+                        @click.prevent="
+                          onUrlVideoPlay(
+                            record.Url,
+                            record.OrgFileName,
+                            record.FormattedPic.replace('.m3u8', '.png'),
+                          )
+                        "
+                      />
+                      <span
+                        style="
+                          color: darkgoldenrod;
+                          margin-left: 4pxr;
+                          margin-top: 2px;
+                        "
+                      >
+                        {{ record.OrgFileName }}
+                      </span>
+                    </a-flex>
+                  </template>
+                </a-card-meta>
+                <template #actions>
+                  <cust-icon-font
+                    size="26"
+                    type="icon-mp3-play"
+                    @click.prevent="onVideoPlay(record.FileId)"
+                  />
+                  <ShareAltOutlined
+                    style="color: rgb(19, 185, 190); font-size: larger"
+                    title="内部分享"
+                    @click.prevent="onShareFamily(record)"
+                  />
+                  <NotificationOutlined
+                    style="color: rgb(19, 185, 190); font-size: larger"
+                    title="专辑发布"
+                    @click.prevent="onPublishVideo(record.FileId)"
+                  />
+                  <UnorderedListOutlined
+                    style="color: rgb(19, 185, 190); font-size: larger"
+                    title="影视厅"
+                    @click.prevent="onViewPreviewVideo(record.FilePath)"
+                  />
+                </template>
+              </a-card>
+            </template>
+            <template v-else-if="fileTypePolicy.isAudio(record.OrderKey)">
+              <a-card hoverable style="width: 300px">
+                <a-flex>
+                  <cust-icon-font
+                    size="60"
+                    type="icon-foldermp3"
+                    @click.prevent="onPlayAudio(toUploadView(record))"
+                  />
+                  <span
+                    style="
+                      color: darkgoldenrod;
+                      margin-left: 4pxr;
+                      margin-top: 10px;
+                    "
+                  >
+                    {{ record.OrgFileName }}
+                  </span>
+                  <div
+                    v-if="record.IsPlay == 'Y'"
+                    style="margin-left: 16px; height: 60px; width: 60px"
+                    :class="record.IsPause == '' ? 'rotating-element' : ''"
+                  >
+                    <cust-icon-font
+                      size="60"
+                      type="icon-playmp3"
+                      v-if="record.IsPause == ''"
+                      @click.prevent="onPauseAudio(toUploadView(record))"
+                    />
+                    <cust-icon-font
+                      size="54"
+                      type="icon-mp3-play"
+                      style="color: #ff7878"
+                      v-if="record.IsPlay == 'Y' && record.IsPause == 'Y'"
+                      @click.prevent="onContinueAudio(toUploadView(record))"
+                    />
+                  </div>
+                </a-flex>
+
+                <template #actions>
+                  <DownloadOutlined
+                    style="color: rgb(19, 185, 190); font-size: larger"
+                    title="下载"
+                    @click.prevent="
+                      onDownloadFile(record.FileId, record.OrgFileName)
+                    "
+                  />
+                  <ShareAltOutlined
+                    style="color: rgb(19, 185, 190); font-size: larger"
+                    title="内部分享"
+                    @click.prevent="onShareFamily(record)"
+                  />
+                  <NotificationOutlined
+                    style="color: rgb(19, 185, 190); font-size: larger"
+                    title="专辑发布"
+                    @click.prevent="onPublishAudio(record.FileId)"
+                  />
+                  <UnorderedListOutlined
+                    style="color: rgb(19, 185, 190); font-size: larger"
+                    title="音乐厅"
+                    @click.prevent="onViewAudioPreview(record.FilePath)"
+                  />
+                </template>
+              </a-card>
+            </template>
+            <template v-else>
+              <DownloadOutlined
+                style="
+                  color: rgb(19, 185, 190);
+                  font-size: larger;
+                  margin-right: 12px;
+                "
+                title="下载"
+                @click.prevent="
+                  onDownloadFile(record.FileId, record.OrgFileName)
+                "
+              />
+              <span>{{ record.OrgFileName }} </span>
+            </template>
+          </template>
+          <template v-else>
+            <a-card style="width: 300px">
+              <template #cover>
+                <img
+                  style="height: 220px; object-fit: cover"
+                  :src="record.Url"
+                  :title="record.OrgFileName"
+                  @click="onPreviewFile(record.CreatedBy, record.OrderKey)"
+                />
+              </template>
+              <a-card-meta>
+                <template #description>
+                  <span
+                    style="color: darkgoldenrod; margin-left: 4pxr"
+                    @click.prevent="
+                      onViewPictureFile(record.FileId, record.OrgFileName)
+                    "
+                  >
+                    <cust-icon-font size="26" type="icon-source-pic" />
+                    {{ record.OrgFileName }}
+                  </span>
+                </template>
+              </a-card-meta>
+              <template #actions>
+                <DownloadOutlined
+                  style="color: rgb(19, 185, 190); font-size: larger"
+                  title="原图下载"
+                  @click.prevent="
+                    onDownloadFile(record.FileId, record.OrgFileName)
+                  "
+                />
+                <ShareAltOutlined
+                  style="color: rgb(19, 185, 190); font-size: larger"
+                  title="内部分享"
+                  @click.prevent="onShareFamily(record)"
+                />
+                <NotificationOutlined
+                  style="color: rgb(19, 185, 190); font-size: larger"
+                  title="相册发布"
+                  @click.prevent="onPublishPhoto(record.FileId)"
+                />
+                <UnorderedListOutlined
+                  style="color: rgb(19, 185, 190); font-size: larger"
+                  title="相册展览"
+                  @click.prevent="onViewPhotoPreview(record.FilePath)"
+                />
+              </template>
+            </a-card>
+          </template>
+        </template>
+      </template>
+
+      <template #footer>
+        <div class="page-footer">
+          <a-row :gutter="24">
+            <a-col :lg="24" :sm="24">
+              <a-row v-if="isEdit" :gutter="[16, 8]">
+                <a-space>
+                  <a-button type="primary" @click.prevent="onCancel"
+                    >取消</a-button
+                  >
+                  <a-button type="primary" @click.prevent="onSave"
+                    >确定</a-button
+                  >
+                </a-space>
+              </a-row>
+              <a-row v-if="!isEdit" :gutter="[16, 8]">
+                <a-space>
+                  <a-button
+                    type="primary"
+                    v-if="canAmend"
+                    :icon="h(FileImageOutlined)"
+                    :disabled="!(keys && keys.length > 0)"
+                    @click.prevent="onViewPic"
+                    >预览</a-button
+                  >
+                  <a-button
+                    type="primary"
+                    v-if="canAmend"
+                    :icon="h(EditOutlined)"
+                    :disabled="!(keys && keys.length > 0)"
+                    @click.prevent="onAmend"
+                    >重命名</a-button
+                  >
+                  <a-button
+                    type="primary"
+                    v-if="canView"
+                    :icon="h(ScissorOutlined)"
+                    :disabled="!(keys && keys.length > 0)"
+                    @click.prevent="onMove"
+                    >移动</a-button
+                  >
+                  <a-popconfirm
+                    title="确定是否删除这条记录?"
+                    ok-text="是"
+                    cancel-text="否"
+                    @confirm="onDelete"
+                  >
+                    <a-button
+                      type="primary"
+                      danger
+                      :icon="h(DeleteOutlined)"
+                      v-if="canDelete"
+                      :disabled="!(keys && keys.length > 0)"
+                      >删除</a-button
+                    >
+                  </a-popconfirm>
+                </a-space>
+              </a-row>
+            </a-col>
+          </a-row>
+        </div>
+      </template>
+    </search>
+    <a-image
+      :width="1024"
+      :style="{ display: 'none' }"
+      :preview="{
+        visible,
+        onVisibleChange: setPicVisible,
+      }"
+      :src="imageSrc"
+      @click="visible = true"
+    />
+    <dmsFolder @on-submit="onReload"></dmsFolder>
+    <videoPlay></videoPlay>
+    <dragModal
+      v-model:open="showModalShare"
+      width="60%"
+      title="分享管理查询"
+      :mask-closable="false"
+      :fullscreen="width < 640"
+      @ok="handleSelectShare"
+    >
+      <DmsFileShareModal ref="shareEnquiry"></DmsFileShareModal>
+    </dragModal>
+    <dragModal
+      v-model:open="showModalPublishPhoto"
+      width="60%"
+      title="相册专辑查询"
+      :mask-closable="false"
+      :fullscreen="width < 640"
+      @ok="handleSelectPublishPhoto"
+    >
+      <PublishPhotoEnquiry ref="publishPhotoEnquiry"> </PublishPhotoEnquiry>
+    </dragModal>
+    <dragModal
+      v-model:open="showModalPublishAudio"
+      width="60%"
+      title="音乐专辑查询"
+      :mask-closable="false"
+      :fullscreen="width < 640"
+      @ok="handleSelectPublishAudio"
+    >
+      <PublishAudioEnquiry ref="publishAudioEnquiry"> </PublishAudioEnquiry>
+    </dragModal>
+    <dragModal
+      v-model:open="showModalPublishVideo"
+      width="60%"
+      title="影视专辑查询"
+      :mask-closable="false"
+      :fullscreen="width < 640"
+      @ok="handleSelectPublishVideo"
+    >
+      <PublishVideoEnquiry ref="publishVideoEnquiry"> </PublishVideoEnquiry>
+    </dragModal>
+  </a-spin>
+</template>
+
+<script setup lang="ts">
+import {
+  reactive,
+  inject,
+  defineComponent,
+  onMounted,
+  onUnmounted,
+  ref,
+  unref,
+  provide,
+  h,
+  computed,
+} from "vue";
+import { BindOption } from "@/data/custom/bindOption";
+import { SelectOption } from "@/data/auto/selectOption";
+import search from "@/components/basic/Search.vue";
+import {
+  DeleteOutlined,
+  EditOutlined,
+  LaptopOutlined,
+  ShareAltOutlined,
+  ScissorOutlined,
+  UploadOutlined,
+  FolderAddOutlined,
+  DownloadOutlined,
+  FolderOutlined,
+  FileImageOutlined,
+  NotificationOutlined,
+  CrownOutlined,
+  ArrowUpOutlined,
+  PictureOutlined,
+  UnorderedListOutlined,
+} from "@ant-design/icons-vue";
+import { DmsFileEntity } from "@/data/auto/dmsFileEntity";
+import { DmsFileResultData } from "@/data/auto/dmsFileResultData";
+
+import { SearchFilter } from "@/data/auto/searchFilter";
+import dmsFileService from "@/service/master/dmsFileService";
+import publishPhotoService from "@/service/master/publishPhotoService";
+import publishAudioService from "@/service/master/publishAudioService";
+import { DmsFileSearchCriteria } from "@/data/auto/dmsFileSearchCriteria";
+import dragModal from "@/components/basic/DragModal.vue";
+import DmsFileShareModal from "./DmsFileShareModal.vue";
+import PublishPhotoEnquiry from "./PublishPhotoEnquiry.vue";
+import PublishAudioEnquiry from "./PublishAudioEnquiry.vue";
+import PublishVideoEnquiry from "./PublishVideoEnquiry.vue";
+import { FamilyFolderFavoriteViewEntity } from "@/data/auto/familyFolderFavoriteViewEntity";
+import { PublishPhotoDetailEntity } from "@/data/auto/publishPhotoDetailEntity";
+import { FamilyGroupFolderEntity } from "@/data/auto/familyGroupFolderEntity";
+import { SearchCriteriaResultData } from "@/data/auto/searchCriteriaResultData";
+import {
+  PermissionContext,
+  usePermissionContext,
+} from "@/hooks/PermissionContext";
+import { useRoute, useRouter } from "vue-router";
+
+import { useBindOption } from "@/hooks/useBindOption";
+import { SearchFilterOperatorPolicy } from "@/data/custom/searchFilterOperatorPolicy";
+import { SearchFilterTypePolicy } from "@/data/custom/searchFilterTypePolicy";
+import { notification } from "ant-design-vue";
+import { GridColumnInfo } from "@/data/auto/gridColumnInfo";
+import { useGridColumnInfo } from "@/hooks/gridColumnInfo";
+import dmsFolder from "./DmsFolderModal.vue";
+
+import { useLoginProfileStore } from "@/store/modules/loginProfile";
+import type { UploadProps } from "ant-design-vue";
+import { WebSitePolicy } from "@/policy/custom/webSitePolicy";
+import { orderBy } from "lodash-es";
+import { bsInfo } from "@/utils/browser";
+import axios from "axios";
+import { getuid } from "process";
+import VideoPlay from "./PlayVideo.vue";
+import {
+  enquiryMethodKey,
+  searchCriteriaManagerKey,
+  masterOperationToEnquiryMethodKey,
+  MasterOperationToEnquiryModelOption,
+  layoutProviderMethodKey,
+} from "@/injections";
+import { useOrderedChildren } from "@/hooks/use-ordered-children";
+import { SearchCriteriaContext } from "@/injections";
+import { Howl, Howler } from "howler";
+import { on } from "events";
+import { PublishPhotoEntity } from "@/data/auto/publishPhotoEntity";
+import { PublishData } from "@/data/auto/publishData";
+import { useWindowSize } from "@vueuse/core";
+import fileTypePolicy from "@/policy/custom/fileTypePolicy";
+import { PublishAudioEntity } from "@/data/auto/publishAudioEntity";
+import { DmsFileUploadViewDisplayData } from "@/data/auto/dmsFileUploadViewDisplayData";
+import { v4 as uuidv4 } from "uuid";
+import { PublishVideoEntity } from "@/data/auto/publishVideoEntity";
+import publishVideoService from "@/service/master/publishVideoService";
+import { useYesNoPolicy } from "@/hooks/useYesNoPolicy";
+
+//page from-----------------------------------------------------------------------------------------------------------------------------------
+//================inject================
+//报表名称
+const layoutProviderMethod = inject(layoutProviderMethodKey);
+
+//================inject================
+
+const { width, height } = useWindowSize();
+
+const widthColumn = ref<string>("3%");
+if (bsInfo.size.sm) {
+  widthColumn.value = "8%";
+} else {
+  widthColumn.value = "3%";
+}
+const showModalShare = ref<boolean>(false);
+// 点击「内部分享」时所在行的 record，供 handleSelectShare 使用
+const sharedFileRecord = ref<DmsFileUploadViewDisplayData | null>(null);
+const showModalPublishPhoto = ref<boolean>(false);
+const showModalPublishAudio = ref<boolean>(false);
+const showModalPublishVideo = ref<boolean>(false);
+const spinTip = ref<string>("加載中...");
+const loading = ref<boolean>(false);
+const isEdit = ref<boolean>(false);
+const canView = ref<boolean>(false);
+const canAmend = ref<boolean>(false);
+const canDelete = ref<boolean>(false);
+const canCreate = ref<boolean>(false);
+const modalTitle = ref<string>("新增文件夹");
+const rootPath = ref<string>("");
+const imageSrc = ref<string>("");
+const route = useRoute();
+const router = useRouter();
+const previousFilePath = ref<string>("");
+
+const fileList = ref<UploadProps["fileList"]>([]);
+const uploadUrl = ref<string>(WebSitePolicy.WebApiRoot + "DmsFile/UploadFile");
+if (process.env.NODE_ENV === "development") {
+  uploadUrl.value = WebSitePolicy.WebApiRootDev + "/DmsFile/UploadFile";
+} else {
+  uploadUrl.value = WebSitePolicy.WebApiRoot + "/DmsFile/UploadFile";
+}
+
+const currFilePath = ref<string>("");
+
+const headers = ref({
+  Authorization: useLoginProfileStore().getToken(),
+  "Content-Type": "multipart/form-data",
+  FilePath: currFilePath.value,
+});
+
+const columns = ref([
+  {
+    title: "",
+    dataIndex: DmsFileUploadViewDisplayData.URL,
+    sorter: false,
+    width: "50%",
+    sequence: 1,
+    hidden: "N",
+  },
+]);
+
+const viewOption = {
+  Value: "default",
+  SelectOptions: [{ BindValue: "default", DisplayName: "默认" }],
+  Columns: [{ BindValue: "default", BindColumn: columns }],
+};
+
+const bindOptions = ref<BindOption[]>([]);
+const datas = ref<DmsFileUploadViewDisplayData[]>([]);
+const pagingParams = ref<PagingParams>({ pageSize: 20, page: 1 });
+const result = ref<SearchCriteriaResultData>(new SearchCriteriaResultData());
+
+const data = ref<DmsFileResultData>(new DmsFileResultData());
+
+const currentFilter = ref<SearchFilter[]>([]);
+const isSearched = ref<boolean>(false);
+const currentSearchCriteria = ref<DmsFileSearchCriteria>(
+  new DmsFileSearchCriteria(),
+);
+
+const keys = ref<DmsFileUploadViewDisplayData[]>([]);
+const dmsFolderModal = ref<boolean>(false);
+const dmsFolderTitle = ref<string>("新增文件夹");
+const dmsFolderIsRename = ref<boolean>(false);
+const dmsFolderIsMove = ref<boolean>(false);
+const entity = ref<DmsFileEntity>(new DmsFileEntity());
+const videoPlayModal = ref<boolean>(false);
+const videoSrc = ref<string>("");
+const videoPoster = ref<string>("");
+const videoType = ref<string>("");
+const videoPlayTitle = ref<string>("");
+const visible = ref<boolean>(false);
+
+interface PublishPhotoEnquiry {
+  keys: PublishPhotoEntity[];
+  setBindOptionValue(
+    bindValue: string,
+    value: string,
+    value1: string,
+    values: string[],
+  ): void;
+}
+
+const publishPhotoEnquiry = ref<PublishPhotoEnquiry | null>(null);
+
+interface PublishAudioEnquiry {
+  keys: PublishAudioEntity[];
+  setBindOptionValue(
+    bindValue: string,
+    value: string,
+    value1: string,
+    values: string[],
+  ): void;
+}
+
+const publishAudioEnquiry = ref<PublishAudioEnquiry | null>(null);
+
+interface PublishVideoEnquiry {
+  keys: PublishVideoEntity[];
+  setBindOptionValue(
+    bindValue: string,
+    value: string,
+    value1: string,
+    values: string[],
+  ): void;
+}
+
+const publishVideoEnquiry = ref<PublishVideoEnquiry | null>(null);
+
+interface ShareEnquiry {
+  keys: FamilyFolderFavoriteViewEntity[];
+  setBindOptionValue(
+    bindValue: string,
+    value: string,
+    value1: string,
+    values: string[],
+  ): void;
+}
+
+const shareEnquiry = ref<ShareEnquiry | null>(null);
+
+const {
+  children: items,
+  addChild: addItem,
+  removeChild: removeItem,
+} = useOrderedChildren<SearchCriteriaContext>();
+
+//================provide================
+//初始化查询条件UI
+provide("dmsFolderModal", dmsFolderModal);
+provide("dmsFolderTitle", dmsFolderTitle);
+provide("dmsFolderIsRename", dmsFolderIsRename);
+provide("dmsFolderIsMove", dmsFolderIsMove);
+provide("DmsFileEntity", entity);
+provide("isModalShare", showModalShare);
+provide("isModalPublishPhoto", showModalPublishPhoto);
+provide("isModalPublishAudio", showModalPublishAudio);
+provide("isModalPublishVideo", showModalPublishVideo);
+provide("selectionTypePublishPhoto", "checkbox");
+
+provide(enquiryMethodKey, {
+  getLayoutSetting: () => {
+    return {
+      controlLeft: 16,
+      controlRight: 8,
+      space: true,
+      soltLeft: 24,
+      soltRight: 24,
+    };
+  },
+  getBindOptions: () => {
+    return unref(bindOptions);
+  },
+  getViewOption: () => {
+    return unref(viewOption);
+  },
+  getDatas: () => {
+    return datas;
+  },
+});
+
+provide(
+  searchCriteriaManagerKey,
+  reactive({
+    items,
+    addItem,
+    removeItem,
+  }),
+);
+
+provide("videoPlayModal", videoPlayModal);
+provide("videoPlayTitle", videoPlayTitle);
+provide("videoSrc", videoSrc);
+provide("videoPoster", videoPoster);
+provide("videoType", videoType);
+//================provide================
+
+const sound = ref();
+
+// 表格 bodyCell 的 record 被透传为 Record<string, any>，转成具体展示类型
+const toUploadView = (r: Record<string, any>): DmsFileUploadViewDisplayData =>
+  r as DmsFileUploadViewDisplayData;
+
+onUnmounted(() => {
+  sound.value?.stop();
+});
+
+const play = (src: string) => {
+  sound.value?.stop();
+  if (!src || src == undefined || src == "") {
+    return;
+  }
+
+  sound.value = new Howl({
+    src: src,
+    volume: 0.5,
+    autoplay: true,
+    loop: false,
+    html5: true,
+    preload: true,
+    onload: () => {
+      // console.log('loaded');
+    },
+    onplay: () => {
+      // console.log('play');
+    },
+    onpause: () => {
+      // console.log('pause');
+    },
+    onend: () => {
+      // console.log('end');
+      datas.value.forEach((element) => {
+        element.IsPlay = "";
+      });
+    },
+  });
+
+  sound.value.play();
+};
+
+const onPauseAudio = (record: DmsFileUploadViewDisplayData) => {
+  record.IsPause = "Y";
+  sound.value.pause();
+};
+
+const onContinueAudio = (record: DmsFileUploadViewDisplayData) => {
+  record.IsPause = "";
+  sound.value.play();
+};
+
+const onPlayAudio = (record: DmsFileUploadViewDisplayData) => {
+  datas.value.forEach((element) => {
+    if (element.FileId == record.FileId && element.IsPlay == "Y") {
+      element.IsPlay = "";
+    } else if (
+      element.FileId == record.FileId &&
+      (element.IsPlay == "" ||
+        element.IsPlay == null ||
+        element.IsPlay == undefined)
+    ) {
+      element.IsPlay = "Y";
+    } else {
+      element.IsPlay = "";
+    }
+    record.IsPause = "";
+  });
+
+  if (record.IsPlay == "") {
+    sound.value?.stop();
+    return;
+  }
+
+  play(record.Url);
+};
+
+defineExpose({
+  keys,
+});
+
+onMounted(async () => {
+  let pContext: PermissionContext = usePermissionContext();
+  canView.value = pContext.canView(route.meta.permission as string);
+  canAmend.value = pContext.canAmend(route.meta.permission as string);
+  canDelete.value = pContext.canDelete(route.meta.permission as string);
+  canCreate.value = pContext.canCreate(route.meta.permission as string);
+
+  await initBindOption();
+
+  onSearchByFilePath(rootPath.value);
+});
+
+const beforeUpload: UploadProps["beforeUpload"] = async (file) => {
+  loading.value = true;
+  fileList.value = [...(fileList.value || []), file];
+  const chunks = splitFile(file);
+
+  let bindOption: BindOption = bindOptions.value.filter(
+    (x) => x.BindValue == DmsFileUploadViewDisplayData.DB_FILE_PATH,
+  )[0];
+  currFilePath.value = headers.value.FilePath = bindOption.Value;
+  let i = 1;
+  let fileSize = file.size;
+  let uid: string = uuidv4();
+  spinTip.value = "上传中(1/" + chunks.length + ")...";
+  await uploadChunk(chunks, file.name, uid, i);
+
+  spinTip.value = "加载中...";
+  return false;
+};
+
+const uploadChunk = async (
+  chunks: any,
+  fileName: string,
+  uid: string,
+  index: number,
+) => {
+  const formData = new FormData();
+
+  const fileExtension = fileName.split(".").pop();
+  formData.append(
+    fileName,
+    chunks[index - 1],
+    uid +
+      "-" +
+      index.toString() +
+      "-" +
+      chunks.length.toString() +
+      "." +
+      fileExtension,
+  );
+
+  if (process.env.NODE_ENV === "development") {
+    axios.defaults.baseURL = WebSitePolicy.WebApiRootDev;
+    axios.defaults.withCredentials = true;
+  } else {
+    axios.defaults.baseURL = WebSitePolicy.WebApiRoot;
+  }
+  try {
+    let response = await axios.create().request({
+      url: "/DmsFile/UploadFile",
+      method: "post",
+      data: formData,
+      headers: headers.value,
+    });
+
+    if (response.status == 200 && index < chunks.length) {
+      spinTip.value = "上传中(" + (index + 1) + "/" + chunks.length + ")...";
+      await uploadChunk(chunks, fileName, uid, index + 1);
+    } else if (index == chunks.length) {
+      let sec: number = 2500;
+      if (index > 25) sec = index * 100;
+      spinTip.value = "加载中...";
+      setTimeout(function () {
+        onReSearch();
+      }, sec);
+    }
+  } catch (error) {
+    loading.value = false;
+    spinTip.value = "加载中...";
+  }
+};
+
+const CHUNK_SIZE = 1024 * 1024; // 设置每个分片的大小为1MB
+
+const splitFile = (file: any) => {
+  const chunks = [];
+  let start = 0;
+  while (start < file.size) {
+    const end = Math.min(start + CHUNK_SIZE, file.size);
+    const chunk = file.slice(start, end);
+    chunks.push(chunk);
+    start += CHUNK_SIZE;
+  }
+  return chunks;
+};
+
+const onSelectChange = (selected: DmsFileUploadViewDisplayData[]) => {
+  keys.value = selected;
+};
+
+const onViewPhotoPreview = async (filePath: string) => {
+  router.push({ name: "Preview", params: { id: filePath, mode: "list" } });
+};
+
+const onViewAudioPreview = async (filePath: string) => {
+  router.push({
+    name: "AudioPreview",
+    params: { id: filePath, mode: "list" },
+  });
+};
+
+const onViewPreviewVideo = async (filePath: string) => {
+  router.push({
+    name: "VideoPreview",
+    params: { id: filePath, mode: "list" },
+  });
+};
+
+const onChangeFolder = async (fvalue: string) => {
+  onSearchByFilePath(fvalue);
+};
+
+const onUrlVideoPlay = (url: string, title: string, poster: string) => {
+  sound.value?.stop();
+  datas.value.forEach((element) => {
+    element.IsPlay = "";
+  });
+  videoPoster.value = poster;
+  videoType.value = "m3u8";
+  videoSrc.value = url;
+  videoPlayModal.value = true;
+  videoPlayTitle.value = title;
+};
+
+const onVideoPlay = async (fid: number) => {
+  //从服务器取出源视频
+  dmsFileService
+    .FindSourceVideoPath(fid)
+    .then((res) => {
+      videoType.value = "video/mp4";
+      videoSrc.value = res;
+      videoPlayModal.value = true;
+    })
+    .catch(() => {
+      videoPlayModal.value = false;
+    });
+};
+
+const onPreviewFile = async (username: string, orderKey: string) => {
+  loading.value = true;
+  getPreviewFile(username, orderKey);
+};
+
+const getPreviewFile = (username: string, fname: string) => {
+  let dms: DmsFileEntity = new DmsFileEntity();
+  dms.CreatedBy = username;
+  dms.OrderKey = fname;
+  dmsFileService
+    .DownloadFilePreview(dms)
+    .then((res) => {
+      const downloadUrl = window.URL.createObjectURL(new Blob([res]));
+      imageSrc.value = downloadUrl;
+      loading.value = false;
+      setPicVisible(true);
+    })
+    .catch(() => {
+      loading.value = false;
+    });
+};
+
+// 注意：不写 Uint8Array<ArrayBuffer>，该泛型语法需要 TS 5.7+，本项目实际是 TS 5.4.5
+const DownloadFileCombine = (
+  fs: string[],
+  mergedData: Uint8Array,
+  index: number,
+  ttl: number,
+  total: number,
+  preview: boolean,
+  fname: string,
+) => {
+  loading.value = true;
+  fs[fs.length - 2] = index.toString();
+  spinTip.value = "加载中(" + index + "/" + total + ")...";
+  dmsFileService
+    .DownloadFileCombine(fs.toString().replace(/,/g, "-"))
+    .then((res) => {
+      mergedData.set(new Uint8Array(res), ttl);
+      if (index < total) {
+        DownloadFileCombine(
+          fs,
+          mergedData,
+          index + 1,
+          ttl + res.byteLength,
+          total,
+          preview,
+          fname,
+        );
+      } else if (index == total) {
+        loading.value = false;
+        spinTip.value = "加载中...";
+        // TS 5.4 与 5.7+ 对 Uint8Array 是否属于 BlobPart 的判定不同，这里做无损断言兼容两者
+        const downloadUrl = window.URL.createObjectURL(
+          new Blob([mergedData as unknown as BlobPart]),
+        );
+        imageSrc.value = downloadUrl;
+        if (!preview) {
+          const link = document.createElement("a");
+          link.href = downloadUrl;
+          link.setAttribute("download", fname);
+          document.body.appendChild(link);
+          link.click();
+        } else {
+          setPicVisible(true);
+        }
+      }
+    })
+    .catch(() => {
+      spinTip.value = "加载中...";
+      loading.value = false;
+    });
+};
+
+const onLastFolder = async () => {
+  if (!datas.value || datas.value.length == 0) {
+    onSearchByFilePath(previousFilePath.value);
+  } else {
+    onPreviousFolder();
+  }
+};
+
+const onPreviousFolder = async () => {
+  let filePath: string = "";
+  if (datas.value && datas.value.length > 0) filePath = datas.value[0].FilePath;
+  dmsFileService.FindFolderNameParentByFolderName(filePath).then((res) => {
+    if (res && res.length > 0) onSearchByFilePath(res);
+  });
+};
+
+const onPublishPhoto = async (fid: number) => {
+  showModalPublishPhoto.value = true;
+};
+
+const onPublishAudio = async (fid: number) => {
+  showModalPublishAudio.value = true;
+};
+
+const onPublishVideo = async (fid: number) => {
+  showModalPublishVideo.value = true;
+};
+
+const onShareFamily = async (record: Record<string, any>) => {
+  sharedFileRecord.value = toUploadView(record);
+  showModalShare.value = true;
+};
+
+const onDownloadFile = async (fid: number, fname: string) => {
+  GetOrgPictureFile(fid, fname, false);
+};
+
+const GetOrgPictureFile = async (
+  fid: number,
+  fname: string,
+  preview: boolean,
+) => {
+  if (fileTypePolicy.isVideo(fname)) {
+    // onVideoPlay(keys.value[0].FileId);
+    return;
+  }
+
+  loading.value = true;
+  dmsFileService
+    .FindByKey(fid)
+    .then((res) => {
+      let fs: string[] = res.OrderKey.split("-");
+      let index: string = fs[fs.length - 2];
+      let total: string = fs[fs.length - 1].split(".")[0];
+      var mergedData = new Uint8Array((res.FileSize + 1) * 1024);
+      let ttl: number = 0;
+      fs[fs.length - 2] = "1";
+      spinTip.value = "加载中(1/" + total + ")...";
+      DownloadFileCombine(
+        fs,
+        mergedData,
+        1,
+        ttl,
+        parseInt(total),
+        preview,
+        fname,
+      );
+    })
+    .catch(() => {
+      loading.value = false;
+    });
+};
+
+const onViewPictureFile = async (fid: number, fname: string) => {
+  GetOrgPictureFile(fid, fname, true);
+};
+
+const onSearchByFilePath = async (fvalue: string) => {
+  setBindOptionValue(
+    DmsFileUploadViewDisplayData.DB_FILE_PATH,
+    fvalue,
+    "",
+    [fvalue],
+    false,
+  );
+  previousFilePath.value = unref(currFilePath.value);
+  currFilePath.value = fvalue;
+  isSearched.value = true;
+  if (currentSearchCriteria.value && fvalue && fvalue.length > 0) {
+    currentSearchCriteria.value.Filter = [];
+    let filter: SearchFilter;
+    filter = new SearchFilter();
+    filter.Column = DmsFileUploadViewDisplayData.DB_FILE_PATH;
+    filter.Type = "SingleSelection";
+    filter.Operator = "single";
+    filter.Value = fvalue;
+    currentSearchCriteria.value.Filter.push(filter);
+  } else {
+    currentSearchCriteria.value.Filter = [];
+  }
+
+  await findBySearchCriteria(unref(currentSearchCriteria));
+};
+
+const onReset = () => {
+  keys.value = [];
+  result.value.Total = 0;
+  setBindOptionValue(
+    DmsFileUploadViewDisplayData.DB_FILE_PATH,
+    rootPath.value,
+    "",
+    [rootPath.value],
+    false,
+  );
+};
+
+const onViewPic = () => {
+  if (keys.value.length == 0) return;
+  if (keys.value[0].IsDirectoryIndc == "Y") {
+    onChangeFolder(keys.value[0].FileName);
+  } else if (fileTypePolicy.isImage(keys.value[0].OrgFileName)) {
+    onPreviewFile(keys.value[0].CreatedBy, keys.value[0].OrderKey);
+  } else if (fileTypePolicy.isVideo(keys.value[0].OrgFileName)) {
+    onVideoPlay(keys.value[0].FileId);
+  } else {
+    notification.info({
+      message: "系统提示：",
+      description: "未知格式无法预览",
+      placement: "topRight",
+    });
+  }
+};
+
+const setPicVisible = (value: boolean): void => {
+  visible.value = value;
+};
+
+const onCreate = () => {
+  dmsFolderTitle.value = "新增文件夹";
+  dmsFolderIsRename.value = false;
+  dmsFolderIsMove.value = false;
+  dmsFolderModal.value = true;
+  entity.value = new DmsFileEntity();
+  let bindOption: BindOption = bindOptions.value.filter(
+    (x) => x.BindValue == DmsFileUploadViewDisplayData.DB_FILE_PATH,
+  )[0];
+
+  entity.value.FilePath = bindOption.SelectOptions.filter(
+    (x) => x.BindValue == bindOption.Value,
+  )[0].DisplayName;
+  entity.value.OrgFileName = bindOption.Value;
+
+  currFilePath.value = bindOption.Value;
+};
+
+const onAmend = () => {
+  if (keys.value[0].IsDirectoryIndc == "Y") {
+    dmsFolderTitle.value = "重命名文件夹";
+  } else {
+    dmsFolderTitle.value = "重命名文件";
+  }
+  dmsFolderIsRename.value = true;
+  dmsFolderModal.value = true;
+  dmsFolderIsMove.value = false;
+  entity.value = new DmsFileEntity();
+
+  entity.value.FileId = keys.value[0].FileId;
+  entity.value.FilePath = keys.value[0].FolderLocalName;
+  if (keys.value[0].CreatedBy == keys.value[0].FolderLocalName) {
+    entity.value.FilePath = "";
+  }
+  entity.value.FileName = keys.value[0].OrgFileName;
+};
+
+const onMove = () => {
+  if (keys.value[0].IsDirectoryIndc == "Y") {
+    dmsFolderTitle.value = "移动文件夹";
+  } else {
+    dmsFolderTitle.value = "移动文件";
+  }
+  dmsFolderIsRename.value = false;
+  dmsFolderIsMove.value = true;
+  dmsFolderModal.value = true;
+
+  entity.value = new DmsFileEntity();
+
+  entity.value.FileId = keys.value[0].FileId;
+  entity.value.FilePath = keys.value[0].FolderLocalName;
+  if (keys.value[0].CreatedBy == keys.value[0].FolderLocalName) {
+    entity.value.FilePath = "";
+  }
+  entity.value.FileName = keys.value[0].FileName;
+  entity.value.OrgFileName = keys.value[0].OrgFileName;
+};
+
+const onDelete = async () => {
+  for (let i = 0; i < keys.value.length; i++) {
+    await dmsFileService.Delete(keys.value[i].FileId);
+  }
+
+  notification.info({
+    message: "系统提示：",
+    description: "记录删除成功",
+    placement: "topRight",
+  });
+  onReload();
+};
+
+const onSave = () => {
+  isEdit.value = false;
+};
+
+const onCancel = () => {
+  isEdit.value = false;
+};
+
+const setBindOptionValue = (
+  bindValue: string,
+  value: string,
+  value1: string,
+  values: string[],
+  disabled: boolean,
+) => {
+  let bindOption: BindOption = bindOptions.value.filter(
+    (x) => x.BindValue == bindValue,
+  )[0];
+  if (!bindOption) return;
+  bindOption.Value = value;
+  bindOption.Value1 = value1;
+  bindOption.Values = values;
+  bindOption.disabled = disabled;
+};
+
+//初始化查询条件
+const initBindOption = async () => {
+  let ubo = useBindOption();
+  bindOptions.value = [];
+  bindOptions.value.splice(0, bindOptions.value.length);
+  let bindOption: BindOption = ubo.getBindOption(
+    DmsFileUploadViewDisplayData.DB_ORG_FILE_NAME,
+    "名称",
+    SearchFilterTypePolicy.TEXT,
+    SearchFilterOperatorPolicy.CONTAIN,
+  );
+  bindOptions.value.push(bindOption);
+
+  // bindOption = ubo.getBindOption(DmsFileUploadViewDisplayData.DB_FILE_PATH, '当前目录', SearchFilterTypePolicy.TEXT, SearchFilterOperatorPolicy.CONTAIN);
+  let rps: SelectOption[] = await dmsFileService.FindDmsFolders();
+  if (rps && rps.length > 1) {
+    rootPath.value = rps[1].BindValue;
+    // 仅在首次初始化（还没有当前目录）时设置默认目录；
+    // onReload 等刷新场景保持 currFilePath（"当前目录"）不变
+    if (!currFilePath.value) {
+      currFilePath.value = rps[1].BindValue;
+    }
+  }
+
+  bindOption = ubo.getBindSelectOption(
+    DmsFileUploadViewDisplayData.DB_FILE_PATH,
+    "当前目录",
+    SearchFilterTypePolicy.SINGLE_SELECTION,
+    SearchFilterOperatorPolicy.SINGLE,
+    rps,
+  );
+
+  bindOptions.value.push(bindOption);
+
+  // bindOption = ubo.getBindOption(DmsFileUploadViewDisplayData.DB_CREATED_DATETIME, '创建日期', SearchFilterTypePolicy.DATE, SearchFilterOperatorPolicy.DATE_BETWEEN);
+  // bindOptions.value.push(bindOption);
+
+  setBindOptionValue(
+    DmsFileUploadViewDisplayData.DB_FILE_PATH,
+    currFilePath.value,
+    "",
+    [currFilePath.value],
+    false,
+  );
+};
+
+//table from-----------------------------------------------------------------------------------------------------------------------------------
+
+result.value.Page = pagingParams.value.page ?? 1;
+result.value.Limit = pagingParams.value.pageSize;
+
+const onSubmit = async (filters: SearchFilter[]) => {
+  loading.value = true;
+  let c: DmsFileSearchCriteria = new DmsFileSearchCriteria();
+  currentFilter.value = filters;
+
+  c.Filter = filters;
+  c.limit = pagingParams.value.pageSize;
+  c.page = pagingParams.value.page ?? 1;
+  c.GridColumns = [];
+  currentSearchCriteria.value = c;
+
+  await findBySearchCriteria(c);
+};
+
+const onPrint = async () => {
+  loading.value = true;
+  let c: DmsFileSearchCriteria = new DmsFileSearchCriteria();
+  if (currentFilter.value.length > 0) c.Filter = currentFilter.value;
+  else c.Filter = [];
+
+  c.limit = pagingParams.value.pageSize;
+  c.page = pagingParams.value.page ?? 1;
+  c.GridColumns = useGridColumnInfo().getGridColumnInfo(unref(columns));
+  c.ReportName = layoutProviderMethod?.getLayoutProvider().layoutTitle!;
+  try {
+    let sss = await dmsFileService.PrintBySearchCriteria(c);
+  } catch (error) {
+    console.log(error);
+  }
+};
+
+const findBySearchCriteria = async (c: DmsFileSearchCriteria) => {
+  keys.value = [];
+  try {
+    if (c.limit == 0) c.limit = pagingParams.value.pageSize;
+    if (c.page == 0) c.page = pagingParams.value.page ?? 1;
+
+    currentFilter.value = c.Filter;
+    data.value = await dmsFileService.FindBySearchCriteria(c);
+
+    isSearched.value = true;
+    result.value.Total = data.value.Total;
+    result.value.Page = data.value.Page;
+    result.value.Limit = data.value.Limit;
+    if (data.value.Datas)
+      data.value.Datas = orderBy(
+        data.value.Datas,
+        (x) => x.IsDirectoryIndc,
+        "desc",
+      );
+    datas.value = data.value.Datas;
+    loading.value = false;
+    if (
+      data.value.Datas &&
+      data.value.Datas.length > 0 &&
+      fileTypePolicy.isAudio(data.value.Datas[0].OrderKey)
+    ) {
+      onPlayAudio(data.value.Datas[0]);
+      onPauseAudio(data.value.Datas[0]);
+    } else {
+      sound.value?.stop();
+    }
+  } catch (error) {
+    loading.value = false;
+    console.log(error);
+  }
+};
+
+const onPagination = async (params: PagingParams) => {
+  try {
+    if (!isSearched.value) return;
+
+    let c: DmsFileSearchCriteria = new DmsFileSearchCriteria();
+
+    if (currentFilter.value.length > 0) c.Filter = currentFilter.value;
+    else c.Filter = [];
+
+    c.limit = params.pageSize;
+    c.page = params.page ?? 1;
+    if (params.sortField) c.orderby = params.sortField!;
+    if (params.sortOrder)
+      c.orderbytag = params.sortOrder?.toString().substring(0, 4)!;
+    c.GridColumns = [];
+    loading.value = true;
+    currentSearchCriteria.value = c;
+
+    await findBySearchCriteria(c);
+  } catch (error) {
+    loading.value = false;
+    console.log(error);
+  }
+};
+
+const onReSearch = async () => {
+  setBindOptionValue(
+    DmsFileUploadViewDisplayData.DB_FILE_PATH,
+    currFilePath.value,
+    "",
+    [currFilePath.value],
+    false,
+  );
+  await findBySearchCriteria(unref(currentSearchCriteria));
+  loading.value = false;
+  spinTip.value = "加载中...";
+};
+
+const onReload = async () => {
+  let cfp: string = currFilePath.value;
+  await initBindOption();
+  setBindOptionValue(
+    DmsFileUploadViewDisplayData.DB_FILE_PATH,
+    cfp,
+    "",
+    [cfp],
+    false,
+  );
+  await findBySearchCriteria(unref(currentSearchCriteria));
+};
+
+const handleSelectShare = async () => {
+  if (shareEnquiry.value) {
+    if (shareEnquiry.value.keys.length > 0) {
+      //查询弹出
+      let fgps: FamilyGroupFolderEntity[] = [];
+      let fgp: FamilyGroupFolderEntity;
+      shareEnquiry.value.keys.forEach((element) => {
+        fgp = new FamilyGroupFolderEntity();
+        fgp.FamilyName = element.FamilyName;
+        fgp.TopFolderName = element.TopFolderName;
+        fgp.FolderName = sharedFileRecord.value?.FileName ?? "";
+        fgp.FolderLocalName = sharedFileRecord.value?.OrgFileName ?? "";
+        fgp.FilePath = element.FolderName;
+
+        fgps.push(fgp);
+      });
+
+      await dmsFileService.CreateFamilyGroupFolder(fgps);
+      showModalShare.value = false;
+    } else {
+      notification.info({
+        message: "系统提示：",
+        description: "请选择一条记录",
+        placement: "topRight",
+      });
+    }
+  }
+};
+
+const handleSelectPublishPhoto = async () => {
+  if (publishPhotoEnquiry.value) {
+    if (publishPhotoEnquiry.value.keys.length > 0) {
+      //查询弹出
+      let data: PublishData;
+      for (let i = 0; i < keys.value.length; i++) {
+        data = new PublishData();
+        data.FileId = keys.value[i].FileId;
+        data.PublishName = publishPhotoEnquiry.value.keys[0].PublishName;
+
+        await publishPhotoService.InsertPublishPhotoDetail(data);
+      }
+      showModalPublishPhoto.value = false;
+
+      notification.info({
+        message: "系统提示：",
+        description: "作品发布成功",
+        placement: "topRight",
+      });
+    } else {
+      notification.info({
+        message: "系统提示：",
+        description: "请选择一条记录",
+        placement: "topRight",
+      });
+    }
+  }
+};
+
+const handleSelectPublishAudio = async () => {
+  if (publishAudioEnquiry.value) {
+    if (publishAudioEnquiry.value.keys.length > 0) {
+      //查询弹出
+      let data: PublishData;
+      for (let i = 0; i < keys.value.length; i++) {
+        data = new PublishData();
+        data.FileId = keys.value[i].FileId;
+        data.PublishName = publishAudioEnquiry.value.keys[0].PublishName;
+
+        await publishAudioService.InsertPublishAudioDetail(data);
+      }
+      showModalPublishAudio.value = false;
+
+      notification.info({
+        message: "系统提示：",
+        description: "专辑发布成功",
+        placement: "topRight",
+      });
+    } else {
+      notification.info({
+        message: "系统提示：",
+        description: "请选择一条记录",
+        placement: "topRight",
+      });
+    }
+  }
+};
+
+const handleSelectPublishVideo = async () => {
+  if (publishVideoEnquiry.value) {
+    if (publishVideoEnquiry.value.keys.length > 0) {
+      //查询弹出
+      let data: PublishData;
+      for (let i = 0; i < keys.value.length; i++) {
+        data = new PublishData();
+        data.FileId = keys.value[i].FileId;
+        data.PublishName = publishVideoEnquiry.value.keys[0].PublishName;
+
+        await publishVideoService.InsertPublishVideoDetail(data);
+      }
+      showModalPublishVideo.value = false;
+
+      notification.info({
+        message: "系统提示：",
+        description: "专辑发布成功",
+        placement: "topRight",
+      });
+    } else {
+      notification.info({
+        message: "系统提示：",
+        description: "请选择一条记录",
+        placement: "topRight",
+      });
+    }
+  }
+};
+
+//table end-----------------------------------------------------------------------------------------------------------------------------------
+</script>
+
+<style scoped>
+.folder-list {
+  height: 80px;
+  width: 90vw;
+  border-bottom: 1px solid #ccc;
+}
+
+.folder-right {
+  position: relative;
+  right: 0;
+}
+
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.rotating-element {
+  animation: rotate 2s linear infinite;
+}
+</style>
diff --git a/WebVue/src/views/master/PublishAudioEnquiry.vue b/WebVue/src/views/master/PublishAudioEnquiry.vue
index fbbb913..798f625 100644
--- a/WebVue/src/views/master/PublishAudioEnquiry.vue
+++ b/WebVue/src/views/master/PublishAudioEnquiry.vue
@@ -8,7 +8,7 @@
         </template>
         <template #bodyCell="{ column, record, index }">
             <template v-if="column.dataIndex === PublishAudioEntity.PUBLISH_NAME">
-                <a-button type="link" block @click.prevent="onViewAudioPreview">{{ record.PublishName }}</a-button>
+                <a-button type="link" block @click.prevent="onViewPreviewAudio">{{ record.PublishName }}</a-button>
             </template>
             <template v-else-if="column.dataIndex === PublishAudioEntity.DEFAULT_INDC">
                 <template v-if="record.DefaultIndc == 'Y'">
@@ -29,7 +29,7 @@
                                     :disabled="!(keys && keys.length > 0)" @click.prevent="onAmend">修改</a-button>
                                 <a-button type="primary" v-if="canView" :icon="h(FileTextOutlined)"
                                     :disabled="!(keys && keys.length > 0)"
-                                    @click.prevent="onViewAudioPreview">音乐厅</a-button>
+                                    @click.prevent="onViewPreviewAudio">音乐厅</a-button>
                             </a-space>
                         </a-row>
                     </a-col>
@@ -200,9 +200,9 @@ const onReset = (() => {
     result.value.Total = 0;
 })
 
-const onViewAudioPreview = (() => {
+const onViewPreviewAudio = (() => {
     if (keys.value.length == 0) return;
-    router.push({ name: "AudioPreviews", params: { id: keys.value[0].PublishName, mode: 'view' } });
+    router.push({ name: "PreviewAudio", params: { id: keys.value[0].PublishName, mode: 'view' } });
 })
 
 const onCreate = (() => {
diff --git a/WebVue/src/views/master/PublishAudioOperation.vue b/WebVue/src/views/master/PublishAudioOperation.vue
index 99179e0..60360f7 100644
--- a/WebVue/src/views/master/PublishAudioOperation.vue
+++ b/WebVue/src/views/master/PublishAudioOperation.vue
@@ -247,7 +247,7 @@
                                                 :disabled="!hasData" v-if="canDelete">删除</a-button>
                                         </a-popconfirm>
                                         <a-button type="primary" v-if="canAmend" :icon="h(EditOutlined)"
-                                            :disabled="!hasData" @click.prevent="onViewAudioPreview">音乐厅</a-button>
+                                            :disabled="!hasData" @click.prevent="onViewPreviewAudio">音乐厅</a-button>
                                     </a-space>
                                 </a-row>
                             </div>
@@ -376,7 +376,7 @@ const columnDtls = ref([
 ]);
 //================provide================
 //弹出(Function Modal)
-provide("isModalAudioPublish", showModal);
+provide("isModalPublishAudio", showModal);
 //记录单选还是多选(Modal)
 provide("selectionTypeAudioPublish", rowSelectionType);
 //初始化查询条件的值(Modal)
@@ -515,8 +515,8 @@ const onReset = (() => {
 
 
 
-const onViewAudioPreview = (async () => {
-    router.push({ name: "AudioPreviews", params: { id: data.value.PublishAudio.PublishName, mode: 'view' } });
+const onViewPreviewAudio = (async () => {
+    router.push({ name: "PreviewAudio", params: { id: data.value.PublishAudio.PublishName, mode: 'view' } });
 })
 
 const onCreate = (() => {
diff --git a/WebVue/src/views/master/PublishPhotoEnquiry.vue b/WebVue/src/views/master/PublishPhotoEnquiry.vue
index 93784ae..31f7fec 100644
--- a/WebVue/src/views/master/PublishPhotoEnquiry.vue
+++ b/WebVue/src/views/master/PublishPhotoEnquiry.vue
@@ -202,7 +202,7 @@ const onReset = (() => {
 
 const onViewPreview = (() => {
     if (keys.value.length == 0) return;
-    router.push({ name: "Previews", params: { id: keys.value[0].PublishName, mode: 'view' } });
+    router.push({ name: "Preview", params: { id: keys.value[0].PublishName, mode: 'view' } });
 })
 
 const onCreate = (() => {
diff --git a/WebVue/src/views/master/PublishPhotoOperation.vue b/WebVue/src/views/master/PublishPhotoOperation.vue
index d71d626..5c48b97 100644
--- a/WebVue/src/views/master/PublishPhotoOperation.vue
+++ b/WebVue/src/views/master/PublishPhotoOperation.vue
@@ -181,13 +181,12 @@
                     </template>
                   </a-card-meta>
                   <template #actions>
-                    <span v-if="isEdit">
+                    <span v-if="isEdit" @click="upSon(datas.index)">
                       <UpSquareTwoTone
                         :style="{ fontSize: '24px', color: '#08c' }"
-                        @click="upSon(datas.index)"
                       />上移
                     </span>
-                    <span v-if="isEdit">
+                    <span v-if="isEdit" @click="downSon(datas.index)">
                       <DownSquareTwoTone
                         :style="{
                           fontSize: '24px',
@@ -195,13 +194,11 @@
                           marginLeft: '20px',
                           marginRight: '20px',
                         }"
-                        @click="downSon(datas.index)"
                       />下移
                     </span>
-                    <span v-if="isEdit">
+                    <span v-if="isEdit" @click="deleteSon(datas.record.DetailId)">
                       <DeleteOutlined
                         :style="{ fontSize: '24px', color: 'red' }"
-                        @click="deleteSon(datas.record.DetailId)"
                       />删除
                     </span>
                   </template>
@@ -329,7 +326,7 @@
                       :icon="h(EditOutlined)"
                       :disabled="!hasData"
                       @click.prevent="onViewPreview"
-                      >作品展览</a-button
+                      >相册展览</a-button
                     >
                   </a-space>
                 </a-row>
@@ -563,7 +560,7 @@ const onReset = () => {
 
 const onViewPreview = async () => {
   router.push({
-    name: "Previews",
+    name: "Preview",
     params: { id: data.value.PublishPhoto.PublishName, mode: "view" },
   });
 };
diff --git a/WebVue/src/views/master/PublishVideoEnquiry.vue b/WebVue/src/views/master/PublishVideoEnquiry.vue
index 5884f48..e844fec 100644
--- a/WebVue/src/views/master/PublishVideoEnquiry.vue
+++ b/WebVue/src/views/master/PublishVideoEnquiry.vue
@@ -8,7 +8,7 @@
         </template>
         <template #bodyCell="{ column, record, index }">
             <template v-if="column.dataIndex === PublishVideoEntity.PUBLISH_NAME">
-                <a-button type="link" block @click.prevent="onViewVideoPreview">{{ record.PublishName }}</a-button>
+                <a-button type="link" block @click.prevent="onViewPreviewVideo">{{ record.PublishName }}</a-button>
             </template>
             <template v-else-if="column.dataIndex === PublishVideoEntity.DEFAULT_INDC">
                 <template v-if="record.DefaultIndc == 'Y'">
@@ -29,7 +29,7 @@
                                     :disabled="!(keys && keys.length > 0)" @click.prevent="onAmend">修改</a-button>
                                 <a-button type="primary" v-if="canView" :icon="h(FileTextOutlined)"
                                     :disabled="!(keys && keys.length > 0)"
-                                    @click.prevent="onViewVideoPreview">影视厅</a-button>
+                                    @click.prevent="onViewPreviewVideo">影视厅</a-button>
                             </a-space>
                         </a-row>
                     </a-col>
@@ -200,9 +200,9 @@ const onReset = (() => {
     result.value.Total = 0;
 })
 
-const onViewVideoPreview = (() => {
+const onViewPreviewVideo = (() => {
     if (keys.value.length == 0) return;
-    router.push({ name: "VideoPreviews", params: { id: keys.value[0].PublishName, mode: 'view' } });
+    router.push({ name: "PreviewVideo", params: { id: keys.value[0].PublishName, mode: 'view' } });
 })
 
 const onCreate = (() => {
diff --git a/WebVue/src/views/master/PublishVideoOperation.vue b/WebVue/src/views/master/PublishVideoOperation.vue
index 30b8a66..8e999db 100644
--- a/WebVue/src/views/master/PublishVideoOperation.vue
+++ b/WebVue/src/views/master/PublishVideoOperation.vue
@@ -247,7 +247,7 @@
                                                 :disabled="!hasData" v-if="canDelete">删除</a-button>
                                         </a-popconfirm>
                                         <a-button type="primary" v-if="canAmend" :icon="h(EditOutlined)"
-                                            :disabled="!hasData" @click.prevent="onViewVideoPreview">影视厅</a-button>
+                                            :disabled="!hasData" @click.prevent="onViewPreviewVideo">影视厅</a-button>
                                     </a-space>
                                 </a-row>
                             </div>
@@ -375,7 +375,7 @@ const columnDtls = ref([
 ]);
 //================provide================
 //弹出(Function Modal)
-provide("isModalVideoPublish", showModal);
+provide("isModalPublishVideo", showModal);
 //记录单选还是多选(Modal)
 provide("selectionTypeVideoPublish", rowSelectionType);
 //初始化查询条件的值(Modal)
@@ -515,8 +515,8 @@ const onReset = (() => {
 
 
 
-const onViewVideoPreview = (async () => {
-    router.push({ name: "VideoPreviews", params: { id: data.value.PublishVideo.PublishName, mode: 'view' } });
+const onViewPreviewVideo = (async () => {
+    router.push({ name: "PreviewVideo", params: { id: data.value.PublishVideo.PublishName, mode: 'view' } });
 })
 
 const onCreate = (() => {
diff --git a/WebVue/src/views/security/ActorEnquiry.vue b/WebVue/src/views/security/ActorEnquiry.vue
index 13b7119..f2c811e 100644
--- a/WebVue/src/views/security/ActorEnquiry.vue
+++ b/WebVue/src/views/security/ActorEnquiry.vue
@@ -66,7 +66,7 @@ import { useOrderedChildren } from "@/hooks/use-ordered-children";
 import { SearchCriteriaContext } from "@/injections";
 //page from-----------------------------------------------------------------------------------------------------------------------------------
 //================inject================
-const actorOperationMethod = inject(operationToEnquiryMethodKey);
+const actorOperationMethod = inject(operationToEnquiryMethodKey, undefined);
 
 const modelOption = actorOperationMethod?.getOperationToEnquiryModelOption() as OperationToEnquiryModelOption;
 
diff --git a/WebVue/src/views/security/FunctionEnquiry.vue b/WebVue/src/views/security/FunctionEnquiry.vue
index 80e90dc..4414a43 100644
--- a/WebVue/src/views/security/FunctionEnquiry.vue
+++ b/WebVue/src/views/security/FunctionEnquiry.vue
@@ -68,7 +68,7 @@ import { SearchCriteriaContext } from "@/injections";
 //报表名称(layout)
 const layoutProviderMethod = inject(layoutProviderMethodKey);
 
-const actorOperationMethod = inject(operationToEnquiryMethodKey);
+const actorOperationMethod = inject(operationToEnquiryMethodKey, undefined);
 const modelOption = actorOperationMethod?.getOperationToEnquiryModelOption() as OperationToEnquiryModelOption;
 
 const isModal = ref(modelOption ? modelOption.isModalFunction : false);
diff --git a/WebVue/src/views/security/GroupEnquiry.vue b/WebVue/src/views/security/GroupEnquiry.vue
index e889186..a26d0f4 100644
--- a/WebVue/src/views/security/GroupEnquiry.vue
+++ b/WebVue/src/views/security/GroupEnquiry.vue
@@ -60,7 +60,7 @@ import { useOrderedChildren } from "@/hooks/use-ordered-children";
 import { SearchCriteriaContext } from "@/injections";
 //page from-----------------------------------------------------------------------------------------------------------------------------------
 //================inject================
-const actorOperationMethod = inject(operationToEnquiryMethodKey);
+const actorOperationMethod =inject(operationToEnquiryMethodKey, undefined);
 const modelOption = actorOperationMethod?.getOperationToEnquiryModelOption() as OperationToEnquiryModelOption;
 
 const isModal = ref(modelOption ? modelOption.isModalGroup : false);
diff --git a/WebVue/src/views/security/MasterEnquiry.vue b/WebVue/src/views/security/MasterEnquiry.vue
index 14d3f22..5ecc28f 100644
--- a/WebVue/src/views/security/MasterEnquiry.vue
+++ b/WebVue/src/views/security/MasterEnquiry.vue
@@ -66,7 +66,7 @@ import { useOrderedChildren } from "@/hooks/use-ordered-children";
 import { SearchCriteriaContext } from "@/injections";
 //page from-----------------------------------------------------------------------------------------------------------------------------------
 //================inject================
-const actorOperationMethod = inject(operationToEnquiryMethodKey);
+const actorOperationMethod = inject(operationToEnquiryMethodKey, undefined);
 const modelOption = actorOperationMethod?.getOperationToEnquiryModelOption() as OperationToEnquiryModelOption;
 
 const isModal = ref(modelOption ? modelOption.isModalMaster : false);
diff --git a/WebVue/src/views/security/PermissionDependentModal.vue b/WebVue/src/views/security/PermissionDependentModal.vue
index 3698e9c..fce5fc4 100644
--- a/WebVue/src/views/security/PermissionDependentModal.vue
+++ b/WebVue/src/views/security/PermissionDependentModal.vue
@@ -33,7 +33,7 @@ import { useOrderedChildren } from "@/hooks/use-ordered-children";
 import { SearchCriteriaContext } from "@/injections";
 //page from-----------------------------------------------------------------------------------------------------------------------------------
 //================inject================
-const actorOperationMethod = inject(operationToEnquiryMethodKey);
+const actorOperationMethod = inject(operationToEnquiryMethodKey, undefined);
 const modelOption = actorOperationMethod?.getOperationToEnquiryModelOption() as OperationToEnquiryModelOption;
 
 const isModal = ref(modelOption ? modelOption.isModalPermissionDependent : false);
diff --git a/WebVue/src/views/security/PermissionEnquiry.vue b/WebVue/src/views/security/PermissionEnquiry.vue
index 0295fa7..465c50b 100644
--- a/WebVue/src/views/security/PermissionEnquiry.vue
+++ b/WebVue/src/views/security/PermissionEnquiry.vue
@@ -60,7 +60,7 @@ import { SearchCriteriaContext } from "@/injections";
 import { enquiryMethodKey, searchCriteriaManagerKey, operationToEnquiryMethodKey, OperationToEnquiryModelOption, layoutProviderMethodKey } from "@/injections";
 //page from-----------------------------------------------------------------------------------------------------------------------------------
 //================inject================
-const actorOperationMethod = inject(operationToEnquiryMethodKey);
+const actorOperationMethod =inject(operationToEnquiryMethodKey, undefined);
 const modelOption = actorOperationMethod?.getOperationToEnquiryModelOption() as OperationToEnquiryModelOption;
 
 const isModal = ref(modelOption ? modelOption.isModalPermission : false);
diff --git a/WebVue/src/views/security/UserEnquiry.vue b/WebVue/src/views/security/UserEnquiry.vue
index f125788..87d8a27 100644
--- a/WebVue/src/views/security/UserEnquiry.vue
+++ b/WebVue/src/views/security/UserEnquiry.vue
@@ -66,7 +66,7 @@ import { useOrderedChildren } from "@/hooks/use-ordered-children";
 import { SearchCriteriaContext } from "@/injections";
 //page from-----------------------------------------------------------------------------------------------------------------------------------
 //================inject================
-const actorOperationMethod = inject(operationToEnquiryMethodKey);
+const actorOperationMethod = inject(operationToEnquiryMethodKey, undefined);
 const modelOption = actorOperationMethod?.getOperationToEnquiryModelOption() as OperationToEnquiryModelOption;
 
 const isModal = ref(modelOption ? modelOption.isModalUser : false);