@jeecg/online 3.6.2-beta → 3.7.1-RC

package/{DBAttributeTable-370de07b.mjs → DBAttributeTable-285d40db.mjs}

@@ -1,20 +1,20 @@
 var Y = Object.defineProperty, $ = Object.defineProperties;
 var k = Object.getOwnPropertyDescriptors;
-var D = Object.getOwnPropertySymbols;
-var x = Object.prototype.hasOwnProperty, K = Object.prototype.propertyIsEnumerable;
-var c = (e, t, d) => t in e ? Y(e, t, { enumerable: !0, configurable: !0, writable: !0, value: d }) : e[t] = d, L = (e, t) => {
-  for (var d in t || (t = {}))
-    x.call(t, d) && c(e, d, t[d]);
-  if (D)
-    for (var d of D(t))
-      K.call(t, d) && c(e, d, t[d]);
+var b = Object.getOwnPropertySymbols;
+var K = Object.prototype.hasOwnProperty, W = Object.prototype.propertyIsEnumerable;
+var c = (e, a, d) => a in e ? Y(e, a, { enumerable: !0, configurable: !0, writable: !0, value: d }) : e[a] = d, D = (e, a) => {
+  for (var d in a || (a = {}))
+    K.call(a, d) && c(e, d, a[d]);
+  if (b)
+    for (var d of b(a))
+      W.call(a, d) && c(e, d, a[d]);
   return e;
-}, O = (e, t) => $(e, k(t));
-import { defineComponent as W, getCurrentInstance as X, ref as b, resolveComponent as Q, openBlock as q, createBlock as J, mergeProps as Z } from "vue";
-import { JVxeTypes as i } from "/@/components/jeecg/JVxeTable/types";
-import { u as z } from "./useTableSync-774c3774.mjs";
-import { _ as j } from "./index-0e3ab3af.mjs";
-import "./cgform.data-cbdd88c3.mjs";
+}, S = (e, a) => $(e, k(a));
+import { defineComponent as X, getCurrentInstance as Q, ref as f, resolveComponent as q, openBlock as J, createBlock as Z, mergeProps as z } from "vue";
+import { JVxeTypes as E } from "/@/components/jeecg/JVxeTable/types";
+import { u as j } from "./useTableSync-d7e9f18d.mjs";
+import { _ as ee } from "./index-1d1a6e56.mjs";
+import "./cgform.data-475d4984.mjs";
 import "/@/utils/dict";
 import "/@/utils/dict/JDictSelectUtil";
 import "/@/utils/uuid";
@@ -22,7 +22,7 @@ import "lodash-es";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "/@/hooks/web/useMessage";
 import "vue-router";
-const ee = [
+const te = [
   "ADD",
   "ALL",
   "ALTER",
@@ -248,19 +248,19 @@ const ee = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], te = W({
+], ae = X({
   name: "DBAttributeTable",
   props: {
     actionButton: { type: Boolean, default: !0 }
   },
-  emits: ["added", "removed", "inserted", "dragged", "syncDbType"],
-  setup(e, { emit: t }) {
-    const d = X(), T = b(!1), R = b([
+  emits: ["added", "removed", "inserted", "dragged", "syncDbType", "syncDbIsPersist", "syncDbIsNull"],
+  setup(e, { emit: a }) {
+    const d = Q(), R = f(!1), N = f([
       {
         title: "字段名称",
         key: "dbFieldName",
         width: 140,
-        type: i.input,
+        type: E.input,
         defaultValue: "",
         placeholder: "请输入${title}",
         validateRules: [
@@ -271,11 +271,18 @@ const ee = [
           },
           { unique: !0, message: "${title}不能重复" },
           {
-            handler({ cellValue: a }, n) {
-              ee.includes(a.toUpperCase()) ? n(!1, a + "是关键字，不能作为字段名称使用！") : n(!0);
+            handler({ cellValue: t }, i) {
+              te.includes(t.toUpperCase()) ? i(!1, t + "是关键字，不能作为字段名称使用！") : i(!0);
             }
           },
-          { handler: S }
+          { handler: O },
+          // update-begin--author:liaozhiyang---date:20240603---for：【TV360X-631】表名字段名表描述字段备注长度校验
+          {
+            handler({ cellValue: t }, i) {
+              t.length > 32 ? i(!1, "字段名最长32个字符") : i(!0);
+            }
+          }
+          // update-end--author:liaozhiyang---date:20240603---for：【TV360X-631】表名字段名表描述字段备注长度校验
         ],
         disabled: !e.actionButton
       },
@@ -283,16 +290,25 @@ const ee = [
         title: "字段备注",
         key: "dbFieldTxt",
         width: 140,
-        type: i.input,
+        type: E.input,
         defaultValue: "",
         placeholder: "请输入${title}",
-        validateRules: [{ required: !0, message: "${title}不能为空" }]
+        validateRules: [
+          { required: !0, message: "${title}不能为空" },
+          // update-begin--author:liaozhiyang---date:20240603---for：【TV360X-631】表名字段名表描述字段备注长度校验
+          {
+            handler({ cellValue: t }, i) {
+              t.length > 200 ? i(!1, "字段名最长200个字") : i(!0);
+            }
+          }
+          // update-end--author:liaozhiyang---date:20240603---for：【TV360X-631】表名字段名表描述字段备注长度校验
+        ]
       },
       {
         title: "字段长度",
         key: "dbLength",
         width: 120,
-        type: i.inputNumber,
+        type: E.inputNumber,
         defaultValue: 32,
         placeholder: "请输入${title}",
         validateRules: [{ required: !0, message: "${title}不能为空" }],
@@ -302,7 +318,7 @@ const ee = [
         title: "小数点",
         key: "dbPointLength",
         width: 100,
-        type: i.inputNumber,
+        type: E.inputNumber,
         defaultValue: 0,
         placeholder: "请输入${title}",
         validateRules: [{ required: !0, message: "${title}不能为空" }],
@@ -312,7 +328,7 @@ const ee = [
         title: "默认值",
         key: "dbDefaultVal",
         width: 140,
-        type: i.input,
+        type: E.input,
         defaultValue: "",
         disabled: !e.actionButton
       },
@@ -320,7 +336,7 @@ const ee = [
         title: "字段类型",
         key: "dbType",
         width: 140,
-        type: i.select,
+        type: E.select,
         options: [
           { title: "String", value: "string" },
           { title: "Integer", value: "int" },
@@ -334,13 +350,13 @@ const ee = [
         defaultValue: "string",
         placeholder: "请选择${title}",
         disabled: !e.actionButton,
-        validateRules: [{ required: !0, message: "请选择${title}" }]
+        validateRules: [{ required: !0, message: "请选择${title}" }, { handler: x }]
       },
       {
         title: "主键",
         key: "dbIsKey",
         width: 80,
-        type: i.checkbox,
+        type: E.checkbox,
         align: "center",
         customValue: ["1", "0"],
         defaultChecked: !1,
@@ -350,7 +366,7 @@ const ee = [
         title: "允许空值",
         key: "dbIsNull",
         width: 80,
-        type: i.checkbox,
+        type: E.checkbox,
         customValue: ["1", "0"],
         defaultChecked: !0,
         disabled: !e.actionButton
@@ -359,97 +375,110 @@ const ee = [
         title: "同步数据库",
         key: "dbIsPersist",
         minWidth: 80,
-        type: i.checkbox,
+        type: E.checkbox,
         customValue: ["1", "0"],
         defaultChecked: !0,
         disabled: !e.actionButton
       },
-      { title: "orderNum", key: "orderNum", type: i.hidden }
+      { title: "orderNum", key: "orderNum", type: E.hidden }
     ]);
-    let u = [];
-    const r = z(R), { tableRef: N, loading: s, dataSource: m, tableHeight: f, tableProps: g, setDataSource: h, validateData: U } = r;
-    function p() {
-      t("added", d);
+    let s = [];
+    const I = j(N), { tableRef: A, loading: L, dataSource: g, tableHeight: m, tableProps: h, setDataSource: p, validateData: y } = I;
+    function U() {
+      a("added", d);
     }
-    function B(a) {
-      u = u.concat(a.deleteRows.map((n) => n.id)), t("removed", O(L({}, a), { removeIds: u, target: d }));
+    function B(t) {
+      s = s.concat(t.deleteRows.map((i) => i.id)), a("removed", S(D({}, t), { removeIds: s, target: d }));
     }
-    function M(a) {
-      t("dragged", {
-        oldIndex: a.oldIndex,
-        newIndex: a.newIndex,
+    function _(t) {
+      a("dragged", {
+        oldIndex: t.oldIndex,
+        newIndex: t.newIndex,
         target: d
       });
     }
-    function y(a) {
-      t("inserted", O(L({}, a), { target: d }));
+    function M(t) {
+      a("inserted", S(D({}, t), { target: d }));
     }
     function v() {
-      return u;
+      return s;
     }
-    function F(a) {
-      let { type: n, row: l, col: I, value: E, target: o } = a;
-      n === i.select && I.key === "dbType" && ((E === "Date" || E === "Datetime") && t("syncDbType", { row: l, value: E, target: d }), E === "Blob" || E === "Text" || E === "Date" ? o.setValues([{ rowKey: l.id, values: { dbLength: "0" } }]) : E === "int" || E === "double" || E === "BigDecimal" ? o.setValues([{ rowKey: l.id, values: { dbLength: "10" } }]) : l.dbLength === "0" && o.setValues([{ rowKey: l.id, values: { dbLength: "32" } }]));
+    function F(t) {
+      let { type: i, row: l, col: o, value: n, target: u, oldValue: r } = t;
+      i === E.select && o.key === "dbType" ? ((n === "Date" || n === "Datetime") && a("syncDbType", { row: l, value: n, target: d }), (n !== "Date" || n !== "Datetime") && (r == "Date" || r == "Datetime") && a("syncDbType", { row: l, value: n, target: d }), n === "Blob" || n === "Text" || n === "Date" ? u.setValues([{ rowKey: l.id, values: { dbLength: "0" } }]) : n === "string" ? u.setValues([{ rowKey: l.id, values: { dbLength: "32" } }]) : n === "int" || n === "double" || n === "BigDecimal" ? u.setValues([{ rowKey: l.id, values: { dbLength: "10" } }]) : l.dbLength === "0" && u.setValues([{ rowKey: l.id, values: { dbLength: "32" } }])) : o.key === "dbIsPersist" ? a("syncDbIsPersist", { row: l, value: n, target: d }) : o.key === "dbIsNull" && a("syncDbIsNull", { row: l, value: n, target: d });
     }
-    function _(a, n, l) {
-      return a === "has_child" || a === "id" && l === 0;
+    function V(t, i, l) {
+      var o;
+      if (t === "has_child")
+        return !0;
+      if (t === "id") {
+        const { tables: n } = I, r = ((o = n.dbTable.value.tableRef.getTableData()) != null ? o : []).findIndex((T) => T.dbFieldName === "id");
+        if ((r === -1 ? 0 : r) === l)
+          return !0;
+      }
+      return !1;
     }
-    function V(a) {
-      N.value.pushRows(a), T.value || t("added", d);
+    function P(t) {
+      A.value.pushRows(t), R.value || a("added", d);
     }
-    function H(a) {
-      return N.value.removeRowsById(a);
+    function H(t) {
+      return A.value.removeRowsById(t);
     }
     function G() {
-      T.value = !0, s.value = !0;
+      R.value = !0, L.value = !0;
     }
-    function P() {
-      T.value = !1, s.value = !1, t("added", d);
+    function w() {
+      R.value = !1, L.value = !1, a("added", d);
     }
-    function S({ cellValue: a, row: n }, l) {
-      const { tables: I } = r;
-      if (I) {
-        let o = I.dbTable.value.tableRef.dataSource.filter((A) => A.id === n.id);
-        (!o || o.length <= 0) && l(!0);
-        let C = o[0].dbFieldName;
-        C == a && l(!0);
-        let w = I.idxTable.value.tableRef.getTableData();
-        for (let A of w)
-          A.indexField.split(",").indexOf(C) >= 0 && l(!1, "当前字段存在索引配置，请先删除索引再修改字段");
+    function O({ cellValue: t, row: i }, l) {
+      const { tables: o } = I;
+      if (o) {
+        let u = o.dbTable.value.tableRef.dataSource.filter((T) => T.id === i.id);
+        (!u || u.length <= 0) && l(!0);
+        let r = u[0].dbFieldName;
+        r == t && l(!0);
+        let C = o.idxTable.value.tableRef.getTableData();
+        for (let T of C)
+          T.indexField.split(",").indexOf(r) >= 0 && l(!1, "当前字段存在索引配置，请先删除索引再修改字段");
       }
       l(!0);
     }
+    function x({ cellValue: t, row: i }, l) {
+      i.dbType == "int" && i.dbPointLength > 0 && l(!1, "设置了小数点不可设置integer类型"), l(!0);
+    }
     return {
-      tableRef: N,
-      loading: s,
-      columns: R,
-      dataSource: m,
-      setDataSource: h,
+      tableRef: A,
+      loading: L,
+      columns: N,
+      dataSource: g,
+      setDataSource: p,
       addBatchBegin: G,
-      addBatchEnd: P,
-      tableAddLine: V,
-      tableHeight: f,
-      tableProps: g,
+      addBatchEnd: w,
+      tableAddLine: P,
+      tableHeight: m,
+      tableProps: h,
       tableDeleteLines: H,
-      handleAdded: p,
+      handleAdded: U,
       handleRemoved: B,
-      handleDragged: M,
-      handleInserted: y,
+      handleDragged: _,
+      handleInserted: M,
       handleValueChange: F,
-      handleDisabledDbFieldName: _,
-      validateData: U,
+      handleDisabledDbFieldName: V,
+      validateData: y,
       getRemoveIds: v,
-      validateExistIndex: S
+      validateExistIndex: O
     };
   }
 });
-function ae(e, t, d, T, R, u) {
-  const r = Q("JVxeTable");
-  return q(), J(r, Z({
+function de(e, a, d, R, N, s) {
+  const I = q("JVxeTable");
+  return J(), Z(I, z({
+    class: "dBAttributeTable",
     ref: "tableRef",
     rowNumber: "",
     rowSelection: "",
     dragSort: "",
+    notAllowDrag: [{ key: "dbFieldName", value: "id" }],
     keyboardEdit: "",
     sortKey: "orderNum",
     addButtonSettings: "",
@@ -467,7 +496,7 @@ function ae(e, t, d, T, R, u) {
     onValueChange: e.handleValueChange
   }), null, 16, ["loading", "columns", "dataSource", "toolbar", "maxHeight", "disabledRows", "onAdded", "onRemoved", "onDragged", "onInserted", "onValueChange"]);
 }
-const Oe = /* @__PURE__ */ j(te, [["render", ae]]);
+const Se = /* @__PURE__ */ ee(ae, [["render", de], ["__scopeId", "data-v-7723c158"]]);
 export {
-  Oe as default
+  Se as default
 };

package/DbToOnlineModal-5dcb67c3.mjs

@@ -0,0 +1,169 @@
+import { defineComponent as D, ref as i, resolveComponent as d, openBlock as H, createBlock as I, withCtx as l, createVNode as m, createTextVNode as g, createElementVNode as _ } from "vue";
+import { defHttp as T } from "/@/utils/http/axios";
+import { BasicTable as $ } from "/@/components/Table";
+import { BasicModal as A, useModalInner as P } from "/@/components/Modal";
+import { useListTable as q } from "/@/hooks/system/useListPage";
+import { useMessage as O } from "/@/hooks/web/useMessage";
+import { useDesign as V } from "/@/hooks/web/useDesign";
+import { _ as j } from "./index-1d1a6e56.mjs";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "vue-router";
+const x = D({
+  name: "TransDb2Online",
+  components: { BasicModal: A, BasicTable: $ },
+  emits: ["success", "register"],
+  setup(o, { emit: h }) {
+    const { createMessage: f } = O(), t = i("暂无数据"), u = i(!1), s = i(!1), n = i([]), a = i([]), { prefixCls: c } = V("online-db-import-form-modal"), p = c, C = document.documentElement.clientHeight, b = C - 180, M = b > 690 ? 690 : b, [L, { setPagination: y, getForm: B }, { rowSelection: F, selectedRowKeys: r }] = q({
+      bordered: !0,
+      columns: [{ title: "表名", align: "left", dataIndex: "id" }],
+      dataSource: a,
+      maxHeight: C - 400,
+      locale: { emptyText: t },
+      pagination: {
+        showQuickJumper: !1,
+        showSizeChanger: !1
+      },
+      clickToRowSelect: !0,
+      showIndexColumn: !0,
+      showActionColumn: !1,
+      formConfig: {
+        schemas: [
+          {
+            label: "表名",
+            field: "tableName",
+            component: "Input",
+            componentProps: {
+              style: { width: "100%" },
+              placeholder: "请输入表名以模糊筛选",
+              onChange: (e) => N(e.target.value)
+            },
+            disabledLabelWidth: !0,
+            itemProps: {
+              labelCol: { sm: 0, md: 0 },
+              wrapperCol: { sm: 24, md: 20 }
+            }
+          }
+        ],
+        baseColProps: { xs: 24, sm: 24, md: 24, lg: 24, xl: 24, xxl: 24 },
+        showActionButtonGroup: !1
+      }
+    }), [E, { closeModal: v }] = P(() => {
+      var e;
+      (e = B()) == null || e.resetFields(), s.value = !1, t.value = "暂无数据", r.value = [], w();
+    });
+    function w() {
+      return u.value = !0, T.get(
+        {
+          url: "/online/cgform/head/queryTables"
+          /* query */
+        },
+        {
+          errorMessageMode: "none"
+        }
+      ).then(
+        (e) => (a.value = e, n.value = [...e], e),
+        (e) => {
+          e.message == "noadminauth" && (t.value = "非admin用户无权限操作！", f.warn(t.value)), a.value = [], n.value = [];
+        }
+      ).finally(() => {
+        u.value = !1;
+      });
+    }
+    function N(e) {
+      n.value.length !== 0 && (e ? (a.value = n.value.filter((S) => S.id.toLowerCase().includes(e.toLowerCase())), t.value = a.value.length === 0 ? "无筛选结果" : "暂无数据") : a.value = [...n.value], y({ current: 1 }));
+    }
+    function k() {
+      v();
+    }
+    function R() {
+      if (!r.value || r.value.length == 0) {
+        f.warning("请选择一张表");
+        return;
+      } else {
+        s.value = !0;
+        let e = r.value.join(",");
+        T.post({ url: "/online/cgform/head/transTables/" + e }, { errorMessageMode: "modal" }).then(() => {
+          v();
+        }).finally(() => {
+          s.value = !1, h("success");
+        });
+      }
+    }
+    return {
+      emptyText: t,
+      confirmLoading: u,
+      btnLoading: s,
+      metaSource: n,
+      handleTrans: R,
+      handleCancel: k,
+      queryTables: w,
+      registerModal: E,
+      registerTable: L,
+      rowSelection: F,
+      selectedRowKeys: r,
+      wrapClassName: p,
+      modalHeight: M
+    };
+  }
+});
+const z = /* @__PURE__ */ _("div", null, [
+  /* @__PURE__ */ g(" 注：导入表会排除配置前缀表 "),
+  /* @__PURE__ */ _("a", {
+    href: "http://doc.jeecg.com/2043924",
+    target: "_blank"
+  }, " 参考文档")
+], -1);
+function G(o, h, f, t, u, s) {
+  const n = d("BasicTable"), a = d("a-spin"), c = d("a-button"), p = d("BasicModal");
+  return H(), I(p, {
+    onRegister: o.registerModal,
+    height: o.modalHeight,
+    width: 500,
+    title: "从数据库导入表单",
+    confirmLoading: o.confirmLoading,
+    onCancel: o.handleCancel,
+    wrapClassName: o.wrapClassName
+  }, {
+    footer: l(() => [
+      m(c, { onClick: o.handleCancel }, {
+        default: l(() => [
+          g("关闭")
+        ]),
+        _: 1
+      }, 8, ["onClick"]),
+      m(c, {
+        onClick: o.handleTrans,
+        type: "primary",
+        preIcon: "ant-design:swap",
+        loading: o.confirmLoading || o.btnLoading
+      }, {
+        default: l(() => [
+          g(" 生成表单 ")
+        ]),
+        _: 1
+      }, 8, ["onClick", "loading"])
+    ]),
+    default: l(() => [
+      m(a, { spinning: o.confirmLoading }, {
+        default: l(() => [
+          m(n, {
+            onRegister: o.registerTable,
+            rowSelection: o.rowSelection,
+            onTableRedo: o.queryTables
+          }, {
+            tableTitle: l(() => [
+              z
+            ]),
+            _: 1
+          }, 8, ["onRegister", "rowSelection", "onTableRedo"])
+        ]),
+        _: 1
+      }, 8, ["spinning"])
+    ]),
+    _: 1
+  }, 8, ["onRegister", "height", "confirmLoading", "onCancel", "wrapClassName"]);
+}
+const ne = /* @__PURE__ */ j(x, [["render", G]]);
+export {
+  ne as default
+};