From d10088d1b26d725e3f34fd7a8b61069a447a64a3 Mon Sep 17 00:00:00 2001 From: mertmit Date: Wed, 22 Jun 2022 00:07:48 +0300 Subject: [PATCH] fix: duration webhook trigger Signed-off-by: mertmit --- .../project/spreadsheet/components/EditableCell.vue | 1 + .../components/editableCell/DurationCell.vue | 13 +++++++++++++ .../components/project/spreadsheet/mixins/cell.js | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/components/project/spreadsheet/components/EditableCell.vue b/packages/nc-gui/components/project/spreadsheet/components/EditableCell.vue index d9865ed1eb..a1e8974d1c 100644 --- a/packages/nc-gui/components/project/spreadsheet/components/EditableCell.vue +++ b/packages/nc-gui/components/project/spreadsheet/components/EditableCell.vue @@ -42,6 +42,7 @@ :is-form="isForm" :column="column" :is-locked="isLocked" + v-on="parentListeners" />
@@ -51,6 +52,18 @@ export default { }, durationType() { return this.column?.meta?.duration || 0 + }, + parentListeners() { + const $listeners = {} + + if (this.$listeners.blur) { + $listeners.blur = this.$listeners.blur + } + if (this.$listeners.focus) { + $listeners.focus = this.$listeners.focus + } + + return $listeners } }, mounted() { diff --git a/packages/nc-gui/components/project/spreadsheet/mixins/cell.js b/packages/nc-gui/components/project/spreadsheet/mixins/cell.js index 414d9ce001..a74521150f 100644 --- a/packages/nc-gui/components/project/spreadsheet/mixins/cell.js +++ b/packages/nc-gui/components/project/spreadsheet/mixins/cell.js @@ -81,7 +81,6 @@ export default { UITypes.Number, UITypes.Decimal, UITypes.Percent, - UITypes.Duration, UITypes.Count, UITypes.AutoNumber, UITypes.SpecificDBType, @@ -92,7 +91,8 @@ export default { return [ UITypes.Currency, UITypes.Year, - UITypes.Time + UITypes.Time, + UITypes.Duration ].includes(this.uiDatatype) } }