@jeecg/online 3.7.0-beta → 3.7.1-RC

package/{ProcessOnlineForm-b42198f5.mjs → ProcessOnlineForm-148632fe.mjs}

@@ -1,24 +1,24 @@
-var u = (e, r, o) => new Promise((d, s) => {
-  var l = (t) => {
+var u = (e, r, t) => new Promise((p, s) => {
+  var d = (o) => {
     try {
-      n(o.next(t));
-    } catch (m) {
-      s(m);
+      a(t.next(o));
+    } catch (n) {
+      s(n);
     }
-  }, i = (t) => {
+  }, i = (o) => {
     try {
-      n(o.throw(t));
-    } catch (m) {
-      s(m);
+      a(t.throw(o));
+    } catch (n) {
+      s(n);
     }
-  }, n = (t) => t.done ? d(t.value) : Promise.resolve(t.value).then(l, i);
-  n((o = o.apply(e, r)).next());
+  }, a = (o) => o.done ? p(o.value) : Promise.resolve(o.value).then(d, i);
+  a((t = t.apply(e, r)).next());
 });
-import S from "./OnlineForm-018981b2.mjs";
-import { defineComponent as k, ref as a, watch as T, nextTick as w, resolveComponent as f, openBlock as h, createElementBlock as y, createVNode as _, withCtx as g, createTextVNode as N, createCommentVNode as C } from "vue";
-import { defHttp as P } from "/@/utils/http/axios";
-import { g as b } from "./useExtendComponent-bb7cca20.mjs";
-import { _ as R } from "./index-173949bb.mjs";
+import C from "./OnlineForm-9f1153ba.mjs";
+import { defineComponent as S, ref as m, watch as T, nextTick as w, resolveComponent as f, openBlock as _, createElementBlock as y, createVNode as g, withCtx as h, createTextVNode as N, createCommentVNode as P } from "vue";
+import { defHttp as R } from "/@/utils/http/axios";
+import { g as b } from "./useExtendComponent-dcae5c78.mjs";
+import { _ as L } from "./index-1d1a6e56.mjs";
 import "/@/hooks/web/useMessage";
 import "/@/components/Form/index";
 import "lodash-es";
@@ -37,32 +37,32 @@ import "/@/store/modules/user";
 import "./constant-fa63bd66.mjs";
 import "/@/hooks/web/useAppInject";
 import "/@/utils/is";
-import "./OnlineForm.vue_vue_type_style_index_0_scoped_0f9f2964_lang-4ed993c7.mjs";
+import "/@/store/modules/permission";
+import "./OnlineForm.vue_vue_type_style_index_0_scoped_4657b304_lang-4ed993c7.mjs";
 import "/@/components/Form/src/componentMap";
 import "/@/utils/propTypes";
 import "/@/components/Form/src/jeecg/components/JUpload";
 import "/@/views/system/user/user.api";
 import "/@/utils/desform/customExpression";
-import "/@/store/modules/permission";
 import "/@/utils/dict/JDictSelectUtil";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
 import "vue-router";
 import "/@/components/Form/src/utils/Area";
 import "/@/components/Preview/index";
-import "./LinkTableListPiece-2660d709.mjs";
+import "./LinkTableListPiece-f3a8e0d7.mjs";
 import "/@/api/common/api";
 import "/@/assets/images/placeholderImage.png";
-import "./OnlineSelectCascade-471fcc76.mjs";
-import "./JModalTip-4a83aaed.mjs";
+import "./OnlineSelectCascade-05c40fef.mjs";
+import "./JModalTip-b055ab60.mjs";
 import "ant-design-vue";
 import "@vueuse/core";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-const L = k({
+const $ = S({
   name: "ProcessOnlineForm",
   inheritAttrs: !1,
   components: {
-    OnlineForm: S
+    OnlineForm: C
   },
   props: {
     dataId: {
@@ -83,28 +83,28 @@ const L = k({
     }
   },
   setup(e) {
-    const r = a(), o = a(""), d = a(1), s = a(!1), l = a(""), i = a(!1);
+    const r = m(), t = m(""), p = m(1), s = m(!1), d = m(""), i = m(!1);
     T(
       () => e.tableName,
       (c) => {
-        c && n();
+        c && a();
       },
       { immediate: !0 }
     );
-    function n() {
+    function a() {
       return u(this, null, function* () {
         i.value = !0;
-        const c = `/online/cgform/api/getFormItemBytbname/${e.tableName}`, I = { taskId: e.taskId };
+        const c = `/online/cgform/api/getFormItemBytbname/${e.tableName}`, k = { taskId: e.taskId };
         try {
-          let p = yield P.get({ url: c, params: I });
-          o.value = p.head.id, d.value = Number(p.head.formTemplate || 1), s.value = p.head.isTree === "Y", l.value = p.head.treeParentIdField || "", yield w(() => u(this, null, function* () {
-            (yield b(r)).createRootProperties(p);
+          let l = yield R.get({ url: c, params: k });
+          t.value = l.head.id, p.value = Number(l.head.formTemplate || 1), s.value = l.head.isTree === "Y", d.value = l.head.treeParentIdField || "", yield w(() => u(this, null, function* () {
+            (yield b(r)).createRootProperties(l);
           }));
-        } catch (p) {
+        } catch (l) {
         }
       });
     }
-    function t() {
+    function o() {
       return u(this, null, function* () {
         let c = yield b(r);
         i.value = !1, c.show(!0, {
@@ -112,71 +112,77 @@ const L = k({
         });
       });
     }
-    const m = a(!1);
+    const n = m(!1);
     function F() {
       return u(this, null, function* () {
-        m.value = !0, r.value.handleSubmit();
+        n.value = !0, r.value.handleSubmit();
       });
     }
     function v() {
-      m.value = !1;
+      n.value = !1;
+    }
+    function I() {
+      n.value = !1;
     }
     return {
       onlineFormCompRef: r,
-      formId: o,
-      formTemplate: d,
+      formId: t,
+      formTemplate: p,
       isTreeForm: s,
-      pidFieldName: l,
-      renderSuccess: t,
+      pidFieldName: d,
+      renderSuccess: o,
       handleSuccess: v,
+      handleClose: I,
       handleSubmit: F,
-      buttonLoading: m,
+      buttonLoading: n,
       spinLoading: i
     };
   }
-}), $ = { class: "cust-onl-form" }, B = {
+}), B = { class: "cust-onl-form" }, O = {
   key: 0,
   style: { width: "100%", "text-align": "center", "margin-top": "5px" }
 };
-function O(e, r, o, d, s, l) {
-  const i = f("a-button"), n = f("online-form"), t = f("a-spin");
-  return h(), y("div", $, [
-    _(t, { spinning: e.spinLoading }, {
-      default: g(() => [
-        _(n, {
+function V(e, r, t, p, s, d) {
+  const i = f("a-button"), a = f("online-form"), o = f("a-spin");
+  return _(), y("div", B, [
+    g(o, { spinning: e.spinLoading }, {
+      default: h(() => [
+        g(a, {
           ref: "onlineFormCompRef",
           id: e.formId,
           disabled: e.disabled,
           "form-template": e.formTemplate,
           isTree: e.isTreeForm,
           pidField: e.pidFieldName,
+          taskId: e.taskId,
           onRendered: e.renderSuccess,
-          onSuccess: e.handleSuccess
+          onSuccess: e.handleSuccess,
+          onClose: e.handleClose
         }, {
-          bottom: g(() => [
-            !e.disabled && !e.spinLoading ? (h(), y("div", B, [
-              _(i, {
+          bottom: h(() => [
+            !e.disabled && !e.spinLoading ? (_(), y("div", O, [
+              g(i, {
                 preIcon: "ant-design:check",
                 style: { width: "126px" },
                 type: "primary",
                 onClick: e.handleSubmit,
                 loading: e.buttonLoading
               }, {
-                default: g(() => [
+                default: h(() => [
                   N(" 提 交 ")
                 ]),
                 _: 1
               }, 8, ["onClick", "loading"])
-            ])) : C("", !0)
+            ])) : P("", !0)
           ]),
           _: 1
-        }, 8, ["id", "disabled", "form-template", "isTree", "pidField", "onRendered", "onSuccess"])
+        }, 8, ["id", "disabled", "form-template", "isTree", "pidField", "taskId", "onRendered", "onSuccess", "onClose"])
       ]),
       _: 1
     }, 8, ["spinning"])
   ]);
 }
-const Ne = /* @__PURE__ */ R(L, [["render", O], ["__scopeId", "data-v-530d8f91"]]);
+const Ne = /* @__PURE__ */ L($, [["render", V], ["__scopeId", "data-v-a4356798"]]);
 export {
   Ne as default
 };

package/{QueryTable-96b3dbd0.mjs → QueryTable-f7bfca7f.mjs}

@@ -1,19 +1,19 @@
-var v = Object.defineProperty, g = Object.defineProperties;
-var T = Object.getOwnPropertyDescriptors;
-var m = Object.getOwnPropertySymbols;
-var _ = Object.prototype.hasOwnProperty, k = Object.prototype.propertyIsEnumerable;
-var c = (e, t, l) => t in e ? v(e, t, { enumerable: !0, configurable: !0, writable: !0, value: l }) : e[t] = l, f = (e, t) => {
+var T = Object.defineProperty, _ = Object.defineProperties;
+var C = Object.getOwnPropertyDescriptors;
+var c = Object.getOwnPropertySymbols;
+var k = Object.prototype.hasOwnProperty, q = Object.prototype.propertyIsEnumerable;
+var f = (e, t, l) => t in e ? T(e, t, { enumerable: !0, configurable: !0, writable: !0, value: l }) : e[t] = l, b = (e, t) => {
   for (var l in t || (t = {}))
-    _.call(t, l) && c(e, l, t[l]);
-  if (m)
-    for (var l of m(t))
-      k.call(t, l) && c(e, l, t[l]);
+    k.call(t, l) && f(e, l, t[l]);
+  if (c)
+    for (var l of c(t))
+      q.call(t, l) && f(e, l, t[l]);
   return e;
-}, h = (e, t) => g(e, T(t));
-import { defineComponent as C, ref as q, resolveComponent as V, openBlock as w, createBlock as x, mergeProps as F } from "vue";
-import { JVxeTypes as u } from "/@/components/jeecg/JVxeTable/types";
-import { u as H } from "./useTableSync-f6089e8a.mjs";
-import { _ as S } from "./index-173949bb.mjs";
+}, h = (e, t) => _(e, C(t));
+import { defineComponent as V, ref as F, resolveComponent as x, openBlock as w, createBlock as H, mergeProps as S } from "vue";
+import { JVxeTypes as r } from "/@/components/jeecg/JVxeTable/types";
+import { u as P } from "./useTableSync-d7e9f18d.mjs";
+import { _ as $ } from "./index-1d1a6e56.mjs";
 import "./cgform.data-475d4984.mjs";
 import "/@/utils/dict";
 import "/@/utils/dict/JDictSelectUtil";
@@ -22,18 +22,18 @@ import "lodash-es";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "/@/hooks/web/useMessage";
 import "vue-router";
-const D = C({
+const I = V({
   name: "QueryTable",
   emits: ["query"],
   setup(e, { emit: t }) {
-    const l = q([
+    const l = F([
       { title: "字段名称", key: "dbFieldName", width: 130 },
       { title: "字段备注", key: "dbFieldTxt", width: 130 },
       {
         title: "控件类型",
         key: "queryShowType",
         width: 170,
-        type: u.select,
+        type: r.select,
         options: [
           { title: "文本框", value: "text" },
           { title: "日期(yyyy-MM-dd)", value: "date" },
@@ -64,69 +64,72 @@ const D = C({
         ],
         defaultValue: "text",
         placeholder: "请选择${title}",
-        validateRules: [{ handler: d }]
+        validateRules: [{ handler: n }]
       },
       {
         title: "字典Table",
         key: "queryDictTable",
         width: 130,
-        type: u.textarea,
+        type: r.textarea,
         defaultValue: ""
       },
       {
         title: "字典Code",
         key: "queryDictField",
         width: 130,
-        type: u.input,
+        type: r.input,
         defaultValue: ""
       },
       {
         title: "字典Text",
         key: "queryDictText",
         width: 130,
-        type: u.input,
+        type: r.input,
         defaultValue: ""
       },
       {
         title: "默认值",
         key: "queryDefVal",
         width: 130,
-        type: u.input,
+        type: r.input,
         defaultValue: ""
       },
       {
         title: "是否启用",
         key: "queryConfigFlag",
         minWidth: 80,
-        type: u.checkbox,
+        type: r.checkbox,
         customValue: ["1", "0"],
         defaultChecked: !1,
         // update-begin--author:liaozhiyang---date:20240603---for：【TV360X-816】如果是关联记录或者没勾选数据库字段个性化查询checkbox禁用
         props: {
           isDisabledCell({ row: a, column: o }) {
-            let { pageTable: i, dbTable: b } = p;
-            const n = i.value.tableRef.getTableData({ rowIds: [a.id] })[0];
-            if (["link_table"].includes(n == null ? void 0 : n.fieldShowType))
+            let { pageTable: i, dbTable: v, fkTable: g } = m;
+            const s = i.value.tableRef.getTableData({ rowIds: [a.id] })[0];
+            if (["link_table"].includes(s == null ? void 0 : s.fieldShowType))
               return a.queryConfigFlag = "0", !0;
-            const s = b.value.tableRef.getTableData({ rowIds: [a.id] })[0];
-            return (s == null ? void 0 : s.dbIsPersist) == "0" ? (a.queryConfigFlag = "0", !0) : !1;
+            const p = v.value.tableRef.getTableData({ rowIds: [a.id] })[0];
+            if ((p == null ? void 0 : p.dbIsPersist) == "0")
+              return a.queryConfigFlag = "0", !0;
+            const u = g.value.tableRef.getTableData({ rowIds: [a.id] })[0];
+            return !!(u != null && u.mainTable && (u != null && u.mainField));
           }
         }
         // update-end--author:liaozhiyang---date:20240603---for：【TV360X-816】如果是关联记录或者没勾选数据库字段个性化查询checkbox禁用
       }
-    ]), r = H(l), { tables: p } = r;
+    ]), d = P(l), { tables: m } = d;
     function y({ row: a, column: o, value: i }) {
       o.key === "queryConfigFlag" && i === "1" && t("query", a.id);
     }
-    function d({ cellValue: a, row: o }, i) {
+    function n({ cellValue: a, row: o }, i) {
       a == null && o.queryConfigFlag == "1" && i(!1, "查询启用状态下，控件类型必选~"), i(!0);
     }
-    return h(f({}, r), { columns: l, handleChange: y });
+    return h(b({}, d), { columns: l, handleChange: y });
   }
 });
-function P(e, t, l, r, p, y) {
-  const d = V("JVxeTable");
-  return w(), x(d, F({
+function M(e, t, l, d, m, y) {
+  const n = x("JVxeTable");
+  return w(), H(n, S({
     ref: "tableRef",
     rowNumber: "",
     keyboardEdit: "",
@@ -138,7 +141,7 @@ function P(e, t, l, r, p, y) {
     onValueChange: e.handleChange
   }, e.tableProps), null, 16, ["maxHeight", "loading", "columns", "dataSource", "onValueChange"]);
 }
-const G = /* @__PURE__ */ S(D, [["render", P]]);
+const L = /* @__PURE__ */ $(I, [["render", M]]);
 export {
-  G as default
+  L as default
 };

package/{SetSwitchOptions-a452fa0f.mjs → SetSwitchOptions-b2af757f.mjs}

@@ -1,6 +1,6 @@
 import { ref as c, watch as m, onMounted as f, resolveComponent as N, openBlock as h, createElementBlock as S, createElementVNode as l, createVNode as v, pushScopeId as g, popScopeId as b } from "vue";
 import { isArray as w } from "/@/utils/is";
-import { _ as y } from "./index-173949bb.mjs";
+import { _ as y } from "./index-1d1a6e56.mjs";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "/@/hooks/web/useMessage";
 import "vue-router";