From f0611085651fedb076574ca42afef4bd0198f5eb Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Sat, 11 Mar 2023 10:31:40 +0530 Subject: [PATCH] fix(ui): transition for hints - remove fix scrollbar jump on edit toggle - remove toggle edit toast - (unrelated) add formula for root type --- models/baseModels/Account/Account.ts | 18 +++++++ src/pages/TemplateBuilder/TemplateBuilder.vue | 49 +++++++++++-------- 2 files changed, 47 insertions(+), 20 deletions(-) diff --git a/models/baseModels/Account/Account.ts b/models/baseModels/Account/Account.ts index 184a6662..55ebfe16 100644 --- a/models/baseModels/Account/Account.ts +++ b/models/baseModels/Account/Account.ts @@ -7,7 +7,9 @@ import { RequiredMap, TreeViewSettings, ReadOnlyMap, + FormulaMap, } from 'fyo/model/types'; +import { ModelNameEnum } from 'models/types'; import { QueryFilter } from 'utils/db/types'; import { AccountRootType, AccountRootTypeEnum, AccountType } from './types'; @@ -76,6 +78,22 @@ export class Account extends Doc { }; } + formulas: FormulaMap = { + rootType: { + formula: async () => { + if (!this.parentAccount) { + return; + } + + return await this.fyo.getValue( + ModelNameEnum.Account, + this.parentAccount, + 'rootType' + ); + }, + }, + }; + static filters: FiltersMap = { parentAccount: (doc: Doc) => { const filter: QueryFilter = { diff --git a/src/pages/TemplateBuilder/TemplateBuilder.vue b/src/pages/TemplateBuilder/TemplateBuilder.vue index 0407df9b..24dfde4f 100644 --- a/src/pages/TemplateBuilder/TemplateBuilder.vue +++ b/src/pages/TemplateBuilder/TemplateBuilder.vue @@ -34,12 +34,12 @@
@@ -173,13 +173,15 @@
-
- -
+ +
+ +
+
@@ -354,22 +356,11 @@ export default defineComponent({ showSidebar.value = false; this.scale = this.getEditModeScale(); this.view?.focus(); - showToast({ - type: 'info', - message: this.t`Edit Mode enabled`, - duration: 1000, - }); }, disableEditMode() { showSidebar.value = this.preEditMode.showSidebar; this.panelWidth = this.preEditMode.panelWidth; this.scale = this.preEditMode.scale; - - showToast({ - type: 'info', - message: this.t`Edit Mode disabled`, - duration: 1000, - }); }, getEditModeScale(): number { // @ts-ignore @@ -550,3 +541,21 @@ export default defineComponent({ }, }); + +