@jeecg/online 3.5.3-vite4 → 3.6.2-beta

package/{OnlineCustomModal-456a85a6.mjs → OnlineCustomModal-518ad33c.mjs}

@@ -1,4 +1,4 @@
-var p = (o, f, r) => new Promise((m, u) => {
+var p = (e, f, r) => new Promise((m, u) => {
   var c = (t) => {
     try {
       s(r.next(t));
@@ -12,21 +12,22 @@ var p = (o, f, r) => new Promise((m, u) => {
       u(l);
     }
   }, s = (t) => t.done ? m(t.value) : Promise.resolve(t.value).then(c, a);
-  s((r = r.apply(o, f)).next());
+  s((r = r.apply(e, f)).next());
 });
-import { defineComponent as z, ref as i, nextTick as T, watch as J, reactive as Q, markRaw as W, defineAsyncComponent as X, resolveComponent as F, openBlock as S, createBlock as k, mergeProps as Y, withCtx as d, createVNode as R, createTextVNode as P, resolveDynamicComponent as Z } from "vue";
-import { BasicModal as x, useModalInner as oo } from "/@/components/Modal";
-import { g as _ } from "./useExtendComponent-48d37d9b.mjs";
-import { defHttp as eo } from "/@/utils/http/axios";
-import { O as to } from "./OnlineForm-630a22c2.mjs";
-import { importViewsFile as no } from "/@/utils";
-import { _ as ro } from "./index-6a09a912.mjs";
+import { defineComponent as z, ref as i, nextTick as T, watch as J, reactive as Q, markRaw as W, defineAsyncComponent as X, resolveComponent as C, openBlock as S, createBlock as k, mergeProps as Y, withCtx as d, createVNode as R, createTextVNode as P, resolveDynamicComponent as Z } from "vue";
+import { BasicModal as x, useModalInner as ee } from "/@/components/Modal";
+import { g as _ } from "./useExtendComponent-325fe3f1.mjs";
+import { defHttp as oe } from "/@/utils/http/axios";
+import te from "./OnlineForm-1fa2d893.mjs";
+import { importViewsFile as ne } from "/@/utils";
+import { _ as re } from "./index-0e3ab3af.mjs";
 import "/@/components/Form/src/componentMap";
 import "/@/utils/propTypes";
 import "@ant-design/icons-vue";
 import "/@/hooks/web/useMessage";
 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";
@@ -39,20 +40,21 @@ import "/@/hooks/system/useListPage";
 import "vue-router";
 import "/@/components/Form/src/utils/Area";
 import "/@/components/Preview/index";
-import "./LinkTableListPiece-34266919.mjs";
-import "./OnlineSelectCascade-c7baf52b.mjs";
+import "./LinkTableListPiece-8499a318.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";
 import "/@/components/jeecg/JVxeTable/types";
 import "/@/hooks/core/useContext";
 import "/@/utils/mitt";
+import "./useCustomHook-acb00837.mjs";
 import "/@/utils/cache";
-import "./constant-fe20103a.mjs";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-const io = {
+const ie = {
   code: "",
   title: "自定义弹框",
   width: 600,
@@ -63,71 +65,70 @@ const io = {
   tableType: "",
   foreignKeys: "",
   formComponent: ""
-}, mo = z({
+}, me = z({
   name: "OnlineCustomModal",
   components: {
-    OnlineForm: to,
+    OnlineForm: te,
     BasicModal: x
   },
-  setup(o, { emit: f }) {
+  setup(e, { emit: f }) {
     const r = i(), m = i(""), u = i("自定义弹框"), c = i(600);
     let a = [], s = [], t = "", l = {};
     const I = {
       loadFormItems: "/online/cgform/api/getFormItem/",
       optPre: "/online/cgform/api/form/"
-    }, B = { position: "relative" }, E = i(!1), g = i(!1);
+    }, B = { position: "relative" }, E = i(!1), F = i(!1);
     function $() {
-      g.value = !0;
+      F.value = !0;
     }
-    const h = i(!0), [N, { setModalProps: D, closeModal: b }] = oo((e) => p(this, null, function* () {
-      D({ confirmLoading: !1 }), L(e), yield T(() => p(this, null, function* () {
-        e.formComponent ? K(e.formComponent) : yield H();
+    const h = i(!0), [N, { setModalProps: D, closeModal: b }] = ee((o) => p(this, null, function* () {
+      D({ confirmLoading: !1 }), L(o), yield T(() => p(this, null, function* () {
+        o.formComponent ? K(o.formComponent) : yield H();
       }));
     }));
-    function L(e) {
-      let n = Object.assign({}, io, e);
+    function L(o) {
+      let n = Object.assign({}, ie, o);
       m.value = n.code, u.value = n.title, c.value = n.width, a = n.hide || [], s = n.show || [], t = U(n.requestUrl), l = n.row;
     }
-    function U(e) {
-      return e || I.optPre + m.value;
+    function U(o) {
+      return o || I.optPre + m.value;
     }
-    const v = i(!1);
+    const g = i(!1);
     function V() {
-      v.value = !0, h.value === !0 ? r.value.handleSubmit() : M.value.handleSubmit(), setTimeout(() => {
-        v.value = !0;
+      g.value = !0, h.value === !0 ? r.value.handleSubmit() : M.value.handleSubmit(), setTimeout(() => {
+        g.value = !0;
       }, 3500);
     }
     function j() {
       b();
     }
-    function A(e) {
-      f("success", e), b();
+    function A(o) {
+      f("success", o), b();
     }
     function H() {
       return p(this, null, function* () {
-        h.value = !0, yield _(g), r.value.handleCustomFormSh(s, a), r.value.handleCustomFormEdit(l, t);
+        h.value = !0, yield _(F), r.value.handleCustomFormSh(s, a), r.value.handleCustomFormEdit(l, t);
       });
     }
     const O = i(1);
     J(m, q, { immediate: !0 });
     function q() {
       return p(this, null, function* () {
-        if (g.value = !1, !m.value)
+        if (F.value = !1, !m.value)
           return;
-        console.log("重新渲染表单》》》》modal");
-        let e = yield G(), n = e.head.formTemplate;
+        let o = yield G(), n = o.head.formTemplate;
         O.value = n ? Number(n) : 1, T(() => p(this, null, function* () {
-          (yield _(r)).createRootProperties(e);
+          (yield _(r)).createRootProperties(o);
         }));
       });
     }
     function G() {
-      let e = `/online/cgform/api/getFormItem/${m.value}`;
-      return new Promise((n, y) => {
-        eo.get({ url: e }, { isTransformResponse: !1 }).then((C) => {
-          console.log("表单结果》》modal:", C), C.success ? n(C.result) : y(C.message);
+      let o = `/online/cgform/api/getFormItem/${m.value}`;
+      return new Promise((n, v) => {
+        oe.get({ url: o }, { isTransformResponse: !1 }).then((y) => {
+          y.success ? n(y.result) : v(y.message);
         }).catch(() => {
-          y();
+          v();
         });
       });
     }
@@ -136,8 +137,8 @@ const io = {
       is: "",
       row: {}
     });
-    function K(e) {
-      h.value = !1, w.url = t, w.row = l, w.is = W(X(() => no(e)));
+    function K(o) {
+      h.value = !1, w.url = t, w.row = l, w.is = W(X(() => ne(o)));
     }
     return {
       //modal
@@ -159,27 +160,27 @@ const io = {
       open,
       isOnlineForm: h,
       confirmLoading: E,
-      submitLoading: v,
+      submitLoading: g,
       handleSuccess: A
     };
   }
 });
-function lo(o, f, r, m, u, c) {
-  const a = F("a-button"), s = F("online-form"), t = F("a-spin"), l = F("BasicModal");
+function le(e, f, r, m, u, c) {
+  const a = C("a-button"), s = C("online-form"), t = C("a-spin"), l = C("BasicModal");
   return S(), k(l, Y({
-    title: o.title,
-    width: o.width
-  }, o.$attrs, {
-    style: o.modalStyle,
-    onRegister: o.registerModal,
+    title: e.title,
+    width: e.width
+  }, e.$attrs, {
+    style: e.modalStyle,
+    onRegister: e.registerModal,
     wrapClassName: "jeecg-online-modal2",
-    onOk: o.handleSubmit
+    onOk: e.handleSubmit
   }), {
     footer: d(() => [
       R(a, {
         key: "submit",
         type: "primary",
-        onClick: o.handleSubmit
+        onClick: e.handleSubmit
       }, {
         default: d(() => [
           P("确定")
@@ -188,7 +189,7 @@ function lo(o, f, r, m, u, c) {
       }, 8, ["onClick"]),
       R(a, {
         key: "back",
-        onClick: o.handleCancel
+        onClick: e.handleCancel
       }, {
         default: d(() => [
           P("关闭")
@@ -197,22 +198,22 @@ function lo(o, f, r, m, u, c) {
       }, 8, ["onClick"])
     ]),
     default: d(() => [
-      R(t, { spinning: o.confirmLoading }, {
+      R(t, { spinning: e.confirmLoading }, {
         default: d(() => [
-          o.isOnlineForm ? (S(), k(s, {
+          e.isOnlineForm ? (S(), k(s, {
             key: 0,
             ref: "onlineFormCompRef",
-            id: o.id,
-            "form-template": o.formTemplate,
-            onRendered: o.renderSuccess,
-            onSuccess: o.handleSuccess,
+            id: e.id,
+            "form-template": e.formTemplate,
+            onRendered: e.renderSuccess,
+            onSuccess: e.handleSuccess,
             modalClass: "jeecg-online-modal2"
-          }, null, 8, ["id", "form-template", "onRendered", "onSuccess"])) : (S(), k(Z(o.customFormComponent.is), {
+          }, null, 8, ["id", "form-template", "onRendered", "onSuccess"])) : (S(), k(Z(e.customFormComponent.is), {
             key: 1,
             ref: "customFormRef",
-            url: o.customFormComponent.url,
-            row: o.customFormComponent.row,
-            onClose: o.handleSuccess
+            url: e.customFormComponent.url,
+            row: e.customFormComponent.row,
+            onClose: e.handleSuccess
           }, null, 40, ["url", "row", "onClose"]))
         ]),
         _: 1
@@ -221,7 +222,7 @@ function lo(o, f, r, m, u, c) {
     _: 1
   }, 16, ["title", "width", "style", "onRegister", "onOk"]);
 }
-const Qo = /* @__PURE__ */ ro(mo, [["render", lo]]);
+const We = /* @__PURE__ */ re(me, [["render", le]]);
 export {
-  Qo as default
+  We as default
 };

package/{OnlineDetailModal-f967f080.mjs → OnlineDetailModal-9675390d.mjs}

@@ -1,31 +1,31 @@
-var c = (e, a, t) => new Promise((l, n) => {
-  var p = (o) => {
+var c = (e, a, o) => new Promise((l, i) => {
+  var p = (t) => {
     try {
-      m(t.next(o));
+      m(o.next(t));
     } catch (r) {
-      n(r);
+      i(r);
     }
-  }, i = (o) => {
+  }, n = (t) => {
     try {
-      m(t.throw(o));
+      m(o.throw(t));
     } catch (r) {
-      n(r);
+      i(r);
     }
-  }, m = (o) => o.done ? l(o.value) : Promise.resolve(o.value).then(p, i);
-  m((t = t.apply(e, a)).next());
+  }, m = (t) => t.done ? l(t.value) : Promise.resolve(t.value).then(p, n);
+  m((o = o.apply(e, a)).next());
 });
 import { defineComponent as I, ref as $, watch as v, resolveComponent as d, openBlock as P, createBlock as y, mergeProps as O, withCtx as s, createVNode as f, createTextVNode as L } from "vue";
 import { BasicModal as V } from "/@/components/Modal";
-import W from "./OnlineFormDetail-1b216792.mjs";
-import { e as j } from "./useExtendComponent-48d37d9b.mjs";
+import W from "./OnlineFormDetail-0e7294ca.mjs";
+import { b as j } from "./useExtendComponent-325fe3f1.mjs";
 import q from "/@/components/jeecg/comment/CommentPanel.vue";
-import { _ as A } from "./index-6a09a912.mjs";
+import { _ as A } from "./index-0e3ab3af.mjs";
 import "/@/hooks/web/useMessage";
 import "/@/components/Loading";
 import "/@/utils/auth";
 import "/@/utils";
 import "@ant-design/icons-vue";
-import "./DetailForm-e4538e7a.mjs";
+import "./DetailForm-424638eb.mjs";
 import "/@/utils/propTypes";
 import "/@/utils/dict";
 import "/@/utils/dict/JDictSelectUtil";
@@ -35,9 +35,10 @@ import "/@/utils/http/axios";
 import "/@/components/Form/src/utils/Area";
 import "/@/utils/common/compUtils";
 import "/@/components/Preview/index";
-import "./OnlineSubFormDetail-0aa4966c.mjs";
+import "/@/components/Markdown";
+import "./OnlineSubFormDetail-f0d2c016.mjs";
 import "/@/components/Form/index";
-import "./constant-fe20103a.mjs";
+import "./constant-754f1a9d.mjs";
 import "/@/components/Form/src/componentMap";
 import "lodash-es";
 import "/@/components/Form/src/jeecg/components/JUpload";
@@ -48,9 +49,10 @@ import "/@/store/modules/permission";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
 import "vue-router";
-import "./LinkTableListPiece-34266919.mjs";
-import "./OnlineSelectCascade-c7baf52b.mjs";
-import "./JModalTip-abe1515a.mjs";
+import "./LinkTableListPiece-8499a318.mjs";
+import "./OnlineSelectCascade-4265c95d.mjs";
+import "./JModalTip-33c7dc44.mjs";
+import "/@/hooks/web/useAppInject";
 import "ant-design-vue";
 import "@vueuse/core";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
@@ -70,22 +72,21 @@ const E = I({
   },
   emits: ["success", "register", "formConfig"],
   setup(e, { emit: a }) {
-    console.log("进入表单弹框》》》》modal");
-    const t = $();
+    const o = $();
     function l() {
-      t.value && t.value.reload();
+      o.value && o.value.reload();
     }
     const {
-      title: n,
+      title: i,
       modalWidth: p,
-      registerModal: i,
+      registerModal: n,
       cgButtonList: m,
-      handleCgButtonClick: o,
+      handleCgButtonClick: t,
       disableSubmit: r,
       handleSubmit: u,
       submitLoading: h,
-      handleCancel: C,
-      handleFormConfig: b,
+      handleCancel: b,
+      handleFormConfig: C,
       onlineFormCompRef: g,
       formTemplate: w,
       isTreeForm: _,
@@ -101,21 +102,21 @@ const E = I({
     v(() => e.id, D, { immediate: !0 });
     function D() {
       return c(this, null, function* () {
-        M.value = !1, e.id && (console.log("重新渲染表单》》》》modal"), yield b(e.id, {}));
+        M.value = !1, e.id && (yield C(e.id, {}));
       });
     }
     return {
-      title: n,
+      title: i,
       onlineFormCompRef: g,
       renderSuccess: F,
-      registerModal: i,
+      registerModal: n,
       handleSubmit: u,
-      handleCancel: C,
+      handleCancel: b,
       modalWidth: p,
       formTemplate: w,
       disableSubmit: r,
       cgButtonList: m,
-      handleCgButtonClick: o,
+      handleCgButtonClick: t,
       isTreeForm: _,
       pidFieldName: R,
       submitLoading: h,
@@ -123,17 +124,17 @@ const E = I({
       tableName: T,
       formDataId: k,
       enableComment: B,
-      commentPanelRef: t,
+      commentPanelRef: o,
       themeTemplate: S
     };
   }
 });
-function z(e, a, t, l, n, p) {
-  const i = d("a-button"), m = d("online-form-detail"), o = d("comment-panel"), r = d("BasicModal");
+function H(e, a, o, l, i, p) {
+  const n = d("a-button"), m = d("online-form-detail"), t = d("comment-panel"), r = d("BasicModal");
   return P(), y(r, O({
     title: e.title,
     width: e.modalWidth,
-    height: 600,
+    maxHeight: 600,
     enableComment: e.enableComment,
     defaultFullscreen: !1
   }, e.$attrs, {
@@ -141,7 +142,7 @@ function z(e, a, t, l, n, p) {
     wrapClassName: "jeecg-online-detail-modal"
   }), {
     footer: s(() => [
-      f(i, {
+      f(n, {
         key: "back",
         onClick: e.handleCancel
       }, {
@@ -152,7 +153,7 @@ function z(e, a, t, l, n, p) {
       }, 8, ["onClick"])
     ]),
     comment: s(() => [
-      f(o, {
+      f(t, {
         ref: "commentPanelRef",
         tableName: e.tableName,
         dataId: e.formDataId
@@ -171,7 +172,7 @@ function z(e, a, t, l, n, p) {
     _: 1
   }, 16, ["title", "width", "enableComment", "onRegister"]);
 }
-const ve = /* @__PURE__ */ A(E, [["render", z]]);
+const ye = /* @__PURE__ */ A(E, [["render", H]]);
 export {
-  ve as default
+  ye as default
 };