Skip to content

Commit 6b40d09

Browse files
committed
feat: 迭代开发
1 parent 8234e48 commit 6b40d09

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

packages/form-render/src/derivative/SearchForm/ActionView.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@ const ActionView = (props: any) => {
2929
onReset(form);
3030
return;
3131
}
32-
3332
form.resetFields();
3433
form.submit();
3534
};
3635

3736
const handleCollapse = () => {
38-
const flag = !isExpand;
39-
setExpand(flag);
37+
setExpand(!isExpand);
4038
};
4139

4240
const searchBtnArr = typeof searchBtnRender === 'function' ? searchBtnRender(form.submit, handleReset, { loading }) : [];

packages/form-render/src/form-core/index.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ const FormCore:FC<FRProps> = (props) => {
7070
form.setSchema(props.schema, true);
7171
}, [JSON.stringify(props.schema || {})]);
7272

73+
useEffect(() => {
74+
store.setState({ removeHiddenData });
75+
}, [removeHiddenData]);
76+
7377
useEffect(() => {
7478
const context = {
7579
column,

packages/form-render/src/models/useForm.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,10 @@ const useForm = () => {
165165
// 获取表单数据
166166
xform.getValues = (nameList?: any, filterFunc?: any) => {
167167
let values = cloneDeep(form.getFieldsValue(getFieldName(nameList), filterFunc));
168-
values = filterValuesHidden(values, flattenSchemaRef.current);
168+
const { removeHiddenData } = storeRef.current?.getState() || {};
169+
if (removeHiddenData) {
170+
values = filterValuesHidden(values, flattenSchemaRef.current);
171+
}
169172
values = filterValuesUndefined(values);
170173
return parseValuesToBind(values, flattenSchemaRef.current);
171174
}

packages/table-render/src/core/TableView/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ const TableView: <RecordType extends object = any>(
152152
size: tableSize,
153153
};
154154

155+
// 需要判断一下,否则影响 table 的某些属性初始化渲染异常
155156
if (columns?.length === 0) {
156157
return null;
157158
}

0 commit comments

Comments
 (0)