@jeecg/online 3.5.3-vite4 → 3.6.2-beta

package/{DetailForm-e4538e7a.mjs → DetailForm-424638eb.mjs}

@@ -1,48 +1,50 @@
 var le = Object.defineProperty;
 var H = Object.getOwnPropertySymbols;
 var ie = Object.prototype.hasOwnProperty, ne = Object.prototype.propertyIsEnumerable;
-var J = (a, o, s) => o in a ? le(a, o, { enumerable: !0, configurable: !0, writable: !0, value: s }) : a[o] = s, U = (a, o) => {
-  for (var s in o || (o = {}))
-    ie.call(o, s) && J(a, s, o[s]);
+var q = (a, o, d) => o in a ? le(a, o, { enumerable: !0, configurable: !0, writable: !0, value: d }) : a[o] = d, R = (a, o) => {
+  for (var d in o || (o = {}))
+    ie.call(o, d) && q(a, d, o[d]);
   if (H)
-    for (var s of H(o))
-      ne.call(o, s) && J(a, s, o[s]);
+    for (var d of H(o))
+      ne.call(o, d) && q(a, d, o[d]);
   return a;
 };
-var p = (a, o, s) => new Promise((h, w) => {
-  var F = (f) => {
+var _ = (a, o, d) => new Promise((w, y) => {
+  var C = (f) => {
     try {
-      _(s.next(f));
-    } catch (C) {
-      w(C);
+      v(d.next(f));
+    } catch (p) {
+      y(p);
     }
   }, D = (f) => {
     try {
-      _(s.throw(f));
-    } catch (C) {
-      w(C);
+      v(d.throw(f));
+    } catch (p) {
+      y(p);
     }
-  }, _ = (f) => f.done ? h(f.value) : Promise.resolve(f.value).then(F, D);
-  _((s = s.apply(a, o)).next());
+  }, v = (f) => f.done ? w(f.value) : Promise.resolve(f.value).then(C, D);
+  v((d = d.apply(a, o)).next());
 });
-import { ref as ae, computed as oe, watch as re, defineComponent as se, resolveComponent as x, openBlock as u, createElementBlock as m, normalizeClass as q, createVNode as T, withCtx as R, Fragment as N, renderList as B, createBlock as W, createElementVNode as c, toDisplayString as M } from "vue";
+import { ref as ae, computed as oe, watch as re, defineComponent as se, resolveComponent as k, openBlock as u, createElementBlock as m, normalizeClass as N, createVNode as x, withCtx as W, Fragment as V, renderList as J, createBlock as P, createElementVNode as c, toDisplayString as B } from "vue";
 import { propTypes as O } from "/@/utils/propTypes";
 import { getDictItemsByCode as de } from "/@/utils/dict";
-import { filterMultiDictText as b, filterDictText as ce } from "/@/utils/dict/JDictSelectUtil";
-import { initDictOptions as V } from "/@/utils/dict/index";
+import { filterMultiDictText as T, filterDictText as ce } from "/@/utils/dict/JDictSelectUtil";
+import { initDictOptions as U } from "/@/utils/dict/index";
 import { loadDictItem as ue, queryDepartTreeSync as fe, getUserList as pe } from "/@/api/common/api";
 import { defHttp as me } from "/@/utils/http/axios";
 import { getAreaTextByCode as _e } from "/@/components/Form/src/utils/Area";
-import { getFileAccessHttpUrl as ge } from "/@/utils/common/compUtils";
-import { createImgPreview as he } from "/@/components/Preview/index";
+import { getFileAccessHttpUrl as he } from "/@/utils/common/compUtils";
+import { createImgPreview as ge } from "/@/components/Preview/index";
 import { useMessage as ve } from "/@/hooks/web/useMessage";
-import { DownloadOutlined as ye, EyeOutlined as we, PaperClipOutlined as De } from "@ant-design/icons-vue";
-import { q as Ce } from "./useExtendComponent-48d37d9b.mjs";
-import { _ as Fe } from "./index-6a09a912.mjs";
+import { DownloadOutlined as we, EyeOutlined as ye, PaperClipOutlined as De } from "@ant-design/icons-vue";
+import { q as Fe } from "./useExtendComponent-325fe3f1.mjs";
+import { MarkdownViewer as ke } from "/@/components/Markdown";
+import { _ as Ce } from "./index-0e3ab3af.mjs";
 import "/@/components/Form/src/componentMap";
 import "/@/components/Modal";
 import "/@/components/Form/index";
 import "lodash-es";
+import "./constant-754f1a9d.mjs";
 import "/@/components/Form/src/jeecg/components/JUpload";
 import "/@/views/system/user/user.api";
 import "/@/store/modules/user";
@@ -52,20 +54,20 @@ import "/@/store/modules/permission";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
 import "vue-router";
-import "./LinkTableListPiece-34266919.mjs";
+import "./LinkTableListPiece-8499a318.mjs";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "./OnlineSelectCascade-c7baf52b.mjs";
+import "./OnlineSelectCascade-4265c95d.mjs";
 import "/@/components/Loading";
 import "/@/utils/auth";
-import "./JModalTip-abe1515a.mjs";
+import "./JModalTip-33c7dc44.mjs";
+import "/@/hooks/web/useAppInject";
 import "ant-design-vue";
 import "@vueuse/core";
-function xe(a) {
-  console.log(a);
-  const o = {}, s = [], h = ae({}), { createMessage: w } = ve(), F = oe(() => a.containerClass ? `jeecg-detail-form ${a.containerClass}` : "jeecg-detail-form");
+function be(a) {
+  const o = {}, d = [], w = ae({}), { createMessage: y } = ve(), C = oe(() => a.containerClass ? `jeecg-detail-form ${a.containerClass}` : "jeecg-detail-form");
   re(
     () => a.data,
-    (e) => p(this, null, function* () {
+    (e) => _(this, null, function* () {
       if (e) {
         let n = a.schemas, i = {};
         if (n && n.length > 0)
@@ -74,16 +76,15 @@ function xe(a) {
             try {
               i[t] = yield D(l);
             } catch (r) {
-              console.error("字段【" + t + "】文本获取失败", r);
             }
           }
-        h.value = i;
+        w.value = i;
       }
     }),
     { deep: !0, immediate: !0 }
   );
   function D(e) {
-    return p(this, null, function* () {
+    return _(this, null, function* () {
       let n = a.data;
       if (n) {
         let i = n[e.field];
@@ -91,48 +92,48 @@ function xe(a) {
           return "";
         let l = i, t = e.view;
         if (t == "list" || t == "radio" || t == "checkbox" || t == "list_multi")
-          l = yield _(e, n);
+          l = yield v(e, n);
         else if (t == "sel_search")
-          l = yield C(e, n);
+          l = yield p(e, n);
         else if (t == "cat_tree")
-          l = yield S(e, n);
+          l = yield b(e, n);
         else if (t == "link_table")
           l = yield ee(e, n);
         else if (t == "sel_depart")
-          l = yield j(e, n);
+          l = yield S(e, n);
         else if (t == "sel_user")
-          l = yield d(e, n);
+          l = yield j(e, n);
         else if (t == "pca")
           l = _e(i);
         else if (t == "link_down")
-          l = yield v(e, n);
+          l = yield E(e, n);
         else if (t == "sel_tree")
-          l = yield I(e, n);
+          l = yield h(e, n);
         else if (t == "switch")
-          l = yield P(e, n);
+          l = yield L(e, n);
         else if (t == "image" || t == "file")
           l = K(e, n);
-        else if (s.indexOf(e.field) >= 0) {
+        else if (d.indexOf(e.field) >= 0) {
           let r = o[e.field];
-          r && r.length > 0 && (l = b(r, i));
+          r && r.length > 0 && (l = T(r, i));
         }
         return l;
       }
       return "";
     });
   }
-  function _(e, n) {
-    return p(this, null, function* () {
+  function v(e, n) {
+    return _(this, null, function* () {
       let i = f(e), l = n[e.field];
       if (!i)
         return l;
       let t = de(i);
       if (t && t.length > 0)
-        return b(t, l);
+        return T(t, l);
       {
         let r = [];
-        if (o[i] ? r = o[i] : r = (yield V(i)) || [], r && r.length > 0)
-          return o[i] = r, b(r, l);
+        if (o[i] ? r = o[i] : r = (yield U(i)) || [], r && r.length > 0)
+          return o[i] = r, T(r, l);
       }
       return "";
     });
@@ -141,8 +142,8 @@ function xe(a) {
     let n = "", { dictCode: i, dictTable: l, dictText: t } = e;
     return l ? n = encodeURI(`${l},${t},${i}`) : n = i, n;
   }
-  function C(e, n) {
-    return p(this, null, function* () {
+  function p(e, n) {
+    return _(this, null, function* () {
       let i = f(e), l = n[e.field];
       if (!l)
         return "";
@@ -150,8 +151,8 @@ function xe(a) {
       return o[i + l] ? t = o[i + l] : t = (yield me.get({ url: `/sys/dict/loadDictItem/${i}`, params: { key: l } })) || [], t && t.length > 0 ? (o[i + l] = t, t.join(",")) : "";
     });
   }
-  function S(e, n) {
-    return p(this, null, function* () {
+  function b(e, n) {
+    return _(this, null, function* () {
       let i = n[e.field];
       if (!i)
         return "";
@@ -159,86 +160,83 @@ function xe(a) {
       return l && l.length > 0 ? l.join(",") : "";
     });
   }
-  function j(e, n) {
-    return p(this, null, function* () {
+  function S(e, n) {
+    return _(this, null, function* () {
       let i = n[e.field];
       if (!i)
         return "";
-      let t = k(e).store || "id", r = (yield fe({ ids: i, primaryKey: t })) || [];
+      let t = s(e).store || "id", r = (yield fe({ ids: i, primaryKey: t })) || [];
       if (r && r.length > 0) {
         let g = [];
-        for (let y of r)
-          g.push(y.title);
+        for (let F of r)
+          g.push(F.title);
         return g.join(",");
       }
       return "";
     });
   }
-  function d(e, n) {
-    return p(this, null, function* () {
+  function j(e, n) {
+    return _(this, null, function* () {
       let i = n[e.field];
       if (!i)
         return "";
-      let l = k(e), r = {
+      let l = s(e), r = {
         [l.store || "username"]: i
-      }, y = ((yield pe(r)) || {}).records || [];
-      if (y && y.length > 0) {
-        let $ = [];
-        console.log("getUserDataText", y);
-        let L = l.text || "realname";
-        for (let E of y)
-          $.push(E[L]);
-        return $.join(",");
+      }, F = ((yield pe(r)) || {}).records || [];
+      if (F && F.length > 0) {
+        let I = [], $ = l.text || "realname";
+        for (let M of F)
+          I.push(M[$]);
+        return I.join(",");
       }
       return "";
     });
   }
-  function k(e) {
+  function s(e) {
     let n = {}, { fieldExtendJson: i } = e;
     if (i && typeof i == "string")
       try {
         let l = JSON.parse(i);
-        n = U({}, l);
+        n = R({}, l);
       } catch (l) {
-        console.error(l);
       }
     return n;
   }
-  function v(e, n) {
-    return p(this, null, function* () {
+  function E(e, n) {
+    return _(this, null, function* () {
       let { dictTable: i, field: l } = e, t = [];
       if (o[l])
         t = o[l];
       else if (i) {
         let r = JSON.parse(i);
         if (r) {
-          let { table: g, txt: y, key: $, linkField: L } = r, E = `${g},${y},${$}`;
-          if (t = [...(yield V(E)) || []], t && t.length > 0 && (o[l] = t, L)) {
-            let te = L.split(",");
+          let { table: g, txt: F, key: I, linkField: $ } = r, M = `${g},${F},${I}`;
+          if (t = [...(yield U(M)) || []], t && t.length > 0 && (o[l] = t, $)) {
+            let te = $.split(",");
             for (let A of te)
-              o[A] = t, s.push(A);
+              o[A] = t, d.push(A);
           }
         }
       }
       if (t && t.length > 0) {
         let r = n[l];
-        return b(t, r);
+        return T(t, r);
       }
       return "";
     });
   }
-  function I(e, n) {
-    return p(this, null, function* () {
+  function h(e, n) {
+    return _(this, null, function* () {
       let { dict: i, field: l } = e, t = [];
-      if (o[l] ? t = o[l] : i && (t = yield V(i)), t && t.length > 0) {
+      if (o[l] ? t = o[l] : i && (t = yield U(i)), t && t.length > 0) {
         let r = n[l];
-        return b(t, r);
+        return T(t, r);
       }
       return "";
     });
   }
-  function P(e, n) {
-    return p(this, null, function* () {
+  function L(e, n) {
+    return _(this, null, function* () {
       let { fieldExtendJson: i, field: l } = e, t = ["Y", "N"];
       i && (t = JSON.parse(i));
       let r = [
@@ -259,7 +257,7 @@ function xe(a) {
       return [];
     let l = i.split(","), t = [];
     for (let r of l) {
-      let g = ge(r) || "";
+      let g = he(r) || "";
       g && t.push(g);
     }
     return t;
@@ -268,12 +266,12 @@ function xe(a) {
     e && window.open(e);
   }
   function G(e) {
-    let n = h.value[e];
+    let n = w.value[e];
     if (!n || n.length == 0) {
-      w.warning("无图片!");
+      y.warning("无图片!");
       return;
     }
-    he({ imageList: n });
+    ge({ imageList: n });
   }
   function Q(e) {
     return e ? e.substring(e.lastIndexOf("/") + 1) : "";
@@ -283,14 +281,14 @@ function xe(a) {
     return X.indexOf(e.view) >= 0 ? a.span == 12 ? "span12" : a.span == 8 ? "span8" : a.span == 6 ? "span6" : "span24" : "";
   }
   function ee(e, n) {
-    return p(this, null, function* () {
+    return _(this, null, function* () {
       let i = n[e.field];
-      return k(e).showType == "select" ? i ? n[e.field + "_dictText"] : "" : i ? n[e.field] : "";
+      return s(e).showType == "select" ? i ? n[e.field + "_dictText"] : "" : i ? n[e.field] : "";
     });
   }
   return {
-    formContainerClass: F,
-    detailFormData: h,
+    formContainerClass: C,
+    detailFormData: w,
     getItemSpan: z,
     handleDownloadFile: Y,
     handleViewImage: G,
@@ -298,13 +296,14 @@ function xe(a) {
     getLabelWidthClass: Z
   };
 }
-const ke = se({
+const xe = se({
   name: "DetailForm",
   components: {
-    DownloadOutlined: ye,
-    EyeOutlined: we,
+    DownloadOutlined: we,
+    EyeOutlined: ye,
     PaperClipOutlined: De,
-    LinkTableCard: Ce
+    LinkTableCard: Fe,
+    MarkdownViewer: ke
   },
   props: {
     span: O.number.def(24),
@@ -315,113 +314,130 @@ const ke = se({
     containerClass: O.string.def("")
   },
   setup(a) {
-    const { formContainerClass: o, detailFormData: s, getItemSpan: h, handleDownloadFile: w, handleViewImage: F, getFilename: D, getLabelWidthClass: _ } = xe(a);
+    const { formContainerClass: o, detailFormData: d, getItemSpan: w, handleDownloadFile: y, handleViewImage: C, getFilename: D, getLabelWidthClass: v } = be(a);
     return {
       formContainerClass: o,
-      detailFormData: s,
-      getItemSpan: h,
-      handleDownloadFile: w,
-      handleViewImage: F,
+      detailFormData: d,
+      getItemSpan: w,
+      handleDownloadFile: y,
+      handleViewImage: C,
       getFilename: D,
-      getLabelWidthClass: _
+      getLabelWidthClass: v,
+      filterLable: (p) => {
+        if (p.fieldExtendJson) {
+          const b = JSON.parse(p.fieldExtendJson);
+          if (b.labelLength && p.label.length > 4)
+            return p.label.substr(0, b.labelLength);
+        }
+        return p.label;
+      }
     };
   }
 });
-const Te = { class: "detail-item" }, be = ["title"], Ie = ["innerHTML"], $e = {
-  key: 1,
+const Te = { class: "detail-item" }, Le = ["title"], Ie = {
+  key: 0,
+  class: "item-content"
+}, $e = ["innerHTML"], Oe = {
+  key: 2,
   class: "item-content",
   style: { display: "block", "padding-top": "10px" }
-}, Le = { key: 0 }, Oe = {
-  key: 2,
+}, Se = { key: 0 }, je = {
+  key: 3,
   class: "item-content"
-}, Se = { class: "ant-upload-list ant-upload-list-picture-card" }, je = {
+}, Ee = { class: "ant-upload-list ant-upload-list-picture-card" }, Me = {
   class: "ant-upload-list-picture-card-container",
   style: { "margin-top": "8px" }
-}, Ee = {
+}, Ne = {
   class: "ant-upload-list-item ant-upload-list-item-done ant-upload-list-item-list-type-picture-card",
   "data-has-actions": "true"
-}, Ne = { class: "ant-upload-list-item-info" }, Be = ["src"], Me = { class: "ant-upload-list-item-actions" }, Ve = {
-  key: 3,
-  class: "item-content"
-}, Ae = { class: "ant-upload-list ant-upload-list-text" }, He = { class: "" }, Je = { class: "ant-upload-list-item ant-upload-list-item-done ant-upload-list-item-list-type-text" }, Ue = { class: "ant-upload-list-item-info" }, qe = { class: "ant-upload-span" }, Re = { class: "ant-upload-text-icon" }, We = ["href"], Pe = { class: "ant-upload-list-item-card-actions" }, ze = {
+}, Ve = { class: "ant-upload-list-item-info" }, Je = ["src"], Be = { class: "ant-upload-list-item-actions" }, Ue = {
   key: 4,
   class: "item-content"
+}, Ae = { class: "ant-upload-list ant-upload-list-text" }, He = { class: "" }, qe = { class: "ant-upload-list-item ant-upload-list-item-done ant-upload-list-item-list-type-text" }, Re = { class: "ant-upload-list-item-info" }, We = { class: "ant-upload-span" }, Pe = { class: "ant-upload-text-icon" }, ze = ["href"], Ke = { class: "ant-upload-list-item-card-actions" }, Ye = {
+  key: 5,
+  class: "item-content"
 };
-function Ke(a, o, s, h, w, F) {
-  const D = x("link-table-card"), _ = x("download-outlined"), f = x("eye-outlined"), C = x("paper-clip-outlined"), S = x("a-col"), j = x("a-row");
+function Ge(a, o, d, w, y, C) {
+  const D = k("MarkdownViewer"), v = k("link-table-card"), f = k("download-outlined"), p = k("eye-outlined"), b = k("paper-clip-outlined"), S = k("a-col"), j = k("a-row");
   return u(), m("div", {
-    class: q(a.formContainerClass)
+    class: N(a.formContainerClass)
   }, [
-    T(j, null, {
-      default: R(() => [
-        (u(!0), m(N, null, B(a.schemas, (d, k) => (u(), W(S, {
-          key: k,
-          span: a.getItemSpan(d)
+    x(j, null, {
+      default: W(() => [
+        (u(!0), m(V, null, J(a.schemas, (s, E) => (u(), P(S, {
+          key: E,
+          span: a.getItemSpan(s)
         }, {
-          default: R(() => [
+          default: W(() => [
             c("div", Te, [
               c("div", {
-                class: q(["item-title", a.getLabelWidthClass(d)]),
-                title: d.label
-              }, M(d.label) + "： ", 11, be),
-              d.isHtml ? (u(), m("div", {
-                key: 0,
-                class: "item-content",
-                innerHTML: a.detailFormData[d.field]
-              }, null, 8, Ie)) : d.isCard ? (u(), m("div", $e, [
-                a.detailFormData[d.field] ? (u(), W(D, {
+                class: N(["item-title", a.getLabelWidthClass(s)]),
+                title: s.label
+              }, B(a.filterLable(s)) + "： ", 11, Le),
+              s.view === "markdown" ? (u(), m("div", Ie, [
+                x(D, {
+                  value: a.detailFormData[s.field],
+                  "onUpdate:value": (h) => a.detailFormData[s.field] = h,
+                  placeholder: ""
+                }, null, 8, ["value", "onUpdate:value"])
+              ])) : s.isHtml ? (u(), m("div", {
+                key: 1,
+                class: N(["item-content", s.view]),
+                innerHTML: a.detailFormData[s.field]
+              }, null, 10, $e)) : s.isCard ? (u(), m("div", Oe, [
+                a.detailFormData[s.field] ? (u(), P(v, {
                   key: 1,
                   disabled: "",
                   detail: "",
-                  value: a.detailFormData[d.field],
-                  valueField: d.dictCode,
-                  textField: d.dictText,
-                  tableName: d.dictTable,
-                  multi: d.multi
-                }, null, 8, ["value", "valueField", "textField", "tableName", "multi"])) : (u(), m("span", Le))
-              ])) : d.isImage ? (u(), m("div", Oe, [
-                c("div", Se, [
-                  (u(!0), m(N, null, B(a.detailFormData[d.field], (v) => (u(), m("div", je, [
+                  value: a.detailFormData[s.field],
+                  valueField: s.dictCode,
+                  textField: s.dictText,
+                  tableName: s.dictTable,
+                  multi: s.multi
+                }, null, 8, ["value", "valueField", "textField", "tableName", "multi"])) : (u(), m("span", Se))
+              ])) : s.isImage ? (u(), m("div", je, [
+                c("div", Ee, [
+                  (u(!0), m(V, null, J(a.detailFormData[s.field], (h) => (u(), m("div", Me, [
                     c("span", null, [
-                      c("div", Ee, [
-                        c("div", Ne, [
+                      c("div", Ne, [
+                        c("div", Ve, [
                           c("img", {
-                            src: v,
+                            src: h,
                             alt: "图片不存在",
                             class: "ant-upload-list-item-image"
-                          }, null, 8, Be)
+                          }, null, 8, Je)
                         ]),
-                        c("span", Me, [
-                          T(_, {
-                            onClick: (I) => a.handleDownloadFile(v)
+                        c("span", Be, [
+                          x(f, {
+                            onClick: (L) => a.handleDownloadFile(h)
                           }, null, 8, ["onClick"]),
-                          T(f, {
-                            onClick: (I) => a.handleViewImage(d.field)
+                          x(p, {
+                            onClick: (L) => a.handleViewImage(s.field)
                           }, null, 8, ["onClick"])
                         ])
                       ])
                     ])
                   ]))), 256))
                 ])
-              ])) : d.isFile ? (u(), m("div", Ve, [
+              ])) : s.isFile ? (u(), m("div", Ue, [
                 c("div", Ae, [
-                  (u(!0), m(N, null, B(a.detailFormData[d.field], (v) => (u(), m("div", He, [
+                  (u(!0), m(V, null, J(a.detailFormData[s.field], (h) => (u(), m("div", He, [
                     c("span", null, [
-                      c("div", Je, [
-                        c("div", Ue, [
-                          c("span", qe, [
-                            c("div", Re, [
-                              T(C)
+                      c("div", qe, [
+                        c("div", Re, [
+                          c("span", We, [
+                            c("div", Pe, [
+                              x(b)
                             ]),
                             c("a", {
-                              href: v,
+                              href: h,
                               target: "_blank",
                               rel: "noopener noreferrer",
                               class: "ant-upload-list-item-name"
-                            }, M(a.getFilename(v)), 9, We),
-                            c("span", Pe, [
-                              T(_, {
-                                onClick: (I) => a.handleDownloadFile(v)
+                            }, B(a.getFilename(h)), 9, ze),
+                            c("span", Ke, [
+                              x(f, {
+                                onClick: (L) => a.handleDownloadFile(h)
                               }, null, 8, ["onClick"])
                             ])
                           ])
@@ -430,7 +446,7 @@ function Ke(a, o, s, h, w, F) {
                     ])
                   ]))), 256))
                 ])
-              ])) : (u(), m("div", ze, M(a.detailFormData[d.field]), 1))
+              ])) : (u(), m("div", Ye, B(a.detailFormData[s.field]), 1))
             ])
           ]),
           _: 2
@@ -440,7 +456,7 @@ function Ke(a, o, s, h, w, F) {
     })
   ], 2);
 }
-const St = /* @__PURE__ */ Fe(ke, [["render", Ke], ["__scopeId", "data-v-fd1939fd"]]);
+const Vt = /* @__PURE__ */ Ce(xe, [["render", Ge], ["__scopeId", "data-v-fce737d0"]]);
 export {
-  St as default
+  Vt as default
 };