@jeecg/online 3.6.2-GA → 3.7.0-beta

package/{CustomButtonList-b9b27a93.mjs → CustomButtonList-37639061.mjs}

@@ -1,44 +1,44 @@
-var K = Object.defineProperty;
-var I = Object.getOwnPropertySymbols;
-var x = Object.prototype.hasOwnProperty, J = Object.prototype.propertyIsEnumerable;
-var F = (e, o, t) => o in e ? K(e, o, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[o] = t, R = (e, o) => {
+var H = Object.defineProperty;
+var M = Object.getOwnPropertySymbols;
+var K = Object.prototype.hasOwnProperty, Z = Object.prototype.propertyIsEnumerable;
+var P = (e, o, t) => o in e ? H(e, o, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[o] = t, T = (e, o) => {
   for (var t in o || (o = {}))
-    x.call(o, t) && F(e, t, o[t]);
-  if (I)
-    for (var t of I(o))
-      J.call(o, t) && F(e, t, o[t]);
+    K.call(o, t) && P(e, t, o[t]);
+  if (M)
+    for (var t of M(o))
+      Z.call(o, t) && P(e, t, o[t]);
   return e;
 };
-var _ = (e, o, t) => new Promise((C, f) => {
-  var b = (i) => {
+var y = (e, o, t) => new Promise((m, p) => {
+  var g = (r) => {
     try {
-      s(t.next(i));
-    } catch (u) {
-      f(u);
+      u(t.next(r));
+    } catch (c) {
+      p(c);
     }
-  }, c = (i) => {
+  }, s = (r) => {
     try {
-      s(t.throw(i));
-    } catch (u) {
-      f(u);
+      u(t.throw(r));
+    } catch (c) {
+      p(c);
     }
-  }, s = (i) => i.done ? C(i.value) : Promise.resolve(i.value).then(b, c);
-  s((t = t.apply(e, o)).next());
+  }, u = (r) => r.done ? m(r.value) : Promise.resolve(r.value).then(g, s);
+  u((t = t.apply(e, o)).next());
 });
-import { defineComponent as Q, ref as A, reactive as W, computed as X, nextTick as Y, resolveComponent as r, openBlock as M, createBlock as P, withCtx as l, createVNode as a, createTextVNode as B, createElementBlock as Z, createCommentVNode as S, normalizeProps as ee, guardReactiveProps as oe } from "vue";
+import { defineComponent as J, ref as A, reactive as Q, computed as W, nextTick as X, resolveComponent as i, openBlock as S, createBlock as R, withCtx as l, createVNode as a, createTextVNode as B, createElementBlock as Y, createCommentVNode as F, normalizeProps as ee, guardReactiveProps as oe } from "vue";
 import { u as te } from "./useOnlineTest-e4bd8be3.mjs";
 import { useListPage as ne } from "/@/hooks/system/useListPage";
 import { BasicTable as le, TableAction as ae } from "/@/components/Table";
-import { BasicModal as ie, useModalInner as re, useModal as se } from "/@/components/Modal";
-import { BasicForm as ce, useForm as ue } from "/@/components/Form";
-import { defHttp as v } from "/@/utils/http/axios";
-import { _ as de } from "./index-73993b18.mjs";
+import { BasicModal as re, useModalInner as ie, useModal as ue } from "/@/components/Modal";
+import { BasicForm as se, useForm as ce } from "/@/components/Form";
+import { defHttp as C } from "/@/utils/http/axios";
+import { _ as de } from "./index-173949bb.mjs";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "/@/hooks/web/useMessage";
 import "vue-router";
-const me = (e, o) => v.get({ url: "/online/cgform/button/list/" + e, params: o });
+const me = (e, o) => C.get({ url: "/online/cgform/button/list/" + e, params: o });
 function D(e) {
-  return v.delete(
+  return C.delete(
     {
       url: "/online/cgform/button/deleteBatch",
       params: {
@@ -48,7 +48,7 @@ function D(e) {
     { joinParamsToUrl: !0 }
   );
 }
-const pe = (e, o) => o ? v.put({ url: "/online/cgform/button/edit", params: e }) : v.post({ url: "/online/cgform/button/add", params: e }), fe = [
+const pe = (e, o) => o ? C.put({ url: "/online/cgform/button/edit", params: e }) : C.post({ url: "/online/cgform/button/add", params: e }), fe = [
   { title: "按钮编码", align: "center", dataIndex: "buttonCode" },
   { title: "按钮名称", align: "center", dataIndex: "buttonName" },
   {
@@ -80,7 +80,16 @@ const pe = (e, o) => o ? v.put({ url: "/online/cgform/button/edit", params: e })
     label: "按钮编码",
     field: "buttonCode",
     component: "Input",
-    required: !0
+    required: !0,
+    // update-begin--author:liaozhiyang---date:20240521---for：【TV360X-139】按钮编码加上正则校验
+    dynamicRules: () => [
+      {
+        validator: (e, o) => new Promise((t, m) => {
+          /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(o) ? t() : m("编码只能包含字母、数字、下划线 (_) 和美元符号 ($)且不能以数字开头");
+        })
+      }
+    ]
+    // update-end--author:liaozhiyang---date:20240521---for：【TV360X-139】按钮编码加上正则校验
   },
   {
     label: "按钮名称",
@@ -137,13 +146,22 @@ const pe = (e, o) => o ? v.put({ url: "/online/cgform/button/edit", params: e })
   {
     label: "按钮图标",
     field: "buttonIcon",
-    component: "Input",
-    helpMessage: "a-icon type"
+    // update-begin--author:liaozhiyang---date:20240528---for：【TV360X-136】按钮图标改成图标组件选择
+    component: "IconPicker",
+    componentProps: {
+      clearSelect: !0,
+      iconPrefixSave: !1
+    },
+    // update-end--author:liaozhiyang---date:20240528---for：【TV360X-136】按钮图标改成图标组件选择
+    ifShow: ({ values: e, model: o }) => e.buttonStyle == "button" || e.buttonStyle == "form" ? !0 : (o.buttonIcon = null, !1)
   },
   {
     label: "表达式",
     field: "exp",
-    component: "Input"
+    component: "Input",
+    // update-begin--author:liaozhiyang---date:20240603---for：【TV360X-89】自定义按钮样式是link时，展示表达式配置
+    ifShow: ({ values: e, model: o }) => e.buttonStyle == "link" ? !0 : (o.exp = "", !1)
+    // update-end--author:liaozhiyang---date:20240603---for：【TV360X-89】自定义按钮样式是link时，展示表达式配置
   },
   {
     label: "按钮状态",
@@ -157,12 +175,12 @@ const pe = (e, o) => o ? v.put({ url: "/online/cgform/button/edit", params: e })
     },
     defaultValue: "1"
   }
-], ge = Q({
+], ge = J({
   name: "CustomButtonList",
-  components: { BasicModal: ie, BasicTable: le, TableAction: ae, BasicForm: ce },
+  components: { BasicModal: re, BasicTable: le, TableAction: ae, BasicForm: se },
   emits: ["register"],
   setup() {
-    const e = A(""), { doRequest: o, doDeleteRecord: t, tableContext: C } = ne({
+    const e = A(""), { doRequest: o, doDeleteRecord: t, tableContext: m } = ne({
       tableProps: {
         api: (n) => me(e.value, n),
         columns: fe,
@@ -172,64 +190,64 @@ const pe = (e, o) => o ? v.put({ url: "/online/cgform/button/edit", params: e })
           return Object.assign(n, { column: "orderNum", order: "asc" });
         }
       }
-    }), [f, { reload: b }, { rowSelection: c, selectedRowKeys: s }] = C, [i, { closeModal: u }] = re((n) => _(this, null, function* () {
-      e.value = n.row.id, b();
-    })), { aiTestMode: y, genButtons: w } = te(), [k, g] = se(), d = A(!1), m = W({
+    }), [p, { reload: g }, { rowSelection: s, selectedRowKeys: u }] = m, [r, { closeModal: c }] = ie((n) => y(this, null, function* () {
+      e.value = n.row.id, g();
+    })), { aiTestMode: w, genButtons: v } = te(), [k, _] = ue(), d = A(!1), f = Q({
       onRegister: k,
-      title: X(() => d != null && d.value ? "修改" : "新增"),
+      title: W(() => d != null && d.value ? "修改" : "新增"),
       width: 800,
       confirmLoading: !1,
-      onOk: q,
-      onCancel: g.closeModal
+      onOk: U,
+      onCancel: _.closeModal
     });
-    let p = {};
-    const [N, { resetFields: E, setFieldsValue: L, validate: V }] = ue({
+    let b = {};
+    const [N, { resetFields: E, setFieldsValue: L, validate: V }] = ce({
       schemas: be,
       showActionButtonGroup: !1
     });
-    function T(n) {
-      return _(this, null, function* () {
-        var h;
-        d.value = n.isUpdate, p = R({}, (h = n.record) != null ? h : {}), g.openModal(), yield Y(), yield E(), L(p);
+    function h(n) {
+      return y(this, null, function* () {
+        var I;
+        d.value = n.isUpdate, b = T({}, (I = n.record) != null ? I : {}), _.openModal(), yield X(), yield E(), L(b);
       });
     }
-    function j() {
-      T({ isUpdate: !1 });
+    function $() {
+      h({ isUpdate: !1 });
     }
-    function O(n) {
-      T({ isUpdate: !0, record: n });
+    function j(n) {
+      h({ isUpdate: !0, record: n });
     }
-    function G() {
-      u();
+    function O() {
+      c();
     }
-    function U() {
-      w(e.value);
+    function z() {
+      v(e.value);
     }
-    function $() {
-      return _(this, null, function* () {
-        o(() => D(s.value));
+    function G() {
+      return y(this, null, function* () {
+        o(() => D(u.value));
       });
     }
-    function q() {
-      return _(this, null, function* () {
+    function U() {
+      return y(this, null, function* () {
         try {
-          m.confirmLoading = !0;
+          f.confirmLoading = !0;
           let n = yield V();
-          n = Object.assign({ cgformHeadId: e.value }, p, n), yield pe(n, d.value), b(), g.closeModal();
+          n = Object.assign({ cgformHeadId: e.value }, b, n), yield pe(n, d.value), g(), _.closeModal();
         } finally {
-          m.confirmLoading = !1;
+          f.confirmLoading = !1;
         }
       });
     }
-    function z(n) {
+    function q(n) {
       return [
         {
           label: "编辑",
-          onClick: () => O(n)
+          onClick: () => j(n)
         }
       ];
     }
-    function H(n) {
+    function x(n) {
       return [
         {
           label: "删除",
@@ -242,28 +260,28 @@ const pe = (e, o) => o ? v.put({ url: "/online/cgform/button/edit", params: e })
       ];
     }
     return {
-      onAdd: j,
-      onBatchDelete: $,
-      aiTestMode: y,
-      onGenButtons: U,
-      registerModal: i,
-      registerTable: f,
-      selectedRowKeys: s,
-      rowSelection: c,
-      onCancel: G,
-      getTableAction: z,
-      getDropDownAction: H,
+      onAdd: $,
+      onBatchDelete: G,
+      aiTestMode: w,
+      onGenButtons: z,
+      registerModal: r,
+      registerTable: p,
+      selectedRowKeys: u,
+      rowSelection: s,
+      onCancel: O,
+      getTableAction: q,
+      getDropDownAction: x,
       registerForm: N,
-      formModalProps: m
+      formModalProps: f
     };
   }
 }), _e = {
   key: 0,
   style: { float: "left" }
 };
-function Be(e, o, t, C, f, b) {
-  const c = r("a-button"), s = r("a-icon"), i = r("a-menu-item"), u = r("a-menu"), y = r("a-dropdown"), w = r("TableAction"), k = r("BasicTable"), g = r("BasicForm"), d = r("a-spin"), m = r("BasicModal");
-  return M(), P(m, {
+function ye(e, o, t, m, p, g) {
+  const s = i("a-button"), u = i("a-icon"), r = i("a-menu-item"), c = i("a-menu"), w = i("a-dropdown"), v = i("TableAction"), k = i("BasicTable"), _ = i("BasicForm"), d = i("a-spin"), f = i("BasicModal");
+  return S(), R(f, {
     onRegister: e.registerModal,
     title: "自定义按钮",
     width: 1200,
@@ -271,20 +289,20 @@ function Be(e, o, t, C, f, b) {
     onCancel: e.onCancel
   }, {
     footer: l(() => [
-      a(c, { onClick: e.onCancel }, {
+      a(s, { onClick: e.onCancel }, {
         default: l(() => [
           B("关闭")
         ]),
         _: 1
       }, 8, ["onClick"]),
-      e.aiTestMode ? (M(), Z("div", _e, [
-        a(c, { onClick: e.onGenButtons }, {
+      e.aiTestMode ? (S(), Y("div", _e, [
+        a(s, { onClick: e.onGenButtons }, {
           default: l(() => [
             B("生成测试数据")
           ]),
           _: 1
         }, 8, ["onClick"])
-      ])) : S("", !0)
+      ])) : F("", !0)
     ]),
     default: l(() => [
       a(k, {
@@ -292,7 +310,7 @@ function Be(e, o, t, C, f, b) {
         rowSelection: e.rowSelection
       }, {
         tableTitle: l(() => [
-          a(c, {
+          a(s, {
             onClick: e.onAdd,
             type: "primary",
             preIcon: "ant-design:plus"
@@ -302,16 +320,16 @@ function Be(e, o, t, C, f, b) {
             ]),
             _: 1
           }, 8, ["onClick"]),
-          e.selectedRowKeys.length > 0 ? (M(), P(y, { key: 0 }, {
+          e.selectedRowKeys.length > 0 ? (S(), R(w, { key: 0 }, {
             overlay: l(() => [
-              a(u, null, {
+              a(c, null, {
                 default: l(() => [
-                  a(i, {
+                  a(r, {
                     key: "1",
                     onClick: e.onBatchDelete
                   }, {
                     default: l(() => [
-                      a(s, { type: "delete" }),
+                      a(u, { type: "delete" }),
                       B(" 删除 ")
                     ]),
                     _: 1
@@ -321,32 +339,32 @@ function Be(e, o, t, C, f, b) {
               })
             ]),
             default: l(() => [
-              a(c, { style: { "margin-left": "8px" } }, {
+              a(s, { style: { "margin-left": "8px" } }, {
                 default: l(() => [
                   B(" 批量操作 "),
-                  a(s, { type: "down" })
+                  a(u, { type: "down" })
                 ]),
                 _: 1
               })
             ]),
             _: 1
-          })) : S("", !0)
+          })) : F("", !0)
         ]),
-        action: l(({ record: p }) => [
-          a(w, {
-            actions: e.getTableAction(p),
-            dropDownActions: e.getDropDownAction(p)
+        action: l(({ record: b }) => [
+          a(v, {
+            actions: e.getTableAction(b),
+            dropDownActions: e.getDropDownAction(b)
           }, null, 8, ["actions", "dropDownActions"])
         ]),
         _: 1
       }, 8, ["onRegister", "rowSelection"]),
-      a(m, ee(oe(e.formModalProps)), {
+      a(f, ee(oe(e.formModalProps)), {
         default: l(() => [
           a(d, {
             spinning: e.formModalProps.confirmLoading
           }, {
             default: l(() => [
-              a(g, { onRegister: e.registerForm }, null, 8, ["onRegister"])
+              a(_, { onRegister: e.registerForm }, null, 8, ["onRegister"])
             ]),
             _: 1
           }, 8, ["spinning"])
@@ -357,7 +375,7 @@ function Be(e, o, t, C, f, b) {
     _: 1
   }, 8, ["onRegister", "onCancel"]);
 }
-const Pe = /* @__PURE__ */ de(ge, [["render", Be]]);
+const Re = /* @__PURE__ */ de(ge, [["render", ye]]);
 export {
-  Pe as default
+  Re as default
 };