@opengis/fastify-table 1.4.74 → 1.4.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.4.74",
+  "version": "1.4.77",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/plugins/table/funcs/metaFormat/index.js

@@ -1,4 +1,4 @@
-import { handlebars } from '../../../../helpers/index.js';
+import { handlebarsSync } from '../../../../helpers/index.js';
 
 import getTemplate from '../getTemplate.js';
 import getSelectVal from './getSelectVal.js';
@@ -10,19 +10,20 @@ export default async function metaFormat({
   const loadTable = table ? await getTemplate('table', table) : {};
   const selectCols = Object.keys(cls || {}).map(key => ({ name: key, data: cls[key] })).concat(loadTable?.columns?.filter((e) => e.data) || []);
   const metaCls = Object.keys(loadTable?.meta?.cls || {}).map((el) => ({ name: el, data: loadTable?.meta?.cls[el] }));
-  const htmlCols = Object.keys(htmls || {}).map(key => ({ name: key, html: htmls[key] })).concat(loadTable?.columns?.filter?.((e) => e.name && e.format === 'html' && e.html) || []);
+  const htmlCols = Object.keys(htmls || {}).map(key => ({ name: key, html: htmls[key] })).concat(loadTable?.columns?.filter?.((e) => e.name && e.html && e.format && ['html', 'slot'].includes(e.format)) || []);
   if (!original?.length || (!selectCols?.length && !metaCls?.length && !htmlCols?.length)) return original;
 
   const rows = reassign ? original : JSON.parse(JSON.stringify(original));
 
-  await Promise.all(htmlCols.map(async (attr) => {
-    await Promise.all(rows.filter(row => row?.[attr.name])?.map(async (row) => {
-      const html = await handlebars.compile(attr.html)(row);
-      Object.assign(row, { [attr.name]: html?.replaceAll(/<[^>]*>/g, '')?.replace(/\n/g, '')?.trim() });
-    }));
-  }));
-  // cls & select format
+  // html && slot (vue component) format
+  htmlCols.forEach((attr) => {
+    rows.filter(Boolean).forEach((row) => {
+      const html = handlebarsSync.compile(attr.html)(row);
+      Object.assign(row, { [attr.name]: html?.replaceAll?.(/<[^>]*>/g, '')?.replace?.(/\n/g, '')?.trim?.() });
+    });
+  });
 
+  // cls & select format
   await Promise.all(selectCols.concat(metaCls)?.map(async (attr) => {
     const values = [...new Set(rows?.map((el) => el[attr.name]).flat())].filter((el) => (typeof el === 'boolean' ? true : el));
     if (!values.length) return null;

package/server/routes/table/controllers/getFormByTable.js

@@ -67,7 +67,7 @@ export default async function getForm({
         // form in form addToken
         formatSchema(schema, user, loadTemplate?.obj);
 
-        const id = edit && tokenData?.id;
+        const id = edit || tokenData?.id;
         const isAllowedByTemplate = id ? actions.includes('edit') : actions.includes('add');
 
         if (