diff --git a/packages/command-services/lib/batch-edit.service.ts b/packages/command-services/lib/batch-edit.service.ts index 58bc7fc420e41efb5d2e10583e50237d26949714..00e979491bdae03e99650211cff7a3c2ba1b8779 100644 --- a/packages/command-services/lib/batch-edit.service.ts +++ b/packages/command-services/lib/batch-edit.service.ts @@ -4,7 +4,7 @@ import { LocaleService } from './locale'; import { FormNotifyService } from './form-notify.service'; import { FormLoadingService } from './form-loading.service'; import { DialogService } from './dialog.service'; -import { LookupDataReferenceService } from './lookup-data-reference.service'; +import { ReferenceDictDataService } from './reference-dict-data.service'; /** * 批量编辑服务 @@ -32,7 +32,7 @@ export class BatchEditService { private formNotifyService: FormNotifyService, private formLoadingService: FormLoadingService, private dialogService: DialogService, - private lookupDataReferenceService: LookupDataReferenceService + private referenceDictDataService: ReferenceDictDataService ) { this.repository = viewModel.repository as BefRepository; this.entityStore = viewModel.entityStore as EntityStore>; @@ -126,7 +126,7 @@ export class BatchEditService { */ public batchAppend(frameId: string, mapFields: string): Promise | undefined { const dictPickedContext = (this as any).context; - return this.lookupDataReferenceService.batchAppendByContext(dictPickedContext, mapFields); + return this.referenceDictDataService.batchAppendByContext(dictPickedContext, mapFields); } public clone(id: string, path: string) { } diff --git a/packages/command-services/lib/index.ts b/packages/command-services/lib/index.ts index c9dc6c72ef61a5ca524128c5f04c1f65017e36e5..afb5820243ea90636a97582e11b52cabf51c079b 100644 --- a/packages/command-services/lib/index.ts +++ b/packages/command-services/lib/index.ts @@ -17,7 +17,7 @@ export * from './entity-change.service'; export * from './pagination.service'; export * from './data-services/tree-data.service'; export * from './lookup-data.service'; -export * from './lookup-data-reference.service'; +export * from './reference-dict-data.service'; export * from './change-item.service'; export * from './data-check.service'; export * from './datagrid.service'; diff --git a/packages/command-services/lib/providers.ts b/packages/command-services/lib/providers.ts index e6098e539c5d0327b94cd362617fe7cea255f95b..2aaded0d59f04f4cf2ea952e7d5a52df46ce2280 100644 --- a/packages/command-services/lib/providers.ts +++ b/packages/command-services/lib/providers.ts @@ -15,7 +15,7 @@ import { EntityChangeService, PaginationService, TreeDataService, LookupDataService, - LookupDataReferenceService, + ReferenceDictDataService, StateService, FormExceptionHandler, changeItemService, @@ -82,7 +82,7 @@ const commandServiceViewModelProviders: StaticProvider[] = [ { provide: PaginationService, useClass: PaginationService, deps: [ViewModel] }, { provide: TreeDataService, useClass: TreeDataService, deps: [ViewModel, FormLoadingService, FormNotifyService, FormMessageService, StateService, EntityChangeService] }, { provide: LookupDataService, useClass: LookupDataService, deps: [ViewModel, HttpClient] }, - { provide: LookupDataReferenceService, useClass: LookupDataReferenceService, deps: [ViewModel, FormNotifyService, FormLoadingService, DialogService, CreateDataService] }, + { provide: ReferenceDictDataService, useClass: ReferenceDictDataService, deps: [ViewModel, FormNotifyService, FormLoadingService, DialogService, CreateDataService] }, { provide: CardDataService, useClass: CardDataService, deps: [ViewModel, FormLoadingService, FormNotifyService, EntityChangeService, FormMessageService] }, { provide: ListDataService, useClass: ListDataService, deps: [ViewModel, FormLoadingService, FormMessageService, FormNotifyService, EntityChangeService] }, { provide: SubListDataService, useClass: SubListDataService, deps: [ViewModel, FormLoadingService, FormMessageService, FormNotifyService] }, @@ -94,7 +94,7 @@ const commandServiceViewModelProviders: StaticProvider[] = [ { provide: ValidationService, useClass: ValidationService, deps: [ViewModel] }, { provide: GridMiddlewareService, useClass: GridMiddlewareService, deps: [ViewModel] }, { provide: BindingDataService, useClass: BindingDataService, deps: [ViewModel] }, - { provide: BatchEditService, useClass: BatchEditService, deps: [ViewModel, FormNotifyService, FormLoadingService, DialogService, LookupDataReferenceService] }, + { provide: BatchEditService, useClass: BatchEditService, deps: [ViewModel, FormNotifyService, FormLoadingService, DialogService, ReferenceDictDataService] }, { provide: DialogService, useClass: DialogService, deps: [ViewModel, RenderEngineService] }, { provide: FormAttentionService, useClass: FormAttentionService, deps: [ViewModel] }, { provide: DiscussionGroupService, useClass: DiscussionGroupService, deps: [ViewModel, FormLoadingService, RuntimeFrameworkService] }, diff --git a/packages/command-services/lib/lookup-data-reference.service.ts b/packages/command-services/lib/reference-dict-data.service.ts similarity index 98% rename from packages/command-services/lib/lookup-data-reference.service.ts rename to packages/command-services/lib/reference-dict-data.service.ts index 7aa09e2a3249a325edc8fd4c32199f9de6b8e6bd..5286f1245543a71abea49d29ecf291a688345346 100644 --- a/packages/command-services/lib/lookup-data-reference.service.ts +++ b/packages/command-services/lib/reference-dict-data.service.ts @@ -7,9 +7,9 @@ import { DialogService, LookupConfig } from './dialog.service'; import { CreateDataService } from './data-services/index'; /** - * 帮助数据引用服务 + * 引用字典数据服务 */ -class LookupDataReferenceService { +class ReferenceDictDataService { /** * 实体仓库 @@ -142,5 +142,5 @@ class LookupDataReferenceService { } } -export { LookupDataReferenceService }; +export { ReferenceDictDataService }; diff --git a/packages/designer/src/components/composition/schema-repository/controller/pc-categories.ts b/packages/designer/src/components/composition/schema-repository/controller/pc-categories.ts index ba1dcb20891f9247aa315935424f191681486e24..8ccdbb5d16d99bc091862e83f99a78dac3f29ebf 100644 --- a/packages/designer/src/components/composition/schema-repository/controller/pc-categories.ts +++ b/packages/designer/src/components/composition/schema-repository/controller/pc-categories.ts @@ -31,7 +31,7 @@ export default [ code: 'data', name: '数据', active: false, - contains: ['RemoveCommands', 'EditCommands', 'BatchEditCommands', 'LoadCommands', 'LookupDataReferenceCommands'] + contains: ['RemoveCommands', 'EditCommands', 'BatchEditCommands', 'LoadCommands', 'ReferenceDictDataCommands'] }, // { // id: 'flow',