diff --git a/packages/nc-gui/components/templates/detailed.vue b/packages/nc-gui/components/templates/detailed.vue index 1d7e2c99f5..73337574df 100644 --- a/packages/nc-gui/components/templates/detailed.vue +++ b/packages/nc-gui/components/templates/detailed.vue @@ -2,12 +2,18 @@
- +

diff --git a/packages/nc-gui/components/templates/editor.vue b/packages/nc-gui/components/templates/editor.vue index a68d44513b..951c4d93d4 100644 --- a/packages/nc-gui/components/templates/editor.vue +++ b/packages/nc-gui/components/templates/editor.vue @@ -381,6 +381,17 @@ :rules="[v => !!v || 'Required'] " />

+ + + + import { uiTypes, getUIDTIcon } from '~/components/project/spreadsheet/helpers/uiTypes' +import GradientGenerator from '~/components/templates/gradientGenerator' const LinkToAnotherRecord = 'LinkToAnotherRecord' const Lookup = 'Lookup' @@ -505,7 +517,7 @@ const defaultColProp = {} export default { name: 'TemplateEditor', - components: {}, + components: { GradientGenerator }, props: { id: [Number, String], viewMode: Boolean, @@ -1003,6 +1015,7 @@ export default { accord.scrollIntoView() }) }, + async saveTemplate() { try { if (this.id || this.localId) { diff --git a/packages/nc-gui/components/templates/gradientGenerator.vue b/packages/nc-gui/components/templates/gradientGenerator.vue new file mode 100644 index 0000000000..21ab242163 --- /dev/null +++ b/packages/nc-gui/components/templates/gradientGenerator.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/packages/nc-gui/components/templates/list.vue b/packages/nc-gui/components/templates/list.vue index 0c8aec3fa3..0759bcbae6 100644 --- a/packages/nc-gui/components/templates/list.vue +++ b/packages/nc-gui/components/templates/list.vue @@ -32,8 +32,9 @@ class="mx-auto" > @@ -65,6 +66,7 @@ @saved="onSaved" @load-category="v =>{ category = v; selectedId = null }" v-on="$listeners" + @showTemplateEditor="newEditor = true" /> diff --git a/packages/nocodb/src/lib/templateParser/NcTemplateParser.ts b/packages/nocodb/src/lib/templateParser/NcTemplateParser.ts index f5677c20da..c1dedbbc2c 100644 --- a/packages/nocodb/src/lib/templateParser/NcTemplateParser.ts +++ b/packages/nocodb/src/lib/templateParser/NcTemplateParser.ts @@ -107,10 +107,9 @@ export default class NcTemplateParser { dtx: 'specificType', dtxp: this.sqlUi.getDefaultLengthForDatatype(colProp.dt), dtxs: this.sqlUi.getDefaultScaleForDatatype(colProp.dt), - cn: tableColumn.cn, + ...colProp, _cn: tableColumn.cn, - uidt: tableColumn.uidt, - ...colProp + ...tableColumn }); } break;