@opengis/admin 0.2.25 → 0.2.27

package/module/settings/table/admin.routes.table.json

@@ -16,9 +16,9 @@
     ],
     "columns": [
         {
-            "name": "alias",
+            "name": "route_id",
             "format": "text",
-            "title": "Назва файлу інтерфейсу"
+            "title": "Назва інтерфейсу"
         },
         {
             "name": "title",
@@ -55,8 +55,8 @@
     },
     "filters": [
         {
-            "ua": "Alias",
-            "name": "alias",
+            "ua": "Назва інтерфейсу",
+            "name": "route_id",
             "type": "text"
         },
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/admin",
-  "version": "0.2.25",
+  "version": "0.2.27",
   "description": "This project Softpro Admin",
   "main": "dist/admin.js",
   "type": "module",
@@ -28,7 +28,14 @@
     "docs:build": "vitepress build docs",
     "docs:preview": "vitepress preview docs"
   },
-  "keywords": [],
+  "keywords": [
+    "admin",
+    "database",
+    "fatify",
+    "vue",
+    "vite",
+    "opengis"
+  ],
   "author": "Softpro",
   "license": "ISC",
   "dependencies": {
@@ -81,4 +88,4 @@
     "vitepress-plugin-tabs": "^0.5.0",
     "vitepress-sidebar": "^1.22.0"
   }
-}
+}

package/server/helpers/list/utils/button.js

@@ -1,6 +1,6 @@
-
-
-export default function button(token, title) {
-    return `<button onclick="window.v3plugin.$form({ token: '${token}' })"
-    class="inline-flex items-center px-2 py-1 text-sm font-medium text-white duration-300 bg-blue-600 border border-transparent rounded-lg gap-x-2 hover:bg-blue-700 hover:text-white">${title || 'Додати'}</button>`;
+
+
+export default function button(token, title) {
+    return `<button onclick="window.v3plugin.$form({ token: '${token}' })"
+    class="inline-flex items-center px-2 py-1 text-sm font-medium text-white duration-300 bg-blue-600 border border-transparent rounded-lg gap-x-2 hover:bg-blue-700 hover:text-white">${title || 'Додати'}</button>`;
 }

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

@@ -44,8 +44,8 @@ export default async function tableFilter(req) {
         if (!dataTypeID) return;
 
         const countArr = pg.pgType?.[dataTypeID]?.includes('[]')
-            ? await pg.queryCache(`select unnest(${name})::text as id,count(*) from ${loadTable.table} where ${loadTable.query || '1=1'} group by unnest(${name})`)
-            : await pg.queryCache(`select ${name}::text as id,count(*) from ${loadTable.table} where ${loadTable.query || '1=1'} group by ${name}`);
+            ? await pg.queryCache(`select unnest(${name})::text as id,count(*) from ${loadTable.table} where ${loadTable.query || '1=1'} group by unnest(${name})`, { table: loadTable.table, time: 15 })
+            : await pg.queryCache(`select ${name}::text as id,count(*) from ${loadTable.table} where ${loadTable.query || '1=1'} group by ${name}`, { table: loadTable.table, time: 15 });
 
         /* if (!countArr.rows?.length) {
             Object.assign(el, { options: cls.map((item) => ({ count: 0, ...item })) });

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

@@ -1,21 +1,21 @@
-function onCheck(rule, data) {
-    const val = data[rule[0]];
-    // console.log(val, rule[1], rule[2])
-    if (rule[1] === '==') return val === rule[2];
-    if (rule[1] === '!=') return val !== rule[2];
-    if (rule[1] === 'in' && rule[2].split) return rule[2].split(',').includes(val);
-    if (rule[1] === 'in' && rule[2].includes) return rule[2].includes(val);
-
-    if (rule[1] === 'not in' && rule[2].split) return !rule[2].split(',').includes(val);
-    if (rule[1] === 'not in' && rule[2].includes) return !rule[2].includes(val);
-
-    if (rule[1] === '>') return val > rule[2];
-    if (rule[1] === '<') return val < rule[2];
-}
-export default function conditions(rules, data) {
-    if (!rules?.length) return true;
-    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
-    // console.log(rules, result)
-    return result;
-
+function onCheck(rule, data) {
+    const val = data[rule[0]];
+    // console.log(val, rule[1], rule[2])
+    if (rule[1] === '==') return val === rule[2];
+    if (rule[1] === '!=') return val !== rule[2];
+    if (rule[1] === 'in' && rule[2].split) return rule[2].split(',').includes(val);
+    if (rule[1] === 'in' && rule[2].includes) return rule[2].includes(val);
+
+    if (rule[1] === 'not in' && rule[2].split) return !rule[2].split(',').includes(val);
+    if (rule[1] === 'not in' && rule[2].includes) return !rule[2].includes(val);
+
+    if (rule[1] === '>') return val > rule[2];
+    if (rule[1] === '<') return val < rule[2];
+}
+export default function conditions(rules, data) {
+    if (!rules?.length) return true;
+    const result = Array.isArray(rules[0]) ? !rules.filter(el => !onCheck(el, data)).length : onCheck(rules, data)
+    // console.log(rules, result)
+    return result;
+
 }