@opengis/fastify-table 1.1.92 → 1.1.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.92",
+  "version": "1.1.93",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/server/plugins/table/funcs/getSelect.js

@@ -1,12 +1,22 @@
+import pgClients from '../../pg/pgClients.js';
 import getTemplate from './getTemplate.js';
 
 const loadCls = {};
 
-export default async function getSelect(name) {
+const sqls = {
+  sql: 'select data from admin.cls where name=$1',
+  json: 'select json_agg(json_build_object(\'id\', code, \'text\', name, \'icon\', icon, \'color\', color)) as data from admin.cls where parent=$1',
+};
+
+export default async function getSelect(name, pg = pgClients.client) {
   if (loadCls[name]) return loadCls[name];
 
-  const clsData = await getTemplate(['cls', 'select'], name);
-  if (!clsData) { return null; }
+  const clsDataGIT = await getTemplate(['cls', 'select'], name);
+  const { type } = !clsDataGIT && pg.pk?.['admin.cls'] ? await pg.query('select type from admin.cls where parent is null and name=$1 limit 1', [name]).then(el => el.rows?.[0] || {}) : {};
+  const q = !clsDataGIT && type && ['sql', 'json'].includes(type) ? sqls[type] : undefined;
+  const clsDataDB = q ? await pg.query(q, [name]).then(el => el.rows?.[0]?.data) : {};
+  const clsData = clsDataGIT || clsDataDB;
+  if (!clsData) return null;
 
   //  console.log(clsData);
   if (clsData && Array.isArray(clsData)) {

package/server/plugins/table/funcs/getSelectMeta.js

@@ -10,7 +10,7 @@ const selectMeta = {};
 export default async function getSelectMeta({ name, pg = pgClients.client, nocache }) {
   if (selectMeta[name] && !nocache) return selectMeta[name];
 
-  const cls = await getSelect(name);
+  const cls = await getSelect(name, pg);
 
   if (!cls) return null;
   if (cls.arr) return cls;

package/server/plugins/table/funcs/gisIRColumn.js

@@ -4,13 +4,14 @@ import getFilterSQL from './getFilterSQL/index.js';
 import getTemplate from './getTemplate.js';
 import pgClients from '../../pg/pgClients.js';
 import config from '../../../../config.js';
+import getSelectVal from './metaFormat/getSelectVal.js';
 
 export default async function gisIRColumn({
   pg = pgClients.client, layer, column, sql, query = '1=1', filter, state, search, custom,
 }) {
   const time = Date.now();
 
-  const sel = await getSelect(query.cls || column);
+  const sel = await getSelect(query.cls || column, pg);
 
   const body = await getTemplate('table', layer);
   const fData = await getFilterSQL({
@@ -58,7 +59,9 @@ export default async function gisIRColumn({
 
   const { rows } = await pg.query(q);
   const cls = query.cls || body?.columns?.find((el) => el.name === column)?.data || col.data || col.option;
-  const select = await getSelect(cls, { val: rows.map((el) => el.id), ar: 1 });
+  const select = await getSelectVal({
+    pg, name: cls, values: rows.map((el) => el.id), ar: 1,
+  });
   rows.forEach((el) => {
     const data = select?.arr ? select.arr?.find((item) => item.id?.toString() === el.id?.toString()) : undefined;
     Object.assign(el, data || {});

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

@@ -6,7 +6,7 @@ const selectIds = {};
 export default async function getSelectVal({ pg = pgClients.client, name, values: valuesOrigin }) {
   if (!valuesOrigin?.length) return null;
   const values = valuesOrigin.map(el => el.toString());
-  const cls = await getSelect(name);
+  const cls = await getSelect(name, pg);
 
   // === array  ===
   if (cls?.arr && Array.isArray(cls?.arr)) {

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

@@ -27,7 +27,7 @@ export default async function filterAPI(req) {
 
   const filters = loadTable?.filters || loadTable?.filterList || [];
   await Promise.all(filters.filter((el) => el.data).map(async (el) => {
-    const cls = await getSelect(el.data);
+    const cls = await getSelect(el.data, req.pg);
     if (!cls?.arr || !loadTable.table) return;
     const { dataTypeID } = columns.find((item) => item.name === el.id) || {};
     const countArr = req.pg.pgType[dataTypeID]?.includes('[]')