@opengis/admin 0.1.37 → 0.1.39

package/dist/style.css

@@ -1 +1 @@
-.map-popup__vertical[data-v-14698eb6]{overflow:auto;max-height:300px}.map-popup__vertical[data-v-14698eb6]::-webkit-scrollbar{width:6px;height:6px;background-color:#f5f5f5}.map-popup__vertical[data-v-14698eb6]::-webkit-scrollbar-thumb{border-radius:5px;background-color:#dedede}.map-popup__vertical[data-v-14698eb6]::-webkit-scrollbar-track{background-color:#f5f5f5}.map__popup-body[data-v-14698eb6]{table-layout:fixed;width:100%}.map__popup-body-item[data-v-14698eb6]:not(:last-child){border-bottom:1px solid #eeeeee}.map__popup-body-item td[data-v-14698eb6]{width:50%;word-wrap:break-word;text-align:start}.map__popup-body-item td[data-v-14698eb6]:first-child{font-weight:600}.popup-image[data-v-180f4367]{max-width:100%;max-height:220px;margin-bottom:10px;object-fit:contain}.maplibregl-ctrl-bottom-right,.maplibregl-popup-close-button{display:none}.widget-file .vs-button{background-color:#2563eb;color:#fff;font-size:.875rem;line-height:1.25rem;font-weight:600}.ui-dialog__modal div.flex.justify-between.items-center.py-3.px-4.border-b{border-bottom-width:0px;--tw-text-opacity: 1;color:#1f2937;font-weight:500;font-size:1.125rem;line-height:1.75rem;padding-bottom:0rem}.ui-dialog__modal .ui-dialog__content .p-4{padding-top:0rem}.widget-images__item-desc span:first-child:after{content:"";width:2px;height:2px;border-radius:50%;display:flex;align-items:center;background:#676a6c;margin:0 5px}.disabled{cursor:not-allowed!important}.item__text-content,.item{transition:all .5s cubic-bezier(.4,0,.2,1)}.item:hover .item__text-content{opacity:.8}.vs-widget-images .vs-button{background-color:#2563eb;color:#fff;font-size:.875rem;line-height:1.25rem;font-weight:600}.editor-container{max-width:800px;margin:0 auto}.ProseMirror-focused{outline:none}.editor-toolbar{background-color:#f9fafb}.editor-content{min-height:200px}button{transition:background-color .2s ease;outline:none}button:focus{outline:none}.editor-content ul{margin-left:20px}.editor-content ul>li{list-style:disc}.editor-content ol{list-style-type:decimal;margin-left:20px}code{background-color:#d3d1d1;border-radius:4px}.mention-popup{background-color:#fafafa;padding:10px;border-radius:10px;box-shadow:0 4px 6px #0000001a;z-index:1000;max-width:200px;overflow-y:auto;width:auto}.mention-option{padding:5px 10px;cursor:pointer;transition:background-color .2s;border-radius:8px}.mention-option:hover{background-color:#f0f0f0}.border-top:not(:first-child){--tw-border-opacity: 1;border-color:#e5e7eb;border-top-width:1px}.widget-comment-form .vs-button{padding:.625rem 1rem;font-size:.75rem;line-height:1rem;font-weight:500}.widget-comment-form .vs-button:focus{border:transparent;--tw-ring-opacity: 1;--tw-ring-color: rgb(191 219 254);--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 rgba(0, 0, 0, 0))}.grid[data-v-908a7e3b]{display:grid;grid-template-columns:repeat(12,minmax(0,1fr));gap:1rem}.admin-wrapper[data-v-c3c91323]{display:flex;height:100vh;align-items:start}.vs-popover__content>div{padding:.25rem}
+li[data-v-d46b1d2e]{cursor:move}.map-popup__vertical[data-v-14698eb6]{overflow:auto;max-height:300px}.map-popup__vertical[data-v-14698eb6]::-webkit-scrollbar{width:6px;height:6px;background-color:#f5f5f5}.map-popup__vertical[data-v-14698eb6]::-webkit-scrollbar-thumb{border-radius:5px;background-color:#dedede}.map-popup__vertical[data-v-14698eb6]::-webkit-scrollbar-track{background-color:#f5f5f5}.map__popup-body[data-v-14698eb6]{table-layout:fixed;width:100%}.map__popup-body-item[data-v-14698eb6]:not(:last-child){border-bottom:1px solid #eeeeee}.map__popup-body-item td[data-v-14698eb6]{width:50%;word-wrap:break-word;text-align:start}.map__popup-body-item td[data-v-14698eb6]:first-child{font-weight:600}.popup-image[data-v-180f4367]{max-width:100%;max-height:220px;margin-bottom:10px;object-fit:contain}.maplibregl-ctrl-bottom-right,.maplibregl-popup-close-button{display:none}.widget-file .vs-button{background-color:#2563eb;color:#fff;font-size:.875rem;line-height:1.25rem;font-weight:600}.ui-dialog__modal div.flex.justify-between.items-center.py-3.px-4.border-b{border-bottom-width:0px;--tw-text-opacity: 1;color:#1f2937;font-weight:500;font-size:1.125rem;line-height:1.75rem;padding-bottom:0rem}.ui-dialog__modal .ui-dialog__content .p-4{padding-top:0rem}.widget-images__item-desc span:first-child:after{content:"";width:2px;height:2px;border-radius:50%;display:flex;align-items:center;background:#676a6c;margin:0 5px}.disabled{cursor:not-allowed!important}.item__text-content,.item{transition:all .5s cubic-bezier(.4,0,.2,1)}.item:hover .item__text-content{opacity:.8}.vs-widget-images .vs-button{background-color:#2563eb;color:#fff;font-size:.875rem;line-height:1.25rem;font-weight:600}.editor-container{max-width:800px;margin:0 auto}.ProseMirror-focused{outline:none}.editor-toolbar{background-color:#f9fafb}.editor-content{min-height:200px}button{transition:background-color .2s ease;outline:none}button:focus{outline:none}.editor-content ul{margin-left:20px}.editor-content ul>li{list-style:disc}.editor-content ol{list-style-type:decimal;margin-left:20px}.editor-content pre{background-color:#d3d1d1;border-radius:4px;padding:0 2px}.mention-popup{background-color:#fafafa;padding:10px;border-radius:10px;box-shadow:0 4px 6px #0000001a;z-index:1000;max-width:200px;overflow-y:auto;width:auto}.mention-option{padding:5px 10px;cursor:pointer;transition:background-color .2s;border-radius:8px}.mention-option:hover{background-color:#f0f0f0}.border-top:not(:first-child){--tw-border-opacity: 1;border-color:#e5e7eb;border-top-width:1px}.widget-comment-form .vs-button{padding:.625rem 1rem;font-size:.75rem;line-height:1rem;font-weight:500}.widget-comment-form .vs-button:focus{border:transparent;--tw-ring-opacity: 1;--tw-ring-color: rgb(191 219 254);--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow, 0 0 rgba(0, 0, 0, 0))}.grid[data-v-908a7e3b]{display:grid;grid-template-columns:repeat(12,minmax(0,1fr));gap:1rem}.admin-wrapper[data-v-c3c91323]{display:flex;height:100vh;align-items:start}.vs-popover__content>div{padding:.25rem}

package/module/settings/menu.json

@@ -10,6 +10,11 @@
                 "table": "admin.users.table",
                 "ua": "Користувачі",
                 "en": "Users"
+            },
+                {
+                "path": "reester",
+                "ua": "Реєстр",
+                "component":"reester-page"
             },
             {
                 "path": "admin.roles",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -34,8 +34,8 @@
   "dependencies": {
     "@opengis/fastify-auth": "^1.0.35",
     "@opengis/fastify-file": "^1.0.17",
-    "@opengis/fastify-table": "^1.1.22",
-    "@opengis/v3-core": "^0.1.92",
+    "@opengis/fastify-table": "^1.1.27",
+    "@opengis/v3-core": "^0.1.105",
     "@opengis/v3-filter": "^0.0.31",
      "@tiptap/core": "^2.8.0",
     "@tiptap/extension-mention": "^2.8.0",

package/server/routes/data/controllers/funcs/getFilterSQL/index.js

@@ -39,7 +39,7 @@ async function getFilterSQL({
         return pk && !fieldsList.includes(name) ? `${pk} in (select ${pk} from (${fieldQuery})q where ${name} ${sval})` : `${name} ${sval}`;
       }).join(' or ')} )` : '';
 
-    const filterList1 = await Promise.all((filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || []))
+    const filterList1 = await Promise.all((filterList || (body?.filter_list || []).concat(body?.filterInline || []).concat(body?.filterCustom || []).concat(body?.filterState || []).concat(body?.filterList || []).concat(body?.filters || []))
       ?.map(async (el) => {
         if (!el?.data) return el;
         const cls = await getTemplate(['cls', 'select'], el.data);

package/server/routes/data/controllers/funcs/getFilterSQL/util/formatValue.js

@@ -71,7 +71,7 @@ function formatValue({
     };
   }
 
-  if (filter.sql && false) {
+  if (filter.sql) {
     return { op: '~', query: filter.sql.replace('{val}', value) };
   }
   if (fieldType?.includes('[]')) {
@@ -114,9 +114,12 @@ function formatValue({
   }
 
   if (['~', '='].includes(operator)) {
+    const operator1 = (filterType === 'text' && (filter?.id || filter?.name) && operator === '=' ? '~' : operator);
+    const match = operator1 === '=' ? `='${value}'` : `ilike '%${value}%'`;
     const query = filter?.data && filter?.sql
-      ? `${filter?.name || filter?.id} in ( ( with q(id,name)  as  (${filter?.sql}) select id from q where name ilike '%${value}%') )` // filter with cls
-      : `${name}::text ilike '%${value}%'`; // simple filter
+      ? `${filter?.name || filter?.id} in ( ( with q(id,name)  as  (${filter?.sql}) select id from q where name::text ${match}) )` // filter with cls
+      : `${name}::text ${match}`; // simple filter
+    // console.log(query);
     return { op: 'ilike', query };
   }
 

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

@@ -73,9 +73,9 @@ export default async function getTableData(req) {
 
         const order = columnList.includes(orderColumn) && orderColumn?.length ? `order by ${orderColumn} ${query.desc || orderDir === 'desc' ? 'desc' : ''}` : '';
 
-        const state = loadTable.filterState && query.state ? loadTable.filterState[query.state]?.sql : null;
+        const state = loadTable.filterState && query.state ? loadTable.filterState?.find((el) => el.label === query.state)?.sql : null;
 
-        const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom[query.custom]?.sql : null;
+        const custom = loadTable.filterCustom && query.custom ? loadTable.filterCustom?.find((el) => el.label === query.custom)?.sql : null;
 
         const search = loadTable.meta?.search && query.search ? `(${loadTable.meta?.search.split(',').map(el => `${el} ilike '%${query.search}%'`).join(' or ')})` : null;
 

package/dist/IconSearch-BtomZb8r.js

@@ -1,26 +0,0 @@
-import { openBlock as o, createElementBlock as r, createElementVNode as t } from "vue";
-import { _ as n } from "./import-file-ChmncuMJ.js";
-const s = {}, c = {
-  class: "shrink-0 size-4 text-gray-400 dark:text-white/60",
-  xmlns: "http://www.w3.org/2000/svg",
-  viewBox: "0 0 24 24",
-  fill: "none",
-  stroke: "currentColor",
-  "stroke-width": "2",
-  "stroke-linecap": "round",
-  "stroke-linejoin": "round"
-};
-function i(l, e, a, p, d, m) {
-  return o(), r("svg", c, e[0] || (e[0] = [
-    t("circle", {
-      cx: "11",
-      cy: "11",
-      r: "8"
-    }, null, -1),
-    t("path", { d: "m21 21-4.3-4.3" }, null, -1)
-  ]));
-}
-const u = /* @__PURE__ */ n(s, [["render", i]]);
-export {
-  u as I
-};