@jeecg/online 3.7.0-beta → 3.7.1-RC

package/{OnlineTabFormDetail-bbf23caa.mjs → OnlineTabFormDetail-8d0c40c0.mjs}

@@ -31,13 +31,13 @@ import { Loading as le } from "/@/components/Loading";
 import { getToken as me } from "/@/utils/auth";
 import { goJmReportViewPage as se } from "/@/utils";
 import { PrinterOutlined as pe } from "@ant-design/icons-vue";
-import ue from "./DetailForm-4aa2570b.mjs";
-import ce from "./OnlineSubFormDetail-03f8ee5c.mjs";
-import { k as fe } from "./useExtendComponent-bb7cca20.mjs";
+import ue from "./DetailForm-deecbf3d.mjs";
+import ce from "./OnlineSubFormDetail-58e896ce.mjs";
+import { k as fe } from "./useExtendComponent-dcae5c78.mjs";
 import { defHttp as de } from "/@/utils/http/axios";
 import { E as be, T as ge } from "./constant-fa63bd66.mjs";
 import { useAppInject as he } from "/@/hooks/web/useAppInject";
-import { _ as _e } from "./index-173949bb.mjs";
+import { _ as _e } from "./index-1d1a6e56.mjs";
 import "/@/utils/propTypes";
 import "/@/utils/dict";
 import "/@/utils/dict/JDictSelectUtil";
@@ -60,11 +60,11 @@ import "/@/store/modules/permission";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
 import "vue-router";
-import "./LinkTableListPiece-2660d709.mjs";
+import "./LinkTableListPiece-f3a8e0d7.mjs";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 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";
 const ye = {

package/{PageAttributeTable-6c23547b.mjs → PageAttributeTable-25e3b7da.mjs}

@@ -1,23 +1,23 @@
-var U = Object.defineProperty, X = Object.defineProperties;
-var Y = Object.getOwnPropertyDescriptors;
-var N = Object.getOwnPropertySymbols;
-var Z = Object.prototype.hasOwnProperty, ee = Object.prototype.propertyIsEnumerable;
-var E = (l, u, s) => u in l ? U(l, u, { enumerable: !0, configurable: !0, writable: !0, value: s }) : l[u] = s, R = (l, u) => {
+var Y = Object.defineProperty, Z = Object.defineProperties;
+var ee = Object.getOwnPropertyDescriptors;
+var R = Object.getOwnPropertySymbols;
+var te = Object.prototype.hasOwnProperty, le = Object.prototype.propertyIsEnumerable;
+var N = (i, u, s) => u in i ? Y(i, u, { enumerable: !0, configurable: !0, writable: !0, value: s }) : i[u] = s, E = (i, u) => {
   for (var s in u || (u = {}))
-    Z.call(u, s) && E(l, s, u[s]);
-  if (N)
-    for (var s of N(u))
-      ee.call(u, s) && E(l, s, u[s]);
-  return l;
-}, P = (l, u) => X(l, Y(u));
-import { defineComponent as te, ref as le, resolveComponent as y, openBlock as I, createElementBlock as ie, Fragment as ae, createVNode as w, mergeProps as oe, withCtx as K, createBlock as se, createTextVNode as ne, createCommentVNode as de } from "vue";
+    te.call(u, s) && N(i, s, u[s]);
+  if (R)
+    for (var s of R(u))
+      le.call(u, s) && N(i, s, u[s]);
+  return i;
+}, I = (i, u) => Z(i, ee(u));
+import { defineComponent as ie, ref as ae, resolveComponent as h, openBlock as P, createElementBlock as oe, Fragment as se, createVNode as w, mergeProps as de, withCtx as H, createBlock as ne, createTextVNode as ue, createCommentVNode as re } from "vue";
 import { JVxeTypes as r } from "/@/components/jeecg/JVxeTable/types";
-import { u as ue } from "./useTableSync-f6089e8a.mjs";
-import re from "./LinkTableConfigModal-a138c85e.mjs";
-import fe from "./LinkTableFieldConfigModal-17b413b0.mjs";
-import ce from "./FieldExtendJsonModal-cc7fce26.mjs";
-import { useModal as C } from "/@/components/Modal";
-import { _ as pe } from "./index-173949bb.mjs";
+import { u as fe } from "./useTableSync-d7e9f18d.mjs";
+import ce from "./LinkTableConfigModal-9242d750.mjs";
+import me from "./LinkTableFieldConfigModal-24adc50c.mjs";
+import be from "./FieldExtendJsonModal-32135634.mjs";
+import { useModal as S } from "/@/components/Modal";
+import { _ as pe } from "./index-1d1a6e56.mjs";
 import "./cgform.data-475d4984.mjs";
 import "/@/utils/dict";
 import "/@/utils/dict/JDictSelectUtil";
@@ -26,12 +26,12 @@ import "lodash-es";
 import "/@/components/Form/index";
 import "/@/utils/http/axios";
 import "/@/hooks/web/useMessage";
-import "./SetSwitchOptions-a452fa0f.mjs";
+import "./SetSwitchOptions-b2af757f.mjs";
 import "/@/utils/is";
 import "./constant-fa63bd66.mjs";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "vue-router";
-const H = [
+const K = [
   { title: "文本框", value: "text" },
   { title: "密码", value: "password" },
   { title: "下拉框", value: "list" },
@@ -60,7 +60,7 @@ const H = [
   { title: "分类字典树", value: "cat_tree" },
   { title: "自定义树控件", value: "sel_tree" },
   { title: "联动组件", value: "link_down" }
-], be = [
+], ge = [
   { title: "文本框", value: "text" },
   { title: "单选框", value: "radio" },
   { title: "开关", value: "switch" },
@@ -74,21 +74,21 @@ const H = [
   { title: "下拉搜索框", value: "sel_search" },
   { title: "popup弹出框", value: "popup" },
   // update-begin--author:liaozhiyang---date:20240130---for：【QQYUN-7961】popupDict字典
-  { title: "Popup字典", value: "popup_dict" },
+  // { title: 'Popup字典', value: 'popup_dict' },
   // update-end--author:liaozhiyang---date:20240130---for：【QQYUN-7961】popupDict字典
   { title: "部门选择", value: "sel_depart" },
   { title: "用户选择", value: "sel_user" },
   { title: "省市区组件", value: "pca" },
   { title: "多行文本", value: "textarea" }
-], me = te({
+], ye = ie({
   name: "PageAttributeTable",
   components: {
-    LinkTableConfigModal: re,
-    LinkTableFieldConfigModal: fe,
-    FieldExtendJsonModal: ce
+    LinkTableConfigModal: ce,
+    LinkTableFieldConfigModal: me,
+    FieldExtendJsonModal: be
   },
   setup() {
-    const l = le([
+    const i = ae([
       { title: "字段名称", key: "dbFieldName", width: 100 },
       { title: "字段备注", key: "dbFieldTxt", width: 150 },
       {
@@ -120,8 +120,8 @@ const H = [
         // update-begin--author:liaozhiyang---date:20240528---for：【TV360X-291】没勾选同步数据库禁用排序功能
         props: {
           isDisabledCell({ row: e, column: t }) {
-            let { dbTable: i } = p;
-            const a = i.value.tableRef.getTableData({ rowIds: [e.id] })[0];
+            let { dbTable: l } = c;
+            const a = l.value.tableRef.getTableData({ rowIds: [e.id] })[0];
             return (a == null ? void 0 : a.dbIsPersist) == "0";
           }
         }
@@ -141,10 +141,10 @@ const H = [
         key: "fieldShowType",
         width: 170,
         type: r.select,
-        options: H,
+        options: K,
         defaultValue: "text",
         placeholder: "请选择${title}",
-        validateRules: [{ required: !0, message: "请选择${title}" }, { handler: S }]
+        validateRules: [{ required: !0, message: "请选择${title}" }, { handler: V }]
       },
       {
         title: "控件长度",
@@ -166,8 +166,8 @@ const H = [
         // update-begin--author:liaozhiyang---date:20240528---for：【TV360X-423】未勾选同步数据库禁用查询
         props: {
           isDisabledCell({ row: e, column: t }) {
-            let { dbTable: i } = p;
-            const a = i.value.tableRef.getTableData({ rowIds: [e.id] })[0];
+            let { dbTable: l } = c;
+            const a = l.value.tableRef.getTableData({ rowIds: [e.id] })[0];
             return (a == null ? void 0 : a.dbIsPersist) == "0";
           }
         }
@@ -180,10 +180,16 @@ const H = [
         type: r.select,
         options: [
           { title: "普通查询", value: "single" },
+          { title: "模糊查询", value: "like" },
           { title: "范围查询", value: "group" }
         ],
         defaultValue: "single",
-        placeholder: "请选择${title}"
+        placeholder: "请选择${title}",
+        validateRules: [{ handler: U }],
+        props: {
+          isDisabledCell({ row: e, column: t }) {
+          }
+        }
       },
       {
         title: "控件默认值",
@@ -216,14 +222,14 @@ const H = [
         type: r.slot,
         slotName: "fieldConfig"
       }
-    ]), u = ue(l), { tableRef: s, tables: p } = u;
-    function S({ cellValue: e, row: t }, i) {
-      let { dbTable: a } = p, o = a.value.tableRef.getTableData({ rowIds: [t.id] })[0].dbType;
-      e === "time" && o !== "string" ? i(!1, "当控件类型为时间时,数据库属性里的字段类型必须是String！") : e === "date" && o !== "Date" && o !== "Datetime" ? i(!1, "当控件类型为日期时，数据库属性里的字段类型必须是Date或Datetime！") : e === "datetime" && o !== "Datetime" ? i(!1, "当控件类型为datetime时，数据库属性里的字段类型必须是Datetime！") : i(!0);
+    ]), u = fe(i), { tableRef: s, tables: c } = u;
+    function V({ cellValue: e, row: t }, l) {
+      let { dbTable: a } = c, o = a.value.tableRef.getTableData({ rowIds: [t.id] })[0].dbType;
+      e === "time" && o !== "string" ? l(!1, "当控件类型为时间时,数据库属性里的字段类型必须是String！") : e === "date" && o !== "Date" && o !== "Datetime" ? l(!1, "当控件类型为日期时，数据库属性里的字段类型必须是Date或Datetime！") : e === "datetime" && o !== "Datetime" ? l(!1, "当控件类型为datetime时，数据库属性里的字段类型必须是Datetime！") : l(!0);
     }
-    function D(e) {
-      let t = "date";
-      e.dbType === "Datetime" && (t = "datetime"), e.dbType === "string" && (t = "text"), s.value.setValues([
+    function C(e) {
+      let t = "text";
+      e.dbType === "Datetime" ? t = "datetime" : e.dbType === "Date" && (t = "date"), s.value.setValues([
         {
           rowKey: e.id,
           values: { fieldShowType: t }
@@ -239,9 +245,9 @@ const H = [
       ]);
     }
     function F(e) {
-      for (let t of l.value)
+      for (let t of i.value)
         if (t.key == "fieldShowType") {
-          t.options = e ? be : H;
+          t.options = e ? ge : K;
           break;
         }
     }
@@ -253,37 +259,37 @@ const H = [
         }
       ]);
     }
-    const [x, { openModal: V }] = C(), [v, { openModal: M }] = C(), [O, { openModal: $ }] = C();
-    function A(e) {
+    const [x, { openModal: D }] = S(), [v, { openModal: M }] = S(), [O, { openModal: $ }] = S();
+    function B(e) {
       return e.row.dbFieldName != "id";
     }
-    function L(e) {
+    function Q(e) {
       e.row.fieldShowType.indexOf("link_table") >= 0 ? J(e) : z(e);
     }
     function J(e) {
-      let { row: t } = e, { checkTable: i } = p;
-      if (i) {
-        let a = i.value.tableRef.getTableData({ rowIds: [t.id] })[0];
+      let { row: t } = e, { checkTable: l } = c;
+      if (l) {
+        let a = l.value.tableRef.getTableData({ rowIds: [t.id] })[0];
         if (e.row.fieldShowType == "link_table") {
-          let o = Q(t, a);
-          V(!0, {
+          let o = L(t, a);
+          D(!0, {
             record: o,
             fieldName: t.dbFieldName
           });
         } else if (e.row.fieldShowType == "link_table_field") {
-          let o = B(t, a);
+          let o = A(t, a);
           M(!0, o);
         }
       }
     }
-    function B(e, t) {
+    function A(e, t) {
       let a = s.value.getTableData().filter((g) => g.fieldShowType == "link_table"), o = {};
       if (a && a.length > 0) {
-        let g = p.checkTable.value.tableRef.getTableData();
+        let g = c.checkTable.value.tableRef.getTableData();
         for (let T of a) {
-          let h = g.filter((b) => b.dbFieldName == T.dbFieldName);
-          if (h && h.length > 0) {
-            let b = h[0];
+          let y = g.filter((b) => b.dbFieldName == T.dbFieldName);
+          if (y && y.length > 0) {
+            let b = y[0];
             o[b.dbFieldName] = {
               title: T.dbFieldTxt,
               table: b.dictTable,
@@ -292,155 +298,169 @@ const H = [
           }
         }
       }
-      const { dictTable: c, dictText: f } = t, { id: n, dbFieldTxt: d } = e;
+      const { dictTable: m, dictText: f } = t, { id: d, dbFieldTxt: n } = e;
       return {
         record: {
-          rowKey: n,
-          dbFieldTxt: d,
+          rowKey: d,
+          dbFieldTxt: n,
           dictText: f,
-          dictTable: c
+          dictTable: m
         },
         tableAndFieldsMap: o
       };
     }
-    function Q(e, t) {
-      const { id: i, dbFieldTxt: a, fieldExtendJson: o } = e, { dictTable: c, dictText: f } = t;
-      let n = {
-        rowKey: i,
+    function L(e, t) {
+      const { id: l, dbFieldTxt: a, fieldExtendJson: o } = e, { dictTable: m, dictText: f } = t;
+      let d = {
+        rowKey: l,
         dbFieldTxt: a,
-        dictTable: c
+        dictTable: m
       };
       if (f) {
-        let d = f.split(",");
-        n.titleField = d[0], d.length > 1 && (n.otherFields = f.substring(f.indexOf(",") + 1));
+        let n = f.split(",");
+        d.titleField = n[0], n.length > 1 && (d.otherFields = f.substring(f.indexOf(",") + 1));
       } else
-        n.titleField = "", n.otherFields = "";
+        d.titleField = "", d.otherFields = "";
       if (o)
         try {
-          let d = JSON.parse(o);
-          d.multiSelect ? n.multiSelect = d.multiSelect : n.multiSelect = !1, d.showType ? n.showType = d.showType : n.showType = "card", d.imageField ? n.imageField = d.imageField : n.imageField = "";
-        } catch (d) {
+          let n = JSON.parse(o);
+          n.multiSelect ? d.multiSelect = n.multiSelect : d.multiSelect = !1, n.showType ? d.showType = n.showType : d.showType = "card", n.imageField ? d.imageField = n.imageField : d.imageField = "";
+        } catch (n) {
         }
-      return n;
+      return d;
     }
-    function j(e) {
-      const { multiSelect: t, showType: i, imageField: a, fieldName: o } = e;
-      let c = { showType: i, multiSelect: t, imageField: a }, f = [{ rowKey: e.rowKey, values: { fieldExtendJson: JSON.stringify(c), dbFieldTxt: e.dbFieldTxt } }];
+    function q(e) {
+      const { multiSelect: t, showType: l, imageField: a, fieldName: o } = e;
+      let m = { showType: l, multiSelect: t, imageField: a }, f = [{ rowKey: e.rowKey, values: { fieldExtendJson: JSON.stringify(m), dbFieldTxt: e.dbFieldTxt } }];
       s.value.setValues(f);
-      let { checkTable: n, dbTable: d } = p;
-      if (d) {
-        let m = [{ rowKey: e.rowKey, values: { dbFieldTxt: e.dbFieldTxt } }];
-        d.value.tableRef.setValues(m);
-      }
+      let { checkTable: d, dbTable: n } = c;
       if (n) {
-        let m = e.titleField;
-        e.otherFields && (m += "," + e.otherFields);
+        let p = [{ rowKey: e.rowKey, values: { dbFieldTxt: e.dbFieldTxt } }];
+        n.value.tableRef.setValues(p);
+      }
+      if (d) {
+        let p = e.titleField;
+        e.otherFields && (p += "," + e.otherFields);
         const { dictTable: g, dictField: T } = e;
-        let h = {
+        let y = {
           dictTable: g,
           dictField: T,
-          dictText: m,
+          dictText: p,
           dbFieldName: o
-        }, b = [{ rowKey: e.rowKey, values: h }];
-        n.value.tableRef.setValues(b);
+        }, b = [{ rowKey: e.rowKey, values: y }];
+        d.value.tableRef.setValues(b);
       }
     }
-    function q(e) {
-      const { dbFieldTxt: t, dictTable: i, dictText: a, rowKey: o } = e;
-      let c = [{ rowKey: o, values: { dbFieldTxt: t } }];
-      s.value.setValues(c);
-      let { checkTable: f, dbTable: n } = p;
-      if (n) {
-        let d = [{ rowKey: o, values: { dbFieldTxt: t, dbIsPersist: "0" } }];
-        n.value.tableRef.setValues(d);
+    function j(e) {
+      const { dbFieldTxt: t, dictTable: l, dictText: a, rowKey: o } = e;
+      let m = [{ rowKey: o, values: { dbFieldTxt: t } }];
+      s.value.setValues(m);
+      let { checkTable: f, dbTable: d } = c;
+      if (d) {
+        let n = [{ rowKey: o, values: { dbFieldTxt: t, dbIsPersist: "0" } }];
+        d.value.tableRef.setValues(n);
       }
       if (f) {
-        let d = [{ rowKey: o, values: { dictTable: i, dictText: a } }];
-        f.value.tableRef.setValues(d);
+        let n = [{ rowKey: o, values: { dictTable: l, dictText: a } }];
+        f.value.tableRef.setValues(n);
       }
     }
     function z(e) {
-      let t = e.row.fieldExtendJson || "", i = e.rowId, a = e.row.fieldShowType || "", o = e.row.sortFlag || "0";
-      const c = e.row.dbType;
+      let t = e.row.fieldExtendJson || "", l = e.rowId, a = e.row.fieldShowType || "", o = e.row.sortFlag || "0";
+      const m = e.row.dbType;
       $(!0, {
         jsonStr: t,
         fieldShowType: a,
         sortFlag: o,
-        id: i,
-        dbType: c
+        id: l,
+        dbType: m
       });
     }
     function W(e, t) {
-      let i;
-      e && Object.keys(e).length > 0 ? i = [{ rowKey: t, values: { fieldExtendJson: JSON.stringify(e) } }] : i = [{ rowKey: t, values: { fieldExtendJson: "" } }], s.value.setValues(i);
+      let l;
+      e && Object.keys(e).length > 0 ? l = [{ rowKey: t, values: { fieldExtendJson: JSON.stringify(e) } }] : l = [{ rowKey: t, values: { fieldExtendJson: "" } }], s.value.setValues(l);
     }
     const G = (e) => {
     };
-    return P(R({}, u), {
-      columns: l,
+    function U({ cellValue: e, row: t }, l) {
+      let { dbTable: a } = c;
+      const o = a.value.tableRef.getTableData({ rowIds: [t.id] })[0].dbType;
+      e === "group" ? ["double", "int", "BigDecimal", "Date", "Datetime"].includes(o) || t.fieldShowType === "time" ? l(!0) : l(!1, "范围查询，只支持数据库属里的字段类型为：Integer、Double、BigDecimal及Date、Datetime 或 控件类型是时间(HH:mm:ss)") : e === "like" ? ["string"].includes(o) && t.fieldShowType === "text" ? l(!0) : l(!1, "模糊查询，只支持控件类型是文本框且数据库属里的字段类型是String") : l(!0);
+    }
+    const X = ({ oldValue: e, row: t }) => {
+      t.dbType != "string" && e == "string" && s.value.getTableData({ rowIds: [t.id] })[0].queryMode == "like" && s.value.setValues([
+        {
+          rowKey: t.id,
+          values: { queryMode: "single" }
+        }
+      ]);
+    };
+    return I(E({}, u), {
+      columns: i,
       enableQuery: _,
-      syncFieldShowType: D,
+      syncFieldShowType: C,
       changePageType: F,
-      showConfigButton: A,
+      showConfigButton: B,
       showFieldConfig: J,
       registerExtJsonModal: O,
       handleExtJson: W,
-      openConfig: L,
+      openConfig: Q,
       registerModal: x,
-      handleConfigData: j,
+      handleConfigData: q,
       registerFieldModal: v,
-      handleFieldConfigData: q,
+      handleFieldConfigData: j,
       syncIsQuery: k,
-      handleValueChange: G
+      handleValueChange: G,
+      syncQueryMode: X
     });
   }
 });
-function ge(l, u, s, p, S, D) {
-  const k = y("a-button"), F = y("JVxeTable"), _ = y("link-table-config-modal"), x = y("link-table-field-config-modal"), V = y("FieldExtendJsonModal");
-  return I(), ie(ae, null, [
-    w(F, oe({
+function he(i, u, s, c, V, C) {
+  const k = h("a-button"), F = h("JVxeTable"), _ = h("link-table-config-modal"), x = h("link-table-field-config-modal"), D = h("FieldExtendJsonModal");
+  return P(), oe(se, null, [
+    w(F, de({
       ref: "tableRef",
       "row-class-name": "online-config-page",
       rowNumber: "",
       keyboardEdit: "",
-      maxHeight: l.tableHeight.noToolbar,
-      loading: l.loading,
-      columns: l.columns,
-      dataSource: l.dataSource,
+      maxHeight: i.tableHeight.noToolbar,
+      loading: i.loading,
+      columns: i.columns,
+      dataSource: i.dataSource,
       disabledRows: { dbFieldName: ["id", "has_child"] },
-      onValueChange: l.handleValueChange
-    }, l.tableProps), {
-      fieldConfig: K((v) => [
-        l.showConfigButton(v) ? (I(), se(k, {
+      onValueChange: i.handleValueChange
+    }, i.tableProps), {
+      fieldConfig: H((v) => [
+        i.showConfigButton(v) ? (P(), ne(k, {
           key: 0,
           type: "primary",
           size: "small",
           ghost: "",
-          onClick: (M) => l.openConfig(v)
+          onClick: (M) => i.openConfig(v)
         }, {
-          default: K(() => [
-            ne("更多配置")
+          default: H(() => [
+            ue("更多配置")
           ]),
           _: 2
-        }, 1032, ["onClick"])) : de("", !0)
+        }, 1032, ["onClick"])) : re("", !0)
       ]),
       _: 1
     }, 16, ["maxHeight", "loading", "columns", "dataSource", "onValueChange"]),
     w(_, {
-      onRegister: l.registerModal,
-      onSuccess: l.handleConfigData
+      onRegister: i.registerModal,
+      onSuccess: i.handleConfigData
     }, null, 8, ["onRegister", "onSuccess"]),
     w(x, {
-      onRegister: l.registerFieldModal,
-      onSuccess: l.handleFieldConfigData
+      onRegister: i.registerFieldModal,
+      onSuccess: i.handleFieldConfigData
     }, null, 8, ["onRegister", "onSuccess"]),
-    w(V, {
-      onRegister: l.registerExtJsonModal,
-      onSuccess: l.handleExtJson
+    w(D, {
+      onRegister: i.registerExtJsonModal,
+      onSuccess: i.handleExtJson
     }, null, 8, ["onRegister", "onSuccess"])
   ], 64);
 }
-const Oe = /* @__PURE__ */ pe(me, [["render", ge], ["__scopeId", "data-v-bc04961b"]]);
+const Be = /* @__PURE__ */ pe(ye, [["render", he], ["__scopeId", "data-v-e34da524"]]);
 export {
-  Oe as default
+  Be as default
 };