sd-render 1.1.0 → 1.1.1

package/{sd-lib-DcrfxTNr.js → sd-lib-OqlIKLHn.js}

@@ -4,14 +4,14 @@ import "element-plus/es/components/dialog/style/index";
 import "element-plus/es/components/button/style/index";
 import "element-plus/es/components/icon/style/index";
 import "element-plus/es/components/image/style/index";
-import { createElementBlock as w, openBlock as n, normalizeClass as X, createElementVNode as P, createCommentVNode as g, toDisplayString as O, defineComponent as L, markRaw as jl, capitalize as Go, normalizeStyle as te, ref as K, nextTick as yt, resolveComponent as Y, Fragment as E, createVNode as r, withCtx as s, createBlock as p, createTextVNode as S, inject as j, renderList as G, resolveDynamicComponent as pa, mergeProps as ae, toHandlers as Ul, withModifiers as R, renderSlot as fe, computed as le, watch as Ke, provide as xe, unref as pe, watchEffect as Yo, toRaw as Jo, withDirectives as Ve, vShow as Rl, reactive as ke, onMounted as Je, normalizeProps as Oa, guardReactiveProps as Na, createSlots as tt, defineAsyncComponent as Xo, resolveDirective as zl, withKeys as Qo } from "vue";
+import { createElementBlock as w, openBlock as n, normalizeClass as X, createElementVNode as P, createCommentVNode as g, toDisplayString as O, defineComponent as L, markRaw as jl, capitalize as Go, normalizeStyle as te, ref as K, nextTick as yt, resolveComponent as Y, Fragment as E, createVNode as r, withCtx as s, createBlock as p, createTextVNode as S, inject as j, renderList as G, resolveDynamicComponent as pa, mergeProps as ae, toHandlers as Ul, withModifiers as R, renderSlot as he, computed as le, watch as Ke, provide as xe, unref as me, watchEffect as Yo, toRaw as Jo, withDirectives as Ve, vShow as Rl, reactive as ke, onMounted as Je, normalizeProps as Oa, guardReactiveProps as Na, createSlots as tt, defineAsyncComponent as Xo, resolveDirective as zl, withKeys as Qo } from "vue";
 import { Editor as It, Node as ot, mergeAttributes as Xe, getMarkRange as Zo, Extension as He, isList as ei } from "@tiptap/core";
 import We from "ace-builds";
 import "ace-builds/src-min-noconflict/theme-tomorrow_night_eighties";
 import "ace-builds/src-min-noconflict/theme-sqlserver";
 import "ace-builds/src-min-noconflict/mode-html";
 import "ace-builds/src-min-noconflict/ext-beautify";
-import { useDark as se } from "@vueuse/core";
+import { useDark as re } from "@vueuse/core";
 import ti from "@tiptap/extension-list-item";
 import Ka from "@tiptap/extension-text";
 import Ga from "@tiptap/extension-paragraph";
@@ -102,7 +102,7 @@ import Vi from "@tiptap/extension-bullet-list";
 import Ai from "@tiptap/extension-ordered-list";
 import Oi from "@tiptap/extension-image";
 import "element-plus/es/components/upload/style/index";
-import he from "axios";
+import ce from "axios";
 import Ni from "@tiptap/extension-task-list";
 import Ei from "@tiptap/extension-task-item";
 import { Table as Li } from "@tiptap/extension-table";
@@ -495,7 +495,7 @@ function On(e, t, a, l, o, i) {
   }, null, 4);
 }
 const Nn = /* @__PURE__ */ B(An, [["render", On]]);
-var Ue = /* @__PURE__ */ ((e) => (e.None = "None", e.String = "String", e.Integer = "Integer", e.Number = "Number", e.Boolean = "Boolean", e.Array = "Array", e.Object = "Object", e.ObjectId = "ObjectId", e.StringDate = "StringDate", e.ArrayDate = "ArrayDate", e.Date = "Date", e.Timestamp = "Timestamp", e.Binary = "Binary", e.StringArray = "String|Array", e.ObjectArray = "Object|Array", e.Any = "Any", e))(Ue || {}), de = /* @__PURE__ */ ((e) => (e.SYS = "SYS", e.FORM = "FORM", e.SQL = "SQL", e))(de || {}), me = /* @__PURE__ */ ((e) => (e.ASC = "ASC", e.DESC = "DESC", e))(me || {});
+var Ue = /* @__PURE__ */ ((e) => (e.None = "None", e.String = "String", e.Integer = "Integer", e.Number = "Number", e.Boolean = "Boolean", e.Array = "Array", e.Object = "Object", e.ObjectId = "ObjectId", e.StringDate = "StringDate", e.ArrayDate = "ArrayDate", e.Date = "Date", e.Timestamp = "Timestamp", e.Binary = "Binary", e.StringArray = "String|Array", e.ObjectArray = "Object|Array", e.Any = "Any", e))(Ue || {}), ue = /* @__PURE__ */ ((e) => (e.SYS = "SYS", e.FORM = "FORM", e.SQL = "SQL", e))(ue || {}), fe = /* @__PURE__ */ ((e) => (e.ASC = "ASC", e.DESC = "DESC", e))(fe || {});
 const Kb = [
   {
     value: "user-list",
@@ -806,7 +806,7 @@ function $a(e, t, a) {
     d && (i === l.length - 1 ? o[d] = a : ((!o[d] || typeof o[d] != "object" || Array.isArray(o[d])) && (o[d] = {}), o = o[d]));
   }
 }
-function ce(e, t) {
+function de(e, t) {
   try {
     let a = t.split("."), l = e;
     for (let o = 0, i = a.length; o < i; o++) {
@@ -827,7 +827,7 @@ function ce(e, t) {
 function Tt(e) {
   return ri.sanitize(e, {});
 }
-function re(e, t) {
+function se(e, t) {
   const a = (i) => `{{###~${i}~###}}`, l = Object.keys(t).map((i, d) => ({
     key: i,
     val: t[i],
@@ -1655,7 +1655,7 @@ const eo = /* @__PURE__ */ B(ys, [["render", vs]]), ws = L({
 function _s(e, t, a, l, o, i) {
   const d = eo, u = Zl, m = Ql;
   return n(), w("div", Fs, [
-    fe(e.$slots, "prepend"),
+    he(e.$slots, "prepend"),
     r(d, {
       editor: e.editor,
       url: e.linkAttrs.href
@@ -2098,8 +2098,8 @@ function Ts(e) {
     l.value = h;
   };
   let i;
-  const d = se(), u = () => {
-    const h = pe(e).extensionManager.extensions.find((b) => b.name === "codeView");
+  const d = re(), u = () => {
+    const h = me(e).extensionManager.extensions.find((b) => b.name === "codeView");
     if (h) {
       const { editorOptions: b } = h.options;
       if (We) {
@@ -2117,7 +2117,7 @@ function Ts(e) {
             wrap: _.wrap,
             printMargin: _.printMargin,
             useWorker: _.useWorker,
-            value: pe(e).getHTML()
+            value: me(e).getHTML()
           })
         ), We.require("ace/ext/beautify").beautify(t.session);
       }
@@ -2132,7 +2132,7 @@ function Ts(e) {
       });
     else if (t) {
       const b = t.getValue();
-      pe(e).commands.setContent(
+      me(e).commands.setContent(
         b,
         !0
         /* emitUpdate */
@@ -2312,7 +2312,7 @@ const Ps = L({
       onUpdate: i
     });
     Yo(() => {
-      pe(d)?.setOptions({
+      me(d)?.setOptions({
         editorProps: {
           attributes: {
             spellcheck: String(e.spellcheck)
@@ -2326,7 +2326,7 @@ const Ps = L({
     xe("isFullscreen", h), xe("toggleFullscreen", b), xe("enableTooltip", e.tooltip), xe("userState", e.userState);
     const { isCodeViewMode: _, aceAreaRef: C } = Ts(d);
     xe("isCodeViewMode", _);
-    const { characters: c } = $s(d), M = le(() => e.enableCharCount && !pe(_));
+    const { characters: c } = $s(d), M = le(() => e.enableCharCount && !me(_));
     return xe("t", m), xe("et", this), {
       t: m,
       onUpdate: i,
@@ -2672,7 +2672,7 @@ const zs = Ci.extend({
       previewIndex: 0
     }), l = K([]), o = K(null), i = e, d = ke({
       providerId: "getfiles-gallery",
-      providerType: de.SYS,
+      providerType: ue.SYS,
       options: {
         page: 1,
         limit: i.perPage ? i.perPage : 30
@@ -2720,7 +2720,7 @@ const zs = Ci.extend({
           fileGroup: I.file_group ? I.file_group : I.fileGroup ? I.fileGroup : "",
           fileId: I._id ? I._id : I.fileId ? I.fileId : ""
         };
-        await he.delete(`${i.userState.host}${a.type[b.value].deleteUrl}`, {
+        await ce.delete(`${i.userState.host}${a.type[b.value].deleteUrl}`, {
           data: V,
           headers: {
             Authorization: `Bearer ${i.userState.user?.token}`
@@ -2786,7 +2786,7 @@ const zs = Ci.extend({
                 "preview-teleported": ""
               }, null, 8, ["src", "preview-src-list", "initial-index"]),
               P("span", Ws, [
-                fe(F.$slots, "action", { file: Me }, void 0, !0),
+                he(F.$slots, "action", { file: Me }, void 0, !0),
                 P("span", {
                   class: "el-upload-list__item-preview",
                   onClick: (U) => q(Me)
@@ -3673,7 +3673,7 @@ const $r = /* @__PURE__ */ B(kr, [["render", Ir]]), Tr = Ei.extend({
   setup(e, { emit: t }) {
     const a = j("t"), l = K(), o = K(!1);
     return { t: a, popoverVisible: o, popoverRef: l, confirmCreateTable: (d, u) => {
-      pe(l).hide(), t("createTable", { row: d, col: u });
+      me(l).hide(), t("createTable", { row: d, col: u });
     } };
   },
   data() {
@@ -4308,7 +4308,7 @@ const Yr = /* @__PURE__ */ B(Kr, [["render", Gr]]), bl = xi.extend({
     const t = j("t"), a = j("enableTooltip", !0), l = j("isCodeViewMode", !1), o = K(), i = K("");
     function d(m) {
       let h = e.editor.commands;
-      m ? h.setColor(m) : h.unsetColor(), pe(o).hide();
+      m ? h.setColor(m) : h.unsetColor(), me(o).hide();
     }
     const u = le(() => ca(e.editor.state, "textStyle").color || "");
     return Ke(u, (m) => {
@@ -4433,7 +4433,7 @@ const ad = /* @__PURE__ */ B(Jr, [["render", td]]), gl = Wi.extend({
     const t = j("t"), a = j("enableTooltip", !0), l = j("isCodeViewMode", !1), o = K(null), i = K(!1), d = K("");
     function u(h) {
       let b = e.editor.commands;
-      h ? b.setHighlight({ color: h }) : b.unsetHighlight(), pe(o).hide();
+      h ? b.setHighlight({ color: h }) : b.unsetHighlight(), me(o).hide();
     }
     const m = le(() => ca(e.editor.state, "highlight").color || "");
     return Ke(m, (h) => {
@@ -5063,7 +5063,7 @@ const $d = /* @__PURE__ */ B(Dd, [["render", Id]]), Td = Yi.extend({
       totalPage: 0
     }), i = K([]), d = e, u = ke({
       providerId: "getfiles-uploadfile",
-      providerType: de.SYS,
+      providerType: ue.SYS,
       options: {
         page: 1,
         limit: d.perPage ? d.perPage : 30
@@ -5127,7 +5127,7 @@ const $d = /* @__PURE__ */ B(Dd, [["render", Id]]), Td = Yi.extend({
           fileGroup: I.file_group ? I.file_group : I.fileGroup ? I.fileGroup : "",
           fileId: I._id ? I._id : I.fileId ? I.fileId : ""
         };
-        he.delete(`${d.userState.host}${o.type[b.value].deleteUrl}`, {
+        ce.delete(`${d.userState.host}${o.type[b.value].deleteUrl}`, {
           data: V,
           headers: {
             Authorization: `Bearer ${d.userState.user?.token}`
@@ -5860,7 +5860,7 @@ const iu = /* @__PURE__ */ B(lu, [["render", ou]]), nu = {
   props: we,
   data() {
     return {
-      isDark: se()
+      isDark: re()
     };
   },
   mounted() {
@@ -6082,7 +6082,7 @@ const bu = /* @__PURE__ */ B(hu, [["render", cu]]), Il = ot.create({
   },
   props: we,
   data() {
-    return { isDark: se() };
+    return { isDark: re() };
   },
   mounted() {
   },
@@ -6831,7 +6831,7 @@ function Mu(e, t, a, l, o, i) {
     onPaste: t[6] || (t[6] = (...d) => e.onPaste && e.onPaste(...d))
   }, null, 40, Tu);
 }
-const dg = /* @__PURE__ */ B($u, [["render", Mu]]), at = async (e, t, a) => await he.post(
+const dg = /* @__PURE__ */ B($u, [["render", Mu]]), at = async (e, t, a) => await ce.post(
   `${a.host}/widget/crud/getdata-all`,
   { sdProvider: e, totalEnable: t },
   {
@@ -6839,7 +6839,7 @@ const dg = /* @__PURE__ */ B($u, [["render", Mu]]), at = async (e, t, a) => awai
       Authorization: `Bearer ${a.user?.token}`
     }
   }
-).then((o) => o.data && o.data.message ? { response: !0, data: o.data, message: o.data.message } : { response: !1, data: null, message: "Can't get data" }).catch((o) => o.response && o.response.data && o.response.data.message ? { response: !1, data: null, message: o.response.data.message } : { response: !1, data: null, message: "Can't get data (error)" }), Ot = async (e, t) => await he.post(
+).then((o) => o.data && o.data.message ? { response: !0, data: o.data, message: o.data.message } : { response: !1, data: null, message: "Can't get data" }).catch((o) => o.response && o.response.data && o.response.data.message ? { response: !1, data: null, message: o.response.data.message } : { response: !1, data: null, message: "Can't get data (error)" }), Ot = async (e, t) => await ce.post(
   `${t.host}/widget/crud/getdata-one`,
   { sdProvider: e },
   {
@@ -6847,7 +6847,7 @@ const dg = /* @__PURE__ */ B($u, [["render", Mu]]), at = async (e, t, a) => awai
       Authorization: `Bearer ${t.user?.token}`
     }
   }
-).then((l) => l.data && l.data.message ? { response: !0, data: l.data, message: l.data.message } : { response: !1, data: null, message: "Can't get data" }).catch((l) => l.response && l.response.data && l.response.data.message ? { response: !1, data: null, message: l.response.data.message } : { response: !1, data: null, message: "Can't get data" }), Ie = async (e, t) => await he.post(
+).then((l) => l.data && l.data.message ? { response: !0, data: l.data, message: l.data.message } : { response: !1, data: null, message: "Can't get data" }).catch((l) => l.response && l.response.data && l.response.data.message ? { response: !1, data: null, message: l.response.data.message } : { response: !1, data: null, message: "Can't get data" }), Ie = async (e, t) => await ce.post(
   `${t.host}/widget/sdform/getform`,
   { formId: e },
   {
@@ -6861,7 +6861,7 @@ const dg = /* @__PURE__ */ B($u, [["render", Mu]]), at = async (e, t, a) => awai
     return o.dataid = o._id, { response: !0, data: o, message: l.data.message };
   } else
     return { response: !1, data: void 0, message: "Can't get form" };
-}).catch((l) => l.response && l.response.data && l.response.data.message ? { response: !1, data: void 0, message: l.response.data.message } : { response: !1, data: void 0, message: "Can't get form" }), Pu = async (e, t, a) => await he.post(
+}).catch((l) => l.response && l.response.data && l.response.data.message ? { response: !1, data: void 0, message: l.response.data.message } : { response: !1, data: void 0, message: "Can't get form" }), Pu = async (e, t, a) => await ce.post(
   `${a.host}/widget/sdform/getform-version`,
   { formId: e, versionName: t },
   {
@@ -6875,7 +6875,7 @@ const dg = /* @__PURE__ */ B($u, [["render", Mu]]), at = async (e, t, a) => awai
     return i.dataid = i._id, { response: !0, data: i, message: o.data.message };
   } else
     return { response: !1, data: void 0, message: "Can't get form" };
-}).catch((o) => o.response && o.response.data && o.response.data.message ? { response: !1, data: void 0, message: o.response.data.message } : { response: !1, data: void 0, message: "Can't get form" }), wa = async (e, t) => await he.post(
+}).catch((o) => o.response && o.response.data && o.response.data.message ? { response: !1, data: void 0, message: o.response.data.message } : { response: !1, data: void 0, message: "Can't get form" }), wa = async (e, t) => await ce.post(
   `${t.host}/widget/sdform/insert-empty`,
   { formId: e },
   {
@@ -6889,12 +6889,12 @@ const dg = /* @__PURE__ */ B($u, [["render", Mu]]), at = async (e, t, a) => awai
     return o.dataid = l.data.id, o._id = l.data.id, o;
   } else
     return null;
-}).catch((l) => null), Vu = async (e, t, a) => await he.delete(`${a.host}/widget/sdform/delete-empty`, {
+}).catch((l) => null), Vu = async (e, t, a) => await ce.delete(`${a.host}/widget/sdform/delete-empty`, {
   headers: {
     Authorization: `Bearer ${a.user?.token}`
   },
   data: { formId: e, dataId: t }
-}).then((o) => !0).catch((o) => !1), dt = async (e, t, a, l, o) => await he.put(
+}).then((o) => !0).catch((o) => !1), dt = async (e, t, a, l, o) => await ce.put(
   `${o.host}/widget/sdform/save-data`,
   { formId: e, dataId: t, dataUpdate: a, rstat: l },
   {
@@ -6908,12 +6908,12 @@ const dg = /* @__PURE__ */ B($u, [["render", Mu]]), at = async (e, t, a) => awai
     return u._id = d.data.id, u.dataid = u._id, { data: u, message: d.data.message };
   } else
     return { data: null, message: d.data.message };
-}).catch((d) => d.response && d.response.data && d.response.data.message ? { data: null, message: d.response.data.message } : { data: null, message: "Can't save data" }), ja = async (e, t, a) => await he.delete(`${a.host}/widget/sdform/remove-data`, {
+}).catch((d) => d.response && d.response.data && d.response.data.message ? { data: null, message: d.response.data.message } : { data: null, message: "Can't save data" }), ja = async (e, t, a) => await ce.delete(`${a.host}/widget/sdform/remove-data`, {
   headers: {
     Authorization: `Bearer ${a.user?.token}`
   },
   data: { formId: e, dataId: t }
-}).then((o) => !0).catch((o) => !1), ug = async (e, t, a) => await he.delete(`${a.host}/widget/sdform/delete-data`, {
+}).then((o) => !0).catch((o) => !1), ug = async (e, t, a) => await ce.delete(`${a.host}/widget/sdform/delete-data`, {
   headers: {
     Authorization: `Bearer ${a.user?.token}`
   },
@@ -6941,7 +6941,7 @@ const dg = /* @__PURE__ */ B($u, [["render", Mu]]), at = async (e, t, a) => awai
 ], pg = (e, t) => e && Object.keys(e).length > 0 && e[t] && e[t].type ? e[t].type : ["_id", "xparentx"].includes(t) ? Ue.ObjectId : Ue.Any, co = (e, t) => {
   const a = e && e.form_db && e.form_db.schema ? e.form_db.schema : null;
   return a && Object.keys(a).length > 0 && t && a[t] && a[t].type ? a[t].type : ["_id", "xparentx"].includes(t) ? Ue.ObjectId : Ue.Any;
-}, Pl = (e, t) => ["_id", "xparentx"].includes(t) ? !0 : co(e, t) === "ObjectId", mg = async (e, t, a, l) => await he.put(
+}, Pl = (e, t) => ["_id", "xparentx"].includes(t) ? !0 : co(e, t) === "ObjectId", mg = async (e, t, a, l) => await ce.put(
   `${l.host}/widget/sdform/check-parent`,
   { formId: e, dataId: t, formData: a },
   {
@@ -7168,11 +7168,18 @@ const dg = /* @__PURE__ */ B($u, [["render", Mu]]), at = async (e, t, a) => awai
       if (u[a] && u[a] === d) {
         let m = [], h = {};
         l.forEach((b) => {
-          u[b] ? (m.push(u[b]), h[`{{${b}}}`] = u[b]) : h[`{{${b}}}`] = "";
-        }), o && o != "" ? i.push(re(o, h)) : i.push(m.join(" "));
+          const _ = de(u, b);
+          _ ? (m.push(_), h[`{{${b}}}`] = _) : h[`{{${b}}}`] = "";
+        }), o && o != "" ? i.push(se(o, h)) : i.push(m.join(" "));
         break;
       }
   return i.join(", ");
+}, fg = (e, t, a) => {
+  let l = "", o = [], i = {};
+  return t.forEach((d) => {
+    const u = de(e, d);
+    u ? (o.push(u), i[`{{${d}}}`] = u) : i[`{{${d}}}`] = "";
+  }), a && a != "" ? l = se(a, i) : l = o.join(" "), l;
 }, Eu = L({
   name: "SdGridColumnDynamic",
   components: {
@@ -7270,7 +7277,7 @@ const dg = /* @__PURE__ */ B($u, [["render", Mu]]), at = async (e, t, a) => awai
         i = i.slice(0, d);
         let b = i.length > 0 ? i.join(".") : i.join();
         if (e[b] && e[b].type && e[b].type == "Array") {
-          let _ = ce(t, b), C = [];
+          let _ = de(t, b), C = [];
           for (const c in _)
             if (Object.prototype.hasOwnProperty.call(_, c)) {
               let f = _[c][h];
@@ -7281,7 +7288,7 @@ const dg = /* @__PURE__ */ B($u, [["render", Mu]]), at = async (e, t, a) => awai
       }
       let u = a;
       this.subIndex > -1 && (u = `${this.parentName}.${this.subIndex}.${this.fieldName}`);
-      let m = ce(t, u);
+      let m = de(t, u);
       return this.rawValue ? m ?? null : Ae(m, a, l, o);
     }
   }
@@ -7696,7 +7703,7 @@ const xt = /* @__PURE__ */ B(Eu, [["render", Lu], ["__scopeId", "data-v-6f6b7a15
       return (e, t) => {
         let a = {}, l = this.sdformModel.form_db.schema;
         for (const o in l) {
-          let i = ce(t, o);
+          let i = de(t, o);
           a[`{{${o}}}`] = Ae(i, o, this.sdformModel);
         }
         if (this.customValue) {
@@ -7705,7 +7712,7 @@ const xt = /* @__PURE__ */ B(Eu, [["render", Lu], ["__scopeId", "data-v-6f6b7a15
               let i = this.customValue[o];
               if (i.expressions)
                 try {
-                  const u = `return ${re(i.expressions, a)}`, m = new Function("row", ...De, u);
+                  const u = `return ${se(i.expressions, a)}`, m = new Function("row", ...De, u);
                   a[`{{${i.fieldName}}}`] = m.call(this.sdformModel, t);
                 } catch (d) {
                   a[`{{${i.fieldName}}}`] = d;
@@ -7714,7 +7721,7 @@ const xt = /* @__PURE__ */ B(Eu, [["render", Lu], ["__scopeId", "data-v-6f6b7a15
                 a[`{{${i.fieldName}}}`] = "";
             }
         }
-        return Tt(re(e, a));
+        return Tt(se(e, a));
       };
     }
   },
@@ -7762,9 +7769,9 @@ const xt = /* @__PURE__ */ B(Eu, [["render", Lu], ["__scopeId", "data-v-6f6b7a15
       this.defaultParams = { ...t, ...e }, this.dpFormData.params = D(this.defaultParams), this.noMore || this.getDataList();
     },
     initForm(e) {
-      this.searchText = "", this.sdformModel = e, this.userState.formStore[this.formId] = this.sdformModel, this.fixApiUrl && this.fixApiUrl != "" ? this.apiUrl = this.fixApiUrl : this.sdformModel.form_db.api_url && this.sdformModel.form_db.api_url != "" ? this.apiUrl = this.sdformModel.form_db.api_url : this.apiUrl = window.APP_CONFIG.API_URL, this.userState.user && (this.allowInsert = Oe(this.sdformModel, this.userState.user)), this.sdformModel.form_event.after_delete && this.sdformModel.form_event.enable && (this.afterDeleteForm = new Function("formData", ...De, this.sdformModel.form_event.after_delete)), this.iconName || (this.iconForm = "", this.sdformModel.form_icon ? this.iconForm = this.sdformModel.form_icon : this.iconForm = ""), this.titleName ? this.titleNameForm = this.titleName : this.titleNameForm = this.sdformModel.form_name ? `${this.sdformModel.form_name}` : "", this.dataProvider ? this.dpFormData = D(this.dataProvider) : (this.dpFormData.providerId = this.formId, this.dpFormData.providerType = de.FORM), this.dpFormData.params || (this.dpFormData.params = {}), this.dpFormData.options ? (this.dpFormData.options.page || (this.dpFormData.options.page = 1), this.dpFormData.options.limit ? this.limit = this.dpFormData.options.limit : this.dpFormData.options.limit = this.limit, this.optionProvider = this.dpFormData.options) : this.dpFormData.options = this.optionProvider, this.parentId != "" && (this.params.xparentx = this.parentId, this.dpFormData.options && this.dpFormData.options.where ? this.dpFormData.options.where += " AND xparentx = CONVERT(:xparentx, 'objectId')" : this.dpFormData.options.where = "xparentx = CONVERT(:xparentx, 'objectId')"), this.searchFields ? this.dpFormData.options.search = this.searchFields : this.dpFormData.options.search = this.sdformModel.form_options.search_fields ? this.sdformModel.form_options.search_fields : [];
+      this.searchText = "", this.sdformModel = e, this.userState.formStore[this.formId] = this.sdformModel, this.fixApiUrl && this.fixApiUrl != "" ? this.apiUrl = this.fixApiUrl : this.sdformModel.form_db.api_url && this.sdformModel.form_db.api_url != "" ? this.apiUrl = this.sdformModel.form_db.api_url : this.apiUrl = window.APP_CONFIG.API_URL, this.userState.user && (this.allowInsert = Oe(this.sdformModel, this.userState.user)), this.sdformModel.form_event.after_delete && this.sdformModel.form_event.enable && (this.afterDeleteForm = new Function("formData", ...De, this.sdformModel.form_event.after_delete)), this.iconName || (this.iconForm = "", this.sdformModel.form_icon ? this.iconForm = this.sdformModel.form_icon : this.iconForm = ""), this.titleName ? this.titleNameForm = this.titleName : this.titleNameForm = this.sdformModel.form_name ? `${this.sdformModel.form_name}` : "", this.dataProvider ? this.dpFormData = D(this.dataProvider) : (this.dpFormData.providerId = this.formId, this.dpFormData.providerType = ue.FORM), this.dpFormData.params || (this.dpFormData.params = {}), this.dpFormData.options ? (this.dpFormData.options.page || (this.dpFormData.options.page = 1), this.dpFormData.options.limit ? this.limit = this.dpFormData.options.limit : this.dpFormData.options.limit = this.limit, this.optionProvider = this.dpFormData.options) : this.dpFormData.options = this.optionProvider, this.parentId != "" && (this.params.xparentx = this.parentId, this.dpFormData.options && this.dpFormData.options.where ? this.dpFormData.options.where += " AND xparentx = CONVERT(:xparentx, 'objectId')" : this.dpFormData.options.where = "xparentx = CONVERT(:xparentx, 'objectId')"), this.searchFields ? this.dpFormData.options.search = this.searchFields : this.dpFormData.options.search = this.sdformModel.form_options.search_fields ? this.sdformModel.form_options.search_fields : [];
       const t = D(this.dpFormData.params), a = D(this.params);
-      this.defaultParams = { ...a, ...t }, this.dpFormData.params = D(this.defaultParams), this.dpFormData.options.orderBy || (this.dpFormData.options.orderBy = [{ column: "created_at", sort: me.DESC }]), this.noMore || this.getDataList(), this.enableWs && this.sdformModel.form_options && this.sdformModel.form_options.enable_websocket && (this.wsConn = this.userState.connectWebSocket("gridform", this.sdformModel.dataid, this.widgetId, (l) => {
+      this.defaultParams = { ...a, ...t }, this.dpFormData.params = D(this.defaultParams), this.dpFormData.options.orderBy || (this.dpFormData.options.orderBy = [{ column: "created_at", sort: fe.DESC }]), this.noMore || this.getDataList(), this.enableWs && this.sdformModel.form_options && this.sdformModel.form_options.enable_websocket && (this.wsConn = this.userState.connectWebSocket("gridform", this.sdformModel.dataid, this.widgetId, (l) => {
         if (l.from != "server" && (l.from != this.userState.user?.username || l.params && l.params.widget && l.params.widget !== this.widgetId)) {
           let o = -1;
           const i = D(l.data);
@@ -7882,7 +7889,7 @@ const xt = /* @__PURE__ */ B(Eu, [["render", Lu], ["__scopeId", "data-v-6f6b7a15
       });
     },
     getValue(e, t) {
-      let a = ce(e, t);
+      let a = de(e, t);
       return a ? Ae(a, t, this.sdformModel) : "";
     },
     getSchema(e) {
@@ -8123,7 +8130,7 @@ function Tp(e, t, a, l, o, i) {
                   innerHTML: e.htmlValue(e.statusContent, V)
                 }, null, 12, Zu)) : g("", !0),
                 e.actionEnable ? (n(), w("span", ep, [
-                  fe(e.$slots, "actionBtnRow", {
+                  he(e.$slots, "actionBtnRow", {
                     row: V,
                     index: T
                   }, void 0, !0),
@@ -8521,7 +8528,7 @@ function Tp(e, t, a, l, o, i) {
                     }, null, 8, Ip))
                   ], 4)) : g("", !0),
                   e.actionEnable ? (n(), w("span", $p, [
-                    fe(e.$slots, "actionBtnRow", {
+                    he(e.$slots, "actionBtnRow", {
                       row: V,
                       index: T
                     }, void 0, !0),
@@ -8568,7 +8575,7 @@ function Tp(e, t, a, l, o, i) {
     ])) : g("", !0)
   ], 64);
 }
-const Mp = /* @__PURE__ */ B(Bu, [["render", Tp], ["__scopeId", "data-v-ff1dc326"]]), fg = /* @__PURE__ */ L({
+const Mp = /* @__PURE__ */ B(Bu, [["render", Tp], ["__scopeId", "data-v-ff1dc326"]]), hg = /* @__PURE__ */ L({
   __name: "SdAppList",
   props: {
     userState: {
@@ -9517,7 +9524,7 @@ const Mp = /* @__PURE__ */ B(Bu, [["render", Tp], ["__scopeId", "data-v-ff1dc326
 function Ta(e) {
   return e.includes("admin") || e.includes("super");
 }
-const Pp = Xo(() => import("./sd-render-jM1JOKg_.js").then((e) => e.S)), Vp = L({
+const Pp = Xo(() => import("./sd-render-CWzAnbYE.js").then((e) => e.S)), Vp = L({
   name: "SdCrudForm",
   components: {
     SdFormRenderAsync: Pp
@@ -9736,8 +9743,8 @@ const Pp = Xo(() => import("./sd-render-jM1JOKg_.js").then((e) => e.S)), Vp = L(
                 }
               this.nextOpenForm = {
                 formId: a.form,
-                parentId: re(a.parentId, o),
-                dataId: re(a.dataId, o),
+                parentId: se(a.parentId, o),
+                dataId: se(a.dataId, o),
                 initData: i
               }, this.nextOpenForm.dataId ? this.nextOpenForm.isInsert = !1 : this.nextOpenForm.isInsert = !0, this.subFormOpen({
                 modelValue: !0,
@@ -9836,7 +9843,7 @@ function Ap(e, t, a, l, o, i) {
         onFormChange: e.onFormChange
       }, {
         default: s(() => [
-          fe(e.$slots, "inputForm")
+          he(e.$slots, "inputForm")
         ]),
         _: 3
       }, 8, ["sdform", "parent-id", "form-data", "option-model", "disabled", "api-url", "params", "annotated", "is-sub-form", "auth-token", "submit-func", "user-state", "onFormChange"])) : g("", !0)
@@ -9891,7 +9898,7 @@ function Ap(e, t, a, l, o, i) {
                 _: 1
               })
             ], 64)) : g("", !0),
-            fe(e.$slots, "closeForm")
+            he(e.$slots, "closeForm")
           ]),
           _: 3
         })
@@ -10035,7 +10042,7 @@ function Kp(e, t, a, l, o, i) {
             icon: "InfoFilled",
             onClick: e.handleAppInfo
           }, null, 8, ["onClick"])) : g("", !0),
-          fe(e.$slots, "actions", {}, void 0, !0)
+          he(e.$slots, "actions", {}, void 0, !0)
         ])
       ]),
       P("div", Rp, [
@@ -10188,7 +10195,7 @@ function Kp(e, t, a, l, o, i) {
     ])) : g("", !0)
   ], 64);
 }
-const hg = /* @__PURE__ */ B(Op, [["render", Kp], ["__scopeId", "data-v-bc1eaadb"]]);
+const cg = /* @__PURE__ */ B(Op, [["render", Kp], ["__scopeId", "data-v-bc1eaadb"]]);
 tn.register(
   an,
   ln,
@@ -10317,7 +10324,7 @@ const Gp = L({
       preLoading: !1,
       showChart: !1,
       apiUrl: "",
-      isDark: se(),
+      isDark: re(),
       useUserState: this.$props.userState
     };
   },
@@ -10331,7 +10338,7 @@ const Gp = L({
   },
   computed: {
     color() {
-      return se().value ? "#414243" : "#e4e7ed";
+      return re().value ? "#414243" : "#e4e7ed";
     },
     dataChart() {
       const e = {}, t = this.rawData.map((l) => {
@@ -10376,7 +10383,7 @@ const Gp = L({
     async initdata() {
       const e = {
         providerId: this.sqlId,
-        providerType: de.SQL,
+        providerType: ue.SQL,
         params: this.params
       };
       if (this.rawData = [], this.loadEnable) {
@@ -10413,7 +10420,7 @@ const Gp = L({
             grid: {
               display: this.gridDisplay,
               color: function(e) {
-                return se().value ? "#414243" : "#e4e7ed";
+                return re().value ? "#414243" : "#e4e7ed";
               }
             },
             ...this.scalesXCustom
@@ -10427,7 +10434,7 @@ const Gp = L({
             grid: {
               display: this.gridDisplay,
               color: function(e) {
-                return se().value ? "#414243" : "#e4e7ed";
+                return re().value ? "#414243" : "#e4e7ed";
               }
             },
             ...this.scalesYCustom
@@ -10450,7 +10457,7 @@ const Gp = L({
             grid: {
               display: this.gridDisplay,
               color: function(e) {
-                return se().value ? "#414243" : "#e4e7ed";
+                return re().value ? "#414243" : "#e4e7ed";
               }
             }
           },
@@ -10463,7 +10470,7 @@ const Gp = L({
             grid: {
               display: this.gridDisplay,
               color: function(e) {
-                return se().value ? "#414243" : "#e4e7ed";
+                return re().value ? "#414243" : "#e4e7ed";
               }
             }
           }
@@ -10493,7 +10500,7 @@ function Yp(e, t, a, l, o, i) {
     ], 64))
   ], 4);
 }
-const cg = /* @__PURE__ */ B(Gp, [["render", Yp]]), Jp = L({
+const bg = /* @__PURE__ */ B(Gp, [["render", Yp]]), Jp = L({
   name: "SdApexChart",
   components: { ApexChart: yn },
   props: {
@@ -10625,7 +10632,7 @@ const cg = /* @__PURE__ */ B(Gp, [["render", Yp]]), Jp = L({
       preLoading: !1,
       showChart: !1,
       apiUrl: "",
-      isDark: se(),
+      isDark: re(),
       useUserState: this.$props.userState
     };
   },
@@ -10639,7 +10646,7 @@ const cg = /* @__PURE__ */ B(Gp, [["render", Yp]]), Jp = L({
   },
   computed: {
     color() {
-      return se().value ? "#414243" : "#e4e7ed";
+      return re().value ? "#414243" : "#e4e7ed";
     },
     dataChart() {
       let e = [];
@@ -10683,7 +10690,7 @@ const cg = /* @__PURE__ */ B(Gp, [["render", Yp]]), Jp = L({
     async initdata() {
       const e = {
         providerId: this.sqlId,
-        providerType: de.SQL,
+        providerType: ue.SQL,
         params: this.params
       };
       if (this.rawData = [], this.loadEnable) {
@@ -10716,7 +10723,7 @@ const cg = /* @__PURE__ */ B(Gp, [["render", Yp]]), Jp = L({
         },
         grid: {
           show: this.gridDisplay,
-          borderColor: se().value ? "#414243" : "#e4e7ed",
+          borderColor: re().value ? "#414243" : "#e4e7ed",
           ...this.gridCustom
         },
         dataLabels: {
@@ -10730,10 +10737,10 @@ const cg = /* @__PURE__ */ B(Gp, [["render", Yp]]), Jp = L({
             text: this.scalesXLabel
           },
           axisBorder: {
-            color: se().value ? "#414243" : "#e4e7ed"
+            color: re().value ? "#414243" : "#e4e7ed"
           },
           axisTicks: {
-            color: se().value ? "#414243" : "#e4e7ed"
+            color: re().value ? "#414243" : "#e4e7ed"
           },
           ...this.scalesXCustom
         },
@@ -10743,10 +10750,10 @@ const cg = /* @__PURE__ */ B(Gp, [["render", Yp]]), Jp = L({
             text: this.scalesYLabel
           },
           axisBorder: {
-            color: se().value ? "#414243" : "#e4e7ed"
+            color: re().value ? "#414243" : "#e4e7ed"
           },
           axisTicks: {
-            color: se().value ? "#414243" : "#e4e7ed"
+            color: re().value ? "#414243" : "#e4e7ed"
           },
           ...this.scalesYCustom
         },
@@ -10755,7 +10762,7 @@ const cg = /* @__PURE__ */ B(Gp, [["render", Yp]]), Jp = L({
           theme: "dark"
         },
         theme: {
-          mode: se().value ? "dark" : "light"
+          mode: re().value ? "dark" : "light"
         },
         ...this.customOptions
       };
@@ -10783,7 +10790,7 @@ const cg = /* @__PURE__ */ B(Gp, [["render", Yp]]), Jp = L({
         },
         grid: {
           show: this.gridDisplay,
-          borderColor: se().value ? "#414243" : "#e4e7ed",
+          borderColor: re().value ? "#414243" : "#e4e7ed",
           ...this.gridCustom
         },
         xaxis: {
@@ -10793,10 +10800,10 @@ const cg = /* @__PURE__ */ B(Gp, [["render", Yp]]), Jp = L({
             text: this.scalesXLabel
           },
           axisBorder: {
-            color: se().value ? "#414243" : "#e4e7ed"
+            color: re().value ? "#414243" : "#e4e7ed"
           },
           axisTicks: {
-            color: se().value ? "#414243" : "#e4e7ed"
+            color: re().value ? "#414243" : "#e4e7ed"
           },
           ...this.scalesXCustom
         },
@@ -10806,10 +10813,10 @@ const cg = /* @__PURE__ */ B(Gp, [["render", Yp]]), Jp = L({
             text: this.scalesYLabel
           },
           axisBorder: {
-            color: se().value ? "#414243" : "#e4e7ed"
+            color: re().value ? "#414243" : "#e4e7ed"
           },
           axisTicks: {
-            color: se().value ? "#414243" : "#e4e7ed"
+            color: re().value ? "#414243" : "#e4e7ed"
           },
           ...this.scalesYCustom
         },
@@ -10818,7 +10825,7 @@ const cg = /* @__PURE__ */ B(Gp, [["render", Yp]]), Jp = L({
           theme: "dark"
         },
         theme: {
-          mode: se().value ? "dark" : "light"
+          mode: re().value ? "dark" : "light"
         },
         ...this.customOptions
       };
@@ -10846,7 +10853,7 @@ function Xp(e, t, a, l, o, i) {
     ], 64))
   ], 4);
 }
-const bg = /* @__PURE__ */ B(Jp, [["render", Xp]]), Qp = L({
+const gg = /* @__PURE__ */ B(Jp, [["render", Xp]]), Qp = L({
   name: "SdExportData",
   emits: ["update:modelValue", "change"],
   props: {
@@ -10938,7 +10945,7 @@ const bg = /* @__PURE__ */ B(Jp, [["render", Xp]]), Qp = L({
         this.showFile = !1;
         const e = `export/${this.userState.user?.username}`;
         let t = { filePath: this.filePath, fileName: this.fName, fileType: "json", fileGroup: e, fileId: "" };
-        await he.delete(`${this.userState.host}/v1/files/remove-one`, {
+        await ce.delete(`${this.userState.host}/v1/files/remove-one`, {
           data: t,
           headers: {
             Authorization: `Bearer ${this.userState.user?.token}`
@@ -10987,7 +10994,7 @@ function tm(e, t, a, l, o, i) {
       ])
     ]),
     default: s(() => [
-      fe(e.$slots, "popup", {}, () => [
+      he(e.$slots, "popup", {}, () => [
         t[2] || (t[2] = S(" Download click here => ", -1)),
         e.showFile ? (n(), p(m, {
           key: 0,
@@ -11209,14 +11216,14 @@ const yo = /* @__PURE__ */ B(im, [["render", nm]]), sm = L({
             l[`{{${o}}}`] = Ae(t[o], o, this.formModel);
         if (a.expressions)
           try {
-            const i = `return ${re(a.expressions, l)}`, d = new Function("row", ...De, i);
+            const i = `return ${se(a.expressions, l)}`, d = new Function("row", ...De, i);
             l["{{expressions}}"] = d.call(this.formModel, t);
           } catch (o) {
             l["{{expressions}}"] = o;
           }
         else
           l["{{expressions}}"] = "";
-        return Tt(re(e, l));
+        return Tt(se(e, l));
       };
     },
     columnFields() {
@@ -11256,11 +11263,11 @@ const yo = /* @__PURE__ */ B(im, [["render", nm]]), sm = L({
       return l;
     },
     getValue(e, t, a) {
-      let l = ce(e, t);
+      let l = de(e, t);
       return this.rawValue ? l ?? null : Ae(l, t, a);
     },
     getValueType(e, t, a) {
-      let l = ce(e, t);
+      let l = de(e, t);
       if (this.rawValue)
         return l ?? null;
       if (typeof l == "boolean")
@@ -11499,7 +11506,7 @@ function um(e, t, a, l, o, i) {
         _: 2
       }, 1032, ["prop", "column-key", "label", "width", "align", "sortable", "filters", "fixed"]))), 256)) : g("", !0)
     ], 64)),
-    fe(e.$slots, "default"),
+    he(e.$slots, "default"),
     e.systemColumn ? (n(), w(E, { key: 2 }, [
       e.formModel && e.formModel.form_options && e.formModel.form_options.query_tool != "disable" ? (n(), p(u, {
         key: 0,
@@ -11751,7 +11758,7 @@ const pm = /* @__PURE__ */ B(sm, [["render", um]]), mm = L({
       useUserState: this.$props.userState,
       showExport: !1,
       showRawValue: !1,
-      dpFormData: { providerId: this.formId, providerType: de.FORM },
+      dpFormData: { providerId: this.formId, providerType: ue.FORM },
       dpExpandData: null,
       isExpand: !1,
       expandedRows: [],
@@ -11762,7 +11769,7 @@ const pm = /* @__PURE__ */ B(sm, [["render", um]]), mm = L({
       widgetId: "SdCrudGrid-" + Rt(),
       dpExportRow: {
         providerId: "",
-        providerType: de.FORM,
+        providerType: ue.FORM,
         options: { where: "_id = CONVERT(:id, 'objectId')" },
         params: { id: "" }
       },
@@ -11874,13 +11881,13 @@ const pm = /* @__PURE__ */ B(sm, [["render", um]]), mm = L({
       this.defaultParams = { ...t, ...e }, this.defaultSort = D(this.optionProvider.orderBy), this.dpFormData.params = D(this.defaultParams), this.getDataList(this.dpFormData);
     },
     initForm(e) {
-      this.searchText = "", this.sdformModel = e, this.userState.formStore[this.formId] = this.sdformModel, this.fixApiUrl && this.fixApiUrl != "" ? this.apiUrl = this.fixApiUrl : this.sdformModel.form_db.api_url && this.sdformModel.form_db.api_url != "" ? this.apiUrl = this.sdformModel.form_db.api_url : this.apiUrl = window.APP_CONFIG.API_URL, this.userState.user && (this.allowInsert = Oe(this.sdformModel, this.userState.user)), this.sdformModel.form_event.after_delete && this.sdformModel.form_event.enable && (this.afterDeleteForm = new Function("formData", ...De, this.sdformModel.form_event.after_delete)), this.iconName || (this.iconForm = "", this.sdformModel.form_icon ? this.iconForm = this.sdformModel.form_icon : this.iconForm = ""), this.titleName ? this.titleNameForm = this.titleName : this.titleNameForm = this.sdformModel.form_name ? `${this.sdformModel.form_name}` : "", this.dataProvider ? this.dpFormData = D(this.dataProvider) : (this.dpFormData.providerId = this.formId, this.dpFormData.providerType = de.FORM), this.dpFormData.params || (this.dpFormData.params = {}), this.dpFormData.options ? (this.dpFormData.options.page || (this.dpFormData.options.page = 1), this.dpFormData.options.limit ? this.limit = this.dpFormData.options.limit : this.dpFormData.options.limit = this.limit, this.optionProvider = this.dpFormData.options) : this.dpFormData.options = this.optionProvider, this.parentId != "" && (this.params.xparentx = this.parentId, this.dpFormData.options && this.dpFormData.options.where ? this.dpFormData.options.where += " AND xparentx = CONVERT(:xparentx, 'objectId')" : this.dpFormData.options.where = "xparentx = CONVERT(:xparentx, 'objectId')"), this.searchFields ? this.dpFormData.options.search = this.searchFields : this.dpFormData.options.search = this.sdformModel.form_options.search_fields ? this.sdformModel.form_options.search_fields : [];
+      this.searchText = "", this.sdformModel = e, this.userState.formStore[this.formId] = this.sdformModel, this.fixApiUrl && this.fixApiUrl != "" ? this.apiUrl = this.fixApiUrl : this.sdformModel.form_db.api_url && this.sdformModel.form_db.api_url != "" ? this.apiUrl = this.sdformModel.form_db.api_url : this.apiUrl = window.APP_CONFIG.API_URL, this.userState.user && (this.allowInsert = Oe(this.sdformModel, this.userState.user)), this.sdformModel.form_event.after_delete && this.sdformModel.form_event.enable && (this.afterDeleteForm = new Function("formData", ...De, this.sdformModel.form_event.after_delete)), this.iconName || (this.iconForm = "", this.sdformModel.form_icon ? this.iconForm = this.sdformModel.form_icon : this.iconForm = ""), this.titleName ? this.titleNameForm = this.titleName : this.titleNameForm = this.sdformModel.form_name ? `${this.sdformModel.form_name}` : "", this.dataProvider ? this.dpFormData = D(this.dataProvider) : (this.dpFormData.providerId = this.formId, this.dpFormData.providerType = ue.FORM), this.dpFormData.params || (this.dpFormData.params = {}), this.dpFormData.options ? (this.dpFormData.options.page || (this.dpFormData.options.page = 1), this.dpFormData.options.limit ? this.limit = this.dpFormData.options.limit : this.dpFormData.options.limit = this.limit, this.optionProvider = this.dpFormData.options) : this.dpFormData.options = this.optionProvider, this.parentId != "" && (this.params.xparentx = this.parentId, this.dpFormData.options && this.dpFormData.options.where ? this.dpFormData.options.where += " AND xparentx = CONVERT(:xparentx, 'objectId')" : this.dpFormData.options.where = "xparentx = CONVERT(:xparentx, 'objectId')"), this.searchFields ? this.dpFormData.options.search = this.searchFields : this.dpFormData.options.search = this.sdformModel.form_options.search_fields ? this.sdformModel.form_options.search_fields : [];
       const t = D(this.dpFormData.params), a = D(this.params);
       if (this.defaultParams = { ...a, ...t }, this.defaultSort = D(this.optionProvider.orderBy), this.dpFormData.params = D(this.defaultParams), this.sumColumn && Object.values(this.sumColumn).length > 0 && (this.dpFormData.options.sum = this.sumColumn), this.groupKey)
         if (this.expandProvider)
           this.dpExpandData = D(this.expandProvider);
         else {
-          if (this.dpExpandData = { providerId: this.formId, providerType: de.FORM }, this.dpFormData.options.select && this.dpFormData.options.select.length > 0) {
+          if (this.dpExpandData = { providerId: this.formId, providerType: ue.FORM }, this.dpFormData.options.select && this.dpFormData.options.select.length > 0) {
             const l = [`\`${this.groupKey}\``, `\`${this.groupKey}\` AS \`${this.rowKey}\``, `COUNT(*) AS \`${this.expandCountChildrenName}\``];
             this.dpFormData.options.select.push(...l);
           } else
@@ -11888,9 +11895,9 @@ const pm = /* @__PURE__ */ B(sm, [["render", um]]), mm = L({
           if (this.aggrColumn && Object.values(this.aggrColumn).length > 0 && this.dpFormData.options.select.push(...this.aggrColumn), this.sumColumn && Object.values(this.sumColumn).length > 0)
             for (const l of this.sumColumn)
               this.dpFormData.options.select.push(`SUM(\`${l}\`) AS \`${l}\``);
-          this.dpExpandData.options || (this.dpExpandData.options = {}), this.dpExpandData.options.select = ["*", `\`${this.keyId}\` AS \`${this.rowKey}\``], this.dpExpandData.options.where = `\`${this.groupKey}\` = :xgidx`, this.dpFormData.options.groupBy = [`\`${this.groupKey}\``], this.dpFormData.options.orderBy = [{ column: `\`${this.groupKey}\``, sort: me.ASC }];
+          this.dpExpandData.options || (this.dpExpandData.options = {}), this.dpExpandData.options.select = ["*", `\`${this.keyId}\` AS \`${this.rowKey}\``], this.dpExpandData.options.where = `\`${this.groupKey}\` = :xgidx`, this.dpFormData.options.groupBy = [`\`${this.groupKey}\``], this.dpFormData.options.orderBy = [{ column: `\`${this.groupKey}\``, sort: fe.ASC }];
         }
-      this.dpFormData.options.orderBy || (this.dpFormData.options.orderBy = [{ column: "created_at", sort: me.DESC }], this.defaultSort = [{ column: "created_at", sort: me.DESC }]), this.dpExportRow.providerId = this.formId, this.getDataList(this.dpFormData), this.enableWs && this.sdformModel.form_options && this.sdformModel.form_options.enable_websocket && (this.wsConn = this.userState.connectWebSocket("gridform", this.sdformModel.dataid, this.widgetId, (l) => {
+      this.dpFormData.options.orderBy || (this.dpFormData.options.orderBy = [{ column: "created_at", sort: fe.DESC }], this.defaultSort = [{ column: "created_at", sort: fe.DESC }]), this.dpExportRow.providerId = this.formId, this.getDataList(this.dpFormData), this.enableWs && this.sdformModel.form_options && this.sdformModel.form_options.enable_websocket && (this.wsConn = this.userState.connectWebSocket("gridform", this.sdformModel.dataid, this.widgetId, (l) => {
         if (l.from != "server" && (l.from != this.userState.user?.username || l.params && l.params.widget && l.params.widget !== this.widgetId)) {
           let o = -1;
           const i = D(l.data), d = l.params ? D(l.params) : null;
@@ -11945,7 +11952,7 @@ const pm = /* @__PURE__ */ B(sm, [["render", um]]), mm = L({
       if (this.dpExpandData) {
         this.dpExpandData.params || (this.dpExpandData.params ? this.dpExpandData.params = { ...this.dpExpandData.params, ...e } : this.dpExpandData.params = D(e));
         const l = this.groupKey;
-        l && e[l] != null && e[l] != null && (this.dpExpandData.params.xgidx = e[l], he.post(
+        l && e[l] != null && e[l] != null && (this.dpExpandData.params.xgidx = e[l], ce.post(
           `${this.userState.host}/widget/crud/getdata-all`,
           {
             sdProvider: this.dpExpandData,
@@ -12116,7 +12123,7 @@ const pm = /* @__PURE__ */ B(sm, [["render", um]]), mm = L({
       }
     },
     handleSort(e) {
-      this.optionProvider.orderBy = this.defaultSort, e.order !== null && (this.defaultSort ? this.optionProvider.orderBy.push({ column: `\`${e.prop}\``, sort: e.order == "descending" ? me.DESC : me.ASC }) : this.optionProvider.orderBy = [{ column: `\`${e.prop}\``, sort: e.order == "descending" ? me.DESC : me.ASC }]), this.dpExpandData && this.resetExpand(), this.getDataList(this.dpFormData);
+      this.optionProvider.orderBy = this.defaultSort, e.order !== null && (this.defaultSort ? this.optionProvider.orderBy.push({ column: `\`${e.prop}\``, sort: e.order == "descending" ? fe.DESC : fe.ASC }) : this.optionProvider.orderBy = [{ column: `\`${e.prop}\``, sort: e.order == "descending" ? fe.DESC : fe.ASC }]), this.dpExpandData && this.resetExpand(), this.getDataList(this.dpFormData);
     },
     handleSearch() {
       this.searchText != "" ? this.dpFormData.params.q = `%${this.searchText}%` : delete this.dpFormData.params.q, this.dpExpandData && this.resetExpand(), this.total = 0, this.getDataList(this.dpFormData);
@@ -12266,7 +12273,7 @@ function wm(e, t, a, l, o, i) {
               _: 1
             }),
             P("span", bm, [
-              fe(e.$slots, "actionsBar", {}, void 0, !0)
+              he(e.$slots, "actionsBar", {}, void 0, !0)
             ])
           ])) : g("", !0),
           r(f, { gutter: 20 }, {
@@ -12294,7 +12301,7 @@ function wm(e, t, a, l, o, i) {
                     _: 1
                   }, 8, ["onClick"])) : g("", !0),
                   t[6] || (t[6] = S()),
-                  fe(e.$slots, "actions", {}, void 0, !0),
+                  he(e.$slots, "actions", {}, void 0, !0),
                   e.rawdataBtnEnable ? (n(), p(b, {
                     key: 1,
                     direction: "vertical",
@@ -12372,7 +12379,7 @@ function wm(e, t, a, l, o, i) {
                 style: { display: "inline-flex" }
               }, {
                 default: s(() => [
-                  fe(e.$slots, "actionsPager", {}, () => [
+                  he(e.$slots, "actionsPager", {}, () => [
                     e.total > e.limit ? (n(), p(M, {
                       key: 0,
                       class: "mb-2",
@@ -12508,14 +12515,14 @@ function wm(e, t, a, l, o, i) {
                   ]),
                   _: 2
                 }, 1024)) : g("", !0),
-                fe(e.$slots, "actionBtnRow", {
+                he(e.$slots, "actionBtnRow", {
                   row: T.row,
                   index: T.$index
                 }, void 0, !0)
               ]),
               _: 3
             }, 8, ["label", "width"])) : g("", !0),
-            fe(e.$slots, "actionColumn", {}, void 0, !0),
+            he(e.$slots, "actionColumn", {}, void 0, !0),
             e.indexColumn ? (n(), p(k, {
               key: 1,
               type: "index",
@@ -12538,7 +12545,7 @@ function wm(e, t, a, l, o, i) {
               "raw-value": e.showRawValue
             }, {
               default: s(() => [
-                fe(e.$slots, "default", {}, void 0, !0)
+                he(e.$slots, "default", {}, void 0, !0)
               ]),
               _: 3
             }, 8, ["form-model", "display-fields", "subform-width", "system-column", "edit-column", "key-id", "row-key", "user-state", "after-save", "raw-value"])) : g("", !0)
@@ -13336,7 +13343,7 @@ const Tm = /* @__PURE__ */ B(Dm, [["render", $m]]), Mm = L({
             t = Nu(o, e, this.valueField, this.labelField, this.labelTemplate);
           } else {
             let o = this.itemsList.find((i) => !!i.value && i.value == e);
-            o && o.label && (t = o.label);
+            o.label && (t = o.label);
           }
           let a = {};
           if (this.refField) {
@@ -13352,14 +13359,14 @@ const Tm = /* @__PURE__ */ B(Dm, [["render", $m]]), Mm = L({
                   return i[this.valueField];
               }
             }), this.refField.forEach((i) => {
-              const d = ce(o, i);
+              const d = de(o, i);
               $a(a, i, d);
             });
           }
           let l = {};
           if (this.joinerObject && this.itemSelected) {
             let o;
-            if (this.fieldName ? o = ce(this.itemSelected, this.fieldName) : this.formModel.joiner_field.joiner_enable && (o = ce(this.itemSelected, this.formModel.joiner_field.field_name)), o) {
+            if (this.fieldName ? o = de(this.itemSelected, this.fieldName) : this.formModel.joiner_field.joiner_enable && (o = de(this.itemSelected, this.formModel.joiner_field.field_name)), o) {
               const i = D(o);
               let d = 1;
               for (const u in i) {
@@ -13398,17 +13405,18 @@ const Tm = /* @__PURE__ */ B(Dm, [["render", $m]]), Mm = L({
     getItemsList(e) {
       let t = "", a = [], l = ga(e);
       this.labelField.forEach((d) => {
-        e[d] ? (a.push(e[d]), l[`{{${d}}}`] = e[d]) : l[`{{${d}}}`] = "";
-      }), this.labelTemplate && this.labelTemplate != "" ? t = re(this.labelTemplate, l) : t = a.join(" "), this.optionsTemplate && this.optionsTemplate != "" && (this.optionsUi[e[this.valueField]] = re(this.optionsTemplate, l));
+        const u = de(e, d);
+        u ? (a.push(u), l[`{{${d}}}`] = u) : l[`{{${d}}}`] = "";
+      }), this.labelTemplate && this.labelTemplate != "" ? t = se(this.labelTemplate, l) : t = a.join(" "), this.optionsTemplate && this.optionsTemplate != "" && (this.optionsUi[e[this.valueField]] = se(this.optionsTemplate, l));
       let o = {};
       this.refField && this.refField.forEach((d) => {
-        const u = ce(e, d);
+        const u = de(e, d);
         $a(o, d, u);
       });
       let i = {};
       if (this.joinerObject) {
         let d;
-        if (this.fieldName ? d = ce(e, this.fieldName) : this.formModel.joiner_field.joiner_enable && (d = ce(e, this.formModel.joiner_field.field_name)), d) {
+        if (this.fieldName ? d = de(e, this.fieldName) : this.formModel.joiner_field.joiner_enable && (d = de(e, this.formModel.joiner_field.field_name)), d) {
           const u = D(d);
           let m = 1;
           for (const h in u) {
@@ -13421,7 +13429,7 @@ const Tm = /* @__PURE__ */ B(Dm, [["render", $m]]), Mm = L({
       return { value: e[this.valueField], label: t, ...i, ...o };
     },
     async getDataAll(e, t) {
-      this.loading = !0, await he.post(
+      this.loading = !0, await ce.post(
         `${this.apiUrl}/widget/crud/getdata-all`,
         {
           sdProvider: e,
@@ -13439,7 +13447,7 @@ const Tm = /* @__PURE__ */ B(Dm, [["render", $m]]), Mm = L({
       });
     },
     async getDataOne(e, t) {
-      this.loading = !0, await he.post(
+      this.loading = !0, await ce.post(
         `${this.apiUrl}/widget/crud/getdata-one`,
         { sdProvider: e },
         {
@@ -13483,7 +13491,7 @@ function Nm(e, t, a, l, o, i) {
     onVisibleChange: e.handleVisibleChange
   }, tt({
     prefix: s(() => [
-      fe(e.$slots, "prefix")
+      he(e.$slots, "prefix")
     ]),
     label: s(({ label: h, value: b }) => [
       P("div", {
@@ -13861,7 +13869,7 @@ function Bm(e, t, a, l, o, i) {
     } : void 0
   ]), 1032, ["modelValue", "multiple", "allow-create", "placeholder", "enable-object-type", "disabled", "data-provider", "value-field", "search-field", "label-field", "ref-field", "limit", "label-template", "options-template", "user-state", "onRemoteMethod", "onVisibleChange", "onChange"]);
 }
-const gg = /* @__PURE__ */ B(Em, [["render", Bm]]), jm = L({
+const yg = /* @__PURE__ */ B(Em, [["render", Bm]]), jm = L({
   name: "SdCrudSelectSubForm",
   components: {
     // SdSelectRemoteList,
@@ -14391,13 +14399,13 @@ const Rm = /* @__PURE__ */ B(jm, [["render", Um]]), vo = /* @__PURE__ */ L({
         }
       } else if (l.dataObjectMode = !0, l.disableAction = Object.keys(a.dataObject).length === 0 && !!a.path, !l.disableAction)
         for (const c in a.dataObject) {
-          const M = a.dataObject[c], f = ce(M, a.path);
+          const M = a.dataObject[c], f = de(M, a.path);
           if (a.prefixProp) {
-            const k = ce(M, a.prefixProp);
+            const k = de(M, a.prefixProp);
             _ = k || a.prefixProp, a.sqlTag && (_ = `\`${_}\``);
           }
           if (a.groupField) {
-            const k = ce(M, a.groupField);
+            const k = de(M, a.groupField);
             C = k ? "----- " + k + " -----" : "----- " + c + " -----";
           }
           let y = [];
@@ -14413,7 +14421,7 @@ const Rm = /* @__PURE__ */ B(jm, [["render", Um]]), vo = /* @__PURE__ */ L({
               let I = F.join(" ");
               if (a.labelTemplate !== "") {
                 const V = ga(A);
-                I = re(a.labelTemplate, V);
+                I = se(a.labelTemplate, V);
               }
               y.push({
                 value: q,
@@ -15270,7 +15278,7 @@ const Wm = { key: 3 }, Km = { class: "items-box" }, Gm = { class: "opt-item" },
       formDataDic: {},
       popupWidthParent: "70%",
       popupWidthDic: "80%",
-      isDark: se(),
+      isDark: re(),
       popSubSchema: {},
       versionDescription: t.versionDescription,
       activeCommt: "0",
@@ -15324,7 +15332,7 @@ const Wm = { key: 3 }, Km = { class: "items-box" }, Gm = { class: "opt-item" },
     const M = () => {
       t.joinerField.order_by.push({
         column: "",
-        sort: me.ASC
+        sort: fe.ASC
       });
     }, f = (U, v) => {
       t.joinerField.order_by.splice(v, 1);
@@ -15332,7 +15340,7 @@ const Wm = { key: 3 }, Km = { class: "items-box" }, Gm = { class: "opt-item" },
       if (U !== "") {
         const v = {
           providerId: "getsdform-all",
-          providerType: de.SYS,
+          providerType: ue.SYS,
           params: { form_license: t.formLicense },
           options: {
             fileterObjectId: ["_id"],
@@ -15364,17 +15372,17 @@ const Wm = { key: 3 }, Km = { class: "items-box" }, Gm = { class: "opt-item" },
             a.subSchema = [];
           if (a.formSelect.joiner_field && a.formSelect.joiner_field.form_id && a.formSelect.joiner_field.joiner_enable) {
             const W = D(a.formSelect.joiner_field.form_id), J = D(a.formSelect.joiner_field.ref_form);
-            let ue = 1, je = {};
+            let pe = 1, je = {};
             if (J) {
               for (const nt in J)
-                ue++;
+                pe++;
               je = {
-                [`xtbxlv${ue}_xfx_id`]: W.value,
+                [`xtbxlv${pe}_xfx_id`]: W.value,
                 ...J
               };
             } else
               je = {
-                [`xtbxlv${ue}_xfx_id`]: W.value
+                [`xtbxlv${pe}_xfx_id`]: W.value
               };
             t.joinerField.ref_form = D(je);
           }
@@ -15393,7 +15401,7 @@ const Wm = { key: 3 }, Km = { class: "items-box" }, Gm = { class: "opt-item" },
       if (v && U !== "") {
         let W = {
           providerId: "getsdform-one",
-          providerType: de.SYS,
+          providerType: ue.SYS,
           params: {
             id: U
           }
@@ -15483,9 +15491,9 @@ const Wm = { key: 3 }, Km = { class: "items-box" }, Gm = { class: "opt-item" },
                 textType: void 0
               };
             else if (U.search(/xtbxlv/g) !== -1) {
-              let J = U.split("xfx"), ue = U.split("lv"), je = "0";
-              if (ue.length > 1 && ue[1]) {
-                const nt = ue[1].split("_");
+              let J = U.split("xfx"), pe = U.split("lv"), je = "0";
+              if (pe.length > 1 && pe[1]) {
+                const nt = pe[1].split("_");
                 nt[0] && (je = nt[0]);
               }
               t.formDb.schema[W] = {
@@ -15684,9 +15692,9 @@ const Wm = { key: 3 }, Km = { class: "items-box" }, Gm = { class: "opt-item" },
       });
     }
     return (U, v) => {
-      const W = oe, J = Ll, ue = El, je = da, nt = ge, _e = ze, ie = lt, st = St, rt = Et, Ee = $e, _a = Nt, za = Ye, qa = jo, Ha = Bo, ne = qe, wo = Y("Link"), Wt = Ge, Fo = Y("Aim"), xa = Lt, Se = Dt, Mt = Ct, ct = kt, _o = va, So = Ra, ye = pt, Sa = vo, Wa = Y("InfoFilled"), ko = ra, Co = Nl, Do = Y("draggable"), Io = ut, Kt = Fe, $o = Y("sd-form-schema", !0), To = qm, Mo = zm, Po = ua;
+      const W = oe, J = Ll, pe = El, je = da, nt = ge, _e = ze, ie = lt, st = St, rt = Et, Ee = $e, _a = Nt, za = Ye, qa = jo, Ha = Bo, ne = qe, wo = Y("Link"), Wt = Ge, Fo = Y("Aim"), xa = Lt, Se = Dt, Mt = Ct, ct = kt, _o = va, So = Ra, ye = pt, Sa = vo, Wa = Y("InfoFilled"), ko = ra, Co = Nl, Do = Y("draggable"), Io = ut, Kt = Fe, $o = Y("sd-form-schema", !0), To = qm, Mo = zm, Po = ua;
       return n(), w(E, null, [
-        r(ue, {
+        r(pe, {
           title: "Parent Form",
           column: 3,
           size: "default",
@@ -16037,11 +16045,11 @@ const Wm = { key: 3 }, Km = { class: "items-box" }, Gm = { class: "opt-item" },
                               })
                             ]),
                             default: s(() => [
-                              r(pe(xl), {
+                              r(me(xl), {
                                 modelValue: $.countSite,
                                 "onUpdate:modelValue": (Q) => $.countSite = Q,
                                 "main-menu-bar": !1,
-                                mode: pe(Wl).tree,
+                                mode: me(Wl).tree,
                                 style: { width: "100%" },
                                 class: X(a.isDark ? "jse-theme-dark" : "")
                               }, null, 8, ["modelValue", "onUpdate:modelValue", "mode", "class"])
@@ -16647,7 +16655,7 @@ const Wm = { key: 3 }, Km = { class: "items-box" }, Gm = { class: "opt-item" },
                   "onUpdate:modelValue": v[2] || (v[2] = ($) => a.versionDescription = $),
                   mode: "mini",
                   readonly: !0,
-                  "user-state": pe(m)
+                  "user-state": me(m)
                 }, null, 8, ["modelValue", "user-state"])
               ]),
               _: 1
@@ -16717,7 +16725,7 @@ const Wm = { key: 3 }, Km = { class: "items-box" }, Gm = { class: "opt-item" },
                           }, {
                             default: s(() => [
                               r(So, {
-                                "user-state": pe(m),
+                                "user-state": me(m),
                                 modelValue: e.joinerField.form_id,
                                 "onUpdate:modelValue": v[4] || (v[4] = ($) => e.joinerField.form_id = $),
                                 filterable: "",
@@ -16727,7 +16735,7 @@ const Wm = { key: 3 }, Km = { class: "items-box" }, Gm = { class: "opt-item" },
                                 "enable-object-type": !0,
                                 "joiner-object": !0,
                                 "field-name": "joiner_field.form_id",
-                                "data-provider": { providerId: "getsdform-all", providerType: pe(de).SYS, params: { form_license: e.formLicense } },
+                                "data-provider": { providerId: "getsdform-all", providerType: me(ue).SYS, params: { form_license: e.formLicense } },
                                 "value-field": "_id",
                                 "search-field": ["form_name"],
                                 "label-field": ["form_name"],
@@ -17026,7 +17034,7 @@ const Wm = { key: 3 }, Km = { class: "items-box" }, Gm = { class: "opt-item" },
                                 dark: a.isDark,
                                 class: "mb-1",
                                 plain: "",
-                                onClick: (Q) => pe(xm)("{{" + $.value + "}}")
+                                onClick: (Q) => me(xm)("{{" + $.value + "}}")
                               }, {
                                 default: s(() => [
                                   S(O($.value), 1)
@@ -17163,14 +17171,14 @@ const Wm = { key: 3 }, Km = { class: "items-box" }, Gm = { class: "opt-item" },
                                       }, {
                                         default: s(() => [
                                           (n(), p(Se, {
-                                            key: pe(me).ASC,
-                                            label: pe(me).ASC,
-                                            value: pe(me).ASC
+                                            key: me(fe).ASC,
+                                            label: me(fe).ASC,
+                                            value: me(fe).ASC
                                           }, null, 8, ["label", "value"])),
                                           (n(), p(Se, {
-                                            key: pe(me).DESC,
-                                            label: pe(me).DESC,
-                                            value: pe(me).DESC
+                                            key: me(fe).DESC,
+                                            label: me(fe).DESC,
+                                            value: me(fe).DESC
                                           }, null, 8, ["label", "value"]))
                                         ]),
                                         _: 1
@@ -17474,7 +17482,7 @@ function sf(e, t, a, l, o, i) {
     _: 1
   }, 8, ["title", "modelValue", "width", "before-close", "close-on-click-modal"]);
 }
-const yg = /* @__PURE__ */ B(lf, [["render", sf]]), rf = /* @__PURE__ */ L({
+const vg = /* @__PURE__ */ B(lf, [["render", sf]]), rf = /* @__PURE__ */ L({
   __name: "SdDynamicInput",
   props: {
     modelValue: {},
@@ -17490,7 +17498,7 @@ const yg = /* @__PURE__ */ B(lf, [["render", sf]]), rf = /* @__PURE__ */ L({
     const a = e, l = ke({
       inputType: a.inputType,
       inputOptions: {},
-      isDark: se(),
+      isDark: re(),
       arrayList: ["multiselect-editor"],
       stringList: [
         "text-editor",
@@ -17708,13 +17716,13 @@ const yg = /* @__PURE__ */ B(lf, [["render", sf]]), rf = /* @__PURE__ */ L({
           onBlur: _,
           onChange: h
         }), null, 16, ["modelValue", "size", "predefine", "disabled"])) : g("", !0),
-        l.inputType === "json-editor" ? (n(), p(pe(xl), {
+        l.inputType === "json-editor" ? (n(), p(me(xl), {
           key: 11,
           modelValue: u.value,
           "onUpdate:modelValue": c[11] || (c[11] = (x) => u.value = x),
           "main-menu-bar": !1,
           "navigation-bar": !1,
-          mode: pe(Wl).tree,
+          mode: me(Wl).tree,
           style: { width: "100%" },
           size: e.size || void 0,
           class: X(l.isDark ? "jse-theme-dark" : ""),
@@ -17796,13 +17804,13 @@ const yg = /* @__PURE__ */ B(lf, [["render", sf]]), rf = /* @__PURE__ */ L({
       ], 64);
     };
   }
-}), vg = /* @__PURE__ */ B(rf, [["__scopeId", "data-v-3bca21e7"]]), df = {
+}), wg = /* @__PURE__ */ B(rf, [["__scopeId", "data-v-3bca21e7"]]), df = {
   role: "heading",
   class: "el-dialog__title"
 }, uf = { style: { width: "100%", "min-height": "500px", height: "500px" } }, pf = {
   key: 0,
   style: { color: "var(--el-color-warning)", "font-size": "9px" }
-}, wg = /* @__PURE__ */ L({
+}, Fg = /* @__PURE__ */ L({
   __name: "SdFormErd",
   props: {
     modelValue: null,
@@ -17970,7 +17978,7 @@ const yg = /* @__PURE__ */ B(lf, [["render", sf]]), rf = /* @__PURE__ */ L({
         ]),
         default: s(() => [
           P("div", uf, [
-            o.showContent ? (n(), p(pe(ni), {
+            o.showContent ? (n(), p(me(ni), {
               key: 0,
               nodes: o.nodes,
               edges: o.edges,
@@ -18171,7 +18179,7 @@ const yg = /* @__PURE__ */ B(lf, [["render", sf]]), rf = /* @__PURE__ */ L({
   },
   methods: {
     async getDataList(e, t) {
-      this.preLoading = !0, await he.post(
+      this.preLoading = !0, await ce.post(
         `${this.apiUrl}/widget/crud/getdata-all`,
         {
           sdProvider: e,
@@ -18192,7 +18200,7 @@ const yg = /* @__PURE__ */ B(lf, [["render", sf]]), rf = /* @__PURE__ */ L({
       if (e.dataid = e._id || null, this.expandProvider) {
         this.expandProvider.params ? this.expandProvider.params = { ...this.expandProvider.params, ...e } : this.expandProvider.params = D(e);
         const l = this.rowKey;
-        l && e[l] != null && e[l] != null && (this.expandProvider.params.rowKey = e[l], he.post(
+        l && e[l] != null && e[l] != null && (this.expandProvider.params.rowKey = e[l], ce.post(
           `${this.apiUrl}/widget/crud/getdata-all`,
           {
             sdProvider: this.expandProvider,
@@ -18285,7 +18293,7 @@ const yg = /* @__PURE__ */ B(lf, [["render", sf]]), rf = /* @__PURE__ */ L({
         }
     },
     handleSort(e) {
-      this.optionProvider.orderBy = D(this.defaultSort), e.order !== null && (this.defaultSort && this.optionProvider.orderBy ? this.optionProvider.orderBy.push({ column: `\`${e.prop}\``, sort: e.order == "descending" ? me.DESC : me.ASC }) : this.optionProvider.orderBy = [{ column: `\`${e.prop}\``, sort: e.order == "descending" ? me.DESC : me.ASC }]), this.expandProvider && this.resetExpand(), this.dataProvider.options = this.optionProvider, this.getDataList(this.dataProvider);
+      this.optionProvider.orderBy = D(this.defaultSort), e.order !== null && (this.defaultSort && this.optionProvider.orderBy ? this.optionProvider.orderBy.push({ column: `\`${e.prop}\``, sort: e.order == "descending" ? fe.DESC : fe.ASC }) : this.optionProvider.orderBy = [{ column: `\`${e.prop}\``, sort: e.order == "descending" ? fe.DESC : fe.ASC }]), this.expandProvider && this.resetExpand(), this.dataProvider.options = this.optionProvider, this.getDataList(this.dataProvider);
     },
     handleSearch() {
       this.searchText != "" ? this.dataProvider.params.q = `%${this.searchText}%` : delete this.dataProvider.params.q, this.expandProvider && this.resetExpand(), this.getDataList(this.dataProvider);
@@ -18314,7 +18322,7 @@ const yg = /* @__PURE__ */ B(lf, [["render", sf]]), rf = /* @__PURE__ */ L({
         cancelButtonText: "Cancel",
         type: "warning"
       }).then(() => {
-        he.delete(`${this.apiUrl}/widget/crud/delete-data`, {
+        ce.delete(`${this.apiUrl}/widget/crud/delete-data`, {
           headers: {
             Authorization: `Bearer ${this.userState.user?.token}`
           },
@@ -18337,7 +18345,7 @@ const yg = /* @__PURE__ */ B(lf, [["render", sf]]), rf = /* @__PURE__ */ L({
         cancelButtonText: "Cancel",
         type: "warning"
       }).then(() => {
-        he.put(
+        ce.put(
           `${this.apiUrl}/widget/crud/update-data`,
           {
             id: o,
@@ -18408,7 +18416,7 @@ function Ff(e, t, a, l, o, i) {
               _: 1
             }),
             P("span", bf, [
-              fe(e.$slots, "actionsBar", {}, void 0, !0)
+              he(e.$slots, "actionsBar", {}, void 0, !0)
             ])
           ])) : g("", !0),
           r(C, { gutter: 20 }, {
@@ -18434,7 +18442,7 @@ function Ff(e, t, a, l, o, i) {
                     _: 1
                   }, 8, ["onClick"])) : g("", !0),
                   t[4] || (t[4] = S()),
-                  fe(e.$slots, "actions", {}, void 0, !0),
+                  he(e.$slots, "actions", {}, void 0, !0),
                   e.totalInline ? (n(), w(E, { key: 1 }, [
                     r(m, {
                       type: "info",
@@ -18490,7 +18498,7 @@ function Ff(e, t, a, l, o, i) {
                 style: { display: "inline-flex" }
               }, {
                 default: s(() => [
-                  fe(e.$slots, "actionsPager", {}, () => [
+                  he(e.$slots, "actionsPager", {}, () => [
                     e.total > e.limit ? (n(), p(_, {
                       key: 0,
                       class: "mb-2",
@@ -18597,7 +18605,7 @@ function Ff(e, t, a, l, o, i) {
               ]),
               _: 1
             }, 8, ["label", "width"])) : g("", !0),
-            fe(e.$slots, "default", {}, void 0, !0)
+            he(e.$slots, "default", {}, void 0, !0)
           ]),
           _: 3
         }, 8, ["data", "border", "show-summary", "summary-method", "onSortChange", "height", "max-height", "row-key", "onExpandChange", "lazy", "load", "tree-props", "onFilterChange"])), [
@@ -18633,14 +18641,14 @@ function Ff(e, t, a, l, o, i) {
         "destroy-on-close": !0
       }, {
         default: s(() => [
-          fe(e.$slots, "popup", {}, void 0, !0)
+          he(e.$slots, "popup", {}, void 0, !0)
         ]),
         _: 3
       }, 8, ["title", "modelValue", "width", "close-on-click-modal"])
     ])) : g("", !0)
   ], 64);
 }
-const Fg = /* @__PURE__ */ B(mf, [["render", Ff], ["__scopeId", "data-v-a6ab139e"]]), _f = L({
+const _g = /* @__PURE__ */ B(mf, [["render", Ff], ["__scopeId", "data-v-a6ab139e"]]), _f = L({
   name: "SdGridColumnIndex",
   props: {
     columnLabel: {
@@ -18676,7 +18684,7 @@ function Sf(e, t, a, l, o, i) {
     align: "center"
   }, null, 8, ["index", "label", "width"]);
 }
-const _g = /* @__PURE__ */ B(_f, [["render", Sf]]), kf = L({
+const Sg = /* @__PURE__ */ B(_f, [["render", Sf]]), kf = L({
   name: "SdGridColumnDate",
   props: {
     columnProp: {
@@ -18729,7 +18737,7 @@ function Cf(e, t, a, l, o, i) {
     _: 1
   }, 8, ["prop", "label", "width", "sortable"]);
 }
-const Sg = /* @__PURE__ */ B(kf, [["render", Cf]]), Df = [
+const kg = /* @__PURE__ */ B(kf, [["render", Cf]]), Df = [
   {
     value: "addon-api",
     label: "Api"
@@ -22247,7 +22255,7 @@ function Pf(e, t, a, l, o, i) {
     _: 1
   }, 8, ["modelValue", "multiple", "allow-create", "disabled", "remote-method", "placeholder", "loading", "onChange"]);
 }
-const kg = /* @__PURE__ */ B($f, [["render", Pf]]), Vf = L({
+const Cg = /* @__PURE__ */ B($f, [["render", Pf]]), Vf = L({
   name: "OptionsItemSetting",
   props: {
     typeSelect: String,
@@ -22461,7 +22469,7 @@ function Bf(e, t, a, l, o, i) {
     ])) : g("", !0)
   ]);
 }
-const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad"]]), jf = L({
+const Dg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad"]]), jf = L({
   name: "SdReport",
   components: {},
   props: {
@@ -22629,16 +22637,16 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
             const F = d[q];
             let I = "";
             if (F.col_field && y[F.col_field] !== null && F.col_value === null)
-              I = re(`{{${F.col_field}}}`, A);
+              I = se(`{{${F.col_field}}}`, A);
             else {
               if (F.col_expressions)
                 try {
-                  const T = `return ${re(F.col_expressions, A)}`, H = new Function("row", ...De, T);
+                  const T = `return ${se(F.col_expressions, A)}`, H = new Function("row", ...De, T);
                   A["{{expressions}}"] = H.call(a, y);
                 } catch (V) {
                   A["{{expressions}}"] = V;
                 }
-              I = re(F.col_value, A);
+              I = se(F.col_value, A);
             }
             if (!F.col_group)
               if (F.col_sum) {
@@ -22752,16 +22760,16 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
             const b = l[h];
             let _ = "";
             if (b.col_field && d[b.col_field] !== null && b.col_value === null)
-              _ = re(`{{${b.col_field}}}`, m);
+              _ = se(`{{${b.col_field}}}`, m);
             else {
               if (b.col_expressions)
                 try {
-                  const M = `return ${re(b.col_expressions, m)}`, f = new Function("row", ...De, M);
+                  const M = `return ${se(b.col_expressions, m)}`, f = new Function("row", ...De, M);
                   m["{{expressions}}"] = f.call(a, d);
                 } catch (c) {
                   m["{{expressions}}"] = c;
                 }
-              _ = re(b.col_value, m);
+              _ = se(b.col_value, m);
             }
             if (b.col_format)
               try {
@@ -22789,7 +22797,7 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
       if (e.pdf_sql && e.pdf_sql.value) {
         const o = {
           providerId: e.pdf_sql.value,
-          providerType: de.SQL,
+          providerType: ue.SQL,
           params: t
         };
         e.pdf_fontsize && e.pdf_fontsize;
@@ -22806,7 +22814,7 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
             for (const [C, c] of _.entries())
               if (c.content_widget) {
                 let M = "";
-                if (c.content_value && (typeof c.content_value == "object" ? M = c.content_value : M = re(c.content_value, b)), c.content_widget === "table")
+                if (c.content_value && (typeof c.content_value == "object" ? M = c.content_value : M = se(c.content_value, b)), c.content_widget === "table")
                   if (Object.keys(e.pdf_column).length > 0) {
                     const f = await this.dataConvert(h, e, i);
                     l.push({
@@ -22832,7 +22840,7 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
                           F[H];
                           let Z = !1;
                           if (k.length > 0 ? k.includes(H) && (Z = !0) : Z = !0, Z) {
-                            let x = re(`{{${H}}}`, V);
+                            let x = se(`{{${H}}}`, V);
                             y.length > 0 && typeof y[0] != "object" && y[T] && (typeof y[T] == "string" ? y[T] : String(y[T])), I[H] = x, T++;
                           }
                         }
@@ -22846,7 +22854,7 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
                 } else if (c.content_widget === "sub_report" && M !== "") {
                   const f = {
                     providerId: "getreport-one",
-                    providerType: de.SYS,
+                    providerType: ue.SYS,
                     params: { reportId: M }
                   }, y = await Ot(f, this.useUserState);
                   if (y && y.response && y.data && y.data.data) {
@@ -22881,7 +22889,7 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
       if (e.pdf_sql && e.pdf_sql.value) {
         const d = {
           providerId: e.pdf_sql.value,
-          providerType: de.SQL,
+          providerType: ue.SQL,
           params: t
         }, u = e.pdf_fontsize ? e.pdf_fontsize : 14;
         let m = {}, h = "";
@@ -22897,7 +22905,7 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
             for (const [f, y] of M.entries())
               if (y.content_widget) {
                 let k = "";
-                if (y.content_value && (typeof y.content_value == "object" ? k = y.content_value : k = re(y.content_value, c)), y.content_widget === "text")
+                if (y.content_value && (typeof y.content_value == "object" ? k = y.content_value : k = se(y.content_value, c)), y.content_widget === "text")
                   l.push({
                     text: k,
                     alignment: y.content_align || "left",
@@ -22986,8 +22994,8 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
                           Be[v];
                           let W = !1;
                           if (V.length > 0 ? V.includes(v) && (W = !0) : W = !0, W) {
-                            let J = re(`{{${v}}}`, Me), ue = I[U] || "left";
-                            if (ue === "l" || ue === "L" ? ue = "left" : ue === "c" || ue === "C" ? ue = "center" : (ue === "r" || ue === "R") && (ue = "rigth"), Z)
+                            let J = se(`{{${v}}}`, Me), pe = I[U] || "left";
+                            if (pe === "l" || pe === "L" ? pe = "left" : pe === "c" || pe === "C" ? pe = "center" : (pe === "r" || pe === "R") && (pe = "rigth"), Z)
                               if (q[U] || (q[U] = "*"), F.length > 0) {
                                 if (typeof F[0] != "object")
                                   if (x = !0, F[U]) {
@@ -22996,7 +23004,7 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
                                       text: je,
                                       bold: !0,
                                       fillColor: "#ddd",
-                                      alignment: ue,
+                                      alignment: pe,
                                       fontSize: u
                                     });
                                   } else
@@ -23004,7 +23012,7 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
                                       text: v,
                                       bold: !0,
                                       fillColor: "#ddd",
-                                      alignment: ue,
+                                      alignment: pe,
                                       fontSize: u
                                     });
                               } else
@@ -23012,12 +23020,12 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
                                   text: v,
                                   bold: !0,
                                   fillColor: "#ddd",
-                                  alignment: ue,
+                                  alignment: pe,
                                   fontSize: u
                                 });
                             et.push({
                               text: J,
-                              alignment: ue,
+                              alignment: pe,
                               fontSize: u
                             }), U++;
                           }
@@ -23046,7 +23054,7 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
                 } else if (y.content_widget === "sub_report" && k !== "") {
                   const A = {
                     providerId: "getreport-one",
-                    providerType: de.SYS,
+                    providerType: ue.SYS,
                     params: { reportId: k }
                   }, q = await Ot(A, this.useUserState);
                   if (q && q.response && q.data && q.data.data) {
@@ -23105,7 +23113,7 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
       this.reportType = t;
       const a = {
         providerId: "getreport-one",
-        providerType: de.SYS,
+        providerType: ue.SYS,
         params: { reportId: e }
       };
       let l = !0;
@@ -23131,7 +23139,7 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
         let i = "output";
         t.pdf_name && (i = t.pdf_name), this.createExcel(o, i);
       } else if (e === "word")
-        this.popupDownloadName = "Report", t.pdf_name && (t.pdf_name, this.popupDownloadName = "Report " + t.pdf_name), t.pdf_temp && Object.keys(t.pdf_temp).length > 0 ? (t.pdf_temp[0].url ? t.pdf_temp[0].url : "") ? await he.post(
+        this.popupDownloadName = "Report", t.pdf_name && (t.pdf_name, this.popupDownloadName = "Report " + t.pdf_name), t.pdf_temp && Object.keys(t.pdf_temp).length > 0 ? (t.pdf_temp[0].url ? t.pdf_temp[0].url : "") ? await ce.post(
           `${this.userState.host}/v1/files/create-word`,
           { reportId: t._id, params: a },
           {
@@ -23295,7 +23303,7 @@ const Cg = /* @__PURE__ */ B(Vf, [["render", Bf], ["__scopeId", "data-v-cc3dcbad
         this.showFile = !1;
         const e = `export/${this.userState.user?.username}`;
         let t = { filePath: this.filePath, fileName: this.fullName, fileType: "docx", fileGroup: e, fileId: "" };
-        await he.delete(`${this.userState.host}/v1/files/remove-one`, {
+        await ce.delete(`${this.userState.host}/v1/files/remove-one`, {
           data: t,
           headers: {
             Authorization: `Bearer ${this.userState.user?.token}`
@@ -23570,7 +23578,7 @@ function Wf(e, t, a, l, o, i) {
     ])) : g("", !0)
   ], 64);
 }
-const Dg = /* @__PURE__ */ B(jf, [["render", Wf], ["__scopeId", "data-v-1702f01f"]]), Kf = L({
+const Ig = /* @__PURE__ */ B(jf, [["render", Wf], ["__scopeId", "data-v-1702f01f"]]), Kf = L({
   name: "SdUiCarousel",
   components: {},
   props: {
@@ -23720,7 +23728,7 @@ const Dg = /* @__PURE__ */ B(jf, [["render", Wf], ["__scopeId", "data-v-1702f01f
       limit: this.limitRow,
       optionProvider: { limit: this.limitRow, page: 1 },
       useUserState: this.$props.userState,
-      dpFormData: { providerId: this.formId, providerType: de.FORM },
+      dpFormData: { providerId: this.formId, providerType: ue.FORM },
       wsConn: void 0,
       widgetId: "SdUiCarousel-" + Rt(),
       isFormEnable: this.providerType === "FORM",
@@ -23732,7 +23740,7 @@ const Dg = /* @__PURE__ */ B(jf, [["render", Wf], ["__scopeId", "data-v-1702f01f
       return (e, t) => {
         let a = {}, l = this.sdformModel.form_db.schema;
         for (const o in l) {
-          let i = ce(t, o);
+          let i = de(t, o);
           a[`{{${o}}}`] = Ae(i, o, this.sdformModel);
         }
         if (this.customValue) {
@@ -23741,7 +23749,7 @@ const Dg = /* @__PURE__ */ B(jf, [["render", Wf], ["__scopeId", "data-v-1702f01f
               let i = this.customValue[o];
               if (i.expressions)
                 try {
-                  const u = `return ${re(i.expressions, a)}`, m = new Function("row", ...De, u);
+                  const u = `return ${se(i.expressions, a)}`, m = new Function("row", ...De, u);
                   a[`{{${i.fieldName}}}`] = m.call(this.sdformModel, t);
                 } catch (d) {
                   a[`{{${i.fieldName}}}`] = d;
@@ -23750,7 +23758,7 @@ const Dg = /* @__PURE__ */ B(jf, [["render", Wf], ["__scopeId", "data-v-1702f01f
                 a[`{{${i.fieldName}}}`] = "";
             }
         }
-        return Tt(re(e, a));
+        return Tt(se(e, a));
       };
     }
   },
@@ -23784,9 +23792,9 @@ const Dg = /* @__PURE__ */ B(jf, [["render", Wf], ["__scopeId", "data-v-1702f01f
       this.defaultParams = { ...t, ...e }, this.dpFormData.params = D(this.defaultParams), this.getDataList();
     },
     initForm(e) {
-      this.searchText = "", this.sdformModel = e, this.userState.formStore[this.formId] = this.sdformModel, this.fixApiUrl && this.fixApiUrl != "" ? this.apiUrl = this.fixApiUrl : this.sdformModel.form_db.api_url && this.sdformModel.form_db.api_url != "" ? this.apiUrl = this.sdformModel.form_db.api_url : this.apiUrl = window.APP_CONFIG.API_URL, this.userState.user && (this.allowInsert = Oe(this.sdformModel, this.userState.user)), this.sdformModel.form_event.after_delete && this.sdformModel.form_event.enable && (this.afterDeleteForm = new Function("formData", ...De, this.sdformModel.form_event.after_delete)), this.iconName || (this.iconForm = "", this.sdformModel.form_icon ? this.iconForm = this.sdformModel.form_icon : this.iconForm = ""), this.titleName ? this.titleNameForm = this.titleName : this.titleNameForm = this.sdformModel.form_name ? `${this.sdformModel.form_name}` : "", this.dataProvider ? this.dpFormData = D(this.dataProvider) : (this.dpFormData.providerId = this.formId, this.dpFormData.providerType = de.FORM), this.dpFormData.params || (this.dpFormData.params = {}), this.dpFormData.options ? (this.dpFormData.options.page || (this.dpFormData.options.page = 1), this.dpFormData.options.limit ? this.limit = this.dpFormData.options.limit : this.dpFormData.options.limit = this.limit, this.optionProvider = this.dpFormData.options) : this.dpFormData.options = this.optionProvider, this.parentId != "" && (this.params.xparentx = this.parentId, this.dpFormData.options && this.dpFormData.options.where ? this.dpFormData.options.where += " AND xparentx = CONVERT(:xparentx, 'objectId')" : this.dpFormData.options.where = "xparentx = CONVERT(:xparentx, 'objectId')");
+      this.searchText = "", this.sdformModel = e, this.userState.formStore[this.formId] = this.sdformModel, this.fixApiUrl && this.fixApiUrl != "" ? this.apiUrl = this.fixApiUrl : this.sdformModel.form_db.api_url && this.sdformModel.form_db.api_url != "" ? this.apiUrl = this.sdformModel.form_db.api_url : this.apiUrl = window.APP_CONFIG.API_URL, this.userState.user && (this.allowInsert = Oe(this.sdformModel, this.userState.user)), this.sdformModel.form_event.after_delete && this.sdformModel.form_event.enable && (this.afterDeleteForm = new Function("formData", ...De, this.sdformModel.form_event.after_delete)), this.iconName || (this.iconForm = "", this.sdformModel.form_icon ? this.iconForm = this.sdformModel.form_icon : this.iconForm = ""), this.titleName ? this.titleNameForm = this.titleName : this.titleNameForm = this.sdformModel.form_name ? `${this.sdformModel.form_name}` : "", this.dataProvider ? this.dpFormData = D(this.dataProvider) : (this.dpFormData.providerId = this.formId, this.dpFormData.providerType = ue.FORM), this.dpFormData.params || (this.dpFormData.params = {}), this.dpFormData.options ? (this.dpFormData.options.page || (this.dpFormData.options.page = 1), this.dpFormData.options.limit ? this.limit = this.dpFormData.options.limit : this.dpFormData.options.limit = this.limit, this.optionProvider = this.dpFormData.options) : this.dpFormData.options = this.optionProvider, this.parentId != "" && (this.params.xparentx = this.parentId, this.dpFormData.options && this.dpFormData.options.where ? this.dpFormData.options.where += " AND xparentx = CONVERT(:xparentx, 'objectId')" : this.dpFormData.options.where = "xparentx = CONVERT(:xparentx, 'objectId')");
       const t = D(this.dpFormData.params), a = D(this.params);
-      this.defaultParams = { ...a, ...t }, this.dpFormData.params = D(this.defaultParams), this.dpFormData.options.orderBy || (this.dpFormData.options.orderBy = [{ column: "created_at", sort: me.DESC }]), this.getDataList(), this.enableWs && this.sdformModel.form_options && this.sdformModel.form_options.enable_websocket && (this.wsConn = this.userState.connectWebSocket("gridform", this.sdformModel.dataid, this.widgetId, (l) => {
+      this.defaultParams = { ...a, ...t }, this.dpFormData.params = D(this.defaultParams), this.dpFormData.options.orderBy || (this.dpFormData.options.orderBy = [{ column: "created_at", sort: fe.DESC }]), this.getDataList(), this.enableWs && this.sdformModel.form_options && this.sdformModel.form_options.enable_websocket && (this.wsConn = this.userState.connectWebSocket("gridform", this.sdformModel.dataid, this.widgetId, (l) => {
         if (l.from != "server" && (l.from != this.userState.user?.username || l.params && l.params.widget && l.params.widget !== this.widgetId)) {
           let o = -1;
           const i = D(l.data);
@@ -23824,7 +23832,7 @@ const Dg = /* @__PURE__ */ B(jf, [["render", Wf], ["__scopeId", "data-v-1702f01f
       this.isInsert = !1, this.selectIndex = t, this.clickEvent && this.clickEvent(e, t);
     },
     getValue(e, t) {
-      let a = ce(e, t);
+      let a = de(e, t);
       return a ? Ae(a, t, this.sdformModel) : "";
     },
     getSchema(e) {
@@ -24025,7 +24033,7 @@ function nh(e, t, a, l, o, i) {
     }, 8, ["indicator-position", "motionBlur", "interval", "autoplay", "direction", "type", "trigger", "height"])) : g("", !0)
   ], 64);
 }
-const Ig = /* @__PURE__ */ B(Kf, [["render", nh], ["__scopeId", "data-v-ea5295de"]]), sh = L({
+const $g = /* @__PURE__ */ B(Kf, [["render", nh], ["__scopeId", "data-v-ea5295de"]]), sh = L({
   name: "SdUiMenu",
   components: {},
   props: {
@@ -24191,7 +24199,7 @@ const Ig = /* @__PURE__ */ B(Kf, [["render", nh], ["__scopeId", "data-v-ea5295de
       limit: this.limitRow,
       optionProvider: { limit: this.limitRow, page: 1 },
       useUserState: this.$props.userState,
-      dpFormData: { providerId: this.formId, providerType: de.FORM },
+      dpFormData: { providerId: this.formId, providerType: ue.FORM },
       wsConn: void 0,
       isFormEnable: this.providerType === "FORM",
       scrollerHeight: 0,
@@ -24205,7 +24213,7 @@ const Ig = /* @__PURE__ */ B(Kf, [["render", nh], ["__scopeId", "data-v-ea5295de
       return (e, t) => {
         let a = {}, l = this.sdformModel.form_db.schema;
         for (const o in l) {
-          let i = ce(t, o);
+          let i = de(t, o);
           a[`{{${o}}}`] = Ae(i, o, this.sdformModel);
         }
         if (this.customValue) {
@@ -24214,7 +24222,7 @@ const Ig = /* @__PURE__ */ B(Kf, [["render", nh], ["__scopeId", "data-v-ea5295de
               let i = this.customValue[o];
               if (i.expressions)
                 try {
-                  const u = `return ${re(i.expressions, a)}`, m = new Function("row", ...De, u);
+                  const u = `return ${se(i.expressions, a)}`, m = new Function("row", ...De, u);
                   a[`{{${i.fieldName}}}`] = m.call(this.sdformModel, t);
                 } catch (d) {
                   a[`{{${i.fieldName}}}`] = d;
@@ -24223,7 +24231,7 @@ const Ig = /* @__PURE__ */ B(Kf, [["render", nh], ["__scopeId", "data-v-ea5295de
                 a[`{{${i.fieldName}}}`] = "";
             }
         }
-        return Tt(re(e, a));
+        return Tt(se(e, a));
       };
     }
   },
@@ -24274,9 +24282,9 @@ const Ig = /* @__PURE__ */ B(Kf, [["render", nh], ["__scopeId", "data-v-ea5295de
       this.defaultParams = { ...t, ...e }, this.dpFormData.params = D(this.defaultParams), this.getDataList();
     },
     initForm(e) {
-      this.searchText = "", this.sdformModel = e, this.userState.formStore[this.formId] = this.sdformModel, this.fixApiUrl && this.fixApiUrl != "" ? this.apiUrl = this.fixApiUrl : this.sdformModel.form_db.api_url && this.sdformModel.form_db.api_url != "" ? this.apiUrl = this.sdformModel.form_db.api_url : this.apiUrl = window.APP_CONFIG.API_URL, this.userState.user && (this.allowInsert = Oe(this.sdformModel, this.userState.user)), this.sdformModel.form_event.after_delete && this.sdformModel.form_event.enable && (this.afterDeleteForm = new Function("formData", ...De, this.sdformModel.form_event.after_delete)), this.dataProvider ? this.dpFormData = D(this.dataProvider) : (this.dpFormData.providerId = this.formId, this.dpFormData.providerType = de.FORM), this.dpFormData.params || (this.dpFormData.params = {}), this.dpFormData.options ? (this.dpFormData.options.page || (this.dpFormData.options.page = 1), this.dpFormData.options.limit ? this.limit = this.dpFormData.options.limit : this.dpFormData.options.limit = this.limit, this.optionProvider = this.dpFormData.options) : this.dpFormData.options = this.optionProvider, this.parentId != "" && (this.params.xparentx = this.parentId, this.dpFormData.options && this.dpFormData.options.where ? this.dpFormData.options.where += " AND xparentx = CONVERT(:xparentx, 'objectId')" : this.dpFormData.options.where = "xparentx = CONVERT(:xparentx, 'objectId')");
+      this.searchText = "", this.sdformModel = e, this.userState.formStore[this.formId] = this.sdformModel, this.fixApiUrl && this.fixApiUrl != "" ? this.apiUrl = this.fixApiUrl : this.sdformModel.form_db.api_url && this.sdformModel.form_db.api_url != "" ? this.apiUrl = this.sdformModel.form_db.api_url : this.apiUrl = window.APP_CONFIG.API_URL, this.userState.user && (this.allowInsert = Oe(this.sdformModel, this.userState.user)), this.sdformModel.form_event.after_delete && this.sdformModel.form_event.enable && (this.afterDeleteForm = new Function("formData", ...De, this.sdformModel.form_event.after_delete)), this.dataProvider ? this.dpFormData = D(this.dataProvider) : (this.dpFormData.providerId = this.formId, this.dpFormData.providerType = ue.FORM), this.dpFormData.params || (this.dpFormData.params = {}), this.dpFormData.options ? (this.dpFormData.options.page || (this.dpFormData.options.page = 1), this.dpFormData.options.limit ? this.limit = this.dpFormData.options.limit : this.dpFormData.options.limit = this.limit, this.optionProvider = this.dpFormData.options) : this.dpFormData.options = this.optionProvider, this.parentId != "" && (this.params.xparentx = this.parentId, this.dpFormData.options && this.dpFormData.options.where ? this.dpFormData.options.where += " AND xparentx = CONVERT(:xparentx, 'objectId')" : this.dpFormData.options.where = "xparentx = CONVERT(:xparentx, 'objectId')");
       const t = D(this.dpFormData.params), a = D(this.params);
-      this.defaultParams = { ...a, ...t }, this.dpFormData.params = D(this.defaultParams), this.dpFormData.options.orderBy || (this.dpFormData.options.orderBy = [{ column: "created_at", sort: me.DESC }]), this.getDataList();
+      this.defaultParams = { ...a, ...t }, this.dpFormData.params = D(this.defaultParams), this.dpFormData.options.orderBy || (this.dpFormData.options.orderBy = [{ column: "created_at", sort: fe.DESC }]), this.getDataList();
     },
     keyIdIndex(e) {
       let t = this.keyId;
@@ -24315,7 +24323,7 @@ const Ig = /* @__PURE__ */ B(Kf, [["render", nh], ["__scopeId", "data-v-ea5295de
       window.localStorage.setItem("side_menu_" + this.formId, String(this.isCollapse));
     },
     getValue(e, t) {
-      let a = ce(e, t);
+      let a = de(e, t);
       return a ? Ae(a, t, this.sdformModel) : "";
     },
     getSchema(e) {
@@ -24488,7 +24496,7 @@ function mh(e, t, a, l, o, i) {
     }, null, 4)
   ], 64);
 }
-const $g = /* @__PURE__ */ B(sh, [["render", mh]]), fh = L({
+const Tg = /* @__PURE__ */ B(sh, [["render", mh]]), fh = L({
   name: "SdUiRecordView",
   components: {
     // SdCrudPopupGrid,
@@ -24636,7 +24644,7 @@ const $g = /* @__PURE__ */ B(sh, [["render", mh]]), fh = L({
   },
   data() {
     return {
-      isDark: se(),
+      isDark: re(),
       rawData: null,
       defaultParams: {},
       preLoading: !1,
@@ -24656,7 +24664,7 @@ const $g = /* @__PURE__ */ B(sh, [["render", mh]]), fh = L({
       optionProvider: { limit: 1, page: 1 },
       allowInsert: !1,
       useUserState: this.$props.userState,
-      dpFormData: { providerId: this.formId, providerType: de.FORM },
+      dpFormData: { providerId: this.formId, providerType: ue.FORM },
       wsConn: void 0,
       widgetId: "SdUiRecordView-" + Rt(),
       sdFunc: {},
@@ -24669,19 +24677,19 @@ const $g = /* @__PURE__ */ B(sh, [["render", mh]]), fh = L({
       return (e, t, a) => {
         let l = {}, o = this.sdformModel.form_db.schema;
         for (const i in o) {
-          let d = ce(t, i);
+          let d = de(t, i);
           l[`{{${i}}}`] = Ae(d, i, this.sdformModel);
         }
         if (a.expressions)
           try {
-            const d = `return ${re(a.expressions, l)}`, u = new Function("row", ...De, d);
+            const d = `return ${se(a.expressions, l)}`, u = new Function("row", ...De, d);
             l["{{expressions}}"] = u.call(this.sdformModel, t);
           } catch (i) {
             l["{{expressions}}"] = i;
           }
         else
           l["{{expressions}}"] = "";
-        return Tt(re(e, l));
+        return Tt(se(e, l));
       };
     }
   },
@@ -24776,7 +24784,7 @@ const $g = /* @__PURE__ */ B(sh, [["render", mh]]), fh = L({
       this.showPopupGridFlag = !1;
     },
     initForm(e) {
-      this.sdformModel = e, this.userState.formStore[this.formId] = this.sdformModel, this.fixApiUrl && this.fixApiUrl != "" ? this.apiUrl = this.fixApiUrl : this.sdformModel.form_db.api_url && this.sdformModel.form_db.api_url != "" ? this.apiUrl = this.sdformModel.form_db.api_url : this.apiUrl = window.APP_CONFIG.API_URL, this.userState.user && (this.allowInsert = Oe(this.sdformModel, this.userState.user)), this.sdformModel.form_event.after_delete && this.sdformModel.form_event.enable && (this.afterDeleteForm = new Function("formData", ...De, this.sdformModel.form_event.after_delete)), this.iconName || (this.iconForm = "", this.sdformModel.form_icon ? this.iconForm = this.sdformModel.form_icon : this.iconForm = ""), this.titleName ? this.titleNameForm = this.titleName : this.titleNameForm = this.sdformModel.form_name ? `${this.sdformModel.form_name}` : "", this.dataProvider ? this.dpFormData = D(this.dataProvider) : (this.dpFormData.providerId = this.formId, this.dpFormData.providerType = de.FORM), this.dpFormData.params || (this.dpFormData.params = {}), this.dpFormData.options ? (this.dpFormData.options.page || (this.dpFormData.options.page = 1), this.dpFormData.options.limit ? this.limit = this.dpFormData.options.limit : this.dpFormData.options.limit = this.limit, this.optionProvider = this.dpFormData.options) : this.dpFormData.options = this.optionProvider, this.parentId != "" && (this.params.xparentx = this.parentId, this.dpFormData.options && this.dpFormData.options.where ? this.dpFormData.options.where += " AND xparentx = CONVERT(:xparentx, 'objectId')" : this.dpFormData.options.where = "xparentx = CONVERT(:xparentx, 'objectId')"), (!this.lastRecord || this.dataId) && (this.params.xdataidx = this.recordId, this.dpFormData.options && this.dpFormData.options.where ? this.dpFormData.options.where += " AND _id = CONVERT(:xdataidx, 'objectId')" : this.dpFormData.options.where = "_id = CONVERT(:xdataidx, 'objectId')"), this.dpFormData.options.orderBy = [{ column: "created_at", sort: me.DESC }];
+      this.sdformModel = e, this.userState.formStore[this.formId] = this.sdformModel, this.fixApiUrl && this.fixApiUrl != "" ? this.apiUrl = this.fixApiUrl : this.sdformModel.form_db.api_url && this.sdformModel.form_db.api_url != "" ? this.apiUrl = this.sdformModel.form_db.api_url : this.apiUrl = window.APP_CONFIG.API_URL, this.userState.user && (this.allowInsert = Oe(this.sdformModel, this.userState.user)), this.sdformModel.form_event.after_delete && this.sdformModel.form_event.enable && (this.afterDeleteForm = new Function("formData", ...De, this.sdformModel.form_event.after_delete)), this.iconName || (this.iconForm = "", this.sdformModel.form_icon ? this.iconForm = this.sdformModel.form_icon : this.iconForm = ""), this.titleName ? this.titleNameForm = this.titleName : this.titleNameForm = this.sdformModel.form_name ? `${this.sdformModel.form_name}` : "", this.dataProvider ? this.dpFormData = D(this.dataProvider) : (this.dpFormData.providerId = this.formId, this.dpFormData.providerType = ue.FORM), this.dpFormData.params || (this.dpFormData.params = {}), this.dpFormData.options ? (this.dpFormData.options.page || (this.dpFormData.options.page = 1), this.dpFormData.options.limit ? this.limit = this.dpFormData.options.limit : this.dpFormData.options.limit = this.limit, this.optionProvider = this.dpFormData.options) : this.dpFormData.options = this.optionProvider, this.parentId != "" && (this.params.xparentx = this.parentId, this.dpFormData.options && this.dpFormData.options.where ? this.dpFormData.options.where += " AND xparentx = CONVERT(:xparentx, 'objectId')" : this.dpFormData.options.where = "xparentx = CONVERT(:xparentx, 'objectId')"), (!this.lastRecord || this.dataId) && (this.params.xdataidx = this.recordId, this.dpFormData.options && this.dpFormData.options.where ? this.dpFormData.options.where += " AND _id = CONVERT(:xdataidx, 'objectId')" : this.dpFormData.options.where = "_id = CONVERT(:xdataidx, 'objectId')"), this.dpFormData.options.orderBy = [{ column: "created_at", sort: fe.DESC }];
       const t = D(this.dpFormData.params), a = D(this.params);
       this.defaultParams = { ...a, ...t }, this.dpFormData.params = D(this.defaultParams), (this.lastRecord || this.dataId) && this.getDataOne(this.dpFormData), this.enableWs && this.sdformModel.form_options && this.sdformModel.form_options.enable_websocket && (this.wsConn = this.userState.connectWebSocket("gridform", this.sdformModel.dataid, this.widgetId, (l) => {
         if (l.from != "server" && (l.from != this.userState.user?.username || l.params && l.params.widget && l.params.widget !== this.widgetId) && l.keyid) {
@@ -24793,7 +24801,7 @@ const $g = /* @__PURE__ */ B(sh, [["render", mh]]), fh = L({
       }
     },
     getValue(e, t) {
-      let a = ce(e, t);
+      let a = de(e, t);
       return a ? Ae(a, t, this.sdformModel) : "";
     },
     allowView(e, t, a) {
@@ -24892,7 +24900,7 @@ function bh(e, t, a, l, o, i) {
       e.actionEnable ? {
         name: "extra",
         fn: s(() => [
-          fe(e.$slots, "actions", { row: e.rawData }, void 0, !0),
+          he(e.$slots, "actions", { row: e.rawData }, void 0, !0),
           !e.dataId && !e.rawData && e.addBtnEnable && e.allowInsert ? (n(), p(m, {
             key: 0,
             plain: "",
@@ -24960,14 +24968,14 @@ function bh(e, t, a, l, o, i) {
     }, null, 8, ["modelValue", "parent-id", "readonly", "form-id", "user-state", "cancel-callback"])) : g("", !0)
   ], 64);
 }
-const Tg = /* @__PURE__ */ B(fh, [["render", bh], ["__scopeId", "data-v-88128e90"]]);
+const Mg = /* @__PURE__ */ B(fh, [["render", bh], ["__scopeId", "data-v-88128e90"]]);
 export {
   Ua as $,
   vo as A,
-  Ig as B,
+  $g as B,
   Mp as C,
-  $g as D,
-  Tg as E,
+  Tg as D,
+  Mg as E,
   Od as F,
   xt as G,
   af as H,
@@ -24981,7 +24989,7 @@ export {
   ja as P,
   ug as Q,
   Au as R,
-  hg as S,
+  cg as S,
   pg as T,
   co as U,
   Pl as V,
@@ -24995,61 +25003,62 @@ export {
   Ou as a1,
   Ae as a2,
   Nu as a3,
-  B as a4,
-  En as a5,
-  Ce as a6,
-  D as a7,
-  De as a8,
-  Rt as a9,
-  Jb as aa,
-  Yb as ab,
-  ce as ac,
-  $a as ad,
-  ng as ae,
-  ig as af,
-  Ln as ag,
-  sg as ah,
-  og as ai,
-  lg as aj,
-  Ba as ak,
-  Xb as al,
-  La as am,
-  Gb as an,
-  ga as ao,
-  eg as ap,
-  ee as aq,
-  Kb as ar,
-  ag as as,
-  tg as at,
-  bt as au,
-  Zb as av,
-  Qb as aw,
-  de as ax,
-  xm as ay,
-  Ra as az,
+  fg as a4,
+  B as a5,
+  En as a6,
+  Ce as a7,
+  D as a8,
+  De as a9,
+  Ra as aA,
+  Rt as aa,
+  Jb as ab,
+  Yb as ac,
+  de as ad,
+  $a as ae,
+  ng as af,
+  ig as ag,
+  Ln as ah,
+  sg as ai,
+  og as aj,
+  lg as ak,
+  Ba as al,
+  Xb as am,
+  La as an,
+  Gb as ao,
+  ga as ap,
+  eg as aq,
+  ee as ar,
+  Kb as as,
+  ag as at,
+  tg as au,
+  bt as av,
+  Zb as aw,
+  Qb as ax,
+  ue as ay,
+  xm as az,
   Nn as b,
   rg as c,
   va as d,
   dg as e,
-  fg as f,
-  cg as g,
-  bg as h,
+  hg as f,
+  bg as g,
+  gg as h,
   bo as i,
   Fm as j,
   Cm as k,
   Tm as l,
-  gg as m,
+  yg as m,
   Rm as n,
-  yg as o,
-  vg as p,
-  wg as q,
-  Fg as r,
+  vg as o,
+  wg as p,
+  Fg as q,
+  _g as r,
   go as s,
   yo as t,
   pm as u,
-  _g as v,
-  Sg as w,
-  kg as x,
-  Cg as y,
-  Dg as z
+  Sg as v,
+  kg as w,
+  Cg as x,
+  Dg as y,
+  Ig as z
 };