Merge branch 'main' into refactor-modal

ArgoZhang · ArgoZhang · commit a81a345bddea · 2025-03-06T14:14:48.000+08:00
# Conflicts:
#	src/BootstrapBlazor/Components/Modal/Modal.razor.js
diff --git a/src/BootstrapBlazor/Components/Modal/Modal.razor.js b/src/BootstrapBlazor/Components/Modal/Modal.razor.js
@@ -12,7 +12,8 @@ export function init(id, invoke, shownCallback, closeCallback) {
             if (modal) {
                 modal.hide();
             }
-        }
+        },
+        originalStyle: null
     }
     Data.set(id, modal)
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ export function init(id, invoke, shownCallback, closeCallback) {`
`12`	`12`	`if (modal) {`
`13`	`13`	`modal.hide();`
`14`	`14`	`}`
`15`		`- }`
	`15`	`+ },`
	`16`	`+ originalStyle: null`
`16`	`17`	`}`
`17`	`18`	`Data.set(id, modal)`
`18`	`19`