github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-08-26 16:46:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: form fieldMappingTime is not working (#5333)

Browse Source 
* fix: form option `fieldMappingTime` is not working

* fix: form merge support `fieldMappingTime`
This commit is contained in:
Netfan
2025-01-09 12:28:33 +08:00
committed by GitHub
parent 16162c01ed
commit 2828e7a7b6
7 changed files with 72 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/effects/plugins/src/echarts/use-echarts.ts
View File

@@ -109,7 +109,7 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
return {
renderEcharts,
resize,
chartInstance
chartInstance,
};
}

10
packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
View File

@@ -8,6 +8,8 @@ import type {
VxeToolbarPropTypes,
} from 'vxe-table';
import type { SetupContext } from 'vue';
import type { VbenFormProps } from '@vben-core/form-ui';
import type { ExtendedVxeGridApi, VxeGridProps } from './types';
@@ -68,18 +70,18 @@ const {
const { isMobile } = usePreferences();
const slots = useSlots();
const slots: SetupContext['slots'] = useSlots();
const [Form, formApi] = useTableForm({
compact: true,
handleSubmit: async () => {
const formValues = formApi.form.values;
const formValues = await formApi.getValues();
formApi.setLatestSubmissionValues(toRaw(formValues));
props.api.reload(formValues);
},
handleReset: async () => {
await formApi.resetForm();
const formValues = formApi.form.values;
const formValues = await formApi.getValues();
formApi.setLatestSubmissionValues(formValues);
props.api.reload(formValues);
},
@@ -246,7 +248,7 @@ async function init() {
const autoLoad = defaultGridOptions.proxyConfig?.autoLoad;
const enableProxyConfig = options.value.proxyConfig?.enabled;
if (enableProxyConfig && autoLoad) {
props.api.grid.commitProxy?.('_init', formApi.form?.values ?? {});
props.api.grid.commitProxy?.('_init', (await formApi.getValues()) ?? {});
// props.api.reload(formApi.form?.values ?? {});
}