diff --git a/packages/designer/src/components/components/view-model-designer/method-manager/components/method-selector/use-web-command-selector.ts b/packages/designer/src/components/components/view-model-designer/method-manager/components/method-selector/use-web-command-selector.ts index 9f12b16aecab9e7c986cf54fcb1419b57017b53b..1303b385971651ba60d1d75766b5857d5e6012bb 100644 --- a/packages/designer/src/components/components/view-model-designer/method-manager/components/method-selector/use-web-command-selector.ts +++ b/packages/designer/src/components/components/view-model-designer/method-manager/components/method-selector/use-web-command-selector.ts @@ -138,9 +138,9 @@ export function useWebCommandSelector() { if (!item.data) { return false; } - // 如果是自定义构件 + // 如果是自定义构件, 必须是支持vue才可显示 if (item.data.nameSpace.includes('.Front')) { - return true; + return item.data.properties?.framework==='Vue'; } return supportedControllers[item.data.id]; }) diff --git a/packages/designer/src/components/composition/schema-repository/controller/controller-selector.service.ts b/packages/designer/src/components/composition/schema-repository/controller/controller-selector.service.ts index 4932f15e9fefe8884e22372d2999389432dae996..549597a75f62857b000f1babc7a06e42ccd13d94 100644 --- a/packages/designer/src/components/composition/schema-repository/controller/controller-selector.service.ts +++ b/packages/designer/src/components/composition/schema-repository/controller/controller-selector.service.ts @@ -26,7 +26,7 @@ export class ControllerSelectorSchemaService { return metadata.filter((metadataItem) => { // 支持自定义构件 if (metadataItem.nameSpace.includes('.Front')) { - return true; + return metadataItem.properties?.framework==='Vue'; } // 移除暂不支持的内置控制器 if (!supportedControllers[metadataItem.id]) { diff --git a/packages/ui-vue/components/condition/src/composition/use-field-config.ts b/packages/ui-vue/components/condition/src/composition/use-field-config.ts index 24b6db9ee9e1ae2bfd7af1b4c796f6140c28d6f4..8f8a68d27778db3d358628534c0ae3584e4b7a70 100644 --- a/packages/ui-vue/components/condition/src/composition/use-field-config.ts +++ b/packages/ui-vue/components/condition/src/composition/use-field-config.ts @@ -47,7 +47,7 @@ export function useFieldConfig(props: ConditionProps, context: SetupContext): Us field.editor.selectMode="week"; } } - if(currentType ==='input-group') { + if(currentType ==='input-group'&&!field.editor.placeholder) { // 多语言在input-group内处理 field.editor.placeholder = '请输入'; } diff --git a/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts b/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts index 4aa0724ac918258c70cddd4b27f759e007b4b50a..abfba24a7433fd45d0cba4133779dc170ec8c007 100644 --- a/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts +++ b/packages/ui-vue/components/data-grid/src/composition/data-grid-component-creator.service.ts @@ -126,11 +126,18 @@ export class DataGridComponentCreatorService { onClick: `root-viewModel.${viewModelNode.id}.${commandPrefix}RemoveItem1` })]; if (!resolvedContainerSchema.toolbar) { - resolvedContainerSchema.toolbar = { id: `${resolvedContainerSchema.id}_toolbar`, buttons: [] }; + resolvedContainerSchema.toolbar = { + id: `${resolvedContainerSchema.id}_toolbar`, + type: DgControl['tab-page'].type === resolvedContainerType ? 'tab-toolbar' : 'section-toolbar', + buttons: [] + }; } if (!resolvedContainerSchema.toolbar.id) { resolvedContainerSchema.toolbar.id = `${resolvedContainerSchema.id}_toolbar`; } + if (!resolvedContainerSchema.toolbar.type) { + resolvedContainerSchema.toolbar.type = DgControl['tab-page'].type === resolvedContainerType ? 'tab-toolbar' : 'section-toolbar'; + } if (!resolvedContainerSchema.toolbar.buttons) { resolvedContainerSchema.toolbar.buttons = []; } diff --git a/packages/ui-vue/components/date-picker/src/designer/date-picker.design.component.tsx b/packages/ui-vue/components/date-picker/src/designer/date-picker.design.component.tsx index d8f1118ce0abea6e3c963ba0c5c40d2aee6fc029..a955d9a795a9b9989fe049905993bee292e4ed3a 100644 --- a/packages/ui-vue/components/date-picker/src/designer/date-picker.design.component.tsx +++ b/packages/ui-vue/components/date-picker/src/designer/date-picker.design.component.tsx @@ -69,14 +69,14 @@ export default defineComponent({ showBorder={false} editable={false} enableClear={false} - placeholder={props.placeholder} + placeholder={props.beginPlaceholder} >
diff --git a/packages/ui-vue/components/date-picker/src/schema/date-picker.schema.json b/packages/ui-vue/components/date-picker/src/schema/date-picker.schema.json index 5f76932787d8d3a52bf149056c3f277448bfb172..3562362342b039cd8226594c407832dbef5ddf0f 100644 --- a/packages/ui-vue/components/date-picker/src/schema/date-picker.schema.json +++ b/packages/ui-vue/components/date-picker/src/schema/date-picker.schema.json @@ -48,13 +48,11 @@ }, "beginPlaceholder": { "description": "", - "type": "string", - "default": "请选择开始日期" + "type": "string" }, "endPlaceholder": { "description": "", - "type": "string", - "default": "请选择结束日期" + "type": "string" }, "readonly": { "description": "", diff --git a/packages/ui-vue/components/events-editor/src/components/combine-form/combine-command-item.component.tsx b/packages/ui-vue/components/events-editor/src/components/combine-form/combine-command-item.component.tsx index d8aea32fca984f25fda42f30980864e0a3054218..37dfeef58520c1293f5d7e8c32001eafa8c028fc 100644 --- a/packages/ui-vue/components/events-editor/src/components/combine-form/combine-command-item.component.tsx +++ b/packages/ui-vue/components/events-editor/src/components/combine-form/combine-command-item.component.tsx @@ -35,7 +35,7 @@ export default defineComponent({ } const formName = selectedTargetForm.value?.name || selectedTargetForm.value?.code || ''; const commandName = selectedTargetCommand.value?.name || selectedTargetCommand.value?.code || ''; - return `${formName}-${commandName}`;; + return `${formName}-${commandName}`; }); /** 目标表单编号-命令编号 */ @@ -47,7 +47,7 @@ export default defineComponent({ const commandName = selectedTargetCommand.value?.name || selectedTargetCommand.value?.code || ''; const formCode = selectedTargetForm.value?.code || ''; const commandCode = selectedTargetCommand.value?.code || ''; - return `${formName} (${formCode})\n${commandName} (${commandCode})`;; + return `${formName} (${formCode})\n${commandName} (${commandCode})`; }); /** 失效的提示信息 */ diff --git a/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts b/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts index bc11231416a5d7407c7a6248cf7d801598ed1728..ba6347c7cf2903978ebe9889f0d1b8cb97ce9b23 100644 --- a/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts +++ b/packages/ui-vue/components/lookup/src/property-config/lookup.property-config.ts @@ -51,7 +51,7 @@ export function getLookupEditorCommonProperties(editorOptions, propsUtilsService ], repositoryToken: LookupSchemaRepositoryToken, }, - dataSourceConverter:lookupDataSourceConverter, + dataSourceConverter: lookupDataSourceConverter, idFieldEditor: { type: "field-selector", textField: 'bindingPath', @@ -176,7 +176,7 @@ export function getLookupDialogCommonProperties(editorOptions) { title: "标题", type: "string", visible: editorOptions.openType !== 'Popup', - $converter:lookupDialogOptionsConverter + $converter: lookupDialogOptionsConverter }, width: { description: "窗口宽度,最小值:300px", @@ -186,7 +186,7 @@ export function getLookupDialogCommonProperties(editorOptions) { ...numberEditor, min: showNavigatiorWidth() ? 520 : 300 }, - $converter:lookupDialogOptionsConverter + $converter: lookupDialogOptionsConverter }, height: { description: "窗口高度,最小值:200px", @@ -196,7 +196,7 @@ export function getLookupDialogCommonProperties(editorOptions) { ...numberEditor, min: 200 }, - $converter:lookupDialogOptionsConverter + $converter: lookupDialogOptionsConverter }, showNavigation: { description: "显示导航栏", @@ -216,42 +216,42 @@ export function getLookupDialogCommonProperties(editorOptions) { min: 200, max: (editorOptions?.dialog?.width ?? 960) - 200 }, - $converter:lookupDialogOptionsConverter + $converter: lookupDialogOptionsConverter }, resizeable: { description: "允许鼠标拖拽窗口边缘调整尺寸", title: "允许调整窗口尺寸", type: "boolean", visible: editorOptions.openType !== 'Popup', - $converter:lookupDialogOptionsConverter + $converter: lookupDialogOptionsConverter }, rememberSize: { description: "记录窗口尺寸", title: "记录窗口尺寸", type: "boolean", visible: !!editorOptions.enableUserData && (editorOptions?.dialog?.resizeable ?? true) && editorOptions.openType !== 'Popup', - $converter:lookupDialogOptionsConverter + $converter: lookupDialogOptionsConverter }, enableEsc: { description: "允许ESC关闭", title: "允许ESC关闭", type: "boolean", visible: editorOptions.openType !== 'Popup', - $converter:lookupDialogOptionsConverter + $converter: lookupDialogOptionsConverter }, showMaxButton: { description: "显示最大化按钮", title: "显示最大化按钮", type: "boolean", visible: editorOptions.openType !== 'Popup', - $converter:lookupDialogOptionsConverter + $converter: lookupDialogOptionsConverter }, showCloseButton: { description: "显示关闭按钮", title: "显示关闭按钮", type: "boolean", visible: editorOptions.openType !== 'Popup', - $converter:lookupDialogOptionsConverter + $converter: lookupDialogOptionsConverter } }; } @@ -260,7 +260,7 @@ export function getLookupDialogCommonProperties(editorOptions) { * @param editorOptions * @returns */ -export function getLookupPaginationProperties(editorOptions,refreshPanelAfterChanged=true) { +export function getLookupPaginationProperties(editorOptions, refreshPanelAfterChanged = true) { const disablePager = !editorOptions.pagination?.enable; const getDisplayType = () => { return editorOptions.displayType ? editorOptions.displayType.toUpperCase() : ''; @@ -291,14 +291,14 @@ export function getLookupPaginationProperties(editorOptions,refreshPanelAfterCha description: "显示每页条数选择器", title: "显示条数选择器", type: "boolean", - refreshPanelAfterChanged:refreshPanelAfterChanged, + refreshPanelAfterChanged: refreshPanelAfterChanged, visible: showPagerProperty(editorOptions) }, sizeLimits: { description: "每页可显示条数", title: "每页显示条数", type: "array", - refreshPanelAfterChanged:refreshPanelAfterChanged, + refreshPanelAfterChanged: refreshPanelAfterChanged, visible: showPagerProperty(editorOptions, 'showLimits'), editor: { columns: [ @@ -339,8 +339,9 @@ export function getLookupPaginationProperties(editorOptions,refreshPanelAfterCha type: "number", visible: showPagerProperty(editorOptions), editor: { - type: "number-spinner", - useThousands: false, + type: 'combo-list', + enableClear: false, + editable: false, data: getPageList(editorOptions.pagination?.sizeLimits), textField: 'value', idField: 'value', diff --git a/packages/ui-vue/components/number-range/src/designer/text-box.design.component.tsx b/packages/ui-vue/components/number-range/src/designer/text-box.design.component.tsx index 02c8d575693127fd74736a08f30dd809ce607844..ad36bbd71aee004ed8b8afd2af8cbb789c61b943 100644 --- a/packages/ui-vue/components/number-range/src/designer/text-box.design.component.tsx +++ b/packages/ui-vue/components/number-range/src/designer/text-box.design.component.tsx @@ -4,7 +4,7 @@ import { NumberRangeProps } from '../number-range.props'; export default function (props: NumberRangeProps, context: SetupContext, useTextBoxComposition: UseTextBox, isBeginTextBox: boolean) { const { onBlurTextBox, onFocusTextBox, onInput, onKeyDown, textBoxValue } = useTextBoxComposition; - const placeholder = computed(() =>isBeginTextBox ? props.beginPlaceHolder : props.endPlaceHolder); + const placeholder = computed(() =>isBeginTextBox ? props.beginPlaceholder : props.endPlaceholder); const numberTextBoxClass = computed(() => ({ 'form-control': true, diff --git a/packages/ui-vue/components/number-range/src/number-range.props.ts b/packages/ui-vue/components/number-range/src/number-range.props.ts index 8e8b91abe9e5c5dbba9ee5b2d5f2640880f4817e..ed01a78cd9cfb728a8fb03f192952d8b7edaa0dc 100644 --- a/packages/ui-vue/components/number-range/src/number-range.props.ts +++ b/packages/ui-vue/components/number-range/src/number-range.props.ts @@ -33,7 +33,7 @@ export const numberRangeProps = { /** * 下限placeholder---未实现 */ - beginPlaceHolder: { type: String, default: '请输入开始数字' }, + beginPlaceholder: { type: String, default: '开始数字' }, /** * 下限值 */ @@ -62,7 +62,7 @@ export const numberRangeProps = { /** * 上限placeholder---未实现 */ - endPlaceHolder: { type: String, default: '请输入结束数字' }, + endPlaceholder: { type: String, default: '结束数字' }, /** * 上限值 */ diff --git a/packages/ui-vue/components/number-range/src/schema/number-range.schema.json b/packages/ui-vue/components/number-range/src/schema/number-range.schema.json index ce43b2e3153b6ea2c9a6003bbc45e27630643a82..ca3f0db1a20017ed4d81568abd93bd04e0654f12 100644 --- a/packages/ui-vue/components/number-range/src/schema/number-range.schema.json +++ b/packages/ui-vue/components/number-range/src/schema/number-range.schema.json @@ -91,7 +91,16 @@ "max": { "description": "", "type": "string" + }, + "beginPlaceholder": { + "description": "", + "type": "string" + }, + "endPlaceholder": { + "description": "", + "type": "string" } + }, "required": [ "type" diff --git a/packages/ui-vue/components/number-spinner/src/composition/use-locales.ts b/packages/ui-vue/components/number-spinner/src/composition/use-locales.ts index f1af38a01ae1b1d117b87efec37b4396aadec6d1..087c0ab537ea89dd2b802571171888633d0e11fa 100644 --- a/packages/ui-vue/components/number-spinner/src/composition/use-locales.ts +++ b/packages/ui-vue/components/number-spinner/src/composition/use-locales.ts @@ -19,8 +19,8 @@ export function useNumberLocales(props: NumberSpinnerProps): NumberLocaleData { } const placeholder = getValue('numberSpinner.placeholder', props.placeholder, '请输入数字'); const range = { - begin: getValue('numberSpinner.range.begin', props.beginPlaceHolder, '开始数字'), - end: getValue('numberSpinner.range.end', props.endPlaceHolder, '结束数字'), + begin: getValue('numberSpinner.range.begin', props.beginPlaceholder, '开始数字'), + end: getValue('numberSpinner.range.end', props.endPlaceholder, '结束数字'), }; return { placeholder, range }; } diff --git a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/composition/use-property.ts b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/composition/use-property.ts index 1cd53b1097712c5c0eecd3cc1ab1fba0166bdfd0..0d662c2e12c25b66ac85bdcf73c393ca593d9701 100644 --- a/packages/ui-vue/components/query-solution/src/designer/query-solution-config/composition/use-property.ts +++ b/packages/ui-vue/components/query-solution/src/designer/query-solution-config/composition/use-property.ts @@ -347,12 +347,12 @@ export function useProperty( if (['date-range', 'datetime-range', 'month-range', 'number-range'].indexOf(controlType) > -1) { delete (commonProperties as any).placeholder; Object.assign(commonProperties, { - "beginPlaceHolder": { + "beginPlaceholder": { description: "开始提示文本", title: "开始提示文本", type: "string", }, - "endPlaceHolder": { + "endPlaceholder": { description: "结束提示文本", title: "结束提示文本", type: "string", diff --git a/packages/ui-vue/components/schema-selector/src/components/nav-list-view.component.tsx b/packages/ui-vue/components/schema-selector/src/components/nav-list-view.component.tsx index f98d648a0ebb8d764ae600bf07d2177a923c8d30..abe9c6a5cef3c8cadfde777534d1c7dd68a045ba 100644 --- a/packages/ui-vue/components/schema-selector/src/components/nav-list-view.component.tsx +++ b/packages/ui-vue/components/schema-selector/src/components/nav-list-view.component.tsx @@ -145,6 +145,16 @@ export default defineComponent({
+
+
+ +
+
selectionChangeEventHandler(event)}> {{ diff --git a/packages/ui-vue/components/section/src/designer/section-toolbar.design.component.tsx b/packages/ui-vue/components/section/src/designer/section-toolbar.design.component.tsx index 472a7e1941a0fbb6a6176b17b457a1c8e56d3b33..ac357897283f63141f32f914d39959a59219cdc7 100644 --- a/packages/ui-vue/components/section/src/designer/section-toolbar.design.component.tsx +++ b/packages/ui-vue/components/section/src/designer/section-toolbar.design.component.tsx @@ -14,6 +14,9 @@ export default function ( }); const items = ref(props.buttons); const toolbarSchema = ref(designerItemContext.schema.toolbar); + if(toolbarSchema.value&&!toolbarSchema.value.type){ + toolbarSchema.value.type='section-toolbar'; + } const sectionComponentId = props.componentId; const sectionToolbarId = `${sectionComponentId}-toolbar`; const toolbarAlignment = computed(() => { return props.buttonPosition === 'inHead' ? 'right' : 'left'; }); diff --git a/packages/ui-vue/components/section/src/designer/use-designer-rules.ts b/packages/ui-vue/components/section/src/designer/use-designer-rules.ts index fe0ad5c4c8a785e87a6f713cc1963977eff30482..f9082b6dc91f3ff6205924b1ccef9716ee901923 100644 --- a/packages/ui-vue/components/section/src/designer/use-designer-rules.ts +++ b/packages/ui-vue/components/section/src/designer/use-designer-rules.ts @@ -112,7 +112,7 @@ export function useDesignerRules(designItemContext: DesignerItemContext, designe } const { schema } = designItemContext; if (!schema.toolbar || !schema.toolbar.buttons) { - schema.toolbar = { id: `${schema.id}_toolbar`, buttons: [] }; + schema.toolbar = { id: `${schema.id}_toolbar`, type:'section-toolbar',buttons: [] }; } const sectionToolbarItemSchema = getSchemaByType('section-toolbar-item') as ComponentSchema; sectionToolbarItemSchema.id = `section_toolbar_item_${Math.random().toString().slice(2, 6)}`;