Skip to content

Commit

Permalink
fix(editable): 增加获取干净table数据的方法
Browse files Browse the repository at this point in the history
  • Loading branch information
greper committed Nov 22, 2023
1 parent daf041f commit 1e1e487
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ export function useEditable(props: any, ctx: any, tableRef: any): { editable: Ed
}
return data;
}
function getTableData(data?: any[]): any[] {
function getCleanTableData(data?: any[]): any[] {
if (data == null) {
data = _.cloneDeep(tableData.getData());
}
Expand Down Expand Up @@ -645,7 +645,7 @@ export function useEditable(props: any, ctx: any, tableRef: any): { editable: Ed
eachRows: editableEachRows,
eachCells: editableEachCells,
validate,
getTableData
getCleanTableData
}
};
}
2 changes: 1 addition & 1 deletion packages/fast-crud/src/d/editable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export type EditableTable = {
eachRows: (callback: (opts: EditableEachRowsOpts) => void) => void;
eachCells: (callback: (opts: EditableEachCellsOpts) => void) => void;
validate: () => Promise<EditableValidateResult>;
getTableData: (data?: any[]) => any[];
getCleanTableData: (data?: any[]) => any[];
};
export type EditableCellActiveProps = {
showAction?: boolean;
Expand Down
7 changes: 7 additions & 0 deletions packages/fast-crud/src/d/expose-editable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,18 @@ export type Editable = {
* 校验表单,返回true,表示校验通过
*/
validate(): Promise<EditableValidateResult>;

/**
* 获取可提交的表格数据(移除$editable_id字段)
* 如果传data则移除传入data的editable_id,否则从表格中获取
*/
getTableData(data?: any[]): any[];

/**
* 同上
* @param data
*/
getCleanTableData(data?: any[]): any[];

getInstance(): any;
};
5 changes: 4 additions & 1 deletion packages/fast-crud/src/use/use-expose.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,10 @@ function useEditable(props: UseEditableProps) {
return await crudExpose.getTableRef().editable?.validate();
},
getTableData(data?: any[]): any[] {
return crudExpose.getTableRef().editable?.getTableData(data);
return crudExpose.getTableRef().editable?.getCleanTableData(data);
},
getCleanTableData(data?: any[]): any[] {
return crudExpose.getTableRef().editable?.getCleanTableData(data);
}
};
return editable;
Expand Down

0 comments on commit 1e1e487

Please sign in to comment.