From 60424cea0e5dc3535315117be226e887f125f668 Mon Sep 17 00:00:00 2001 From: aalizzwell Date: Mon, 11 Aug 2025 05:39:30 +0000 Subject: [PATCH 1/2] =?UTF-8?q?!1848=20chore:=20=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=8D=E5=8A=A1=E6=B3=A8=E5=85=A5=20*=20ch?= =?UTF-8?q?ore:=20=E5=B1=8F=E8=94=BD=E6=89=93=E5=8D=B0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command-services/lib/print.service.ts | 166 +----------------- packages/command-services/lib/providers.ts | 4 +- 2 files changed, 9 insertions(+), 161 deletions(-) diff --git a/packages/command-services/lib/print.service.ts b/packages/command-services/lib/print.service.ts index e330999dc85..61473e615fc 100644 --- a/packages/command-services/lib/print.service.ts +++ b/packages/command-services/lib/print.service.ts @@ -1,15 +1,9 @@ -import { LanguageService } from './language.service'; -import { CloudPrintService, OutputOptions, SourceOptions, OutputType, FileType, SourceFilterOptions, PrintType } from '@gsp-svc/cloudprint-vue'; -import { FormNotifyService } from './form-notify.service'; - class PrintService { /** * 构造函数 */ constructor( - private languageService: LanguageService, - private printService: CloudPrintService, - private formNotifyService: FormNotifyService, + ) { } @@ -19,11 +13,7 @@ class PrintService { * @param bizBillId 业务单据标识 */ public printSingle(beMetaId: string, bizBillId: string) { - if (!bizBillId) { - this.showWarning(this.languageService.language.unallowEmptyBizBillId); - return Promise.reject(); - } - return this.printArray(beMetaId, [bizBillId]); + } /** * 打印单据（通过id或ids） @@ -31,15 +21,7 @@ class PrintService { * @param ids 单据id或ids */ public printByIds(beMetaId: string, ids: string | string[]) { - if (!ids) { - this.showWarning(this.languageService.language.unallowEmptyBizBillId); - return Promise.reject(); - } - if (typeof ids === 'string') { - ids = ids.split(',').filter(item => item); - } - const dataIds: Array = ids; - return this.printArray(beMetaId, dataIds); + } /** * 打印单据（带维度） @@ -50,12 +32,7 @@ class PrintService { * @param billCategoryId 单据类型Id */ public printByIdsWithDimension(beMetaId: string, ids: string, dim1: string, dim2: string, billCategoryId?: string) { - if (!ids) { - this.showWarning(this.languageService.language.unallowEmptyBizBillId); - return Promise.reject(); - } - const dataIds: Array = ids.split(',').filter(item => item); - return this.printArray(beMetaId, dataIds, dim1, dim2, billCategoryId); + } /** * 打印多个单据 @@ -66,27 +43,7 @@ class PrintService { * @param billCategoryId 业务单据类型Id */ public printArray(beMetaId: string, dataIds: string[], dim1?: any, dim2?: any, billCategoryId?: string) { - if (!dataIds || dataIds.length === 0) { - this.showWarning(this.languageService.language.unallowEmptyBizBillId); - return Promise.reject(); - } - const sourceOptions: SourceOptions = this.buildSourceOptions({ - dataIds: dataIds, - sourceId: beMetaId - }); - - const outputOptions: OutputOptions = this.buildOutputOptions(); - - if (typeof dim1 !== 'undefined') { - sourceOptions.FirstDimensionVal = dim1; - } - if (typeof dim2 !== 'undefined') { - sourceOptions.SecondDimensionVal = dim2; - } - if (typeof billCategoryId !== 'undefined') { - sourceOptions.billCategoryId = billCategoryId; - } - return this.printService.outputBEData(sourceOptions, outputOptions, 'tab'); + } /** @@ -97,23 +54,7 @@ class PrintService { * @param includeChildData 包含子表数据 */ public printMulti(beMetaId: string, filterCondition: string, sortCondition: string, includeChildData: boolean = true) { - const entryFilter = { 'isUsePagination': false, 'filterConditions': [], 'sortConditions': [], 'pagination': null }; - if (filterCondition) { - // 统一纠正最后一个过滤条件的Relation - const filters = JSON.parse(filterCondition); - if (filters && filters.length > 0) { - filters[filters.length - 1].Relation = 0; - } - entryFilter.filterConditions = filters; - } - - if (sortCondition) { - entryFilter.sortConditions = JSON.parse(sortCondition); - } - // sfo:SourceFilterOptions - const sourceFilterOptions: SourceFilterOptions = this.buildSourceFilterOptions({ sourceId: beMetaId, entryFilter, includeChildData }); - const outputOptions: OutputOptions = this.buildOutputOptions(); - return this.printService.outputBEDataWithFilter(sourceFilterOptions, outputOptions, 'tab'); + } /** * 按照BE取数方式批量打印单据(带维度) @@ -126,100 +67,7 @@ class PrintService { * @param includeChildData 包含子表数据 */ public printMultiWithDimension(beMetaId: string, filterCondition: string, sortCondition: string, dim1: string, dim2: string, billCategoryId?: string, includeChildData: boolean = true) { - const entryFilter = { 'isUsePagination': false, 'filterConditions': [], 'sortConditions': [], 'pagination': null }; - if (filterCondition) { - // 统一纠正最后一个过滤条件的Relation - const filters = JSON.parse(filterCondition); - if (filters && filters.length > 0) { - filters[filters.length - 1].Relation = 0; - } - entryFilter.filterConditions = filters; - } - - if (sortCondition) { - entryFilter.sortConditions = JSON.parse(sortCondition); - } - const sfo: SourceFilterOptions = this.buildSourceFilterOptions({ sourceId: beMetaId, entryFilter, includeChildData }); - if (typeof dim1 !== 'undefined') { - sfo.FirstDimensionVal = dim1; - } - if (typeof dim2 !== 'undefined') { - sfo.SecondDimensionVal = dim2; - } - if (typeof billCategoryId !== 'undefined') { - sfo.billCategoryId = billCategoryId; - } - const outputOptions: OutputOptions = this.buildOutputOptions(); - return this.printService.outputBEDataWithFilter(sfo, outputOptions, 'tab'); - } - /** - * 构造SourceOptions - * @param options options - */ - private buildSourceOptions(options: { dataIds: string[], sourceId: string, [prop: string]: any; }): SourceOptions { - const outputOptions: SourceOptions = { - DataIds: options.dataIds, - SourceId: options.sourceId, - FirstDimensionVal: options.dim1, - SecondDimensionVal: options.dim2, - RetrieveParam: options.retrieveParam, - FormatId: options.formatId, - billCategoryId: options.billCategoryId, - ServiceUnit: options.serviceUnit, - currentPage: options.currentPage, - pageRowCount: options.pageRowCount, - queryType: options.queryType, - queryServiceId: options.queryServiceId, - queryParam: options.queryParam - }; - return outputOptions; - } - /** - * 构造OutputOptions - * @param options options - */ - private buildOutputOptions(options?: { [prop: string]: any; }): OutputOptions { - const outputOptions: OutputOptions = { - OutputType: options && options.outputType || OutputType.PRINT, - FileType: options && options.fileType || FileType.Html5, - Path: options && options.path, - DeviceId: options && options.deviceId, - printJob: options && options.printJob, - printerName: options && options.printerName, - printSetting: options && options.printSetting, - printType: options && options.printType || PrintType.Form, - }; - return outputOptions; - } - /** - * 构造SourceFilterOptions - * @param options options - */ - private buildSourceFilterOptions(options: { sourceId: string, [prop: string]: any; }): SourceFilterOptions { - const entryFilter = { 'isUsePagination': false, 'filterConditions': [], 'sortConditions': [], 'pagination': null }; - const sourceFilterOptions: SourceFilterOptions & { [prop: string]: any; } = { - SourceId: options.sourceId, - EntityFilter: options.entryFilter || entryFilter, - FirstDimensionVal: options.dim1, - SecondDimensionVal: options.dim2, - FormatId: options.formatId, - ServiceUnit: options.serviceUnit, - billCategoryId: options.billCategoryId, - currentPage: options.currentPage, - pageRowCount: options.pageRowCount, - queryParam: options.queryParam, - queryServiceId: options.queryServiceId, - queryType: options.queryType, - includeChildData: options && options.hasOwnProperty('includeChildData') ? options.includeChildData : true - }; - return sourceFilterOptions; - } - /** - * 展示错误消息 - * @param message 错误消息 - */ - private showWarning(message: string) { - this.formNotifyService.warning(message); + } } diff --git a/packages/command-services/lib/providers.ts b/packages/command-services/lib/providers.ts index 5044fd8fc29..cadc0f02dae 100644 --- a/packages/command-services/lib/providers.ts +++ b/packages/command-services/lib/providers.ts @@ -51,7 +51,7 @@ import { } from './index'; import { UploadDialogService, DownloadService } from '@gsp-svc/formdoc-upload-vue'; import { FileViewerService } from '@gsp-svc/file-viewer-vue'; -import { CloudPrintService } from '@gsp-svc/cloudprint-vue'; + const commandServicesDevkitProviders: StaticProvider[] = [ { provide: QuerystringService, useClass: QuerystringService, deps: [] }, @@ -119,7 +119,7 @@ const commandServiceViewModelProviders: StaticProvider[] = [ // 参数解析服务 { provide: ParamService, useClass: ParamService, deps: [QuerystringService, RuntimeFrameworkService] }, { provide: ApplicationParamService, useClass: ApplicationParamService, deps: [ParamService, RuntimeFrameworkService, ViewModel] }, - { provide: PrintService, useClass: PrintService, deps: [LanguageService, CloudPrintService, FormNotifyService] }, + { provide: PrintService, useClass: PrintService, deps: [] }, { provide: ContextService, useClass: ContextService, deps: [ ViewModel, RenderEngineService ] } ]; -- Gitee From e652622119a41b5e983f668807db9117a15e5aa1 Mon Sep 17 00:00:00 2001 From: wang-xh Date: Mon, 11 Aug 2025 05:49:00 +0000 Subject: [PATCH 2/2] =?UTF-8?q?!1852=20=E7=A7=BB=E9=99=A4=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E5=AE=B9=E5=99=A8=E6=97=B6=E5=90=8C=E6=97=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=BB=84=E4=BB=B6=E9=80=9A=E8=AE=AF=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=20*=20fix:=20=E7=A7=BB=E9=99=A4=E5=A4=96=E9=83=A8=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E6=97=B6=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E9=80=9A=E8=AE=AF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/designer/src/components/composition/use-form-schema.ts | 2 +- .../src/property-config/external-container.property-config.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/designer/src/components/composition/use-form-schema.ts b/packages/designer/src/components/composition/use-form-schema.ts index 84dc6ced8a3..47c631d8f47 100644 --- a/packages/designer/src/components/composition/use-form-schema.ts +++ b/packages/designer/src/components/composition/use-form-schema.ts @@ -1260,7 +1260,7 @@ export function useFormSchema(): UseFormSchema { Object.keys(controlEventPropertyIDList).forEach(propertyId => { const propertyValue = componentSchema[propertyId]; if (propertyValue && propertyValue.includes('communication:')) { - const communicationIds = propertyValue.replace('communication:', '').split(';'); + const communicationIds = propertyValue.replace(/communication:/g, '').split(';'); formSchema.module.communications = formSchema.module.communications?.filter(communication => !communicationIds.includes(communication.id)); } }); diff --git a/packages/ui-vue/components/external-container/src/property-config/external-container.property-config.ts b/packages/ui-vue/components/external-container/src/property-config/external-container.property-config.ts index 6698f2014aa..2f79d903179 100644 --- a/packages/ui-vue/components/external-container/src/property-config/external-container.property-config.ts +++ b/packages/ui-vue/components/external-container/src/property-config/external-container.property-config.ts @@ -130,7 +130,7 @@ export class ExternalContainerProperty extends BaseControlProperty { if (!propertyData.onCommunication) { return; } - const communicationIds = propertyData.onCommunication.replace('communication:', '').split(';'); + const communicationIds = propertyData.onCommunication.replace(/communication:/g, '').split(';'); if (!communicationIds?.length) { return; } -- Gitee