github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-01-24 10:33:50 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: EditableCell about checked/unChecked Value, getDisable, rowKey missing for updating (#3418). resolve #3419

Browse Source
This commit is contained in:
xachary 2023-12-15 16:12:43 +08:00 committed by GitHub
parent d502e1d493
commit 404a4720b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/components/Table/src/components/editable/EditableCell.vue
View File

@ -66,13 +66,23 @@
const getComponentProps = computed(() => {
const isCheckValue = unref(getIsCheckComp);
let compProps = props.column?.editComponentProps ?? ({} as any);
const { checkedValue, unCheckedValue } = compProps;
const valueField = isCheckValue ? 'checked' : 'value';
const val = unref(currentValueRef);
const value = isCheckValue ? (isNumber(val) || isBoolean(val) ? val : !!val) : val;
let value = val;
if (isCheckValue) {
if (typeof checkedValue !== 'undefined') {
value = val === checkedValue ? checkedValue : unCheckedValue;
} else if (typeof unCheckedValue !== 'undefined') {
value = val === unCheckedValue ? unCheckedValue : checkedValue;
} else {
value = isNumber(val) || isBoolean(val) ? val : !!val;
}
}
let compProps = props.column?.editComponentProps ?? ({} as any);
const { record, column, index } = props;
if (isFunction(compProps)) {
@ -114,7 +124,7 @@
}
if (isFunction(editDynamicDisabled)) {
const { record } = props;
disabled = editDynamicDisabled({ record });
disabled = editDynamicDisabled({ record, currentValue: currentValueRef.value });
}
return disabled;
});
@ -170,7 +180,7 @@
});
function handleEdit() {
if (unref(getRowEditable) || unref(props.column?.editRow)) return;
if (unref(getRowEditable) || unref(props.column?.editRow) || unref(getDisable)) return;
ruleMessage.value = '';
isEdit.value = true;
nextTick(() => {
@ -248,17 +258,19 @@
if (!record.editable) {
const { getBindValues } = table;
const { beforeEditSubmit, columns } = unref(getBindValues);
const { beforeEditSubmit, columns, rowKey } = unref(getBindValues);
const rowKeyValue = typeof rowKey === 'string' ? rowKey : rowKey ? rowKey(record) : '';
if (beforeEditSubmit && isFunction(beforeEditSubmit)) {
spinning.value = true;
const keys: string[] = columns
.map((_column) => _column.dataIndex)
.filter((field) => !!field) as string[];
let result: any = true;
try {
result = await beforeEditSubmit({
record: pick(record, keys),
record: pick(record, [rowKeyValue, ...keys]),
index,
key: dataKey as string,
value,
@ -391,6 +403,7 @@
handleEnter,
handleSubmitClick,
spinning,
getDisable,
};
},
render() {
@ -408,10 +421,13 @@
record: this.record as Recordable,
column: this.column,
index: this.index,
currentValue: this.currentValueRef,
})
: this.getValues ?? '\u00A0'}
</div>
{!this.column.editRow && <FormOutlined class={`${this.prefixCls}__normal-icon`} />}
{!this.column.editRow && !this.getDisable && (
<FormOutlined class={`${this.prefixCls}__normal-icon`} />
)}
</div>
{this.isEdit && (
<Spin spinning={this.spinning}>

1
src/components/Table/src/types/table.ts
View File

@ -472,6 +472,7 @@ export interface BasicColumn extends ColumnProps<Recordable> {
record: Recordable;
column: BasicColumn;
index: number;
currentValue: string | number | boolean | Recordable;
}) => VNodeChild | JSX.Element;
// 动态 Disabled
editDynamicDisabled?: boolean | ((record: Recordable) => boolean);