diff --git a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/create.vue b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/create.vue index 6a118a4de..eb22a62b5 100644 --- a/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/create.vue +++ b/demo/WalkingTec.Mvvm.Vue3Demo/ClientApp/src/views/_admin/frameworkmenu/create.vue @@ -172,7 +172,7 @@ const state = reactive({ IsPublic: null, IsInside: true, }, - SelectedModule: [], + SelectedModule: null, SelectedActionIDs: [] as any[], SelectedRolesIds: [] }, diff --git a/src/WalkingTec.Mvvm.Mvc/framework_layui.js b/src/WalkingTec.Mvvm.Mvc/framework_layui.js index 955ac07d2..7a25a5889 100644 --- a/src/WalkingTec.Mvvm.Mvc/framework_layui.js +++ b/src/WalkingTec.Mvvm.Mvc/framework_layui.js @@ -932,13 +932,13 @@ window.ff = { } var tempwhere = {}; $.extend(tempwhere, defaultcondition); - for (let item in tempwhere) { + $.extend(tempwhere, formData); + for (let item in tempwhere) { if (item.startsWith("Searcher.") == false) { tempwhere["Searcher." + item] = tempwhere[item]; } } - $.extend(tempwhere, formData); var form = $('
'); for (var attr in tempwhere) { if (tempwhere[attr] != null) {