fix: solve conflict after pull

This commit is contained in:
riefive
2025-10-04 09:07:03 +07:00
3 changed files with 4 additions and 2 deletions
@@ -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 = () => {
+1 -1
View File
@@ -148,7 +148,7 @@ onMounted(async () => {
class="mb-4 xl:mb-5" class="mb-4 xl:mb-5"
/> />
<AppDivisionList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" /> <AppDivisionList :data="data" :pagination-meta="paginationMeta" @page-change="handlePageChange" />
<Dialog v-model:open="isFormEntryDialogOpen" :title="!!recItem ? title : 'Tambah Divisi'" size="lg" prevent-outside> <Dialog v-model:open="isFormEntryDialogOpen" :title="!!recItem ? title : 'Tambah Divisi'" size="lg" prevent-outside>
<AppDivisionEntryForm <AppDivisionEntryForm
:schema="DivisionSchema" :schema="DivisionSchema"
+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)
} }