fix(form): 修复 Select 在 value 为空时仍发起 initUrl 请求的问题

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
roymondchen 2026-05-15 19:32:04 +08:00
parent 0efd23d6ab
commit e64d86660d
2 changed files with 118 additions and 1 deletions

View File

@ -291,6 +291,14 @@ const getInitOption = async () => {
return getInitLocalOption();
}
if (
typeof props.model[props.name] === 'undefined' ||
props.model[props.name] === '' ||
props.model[props.name] === null
) {
return [];
}
if (typeof url === 'function') {
url = await url(mForm, { model: props.model, formValue: mForm?.values });
}

View File

@ -3,9 +3,10 @@
*
* Copyright (C) 2025 Tencent.
*/
import { describe, expect, test } from 'vitest';
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
import { nextTick } from 'vue';
import MagicForm, { MForm, MSelect } from '@form/index';
import { setConfig } from '@form/utils/config';
import { mount } from '@vue/test-utils';
import ElementPlus from 'element-plus';
@ -94,3 +95,111 @@ describe('Select', () => {
expect(wrapper.findComponent(MSelect).exists()).toBe(true);
});
});
describe('Select - getInitOption empty value', () => {
let request: ReturnType<typeof vi.fn>;
const mountFormWithRequest = (config: any[], initValues: any = {}) =>
mount(MForm, {
global: { plugins: [ElementPlus as any, [MagicForm as any, { request }]] },
props: { config, initValues },
});
beforeEach(() => {
request = vi.fn(async () => ({ data: { list: [{ text: 'X', value: 'x' }] } }));
setConfig({ request });
});
afterEach(() => {
setConfig({});
vi.restoreAllMocks();
});
const buildConfig = (extra: any = {}) => [
{
name: 's',
type: 'select',
text: 's',
option: {
url: 'https://example.com/list',
initUrl: 'https://example.com/init',
...extra,
},
},
];
test('value 为空字符串时不发起 init 请求且 options 为空', async () => {
const wrapper = mountFormWithRequest(buildConfig(), { s: '' });
await nextTick();
await new Promise((r) => setTimeout(r, 0));
await nextTick();
expect(request).not.toHaveBeenCalled();
const select = wrapper.findComponent(MSelect);
expect(select.exists()).toBe(true);
expect((select.vm as any).options).toEqual([]);
});
test('value 为 null 时不发起 init 请求且 options 为空', async () => {
const wrapper = mountFormWithRequest(buildConfig(), { s: null });
await nextTick();
await new Promise((r) => setTimeout(r, 0));
await nextTick();
expect(request).not.toHaveBeenCalled();
const select = wrapper.findComponent(MSelect);
expect((select.vm as any).options).toEqual([]);
});
test('value 非空时正常发起 init 请求并填充 options', async () => {
const wrapper = mountFormWithRequest(buildConfig({ initRoot: 'data.list' }), { s: 'x' });
await nextTick();
await new Promise((r) => setTimeout(r, 0));
await nextTick();
expect(request).toHaveBeenCalledTimes(1);
const callArg = request.mock.calls[0][0];
expect(callArg.url).toBe('https://example.com/init');
expect(callArg.data).toMatchObject({ id: 'x' });
const select = wrapper.findComponent(MSelect);
const opts = (select.vm as any).options;
expect(Array.isArray(opts)).toBe(true);
expect(opts.length).toBeGreaterThan(0);
expect(opts[0]).toMatchObject({ text: 'X', value: 'x' });
});
test('value 为 undefined 时不会调用 getInitOptiononBeforeMount 已过滤)', async () => {
const wrapper = mountFormWithRequest(buildConfig(), {});
await nextTick();
await new Promise((r) => setTimeout(r, 0));
await nextTick();
expect(request).not.toHaveBeenCalled();
const select = wrapper.findComponent(MSelect);
expect((select.vm as any).options).toEqual([]);
});
test('未配置 initUrl 时(仅 url走本地选项分支并发起请求', async () => {
const wrapper = mountFormWithRequest(
[
{
name: 's',
type: 'select',
text: 's',
option: {
url: 'https://example.com/list',
},
},
],
{ s: 'x' },
);
await nextTick();
await new Promise((r) => setTimeout(r, 0));
await nextTick();
expect(request).toHaveBeenCalled();
expect(request.mock.calls[0][0].url).toBe('https://example.com/list');
expect(wrapper.findComponent(MSelect).exists()).toBe(true);
});
});