Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Table] fix editable-cell can not exit #2055

Merged
merged 3 commits into from
Jan 29, 2023
Merged

[Table] fix editable-cell can not exit #2055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b268c5
fix(table): editable-cell can not exit
chaishi Jan 29, 2023
41e14c1
fix(hooks useresizeobserver): add comment; remove neccessary warn
chaishi Jan 29, 2023
2717167
fix: remove useless params e
chaishi Jan 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 27 additions & 15 deletions src/hooks/useResizeObserver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,39 @@
import { Ref, onMounted, onBeforeUnmount } from '@vue/composition-api';
import { Ref, watch, onBeforeUnmount } from '@vue/composition-api';

export default function useResizeObserver(
container: Ref<HTMLElement>,
callback: (data: [ResizeObserverEntry]) => void,
callback: (data: ResizeObserverEntry[]) => void,
) {
const isSupport = window && window.ResizeObserver;
// unit tests do not need any warn console; too many warns influence focusing on more important log info
if (!isSupport) return;

let containerObserver: ResizeObserver = null;

const observeContainer = () => {
if (!container || !container.value || !window || !window.ResizeObserver) {
containerObserver?.unobserve(container.value);
containerObserver?.disconnect();
} else {
containerObserver = new ResizeObserver(callback);
containerObserver.observe(container.value);
}
const cleanupObserver = () => {
if (!containerObserver) return;
containerObserver.unobserve(container.value);
containerObserver.disconnect();
containerObserver = null;
};

onMounted(() => {
observeContainer();
});
const addObserver = (el: HTMLElement) => {
containerObserver = new ResizeObserver(callback);
containerObserver.observe(el);
};

if (container) {
watch(
container,
(el) => {
cleanupObserver();
el && addObserver(el);
},
{ immediate: true, flush: 'post' },
);
}

onBeforeUnmount(() => {
containerObserver?.unobserve(container.value);
containerObserver?.disconnect();
cleanupObserver();
});
}
16 changes: 1 addition & 15 deletions src/table/editable-cell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,19 +248,9 @@ export default defineComponent({
}
};

const documentClickHandler = (e: PointerEvent) => {
const documentClickHandler = () => {
if (!col.value.edit || !col.value.edit.component) return;
if (!isEdit.value) return;
// @ts-ignore
if (e.path?.includes(tableEditableCellRef.value?.$el)) return;
// @ts-ignore 如果点击到 Popup 复层也直接返回
for (let i = 0, len = e.path.length; i < len; i++) {
// @ts-ignore
const node = e.path[i];
if (node.classList?.value?.includes('popup__content')) {
return;
}
}
const outsideAbortEvent = col.value.edit.onEdited;
updateAndSaveAbort(outsideAbortEvent, {
...cellParams.value,
Expand Down Expand Up @@ -296,10 +286,6 @@ export default defineComponent({
watch(
cellValue,
(cellValue) => {
// let val = cellValue;
// if (typeof val === 'object' && val !== null) {
// val = val instanceof Array ? [...val] : { ...val };
// }
editValue.value = cellValue;
},
{ immediate: true },
Expand Down