Merge branch '310-6.8.0' into 310-6.8.1

This commit is contained in:
qinhaoyan 2024-10-11 14:11:12 +08:00
commit e82cf11c86
3 changed files with 5 additions and 3 deletions

View File

@ -506,6 +506,7 @@ export default class Form extends React.Component<FormProps, object> {
this.blockRouting = this.blockRouting.bind(this); this.blockRouting = this.blockRouting.bind(this);
this.beforePageUnload = this.beforePageUnload.bind(this); this.beforePageUnload = this.beforePageUnload.bind(this);
this.formItemDispatchEvent = this.formItemDispatchEvent.bind(this); this.formItemDispatchEvent = this.formItemDispatchEvent.bind(this);
this.flush = this.flush.bind(this);
const {store, canAccessSuperData, persistData, simpleMode, formLazyChange} = const {store, canAccessSuperData, persistData, simpleMode, formLazyChange} =
props; props;
@ -1933,7 +1934,8 @@ export default class Form extends React.Component<FormProps, object> {
removeHook: this.removeHook, removeHook: this.removeHook,
renderFormItems: this.renderFormItems, renderFormItems: this.renderFormItems,
formItemDispatchEvent: this.formItemDispatchEvent, formItemDispatchEvent: this.formItemDispatchEvent,
formPristine: form.pristine formPristine: form.pristine,
onFlushForm: this.flush
// value: (control as any)?.name // value: (control as any)?.name
// ? getVariable(form.data, (control as any)?.name, canAccessSuperData) // ? getVariable(form.data, (control as any)?.name, canAccessSuperData)
// : (control as any)?.value, // : (control as any)?.value,

View File

@ -1894,7 +1894,7 @@ export class EditorManager {
(id, value) => batch.unshift({id, value}), (id, value) => batch.unshift({id, value}),
ids ids
); );
ids.set(schema.id, node.schemaPath); node.schemaPath && ids.set(schema.id, node.schemaPath);
} }
}); });
}; };

View File

@ -774,7 +774,7 @@ test('Renderer:input-table formula', async () => {
fireEvent.change(dollor!, {target: {value: '22'}}); fireEvent.change(dollor!, {target: {value: '22'}});
await wait(400); await wait(800);
const inputs = container.querySelectorAll('input[name=score]'); const inputs = container.querySelectorAll('input[name=score]');
expect(inputs.length).toBe(3); expect(inputs.length).toBe(3);