munawwirul_jamal/simrsx-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: solve conflict after pull

Browse Source
This commit is contained in:
riefive
2025-10-04 09:07:03 +07:00
parent a7cbbeeda9 55559a4683
commit 42a54bbb3b
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/components/app/division/entry-form.vue
-1
View File
@@ -51,7 +51,6 @@ if (props.values) {
if (props.values.name !== undefined) name.value = props.values.name if (props.values.name !== undefined) name.value = props.values.name
if (props.values.parent_id !== undefined) parent.value = String(props.values.parent_id) if (props.values.parent_id !== undefined) parent.value = String(props.values.parent_id)
if (props.values.division_id !== undefined) division.value = String(props.values.division_id) if (props.values.division_id !== undefined) division.value = String(props.values.division_id)
console.log(props.values)
} }
const resetForm = () => { const resetForm = () => {
app/handlers/_handler.ts
+3
View File
@@ -186,6 +186,8 @@ export function genCrudHandler<T = any>(crud: {
if (refresh) refresh() if (refresh) refresh()
}, },
onFinally: () => { onFinally: () => {
setTimeout(refresh, 300)
onResetState()
isProcessing.value = false isProcessing.value = false
}, },
}) })
@@ -194,6 +196,7 @@ export function genCrudHandler<T = any>(crud: {
function handleCancelForm(reset: () => void) { function handleCancelForm(reset: () => void) {
isFormEntryDialogOpen.value = false isFormEntryDialogOpen.value = false
isReadonly.value = false isReadonly.value = false
onResetState()
setTimeout(reset, 300) setTimeout(reset, 300)
} }