@jeecg/online 3.6.2-beta → 3.7.1-RC

package/{CgreportModal.vue_vue_type_script_setup_true_lang-c89d9222.mjs → CgreportModal-edefa8e3.mjs}

@@ -1,5 +1,5 @@
-var ce = Object.defineProperty, ue = Object.defineProperties;
-var de = Object.getOwnPropertyDescriptors;
+var ce = Object.defineProperty, de = Object.defineProperties;
+var ue = Object.getOwnPropertyDescriptors;
 var A = Object.getOwnPropertySymbols;
 var pe = Object.prototype.hasOwnProperty, me = Object.prototype.propertyIsEnumerable;
 var J = (t, o, l) => o in t ? ce(t, o, { enumerable: !0, configurable: !0, writable: !0, value: l }) : t[o] = l, B = (t, o) => {
@@ -9,36 +9,37 @@ var J = (t, o, l) => o in t ? ce(t, o, { enumerable: !0, configurable: !0, writa
     for (var l of A(o))
       me.call(o, l) && J(t, l, o[l]);
   return t;
-}, U = (t, o) => ue(t, de(o));
-var q = (t, o, l) => new Promise((_, m) => {
-  var g = (u) => {
+}, U = (t, o) => de(t, ue(o));
+var R = (t, o, l) => new Promise((m, v) => {
+  var f = (d) => {
     try {
-      c(l.next(u));
-    } catch (C) {
-      m(C);
+      c(l.next(d));
+    } catch (V) {
+      v(V);
     }
-  }, S = (u) => {
+  }, h = (d) => {
     try {
-      c(l.throw(u));
-    } catch (C) {
-      m(C);
+      c(l.throw(d));
+    } catch (V) {
+      v(V);
     }
-  }, c = (u) => u.done ? _(u.value) : Promise.resolve(u.value).then(g, S);
+  }, c = (d) => d.done ? m(d.value) : Promise.resolve(d.value).then(f, h);
   c((l = l.apply(t, o)).next());
 });
-import { defineComponent as fe, ref as P, reactive as z, unref as h, computed as ge, resolveComponent as v, openBlock as F, createBlock as M, mergeProps as he, withCtx as b, createVNode as y, createElementVNode as k, createTextVNode as V } from "vue";
-import { useModalInner as be, BasicModal as ye } from "/@/components/Modal";
-import { useForm as xe, BasicForm as _e } from "/@/components/Form/index";
-import { useJvxeMethod as Se } from "/@/hooks/system/useJvxeMethods.ts";
+import { defineComponent as fe, ref as w, reactive as K, unref as b, computed as ge, resolveComponent as S, openBlock as F, createBlock as O, mergeProps as he, withCtx as _, createVNode as y, createElementVNode as C, createTextVNode as P, pushScopeId as be, popScopeId as _e } from "vue";
+import { useModalInner as ye, BasicModal as xe } from "/@/components/Modal";
+import { useForm as Se, BasicForm as Ce } from "/@/components/Form/index";
+import { useJvxeMethod as ve } from "/@/hooks/system/useJvxeMethods.ts";
 import { JVxeTypes as i } from "/@/components/jeecg/JVxeTable/types";
-import { duplicateCheck as Ce } from "/@/views/system/user/user.api";
+import { duplicateCheckDelay as ke } from "/@/views/system/user/user.api";
 import { defHttp as x } from "/@/utils/http/axios";
-import { useMessage as K } from "/@/hooks/web/useMessage";
-import { usePermissionStore as ve } from "/@/store/modules/permission";
-const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", Ie = "/online/cgreport/item/listByHeadId", Ye = (t) => x.get({ url: "/online/cgreport/head/list", params: t }), et = (t, o) => x.delete({ url: "/online/cgreport/head/delete", params: t }, { joinParamsToUrl: !0 }).then(() => {
+import { useMessage as j } from "/@/hooks/web/useMessage";
+import { usePermissionStore as Ie } from "/@/store/modules/permission";
+import { _ as we } from "./index-1d1a6e56.mjs";
+const { createConfirm: Pe } = j(), Te = "/online/cgreport/param/listByHeadId", Ve = "/online/cgreport/item/listByHeadId", at = (t) => x.get({ url: "/online/cgreport/head/list", params: t }), nt = (t, o) => x.delete({ url: "/online/cgreport/head/delete", params: t }, { joinParamsToUrl: !0 }).then(() => {
   o();
-}), tt = (t, o) => {
-  ke({
+}), it = (t, o) => {
+  Pe({
     title: "确认删除",
     content: "是否删除选中数据",
     okText: "确认",
@@ -48,12 +49,12 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
       o();
     })
   });
-}, Pe = (t, o) => o ? x.put({ url: "/online/cgreport/head/editAll", params: t }) : x.post({ url: "/online/cgreport/head/add", params: t }), ot = (t) => x.get({ url: "/online/cgreport/api/getParamsInfo/" + t }), Ve = () => x.get({
+}, Le = (t, o) => o ? x.put({ url: "/online/cgreport/head/editAll", params: t }) : x.post({ url: "/online/cgreport/head/add", params: t }), st = (t) => x.get({ url: "/online/cgreport/api/getParamsInfo/" + t }), $e = () => x.get({
   url: "/sys/dataSource/options"
   /* getDataSourceList */
-}), Le = (t) => x.get({
+}), qe = (t) => x.get({
   url: "/online/cgreport/head/parseSql?" + t
-}), Te = ve(), lt = [
+}), Re = Ie(), ct = [
   {
     title: "报表名字",
     align: "center",
@@ -76,6 +77,7 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
     title: "数据源",
     align: "center",
     dataIndex: "dbSource",
+    customRender: ({ text: t, record: o }) => o.dbSource_dictText ? o.dbSource_dictText : t,
     width: 120
   },
   {
@@ -84,7 +86,7 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
     dataIndex: "createTime",
     width: 120
   }
-], rt = [
+], dt = [
   {
     label: "报表名称",
     field: "name",
@@ -95,7 +97,7 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
     field: "code",
     component: "JInput"
   }
-], $e = /^[a-z|A-Z][a-z|A-Z|\d|_|-]{0,}$/, qe = [
+], Ne = /^[a-z|A-Z][a-z|A-Z|\d|_|-]{0,}$/, De = [
   {
     label: "",
     field: "id",
@@ -117,21 +119,21 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
     dynamicRules: ({ values: t, model: o }) => [
       {
         required: !0,
-        validator: (l, _) => new Promise((m, g) => {
-          if (!_)
-            return g("请输入报表编码！");
-          if (!$e.test(_))
-            return g("编码必须以字母开头，可包含数字、下划线、横杠！");
-          let S = {
+        validator: (l, m) => new Promise((v, f) => {
+          if (!m)
+            return f("请输入报表编码！");
+          if (!Ne.test(m))
+            return f("编码必须以字母开头，可包含数字、下划线、横杠！");
+          let h = {
             tableName: "onl_cgreport_head",
             fieldName: "code",
-            fieldVal: _,
+            fieldVal: m,
             dataId: o.id
           };
-          Ce(S).then((c) => {
-            c.success ? m() : g("报表编码已存在!");
+          ke(h).then((c) => {
+            c.success ? v() : f("报表编码已存在!");
           }).catch((c) => {
-            g(c.message || "校验失败");
+            f(c.message || "校验失败");
           });
         })
       }
@@ -163,9 +165,9 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
       xxl: 8
     },
     component: "ApiSelect",
-    rules: [{ required: Te.sysSafeMode, message: "请选择数据源！" }],
+    rules: [{ required: Re.sysSafeMode, message: "请选择数据源！" }],
     componentProps: {
-      api: Ve
+      api: $e
     }
   },
   /*    {
@@ -187,16 +189,23 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
     field: "cgrSql",
     component: "JCodeEditor",
     rules: [{ required: !0, message: "请填写报表SQL" }],
-    itemProps: {
-      labelCol: { xs: 24, sm: 2 },
-      wrapperCol: { xs: 24, sm: 22 }
-    },
+    // update-begin--author:liaozhiyang---date:20240509---for：【QQYUN-9230】报表图表弹窗样式调整
+    // itemProps: {
+    //   labelCol: { xs: 24, sm: 4, md: 2, lg: 2, xl: 3, xxl: 2 },
+    //   wrapperCol: { xs: { span: 24 }, sm: { span: 18 }, md: { span: 24 } },
+    // },
+    // update-end--author:liaozhiyang---date:20240509---for：【QQYUN-9230】报表图表弹窗样式调整
     componentProps: {
       height: "200px",
       fullScreen: !0
     },
     colProps: {
-      span: 20
+      sm: 24,
+      xs: 24,
+      md: 18,
+      lg: 16,
+      xl: 16,
+      xxl: 16
     }
   },
   {
@@ -205,7 +214,12 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
     component: "Input",
     slot: "analyseButton",
     colProps: {
-      span: 4
+      xs: 24,
+      sm: 24,
+      md: 6,
+      lg: 8,
+      xl: 8,
+      xxl: 8
     },
     itemProps: {
       labelCol: { xs: 1, sm: 1 },
@@ -213,7 +227,7 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
       colon: !1
     }
   }
-], Ne = [
+], Me = [
   {
     title: "参数字段",
     key: "paramName",
@@ -240,7 +254,7 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
     placeholder: "请输入${title}",
     defaultValue: ""
   }
-], Re = [
+], Be = [
   {
     title: "字段名字",
     key: "fieldName",
@@ -272,7 +286,8 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
       { title: "字符类型", value: "String" },
       { title: "日期类型", value: "Date" },
       { title: "时间类型", value: "Datetime" },
-      { title: "长整型", value: "Long" }
+      { title: "长整型", value: "Long" },
+      { title: "图片类型", value: "Image" }
     ]
   },
   {
@@ -345,35 +360,39 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
     minWidth: "80px",
     defaultChecked: !1
   }
-], De = { style: { flex: "1", "text-align": "left" } }, Be = /* @__PURE__ */ k("br", null, null, -1), Fe = /* @__PURE__ */ k("br", null, null, -1), Me = /* @__PURE__ */ k("br", null, null, -1), We = /* @__PURE__ */ k("br", null, null, -1), Oe = /* @__PURE__ */ k("br", null, null, -1), Ae = /* @__PURE__ */ k("span", { style: { color: "red" } }, "注：参数只支持动态报表，popup暂不支持", -1), at = /* @__PURE__ */ fe({
+], T = (t) => (be("data-v-f79bfba3"), t = t(), _e(), t), Fe = { style: { flex: "1", "text-align": "left" } }, Oe = /* @__PURE__ */ T(() => /* @__PURE__ */ C("br", null, null, -1)), We = /* @__PURE__ */ T(() => /* @__PURE__ */ C("br", null, null, -1)), ze = /* @__PURE__ */ T(() => /* @__PURE__ */ C("br", null, null, -1)), Ae = /* @__PURE__ */ T(() => /* @__PURE__ */ C("br", null, null, -1)), Je = /* @__PURE__ */ T(() => /* @__PURE__ */ C("br", null, null, -1)), Ue = /* @__PURE__ */ T(() => /* @__PURE__ */ C("span", { style: { color: "red" } }, "注：参数只支持动态报表，popup暂不支持", -1)), Ke = /* @__PURE__ */ fe({
   __name: "CgreportModal",
   emits: ["register", "success"],
   setup(t, { emit: o }) {
-    const { createMessage: l } = K(), _ = o, m = P(!0), g = P(!0), S = P(["onlCgreportItem", "onlCgreportParam"]), c = P("onlCgreportItem"), u = P(), C = P(), Q = { onlCgreportItem: C, onlCgreportParam: u }, w = z({
+    const { createMessage: l } = j(), m = w(!0), v = w(!0), f = w(["onlCgreportItem", "onlCgreportParam"]), h = w("onlCgreportItem"), c = w(), d = w(), V = { onlCgreportItem: d, onlCgreportParam: c }, k = K({
       loading: !1,
       dataSource: [],
-      columns: Ne
-    }), I = z({
+      columns: Me
+    }), I = K({
       loading: !1,
       dataSource: [],
-      columns: Re
-    }), [H, { setProps: j, resetFields: E, setFieldsValue: Z, validate: Je, validateFields: G }] = xe({
+      columns: Be
+    }), [Q, { setProps: H, resetFields: E, setFieldsValue: Z, validate: Qe, validateFields: G }] = Se({
       // labelWidth: 150,
-      schemas: qe,
-      showActionButtonGroup: !1
-    }), [X, { setModalProps: L, closeModal: Y }] = be((e) => q(this, null, function* () {
+      schemas: De,
+      showActionButtonGroup: !1,
+      // update-begin--author:liaozhiyang---date:20240509---for：【QQYUN-9230】报表图表弹窗样式调整
+      labelWidth: 100,
+      wrapperCol: null
+      // update-end--author:liaozhiyang---date:20240509---for：【QQYUN-9230】报表图表弹窗样式调整
+    }), [X, { setModalProps: L, closeModal: Y }] = ye((e) => R(this, null, function* () {
       var r, a;
-      yield re(), L({ confirmLoading: !1, showCancelBtn: e == null ? void 0 : e.showFooter, showOkBtn: e == null ? void 0 : e.showFooter }), m.value = !!(e != null && e.isUpdate), h(m) && (yield Z(B({}, e.record)), W(we, { headId: (r = e == null ? void 0 : e.record) == null ? void 0 : r.id }, w), W(Ie, { headId: (a = e == null ? void 0 : e.record) == null ? void 0 : a.id }, I)), j({ disabled: !(e != null && e.showFooter) });
-    })), [ee, te, W, oe] = Se(
+      yield re(), L({ confirmLoading: !1, showCancelBtn: e == null ? void 0 : e.showFooter, showOkBtn: e == null ? void 0 : e.showFooter }), m.value = !!(e != null && e.isUpdate), b(m) && (yield Z(B({}, e.record)), W(Te, { headId: (r = e == null ? void 0 : e.record) == null ? void 0 : r.id }, k), W(Ve, { headId: (a = e == null ? void 0 : e.record) == null ? void 0 : a.id }, I)), H({ disabled: !(e != null && e.showFooter) });
+    })), [ee, te, W, oe] = ve(
       ne,
       ae,
-      Q,
-      c,
-      S
-    ), le = ge(() => h(m) ? "编辑" : "新增");
+      V,
+      h,
+      f
+    ), le = ge(() => b(m) ? "编辑" : "新增");
     function re() {
-      return q(this, null, function* () {
-        yield E(), c.value = "onlCgreportItem", w.dataSource = [], I.dataSource = [];
+      return R(this, null, function* () {
+        yield E(), h.value = "onlCgreportItem", k.dataSource = [], I.dataSource = [];
       });
     }
     function ae(e) {
@@ -385,13 +404,13 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
       });
     }
     function ne(e) {
-      return q(this, null, function* () {
+      return R(this, null, function* () {
         try {
           L({ confirmLoading: !0 });
           let r = [], a = [], s = {};
           Object.keys(e).map((n) => {
             n == "onlCgreportItemList" ? a = e[n] : n == "onlCgreportParamList" ? r = e[n] : s[n] = e[n];
-          }), yield Pe({ head: s, params: r, items: a }, m.value), Y(), _("success");
+          }), yield Le({ head: s, params: r, items: a }, m.value), Y(), o("success");
         } finally {
           L({ confirmLoading: !1 });
         }
@@ -400,13 +419,13 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
     function ie() {
       L({ confirmLoading: !0 }), G(["cgrSql", "dbSource"]).then((e) => {
         let { cgrSql: r, dbSource: a } = e, s = "sql=" + encodeURIComponent(r);
-        a && (s += "&dbKey=" + a), Le(s).then((d) => {
-          if (d) {
+        a && (s += "&dbKey=" + a), qe(s).then((u) => {
+          if (u) {
             l.success("解析成功");
-            let { fields: n, params: p } = d, f = n.filter(($) => $.fieldName != "__row_number__"), N = C.value.getTableData(), T = O(N, f || [], "fieldName");
-            T = T.sort(($, D) => $.orderNum - D.orderNum), I.dataSource = T;
-            let se = u.value.getTableData(), R = O(se, p || [], "paramName");
-            R = R.sort(($, D) => $.orderNum - D.orderNum), w.dataSource = R;
+            let { fields: n, params: p } = u, g = n.filter((q) => q.fieldName != "__row_number__"), N = d.value.getTableData(), $ = z(N, g || [], "fieldName");
+            $ = $.sort((q, M) => q.orderNum - M.orderNum), I.dataSource = $;
+            let se = c.value.getTableData(), D = z(se, p || [], "paramName");
+            D = D.sort((q, M) => q.orderNum - M.orderNum), k.dataSource = D;
           }
         });
       }).catch(() => {
@@ -414,74 +433,74 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
         L({ confirmLoading: !1 });
       });
     }
-    function O(e, r, a) {
+    function z(e, r, a) {
       if (e.length > 0) {
-        let s = [], d = [], n = 1;
+        let s = [], u = [], n = 1;
         for (let p of r)
-          for (let f of e)
-            if (f[a] == p[a]) {
-              s.push(f), d.push(p[a]), f.orderNum > n && (n = f.orderNum);
+          for (let g of e)
+            if (g[a] == p[a]) {
+              s.push(g), u.push(p[a]), g.orderNum > n && (n = g.orderNum);
               break;
             }
         for (let p of r)
-          d.indexOf(p[a]) < 0 && (p.orderNum = ++n, s.push(p));
+          u.indexOf(p[a]) < 0 && (p.orderNum = ++n, s.push(p));
         return s;
       } else {
         let s = 0;
-        for (let d of r)
-          d.orderNum || (d.orderNum = ++s);
+        for (let u of r)
+          u.orderNum || (u.orderNum = ++s);
         return r;
       }
     }
     return (e, r) => {
-      const a = v("a-icon"), s = v("a-popover"), d = v("a-button"), n = v("a-divider"), p = v("JVxeTable"), f = v("a-tab-pane"), N = v("a-tabs");
-      return F(), M(h(ye), he(e.$attrs, {
-        onRegister: h(X),
+      const a = S("a-icon"), s = S("a-popover"), u = S("a-button"), n = S("a-divider"), p = S("JVxeTable"), g = S("a-tab-pane"), N = S("a-tabs");
+      return F(), O(b(xe), he(e.$attrs, {
+        onRegister: b(X),
         title: le.value,
         width: 1200,
         maskClosable: !1,
         defaultFullscreen: !0,
-        confirmLoading: g.value,
-        onOk: h(te)
+        confirmLoading: v.value,
+        onOk: b(te)
       }), {
-        default: b(() => [
-          y(h(_e), {
-            onRegister: h(H),
+        default: _(() => [
+          y(b(Ce), {
+            onRegister: b(Q),
             ref_key: "formRef",
             ref: oe
           }, {
-            analyseButton: b(() => [
-              k("div", De, [
+            analyseButton: _(() => [
+              C("div", Fe, [
                 y(s, {
                   title: "使用指南",
                   trigger: "hover",
                   style: { margin: "0 10px 0 6px" }
                 }, {
-                  content: b(() => [
-                    V(" 您可以键入“”作为一个参数，这里abc是参数的名称。例如："),
-                    Be,
-                    V(" select * from table where id = ${abc}。"),
-                    Fe,
-                    V(" select * from table where id like concat('%',${abc},'%')。(mysql模糊查询)"),
-                    Me,
-                    V(" select * from table where id like '%'||${abc}||'%'。(oracle模糊查询)"),
-                    We,
-                    V(" select * from table where id like '%'+${abc}+'%'。(sqlserver模糊查询)"),
+                  content: _(() => [
+                    P(" 您可以键入“”作为一个参数，这里abc是参数的名称。例如："),
                     Oe,
-                    Ae
+                    P(" select * from table where id = ${abc}。"),
+                    We,
+                    P(" select * from table where id like concat('%',${abc},'%')。(mysql模糊查询)"),
+                    ze,
+                    P(" select * from table where id like '%'||${abc}||'%'。(oracle模糊查询)"),
+                    Ae,
+                    P(" select * from table where id like '%'+${abc}+'%'。(sqlserver模糊查询)"),
+                    Je,
+                    Ue
                   ]),
-                  default: b(() => [
+                  default: _(() => [
                     y(a, { type: "question-circle" })
                   ]),
                   _: 1
                 }),
-                y(d, {
+                y(u, {
                   style: { "margin-left": "10px" },
                   type: "primary",
                   onClick: ie
                 }, {
-                  default: b(() => [
-                    V("SQL解析")
+                  default: _(() => [
+                    P("SQL解析")
                   ]),
                   _: 1
                 })
@@ -494,24 +513,24 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
             class: "cust-divider"
           }),
           y(N, {
-            activeKey: c.value,
-            "onUpdate:activeKey": r[0] || (r[0] = (T) => c.value = T),
+            activeKey: h.value,
+            "onUpdate:activeKey": r[0] || (r[0] = ($) => h.value = $),
             animated: "",
-            onChange: h(ee)
+            onChange: b(ee)
           }, {
-            default: b(() => [
-              (F(), M(f, {
+            default: _(() => [
+              (F(), O(g, {
                 tab: "动态报表配置明细",
-                key: S.value[0],
+                key: f.value[0],
                 forceRender: !0
               }, {
-                default: b(() => [
+                default: _(() => [
                   y(p, {
                     "keep-source": "",
                     dragSort: "",
                     resizable: "",
                     ref_key: "onlCgreportItem",
-                    ref: C,
+                    ref: d,
                     loading: I.loading,
                     columns: I.columns,
                     dataSource: I.dataSource,
@@ -523,21 +542,21 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
                 ]),
                 _: 1
               })),
-              (F(), M(f, {
+              (F(), O(g, {
                 tab: "报表参数",
-                key: S.value[1],
+                key: f.value[1],
                 forceRender: !0
               }, {
-                default: b(() => [
+                default: _(() => [
                   y(p, {
                     "keep-source": "",
                     resizable: "",
                     dragSort: "",
                     ref_key: "onlCgreportParam",
-                    ref: u,
-                    loading: w.loading,
-                    columns: w.columns,
-                    dataSource: w.dataSource,
+                    ref: c,
+                    loading: k.loading,
+                    columns: k.columns,
+                    dataSource: k.dataSource,
                     height: 390,
                     rowNumber: !0,
                     rowSelection: !0,
@@ -555,12 +574,17 @@ const { createConfirm: ke } = K(), we = "/online/cgreport/param/listByHeadId", I
     };
   }
 });
+const je = /* @__PURE__ */ we(Ke, [["__scopeId", "data-v-f79bfba3"]]), ut = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  default: je
+}, Symbol.toStringTag, { value: "Module" }));
 export {
-  at as _,
-  tt as b,
-  lt as c,
-  et as d,
-  ot as g,
-  Ye as l,
-  rt as s
+  je as C,
+  ut as a,
+  it as b,
+  ct as c,
+  nt as d,
+  st as g,
+  at as l,
+  dt as s
 };