@jeecg/online 3.6.2-beta → 3.7.0-beta

package/{DBAttributeTable-370de07b.mjs → DBAttributeTable-95dc66c1.mjs}

@@ -1,20 +1,20 @@
-var Y = Object.defineProperty, $ = Object.defineProperties;
+var $ = Object.defineProperty, x = 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 C = Object.getOwnPropertySymbols;
+var K = Object.prototype.hasOwnProperty, W = Object.prototype.propertyIsEnumerable;
+var b = (e, a, d) => a in e ? $(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) && b(e, d, a[d]);
+  if (C)
+    for (var d of C(a))
+      W.call(a, d) && b(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";
+}, O = (e, a) => x(e, k(a));
+import { defineComponent as X, getCurrentInstance as Q, ref as c, 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-f6089e8a.mjs";
+import { _ as ee } from "./index-173949bb.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(), I = c(!1), R = c([
       {
         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: S },
+          // 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: w }]
       },
       {
         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,102 @@ 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);
+    const T = j(R), { tableRef: N, loading: A, dataSource: f, tableHeight: g, tableProps: h, setDataSource: m, validateData: p } = T;
+    function y() {
+      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 U(t) {
+      u = u.concat(t.deleteRows.map((i) => i.id)), a("removed", O(D({}, t), { removeIds: u, target: d }));
     }
-    function M(a) {
-      t("dragged", {
-        oldIndex: a.oldIndex,
-        newIndex: a.newIndex,
+    function B(t) {
+      a("dragged", {
+        oldIndex: t.oldIndex,
+        newIndex: t.newIndex,
         target: d
       });
     }
-    function y(a) {
-      t("inserted", O(L({}, a), { target: d }));
+    function _(t) {
+      a("inserted", O(D({}, t), { target: d }));
     }
-    function v() {
+    function M() {
       return u;
     }
-    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 v(t) {
+      let { type: i, row: l, col: r, value: n, target: o, oldValue: s } = t;
+      i === E.select && r.key === "dbType" ? ((n === "Date" || n === "Datetime") && a("syncDbType", { row: l, value: n, target: d }), n === "string" && (s == "Date" || s == "Datetime") && a("syncDbType", { row: l, value: n, target: d }), n === "Blob" || n === "Text" || n === "Date" ? o.setValues([{ rowKey: l.id, values: { dbLength: "0" } }]) : n === "string" ? o.setValues([{ rowKey: l.id, values: { dbLength: "32" } }]) : n === "int" || n === "double" || n === "BigDecimal" ? o.setValues([{ rowKey: l.id, values: { dbLength: "10" } }]) : l.dbLength === "0" && o.setValues([{ rowKey: l.id, values: { dbLength: "32" } }])) : r.key === "dbIsPersist" ? a("syncDbIsPersist", { row: l, value: n, target: d }) : r.key === "dbIsNull" && a("syncDbIsNull", { row: l, value: n, target: d });
     }
-    function _(a, n, l) {
-      return a === "has_child" || a === "id" && l === 0;
+    function F(t, i, l) {
+      return t === "has_child" || t === "id" && l === 0;
     }
-    function V(a) {
-      N.value.pushRows(a), T.value || t("added", d);
+    function V(t) {
+      N.value.pushRows(t), I.value || a("added", d);
     }
-    function H(a) {
-      return N.value.removeRowsById(a);
+    function P(t) {
+      return N.value.removeRowsById(t);
     }
-    function G() {
-      T.value = !0, s.value = !0;
+    function H() {
+      I.value = !0, A.value = !0;
     }
-    function P() {
-      T.value = !1, s.value = !1, t("added", d);
+    function G() {
+      I.value = !1, A.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);
+    function S({ cellValue: t, row: i }, l) {
+      const { tables: r } = T;
+      if (r) {
+        let o = r.dbTable.value.tableRef.dataSource.filter((L) => L.id === i.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, "当前字段存在索引配置，请先删除索引再修改字段");
+        let s = o[0].dbFieldName;
+        s == t && l(!0);
+        let Y = r.idxTable.value.tableRef.getTableData();
+        for (let L of Y)
+          L.indexField.split(",").indexOf(s) >= 0 && l(!1, "当前字段存在索引配置，请先删除索引再修改字段");
       }
       l(!0);
     }
+    function w({ cellValue: t, row: i }, l) {
+      i.dbType == "int" && i.dbPointLength > 0 && l(!1, "设置了小数点不可设置integer类型"), l(!0);
+    }
     return {
       tableRef: N,
-      loading: s,
+      loading: A,
       columns: R,
-      dataSource: m,
-      setDataSource: h,
-      addBatchBegin: G,
-      addBatchEnd: P,
+      dataSource: f,
+      setDataSource: m,
+      addBatchBegin: H,
+      addBatchEnd: G,
       tableAddLine: V,
-      tableHeight: f,
-      tableProps: g,
-      tableDeleteLines: H,
-      handleAdded: p,
-      handleRemoved: B,
-      handleDragged: M,
-      handleInserted: y,
-      handleValueChange: F,
-      handleDisabledDbFieldName: _,
-      validateData: U,
-      getRemoveIds: v,
+      tableHeight: g,
+      tableProps: h,
+      tableDeleteLines: P,
+      handleAdded: y,
+      handleRemoved: U,
+      handleDragged: B,
+      handleInserted: _,
+      handleValueChange: v,
+      handleDisabledDbFieldName: F,
+      validateData: p,
+      getRemoveIds: M,
       validateExistIndex: S
     };
   }
 });
-function ae(e, t, d, T, R, u) {
-  const r = Q("JVxeTable");
-  return q(), J(r, Z({
+function de(e, a, d, I, R, u) {
+  const T = q("JVxeTable");
+  return J(), Z(T, z({
+    class: "dBAttributeTable",
     ref: "tableRef",
     rowNumber: "",
     rowSelection: "",
     dragSort: "",
+    notAllowDrag: [{ key: "dbFieldName", value: "id" }],
     keyboardEdit: "",
     sortKey: "orderNum",
     addButtonSettings: "",
@@ -467,7 +488,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 Oe = /* @__PURE__ */ ee(ae, [["render", de], ["__scopeId", "data-v-0cd4f97d"]]);
 export {
   Oe as default
 };

package/{DbToOnlineModal-9f13956f.mjs → DbToOnlineModal-f49b9530.mjs}

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