@opengis/admin 0.3.70 → 0.3.72

package/dist/{profile-page-Bn9naG_j.js → profile-page-C6ZqfM0p.js}

@@ -1,6 +1,6 @@
-import { _ as n, e as m } from "./import-file-C9RmOGhX.js";
+import { _ as n, f as m } from "./import-file-BxGL9AWZ.js";
 import { u as p } from "./user-B_2kh6ic.js";
-import { resolveComponent as d, createElementBlock as f, openBlock as u, createElementVNode as o, createBlock as h, createCommentVNode as b } from "vue";
+import { resolveComponent as f, openBlock as u, createElementBlock as d, createElementVNode as o, createBlock as h, createCommentVNode as b } from "vue";
 const x = {
   data() {
     return {
@@ -50,8 +50,8 @@ const x = {
   }
 }, g = { class: "flex justify-center pt-[20px] pb-[20px] pl-[20px] h-[calc(100vh-58px)]" }, k = { class: "bg-white rounded-xl p-[20px]" }, y = { class: "flex-1 overflow-auto [&::-webkit-scrollbar]:w-2 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-track]:bg-gray-100 [&::-webkit-scrollbar-thumb]:bg-gray-300 dark:[&::-webkit-scrollbar-track]:bg-neutral-700 dark:[&::-webkit-scrollbar-thumb]:bg-neutral-500" }, w = { class: "flex" };
 function _(r, t, a, l, e, s) {
-  const i = d("VsForm");
-  return u(), f("div", g, [
+  const i = f("VsForm");
+  return u(), d("div", g, [
     o("div", k, [
       t[2] || (t[2] = o("h2", { class: "mb-[20px] text-center" }, "Профіль", -1)),
       o("div", y, [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.3.70",
+  "version": "0.3.72",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -49,7 +49,7 @@
     "@opengis/fastify-auth": "1.0.80",
     "@opengis/fastify-file": "1.0.66",
     "@opengis/fastify-table": "^1.3.28",
-    "@opengis/v3-core": "^0.3.144",
+    "@opengis/v3-core": "^0.3.145",
     "@opengis/v3-filter": "^0.1.3",
     "@tiptap/core": "^2.8.0",
     "@tiptap/extension-color": "^2.8.0",

package/server/helpers/core/badge.js

@@ -3,13 +3,13 @@ import { getSelect } from "@opengis/fastify-table/utils.js";
 
 
 export default async function badge(id, options) {
-  if (!id) return '-';
+  if (!id?.toString) return '-';
   const data = options.hash?.data;
   if (!data) return id;
   const classifier = await getSelect(data);
   if (!classifier?.arr) return id;
 
-  const item = classifier?.arr.find(el => el.id == id);
+  const item = classifier?.arr.find(el => el.id?.toString?.() === id.toString());
   if (!item) return id;
   return `<span style='color:${item.color || '#14b8a6'};border-color:${item.color || '#14b8a6'};' class="inline-flex items-center gap-x-1.5 py-1.5 px-3 rounded-full text-xs font-medium border border-teal-500 text-teal-500">${item.text}</span>`
 

package/server/helpers/list/descriptionList.js

@@ -15,7 +15,7 @@ async function format(d, key, data) {
 export default async function descriptionList(data, opt) {
     const { hash } = opt;
 
-    
+    // no data
     if (hash.nodata && !data) {
         const noDataText = typeof hash.nodata == 'string' ? hash.nodata : '<div class="bg-gray-200 text-center p-6 rounded-xl"><h3 class="text-lg font-semibold">Інформація відсутня</h3></div>';
         return noDataText
@@ -23,10 +23,7 @@ export default async function descriptionList(data, opt) {
     if (!hash.columns) return 'columns empty'
     const keys = hash.columns.split(hash.divider || ',').map(el => hash.comma ? el.trim().replace(new RegExp(hash.comma || '#', 'g'), ',') : el.trim());
 
-    const colCount = parseInt(hash.col) || 1; 
-    const itemsPerCol = Math.ceil(keys.length / (2 * colCount)); 
-
-    const columns = Array(colCount).fill().map(() => []);
+    const result = [];
 
     for (let i = 0; i < keys.length; i += 2) {
         const name = keys[i];
@@ -35,28 +32,15 @@ export default async function descriptionList(data, opt) {
         if (!nameHBS && name.includes('{{')) continue;
 
         const key = keys[i + 1];
+
         const d1 = await format(data[key], key, data) || '-';
 
-        const itemHtml = `<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4 even:bg-gray-50 text-[12px]">
+        result.push(`<div class="grid grid-cols-1 gap-1 py-3 sm:grid-cols-3 sm:gap-4 even:bg-gray-50 text-[12px]">
             <dt class="text-gray-900">${nameHBS || name}</dt>
             <dd class="text-gray-700 sm:col-span-2">${d1}</dd>
-        </div>`;
-
-        const colIndex = Math.floor((i / 2) / itemsPerCol);
-        if (colIndex < colCount) {
-            columns[colIndex].push(itemHtml);
-        }
-    }
+            </div>
+        `);
 
-    let finalHtml = '<div class="grid grid-cols-1 gap-4 sm:grid-cols-' + colCount + '">';
-    
-    for (let i = 0; i < colCount; i++) {
-        if (columns[i].length > 0) {
-            finalHtml += '<dl class="divide-y divide-gray-100 py-[5px]">' + columns[i].join('') + '</dl>';
-        }
     }
-    
-    finalHtml += '</div>';
-    
-    return finalHtml;
+    return '<dl class=" divide-y divide-gray-100 py-[5px]">' + result.join('') + '</dl>';
 }