@opengis/admin 0.3.25 → 0.3.26

package/server/helpers/list/tableList.js

@@ -30,7 +30,7 @@ export default async function tableList(data, opt) {
     const keys = hash.columns.split(hash.divider || ',').map(el => hash.comma ? el.trim().replace(new RegExp(hash.comma, 'g'), ',') : el.trim()).concat(hash.uid && hash.table && hash.id && !hash.noactions ? ['Дії', 'actions'] : []);
 
     const result = [];
-    result.push('<thead class="text-left"> <tr>');
+    result.push('<thead class="text-left font-medium text-gray-700"> <tr>');
 
     // thead 
     const skip = {}
@@ -46,7 +46,7 @@ export default async function tableList(data, opt) {
         skip[name] = name.includes('{{') && !nameHBS;
         if (skip[name]) continue;
 
-        result.push(`<th class="whitespace-nowrap py-3 font-medium text-gray-900 ">
+        result.push(`<th class="py-2">
                     ${nameHBS || name}
         </th>`)
     }
@@ -55,7 +55,7 @@ export default async function tableList(data, opt) {
     // body 
     for (let k = 0; k < data.length; k += 1) {
         const row = data[k];
-        result.push('<tr>');
+        result.push('<tr class="odd:bg-gray-50">');
         const obj = { form: hash.form, table: hash.table, id: row[hash.id] }
         const token = hash.table ? setToken({ ids: [JSON.stringify(obj)], uid: hash.uid, array: 1 })[0] : null;
         for (let i = 0; i < keys.length; i += 2) {
@@ -67,7 +67,7 @@ export default async function tableList(data, opt) {
 
             const tokenData = key == 'actions' ? token : null;
             const d1 = key.includes('{{') ? await handlebars.compile(key)({ ...row, token, hash }) || '-' : null
-            result.push(`<td class="whitespace-nowrap py-2 text-gray-900">
+            result.push(`<td class="py-2 pr-5">
                                ${d1 || format(tokenData || row[key], key, row, hash)}
                             </td>`);
 
@@ -79,5 +79,5 @@ export default async function tableList(data, opt) {
     result.push('</tbody>');
 
     //    console.log(Date.now() - time)
-    return '<table class="min-w-full divide-y-2 divide-gray-200 bg-white min-w-full divide-y-2 divide-gray-200 bg-white "> ' + result.join('') + '</table>';
+    return '<table class="min-w-full divide-y-2 divide-gray-200 bg-white min-w-full divide-y-2 divide-gray-200 bg-white text-[12px] text-gray-600">' + result.join('') + '</table>';
 }

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/helpers/list/utils/buttonDel.js

@@ -8,6 +8,6 @@ const newColor = 'red'
 export default function button(token, title) {
     return `<button onclick="window.v3plugin.$api({ api: '/api/table/${token}', method:'delete',confirm: { title:'Підтвердити операцію',  text: 'Ви впевнені що хочете вилучити запис?', cancel: 'Скасувати', confirm : 'Виконати'} })"
     class="group px-2 py-1 inline-flex border-solid justify-center items-center gap-2 rounded-md font-semibold focus:outline-none text-sm transition-all border border-transparent hover:text-white ring-offset-white bg-${newColor}-100 text-${newColor}-100 hover:bg-${newColor}-500 focus:ring-${newColor}-500">
-    <svg  class="group-hover:fill-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" width="15" height="15" fill="#ef4444"><path d="M135.2 17.7L128 32 32 32C14.3 32 0 46.3 0 64S14.3 96 32 96l384 0c17.7 0 32-14.3 32-32s-14.3-32-32-32l-96 0-7.2-14.3C307.4 6.8 296.3 0 284.2 0L163.8 0c-12.1 0-23.2 6.8-28.6 17.7zM416 128L32 128 53.2 467c1.6 25.3 22.6 45 47.9 45l245.8 0c25.3 0 46.3-19.7 47.9-45L416 128z"/></svg>
+    <svg  class="group-hover:fill-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" width="13" height="13" fill="#ef4444"><path d="M135.2 17.7L128 32 32 32C14.3 32 0 46.3 0 64S14.3 96 32 96l384 0c17.7 0 32-14.3 32-32s-14.3-32-32-32l-96 0-7.2-14.3C307.4 6.8 296.3 0 284.2 0L163.8 0c-12.1 0-23.2 6.8-28.6 17.7zM416 128L32 128 53.2 467c1.6 25.3 22.6 45 47.9 45l245.8 0c25.3 0 46.3-19.7 47.9-45L416 128z"/></svg>
     </button>`;
 }

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

@@ -10,6 +10,6 @@ const newColor = 'blue'
 export default function button(token, title) {
     return `<button onclick="window.v3plugin.$form({ token: '${token}' })"
     class="group px-2 py-1 inline-flex border-solid justify-center items-center gap-2 rounded-md font-semibold focus:outline-none text-sm transition-all border border-transparent hover:text-white ring-offset-white bg-${newColor}-100 text-${newColor}-100 hover:bg-${newColor}-500 focus:ring-${newColor}-500">
-    <svg class="group-hover:fill-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="15" height="15" fill="#3b82f6"><path d="M471.6 21.7c-21.9-21.9-57.3-21.9-79.2 0L362.3 51.7l97.9 97.9 30.1-30.1c21.9-21.9 21.9-57.3 0-79.2L471.6 21.7zm-299.2 220c-6.1 6.1-10.8 13.6-13.5 21.9l-29.6 88.8c-2.9 8.6-.6 18.1 5.8 24.6s15.9 8.7 24.6 5.8l88.8-29.6c8.2-2.7 15.7-7.4 21.9-13.5L437.7 172.3 339.7 74.3 172.4 241.7zM96 64C43 64 0 107 0 160L0 416c0 53 43 96 96 96l256 0c53 0 96-43 96-96l0-96c0-17.7-14.3-32-32-32s-32 14.3-32 32l0 96c0 17.7-14.3 32-32 32L96 448c-17.7 0-32-14.3-32-32l0-256c0-17.7 14.3-32 32-32l96 0c17.7 0 32-14.3 32-32s-14.3-32-32-32L96 64z"/></svg>
+    <svg class="group-hover:fill-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="13" height="13" fill="#3b82f6"><path d="M471.6 21.7c-21.9-21.9-57.3-21.9-79.2 0L362.3 51.7l97.9 97.9 30.1-30.1c21.9-21.9 21.9-57.3 0-79.2L471.6 21.7zm-299.2 220c-6.1 6.1-10.8 13.6-13.5 21.9l-29.6 88.8c-2.9 8.6-.6 18.1 5.8 24.6s15.9 8.7 24.6 5.8l88.8-29.6c8.2-2.7 15.7-7.4 21.9-13.5L437.7 172.3 339.7 74.3 172.4 241.7zM96 64C43 64 0 107 0 160L0 416c0 53 43 96 96 96l256 0c53 0 96-43 96-96l0-96c0-17.7-14.3-32-32-32s-32 14.3-32 32l0 96c0 17.7-14.3 32-32 32L96 448c-17.7 0-32-14.3-32-32l0-256c0-17.7 14.3-32 32-32l96 0c17.7 0 32-14.3 32-32s-14.3-32-32-32L96 64z"/></svg>
     </button>`;
 }

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;
+
 }

package/dist/edit-page-BsDJ8lKP.js

@@ -1,140 +0,0 @@
-import { _ as f, e as m, u as y } from "./import-file-B8gDejaq.js";
-import { resolveComponent as x, createElementBlock as w, openBlock as h, createElementVNode as u, normalizeStyle as d, createBlock as k, createCommentVNode as v } from "vue";
-const $ = {
-  data() {
-    return {
-      formValues: {},
-      scheme: null,
-      table: "",
-      token: "",
-      style: null
-    };
-  },
-  mounted() {
-    this.getFormScheme();
-  },
-  methods: {
-    flattenMenu(e) {
-      const t = [];
-      return e.forEach((r) => {
-        r.menu ? t.push(...this.flattenMenu(r.menu)) : t.push(r);
-      }), t;
-    },
-    async getFormScheme() {
-      var i, o;
-      const e = this.flattenMenu(y.value);
-      e != null && e.length || this.$router.replace("/404");
-      const t = e == null ? void 0 : e.find((a) => {
-        var n, s;
-        return (a == null ? void 0 : a.path) == ((s = (n = this.$route) == null ? void 0 : n.query) == null ? void 0 : s.table);
-      });
-      t || this.$router.replace("/404");
-      const r = t == null ? void 0 : t.table;
-      this.table = r;
-      try {
-        const {
-          data: { form: a }
-        } = await m.get(`/api/template/table/${r}`), { data: n } = await m.get(
-          `/api/table/${this.table}/${(o = (i = this.$route) == null ? void 0 : i.query) == null ? void 0 : o.id}`
-        );
-        this.token = (n == null ? void 0 : n.token) || "", this.formValues = n || {};
-        const { data: s } = await m.get(`/api/template/form/${a}`);
-        this.scheme = (s == null ? void 0 : s.schema) || s, this.style = (s == null ? void 0 : s.style) || null;
-      } catch {
-      }
-    },
-    async onlyEditObject() {
-      var t, r, i, o, a, n, s, c, l;
-      const e = this.$refs.form;
-      try {
-        await e.doValidation(), await m.put(`/api/table/${this.token}`, this.formValues), await this.$notify({
-          title: "Успішно!",
-          message: "Об'єкт успішно створено",
-          type: "success"
-        });
-      } catch (b) {
-        const p = ((t = b == null ? void 0 : b.response) == null ? void 0 : t.data) || "";
-        let g = ((a = (o = (i = (r = Object.entries(e == null ? void 0 : e.formErrors)) == null ? void 0 : r[0]) == null ? void 0 : i[1]) == null ? void 0 : o[0]) == null ? void 0 : a.message) === "Це поле обов'язкове" ? "Заповніть обов'язкові поля" : (l = (c = (s = (n = Object.entries(e == null ? void 0 : e.formErrors)) == null ? void 0 : n[0]) == null ? void 0 : s[1]) == null ? void 0 : c[0]) == null ? void 0 : l.message;
-        this.$notify({
-          title: "Помилка!",
-          message: p || g || "Сталася помилка валідаціі",
-          type: "error"
-        });
-      }
-    },
-    getGroupedErrorNotification(e, t) {
-      if (!e || !t) return "";
-      const r = {};
-      return Object.entries(e).forEach(([o, a]) => {
-        var s;
-        const n = ((s = t[o]) == null ? void 0 : s.ua) || o;
-        a.forEach((c) => {
-          const l = c.message;
-          r[l] || (r[l] = []), r[l].push(`"${n}"`);
-        });
-      }), Object.entries(r).map(([o, a]) => `<b>${o}:</b> ${a.join(", ")}`).join("<br>") || "Сталася помилка валідації";
-    },
-    async editObjectAndRedirect() {
-      const e = this.$refs.form;
-      try {
-        await e.doValidation(), await m.put(`/api/table/${this.token}`, this.formValues), await this.$router.back(), await this.$notify({
-          title: "Успішно!",
-          message: "Об'єкт успішно створено",
-          type: "success"
-        });
-      } catch {
-        const r = this.getGroupedErrorNotification(
-          e == null ? void 0 : e.formErrors,
-          e == null ? void 0 : e.scheme
-        );
-        this.$notify({
-          title: "Помилка!",
-          message: r,
-          type: "error"
-        });
-      }
-    }
-  }
-}, V = { class: "bg-gray-50 lg:w-[calc(100vw-260px)] w-[100vw]" }, j = { class: "h-[76px] mt-[15px] flex items-center justify-between mx-[20px] px-[20px] bg-white border rounded-xl" }, E = { class: "flex items-center gap-[6px]" }, _ = { class: "bg-white w-full rounded-xl border p-[20px] overflow-auto [&::-webkit-scrollbar]:w-2 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar:horizontal]:h-[8px] [&::-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" };
-function O(e, t, r, i, o, a) {
-  var s, c;
-  const n = x("VsForm");
-  return h(), w("div", V, [
-    u("div", j, [
-      t[3] || (t[3] = u("h2", { class: "text-xl font-medium" }, "Редагувати", -1)),
-      u("div", E, [
-        u("button", {
-          onClick: t[0] || (t[0] = (l) => e.$router.back()),
-          class: "flex items-center px-3 py-2 text-sm font-medium text-gray-800 duration-300 bg-white border border-gray-100 rounded-lg shadow gap-x-2 focus:outline-none hover:bg-gray-50 hover:border-gray-100"
-        }, " Скасувати "),
-        u("button", {
-          onClick: t[1] || (t[1] = (...l) => a.editObjectAndRedirect && a.editObjectAndRedirect(...l)),
-          class: "inline-flex items-center px-3 py-2 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"
-        }, " Зберегти ")
-      ])
-    ]),
-    u("div", {
-      style: d({
-        height: ((s = e.$adminSettings) == null ? void 0 : s.header) === !1 ? "calc(100vh - 100px)" : "calc(100vh - 165px)"
-      }),
-      class: "bg-gray-50 p-[20px] flex lg:w-[calc(100vw-260px)] w-[100vw]"
-    }, [
-      u("div", _, [
-        o.scheme ? (h(), k(n, {
-          key: 0,
-          ref: "form",
-          scheme: o.scheme,
-          columns: (c = o.style) == null ? void 0 : c.columns,
-          style: d(o.style),
-          modelValue: o.formValues,
-          "onUpdate:modelValue": t[2] || (t[2] = (l) => o.formValues = l),
-          class: "p-0 mt-[20px]"
-        }, null, 8, ["scheme", "columns", "style", "modelValue"])) : v("", !0)
-      ])
-    ], 4)
-  ]);
-}
-const F = /* @__PURE__ */ f($, [["render", O]]);
-export {
-  F as default
-};