@jeecg/online 3.6.2-beta → 3.7.1-RC

package/FieldExtendJsonModal-32135634.mjs

@@ -0,0 +1,277 @@
+var P = Object.defineProperty, G = Object.defineProperties;
+var I = Object.getOwnPropertyDescriptors;
+var F = Object.getOwnPropertySymbols;
+var T = Object.prototype.hasOwnProperty, V = Object.prototype.propertyIsEnumerable;
+var L = (t, a, n) => a in t ? P(t, a, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[a] = n, _ = (t, a) => {
+  for (var n in a || (a = {}))
+    T.call(a, n) && L(t, n, a[n]);
+  if (F)
+    for (var n of F(a))
+      V.call(a, n) && L(t, n, a[n]);
+  return t;
+}, N = (t, a) => G(t, I(a));
+var R = (t, a, n) => new Promise((f, i) => {
+  var l = (r) => {
+    try {
+      p(n.next(r));
+    } catch (c) {
+      i(c);
+    }
+  }, d = (r) => {
+    try {
+      p(n.throw(r));
+    } catch (c) {
+      i(c);
+    }
+  }, p = (r) => r.done ? f(r.value) : Promise.resolve(r.value).then(l, d);
+  p((n = n.apply(t, a)).next());
+});
+import { defineComponent as C, ref as m, reactive as j, toRaw as D, toRefs as K, resolveComponent as w, openBlock as $, createBlock as A, mergeProps as J, withCtx as y, createVNode as O } from "vue";
+import { BasicModal as U, useModalInner as Y } from "/@/components/Modal";
+import q from "./SetSwitchOptions-b2af757f.mjs";
+import { BasicForm as H, useForm as W } from "/@/components/Form/index";
+import { pick as z } from "lodash-es";
+import { L as x } from "./constant-fa63bd66.mjs";
+import { isArray as Q } from "/@/utils/is";
+import { _ as X } from "./index-1d1a6e56.mjs";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "/@/hooks/web/useMessage";
+import "vue-router";
+const Z = C({
+  name: "FieldExtendJsonModal",
+  components: {
+    BasicModal: U,
+    BasicForm: H,
+    SetSwitchOptions: q
+  },
+  emits: ["success", "register"],
+  setup(t, { emit: a }) {
+    const n = m(!1);
+    function f() {
+      i.uploadnum = 0, i.showLength = "", i.popupMulti = !0, i.multiSelect = !0, i.store = "", i.text = "", i.orderRule = "", i.validateError = "", i.labelLength = x;
+    }
+    const i = j({
+      uploadnum: 0,
+      showLength: "",
+      popupMulti: !0,
+      store: "",
+      text: "",
+      multiSelect: !0,
+      orderRule: "",
+      validateError: "",
+      labelLength: x
+    }), l = m(""), d = m(""), p = m("0"), r = m(""), c = [
+      {
+        label: "rowKey",
+        field: "rowKey",
+        component: "Input",
+        show: !1
+      },
+      {
+        label: "文件上传数量",
+        field: "uploadnum",
+        component: "InputNumber",
+        componentProps: {
+          style: {
+            width: "100%"
+          }
+        },
+        ifShow: () => l.value === "file" || l.value === "image"
+      },
+      {
+        label: "是否多选",
+        field: "popupMulti",
+        component: "RadioGroup",
+        defaultValue: !0,
+        componentProps: {
+          options: [
+            { label: "否", value: !1 },
+            { label: "是", value: !0 }
+          ]
+        },
+        ifShow: () => l.value === "popup" || l.value === "popup_dict"
+      },
+      {
+        label: "是否多选",
+        field: "multiSelect",
+        component: "RadioGroup",
+        defaultValue: !0,
+        componentProps: {
+          options: [
+            { label: "否", value: !1 },
+            { label: "是", value: !0 }
+          ]
+        },
+        ifShow: () => l.value === "sel_user" || l.value === "sel_depart"
+      },
+      {
+        label: "存储字段",
+        field: "store",
+        component: "Input",
+        ifShow: () => l.value === "sel_user" || l.value === "sel_depart"
+      },
+      {
+        label: "展示字段",
+        field: "text",
+        component: "Input",
+        ifShow: () => l.value === "sel_user" || l.value === "sel_depart"
+      },
+      {
+        label: "默认排序",
+        field: "orderRule",
+        component: "RadioGroup",
+        defaultValue: "",
+        componentProps: {
+          options: [
+            { label: "降序", value: "desc" },
+            { label: "升序", value: "asc" },
+            { label: "不默认排序", value: "" }
+          ]
+        },
+        ifShow: () => p.value === "1" || ["Datetime", "string", "Date", "int", "BigDecimal", "double"].includes(r.value)
+      },
+      {
+        label: "校验提示",
+        field: "validateError",
+        component: "Input",
+        componentProps: {
+          placeholder: "请输入校验提示文本"
+        }
+      },
+      {
+        label: "查询label长度",
+        field: "labelLength",
+        component: "InputNumber",
+        componentProps: {
+          placeholder: "请输入label长度"
+        }
+      },
+      {
+        label: "是否固定",
+        field: "isFixed",
+        component: "RadioGroup",
+        defaultValue: 0,
+        componentProps: {
+          options: [
+            { label: "是", value: 1 },
+            { label: "否", value: 0 }
+          ]
+        }
+      },
+      // update-begin--author:liaozhiyang---date:20240105---for：【QQYUN-7499】多列风格富文本、markdown增加独占一行功能
+      {
+        label: "是否独占一行",
+        field: "isOneRow",
+        component: "RadioGroup",
+        defaultValue: !1,
+        componentProps: {
+          options: [
+            { label: "否", value: !1 },
+            { label: "是", value: !0 }
+          ]
+        },
+        ifShow: () => l.value === "markdown" || l.value === "umeditor"
+      },
+      // update-end--author:liaozhiyang---date:20240105---for：【QQYUN-7499】多列风格富文本、markdown增加独占一行功能
+      // update-begin--author:liaozhiyang---date:20240430---for：【issues/6094】online 日期(年月日)控件增加年、年月，年周，年季度等格式
+      {
+        label: "日期格式",
+        field: "picker",
+        component: "RadioGroup",
+        defaultValue: "default",
+        componentProps: {
+          options: [
+            { label: "年", value: "year" },
+            { label: "年月", value: "month" },
+            { label: "年周", value: "week" },
+            { label: "年季度", value: "quarter" },
+            { label: "年月日", value: "default" }
+          ]
+        },
+        ifShow: () => l.value === "date"
+      },
+      // update-end--author:liaozhiyang---date:20240430---for：【issues/6094】online 日期(年月日)控件增加年、年月，年周，年季度等格式
+      // update-begin--author:liaozhiyang---date:20240308---for：【TV360X-25】扩展参数配置中增加开关是否选项配置
+      {
+        label: "开关值",
+        field: "switchOptions",
+        component: "Input",
+        slot: "switchOptions",
+        ifShow: () => l.value === "switch"
+      }
+      // update-end--author:liaozhiyang---date:20240308---for：【TV360X-25】扩展参数配置中增加开关是否选项配置
+    ], [h, { validate: b, setFieldsValue: v, resetFields: B }] = W({
+      schemas: c,
+      showActionButtonGroup: !1,
+      labelAlign: "right",
+      labelWidth: 100
+    }), [M, { closeModal: k }] = Y((e) => R(this, null, function* () {
+      if (f(), e.jsonStr) {
+        let o = JSON.parse(e.jsonStr);
+        e.fieldShowType === "switch" && Q(o) && o.length == 2 && (i.switchOptions = o), Object.keys(o).map((u) => {
+          i[u] = o[u];
+        });
+      } else
+        e.fieldShowType === "switch" && (i.switchOptions = ["Y", "N"]);
+      l.value = e.fieldShowType, d.value = e.id, p.value = e.sortFlag, r.value = e.dbType;
+      let s = D(i);
+      yield B(), yield v(N(_({}, s), {
+        rowKey: e.id
+      }));
+    }));
+    function E() {
+      return R(this, null, function* () {
+        let e = yield b(), s = l.value, o = {};
+        if (s === "file" || s === "image" ? e.uploadnum && e.uploadnum > 0 && (o.uploadnum = e.uploadnum) : s === "textarea" || s === "text" ? e.showLength && e.showLength > 0 && (o.showLength = e.showLength) : s === "sel_user" || s === "sel_depart" ? o = z(e, "store", "text", "multiSelect") : (s === "popup" || s === "popup_dict") && (o.popupMulti = e.popupMulti), e.orderRule && (o.orderRule = e.orderRule), e.validateError && (o.validateError = e.validateError), e.labelLength && (o.labelLength = e.labelLength), e.isFixed && (o.isFixed = e.isFixed), e.isOneRow && (o.isOneRow = e.isOneRow), e.picker && (o.picker = e.picker), e.switchOptions) {
+          const u = e.switchOptions.split(",");
+          let g = Number(u[0]), S = Number(u[1]);
+          (Number.isNaN(g) || Number.isNaN(S)) && (g = u[0], S = u[1]), o.switchOptions = [g, S];
+        }
+        for (let u in o)
+          o[u] === "" && delete o[u];
+        a("success", o, e.rowKey), k();
+      });
+    }
+    return _({
+      spinningLoading: n,
+      registerModal: M,
+      registerForm: h,
+      fieldShowType: l,
+      rowKey: d,
+      handleSubmit: E
+    }, K(i));
+  }
+});
+function ee(t, a, n, f, i, l) {
+  const d = w("SetSwitchOptions"), p = w("BasicForm"), r = w("a-spin"), c = w("BasicModal");
+  return $(), A(c, J({ wrapClassName: "field-extend-config-modal" }, t.$attrs, {
+    title: "字段扩展配置项",
+    onRegister: t.registerModal,
+    keyboard: "",
+    canFullscreen: !1,
+    cancelText: "关闭",
+    onOk: t.handleSubmit
+  }), {
+    default: y(() => [
+      O(r, { spinning: t.spinningLoading }, {
+        default: y(() => [
+          O(p, { onRegister: t.registerForm }, {
+            switchOptions: y(({ model: h, field: b }) => [
+              O(d, {
+                value: h[b],
+                "onUpdate:value": (v) => h[b] = v
+              }, null, 8, ["value", "onUpdate:value"])
+            ]),
+            _: 1
+          }, 8, ["onRegister"])
+        ]),
+        _: 1
+      }, 8, ["spinning"])
+    ]),
+    _: 1
+  }, 16, ["onRegister", "onOk"]);
+}
+const me = /* @__PURE__ */ X(Z, [["render", ee]]);
+export {
+  me as default
+};

package/{FileSelectModal-9a02560b.mjs → FileSelectModal-1643c8b9.mjs}

@@ -17,7 +17,7 @@ var u = (e, d, o) => new Promise((n, a) => {
 import { defineComponent as R, ref as f, resolveComponent as p, openBlock as h, createBlock as v, withCtx as m, createVNode as g, createElementVNode as k, createTextVNode as D, createCommentVNode as w } from "vue";
 import { defHttp as y } from "/@/utils/http/axios";
 import { BasicModal as B, useModalInner as b } from "/@/components/Modal";
-import { _ as F } from "./index-0e3ab3af.mjs";
+import { _ as F } from "./index-1d1a6e56.mjs";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "/@/hooks/web/useMessage";
 import "vue-router";

package/{ForeignKeyTable-6a843c4b.mjs → ForeignKeyTable-7f7e28a7.mjs}

@@ -12,9 +12,9 @@ var i = (e, t, o) => t in e ? p(e, t, { enumerable: !0, configurable: !0, writab
 }, n = (e, t) => m(e, s(t));
 import { defineComponent as b, ref as f, resolveComponent as y, openBlock as h, createBlock as g, mergeProps as T } from "vue";
 import { JVxeTypes as l } from "/@/components/jeecg/JVxeTable/types";
-import { u as k } from "./useTableSync-774c3774.mjs";
-import { _ as w } from "./index-0e3ab3af.mjs";
-import "./cgform.data-cbdd88c3.mjs";
+import { u as k } from "./useTableSync-d7e9f18d.mjs";
+import { _ as w } from "./index-1d1a6e56.mjs";
+import "./cgform.data-475d4984.mjs";
 import "/@/utils/dict";
 import "/@/utils/dict/JDictSelectUtil";
 import "/@/utils/uuid";

package/{IndexTable-f8af9d44.mjs → IndexTable-cdcc2b48.mjs}

@@ -1,8 +1,8 @@
 import { defineComponent as f, ref as b, resolveComponent as g, openBlock as h, createBlock as y, mergeProps as $ } from "vue";
-import { JVxeTypes as a } from "/@/components/jeecg/JVxeTable/types";
-import { u as T } from "./useTableSync-774c3774.mjs";
-import { _ as v } from "./index-0e3ab3af.mjs";
-import "./cgform.data-cbdd88c3.mjs";
+import { JVxeTypes as o } from "/@/components/jeecg/JVxeTable/types";
+import { u as T } from "./useTableSync-d7e9f18d.mjs";
+import { _ as v } from "./index-1d1a6e56.mjs";
+import "./cgform.data-475d4984.mjs";
 import "/@/utils/dict";
 import "/@/utils/dict/JDictSelectUtil";
 import "/@/utils/uuid";
@@ -10,7 +10,7 @@ import "lodash-es";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "/@/hooks/web/useMessage";
 import "vue-router";
-const S = f({
+const x = f({
   name: "IndexTable",
   components: {},
   props: {
@@ -26,16 +26,24 @@ const S = f({
         title: "索引名称",
         key: "indexName",
         width: 330,
-        type: a.input,
+        type: o.input,
         defaultValue: "",
         placeholder: "请输入${title}",
-        validateRules: [{ required: !0, message: "${title}不能为空" }]
+        validateRules: [
+          { required: !0, message: "${title}不能为空" },
+          // update-begin--author:liaozhiyang---date:20240807---for：【TV360X-1974】online索引名称增加校验
+          {
+            pattern: /^[a-zA-Z][a-zA-Z0-9_-]*$/,
+            message: "命名规则：只能由字母、数字、下划线组成；必须以字母开头"
+          }
+          // update-end--author:liaozhiyang---date:20240807---for：【TV360X-1974】online索引名称增加校验
+        ]
       },
       {
         title: "索引栏位",
         key: "indexField",
         width: 330,
-        type: a.selectMultiple,
+        type: o.selectMultiple,
         options: [],
         defaultValue: "",
         placeholder: "请选择${title}",
@@ -45,7 +53,7 @@ const S = f({
         title: "索引类型",
         key: "indexType",
         width: 330,
-        type: a.select,
+        type: o.select,
         options: [
           { title: "normal", value: "normal" },
           { title: "unique", value: "unique" }
@@ -54,20 +62,20 @@ const S = f({
         placeholder: "请选择${title}",
         validateRules: [{ required: !0, message: "请选择${title}" }]
       }
-    ]), l = T(e), { tableRef: r, loading: i, dataSource: n, tableHeight: u, tableProps: t, setDataSource: s, validateData: p } = l;
+    ]), l = T(e), { tableRef: r, loading: i, dataSource: n, tableHeight: u, tableProps: t, setDataSource: d, validateData: p } = l;
     function m(c) {
-      let d = [];
-      c.value.tableRef.getTableData().forEach((o) => {
-        o.dbFieldName && d.push({
-          title: o.dbFieldName,
-          value: o.dbFieldName
+      let s = [];
+      c.value.tableRef.getTableData().forEach((a) => {
+        a.dbFieldName && s.push({
+          title: a.dbFieldTxt,
+          value: a.dbFieldName
         });
-      }), e.value[1].options = d;
+      }), e.value[1].options = s;
     }
-    return { tableRef: r, loading: i, dataSource: n, columns: e, tableHeight: u, tableProps: t, syncTable: m, setDataSource: s, validateData: p };
+    return { tableRef: r, loading: i, dataSource: n, columns: e, tableHeight: u, tableProps: t, syncTable: m, setDataSource: d, validateData: p };
   }
 });
-function x(e, l, r, i, n, u) {
+function S(e, l, r, i, n, u) {
   const t = g("JVxeTable");
   return h(), y(t, $({
     ref: "tableRef",
@@ -83,7 +91,7 @@ function x(e, l, r, i, n, u) {
     toolbar: e.actionButton
   }, e.tableProps), null, 16, ["maxHeight", "loading", "columns", "dataSource", "toolbar"]);
 }
-const C = /* @__PURE__ */ v(S, [["render", x]]);
+const z = /* @__PURE__ */ v(x, [["render", S]]);
 export {
-  C as default
+  z as default
 };

package/{JModalTip-33c7dc44.mjs → JModalTip-b055ab60.mjs}

@@ -1,6 +1,6 @@
 import { computed as c, openBlock as n, createElementBlock as l, normalizeClass as p, createElementVNode as t, createCommentVNode as d, pushScopeId as r, popScopeId as _ } from "vue";
 import { useAppInject as m } from "/@/hooks/web/useAppInject";
-import { _ as v } from "./index-0e3ab3af.mjs";
+import { _ as v } from "./index-1d1a6e56.mjs";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "/@/hooks/web/useMessage";
 import "vue-router";

package/JOnlineSearchSelect-22aae934.mjs

@@ -0,0 +1,128 @@
+var h = (i, p, o) => new Promise((t, n) => {
+  var u = (a) => {
+    try {
+      e(o.next(a));
+    } catch (s) {
+      n(s);
+    }
+  }, c = (a) => {
+    try {
+      e(o.throw(a));
+    } catch (s) {
+      n(s);
+    }
+  }, e = (a) => a.done ? t(a.value) : Promise.resolve(a.value).then(u, c);
+  e((o = o.apply(i, p)).next());
+});
+import { useDebounceFn as O } from "@vueuse/core";
+import { defHttp as P } from "/@/utils/http/axios";
+import { useMessage as k } from "/@/hooks/web/useMessage";
+import { ref as m, watch as S, resolveComponent as _, openBlock as g, createBlock as y, withCtx as w, createElementBlock as B, Fragment as D, renderList as H, createTextVNode as I, toDisplayString as q } from "vue";
+import { _ as L } from "./index-1d1a6e56.mjs";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "vue-router";
+const { createMessage: N } = k(), T = {
+  name: "JOnlineSearchSelect",
+  props: {
+    placeholder: {
+      type: String,
+      default: "",
+      required: !1
+    },
+    value: {
+      type: String,
+      required: !1
+    },
+    // online CgReport item id
+    fieldId: {
+      type: String,
+      required: !0
+    }
+  },
+  emits: ["update:value"],
+  setup(i, { emit: p }) {
+    let o = m(""), t = m([]), n = !0, u = !1, c = "";
+    const e = m(1);
+    S(
+      () => i.value,
+      (l) => {
+        l ? o.value = l : o.value = void 0;
+      },
+      { immediate: !0 }
+    ), S(
+      () => i.fieldId,
+      () => {
+        v();
+      },
+      { immediate: !0 }
+    );
+    const a = O((l) => {
+      c = l, e.value = 1, n = !0, s(l);
+    }, 800);
+    function s(l = "") {
+      return h(this, null, function* () {
+        let d = {
+          keyword: l,
+          fieldId: i.fieldId,
+          pageSize: 10,
+          pageNo: e.value
+        }, f = "/online/cgreport/api/getReportDictList";
+        yield P.get({ url: f, params: d }, { isTransformResponse: !1 }).then((r) => {
+          r.success ? r.result && r.result.length > 0 ? (e.value == 1 ? t.value = [...r.result] : t.value.push(...r.result), e.value++) : (e.value == 1 && (t.value = []), n = !1) : N.warning(r.message);
+        }).catch(() => {
+          e.value != 1 && e.value--;
+        });
+      });
+    }
+    function C(l) {
+      p("update:value", l), (!l || l == "") && v();
+    }
+    function v() {
+      t.value = [], e.value = 1, n = !0, c = "", s();
+    }
+    return {
+      selectOptions: t,
+      handleSearch: a,
+      handleChange: C,
+      selected: o,
+      handlePopupScroll: (l) => h(this, null, function* () {
+        const { target: d } = l, { scrollTop: f, scrollHeight: r, clientHeight: x } = d;
+        !u && n && f + x >= r - 10 && (u = !0, s(c).finally(() => {
+          u = !1;
+        }));
+      })
+    };
+  }
+};
+function F(i, p, o, t, n, u) {
+  const c = _("a-select-option"), e = _("a-select");
+  return g(), y(e, {
+    value: t.selected,
+    placeholder: o.placeholder,
+    "show-search": "",
+    "default-active-first-option": !1,
+    "show-arrow": !0,
+    "filter-option": !1,
+    "not-found-content": null,
+    onSearch: t.handleSearch,
+    onChange: t.handleChange,
+    onPopupScroll: t.handlePopupScroll,
+    allowClear: ""
+  }, {
+    default: w(() => [
+      (g(!0), B(D, null, H(t.selectOptions, (a) => (g(), y(c, {
+        key: a.value
+      }, {
+        default: w(() => [
+          I(q(a.text), 1)
+        ]),
+        _: 2
+      }, 1024))), 128))
+    ]),
+    _: 1
+  }, 8, ["value", "placeholder", "onSearch", "onChange", "onPopupScroll"]);
+}
+const G = /* @__PURE__ */ L(T, [["render", F]]);
+export {
+  G as default
+};

package/{LeftDepart-fa85523d.mjs → LeftDepart-d5615ed9.mjs}

@@ -16,7 +16,7 @@ var f = (n, r, o) => new Promise((s, c) => {
 });
 import { defineComponent as h, ref as u, resolveComponent as m, openBlock as y, createElementBlock as K, createBlock as _, withCtx as D, createVNode as v, normalizeStyle as S, createCommentVNode as k } from "vue";
 import { queryTreeList as x } from "/@/api/common/api";
-import { _ as C } from "./index-0e3ab3af.mjs";
+import { _ as C } from "./index-1d1a6e56.mjs";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "/@/hooks/web/useMessage";
 import "vue-router";

package/{LeftRole-8b8dfe21.mjs → LeftRole-2ed8a2bf.mjs}

@@ -18,7 +18,7 @@ import { defineComponent as g, resolveComponent as _, openBlock as w, createBloc
 import { defHttp as h } from "/@/utils/http/axios";
 import { BasicTable as C } from "/@/components/Table";
 import { useListPage as R } from "/@/hooks/system/useListPage";
-import { _ as x } from "./index-0e3ab3af.mjs";
+import { _ as x } from "./index-1d1a6e56.mjs";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "/@/hooks/web/useMessage";
 import "vue-router";

package/{LeftUser-dc24ef2f.mjs → LeftUser-22baa378.mjs}

@@ -18,7 +18,7 @@ import { defineComponent as g, resolveComponent as w, openBlock as _, createBloc
 import { defHttp as T } from "/@/utils/http/axios";
 import { BasicTable as C } from "/@/components/Table";
 import { useListPage as x } from "/@/hooks/system/useListPage";
-import { _ as B } from "./index-0e3ab3af.mjs";
+import { _ as B } from "./index-1d1a6e56.mjs";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "/@/hooks/web/useMessage";
 import "vue-router";
@@ -50,7 +50,7 @@ const R = g({
               field: "username",
               component: "JInput",
               componentProps: {
-                placeholder: "输入账号模糊查询"
+                placeholder: "输入账号"
               }
             },
             {
@@ -58,7 +58,7 @@ const R = g({
               field: "realname",
               component: "JInput",
               componentProps: {
-                placeholder: "输入姓名模糊查询"
+                placeholder: "输入姓名"
               }
             }
           ]