@jeecg/online 3.9.0-beta2 → 3.9.1-beta

package/{useListButton-73071548.mjs → useListButton-BaTZwDMS.mjs}

@@ -26,19 +26,19 @@ var V = (l, m, s) => new Promise((B, R) => {
   }, v = (D) => D.done ? B(D.value) : Promise.resolve(D.value).then(k, g);
   v((s = s.apply(l, m)).next());
 });
-import { E as ae, s as Ie } from "./useExtendComponent-95ce0719.mjs";
+import { E as ae, s as Ie } from "./useExtendComponent-D3N4jqMD.mjs";
 import { useRoute as Me } from "vue-router";
 import { router as De } from "/@/router";
 import { ref as w, provide as Ce, onBeforeUnmount as Ne, toRaw as C, nextTick as Se, reactive as ne, computed as $e } from "vue";
 import { defHttp as _ } from "/@/utils/http/axios";
 import { useMessage as Te } from "/@/hooks/web/useMessage";
 import { filterObj as Oe } from "/@/utils/common/compUtils";
-import { u as Ue, G as Qe } from "./useCustomHook-3a17a690.mjs";
+import { u as Ue, G as Qe } from "./useCustomHook-B35kFqDB.mjs";
 import { onMountedOrActivated as Ve } from "/@/hooks/core/onMountedOrActivated";
 import { useModal as J } from "/@/components/Modal";
-import { E as le } from "./constant-fa63bd66.mjs";
+import { E as le } from "./constant-DnbpmwZg.mjs";
 import { useMultipleTabStore as Ke } from "/@/store/modules/multipleTab";
-import { u as je } from "./cgformState-d9f8ec42.mjs";
+import { u as je } from "./cgformState-CUyRXfhW.mjs";
 import { getMenus as Le } from "/@/router/menus";
 import { pick as ze } from "lodash-es";
 import { Modal as He } from "ant-design-vue";
@@ -223,8 +223,7 @@ function yt(l = {}) {
           onOk: () => De.back()
         }) : H.warning(t.message), f(!1));
       }).catch(() => {
-        let t = "请求列表数据异常!";
-        H.warning(t), f(!1);
+        H.warning("请求列表数据异常!"), f(!1);
       });
     });
   }
@@ -320,8 +319,7 @@ function yt(l = {}) {
           I(r);
         }
       }).catch(() => {
-        let o = "loadDataByExpandedRows请求列表数据异常!";
-        H.warning(o);
+        H.warning("loadDataByExpandedRows请求列表数据异常!");
       });
     } else
       return Promise.resolve();
@@ -632,7 +630,7 @@ function St(l, m, s = {}) {
         content: "是否删除选中数据",
         okText: "确认",
         cancelText: "取消",
-        onOk: () => V(this, null, function* () {
+        onOk: () => V(null, null, function* () {
           yield Z(a), l.clearSelectedRow();
         })
       });

package/{useSchemas-b074f3a1.mjs → useSchemas-svH7q1tm.mjs}

@@ -4,8 +4,8 @@ import { FolderOpenOutlined as P } from "@ant-design/icons-vue";
 import { bindMapFormSchema as c } from "/@/utils/common/compUtils";
 import { usePermission as v } from "/@/hooks/web/usePermission";
 import { rules as S } from "/@/utils/helper/validator";
-v();
-function F(d, n, t) {
+const { isDisabledAuth: R } = v();
+function F(d, n, o) {
   const e = c(
     {
       // 一列
@@ -43,8 +43,8 @@ function F(d, n, t) {
       component: "Input",
       required: !0,
       // 如果版本号为1 表示未曾修改 未曾同步 可以修改表名
-      dynamicDisabled: ({ model: o }) => o.tableVersion && o.tableVersion != 1,
-      dynamicRules: ({ model: o, schema: a }) => [
+      dynamicDisabled: ({ model: t }) => t.tableVersion && t.tableVersion != 1,
+      dynamicRules: ({ model: t, schema: a }) => [
         {
           validator: (s, p) => new Promise((i, u) => {
             /[\u4E00-\u9FA5]/g.test(p) && u("不允许输入中文"), i();
@@ -57,7 +57,7 @@ function F(d, n, t) {
           })
         },
         // update-end--author:liaozhiyang---date:20240603---for：【TV360X-631】表名字段名表描述字段备注长度校验
-        ...S.duplicateCheckRule("onl_cgform_head", "table_name", o, a, !0)
+        ...S.duplicateCheckRule("onl_cgform_head", "table_name", t, a, !0)
       ]
     }),
     e({
@@ -66,7 +66,7 @@ function F(d, n, t) {
       component: "Input",
       required: !0,
       // update-begin--author:liaozhiyang---date:20240603---for：【TV360X-631】表名字段名表描述字段备注长度校验
-      dynamicRules: ({ model: o, schema: a }) => [
+      dynamicRules: ({ model: t, schema: a }) => [
         {
           validator: (s, p) => new Promise((i, u) => {
             p.length > 200 && u("表描述最长200个字"), i();
@@ -86,7 +86,7 @@ function F(d, n, t) {
           { label: "主表", value: 2 },
           { label: "附表", value: 3 }
         ],
-        onChange: t.onTableTypeChange,
+        onChange: o.onTableTypeChange,
         allowClear: !1
       }
     }),
@@ -131,7 +131,7 @@ function F(d, n, t) {
       colProps: { xs: 24, sm: 3 },
       itemProps: {
         labelCol: { xs: 24, sm: 7 },
-        wrapperCol: { xs: 24, sm: 24 - 7 }
+        wrapperCol: { xs: 24, sm: 17 }
       },
       ifShow: r
     }),
@@ -194,17 +194,17 @@ function F(d, n, t) {
         allowClear: !1
       },
       // 单表时禁用该字段
-      dynamicDisabled: ({ model: o }) => o.tableType === 1,
+      dynamicDisabled: ({ model: t }) => t.tableType === 1,
       // update-begin--author:liaozhiyang---date:20231123---for：【QQYUN-7073】提示ERP、内嵌子表不支持联合查询
       dynamicRules() {
         return [
           {
-            validator({}, o) {
+            validator({}, t) {
               const a = n.value;
-              if (o === "erp") {
+              if (t === "erp") {
                 if (a.joinQuery)
                   return Promise.reject("ERP不支持联合查询功能");
-              } else if (o === "innerTable" && a.joinQuery)
+              } else if (t === "innerTable" && a.joinQuery)
                 return Promise.reject("内嵌子表不支持联合查询功能");
               return Promise.resolve();
             }
@@ -280,21 +280,21 @@ function F(d, n, t) {
           { label: "是", value: "Y" },
           { label: "否", value: "N" }
         ],
-        onChange: t.onIsTreeChange,
+        onChange: o.onIsTreeChange,
         allowClear: !1
       },
-      dynamicRules({ model: o }) {
+      dynamicRules({ model: t }) {
         return [
           {
             validator({}, a) {
-              return a === "Y" && (o.tableType == 2 || o.tableType == 3) ? Promise.reject("主表和附表不支持树类型！") : Promise.resolve();
+              return a === "Y" && (t.tableType == 2 || t.tableType == 3) ? Promise.reject("主表和附表不支持树类型！") : Promise.resolve();
             }
           }
         ];
       },
       // update-begin--author:liaozhiyang---date:20240604---for：【TV360X-125】选择主表和附表时隐藏树表配置
-      show({ model: o, values: a }) {
-        return o.tableType == 2 || o.tableType == 3 ? (o.isTree = "N", t.onIsTreeChange("N"), !1) : !0;
+      show({ model: t, values: a }) {
+        return t.tableType == 2 || t.tableType == 3 ? (t.isTree = "N", o.onIsTreeChange("N"), !1) : !0;
       }
       // update-end--author:liaozhiyang---date:20240604---for：【TV360X-125】选择主表和附表时隐藏树表配置
     }),
@@ -336,13 +336,13 @@ function F(d, n, t) {
           placeholder: " ",
           allowClear: !1
         },
-        ifShow: t.ifShowOfSubTableStr
+        ifShow: o.ifShowOfSubTableStr
       },
       "one"
     )
   ];
-  function r({ field: o, model: a }) {
-    switch (o) {
+  function r({ field: t, model: a }) {
+    switch (t) {
       case "relationType":
       case "tabOrderNum":
         return a.tableType === 3;
@@ -357,8 +357,8 @@ function F(d, n, t) {
   }
   return { formSchemas: l };
 }
-function R(d, n) {
-  const t = c(
+function N(d, n) {
+  const o = c(
     {
       left: {
         colProps: { xs: 24, sm: 7 },
@@ -381,7 +381,7 @@ function R(d, n) {
   );
   return { formSchemas: [
     // 弹窗
-    t(
+    o(
       {
         label: "弹窗默认全屏",
         field: "modelFullscreen",
@@ -396,7 +396,7 @@ function R(d, n) {
       },
       "left"
     ),
-    t(
+    o(
       {
         label: "弹窗宽度",
         field: "modalMinWidth",
@@ -412,7 +412,7 @@ function R(d, n) {
       "right"
     ),
     //----------------------------表单评论 begin-----------------------------------------
-    t(
+    o(
       {
         label: "开启表单评论",
         field: "commentStatus",
@@ -428,7 +428,7 @@ function R(d, n) {
       "left"
     ),
     // 此处为占位符
-    t(
+    o(
       {
         label: "",
         field: "commentStatus",
@@ -438,7 +438,7 @@ function R(d, n) {
       "right"
     ),
     // 启用联合查询
-    t(
+    o(
       {
         label: "启用联合查询",
         field: "joinQuery",
@@ -455,7 +455,7 @@ function R(d, n) {
       "left"
     ),
     // 此处为占位符
-    t(
+    o(
       {
         label: "",
         field: "joinQuery",
@@ -465,7 +465,7 @@ function R(d, n) {
       "right"
     ),
     // 积木报表打印
-    t(
+    o(
       {
         label: "集成积木报表",
         field: "reportPrintShow",
@@ -481,7 +481,7 @@ function R(d, n) {
       },
       "left"
     ),
-    t(
+    o(
       {
         label: "报表地址",
         field: "reportPrintUrl",
@@ -535,7 +535,7 @@ function R(d, n) {
     // ),
     // update-end--author:liaozhiyang---date:20231213---for：【QQYUN-7421】vue3先注释集成设计表单功能
     // 列表操作列
-    t(
+    o(
       {
         label: "固定操作列",
         field: "tableFixedAction",
@@ -551,7 +551,7 @@ function R(d, n) {
       },
       "left"
     ),
-    t(
+    o(
       {
         label: "固定方式",
         field: "tableFixedActionType",
@@ -569,9 +569,36 @@ function R(d, n) {
       },
       "right"
     ),
+    // 列宽拖动调整
+    o(
+      {
+        label: "列宽拖动",
+        field: "canResizeColumn",
+        component: "RadioButtonGroup",
+        componentProps: {
+          options: [
+            { label: "开启", value: 1 },
+            { label: "关闭", value: 0 }
+          ],
+          buttonStyle: "solid"
+        },
+        defaultValue: 0
+      },
+      "left"
+    ),
+    // 此处为占位符
+    o(
+      {
+        label: "",
+        field: "canResizeColumn",
+        component: "InputNumber",
+        render: () => ""
+      },
+      "right"
+    ),
     //--------------------------表单评论 end-----------------------------------------
     // update-begin--author:liaozhiyang---date:20240329---for：【QQYUN-7872】online表单label较长优化
-    t(
+    o(
       {
         label: "表单Label长度",
         field: "formLabelLengthShow",
@@ -587,7 +614,7 @@ function R(d, n) {
       },
       "left"
     ),
-    t(
+    o(
       {
         label: "Label长度",
         field: "formLabelLength",
@@ -637,7 +664,7 @@ function R(d, n) {
     // ),
   ] };
 }
-function N(d, n, t) {
+function D(d, n, o) {
   const e = c(
     {
       // 一列
@@ -666,18 +693,18 @@ function N(d, n, t) {
       }
     },
     "one"
-  ), l = b(() => t.value ? "one" : "tow");
+  ), l = b(() => o.value ? "one" : "tow");
   return { formSchemas: b(() => [
     e(
       {
         label: "代码生成目录",
         field: "projectPath",
-        render: ({ model: o, field: a }) => m(
+        render: ({ model: t, field: a }) => m(
           f.Search,
           {
-            value: o[a],
+            value: t[a],
             onChange: (s) => {
-              o[a] = s.target.value, n.onProjectPathChange(s);
+              t[a] = s.target.value, n.onProjectPathChange(s);
             },
             onSearch: n.onProjectPathSearch
           },
@@ -698,7 +725,7 @@ function N(d, n, t) {
         required: !0
         // 如果版本号为1 表示未曾修改 未曾同步 可以修改表名
       },
-      t.value ? "one" : "towOne"
+      o.value ? "one" : "towOne"
     ),
     e(
       {
@@ -806,7 +833,7 @@ function N(d, n, t) {
   ]) };
 }
 export {
-  R as a,
-  N as b,
+  N as a,
+  D as b,
   F as u
 };

package/{useTableSync-dbfba20e.mjs → useTableSync-BAWujyoc.mjs}

@@ -15,7 +15,7 @@ var y = (f, m, e) => new Promise((o, u) => {
   s((e = e.apply(f, m)).next());
 });
 import { inject as k, ref as w, computed as g, nextTick as v } from "vue";
-import { V as N } from "./cgform.data-0ca62d09.mjs";
+import { V as N } from "./cgform.data-CviSPXEg.mjs";
 import { pick as R } from "lodash-es";
 function L(f) {
   const m = k("tables"), e = k("fullScreenRef"), o = w(), u = w(!1), n = w([]), T = g(() => ({

package/{utils-9fce7606.mjs → utils-DcQ65Qmw.mjs}

@@ -1,4 +1,4 @@
-import { E as e } from "./cgform.data-0ca62d09.mjs";
+import { E as e } from "./cgform.data-CviSPXEg.mjs";
 function i(s) {
   let o = {};
   if (s.extConfigJson)

package/AppLogin-bf783eab.mjs

@@ -1,287 +0,0 @@
-var L = (P, x, u) => new Promise((a, d) => {
-  var s = (c) => {
-    try {
-      g(u.next(c));
-    } catch (l) {
-      d(l);
-    }
-  }, w = (c) => {
-    try {
-      g(u.throw(c));
-    } catch (l) {
-      d(l);
-    }
-  }, g = (c) => c.done ? a(c.value) : Promise.resolve(c.value).then(s, w);
-  g((u = u.apply(P, x)).next());
-});
-import { defineComponent as Q, ref as r, reactive as X, onMounted as Y, resolveComponent as T, openBlock as S, createElementBlock as F, Fragment as Z, createElementVNode as e, createVNode as t, toDisplayString as R, unref as p, withDirectives as m, vShow as f, createCommentVNode as U, withCtx as v, withModifiers as oo, createTextVNode as eo, toRaw as no, nextTick as to } from "vue";
-import io from "./AppLoginHeader-55594326.mjs";
-import lo from "./AppRegister-043efc45.mjs";
-import ro from "./AccountLoginForm-634a76b1.mjs";
-import so from "./PhoneLoginForm-4a9d7869.mjs";
-import co from "./AppForgetPassword-f9a6258a.mjs";
-import { useI18n as ao } from "/@/hooks/web/useI18n";
-import { createFromIconfontCN as uo, WechatFilled as go } from "@ant-design/icons-vue";
-import { useMessage as po } from "/@/hooks/web/useMessage";
-import { useUserStore as mo } from "/@/store/modules/user";
-import fo from "./AppTenant-c7bb8700.mjs";
-import { router as V } from "/@/router";
-import vo from "./AppThirdForm-5e7e1144.mjs";
-import { useLocale as _o } from "/@/locales/useLocale";
-import { PageEnum as ho } from "/@/enums/pageEnum";
-import { _ as yo } from "./index-740b2c4a.mjs";
-import "/@/assets/images/logo.png";
-import "/@/api/sys/user";
-import "/@/views/sys/login/useLogin";
-import "./AppNameEmail-54026ea8.mjs";
-import "/@/components/jeecg/captcha/CaptchaModal.vue";
-import "/@/components/Modal";
-import "/@/enums/exceptionEnum";
-import "/@/assets/images/checkcode.png";
-import "/@/utils/http/axios";
-import "ant-design-vue";
-import "/@/components/CountDown";
-import "/@/hooks/setting";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
-const Lo = {
-  key: 0,
-  class: "login-box"
-}, To = { class: "login-subject" }, wo = { class: "flex-row align-items-center margin-top10" }, Ao = { class: "login-title" }, bo = { class: "content-box" }, ko = {
-  key: 0,
-  class: "text-center"
-}, Co = { class: "login-other" }, Ro = { style: { width: "100%", display: "flex" } }, xo = { class: "aui-third-login" }, Io = { class: "login-language" }, So = /* @__PURE__ */ Q({
-  __name: "AppLogin",
-  setup(P) {
-    const { changeLocale: x, getLocale: u } = _o(), a = r(), d = mo(), s = r("accountLogin");
-    uo({
-      scriptUrl: "//at.alicdn.com/t/font_2316098_umqusozousr.js"
-    });
-    const w = r(), g = r(), c = r(), { t: l } = ao(), i = r("login");
-    r(), X({
-      phone: "",
-      smscode: ""
-    });
-    const { notification: D, createErrorModal: Fo } = po(), A = r("zh_CN"), b = r(!1), _ = r(!1);
-    function H() {
-      i.value = "register", setTimeout(() => {
-        w.value.clearValidate();
-      }, 300);
-    }
-    function E() {
-      i.value = "login", s.value = "accountLogin";
-    }
-    function N(o) {
-      i.value = "login", s.value = "accountLogin", setTimeout(() => {
-        g.value.setAccountData(o);
-      }, 300);
-    }
-    function B(o) {
-      s.value = o;
-    }
-    function $() {
-      i.value = "forgetPwd";
-    }
-    function I(o) {
-      return L(this, null, function* () {
-        var h, y;
-        const n = no(d.getLoginInfo), { tenantList: k } = n;
-        if (!k || k.length === 0)
-          i.value = "tenant";
-        else {
-          D.success({
-            message: l("sys.login.loginSuccessTitle"),
-            description: `${l("sys.login.loginSuccessDesc")}: ${o}`,
-            duration: 3
-          });
-          let C = (y = (h = V.currentRoute.value) == null ? void 0 : h.query) == null ? void 0 : y.redirect;
-          if (C) {
-            window.open(decodeURIComponent(C), "_self");
-            return;
-          }
-          yield V.replace(d.getUserInfo && d.getUserInfo.homePath || ho.BASE_HOME), M();
-        }
-      });
-    }
-    function M() {
-      window.location.reload();
-    }
-    function j(o) {
-      a.value.onThirdLogin(o);
-    }
-    function q(o) {
-      return L(this, null, function* () {
-        yield x(o);
-      });
-    }
-    function O({ key: o }) {
-      A.value = o, p(u) !== o && q(o);
-    }
-    function W(o) {
-      to(() => {
-        o.loginType != "thirdLogin" && (b.value = !0, a.value.hideBindThirdAccount()), o.loginType === "login" && (s.value = "phoneLogin"), i.value = o.loginType;
-      });
-    }
-    function G(o) {
-      return L(this, null, function* () {
-        _.value = !0, yield a.value.bindThirdAccount(o), _.value = !1;
-      });
-    }
-    function J(o) {
-      return L(this, null, function* () {
-        _.value = !0, yield a.value.createAccountBindThird(o), _.value = !1;
-      });
-    }
-    return Y(() => {
-      let o = document.getElementById("app");
-      o.style.height = "auto";
-      let n = document.getElementsByTagName("body")[0].style;
-      n.backgroundColor = "#f2f5f7";
-    }), (o, n) => {
-      const k = T("a-spin"), h = T("Icon"), y = T("a-menu-item"), C = T("a-menu"), K = T("a-dropdown");
-      return S(), F(Z, null, [
-        i.value === "login" ? (S(), F("div", Lo, [
-          e("div", To, [
-            t(io),
-            e("div", wo, [
-              e("div", Ao, R(s.value === "accountLogin" ? p(l)("sys.login.signInFormTitle") : p(l)("sys.login.mobileSignInFormTitle")), 1)
-            ]),
-            e("div", bo, [
-              m(e("div", null, [
-                t(ro, {
-                  ref_key: "accountLoginRef",
-                  ref: g,
-                  onLogin: B,
-                  onForgetPwd: $,
-                  onLoginSuccess: I
-                }, null, 512)
-              ], 512), [
-                [f, s.value === "accountLogin"]
-              ]),
-              m(e("div", null, [
-                t(so, {
-                  onLogin: B,
-                  onLoginSuccess: I,
-                  bindThirdAccount: b.value,
-                  onBindThirdPhone: G
-                }, null, 8, ["bindThirdAccount"])
-              ], 512), [
-                [f, s.value === "phoneLogin"]
-              ]),
-              b.value ? U("", !0) : (S(), F("div", ko, [
-                e("div", Co, R(p(l)("sys.login.otherSignIn")), 1),
-                e("div", Ro, [
-                  e("div", xo, [
-                    e("a", {
-                      title: "微信",
-                      onClick: n[0] || (n[0] = (z) => j("wechat_open"))
-                    }, [
-                      t(p(go), { style: { color: "rgb(75, 176, 79)" } })
-                    ])
-                  ])
-                ]),
-                n[3] || (n[3] = e("div", { class: "line" }, null, -1)),
-                e("div", {
-                  class: "register-account pointer",
-                  onClick: H
-                }, R(p(l)("sys.login.registerButton")), 1)
-              ]))
-            ])
-          ])
-        ])) : U("", !0),
-        m(e("div", null, [
-          t(k, { spinning: _.value }, {
-            default: v(() => [
-              t(lo, {
-                ref_key: "appRegisterRef",
-                ref: w,
-                onReturnLogin: E,
-                bindThirdAccount: b.value,
-                onLoginAccount: N,
-                onBindThirdAccount: J
-              }, null, 8, ["bindThirdAccount"])
-            ]),
-            _: 1
-          }, 8, ["spinning"])
-        ], 512), [
-          [f, i.value === "register"]
-        ]),
-        m(e("div", null, [
-          t(co, {
-            ref_key: "appForgetPwdRef",
-            ref: c,
-            onReturnLogin: E,
-            onLoginAccount: N
-          }, null, 512)
-        ], 512), [
-          [f, i.value === "forgetPwd"]
-        ]),
-        m(e("div", null, [
-          t(fo, { onSuccess: M })
-        ], 512), [
-          [f, i.value === "tenant"]
-        ]),
-        m(e("div", Io, [
-          t(h, {
-            icon: "ant-design:global-outlined",
-            style: { "font-size": "13px", color: "#9e9e9e" }
-          }),
-          t(K, {
-            trigger: ["click"],
-            placement: "top"
-          }, {
-            overlay: v(() => [
-              t(C, {
-                value: A.value,
-                "onUpdate:value": n[2] || (n[2] = (z) => A.value = z),
-                onClick: O
-              }, {
-                default: v(() => [
-                  t(y, { key: "zh_CN" }, {
-                    default: v(() => n[4] || (n[4] = [
-                      e("span", null, "简体中文", -1)
-                    ])),
-                    _: 1
-                  }),
-                  t(y, { key: "en" }, {
-                    default: v(() => n[5] || (n[5] = [
-                      e("span", null, "English", -1)
-                    ])),
-                    _: 1
-                  })
-                ]),
-                _: 1
-              }, 8, ["value"])
-            ]),
-            default: v(() => [
-              e("span", {
-                class: "language-drop pointer",
-                onClick: n[1] || (n[1] = oo(() => {
-                }, ["prevent"]))
-              }, [
-                eo(R(A.value === "zh_CN" ? "CN" : "EN") + " ", 1),
-                t(h, {
-                  icon: "ant-design:down-outlined",
-                  style: { color: "#9e9e9e", "font-size": "13px" }
-                })
-              ])
-            ]),
-            _: 1
-          })
-        ], 512), [
-          [f, i.value !== "thirdLogin"]
-        ]),
-        t(vo, {
-          ref_key: "thirdModalRef",
-          ref: a,
-          onType: W,
-          onLoginSuccess: I
-        }, null, 512)
-      ], 64);
-    };
-  }
-});
-const ae = /* @__PURE__ */ yo(So, [["__scopeId", "data-v-1103e34e"]]);
-export {
-  ae as default
-};