github
/
jeecg-boot-vue3
mirror of https://github.com/jeecgboot/jeecgboot-vue3
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 8db81386cd into defd8d93da

pull/1164/merge
Ali-ZLin 2024-06-21 17:13:23 +08:00 committed by GitHub
parent defd8d93da 8db81386cd
commit 435ff3eb98
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,11 @@
}); });
const getComponentProps = computed(() => { const getComponentProps = computed(() => {
const compProps = props.column?.editComponentProps ?? {}; let editComponentProps = props.column?.editComponentProps ?? {};
if (isFunction(editComponentProps)) {
editComponentProps = editComponentProps(props.record as Recordable);
}
const compProps = editComponentProps;
const component = unref(getComponent); const component = unref(getComponent);
const apiSelectProps: Recordable = {}; const apiSelectProps: Recordable = {};
if (component === 'ApiSelect') { if (component === 'ApiSelect') {
@ -122,8 +126,10 @@
}); });
const getValues = computed(() => { const getValues = computed(() => {
const { editComponentProps, editValueMap } = props.column; let { editComponentProps, editValueMap } = props.column;
if (editComponentProps && isFunction(editComponentProps)) {
editComponentProps = editComponentProps(props.record as Recordable);
}
const value = unref(currentValueRef); const value = unref(currentValueRef);
if (editValueMap && isFunction(editValueMap)) { if (editValueMap && isFunction(editValueMap)) {
@ -193,7 +199,11 @@
} else if (isString(e) || isBoolean(e) || isNumber(e) || isArray(e)) { } else if (isString(e) || isBoolean(e) || isNumber(e) || isArray(e)) {
currentValueRef.value = e; currentValueRef.value = e;
} }
const onChange = props.column?.editComponentProps?.onChange; let editComponentProps = props.column?.editComponentProps ?? {};
if (isFunction(editComponentProps)) {
editComponentProps = editComponentProps(props.record as Recordable);
}
const onChange = editComponentProps?.onChange;
if (onChange && isFunction(onChange)) onChange(...arguments); if (onChange && isFunction(onChange)) onChange(...arguments);
table.emit?.('edit-change', { table.emit?.('edit-change', {
@ -316,7 +326,11 @@
// only ApiSelect or TreeSelect // only ApiSelect or TreeSelect
function handleOptionsChange(options: LabelValueOptions) { function handleOptionsChange(options: LabelValueOptions) {
const { replaceFields } = props.column?.editComponentProps ?? {}; let editComponentProps = props.column?.editComponentProps ?? {};
if (isFunction(editComponentProps)) {
editComponentProps = editComponentProps(props.record as Recordable);
}
const { replaceFields } = editComponentProps;
const component = unref(getComponent); const component = unref(getComponent);
if (component === 'ApiTreeSelect') { if (component === 'ApiTreeSelect') {
const { title = 'title', value = 'value', children = 'children' } = replaceFields || {}; const { title = 'title', value = 'value', children = 'children' } = replaceFields || {};