@jeecg/online 1.0.1 → 3.4.3-beta

package/CustomButtonList.js

@@ -34,7 +34,7 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { defineComponent, ref, reactive, computed, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementBlock, createCommentVNode, normalizeProps, guardReactiveProps, createTextVNode, nextTick } from "vue";
+import { defineComponent, ref, reactive, computed, resolveComponent, openBlock, createBlock, withCtx, createVNode, createTextVNode, createElementBlock, createCommentVNode, normalizeProps, guardReactiveProps, nextTick } from "vue";
 import { u as useOnlineTest } from "./useOnlineTest.js";
 import { useListPage } from "/@/hooks/system/useListPage";
 import { BasicTable, TableAction } from "/@/components/Table";
@@ -42,18 +42,20 @@ import { BasicModal, useModalInner, useModal } from "/@/components/Modal";
 import { BasicForm, useForm } from "/@/components/Form";
 import { defHttp } from "/@/utils/http/axios";
 import { _ as _export_sfc } from "./index.js";
-import "/@/hooks/web/useMessage";
-import "/@/utils/cache";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "/@/hooks/web/useMessage";
 import "vue-router";
 const list = (code, params) => defHttp.get({ url: "/online/cgform/button/list/" + code, params });
 function doBatchDelete(idList) {
-  return defHttp.delete({
-    url: "/online/cgform/button/deleteBatch",
-    params: {
-      ids: idList.join(",")
-    }
-  }, { joinParamsToUrl: true });
+  return defHttp.delete(
+    {
+      url: "/online/cgform/button/deleteBatch",
+      params: {
+        ids: idList.join(",")
+      }
+    },
+    { joinParamsToUrl: true }
+  );
 }
 const saveOrUpdate = (params, isUpdate) => {
   if (isUpdate) {
@@ -200,7 +202,7 @@ const _sfc_main = defineComponent({
       code.value = data.row.id;
       reload();
     }));
-    const { aiTestMode, genButtons } = useOnlineTest({}, { reload }, null);
+    const { aiTestMode, genButtons } = useOnlineTest();
     const [registerFormModal, formModal] = useModal();
     const isUpdate = ref(false);
     const formModalProps = reactive({
@@ -295,15 +297,10 @@ const _sfc_main = defineComponent({
     };
   }
 });
-const _hoisted_1 = /* @__PURE__ */ createTextVNode("\u5173\u95ED");
-const _hoisted_2 = {
+const _hoisted_1 = {
   key: 0,
   style: { "float": "left" }
 };
-const _hoisted_3 = /* @__PURE__ */ createTextVNode("\u751F\u6210\u6D4B\u8BD5\u6570\u636E");
-const _hoisted_4 = /* @__PURE__ */ createTextVNode("\u65B0\u589E");
-const _hoisted_5 = /* @__PURE__ */ createTextVNode(" \u5220\u9664 ");
-const _hoisted_6 = /* @__PURE__ */ createTextVNode(" \u6279\u91CF\u64CD\u4F5C ");
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_a_button = resolveComponent("a-button");
   const _component_a_icon = resolveComponent("a-icon");
@@ -325,14 +322,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     footer: withCtx(() => [
       createVNode(_component_a_button, { onClick: _ctx.onCancel }, {
         default: withCtx(() => [
-          _hoisted_1
+          createTextVNode("\u5173\u95ED")
         ]),
         _: 1
       }, 8, ["onClick"]),
-      _ctx.aiTestMode ? (openBlock(), createElementBlock("div", _hoisted_2, [
+      _ctx.aiTestMode ? (openBlock(), createElementBlock("div", _hoisted_1, [
         createVNode(_component_a_button, { onClick: _ctx.onGenButtons }, {
           default: withCtx(() => [
-            _hoisted_3
+            createTextVNode("\u751F\u6210\u6D4B\u8BD5\u6570\u636E")
           ]),
           _: 1
         }, 8, ["onClick"])
@@ -350,7 +347,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             preIcon: "ant-design:plus"
           }, {
             default: withCtx(() => [
-              _hoisted_4
+              createTextVNode("\u65B0\u589E")
             ]),
             _: 1
           }, 8, ["onClick"]),
@@ -364,7 +361,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   }, {
                     default: withCtx(() => [
                       createVNode(_component_a_icon, { type: "delete" }),
-                      _hoisted_5
+                      createTextVNode(" \u5220\u9664 ")
                     ]),
                     _: 1
                   }, 8, ["onClick"])
@@ -375,7 +372,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             default: withCtx(() => [
               createVNode(_component_a_button, { style: { "margin-left": "8px" } }, {
                 default: withCtx(() => [
-                  _hoisted_6,
+                  createTextVNode(" \u6279\u91CF\u64CD\u4F5C "),
                   createVNode(_component_a_icon, { type: "down" })
                 ]),
                 _: 1

package/DBAttributeTable.js

@@ -17,7 +17,7 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { defineComponent, getCurrentInstance, ref, resolveComponent, openBlock, createBlock } from "vue";
+import { defineComponent, getCurrentInstance, ref, resolveComponent, openBlock, createBlock, mergeProps } from "vue";
 import { JVxeTypes } from "/@/components/jeecg/JVxeTable/types";
 import { u as useTableSync } from "./useTableSync.js";
 import { _ as _export_sfc } from "./index.js";
@@ -26,13 +26,240 @@ import "/@/utils/dict";
 import "/@/utils/dict/JDictSelectUtil";
 import "/@/utils/uuid";
 import "./pick.js";
+import "./_flatRest.js";
 import "./isArray.js";
 import "./toString.js";
 import "./_arrayPush.js";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "/@/hooks/web/useMessage";
 import "vue-router";
-const MySQLKeywords = ["ADD", "ALL", "ALTER", "ANALYZE", "AND", "AS", "ASC", "ASENSITIVE", "BEFORE", "BETWEEN", "BIGINT", "BINARY", "BLOB", "BOTH", "BY", "CALL", "CASCADE", "CASE", "CHANGE", "CHAR", "CHARACTER", "CHECK", "COLLATE", "COLUMN", "CONDITION", "CONNECTION", "CONSTRAINT", "CONTINUE", "CONVERT", "CREATE", "CROSS", "CURRENT_DATE", "CURRENT_TIME", "CURRENT_TIMESTAMP", "CURRENT_USER", "CURSOR", "DATABASE", "DATABASES", "DAY_HOUR", "DAY_MICROSECOND", "DAY_MINUTE", "DAY_SECOND", "DEC", "DECIMAL", "DECLARE", "DEFAULT", "DELAYED", "DELETE", "DESC", "DESCRIBE", "DETERMINISTIC", "DISTINCT", "DISTINCTROW", "DIV", "DOUBLE", "DROP", "DUAL", "EACH", "ELSE", "ELSEIF", "ENCLOSED", "ESCAPED", "EXISTS", "EXIT", "EXPLAIN", "FALSE", "FETCH", "FLOAT", "FLOAT4", "FLOAT8", "FOR", "FORCE", "FOREIGN", "FROM", "FULLTEXT", "GOTO", "GRANT", "GROUP", "HAVING", "HIGH_PRIORITY", "HOUR_MICROSECOND", "HOUR_MINUTE", "HOUR_SECOND", "IF", "IGNORE", "IN", "INDEX", "INFILE", "INNER", "INOUT", "INSENSITIVE", "INSERT", "INT", "INT1", "INT2", "INT3", "INT4", "INT8", "INTEGER", "INTERVAL", "INTO", "IS", "ITERATE", "JOIN", "KEY", "KEYS", "KILL", "LABEL", "LEADING", "LEAVE", "LEFT", "LIKE", "LIMIT", "LINEAR", "LINES", "LOAD", "LOCALTIME", "LOCALTIMESTAMP", "LOCK", "LONG", "LONGBLOB", "LONGTEXT", "LOOP", "LOW_PRIORITY", "MATCH", "MEDIUMBLOB", "MEDIUMINT", "MEDIUMTEXT", "MIDDLEINT", "MINUTE_MICROSECOND", "MINUTE_SECOND", "MOD", "MODIFIES", "NATURAL", "NOT", "NO_WRITE_TO_BINLOG", "NULL", "NUMERIC", "ON", "OPTIMIZE", "OPTION", "OPTIONALLY", "OR", "ORDER", "OUT", "OUTER", "OUTFILE", "PRECISION", "PRIMARY", "PROCEDURE", "PURGE", "RAID0", "RANGE", "READ", "READS", "REAL", "REFERENCES", "REGEXP", "RELEASE", "RENAME", "REPEAT", "REPLACE", "REQUIRE", "RESTRICT", "RETURN", "REVOKE", "RIGHT", "RLIKE", "SCHEMA", "SCHEMAS", "SECOND_MICROSECOND", "SELECT", "SENSITIVE", "SEPARATOR", "SET", "SHOW", "SMALLINT", "SPATIAL", "SPECIFIC", "SQL", "SQLEXCEPTION", "SQLSTATE", "SQLWARNING", "SQL_BIG_RESULT", "SQL_CALC_FOUND_ROWS", "SQL_SMALL_RESULT", "SSL", "STARTING", "STRAIGHT_JOIN", "TABLE", "TERMINATED", "THEN", "TINYBLOB", "TINYINT", "TINYTEXT", "TO", "TRAILING", "TRIGGER", "TRUE", "UNDO", "UNION", "UNIQUE", "UNLOCK", "UNSIGNED", "UPDATE", "USAGE", "USE", "USING", "UTC_DATE", "UTC_TIME", "UTC_TIMESTAMP", "VALUES", "VARBINARY", "VARCHAR", "VARCHARACTER", "VARYING", "WHEN", "WHERE", "WHILE", "WITH", "WRITE", "X509", "XOR", "YEAR_MONTH", "ZEROFILL"];
+const MySQLKeywords = [
+  "ADD",
+  "ALL",
+  "ALTER",
+  "ANALYZE",
+  "AND",
+  "AS",
+  "ASC",
+  "ASENSITIVE",
+  "BEFORE",
+  "BETWEEN",
+  "BIGINT",
+  "BINARY",
+  "BLOB",
+  "BOTH",
+  "BY",
+  "CALL",
+  "CASCADE",
+  "CASE",
+  "CHANGE",
+  "CHAR",
+  "CHARACTER",
+  "CHECK",
+  "COLLATE",
+  "COLUMN",
+  "CONDITION",
+  "CONNECTION",
+  "CONSTRAINT",
+  "CONTINUE",
+  "CONVERT",
+  "CREATE",
+  "CROSS",
+  "CURRENT_DATE",
+  "CURRENT_TIME",
+  "CURRENT_TIMESTAMP",
+  "CURRENT_USER",
+  "CURSOR",
+  "DATABASE",
+  "DATABASES",
+  "DAY_HOUR",
+  "DAY_MICROSECOND",
+  "DAY_MINUTE",
+  "DAY_SECOND",
+  "DEC",
+  "DECIMAL",
+  "DECLARE",
+  "DEFAULT",
+  "DELAYED",
+  "DELETE",
+  "DESC",
+  "DESCRIBE",
+  "DETERMINISTIC",
+  "DISTINCT",
+  "DISTINCTROW",
+  "DIV",
+  "DOUBLE",
+  "DROP",
+  "DUAL",
+  "EACH",
+  "ELSE",
+  "ELSEIF",
+  "ENCLOSED",
+  "ESCAPED",
+  "EXISTS",
+  "EXIT",
+  "EXPLAIN",
+  "FALSE",
+  "FETCH",
+  "FLOAT",
+  "FLOAT4",
+  "FLOAT8",
+  "FOR",
+  "FORCE",
+  "FOREIGN",
+  "FROM",
+  "FULLTEXT",
+  "GOTO",
+  "GRANT",
+  "GROUP",
+  "HAVING",
+  "HIGH_PRIORITY",
+  "HOUR_MICROSECOND",
+  "HOUR_MINUTE",
+  "HOUR_SECOND",
+  "IF",
+  "IGNORE",
+  "IN",
+  "INDEX",
+  "INFILE",
+  "INNER",
+  "INOUT",
+  "INSENSITIVE",
+  "INSERT",
+  "INT",
+  "INT1",
+  "INT2",
+  "INT3",
+  "INT4",
+  "INT8",
+  "INTEGER",
+  "INTERVAL",
+  "INTO",
+  "IS",
+  "ITERATE",
+  "JOIN",
+  "KEY",
+  "KEYS",
+  "KILL",
+  "LABEL",
+  "LEADING",
+  "LEAVE",
+  "LEFT",
+  "LIKE",
+  "LIMIT",
+  "LINEAR",
+  "LINES",
+  "LOAD",
+  "LOCALTIME",
+  "LOCALTIMESTAMP",
+  "LOCK",
+  "LONG",
+  "LONGBLOB",
+  "LONGTEXT",
+  "LOOP",
+  "LOW_PRIORITY",
+  "MATCH",
+  "MEDIUMBLOB",
+  "MEDIUMINT",
+  "MEDIUMTEXT",
+  "MIDDLEINT",
+  "MINUTE_MICROSECOND",
+  "MINUTE_SECOND",
+  "MOD",
+  "MODIFIES",
+  "NATURAL",
+  "NOT",
+  "NO_WRITE_TO_BINLOG",
+  "NULL",
+  "NUMERIC",
+  "ON",
+  "OPTIMIZE",
+  "OPTION",
+  "OPTIONALLY",
+  "OR",
+  "ORDER",
+  "OUT",
+  "OUTER",
+  "OUTFILE",
+  "PRECISION",
+  "PRIMARY",
+  "PROCEDURE",
+  "PURGE",
+  "RAID0",
+  "RANGE",
+  "READ",
+  "READS",
+  "REAL",
+  "REFERENCES",
+  "REGEXP",
+  "RELEASE",
+  "RENAME",
+  "REPEAT",
+  "REPLACE",
+  "REQUIRE",
+  "RESTRICT",
+  "RETURN",
+  "REVOKE",
+  "RIGHT",
+  "RLIKE",
+  "SCHEMA",
+  "SCHEMAS",
+  "SECOND_MICROSECOND",
+  "SELECT",
+  "SENSITIVE",
+  "SEPARATOR",
+  "SET",
+  "SHOW",
+  "SMALLINT",
+  "SPATIAL",
+  "SPECIFIC",
+  "SQL",
+  "SQLEXCEPTION",
+  "SQLSTATE",
+  "SQLWARNING",
+  "SQL_BIG_RESULT",
+  "SQL_CALC_FOUND_ROWS",
+  "SQL_SMALL_RESULT",
+  "SSL",
+  "STARTING",
+  "STRAIGHT_JOIN",
+  "TABLE",
+  "TERMINATED",
+  "THEN",
+  "TINYBLOB",
+  "TINYINT",
+  "TINYTEXT",
+  "TO",
+  "TRAILING",
+  "TRIGGER",
+  "TRUE",
+  "UNDO",
+  "UNION",
+  "UNIQUE",
+  "UNLOCK",
+  "UNSIGNED",
+  "UPDATE",
+  "USAGE",
+  "USE",
+  "USING",
+  "UTC_DATE",
+  "UTC_TIME",
+  "UTC_TIMESTAMP",
+  "VALUES",
+  "VARBINARY",
+  "VARCHAR",
+  "VARCHARACTER",
+  "VARYING",
+  "WHEN",
+  "WHERE",
+  "WHILE",
+  "WITH",
+  "WRITE",
+  "X509",
+  "XOR",
+  "YEAR_MONTH",
+  "ZEROFILL"
+];
 const _sfc_main = defineComponent({
   name: "DBAttributeTable",
   props: {
@@ -125,9 +352,7 @@ const _sfc_main = defineComponent({
         defaultValue: "string",
         placeholder: "\u8BF7\u9009\u62E9${title}",
         disabled: !props.actionButton,
-        validateRules: [
-          { required: true, message: "\u8BF7\u9009\u62E9${title}" }
-        ]
+        validateRules: [{ required: true, message: "\u8BF7\u9009\u62E9${title}" }]
       },
       {
         title: "\u4E3B\u952E",
@@ -142,6 +367,15 @@ const _sfc_main = defineComponent({
       {
         title: "\u5141\u8BB8\u7A7A\u503C",
         key: "dbIsNull",
+        width: 80,
+        type: JVxeTypes.checkbox,
+        customValue: ["1", "0"],
+        defaultChecked: true,
+        disabled: !props.actionButton
+      },
+      {
+        title: "\u540C\u6B65\u6570\u636E\u5E93",
+        key: "dbIsPersist",
         minWidth: 80,
         type: JVxeTypes.checkbox,
         customValue: ["1", "0"],
@@ -152,7 +386,7 @@ const _sfc_main = defineComponent({
     ]);
     let removeIds = [];
     const setup = useTableSync(columns);
-    const { tableRef, loading, dataSource, tableHeight, setDataSource, validateData } = setup;
+    const { tableRef, loading, dataSource, tableHeight, tableProps, setDataSource, validateData } = setup;
     function handleAdded() {
       emit("added", instance);
     }
@@ -180,11 +414,11 @@ const _sfc_main = defineComponent({
           emit("syncDbType", { row, value, target: instance });
         }
         if (value === "Blob" || value === "Text" || value === "Date") {
-          target.ctx.setValues([{ rowKey: row.id, values: { dbLength: "0" } }]);
+          target.setValues([{ rowKey: row.id, values: { dbLength: "0" } }]);
         } else if (value === "int" || value === "double" || value === "BigDecimal") {
-          target.ctx.setValues([{ rowKey: row.id, values: { dbLength: "10" } }]);
+          target.setValues([{ rowKey: row.id, values: { dbLength: "10" } }]);
         } else if (row["dbLength"] === "0") {
-          target.ctx.setValues([{ rowKey: row.id, values: { dbLength: "32" } }]);
+          target.setValues([{ rowKey: row.id, values: { dbLength: "32" } }]);
         }
       }
     }
@@ -239,6 +473,7 @@ const _sfc_main = defineComponent({
       addBatchEnd,
       tableAddLine,
       tableHeight,
+      tableProps,
       tableDeleteLines,
       handleAdded,
       handleRemoved,
@@ -253,7 +488,7 @@ const _sfc_main = defineComponent({
 });
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_JVxeTable = resolveComponent("JVxeTable");
-  return openBlock(), createBlock(_component_JVxeTable, {
+  return openBlock(), createBlock(_component_JVxeTable, mergeProps({
     ref: "tableRef",
     rowNumber: "",
     rowSelection: "",
@@ -266,13 +501,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     dataSource: _ctx.dataSource,
     toolbar: _ctx.actionButton,
     maxHeight: _ctx.tableHeight.normal,
-    disabledRows: { dbFieldName: ["id", "has_child"] },
+    disabledRows: { dbFieldName: ["id", "has_child"] }
+  }, _ctx.tableProps, {
     onAdded: _ctx.handleAdded,
     onRemoved: _ctx.handleRemoved,
     onDragged: _ctx.handleDragged,
     onInserted: _ctx.handleInserted,
     onValueChange: _ctx.handleValueChange
-  }, null, 8, ["loading", "columns", "dataSource", "toolbar", "maxHeight", "onAdded", "onRemoved", "onDragged", "onInserted", "onValueChange"]);
+  }), null, 16, ["loading", "columns", "dataSource", "toolbar", "maxHeight", "onAdded", "onRemoved", "onDragged", "onInserted", "onValueChange"]);
 }
 var DBAttributeTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export { DBAttributeTable as default };

package/DbToOnlineModal.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createTextVNode } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createTextVNode, createElementVNode } from "vue";
 import { defHttp } from "/@/utils/http/axios";
 import { BasicTable } from "/@/components/Table";
 import { BasicModal, useModalInner } from "/@/components/Modal";
@@ -26,9 +26,7 @@ const _sfc_main = defineComponent({
     });
     const [registerTable, { setPagination }, { rowSelection, selectedRowKeys }] = useListTable({
       bordered: true,
-      columns: [
-        { title: "\u8868\u540D", align: "left", dataIndex: "id" }
-      ],
+      columns: [{ title: "\u8868\u540D", align: "left", dataIndex: "id" }],
       dataSource,
       maxHeight: 300,
       locale: { emptyText },
@@ -63,24 +61,30 @@ const _sfc_main = defineComponent({
     });
     function queryTables() {
       confirmLoading.value = true;
-      return defHttp.get({
-        url: "/online/cgform/head/queryTables/"
-      }, {
-        errorMessageMode: "none"
-      }).then((result) => {
-        dataSource.value = result;
-        metaSource.value = [...result];
-        return result;
-      }, (e) => {
-        if (e.message == "noadminauth") {
-          emptyText.value = "\u975Eadmin\u7528\u6237\u65E0\u6743\u9650\u64CD\u4F5C\uFF01";
-          $message.warn(emptyText.value);
-        } else {
-          console.error(e);
+      return defHttp.get(
+        {
+          url: "/online/cgform/head/queryTables/"
+        },
+        {
+          errorMessageMode: "none"
+        }
+      ).then(
+        (result) => {
+          dataSource.value = result;
+          metaSource.value = [...result];
+          return result;
+        },
+        (e) => {
+          if (e.message == "noadminauth") {
+            emptyText.value = "\u975Eadmin\u7528\u6237\u65E0\u6743\u9650\u64CD\u4F5C\uFF01";
+            $message.warn(emptyText.value);
+          } else {
+            console.error(e);
+          }
+          dataSource.value = [];
+          metaSource.value = [];
         }
-        dataSource.value = [];
-        metaSource.value = [];
-      }).finally(() => {
+      ).finally(() => {
         confirmLoading.value = false;
       });
     }
@@ -133,8 +137,6 @@ const _hoisted_1 = /* @__PURE__ */ createElementVNode("div", null, [
     target: "_blank"
   }, " \u53C2\u8003\u6587\u6863")
 ], -1);
-const _hoisted_2 = /* @__PURE__ */ createTextVNode("\u5173\u95ED");
-const _hoisted_3 = /* @__PURE__ */ createTextVNode(" \u751F\u6210\u8868\u5355 ");
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_BasicTable = resolveComponent("BasicTable");
   const _component_a_spin = resolveComponent("a-spin");
@@ -150,7 +152,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     footer: withCtx(() => [
       createVNode(_component_a_button, { onClick: _ctx.handleCancel }, {
         default: withCtx(() => [
-          _hoisted_2
+          createTextVNode("\u5173\u95ED")
         ]),
         _: 1
       }, 8, ["onClick"]),
@@ -161,7 +163,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         loading: _ctx.confirmLoading || _ctx.btnLoading
       }, {
         default: withCtx(() => [
-          _hoisted_3
+          createTextVNode(" \u751F\u6210\u8868\u5355 ")
         ]),
         _: 1
       }, 8, ["onClick", "loading"])