diff --git a/packages/ui-vue/components/lookup/src/composition/use-http.ts b/packages/ui-vue/components/lookup/src/composition/use-http.ts index 039fea5c785d2963f5cb8edbdc5a70217df5e52c..70f6a77ea12d5fd19a760d00bfa5f7da07d46992 100644 --- a/packages/ui-vue/components/lookup/src/composition/use-http.ts +++ b/packages/ui-vue/components/lookup/src/composition/use-http.ts @@ -346,7 +346,7 @@ export function useHttp(props: LookupProps, context: any): UseHttpComposition { try { let httpResult = await getData(params); - if (lookupOptions.displayType !== httpResult.displayType) { + if (lookupOptions.displayType !== httpResult.displayType && event.action !== 'navsearch') { lookupOptions.displayType = httpResult.displayType; } diff --git a/packages/ui-vue/components/lookup/src/composition/use-treegrid.tsx b/packages/ui-vue/components/lookup/src/composition/use-treegrid.tsx index 6dc7352a04631145ad83e40e4554e5069f1ef8a3..6e4391a2f167dfd2706976cb18b3a42a7b3cc38d 100644 --- a/packages/ui-vue/components/lookup/src/composition/use-treegrid.tsx +++ b/packages/ui-vue/components/lookup/src/composition/use-treegrid.tsx @@ -65,7 +65,7 @@ export function useTreegrid(props: LookupProps, context: SetupContext) { } newColumns && setColumns(treegridRef.value, newColumns, true); - newItems && treeGridLoadData(newItems, lookupState['action'] === 'search'); + treeGridLoadData(newItems || [], lookupState['action'] === 'search'); } }); diff --git a/packages/ui-vue/components/modal/src/modal.component.tsx b/packages/ui-vue/components/modal/src/modal.component.tsx index 8cf6c374250e7fd692e289d9ac3ef53c51fb3b25..fbfe122d47a5aa19581bde310929bbc5b152bca4 100644 --- a/packages/ui-vue/components/modal/src/modal.component.tsx +++ b/packages/ui-vue/components/modal/src/modal.component.tsx @@ -269,8 +269,8 @@ export default defineComponent({ return Object.assign(styleObject, footerSytles); }); - function maxDialog($event: MouseEvent) { - $event.stopPropagation(); + function maxDialog($event?: MouseEvent) { + $event?.stopPropagation(); if (maximized.value) { maximized.value = false; restore();