diff --git a/packages/designer/src/components/components/view-model-designer/method-manager/components/method-list/method-list.component.tsx b/packages/designer/src/components/components/view-model-designer/method-manager/components/method-list/method-list.component.tsx index 253e06fde2fdca965d52e62d5a3e25168bbdab45..cf6a09df6b4e64edb9adf5bdd419fe97d3933ebf 100644 --- a/packages/designer/src/components/components/view-model-designer/method-manager/components/method-list/method-list.component.tsx +++ b/packages/designer/src/components/components/view-model-designer/method-manager/components/method-list/method-list.component.tsx @@ -117,7 +117,7 @@ export default defineComponent({ return param.name === 'lookupId'; }); if (lookupIdParam && !lookupIdParam.value) { - messageService?.warning('请先选择参照帮助'); + messageService?.warning('请先选择数据源。'); return false; } const foundParam = selectedData.params.find((paramItem: any) => paramItem?.controlSource?.type === 'Select'); diff --git a/packages/designer/src/components/composition/command.service.tsx b/packages/designer/src/components/composition/command.service.tsx index 77eca927cfb276542c81f45ac6678b8905db1e25..fc573900fbf099bfe212bc3a1d4c461555ade8ee 100644 --- a/packages/designer/src/components/composition/command.service.tsx +++ b/packages/designer/src/components/composition/command.service.tsx @@ -250,7 +250,7 @@ export function useFormCommandService( return param.name === 'lookupId'; }); if (lookupIdParam && !lookupIdParam.value) { - messageService?.warning('请先选择参照帮助'); + messageService?.warning('请先选择数据源。'); return false; } const foundParam = currentCommand.params.find((paramItem: any) => paramItem.name === 'lookupId'); diff --git a/packages/ui-vue/components/events-editor/src/components/parameter-editor/parameter-editor.component.tsx b/packages/ui-vue/components/events-editor/src/components/parameter-editor/parameter-editor.component.tsx index b4f51f629c71f0c1f91251cded2fea9436543010..2da3ff79c010e8f9134c9fd23c5c5347d64b38ef 100644 --- a/packages/ui-vue/components/events-editor/src/components/parameter-editor/parameter-editor.component.tsx +++ b/packages/ui-vue/components/events-editor/src/components/parameter-editor/parameter-editor.component.tsx @@ -222,6 +222,15 @@ export default defineComponent({ onEditorBlurHandler(); }} onValueChange={(event) => { + // 隐藏帮助命令下,切换帮助后,字段映射值清空 + if (propertyItem.origin?.Code === 'lookupId') { + const fieldMappingParamItem = command.value.property?.find((param: any) => { + return param.name === 'mappingFields'; + }); + if (fieldMappingParamItem && fieldMappingParamItem.value) { + fieldMappingParamItem.value = ''; + } + } onEditorChangeHandler(event, propertyItem); onEditorBlurHandler(); // 隐藏帮助命令下,切换帮助后,字段映射值清空 diff --git a/packages/ui-vue/components/tree-grid/src/tree-grid.component.tsx b/packages/ui-vue/components/tree-grid/src/tree-grid.component.tsx index 04383534ac4124cb4a8af827cccaee27cfe751c6..052e8ca0484a8de842f4769294cfd9750ad51468 100644 --- a/packages/ui-vue/components/tree-grid/src/tree-grid.component.tsx +++ b/packages/ui-vue/components/tree-grid/src/tree-grid.component.tsx @@ -484,6 +484,16 @@ export default defineComponent({ function getCollapseField() { return collapseField.value; } + + function selectRowById(dataItemId: string) { + const idField = useIdentifyComposition.idField.value; + const visibleItemToBeSelected = visibleDatas.value.find((visibleData: VisualData) => { + return visibleData.raw[idField] === dataItemId; + }) as VisualData; + if (visibleItemToBeSelected) { + useRowComposition.selectRow(visibleItemToBeSelected); + } + } context.expose({ activeRowById, addNewDataItem, @@ -508,7 +518,8 @@ export default defineComponent({ reassignRowData, hasChildren, getCollapseField, - getCollapseStatusById + getCollapseStatusById, + selectRowById }); const gridContentStyle = computed(() => {