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 @@ + + + + 全选 + + + + + + + + + + + + + + + + + + + + + + + + + {{ record.OrgFileName }} + + + + + + + {{ record.OrgFileName }} + + + + + + + + + + {{ record.OrgFileName }} + + + + + + + {{ record.OrgFileName }} + + + + + + + {{ record.OrgFileName }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ record.OrgFileName }} + {{ formatSize(record.FileSize) }} + {{ formatDate(record.CreatedDatetime) }} + + + + + + + + + + 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 @@ + + + + + 新增文件夹 + + + 上传 + + + + + + + + + 下载 + + + + 共享 + + + + {{ publishTooltip }} + + + + {{ previewTooltip }} + + + + + 播放 + + + + + + 播放 + + + 暂停 + + + 继续 + + + + + + + + + + + 更多 + + + + + + 预览 + + + 重命名 + + + 移动 + + + + 删除 + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.displayName }} + + + + + + + + + + + + + + + + + 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 @@ - @@ -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 @@ - @@ -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 @@ - - - 新增 - - - - 上传 - - - + + - - - - 返回顶层 - - - - 返回上层 - - - + - - - - - - - - - {{ record.OrgFileName }} - - - - - - - - - - - - - - - - - {{ record.OrgFileName }} - - - - - - - - - - - - - - - - - - {{ record.OrgFileName }} - - - - - - + + - - - - - - - - - - - {{ record.OrgFileName }} - - - - - - - - - - - - {{ record.OrgFileName }} - - - - - - - - - - - - - - - - - - @@ -367,7 +75,7 @@ :fullscreen="width < 640" @ok="handleSelectPublishPhoto" > - + - + - + @@ -395,39 +103,16 @@ 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 @@ + + + + + 新增 + + + + 上传 + + + + + + + + 返回顶层 + + + + 返回上层 + + + + + + + + + + + + + {{ record.OrgFileName }} + + + + + + + + + + + + + + + + + {{ record.OrgFileName }} + + + + + + + + + + + + + + + + + + {{ record.OrgFileName }} + + + + + + + + + + + + + + + + + + {{ record.OrgFileName }} + + + + + + + + + + + + {{ record.OrgFileName }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - {{ record.PublishName }} + {{ record.PublishName }} @@ -29,7 +29,7 @@ :disabled="!(keys && keys.length > 0)" @click.prevent="onAmend">修改 音乐厅 + @click.prevent="onViewPreviewAudio">音乐厅 @@ -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">删除 音乐厅 + :disabled="!hasData" @click.prevent="onViewPreviewAudio">音乐厅 @@ -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 @@ - + 上移 - + 下移 - + 删除 @@ -329,7 +326,7 @@ :icon="h(EditOutlined)" :disabled="!hasData" @click.prevent="onViewPreview" - >作品展览相册展览 @@ -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 @@ - {{ record.PublishName }} + {{ record.PublishName }} @@ -29,7 +29,7 @@ :disabled="!(keys && keys.length > 0)" @click.prevent="onAmend">修改 影视厅 + @click.prevent="onViewPreviewVideo">影视厅 @@ -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">删除 影视厅 + :disabled="!hasData" @click.prevent="onViewPreviewVideo">影视厅 @@ -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);