@opengis/bi 1.0.41 → 1.0.42

package/dist/{vs-donut-D-QP9o_T.js → vs-donut-DsuDQZ3C.js}

@@ -1,4 +1,4 @@
-import { _ as y, c as D, i as g, a as c, b as h, P as l } from "./import-file-CcioJxEB.js";
+import { _ as y, c as D, i as g, a as c, b as h, P as l } from "./import-file-XtDaxS3X.js";
 import { createElementBlock as b, openBlock as x } from "vue";
 const _ = {
   name: "VsPie",

package/dist/{vs-funnel-bar-Bmk_YjfV.js → vs-funnel-bar-CQAgEcLe.js}

@@ -1,4 +1,4 @@
-import { _ as n, c, i as h, b as o, d as l, a as d } from "./import-file-CcioJxEB.js";
+import { _ as n, c, i as h, b as o, d as l, a as d } from "./import-file-XtDaxS3X.js";
 import { createElementBlock as p, openBlock as u } from "vue";
 const m = {
   name: "VsFunnelBar",

package/dist/{vs-list-ONirzMum.js → vs-list-C-gFvDvr.js}

@@ -1,4 +1,4 @@
-import { _ as Qs, g as Vp, h as Np } from "./import-file-CcioJxEB.js";
+import { _ as Qs, h as Vp, j as Np } from "./import-file-XtDaxS3X.js";
 import { createElementBlock as br, openBlock as wr, createElementVNode as Vt, createStaticVNode as jp, withDirectives as Up, toDisplayString as rh, vShow as $p, Fragment as ju, renderList as Uu, normalizeClass as qp, resolveComponent as Zp, createVNode as Gp } from "vue";
 const Hp = {}, Xp = {
   class: "shrink-0 size-3",

package/dist/{vs-map-cluster-D3AbUEU0.js → vs-map-cluster-B9kG91Ge.js}

@@ -1,8 +1,8 @@
-import { c as R, l as A, p as N, b as P, V as Z, a as q, d as K, e as W, m as T } from "./vs-list-ONirzMum.js";
-import { _ as V, V as D, c as J, I as Q, e as U } from "./import-file-CcioJxEB.js";
-import { createElementBlock as h, createCommentVNode as S, openBlock as p, createElementVNode as l, normalizeClass as I, Fragment as O, renderList as F, toDisplayString as G, normalizeStyle as X, resolveComponent as u, withDirectives as z, createBlock as M, resolveDynamicComponent as Y, createVNode as w, vShow as C } from "vue";
-const j = {
-  components: { legendIcon: A, closeIcon: R },
+import { c as A, l as P, p as O, b as Z, V as q, a as K, d as W, e as D, m as T } from "./vs-list-C-gFvDvr.js";
+import { _ as V, V as J, c as Q, e as N, I as U, g as X } from "./import-file-XtDaxS3X.js";
+import { createElementBlock as h, createCommentVNode as S, openBlock as p, createElementVNode as l, normalizeClass as I, Fragment as F, renderList as G, toDisplayString as R, normalizeStyle as Y, resolveComponent as u, withDirectives as z, createBlock as M, resolveDynamicComponent as j, createVNode as w, vShow as C } from "vue";
+const $ = {
+  components: { legendIcon: P, closeIcon: A },
   props: {
     mapId: { type: String },
     colors: { type: Array },
@@ -17,7 +17,7 @@ const j = {
   data() {
     return {
       isOpenLegend: !1,
-      palette: N
+      palette: O
       // palette: ['#69D2E7', 'yellow', '#FE4365'],
     };
   },
@@ -45,37 +45,37 @@ const j = {
       return (t + 1) / this.sortedSizes.length;
     }
   }
-}, $ = {
+}, ee = {
   key: 0,
   class: "absolute flex items-end w-fit bottom-[10px] max-w-[80%] left-[50%] translate-x-[-50%] bg-[rgba(255,255,255,0.7)] p-[10px] rounded"
-}, ee = { class: "w-[80px] mr-[10px]" }, te = ["title"], se = { class: "text-[10px] mb-[2px] text-[#1F2937] font-normal leading-[1.2]" };
-function oe(t, s, n, a, e, o) {
+}, te = { class: "w-[80px] mr-[10px]" }, se = ["title"], oe = { class: "text-[10px] mb-[2px] text-[#1F2937] font-normal leading-[1.2]" };
+function re(t, s, n, a, e, o) {
   var d;
-  return (d = n.sizes) != null && d.length ? (p(), h("div", $, [
-    l("div", ee, [
+  return (d = n.sizes) != null && d.length ? (p(), h("div", ee, [
+    l("div", te, [
       s[0] || (s[0] = l("p", { class: "text-[10px] mb-[2px] text-[#1F2937] leading-[1.2]" }, " Дані відсутні ", -1)),
       l("div", {
         class: I([o.sizeClass(t.index), "w-full border border-gray-500"])
       }, null, 2)
     ]),
-    o.sortedSizes.length ? (p(!0), h(O, { key: 0 }, F(o.sortedSizes, (c, i) => {
-      var v, x, _, m, g, y, f, b;
+    o.sortedSizes.length ? (p(!0), h(F, { key: 0 }, G(o.sortedSizes, (c, i) => {
+      var x, v, _, m, g, y, f, b;
       return p(), h("div", {
         class: "w-[80px]",
-        title: i === ((v = o.sortedSizes) == null ? void 0 : v.length) - 1 ? ">" + c : i == ((x = o.sortedSizes) == null ? void 0 : x.length) - 1 ? ">" + o.sortedSizes[((_ = o.sortedSizes) == null ? void 0 : _.length) - 1] : c + "-" + o.sortedSizes[i + 1]
+        title: i === ((x = o.sortedSizes) == null ? void 0 : x.length) - 1 ? ">" + c : i == ((v = o.sortedSizes) == null ? void 0 : v.length) - 1 ? ">" + o.sortedSizes[((_ = o.sortedSizes) == null ? void 0 : _.length) - 1] : c + "-" + o.sortedSizes[i + 1]
       }, [
-        l("p", se, G(i === ((m = o.sortedSizes) == null ? void 0 : m.length) - 1 ? ">" + parseInt(c) : i == ((g = o.sortedSizes) == null ? void 0 : g.length) - 1 ? ">" + parseInt(o.sortedSizes[((y = o.sortedSizes) == null ? void 0 : y.length) - 1]) : parseInt(c) + "-" + parseInt(o.sortedSizes[i + 1])), 1),
+        l("p", oe, R(i === ((m = o.sortedSizes) == null ? void 0 : m.length) - 1 ? ">" + parseInt(c) : i == ((g = o.sortedSizes) == null ? void 0 : g.length) - 1 ? ">" + parseInt(o.sortedSizes[((y = o.sortedSizes) == null ? void 0 : y.length) - 1]) : parseInt(c) + "-" + parseInt(o.sortedSizes[i + 1])), 1),
         l("div", {
           class: I([o.sizeClass(i), "w-full border border-r-0 border-gray-500"]),
-          style: X({
+          style: Y({
             backgroundColor: ((b = (f = e.palette) == null ? void 0 : f[n.color]) == null ? void 0 : b[i]) || n.color
           })
         }, null, 6)
-      ], 8, te);
+      ], 8, se);
     }), 256)) : S("", !0)
   ])) : S("", !0);
 }
-const re = /* @__PURE__ */ V(j, [["render", oe]]), ae = {}, ne = {
+const ae = /* @__PURE__ */ V($, [["render", re]]), ne = {}, le = {
   xmlns: "http://www.w3.org/2000/svg",
   width: "24",
   height: "24",
@@ -87,8 +87,8 @@ const re = /* @__PURE__ */ V(j, [["render", oe]]), ae = {}, ne = {
   "stroke-linejoin": "round",
   class: "icon icon-tabler icons-tabler-outline icon-tabler-map"
 };
-function le(t, s) {
-  return p(), h("svg", ne, s[0] || (s[0] = [
+function ie(t, s) {
+  return p(), h("svg", le, s[0] || (s[0] = [
     l("path", {
       stroke: "none",
       d: "M0 0h24v24H0z",
@@ -99,24 +99,25 @@ function le(t, s) {
     l("path", { d: "M15 7v13" }, null, -1)
   ]));
 }
-const ie = /* @__PURE__ */ V(ae, [["render", le]]), pe = {
-  mixins: [J, W],
+const pe = /* @__PURE__ */ V(ne, [["render", ie]]), ce = {
+  mixins: [Q, D],
   components: {
-    VsMapSetting: K,
-    VsClusterLegend: re,
-    VsMapGoHome: q,
-    VsList: Z,
-    VsMapSlotLayers: P,
-    VsListbar: D
+    VsMapSetting: W,
+    VsClusterLegend: ae,
+    VsMapGoHome: K,
+    VsList: q,
+    VsMapSlotLayers: Z,
+    // VsListbar,
+    VsBar: J
   },
   data() {
     return {
       baseColor: "pink",
       kattotg: "",
       options: [
-        { id: "map", text: "Карта", component: ie },
-        { id: "table", text: "Таблиця", component: Q },
-        { id: "chart", text: "Віджет", component: U }
+        { id: "map", text: "Карта", component: pe },
+        { id: "table", text: "Таблиця", component: U },
+        { id: "chart", text: "Віджет", component: X }
       ],
       activeTab: "map",
       mapId: `map-${Math.floor(Math.random() * 1e3)}`,
@@ -141,17 +142,19 @@ const ie = /* @__PURE__ */ V(ae, [["render", le]]), pe = {
   },
   methods: {
     async getMapData() {
-      const t = await fetch(
-        `/api/bi-cluster?widget=${this.widget}&dashboard=${this.dashboard}`
+      const t = await N.get(
+        `/bi-cluster?widget=${this.widget}&dashboard=${this.dashboard}`
+      ), { data: s } = await N.get(
+        `/bi-data?dashboard=${this.dashboard}&widget=${this.widget}`
       );
-      this.data = await t.json();
+      console.log(s), this.data = t.data;
     },
     async loadHandler() {
       var a, e, o, d;
       this.baseColor = ((a = this.data.style) == null ? void 0 : a.color) || "blue";
       const t = ["case"];
       (d = (o = (e = this.data) == null ? void 0 : e.sizes) == null ? void 0 : o.reverse()) == null || d.forEach((c, i) => {
-        t.push([">", ["get", "metric"], c]), t.push(N[this.baseColor][i]), i++;
+        t.push([">", ["get", "metric"], c]), t.push(O[this.baseColor][i]), i++;
       }), t.push("gray");
       const s = {
         type: "polygon",
@@ -231,23 +234,23 @@ const ie = /* @__PURE__ */ V(ae, [["render", le]]), pe = {
       }
     }
   }
-}, ce = { class: "h-full" }, de = { class: "flex items-start justify-between mb-[6px] w-full" }, he = { class: "text-gray-800 font-[600]" }, ue = { class: "flex gap-2" }, me = ["onClick"], ge = ["id"], ye = ["id"], fe = { class: "absolute flex flex-col right-[10px] top-[105px] gap-1" }, be = { class: "h-[calc(250px)]" };
+}, de = { class: "h-full" }, he = { class: "flex items-start justify-between mb-[6px] w-full" }, ue = { class: "text-gray-800 font-[600]" }, me = { class: "flex gap-2" }, ge = ["onClick"], ye = ["id"], fe = ["id"], be = { class: "absolute flex flex-col right-[10px] top-[105px] gap-1" }, xe = { class: "h-[calc(250px)]" };
 function ve(t, s, n, a, e, o) {
   var m, g, y, f, b, k, L, E, B, H;
-  const d = u("VsMapSetting"), c = u("VsMapSlotLayers"), i = u("VsMapGoHome"), v = u("VsClusterLegend"), x = u("VsList"), _ = u("VsListbar");
-  return p(), h("div", ce, [
-    l("div", de, [
-      l("h3", he, G(t.title), 1),
-      l("div", ue, [
-        (p(!0), h(O, null, F(e.options, (r) => (p(), h("button", {
-          class: I(["p-1 text-gray-700 border rounded-lg", [e.activeTab === (r == null ? void 0 : r.id) ? "ring-2 ring-blue-500" : ""]]),
-          onClick: (xe) => e.activeTab = r == null ? void 0 : r.id
+  const d = u("VsMapSetting"), c = u("VsMapSlotLayers"), i = u("VsMapGoHome"), x = u("VsClusterLegend"), v = u("VsList"), _ = u("VsBar");
+  return p(), h("div", de, [
+    l("div", he, [
+      l("h3", ue, R(t.title), 1),
+      l("div", me, [
+        (p(!0), h(F, null, G(e.options, (r) => (p(), h("button", {
+          class: I(["p-1 text-gray-700 border rounded", [e.activeTab === (r == null ? void 0 : r.id) ? "ring-2 ring-blue-500" : ""]]),
+          onClick: (_e) => e.activeTab = r == null ? void 0 : r.id
         }, [
-          (p(), M(Y(r == null ? void 0 : r.component), {
-            height: "24",
-            width: "24"
+          (p(), M(j(r == null ? void 0 : r.component), {
+            height: "16",
+            width: "16"
           }))
-        ], 10, me))), 256))
+        ], 10, ge))), 256))
       ])
     ]),
     z(l("div", {
@@ -257,20 +260,20 @@ function ve(t, s, n, a, e, o) {
       l("div", {
         id: e.mapId,
         class: "h-[calc(100%-40px)] w-full flex items-end min-h-[250px]"
-      }, null, 8, ye),
+      }, null, 8, fe),
       e.showSetting ? (p(), M(d, {
         key: 0,
         map: e.map,
         coordinates: e.coordinatesByMouse
       }, null, 8, ["map", "coordinates"])) : S("", !0),
       w(c, { map: e.map }, null, 8, ["map"]),
-      l("div", fe, [
+      l("div", be, [
         w(i, {
           map: e.map,
           bbox: (m = e.data) == null ? void 0 : m.bounds
         }, null, 8, ["map", "bbox"])
       ]),
-      w(v, {
+      w(x, {
         mapId: e.mapId,
         colors: (g = e.data) == null ? void 0 : g.colors,
         sizes: (y = e.data) == null ? void 0 : y.sizes,
@@ -278,10 +281,10 @@ function ve(t, s, n, a, e, o) {
         changeOpacityItem: "true",
         cluster: "true"
       }, null, 8, ["mapId", "colors", "sizes", "color"])
-    ], 8, ge), [
+    ], 8, ye), [
       [C, e.activeTab == "map"]
     ]),
-    z(w(x, {
+    z(w(v, {
       mapId: e.mapId,
       source: (f = e.data) == null ? void 0 : f.rows,
       total: ((b = e.data) == null ? void 0 : b.total) || 0,
@@ -290,7 +293,7 @@ function ve(t, s, n, a, e, o) {
     }, null, 8, ["mapId", "source", "total", "count"]), [
       [C, e.activeTab == "table"]
     ]),
-    z(l("div", be, [
+    z(l("div", xe, [
       (E = (L = e.data) == null ? void 0 : L.rows) != null && E.length ? (p(), M(_, {
         key: 0,
         source: (H = (B = e.data) == null ? void 0 : B.rows) == null ? void 0 : H.map((r) => ({
@@ -303,7 +306,7 @@ function ve(t, s, n, a, e, o) {
     ])
   ]);
 }
-const ze = /* @__PURE__ */ V(pe, [["render", ve]]);
+const Me = /* @__PURE__ */ V(ce, [["render", ve]]);
 export {
-  ze as default
+  Me as default
 };

package/dist/{vs-map-CnK-QncQ.js → vs-map-uUiqdNLp.js}

@@ -1,5 +1,5 @@
-import { c as L, l as $, p as B, V as H, a as O, b as T, d as F, m as S, e as N } from "./vs-list-ONirzMum.js";
-import { _ as C, c as R } from "./import-file-CcioJxEB.js";
+import { c as L, l as $, p as B, V as H, a as O, b as T, d as F, m as S, e as N } from "./vs-list-C-gFvDvr.js";
+import { _ as C, c as R } from "./import-file-XtDaxS3X.js";
 import { resolveComponent as u, createElementBlock as d, openBlock as n, Fragment as w, createElementVNode as a, createBlock as E, createCommentVNode as c, createVNode as f, Teleport as A, toDisplayString as b, renderList as k, normalizeStyle as I, normalizeClass as V } from "vue";
 const G = {
   components: { legendIcon: $, closeIcon: L },
@@ -98,7 +98,7 @@ function ee(e, t, s, o, r, l) {
                     backgroundColor: i.color
                   })
                 }, null, 4)) : c("", !0),
-                a("p", K, b(i.val), 1)
+                a("p", K, b(i.text || i.val), 1)
               ]))), 128))
             ])
           ])) : c("", !0),

package/dist/{vs-number-BwR2niBA.js → vs-number-BuOWTFVp.js}

@@ -1,4 +1,4 @@
-import { _ as c, c as o, f as n } from "./import-file-CcioJxEB.js";
+import { _ as c, c as o, f as n } from "./import-file-XtDaxS3X.js";
 import { createElementBlock as i, openBlock as m, toDisplayString as s } from "vue";
 const u = {
   name: "VsNumber",

package/dist/{vs-table-BgSOqPFX.js → vs-table-BG9nb7R0.js}

@@ -1,4 +1,4 @@
-import { _ as m, c as f, d as _, a as b } from "./import-file-CcioJxEB.js";
+import { _ as m, c as f, d as _, a as b } from "./import-file-XtDaxS3X.js";
 import { createElementBlock as a, openBlock as r, createElementVNode as s, Fragment as n, renderList as c, toDisplayString as d } from "vue";
 const x = {
   name: "VsTable",

package/dist/{vs-text-L2QtfpkN.js → vs-text-BEb3W2ua.js}

@@ -1,4 +1,4 @@
-import { _ as o, c as s, m as i } from "./import-file-CcioJxEB.js";
+import { _ as o, c as s, m as i } from "./import-file-XtDaxS3X.js";
 import { createElementBlock as r, openBlock as n, createCommentVNode as a } from "vue";
 const c = {
   name: "VsText",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/bi",
-  "version": "1.0.41",
+  "version": "1.0.42",
   "description": "BI data visualization module",
   "main": "dist/bi.js",
   "browser": "dist/bi.umd.cjs",

package/server/routes/dashboard/controllers/dashboard.js

@@ -31,6 +31,7 @@ export default async function dashboard({
     } catch (err) {
       data.error = err.toString();
     }
+
     data.type = 'bd';
     const { table_name: table } = data;
 
@@ -38,7 +39,16 @@ export default async function dashboard({
       return { message: 'not enough params: table required', status: 400 };
     }
 
-    const { fields = [] } = table && pg.pk?.[table] ? await pg.query(`select * from ${table} limit 0`) : {};
+    const loadTemplate = pg.pk?.['admin.doc_template'] ? await pg.query(
+      'select body from admin.doc_template where doc_type=5 and title=$1',
+      [table]
+    ).then(el => el.rows?.[0]?.body) : null;
+
+    const sqlList = loadTemplate?.sql ? loadTemplate?.sql
+      ?.filter?.(el => !el.disabled && el?.sql?.replace)
+      ?.map?.((el, i) => `left join lateral (${el.sql.replace(/limit 1/ig, '')}) t${i} on 1=1`)?.join?.(' ') : '';
+
+    const { fields = [] } = table && pg.pk?.[loadTemplate?.table || table] ? await pg.query(`select * from ${loadTemplate?.table || table} t ${sqlList || ''} limit 0`) : {};
 
     data?.widgets?.forEach?.(el => {
       const { style, data = {}, type, title, x, metrics } = el;
@@ -51,11 +61,10 @@ export default async function dashboard({
       Object.assign(el, { title, type });
     });
 
-    const meta = table ? await getMeta({ pg, table }) : {};
+    const meta = table ? await getMeta({ pg, table: loadTemplate?.table || table }) : {};
+    const columnIndexes = meta?.columns?.reduce((acc, curr, idx) => Object.assign(acc, { [curr.name]: idx }), {}) || [];
 
-    const columns = meta?.columns
-      ?.filter(el => fields.map(field => field.name).includes(el.name))
-      ?.map(el => ({ name: el.name, title: el.title, type: pg.pgType?.[el.dataTypeID] }));
+    const columns = fields?.map(el => ({ name: el.name, title: meta?.columns[columnIndexes[el.name]]?.title || el.name, type: pg.pgType?.[el.dataTypeID] }));
 
     return {
       ...data || {},
@@ -63,8 +72,9 @@ export default async function dashboard({
       panels: data?.panels?.filter?.(el => el?.widget) || [],
       geom: !meta?.geom,
       error:
-        table && !pg.pk?.[table] ? `table pkey not found: ${table}` : undefined,
+        table && !pg.pk?.[loadTemplate?.table || table] ? `table pkey not found: ${loadTemplate?.table || table}` : undefined,
       table_name: table,
+      templateTable: loadTemplate?.table,
       time: Date.now() - time,
       columns,
     };

package/server/routes/data/controllers/data.js

@@ -34,7 +34,7 @@ export default async function dataAPI(req, reply) {
   const pg = widgetData.pg || req.pg || pgClients.client;
 
   const { fields: cols } = await pg.query(
-    `select * from ${data.table} limit 0`
+    `select * from ${data.table} t ${widgetData.tableSQL || data.tableSQL || ''} limit 0`
   );
   const columnTypes = cols.map((el) => ({
     name: el.name,
@@ -65,8 +65,8 @@ export default async function dataAPI(req, reply) {
     return { message: `table not found: ${data.table} (${pg.options?.database})`, status: 404 };
   }
 
-  const columnList = columns.map(col => col.name);
-  const groupbyColumnNotExists = groupby?.split?.(',')?.filter?.(el => !columnList.includes(el.trim()));
+  // const columnList = columns.map(col => col.name);
+  const groupbyColumnNotExists = groupby?.split?.(',')?.filter?.(el => !columnTypes.map(el => el.name).includes(el.trim()));
 
   if (groupby && groupbyColumnNotExists?.length) {
     return { message: `groupby column not found: ${groupbyColumnNotExists} (${data.table}/${pg.options?.database})`, status: 404 };
@@ -83,7 +83,7 @@ export default async function dataAPI(req, reply) {
 
   if (query.sql === '2') return { x, metric, table, tableSQL, data, groupData };
 
-  const order = data.order || (type === 'listbar' ? 'metric desc' : null);
+  const order = data.order || (type === 'listbar' && cols.find(el => el.name === 'metric') ? 'metric desc' : null);
 
   const fData =
     filter || search
@@ -139,7 +139,8 @@ export default async function dataAPI(req, reply) {
     };
   }
 
-  if (config.debug) console.log(sql, user?.uid);
+  if (config.trace) console.log(sql, user?.uid);
+
   const { rows, fields } = await pg.query(sql.replace('{{uid}}', user?.uid)); // test with limit
 
   if (cls) {

package/server/routes/data/controllers/util/normalizeData.js

@@ -57,7 +57,7 @@ function normalizeData(data, query = {}, columnTypes = []) {
   const where = `${data.query || '1=1'} and ${custom || 'true'}`;
 
   const tableSQL = data.tableSQL?.length
-    ? `(select * from ${data?.table} t ${data.tableSQL.join(' \n ')} where ${where})q`
+    ? `(select * from ${data?.table} t ${data.tableSQL || ''} where ${where})q`
     : undefined;
 
   return { x, cls, metric, table, where, tableSQL, groupby, xName, xType, yName, yType, error: skip.length ? skip.join(',') : undefined };

package/server/routes/edit/controllers/widget.add.js

@@ -1,5 +1,5 @@
 import { createHash } from 'node:crypto';
-import { dataInsert, dataUpdate, pgClients } from "@opengis/fastify-table/utils.js";
+import { dataInsert, dataUpdate, getPGAsync, pgClients } from "@opengis/fastify-table/utils.js";
 
 /* eslint-disable import/extensions */
 import { yamlSafe } from '../../../../utils.js';
@@ -20,12 +20,19 @@ export default async function widgetAdd({ pg = pgClients.client, params = {}, bo
   const row = await pg.query(`select dashboard_id, widgets, panels, table_name, db from bi.dashboard 
   where $1 in (dashboard_id,name)`, [dashboardName]).then(el => el.rows?.[0] || {});
 
+  const pg1 = row?.db ? await getPGAsync(row.db) : pg;
+
   const tableName = data.data?.table
     || data?.table
     || data.table_name
     || row.table_name;
 
-  if (!tableName || !(pg.pk?.[tableName] || pgClients[data.db || row.db || 'client']?.pk?.[tableName])) {
+  const loadTemplate = pg1.pk?.['admin.doc_template'] ? await pg1.query(
+    'select body from admin.doc_template where doc_type=5 and title=$1',
+    [tableName]
+  ).then(el => el.rows?.[0]?.body) : null;
+
+  if (!tableName || !(pg.pk?.[loadTemplate?.table || tableName] || pgClients[data.db || row.db || 'client']?.pk?.[loadTemplate?.table || tableName])) {
     return { message: 'bad params: table', status: 400 };
   }
 

package/server/routes/edit/controllers/widget.edit.js

@@ -37,8 +37,18 @@ export default async function widgetEdit({ pg = pgClients.client, body, params }
     .reduce((p, el) => ({ ...p, [el]: data[el] }), {});
 
   // get table
-  const tableName = body.table || widgetData.data?.table_name || widgetData.data?.table || widgetData?.table_name || templateData.table;
-  if (!tableName || !(pg.pk?.[tableName] || pgClients[widgetData?.data?.db || templateData?.db || 'client']?.pk?.[tableName])) {
+  const tableName = body.table
+    || widgetData.data?.table_name
+    || widgetData.data?.table
+    || widgetData?.table_name
+    || templateData.table;
+
+  const loadTemplate = pg.pk?.['admin.doc_template'] ? await pg.query(
+    'select body from admin.doc_template where doc_type=5 and title=$1',
+    [tableName]
+  ).then(el => el.rows?.[0]?.body) : null;
+
+  if (!tableName || !(pg.pk?.[loadTemplate?.table || tableName] || pgClients[widgetData?.data?.db || templateData?.db || 'client']?.pk?.[loadTemplate?.table || tableName])) {
     return { message: 'bad params: table ' + tableName, status: 400 };
   }
 

package/server/routes/map/controllers/map.js

@@ -31,9 +31,9 @@ export default async function map(req) {
     );
     if (data?.cls) {
       const vals = await getSelectVal({
-        pg, name: data.cls, values: rows.map(el => el.val),
+        pg, name: data.cls, values: rows.map(el => el.val), ar: true,
       });
-      rows.forEach(row => Object.assign(row, { val: vals?.[row.val || ''] || row.val }));
+      rows.forEach(row => Object.assign(row, { ...vals?.find?.(el => el.id === row.val) || { text: row.val } }));
     }
     Object.assign(res, { colors: rows }); // кольори для легенди
   }

package/server/utils/getWidget.js

@@ -85,10 +85,15 @@ async function getWidget({ pg: pg1 = pgClients.client, dashboard, widget }) {
     };
   }
 
-  const { pk, view } = await getMeta({ pg: widgetDb, table: main?.table });
+  const loadTemplate = pg.pk?.['admin.doc_template'] ? await pg.query(
+    'select body from admin.doc_template where doc_type=5 and title=$1',
+    [main.table]
+  ).then(el => el.rows?.[0]?.body) : null;
+
+  const { pk, view, columns = [] } = await getMeta({ pg: widgetDb, table: loadTemplate?.table || main?.table });
   if (!pk && !view) {
     return {
-      message: /* json.error || */ `invalid ${widget ? 'widget' : 'dashboard'}: table not found (${main?.table})`,
+      message: /* json.error || */ `invalid ${widget ? 'widget' : 'dashboard'}: table not found (${loadTemplate?.table || main?.table})`,
       status: 404,
     };
   }
@@ -97,6 +102,16 @@ async function getWidget({ pg: pg1 = pgClients.client, dashboard, widget }) {
     (el, i) => `left join lateral(${el})t${i + 1} on 1=1`
   );
 
-  return { ...main, pg: widgetDb, sql: widgetData?.sql, limit: widgetData?.limit, tableSQL, data, type, text, controls, style, options, yml };
+  const columnList = columns.map(col => col.name);
+
+  const res = { ...main, pg: widgetDb, sql: widgetData?.sql, limit: widgetData?.limit, tableSQL, data, type, text, controls, style, options, yml };
+  if (res.x && !columnList.includes(res.x) && !loadTemplate?.table) {
+    Object.assign(res, { x: null, error: `column does not exists: ${res.x} at table ${res.table}` });
+  }
+  if (loadTemplate?.table) {
+    Object.assign(res.data || {}, { table: loadTemplate?.table });
+    Object.assign(res, { table: loadTemplate?.table, table_name: loadTemplate?.table, tableSQL: loadTemplate.sql?.filter?.(el => !el.disabled && el?.sql?.replace)?.map?.((el, i) => `left join lateral(${el.sql})t${i + 1} on 1=1`)?.join?.(' ') });
+  }
+  return res;
 }
 export default getWidget;