merge

dotnetcore · Jun 15, 2023 · 2a96576 · 2a96576
2 parents c1985f5 + fd0fe14
commit 2a96576
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
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
@@ -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
@@ -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 = $('<form method="POST" action="' + url + '">');
         for (var attr in tempwhere) {
             if (tempwhere[attr] != null) {