diff --git a/packages/designer/src/components/composition/control-creator/use-pc-control-creator.service.ts b/packages/designer/src/components/composition/control-creator/use-pc-control-creator.service.ts index 612c51e8acd5b12db3064151cba88f59061b933f..8954685de0cf4b49cd31fe2d12de9faf8dd9de1d 100644 --- a/packages/designer/src/components/composition/control-creator/use-pc-control-creator.service.ts +++ b/packages/designer/src/components/composition/control-creator/use-pc-control-creator.service.ts @@ -60,6 +60,9 @@ export function usePCControlCreator(schemaService: UseSchemaService): UseControl } else { formEditor.precision = field.type.precision; formEditor.nullable = true; + if (position === 'Grid') { + formEditor.textAlign = 'right'; + } } } // 数字、字符串、备注 :设置最大长度 @@ -218,25 +221,11 @@ export function usePCControlCreator(schemaService: UseSchemaService): UseControl // 设置列类型. 若是枚举类型再设置enumData;若是日期类型,设置默认格式;数字类型设置格式、精度 metadata.dataType = mapControlType2GridFieldType(field); + // 数字类列配置为右对齐 if (metadata.dataType === 'number') { metadata.halign = 'right'; metadata.align = 'right'; } - // 枚举类型 设置enumData - // if (metadata.dataType === 'enum' && field.type) { - // metadata.enumData = field.type.enumValues; - // metadata.idField = 'value'; - // metadata.valueField = 'value'; - // metadata.textField = 'name'; - // } - metadata.multiLanguage = field.multiLanguage; - - // 日期类型字段:增加数据国际化配置 - if (field.type.name === FormSchemaEntityFieldTypeName.Date || - field.type.name === FormSchemaEntityFieldTypeName.DateTime) { - metadata.localization = false; - metadata.localizationType = field.type.name; - } // 列格式 setGridFieldFormatter(metadata.dataType, metadata, field); diff --git a/packages/designer/src/components/composition/design-viewmodel.service.ts b/packages/designer/src/components/composition/design-viewmodel.service.ts index f6a3ce968a242b00dfca9ccb4d990baa0789179b..4b2b585c3a3f8b17de0a0351113085b9dce13ffc 100644 --- a/packages/designer/src/components/composition/design-viewmodel.service.ts +++ b/packages/designer/src/components/composition/design-viewmodel.service.ts @@ -1,6 +1,6 @@ /* eslint-disable no-use-before-define */ import { merge } from "lodash-es"; -import { FormBindingType, FormSchemaEntityField, UseDesignViewModel, UseFormSchema, UseSchemaService } from "../types"; +import { EntityFieldTypeDisplayNamei18n, FormBindingType, FormSchemaEntityField, UseDesignViewModel, UseFormSchema, UseSchemaService } from "../types"; import { DesignViewModel, DesignViewModelField } from "../types/design-viewmodel"; import { cloneDeep } from 'lodash-es'; @@ -134,8 +134,10 @@ export function useDesignViewModel(useFormSchema: UseFormSchema, schemaService: const dgField = dgVMFields.find(d => d.id === element.id); const clonedField = dgField ? cloneDeep(dgField) : cloneDeep(element); + const displayTypeNamei18n = (element.multiLanguage ? EntityFieldTypeDisplayNamei18n.MultiLanguage : EntityFieldTypeDisplayNamei18n[element.type.name]) || element.type.displayName; + treeData.push({ - data: Object.assign({ rawData: clonedField, fieldType: clonedField.type.displayName }, clonedField), + data: Object.assign({ rawData: clonedField, fieldType: displayTypeNamei18n }, clonedField), children }); }); diff --git a/packages/ui-vue/components/binding-selector/src/components/binding-selector-container.component.tsx b/packages/ui-vue/components/binding-selector/src/components/binding-selector-container.component.tsx index 2708cbcde8b7541ba2a9d87d64a70fbcfafc0c77..01a6629f40e2b22fccda66a09cc8b3c4077b91db 100644 --- a/packages/ui-vue/components/binding-selector/src/components/binding-selector-container.component.tsx +++ b/packages/ui-vue/components/binding-selector/src/components/binding-selector-container.component.tsx @@ -78,6 +78,12 @@ export default defineComponent({ ; } + function getRealFieldType(visualData: any) { + if (visualData.raw.multiLanguage) { + return 'multiLanguage'; + } + return bindingType.value === 'Form' ? visualData.raw.type?.name : visualData.raw.type; + } // 配置行禁用 const rowOption: Partial = { customRowStatus: (visualData: VisualData) => { @@ -91,7 +97,7 @@ export default defineComponent({ visualData.disabled = true; return visualData; } - const fieldTypeNode = bindingType.value === 'Form' ? visualData.raw.type?.name : visualData.raw.type; + const fieldTypeNode = getRealFieldType(visualData); // 1、由复杂类型字段切换成其他字段类型:新字段适配控件类型即可 // 2、原字段被删除或原本没有绑定信息:新字段适配控件类型即可 diff --git a/packages/ui-vue/components/binding-selector/src/composition/use-field-selection.ts b/packages/ui-vue/components/binding-selector/src/composition/use-field-selection.ts index 1542f7627a35bf3cb575773a6643d47463052fe4..52e6ff7651fd35ace91aa3e8b71af303175badaa 100644 --- a/packages/ui-vue/components/binding-selector/src/composition/use-field-selection.ts +++ b/packages/ui-vue/components/binding-selector/src/composition/use-field-selection.ts @@ -273,7 +273,7 @@ export function useFieldSelection(props: BindingSelectorProps) { } // 追加多语控件 - // controlFieldMapping.LanguageTextBox = ['multiLanguage']; + controlFieldMapping['language-textbox'] = ['multiLanguage']; return controlFieldMapping[editorType]; } diff --git a/packages/ui-vue/components/data-grid/src/property-config/data-grid-column.property-config.ts b/packages/ui-vue/components/data-grid/src/property-config/data-grid-column.property-config.ts index 839de59999f9d899237824d94e2eb32f39d38244..3e94e6aba8c795fab656da65309bb2c9f1c553a2 100644 --- a/packages/ui-vue/components/data-grid/src/property-config/data-grid-column.property-config.ts +++ b/packages/ui-vue/components/data-grid/src/property-config/data-grid-column.property-config.ts @@ -752,10 +752,6 @@ export class DataGriColumnProperty extends BaseControlProperty { if (this.designViewModelField && this.designViewModelField.$type === FormSchemaEntityField$Type.SimpleField) { editorTypeList = SchemaDOMMapping.getEditorTypesByMDataType(this.designViewModelField.type.name, this.designViewModelField.multiLanguage, propertyData.type); } - if (!propertyData.multiLanguage) { - // 不启用多语,不提供多语文本编辑器的选项 - editorTypeList = editorTypeList.filter((editorType: { key: string, value: string }) => editorType.key !== 'language-textbox'); - } return { canChangeControlType, editorTypeList }; } /**