@jeecg/online - npm Package Compare versions

Comparing version 3.4.4-beta2 to 3.5.3-beta

AuthButtonTree.js

@@ -76,2 +76,3 @@ var __async = (__this, __arguments, generator) => {
         checkedKeys.value = [];
+        yield loadTree();
         let result = yield loadRoleAuthChecked({
@@ -88,2 +89,3 @@ roleId: $roleId,
       roleId.value = "";
+      loadTree();
     }
@@ -182,3 +184,3 @@ function onSave() {
 }
-var AuthButtonTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-0c1d5eb9"]]);
+var AuthButtonTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-0e98e024"]]);
 export { AuthButtonTree as default };

AuthDataTree.js

@@ -58,2 +58,3 @@ var __async = (__this, __arguments, generator) => {
         checkedKeys.value = [];
+        yield loadTree();
         let result = yield loadRoleAuthChecked({
@@ -70,2 +71,3 @@ roleId: $roleId,
       roleId.value = "";
+      loadTree();
     }
@@ -159,3 +161,3 @@ function onRefresh() {
 }
-var AuthDataTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-4ce74ac6"]]);
+var AuthDataTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-a8874950"]]);
 export { AuthDataTree as default };

AuthFieldTree.js

@@ -101,2 +101,3 @@ var __async = (__this, __arguments, generator) => {
         checkedKeys.value = [];
+        yield loadTree();
         let result = yield loadRoleAuthChecked({
@@ -113,2 +114,3 @@ roleId: $roleId,
       roleId.value = "";
+      loadTree();
     }
@@ -280,3 +282,3 @@ function onRefresh() {
 }
-var AuthFieldTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-b03cefd8"]]);
+var AuthFieldTree = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-909a7fde"]]);
 export { AuthFieldTree as default };

AuthSetterModal.js

@@ -90,6 +90,4 @@ var __defProp = Object.defineProperty;
       activeKey.value = "field";
-      if (cgformId.value != data.cgformId) {
-        cgformId.value = data.cgformId;
-        reset();
-      }
+      cgformId.value = data.cgformId;
+      reset();
     });
@@ -96,0 +94,0 @@ function getActiveRef(key = activeKey.value) {

cgform.data.js

@@ -90,3 +90,5 @@ import { getDictItemsByCode } from "/@/utils/dict";
   modalMinWidth: "",
-  commentStatus: 0
+  commentStatus: 0,
+  tableFixedAction: 1,
+  tableFixedActionType: "right"
 };
@@ -93,0 +95,0 @@ function useInitialData() {

CgformCopyList.js

@@ -53,4 +53,5 @@ import { defineComponent, provide, watch, resolveComponent, openBlock, createElementBlock, Fragment, createElementVNode, normalizeClass, createVNode, withCtx, createTextVNode, createCommentVNode } from "vue";
 import "/@/utils";
-import "./useAutoForm.js";
-import "./FormSchemaFactory.js";
+import "./useExtendComponent.js";
+import "/@/components/Form/src/componentMap";
+import "/@/utils/propTypes";
 import "/@/components/Form/src/jeecg/components/JUpload";
@@ -61,6 +62,3 @@ import "/@/views/system/user/user.api";
 import "/@/utils/desform/customExpression";
-import "/@/components/Form/src/componentMap";
-import "./OnlineSelectCascade.js";
 import "/@/store/modules/permission";
-import "/@/utils/propTypes";
 import "/@/hooks/system/useListPage";
@@ -71,2 +69,4 @@ import "vue-router";
 import "./LinkTableListPiece.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "./OnlineSelectCascade.js";
 import "/@/components/Loading";
@@ -98,3 +98,2 @@ import "/@/utils/auth";
 import "./clipboard.js";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 const _sfc_main = defineComponent({
@@ -101,0 +100,0 @@ name: "CgformCopyList",

CgformModal.js

@@ -59,7 +59,15 @@ var __defProp = Object.defineProperty;
 import { sleep } from "/@/utils";
-import { g as getRefPromise } from "./useAutoForm.js";
+import { g as getRefPromise } from "./useExtendComponent.js";
 import { _ as _export_sfc } from "./index.js";
 const list = (params) => defHttp.get({ url: "/online/cgform/head/list", params });
 const doBatchRemove = (idList) => doRemove(idList, 0);
+const doSingleRemove = (pid) => defHttp.delete(
+  { url: "/online/cgform/head/removeRecord", params: { id: pid } },
+  { joinParamsToUrl: true }
+);
 const doBatchDelete = (idList) => doRemove(idList, 1);
+const doSingleDelete = (pid) => defHttp.delete(
+  { url: "/online/cgform/head/delete", params: { id: pid } },
+  { joinParamsToUrl: true }
+);
 function doRemove(idList, flag) {
@@ -773,2 +781,2 @@ return defHttp.delete(
 }, Symbol.toStringTag, { value: "Module" }));
-export { CgformModal as C, doBatchRemove as a, doBatchDelete as b, doDatabaseSync as c, doCopyOnlineView as d, doCopyTable as e, CgformModal$1 as f, list as l };
+export { CgformModal as C, doSingleDelete as a, doSingleRemove as b, doBatchRemove as c, doCopyOnlineView as d, doBatchDelete as e, doDatabaseSync as f, doCopyTable as g, CgformModal$1 as h, list as l };

CheckDictTable.js

@@ -120,3 +120,3 @@ var __defProp = Object.defineProperty;
     function isCustomRegexp(value) {
-      return !validTypeValues.value.includes(value);
+      return value != null && !validTypeValues.value.includes(value);
     }
@@ -202,2 +202,3 @@ function onAddCustomRegexp(props) {
                 options: _ctx.validTypeOptions,
+                placeholder: "\u7A7A",
                 style: { "width": "100%" },
@@ -242,3 +243,3 @@ onChange: props.triggerChange
 }
-var CheckDictTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-8470723a"]]);
+var CheckDictTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-68f6d466"]]);
 export { CheckDictTable as default };

CodeGeneratorModal.js

@@ -30,4 +30,4 @@ var __async = (__this, __arguments, generator) => {
 import FileSelectModal from "./FileSelectModal.js";
+import { message } from "ant-design-vue";
 import { _ as _export_sfc } from "./index.js";
-import "ant-design-vue";
 import "@ant-design/icons-vue";
@@ -199,2 +199,3 @@ import "/@/hooks/web/usePermission";
           } else {
+            message.error(res.message);
             reject(res.message);
@@ -201,0 +202,0 @@ }

DBAttributeTable.js

@@ -425,2 +425,13 @@ var __defProp = Object.defineProperty;
     }
+    function handleDisabledDbFieldName(value, _row, rowIndex) {
+      if (value === "has_child") {
+        return true;
+      }
+      if (value === "id") {
+        if (rowIndex === 0) {
+          return true;
+        }
+      }
+      return false;
+    }
     function tableAddLine(newLine) {
@@ -484,2 +495,3 @@ tableRef.value.pushRows(newLine);
       handleValueChange,
+      handleDisabledDbFieldName,
       validateData,
@@ -506,3 +518,3 @@ getRemoveIds,
     maxHeight: _ctx.tableHeight.normal,
-    disabledRows: { dbFieldName: ["id", "has_child"] }
+    disabledRows: { dbFieldName: _ctx.handleDisabledDbFieldName }
   }, _ctx.tableProps, {
@@ -514,5 +526,5 @@ onAdded: _ctx.handleAdded,
     onValueChange: _ctx.handleValueChange
-  }), null, 16, ["loading", "columns", "dataSource", "toolbar", "maxHeight", "onAdded", "onRemoved", "onDragged", "onInserted", "onValueChange"]);
+  }), null, 16, ["loading", "columns", "dataSource", "toolbar", "maxHeight", "disabledRows", "onAdded", "onRemoved", "onDragged", "onInserted", "onValueChange"]);
 }
 var DBAttributeTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export { DBAttributeTable as default };

DetailForm.js

@@ -49,5 +49,7 @@ var __defProp = Object.defineProperty;
 import { DownloadOutlined, EyeOutlined, PaperClipOutlined } from "@ant-design/icons-vue";
-import { L as LinkTableCard } from "./useAutoForm.js";
+import { L as LinkTableCard } from "./useExtendComponent.js";
 import { _ as _export_sfc } from "./index.js";
-import "./FormSchemaFactory.js";
+import "/@/components/Form/src/componentMap";
+import "/@/components/Modal";
+import "/@/components/Form/index";
 import "/@/components/Form/src/jeecg/components/JUpload";
@@ -59,9 +61,3 @@ import "/@/views/system/user/user.api";
 import "/@/utils/desform/customExpression";
-import "/@/components/Form/src/componentMap";
-import "./OnlineSelectCascade.js";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
 import "/@/store/modules/permission";
-import "/@/components/Modal";
-import "/@/components/Form/index";
 import "./pick.js";
@@ -74,3 +70,6 @@ import "./_flatRest.js";
 import "/@/hooks/system/useListPage";
+import "vue-router";
 import "./LinkTableListPiece.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "./OnlineSelectCascade.js";
 import "/@/components/Loading";
@@ -77,0 +76,0 @@ import "/@/utils/auth";

enhance.data.js

@@ -164,3 +164,3 @@ import { computed } from "vue";
           fullScreen: true,
-          minHeight: 320
+          height: "320px"
         },
@@ -167,0 +167,0 @@ defaultValue: ""

EnhanceJsHistory.js

@@ -224,3 +224,3 @@ var __defProp = Object.defineProperty;
 }
-var EnhanceJsHistory = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-0e8e9411"]]);
+var EnhanceJsHistory = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-3072773c"]]);
 var EnhanceJsHistory$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -227,0 +227,0 @@ __proto__: null,

FieldExtendJsonModal.js

@@ -70,2 +70,3 @@ var __defProp = Object.defineProperty;
       extendConfig.validateError = "";
+      extendConfig.labelLength = 4;
     }
@@ -80,3 +81,4 @@ const extendConfig = reactive({
       orderRule: "",
-      validateError: ""
+      validateError: "",
+      labelLength: 4
     });
@@ -175,2 +177,10 @@ const fieldShowType = ref("");
         }
+      },
+      {
+        label: "label\u957F\u5EA6",
+        field: "labelLength",
+        component: "InputNumber",
+        componentProps: {
+          placeholder: "\u8BF7\u8F93\u5165label\u957F\u5EA6"
+        }
       }
@@ -228,2 +238,5 @@ ];
         }
+        if (data.labelLength) {
+          obj.labelLength = data.labelLength;
+        }
         console.log("obj....", obj);
@@ -230,0 +243,0 @@ for (let key in obj) {

index.js

@@ -56,3 +56,3 @@ const import_meta = {};
     return { "./src/views/super/online/cgform/CgformCopyList.vue": () => import("./CgformCopyList.js"), "./src/views/super/online/cgform/index.vue": () => import("./index2.js"), "./src/views/super/online/cgreport/index.vue": () => import("./index3.js"), "./src/views/super/online/cgform/components/CgformModal.vue": () => import("./CgformModal.js").then(function(n) {
-      return n.f;
+      return n.h;
     }), "./src/views/super/online/cgform/components/CodeFileListModal.vue": () => import("./CodeFileListModal.js"), "./src/views/super/online/cgform/components/CodeFileViewModal.vue": () => import("./CodeFileViewModal.js"), "./src/views/super/online/cgform/components/CodeGeneratorModal.vue": () => import("./CodeGeneratorModal.js"), "./src/views/super/online/cgform/components/DbToOnlineModal.vue": () => import("./DbToOnlineModal.js"), "./src/views/super/online/cgform/components/ExtendConfigModal.vue": () => import("./ExtendConfigModal.js"), "./src/views/super/online/cgform/components/FileSelectModal.vue": () => import("./FileSelectModal.js"), "./src/views/super/online/cgform/extend/FieldExtendJsonModal.vue": () => import("./FieldExtendJsonModal.js"), "./src/views/super/online/cgreport/auto/OnlCgReportList.vue": () => Promise.resolve().then(function() {
@@ -62,16 +62,18 @@ return OnlCgReportList$1;
       return n.C;
-    }), "./src/views/super/online/cgreport/demo/ModalFormDemo.vue": () => import("./ModalFormDemo.js"), "./src/views/super/online/cgform/auto/comp/JOnlineSearchSelect.vue": () => import("./JOnlineSearchSelect.js"), "./src/views/super/online/cgform/auto/comp/OnlineForm.vue": () => import("./OnlineForm.js"), "./src/views/super/online/cgform/auto/comp/OnlineFormDetail.vue": () => import("./OnlineFormDetail.js"), "./src/views/super/online/cgform/auto/comp/OnlinePopForm.vue": () => import("./useAutoForm.js").then(function(n) {
-      return n.n;
-    }), "./src/views/super/online/cgform/auto/comp/OnlinePopListModal.vue": () => import("./useAutoForm.js").then(function(n) {
-      return n.q;
-    }), "./src/views/super/online/cgform/auto/comp/OnlinePopModal.vue": () => import("./useAutoForm.js").then(function(n) {
-      return n.o;
-    }), "./src/views/super/online/cgform/auto/comp/OnlineQueryForm.vue": () => import("./OnlineQueryForm.js"), "./src/views/super/online/cgform/auto/comp/OnlineSearchFormItem.vue": () => import("./OnlineSearchFormItem.js"), "./src/views/super/online/cgform/auto/comp/OnlineSelectCascade.vue": () => import("./OnlineSelectCascade.js"), "./src/views/super/online/cgform/auto/comp/OnlineSubForm.vue": () => import("./useAutoForm.js").then(function(n) {
-      return n.m;
+    }), "./src/views/super/online/cgreport/demo/ModalFormDemo.vue": () => import("./ModalFormDemo.js"), "./src/views/super/online/cgform/auto/comp/JOnlineSearchSelect.vue": () => import("./JOnlineSearchSelect.js"), "./src/views/super/online/cgform/auto/comp/OnlineForm.vue": () => import("./OnlineForm.js").then(function(n) {
+      return n.a;
+    }), "./src/views/super/online/cgform/auto/comp/OnlineFormDetail.vue": () => import("./OnlineFormDetail.js"), "./src/views/super/online/cgform/auto/comp/OnlinePopForm.vue": () => import("./useExtendComponent.js").then(function(n) {
+      return n.s;
+    }), "./src/views/super/online/cgform/auto/comp/OnlinePopListModal.vue": () => import("./useExtendComponent.js").then(function(n) {
+      return n.w;
+    }), "./src/views/super/online/cgform/auto/comp/OnlinePopModal.vue": () => import("./useExtendComponent.js").then(function(n) {
+      return n.t;
+    }), "./src/views/super/online/cgform/auto/comp/OnlineQueryForm.vue": () => import("./OnlineQueryForm.js"), "./src/views/super/online/cgform/auto/comp/OnlineSearchFormItem.vue": () => import("./OnlineSearchFormItem.js"), "./src/views/super/online/cgform/auto/comp/OnlineSelectCascade.vue": () => import("./OnlineSelectCascade.js"), "./src/views/super/online/cgform/auto/comp/OnlineSubForm.vue": () => import("./useExtendComponent.js").then(function(n) {
+      return n.r;
     }), "./src/views/super/online/cgform/auto/comp/OnlineSubFormDetail.vue": () => import("./OnlineSubFormDetail.js"), "./src/views/super/online/cgform/auto/comp/ProcessOnlineForm.vue": () => import("./ProcessOnlineForm.js"), "./src/views/super/online/cgform/auto/default/OnlineAutoList.vue": () => import("./OnlineAutoList.js"), "./src/views/super/online/cgform/auto/default/OnlineAutoModal.vue": () => import("./OnlineAutoModal.js"), "./src/views/super/online/cgform/auto/default/OnlineCustomModal.vue": () => import("./OnlineCustomModal.js"), "./src/views/super/online/cgform/auto/default/OnlineDetailModal.vue": () => import("./OnlineDetailModal.js"), "./src/views/super/online/cgform/auto/tree/OnlineAutoTreeList.vue": () => import("./OnlineAutoTreeList.js"), "./src/views/super/online/cgform/components/auth/AuthManagerDrawer.vue": () => import("./AuthManagerDrawer.js"), "./src/views/super/online/cgform/components/auth/AuthSetterModal.vue": () => import("./AuthSetterModal.js"), "./src/views/super/online/cgform/components/button/CustomButtonList.vue": () => import("./CustomButtonList.js"), "./src/views/super/online/cgform/components/enhance/EnhanceJavaModal.vue": () => import("./EnhanceJavaModal.js"), "./src/views/super/online/cgform/components/enhance/EnhanceJsHistory.vue": () => import("./EnhanceJsHistory.js").then(function(n) {
       return n.a;
-    }), "./src/views/super/online/cgform/components/enhance/EnhanceJsModal.vue": () => import("./EnhanceJsModal.js"), "./src/views/super/online/cgform/components/enhance/EnhanceSqlModal.vue": () => import("./EnhanceSqlModal.js"), "./src/views/super/online/cgform/components/tables/CheckDictTable.vue": () => import("./CheckDictTable.js"), "./src/views/super/online/cgform/components/tables/DBAttributeTable.vue": () => import("./DBAttributeTable.js"), "./src/views/super/online/cgform/components/tables/ForeignKeyTable.vue": () => import("./ForeignKeyTable.js"), "./src/views/super/online/cgform/components/tables/IndexTable.vue": () => import("./IndexTable.js"), "./src/views/super/online/cgform/components/tables/PageAttributeTable.vue": () => import("./PageAttributeTable.js"), "./src/views/super/online/cgform/components/tables/QueryTable.vue": () => import("./QueryTable.js"), "./src/views/super/online/cgform/extend/form/DetailForm.vue": () => import("./DetailForm.js"), "./src/views/super/online/cgform/extend/linkTable/JModalTip.vue": () => import("./JModalTip.js"), "./src/views/super/online/cgform/extend/linkTable/LinkTableCard.vue": () => import("./useAutoForm.js").then(function(n) {
-      return n.r;
-    }), "./src/views/super/online/cgform/extend/linkTable/LinkTableConfigModal.vue": () => import("./LinkTableConfigModal.js"), "./src/views/super/online/cgform/extend/linkTable/LinkTableFieldConfigModal.vue": () => import("./LinkTableFieldConfigModal.js"), "./src/views/super/online/cgform/extend/linkTable/LinkTableListPiece.vue": () => import("./LinkTableListPiece.js"), "./src/views/super/online/cgform/extend/linkTable/LinkTableSelect.vue": () => import("./useAutoForm.js").then(function(n) {
-      return n.p;
+    }), "./src/views/super/online/cgform/components/enhance/EnhanceJsModal.vue": () => import("./EnhanceJsModal.js"), "./src/views/super/online/cgform/components/enhance/EnhanceSqlModal.vue": () => import("./EnhanceSqlModal.js"), "./src/views/super/online/cgform/components/tables/CheckDictTable.vue": () => import("./CheckDictTable.js"), "./src/views/super/online/cgform/components/tables/DBAttributeTable.vue": () => import("./DBAttributeTable.js"), "./src/views/super/online/cgform/components/tables/ForeignKeyTable.vue": () => import("./ForeignKeyTable.js"), "./src/views/super/online/cgform/components/tables/IndexTable.vue": () => import("./IndexTable.js"), "./src/views/super/online/cgform/components/tables/PageAttributeTable.vue": () => import("./PageAttributeTable.js"), "./src/views/super/online/cgform/components/tables/QueryTable.vue": () => import("./QueryTable.js"), "./src/views/super/online/cgform/extend/form/DetailForm.vue": () => import("./DetailForm.js"), "./src/views/super/online/cgform/extend/linkTable/JModalTip.vue": () => import("./JModalTip.js"), "./src/views/super/online/cgform/extend/linkTable/LinkTableCard.vue": () => import("./useExtendComponent.js").then(function(n) {
+      return n.x;
+    }), "./src/views/super/online/cgform/extend/linkTable/LinkTableConfigModal.vue": () => import("./LinkTableConfigModal.js"), "./src/views/super/online/cgform/extend/linkTable/LinkTableFieldConfigModal.vue": () => import("./LinkTableFieldConfigModal.js"), "./src/views/super/online/cgform/extend/linkTable/LinkTableListPiece.vue": () => import("./LinkTableListPiece.js"), "./src/views/super/online/cgform/extend/linkTable/LinkTableSelect.vue": () => import("./useExtendComponent.js").then(function(n) {
+      return n.v;
     }), "./src/views/super/online/cgform/auto/comp/superquery/SuperQuery.vue": () => import("./SuperQuery.js"), "./src/views/super/online/cgform/auto/comp/superquery/SuperQueryValComponent.vue": () => import("./SuperQueryValComponent.js"), "./src/views/super/online/cgform/components/auth/manager/AuthButtonConfig.vue": () => import("./AuthButtonConfig.js"), "./src/views/super/online/cgform/components/auth/manager/AuthDataConfig.vue": () => import("./AuthDataConfig.js"), "./src/views/super/online/cgform/components/auth/manager/AuthFieldConfig.vue": () => import("./AuthFieldConfig.js"), "./src/views/super/online/cgform/components/auth/setter/AuthButtonTree.vue": () => import("./AuthButtonTree.js"), "./src/views/super/online/cgform/components/auth/setter/AuthDataTree.vue": () => import("./AuthDataTree.js"), "./src/views/super/online/cgform/components/auth/setter/AuthFieldTree.vue": () => import("./AuthFieldTree.js"), "./src/views/super/online/cgform/components/auth/setter/LeftDepart.vue": () => import("./LeftDepart.js"), "./src/views/super/online/cgform/components/auth/setter/LeftRole.vue": () => import("./LeftRole.js"), "./src/views/super/online/cgform/components/auth/setter/LeftUser.vue": () => import("./LeftUser.js") };
@@ -81,8 +83,8 @@ }
 const OnlineSelectCascade = defineAsyncComponent(() => import("./OnlineSelectCascade.js"));
-const LinkTableCard = defineAsyncComponent(() => import("./useAutoForm.js").then(function(n) {
-  return n.r;
+const LinkTableCard = defineAsyncComponent(() => import("./useExtendComponent.js").then(function(n) {
+  return n.x;
 }));
-const LinkTableSelect = defineAsyncComponent(() => import("./useAutoForm.js").then(function(n) {
-  return n.p;
+const LinkTableSelect = defineAsyncComponent(() => import("./useExtendComponent.js").then(function(n) {
+  return n.v;
 }));
 export { LinkTableCard as L, OnlineSelectCascade as O, _export_sfc as _, LinkTableSelect as a, index as i };

index2.js

@@ -1,2 +0,2 @@
-import { defineComponent, resolveComponent, openBlock, createElementBlock, Fragment, createElementVNode, normalizeClass, createVNode, mergeProps, withCtx, createTextVNode, createBlock, createCommentVNode } from "vue";
+import { defineComponent, resolveComponent, resolveDirective, openBlock, createElementBlock, Fragment, createElementVNode, normalizeClass, createVNode, mergeProps, withCtx, createTextVNode, withDirectives, createBlock, createCommentVNode } from "vue";
 import { BasicTable, TableAction } from "/@/components/Table";
@@ -56,4 +56,5 @@ import { C as CgformModal } from "./CgformModal.js";
 import "/@/utils";
-import "./useAutoForm.js";
-import "./FormSchemaFactory.js";
+import "./useExtendComponent.js";
+import "/@/components/Form/src/componentMap";
+import "/@/utils/propTypes";
 import "/@/components/Form/src/jeecg/components/JUpload";
@@ -64,6 +65,3 @@ import "/@/views/system/user/user.api";
 import "/@/utils/desform/customExpression";
-import "/@/components/Form/src/componentMap";
-import "./OnlineSelectCascade.js";
 import "/@/store/modules/permission";
-import "/@/utils/propTypes";
 import "/@/hooks/system/useListPage";
@@ -73,2 +71,3 @@ import "/@/components/Form/src/utils/Area";
 import "./LinkTableListPiece.js";
+import "./OnlineSelectCascade.js";
 import "/@/components/Loading";
@@ -204,2 +203,3 @@ import "/@/utils/auth";
   const _component_AuthSetterModal = resolveComponent("AuthSetterModal");
+  const _directive_auth = resolveDirective("auth");
   return openBlock(), createElementBlock(Fragment, null, [
@@ -244,3 +244,3 @@ createElementVNode("div", {
           }, 8, ["onClick"]),
-          createVNode(_component_a_button, {
+          withDirectives((openBlock(), createBlock(_component_a_button, {
             onClick: _ctx.onShowEnhanceSql,
@@ -254,3 +254,5 @@ type: "primary",
             _: 1
-          }, 8, ["onClick"]),
+          }, 8, ["onClick"])), [
+            [_directive_auth, "online:form:enhanceSql:save"]
+          ]),
           createVNode(_component_a_button, {
@@ -266,3 +268,3 @@ onClick: _ctx.onShowEnhanceJava,
           }, 8, ["onClick"]),
-          createVNode(_component_a_button, {
+          withDirectives((openBlock(), createBlock(_component_a_button, {
             onClick: _ctx.onImportDbTable,
@@ -276,4 +278,6 @@ type: "primary",
             _: 1
-          }, 8, ["onClick"]),
-          createVNode(_component_a_button, {
+          }, 8, ["onClick"])), [
+            [_directive_auth, "online:form:importTable"]
+          ]),
+          withDirectives((openBlock(), createBlock(_component_a_button, {
             onClick: _ctx.onGenerateCode,
@@ -287,3 +291,5 @@ type: "primary",
             _: 1
-          }, 8, ["onClick"]),
+          }, 8, ["onClick"])), [
+            [_directive_auth, "online:form:generateCode"]
+          ]),
           _ctx.selectedRowKeys.length > 0 ? (openBlock(), createBlock(_component_a_dropdown, { key: 0 }, {
@@ -290,0 +296,0 @@ overlay: withCtx(() => [

OnlineAutoList.js

@@ -21,2 +21,3 @@ var __async = (__this, __arguments, generator) => {
 };
+import { ref, watch, resolveComponent, openBlock, createElementBlock, createVNode, createBlock, normalizeClass, withCtx, createTextVNode, createCommentVNode, Fragment, renderList, toDisplayString, withDirectives, vShow, createElementVNode, mergeProps, toHandlers, resolveDynamicComponent, normalizeProps, guardReactiveProps } from "vue";
 import { BasicTable, TableAction } from "/@/components/Table";
@@ -27,6 +28,5 @@ import { useMessage } from "/@/hooks/web/useMessage";
 import OnlineDetailModal from "./OnlineDetailModal.js";
-import { watch, resolveComponent, openBlock, createElementBlock, createVNode, createBlock, normalizeClass, withCtx, createTextVNode, createCommentVNode, Fragment, renderList, toDisplayString, withDirectives, vShow, createElementVNode, mergeProps, toHandlers, resolveDynamicComponent, normalizeProps, guardReactiveProps } from "vue";
 import JImportModal from "/@/components/Form/src/jeecg/components/JImportModal.vue";
 import { u as useOnlineTableContext, a as useListButton } from "./useListButton.js";
-import { a as OnlinePopModal, c as useEnhance, j as useTableColumns, g as getRefPromise } from "./useAutoForm.js";
+import { a as OnlinePopModal, d as useEnhance, o as useTableColumns, g as getRefPromise } from "./useExtendComponent.js";
 import OnlineQueryForm from "./OnlineQueryForm.js";
@@ -40,4 +40,2 @@ import OnlineSuperQuery from "./SuperQuery.js";
 import "/@/components/Form/index";
-import "./FormSchemaFactory.js";
-import "/@/components/Form/src/jeecg/components/JUpload";
 import "/@/utils/http/axios";
@@ -49,2 +47,5 @@ import "/@/utils";
 import "@ant-design/icons-vue";
+import "/@/utils/cache";
+import "/@/utils/common/compUtils";
+import "/@/store/modules/user";
 import "./pick.js";
@@ -58,30 +59,28 @@ import "./_flatRest.js";
 import "./_baseSlice.js";
+import "/@/components/jeecg/comment/CommentPanel.vue";
+import "./OnlineFormDetail.js";
+import "./DetailForm.js";
+import "/@/utils/propTypes";
+import "/@/utils/dict";
+import "/@/utils/dict/JDictSelectUtil";
+import "/@/utils/dict/index";
+import "/@/api/common/api";
+import "/@/components/Form/src/utils/Area";
+import "/@/components/Preview/index";
+import "/@/components/Form/src/componentMap";
+import "/@/components/Form/src/jeecg/components/JUpload";
 import "/@/views/system/user/user.api";
 import "./_commonjsHelpers.js";
-import "/@/store/modules/user";
 import "/@/utils/desform/customExpression";
-import "/@/components/Form/src/componentMap";
-import "./OnlineSelectCascade.js";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
 import "/@/store/modules/permission";
-import "/@/utils/propTypes";
-import "/@/utils/dict/JDictSelectUtil";
-import "/@/utils/common/compUtils";
 import "/@/hooks/system/useListPage";
-import "/@/components/Form/src/utils/Area";
-import "/@/components/Preview/index";
+import "vue-router";
 import "./LinkTableListPiece.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "./OnlineSelectCascade.js";
 import "./JModalTip.js";
 import "ant-design-vue";
 import "@vueuse/core";
-import "/@/components/jeecg/comment/CommentPanel.vue";
-import "./OnlineFormDetail.js";
-import "./DetailForm.js";
-import "/@/utils/dict";
-import "/@/utils/dict/index";
-import "/@/api/common/api";
 import "./OnlineSubFormDetail.js";
 import "/@/router";
-import "/@/utils/cache";
 import "/@/hooks/core/onMountedOrActivated";
@@ -173,2 +172,13 @@ import "/@/hooks/system/useMethods";
     } = useListButton(onlineTableContext, onlineExtConfigJson);
+    const exportLoading = ref(false);
+    function onExportExcelOverride() {
+      return __async(this, null, function* () {
+        try {
+          exportLoading.value = true;
+          yield onExportExcel();
+        } finally {
+          setTimeout(() => exportLoading.value = false, 1500);
+        }
+      });
+    }
     const {
@@ -227,2 +237,3 @@ columns,
       return __async(this, null, function* () {
+        console.log("onQueryFormLoaded", json);
         yield getRefPromise(superQueryButtonRef);
@@ -269,2 +280,4 @@ superQueryButtonRef.value.init(json);
       onExportExcel,
+      exportLoading,
+      onExportExcelOverride,
       cgTopButtonList,
@@ -381,3 +394,4 @@ cgLinkButtonList,
           type: "primary",
-          onClick: _ctx.onExportExcel
+          loading: _ctx.exportLoading,
+          onClick: _ctx.onExportExcelOverride
         }, {
@@ -388,3 +402,3 @@ default: withCtx(() => [
           _: 1
-        }, 8, ["onClick"])) : createCommentVNode("", true),
+        }, 8, ["loading", "onClick"])) : createCommentVNode("", true),
         _ctx.cgTopButtonList && _ctx.cgTopButtonList.length > 0 ? (openBlock(true), createElementBlock(Fragment, { key: 3 }, renderList(_ctx.cgTopButtonList, (item, index) => {
@@ -391,0 +405,0 @@ return openBlock(), createElementBlock(Fragment, null, [

OnlineAutoModal.js

@@ -23,4 +23,4 @@ var __async = (__this, __arguments, generator) => {
 import { BasicModal } from "/@/components/Modal";
-import OnlineForm from "./OnlineForm.js";
-import { k as useAutoModal } from "./useAutoForm.js";
+import { O as OnlineForm } from "./OnlineForm.js";
+import { p as useAutoModal } from "./useExtendComponent.js";
 import CommentPanel from "/@/components/jeecg/comment/CommentPanel.vue";
@@ -30,4 +30,2 @@ import { _ as _export_sfc } from "./index.js";
 import "/@/components/Form/index";
-import "./FormSchemaFactory.js";
-import "/@/components/Form/src/jeecg/components/JUpload";
 import "/@/utils/http/axios";
@@ -41,2 +39,5 @@ import "/@/utils";
 import "/@/utils/mitt";
+import "/@/utils/cache";
+import "/@/utils/common/compUtils";
+import "/@/store/modules/user";
 import "./pick.js";
@@ -50,19 +51,18 @@ import "./_flatRest.js";
 import "./_baseSlice.js";
+import "/@/components/Form/src/componentMap";
+import "/@/utils/propTypes";
+import "/@/components/Form/src/jeecg/components/JUpload";
 import "/@/views/system/user/user.api";
 import "./_commonjsHelpers.js";
-import "/@/store/modules/user";
 import "/@/utils/desform/customExpression";
-import "/@/components/Form/src/componentMap";
-import "./OnlineSelectCascade.js";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
 import "/@/store/modules/permission";
-import "/@/utils/propTypes";
 import "/@/utils/dict/JDictSelectUtil";
-import "/@/utils/common/compUtils";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
+import "vue-router";
 import "/@/components/Form/src/utils/Area";
 import "/@/components/Preview/index";
 import "./LinkTableListPiece.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "./OnlineSelectCascade.js";
 import "./JModalTip.js";
@@ -69,0 +69,0 @@ import "ant-design-vue";

OnlineAutoTreeList.js

@@ -29,3 +29,3 @@ var __async = (__this, __arguments, generator) => {
 import { u as useOnlineTableContext, a as useListButton } from "./useListButton.js";
-import { c as useEnhance, j as useTableColumns, g as getRefPromise } from "./useAutoForm.js";
+import { d as useEnhance, o as useTableColumns, g as getRefPromise } from "./useExtendComponent.js";
 import { defHttp } from "/@/utils/http/axios";
@@ -38,4 +38,2 @@ import OnlineQueryForm from "./OnlineQueryForm.js";
 import "/@/components/Form/index";
-import "./FormSchemaFactory.js";
-import "/@/components/Form/src/jeecg/components/JUpload";
 import "/@/utils";
@@ -48,2 +46,5 @@ import "/@/components/Loading";
 import "/@/utils/mitt";
+import "/@/utils/cache";
+import "/@/utils/common/compUtils";
+import "/@/store/modules/user";
 import "./pick.js";
@@ -57,22 +58,21 @@ import "./_flatRest.js";
 import "./_baseSlice.js";
+import "/@/components/jeecg/comment/CommentPanel.vue";
+import "/@/components/Form/src/componentMap";
+import "/@/utils/propTypes";
+import "/@/components/Form/src/jeecg/components/JUpload";
 import "/@/views/system/user/user.api";
 import "./_commonjsHelpers.js";
-import "/@/store/modules/user";
 import "/@/utils/desform/customExpression";
-import "/@/components/Form/src/componentMap";
-import "./OnlineSelectCascade.js";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
 import "/@/store/modules/permission";
-import "/@/utils/propTypes";
 import "/@/utils/dict/JDictSelectUtil";
-import "/@/utils/common/compUtils";
 import "/@/hooks/system/useListPage";
+import "vue-router";
 import "/@/components/Form/src/utils/Area";
 import "/@/components/Preview/index";
 import "./LinkTableListPiece.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "./OnlineSelectCascade.js";
 import "./JModalTip.js";
 import "ant-design-vue";
 import "@vueuse/core";
-import "/@/components/jeecg/comment/CommentPanel.vue";
 import "./OnlineFormDetail.js";
@@ -85,3 +85,2 @@ import "./DetailForm.js";
 import "/@/router";
-import "/@/utils/cache";
 import "/@/hooks/core/onMountedOrActivated";
@@ -88,0 +87,0 @@ import "/@/hooks/system/useMethods";

OnlineCustomModal.js

@@ -23,8 +23,12 @@ var __async = (__this, __arguments, generator) => {
 import { BasicModal, useModalInner } from "/@/components/Modal";
-import { g as getRefPromise } from "./useAutoForm.js";
+import { g as getRefPromise } from "./useExtendComponent.js";
 import { defHttp } from "/@/utils/http/axios";
-import OnlineForm from "./OnlineForm.js";
+import { O as OnlineForm } from "./OnlineForm.js";
 import { importViewsFile } from "/@/utils";
 import { _ as _export_sfc } from "./index.js";
-import "./FormSchemaFactory.js";
+import "/@/components/Form/src/componentMap";
+import "/@/utils/propTypes";
+import "@ant-design/icons-vue";
+import "/@/hooks/web/useMessage";
+import "/@/components/Form/index";
 import "/@/components/Form/src/jeecg/components/JUpload";
@@ -35,11 +39,3 @@ import "/@/views/system/user/user.api";
 import "/@/utils/desform/customExpression";
-import "/@/components/Form/src/componentMap";
-import "./OnlineSelectCascade.js";
-import "/@/hooks/web/useMessage";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
 import "/@/store/modules/permission";
-import "/@/utils/propTypes";
-import "@ant-design/icons-vue";
-import "/@/components/Form/index";
 import "/@/utils/dict/JDictSelectUtil";
@@ -54,5 +50,8 @@ import "/@/utils/common/compUtils";
 import "/@/hooks/system/useListPage";
+import "vue-router";
 import "/@/components/Form/src/utils/Area";
 import "/@/components/Preview/index";
 import "./LinkTableListPiece.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "./OnlineSelectCascade.js";
 import "/@/components/Loading";
@@ -66,2 +65,3 @@ import "/@/utils/auth";
 import "/@/utils/mitt";
+import "/@/utils/cache";
 import "./omit.js";
@@ -240,3 +240,3 @@ import "./_baseClone.js";
     onRegister: _ctx.registerModal,
-    wrapClassName: "jeecg-online-modal",
+    wrapClassName: "jeecg-online-modal2",
     onOk: _ctx.handleSubmit
@@ -274,3 +274,4 @@ }), {
             onRendered: _ctx.renderSuccess,
-            onSuccess: _ctx.handleSuccess
+            onSuccess: _ctx.handleSuccess,
+            modalClass: "jeecg-online-modal2"
           }, null, 8, ["id", "form-template", "onRendered", "onSuccess"])) : (openBlock(), createBlock(resolveDynamicComponent(_ctx.customFormComponent.is), {
@@ -277,0 +278,0 @@ key: 1,

OnlineDetailModal.js

@@ -21,6 +21,6 @@ var __async = (__this, __arguments, generator) => {
 };
-import { defineComponent, watch, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createVNode, createTextVNode } from "vue";
+import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createVNode, createTextVNode } from "vue";
 import { BasicModal } from "/@/components/Modal";
 import OnlineFormDetail from "./OnlineFormDetail.js";
-import { k as useAutoModal } from "./useAutoForm.js";
+import { p as useAutoModal } from "./useExtendComponent.js";
 import CommentPanel from "/@/components/jeecg/comment/CommentPanel.vue";
@@ -43,3 +43,4 @@ import { _ as _export_sfc } from "./index.js";
 import "/@/components/Preview/index";
-import "./FormSchemaFactory.js";
+import "/@/components/Form/src/componentMap";
+import "/@/components/Form/index";
 import "/@/components/Form/src/jeecg/components/JUpload";
@@ -50,8 +51,3 @@ import "/@/views/system/user/user.api";
 import "/@/utils/desform/customExpression";
-import "/@/components/Form/src/componentMap";
-import "./OnlineSelectCascade.js";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
 import "/@/store/modules/permission";
-import "/@/components/Form/index";
 import "./pick.js";
@@ -64,3 +60,6 @@ import "./_flatRest.js";
 import "/@/hooks/system/useListPage";
+import "vue-router";
 import "./LinkTableListPiece.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "./OnlineSelectCascade.js";
 import "./JModalTip.js";
@@ -85,4 +84,9 @@ import "ant-design-vue";
   emits: ["success", "register"],
-  setup(props) {
+  setup(props, { emit }) {
     console.log("\u8FDB\u5165\u8868\u5355\u5F39\u6846\u300B\u300B\u300B\u300Bmodal");
+    const commentPanelRef = ref();
+    function reloadComment() {
+      if (commentPanelRef.value)
+        commentPanelRef.value.reload();
+    }
     const {
@@ -109,3 +113,3 @@ title,
       enableComment
-    } = useAutoModal();
+    } = useAutoModal(false, { emit }, reloadComment);
     watch(() => props.id, renderFormItems, { immediate: true });
@@ -140,3 +144,4 @@ function renderFormItems() {
       formDataId,
-      enableComment
+      enableComment,
+      commentPanelRef
     };
@@ -174,2 +179,3 @@ return that;
       createVNode(_component_comment_panel, {
+        ref: "commentPanelRef",
         tableName: _ctx.tableName,
@@ -176,0 +182,0 @@ dataId: _ctx.formDataId

OnlineForm.js

@@ -37,9 +37,11 @@ var __defProp = Object.defineProperty;
 };
+import * as HOOK_MESSAGE from "/@/hooks/web/useMessage";
 import { useMessage } from "/@/hooks/web/useMessage";
+import * as vue from "vue";
 import { ref, reactive, computed, resolveComponent, openBlock, createElementBlock, createVNode, createCommentVNode, createBlock, withCtx, Fragment, renderList, normalizeStyle, renderSlot, unref, nextTick, toRaw } from "vue";
 import { BasicForm, useForm } from "/@/components/Form/index";
-import { V as VALIDATE_FAILED, S as SUBMIT_FLOW_KEY, b as SUBMIT_FLOW_ID, O as ONL_FORM_TABLE_NAME } from "./FormSchemaFactory.js";
+import { O as OnlineSubForm, a as OnlinePopModal, b as useOnlineFormContext, c as useFormItems, d as useEnhance, l as loadFormFieldsDefVal, g as getRefPromise, V as VALIDATE_FAILED, S as SUBMIT_FLOW_KEY, e as SUBMIT_FLOW_ID, f as ONL_FORM_TABLE_NAME } from "./useExtendComponent.js";
+import * as UTIL_AXIOS from "/@/utils/http/axios";
 import { defHttp } from "/@/utils/http/axios";
 import { sleep, goJmReportViewPage } from "/@/utils";
-import { O as OnlineSubForm, a as OnlinePopModal, u as useOnlineFormContext, b as useFormItems, c as useEnhance, l as loadFormFieldsDefVal, g as getRefPromise } from "./useAutoForm.js";
 import { Loading } from "/@/components/Loading";
@@ -52,32 +54,60 @@ import "/@/components/jeecg/JVxeTable/types";
 import { useModal } from "/@/components/Modal";
+import * as UTIL_CACHE from "/@/utils/cache";
+import { randomString } from "/@/utils/common/compUtils";
+import * as HOOK_USERINFO from "/@/store/modules/user";
 import { _ as _export_sfc } from "./index.js";
 import { p as pick } from "./pick.js";
 import { o as omit } from "./omit.js";
-import "/@/components/Form/src/jeecg/components/JUpload";
-import "/@/views/system/user/user.api";
-import "./_commonjsHelpers.js";
-import "/@/store/modules/user";
-import "/@/utils/desform/customExpression";
-import "/@/components/Form/src/componentMap";
-import "./OnlineSelectCascade.js";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
-import "/@/store/modules/permission";
-import "/@/utils/propTypes";
-import "/@/utils/dict/JDictSelectUtil";
-import "/@/utils/common/compUtils";
-import "/@/components/Table";
-import "/@/hooks/system/useListPage";
-import "/@/components/Form/src/utils/Area";
-import "/@/components/Preview/index";
-import "./LinkTableListPiece.js";
-import "./JModalTip.js";
-import "ant-design-vue";
-import "@vueuse/core";
-import "./_flatRest.js";
-import "./isArray.js";
-import "./toString.js";
-import "./_arrayPush.js";
-import "./_baseClone.js";
-import "./_baseSlice.js";
+const $exports = {
+  vue,
+  "@": {
+    hooks: {
+      useMessage: HOOK_MESSAGE,
+      useUserStore: HOOK_USERINFO
+    },
+    utils: {
+      axios: UTIL_AXIOS,
+      cache: UTIL_CACHE
+    }
+  }
+};
+function useCustomHook(otherExports, context) {
+  const assignExports = Object.assign({}, $exports, otherExports);
+  function doImport(path) {
+    if (path != null && path != "") {
+      let paths = path.toString().split("/");
+      let result = assignExports[paths[0]];
+      for (let i = 1; i < paths.length; i++) {
+        result = result[paths[i]];
+      }
+      return result;
+    }
+    return null;
+  }
+  function doExport() {
+  }
+  function executeJsEnhanced(code, row) {
+    let randomKey = randomString(6);
+    let exportKey = "__export_" + randomKey;
+    if (row) {
+      const executeCode = `return function (row, customImport, ${exportKey}) {"use strict"; ${code}}`;
+      console.group("executeJsEnhanced");
+      console.log(executeCode);
+      console.groupEnd();
+      const fun = new Function(executeCode)();
+      fun.call(context, row, doImport, doExport);
+    } else {
+      const executeCode = `return function (customImport, ${exportKey}) {"use strict"; ${code}}`;
+      console.group("executeJsEnhanced");
+      console.log(executeCode);
+      console.groupEnd();
+      const fun = new Function(executeCode)();
+      fun.call(context, doImport, doExport);
+    }
+  }
+  return {
+    executeJsEnhanced
+  };
+}
+const GET_FUN_BODY_REG = /(?:\/\*[\s\S]*?\*\/|\/\/.*?\r?\n|[^{])+\{([\s\S]*)\}$/;
 const urlObject = {
@@ -122,2 +152,6 @@ optPre: "/online/cgform/api/form/",
       default: true
+    },
+    modalClass: {
+      type: String,
+      default: ""
     }
@@ -162,2 +196,3 @@ },
     let { EnhanceJS, initCgEnhanceJs } = useEnhance(onlineFormContext, false);
+    const { executeJsEnhanced } = useCustomHook({}, onlineFormContext);
     const [registerForm, { setProps, validate, resetFields, setFieldsValue, updateSchema, getFieldsValue, scrollToField }] = useForm({
@@ -303,7 +338,17 @@ schemas: formSchemas,
           }
+          onChangeEvent(field, value, changeFormData);
         };
+        if (EnhanceJS && EnhanceJS["setup"]) {
+          executeEnhanceFormJsHook(EnhanceJS["setup"]);
+        }
       });
     }
+    function onChangeEvent(field, value, changeFormData) {
+      onlineFormContext.changEvent(field, value, changeFormData);
+    }
+    function onlineFormValueChange(callback) {
+      onlineFormContext.addObject2Context("changEvent", callback);
+    }
     function handleExtConfigJson(jsonStr) {
-      let extConfigJson = { reportPrintShow: 0, reportPrintUrl: "", joinQuery: 0, modelFullscreen: 1, modalMinWidth: "", commentStatus: 0 };
+      let extConfigJson = { reportPrintShow: 0, reportPrintUrl: "", joinQuery: 0, modelFullscreen: 0, modalMinWidth: "", commentStatus: 0 };
       if (jsonStr) {
@@ -540,3 +585,5 @@ extConfigJson = JSON.parse(jsonStr);
       console.log("handleAdded", sub, event);
-      handleSubTableDefaultValue(sub, event);
+      if (!event.isModalData) {
+        handleSubTableDefaultValue(sub, event);
+      }
     }
@@ -566,6 +613,17 @@ function getSubTableAuthPre(table) {
     }
+    function executeEnhanceFormJsHook(funStr) {
+      let str = funStr.toLocaleString();
+      let arr = str.match(GET_FUN_BODY_REG);
+      if (arr.length > 1) {
+        let temp = arr[1];
+        executeJsEnhanced(temp);
+      }
+    }
     function handleCgButtonClick(optType, buttonCode) {
       if ("js" == optType) {
+        let hookFunName = buttonCode + "_hook";
         if (EnhanceJS && EnhanceJS[buttonCode]) {
           EnhanceJS[buttonCode].call(onlineFormContext, onlineFormContext);
+        } else if (EnhanceJS && EnhanceJS[hookFunName]) {
+          executeEnhanceFormJsHook(EnhanceJS[hookFunName]);
         }
@@ -663,3 +721,3 @@ } else if ("action" == optType) {
       return __async(this, null, function* () {
-        console.log("\u81EA\u5B9A\u4E49\u5F39\u7A97\u6253\u5F00online\u8868\u5355\u300B\u300Bform", record);
+        console.log("\u81EA\u5B9A\u4E49\u5F39\u7A97\u6253\u5F00online\u8868\u53552\u300B\u300Bform", record);
         customEditSubmitUrl.value = editSubmitUrl;
@@ -699,3 +757,3 @@ yield resetFields();
       popModalRequest.value = false;
-      openPopModal(true, { isUpdate: false });
+      openPopModal(true, { isUpdate: false, tableType: "3" });
     }
@@ -723,3 +781,3 @@ function openSubFormModalForEdit(sub) {
         let instance = getSubTableInstance(tableName2);
-        instance.addRows(record, { isOnlineJS: false, setActive: false, emitChange: true });
+        instance.addRows(record, { isOnlineJS: false, setActive: false, emitChange: true, isModalData: true });
       }
@@ -793,3 +851,6 @@ }
       executeMainFillRule,
-      executeSubFillRule
+      executeSubFillRule,
+      changEvent: () => {
+      },
+      onlineFormValueChange
     };
@@ -916,3 +977,4 @@ resetContext(context);
                   toolbarSuffix: withCtx(() => [
-                    createVNode(_component_a_button, {
+                    !$setup.onlineFormDisabled ? (openBlock(), createBlock(_component_a_button, {
+                      key: 0,
                       type: "primary",
@@ -925,4 +987,5 @@ onClick: ($event) => $setup.openSubFormModalForAdd(sub)
                       _: 2
-                    }, 1032, ["onClick"]),
-                    createVNode(_component_a_button, {
+                    }, 1032, ["onClick"])) : createCommentVNode("", true),
+                    !$setup.onlineFormDisabled ? (openBlock(), createBlock(_component_a_button, {
+                      key: 1,
                       type: "primary",
@@ -935,3 +998,3 @@ onClick: ($event) => $setup.openSubFormModalForEdit(sub)
                       _: 2
-                    }, 1032, ["onClick"])
+                    }, 1032, ["onClick"])) : createCommentVNode("", true)
                   ]),
@@ -954,2 +1017,3 @@ _: 2
     createVNode(_component_online_pop_modal, {
+      formTableType: "3",
       request: $setup.popModalRequest,
@@ -965,2 +1029,6 @@ id: $setup.popTableName,
 var OnlineForm = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-export { OnlineForm as default };
+var OnlineForm$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+  __proto__: null,
+  "default": OnlineForm
+}, Symbol.toStringTag, { value: "Module" }));
+export { GET_FUN_BODY_REG as G, OnlineForm as O, OnlineForm$1 as a, useCustomHook as u };

OnlineFormDetail.js

@@ -45,3 +45,3 @@ var __defProp = Object.defineProperty;
 import OnlineSubFormDetail from "./OnlineSubFormDetail.js";
-import { d as getDetailFormSchemas } from "./useAutoForm.js";
+import { h as getDetailFormSchemas } from "./useExtendComponent.js";
 import { defHttp } from "/@/utils/http/axios";
@@ -58,3 +58,4 @@ import { _ as _export_sfc } from "./index.js";
 import "/@/components/Form/index";
-import "./FormSchemaFactory.js";
+import "/@/components/Form/src/componentMap";
+import "/@/components/Modal";
 import "/@/components/Form/src/jeecg/components/JUpload";
@@ -65,8 +66,3 @@ import "/@/views/system/user/user.api";
 import "/@/utils/desform/customExpression";
-import "/@/components/Form/src/componentMap";
-import "./OnlineSelectCascade.js";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
 import "/@/store/modules/permission";
-import "/@/components/Modal";
 import "./pick.js";
@@ -79,3 +75,6 @@ import "./_flatRest.js";
 import "/@/hooks/system/useListPage";
+import "vue-router";
 import "./LinkTableListPiece.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "./OnlineSelectCascade.js";
 import "./JModalTip.js";
@@ -140,3 +139,3 @@ import "ant-design-vue";
     });
-    const { detailFormSchemas, hasSubTable, subTabInfo, refMap, subDataSource, createFormSchemas, formSpan } = getDetailFormSchemas(props);
+    const { detailFormSchemas, hasSubTable, subTabInfo, refMap, showStatus, subDataSource, createFormSchemas, formSpan } = getDetailFormSchemas(props);
     function handleExtConfigJson(jsonStr) {
@@ -165,2 +164,3 @@ let extConfigJson = { reportPrintShow: 0, reportPrintUrl: "", joinQuery: 0, modelFullscreen: 1, modalMinWidth: "" };
         yield edit(record);
+        changeShowStatus(true);
       });
@@ -183,2 +183,13 @@ }
     }
+    function changeShowStatus(flag) {
+      Object.keys(showStatus).map((k) => {
+        showStatus[k] = flag;
+      });
+    }
+    function onTabChange() {
+      changeShowStatus(false);
+      setTimeout(() => {
+        changeShowStatus(true);
+      }, 300);
+    }
     function edit(record) {
@@ -245,2 +256,3 @@ return __async(this, null, function* () {
       refMap,
+      onTabChange,
       subDataSource,
@@ -252,3 +264,4 @@ getSubTableAuthPre,
       onlineExtConfigJson,
-      getSubTableForeignKeyValue
+      getSubTableForeignKeyValue,
+      showStatus
     };
@@ -268,2 +281,3 @@ }
   const _component_JVxeTable = resolveComponent("JVxeTable");
+  const _component_a_spin = resolveComponent("a-spin");
   const _component_a_tab_pane = resolveComponent("a-tab-pane");
@@ -287,3 +301,6 @@ const _component_a_tabs = resolveComponent("a-tabs");
     }, null, 8, ["schemas", "data", "span"]),
-    $setup.hasSubTable && $props.showSub ? (openBlock(), createBlock(_component_a_tabs, { key: 1 }, {
+    $setup.hasSubTable && $props.showSub ? (openBlock(), createBlock(_component_a_tabs, {
+      key: 1,
+      onChange: $setup.onTabChange
+    }, {
       default: withCtx(() => [
@@ -308,3 +325,4 @@ (openBlock(true), createElementBlock(Fragment, null, renderList($setup.subTabInfo, (sub, index) => {
               ], 4)) : (openBlock(), createElementBlock("div", _hoisted_3, [
-                createVNode(_component_JVxeTable, {
+                $setup.showStatus[sub.key] ? (openBlock(), createBlock(_component_JVxeTable, {
+                  key: 0,
                   ref_for: true,
@@ -321,3 +339,6 @@ ref: $setup.refMap[sub.key],
                   authPre: $setup.getSubTableAuthPre(sub.key)
-                }, null, 8, ["height", "columns", "dataSource", "authPre"])
+                }, null, 8, ["height", "columns", "dataSource", "authPre"])) : (openBlock(), createBlock(_component_a_spin, {
+                  key: 1,
+                  spinning: true
+                }))
               ]))
@@ -330,3 +351,3 @@ ]),
       _: 1
-    })) : createCommentVNode("", true),
+    }, 8, ["onChange"])) : createCommentVNode("", true),
     createVNode(_component_Loading, {
@@ -333,0 +354,0 @@ loading: $setup.loading,

OnlineQueryForm.js

@@ -41,5 +41,8 @@ var __defProp = Object.defineProperty;
 import { useMessage } from "/@/hooks/web/useMessage";
-import { c as FORM_VIEW_TO_QUERY_VIEW, F as FormSchemaFactory } from "./FormSchemaFactory.js";
-import { g as getRefPromise, e as loadOneFieldDefVal, f as LINK_DOWN, h as handleLinkDown, i as getFieldIndex } from "./useAutoForm.js";
+import { u as useExtendComponent, g as getRefPromise, i as FORM_VIEW_TO_QUERY_VIEW, j as loadOneFieldDefVal, F as FormSchemaFactory, k as LINK_DOWN, m as handleLinkDown, n as getFieldIndex } from "./useExtendComponent.js";
 import { _ as _export_sfc } from "./index.js";
+import "/@/components/Form/src/componentMap";
+import "/@/utils/propTypes";
+import "@ant-design/icons-vue";
+import "/@/components/Modal";
 import "/@/components/Form/src/jeecg/components/JUpload";
@@ -51,10 +54,3 @@ import "/@/views/system/user/user.api";
 import "/@/utils/desform/customExpression";
-import "/@/components/Form/src/componentMap";
-import "./OnlineSelectCascade.js";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
 import "/@/store/modules/permission";
-import "/@/utils/propTypes";
-import "@ant-design/icons-vue";
-import "/@/components/Modal";
 import "/@/utils/dict/JDictSelectUtil";
@@ -69,5 +65,8 @@ import "/@/utils/common/compUtils";
 import "/@/hooks/system/useListPage";
+import "vue-router";
 import "/@/components/Form/src/utils/Area";
 import "/@/components/Preview/index";
 import "./LinkTableListPiece.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "./OnlineSelectCascade.js";
 import "/@/components/Loading";
@@ -101,2 +100,3 @@ import "/@/utils/auth";
     const { createMessage: $message } = useMessage();
+    const { linkTableCard2Select } = useExtendComponent();
     const defaultValues = reactive({
@@ -143,2 +143,7 @@ config: {},
           const item = formProperties[key];
+          if (key === "sys_org_code") {
+            if (!item.fieldExtendJson) {
+              item.fieldExtendJson = '{"store":"orgCode"}';
+            }
+          }
           let view = item.view;
@@ -194,2 +199,3 @@ if (FORM_VIEW_TO_QUERY_VIEW[view]) {
           }
+          linkTableCard2Select(tempSchema);
           schemaArray.push(tempSchema);
@@ -359,3 +365,3 @@ }
 };
-const _withScopeId = (n) => (pushScopeId("data-v-716ddf4f"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-4b8f6d7a"), n = n(), popScopeId(), n);
 const _hoisted_1 = {
@@ -484,3 +490,3 @@ key: 0,
 }
-var OnlineQueryForm = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-716ddf4f"]]);
+var OnlineQueryForm = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-4b8f6d7a"]]);
 export { OnlineQueryForm as default };

OnlineSubFormDetail.js

@@ -25,7 +25,10 @@ var __async = (__this, __arguments, generator) => {
 import { defHttp } from "/@/utils/http/axios";
-import { d as getDetailFormSchemas, g as getRefPromise } from "./useAutoForm.js";
+import { h as getDetailFormSchemas, g as getRefPromise } from "./useExtendComponent.js";
 import { Loading } from "/@/components/Loading";
 import DetailForm from "./DetailForm.js";
 import { _ as _export_sfc } from "./index.js";
-import "./FormSchemaFactory.js";
+import "/@/components/Form/src/componentMap";
+import "/@/utils/propTypes";
+import "@ant-design/icons-vue";
+import "/@/components/Modal";
 import "/@/components/Form/src/jeecg/components/JUpload";
@@ -37,10 +40,3 @@ import "/@/views/system/user/user.api";
 import "/@/utils/desform/customExpression";
-import "/@/components/Form/src/componentMap";
-import "./OnlineSelectCascade.js";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
 import "/@/store/modules/permission";
-import "/@/utils/propTypes";
-import "@ant-design/icons-vue";
-import "/@/components/Modal";
 import "/@/utils/dict/JDictSelectUtil";
@@ -55,5 +51,8 @@ import "/@/utils/common/compUtils";
 import "/@/hooks/system/useListPage";
+import "vue-router";
 import "/@/components/Form/src/utils/Area";
 import "/@/components/Preview/index";
 import "./LinkTableListPiece.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "./OnlineSelectCascade.js";
 import "/@/utils/auth";
@@ -60,0 +59,0 @@ import "./JModalTip.js";

package.json

 {
   "name": "@jeecg/online",
-  "version": "3.4.4-beta2",
+  "version": "3.5.3-beta",
   "main": "./main.index.js",
   "module": "./main.index.js"
 }

PageAttributeTable.js

@@ -101,3 +101,3 @@ var __defProp = Object.defineProperty;
       { title: "\u5B57\u6BB5\u540D\u79F0", key: "dbFieldName", width: 100 },
-      { title: "\u5B57\u6BB5\u5907\u6CE8", key: "dbFieldTxt", width: 100 },
+      { title: "\u5B57\u6BB5\u5907\u6CE8", key: "dbFieldTxt", width: 150 },
       {
@@ -486,3 +486,3 @@ title: "\u8868\u5355\u663E\u793A",
 }
-var PageAttributeTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-58928976"]]);
+var PageAttributeTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-5c39d0ca"]]);
 export { PageAttributeTable as default };

ProcessOnlineForm.js

@@ -21,11 +21,9 @@ var __async = (__this, __arguments, generator) => {
 };
-import OnlineForm from "./OnlineForm.js";
+import { O as OnlineForm } from "./OnlineForm.js";
 import { defineComponent, ref, watch, nextTick, resolveComponent, openBlock, createElementBlock, createVNode, withCtx, createTextVNode, createCommentVNode } from "vue";
 import { defHttp } from "/@/utils/http/axios";
-import { g as getRefPromise } from "./useAutoForm.js";
+import { g as getRefPromise } from "./useExtendComponent.js";
 import { _ as _export_sfc } from "./index.js";
 import "/@/hooks/web/useMessage";
 import "/@/components/Form/index";
-import "./FormSchemaFactory.js";
-import "/@/components/Form/src/jeecg/components/JUpload";
 import "/@/utils";
@@ -39,2 +37,5 @@ import "/@/components/Loading";
 import "/@/components/Modal";
+import "/@/utils/cache";
+import "/@/utils/common/compUtils";
+import "/@/store/modules/user";
 import "./pick.js";
@@ -48,19 +49,18 @@ import "./_flatRest.js";
 import "./_baseSlice.js";
+import "/@/components/Form/src/componentMap";
+import "/@/utils/propTypes";
+import "/@/components/Form/src/jeecg/components/JUpload";
 import "/@/views/system/user/user.api";
 import "./_commonjsHelpers.js";
-import "/@/store/modules/user";
 import "/@/utils/desform/customExpression";
-import "/@/components/Form/src/componentMap";
-import "./OnlineSelectCascade.js";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
 import "/@/store/modules/permission";
-import "/@/utils/propTypes";
 import "/@/utils/dict/JDictSelectUtil";
-import "/@/utils/common/compUtils";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
+import "vue-router";
 import "/@/components/Form/src/utils/Area";
 import "/@/components/Preview/index";
 import "./LinkTableListPiece.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "./OnlineSelectCascade.js";
 import "./JModalTip.js";
@@ -67,0 +67,0 @@ import "ant-design-vue";

SuperQuery.js

@@ -27,13 +27,36 @@ var __defProp = Object.defineProperty;
 import { useRoute } from "vue-router";
-import { F as FormSchemaFactory } from "./FormSchemaFactory.js";
+import { u as useExtendComponent, F as FormSchemaFactory } from "./useExtendComponent.js";
 import { _ as _sfc_main$1 } from "./SuperQueryValComponent.vue_vue_type_script_lang.js";
 import { MinusCircleOutlined, PlusOutlined, FileTextOutlined, CloseCircleOutlined, AppstoreTwoTone } from "@ant-design/icons-vue";
 import { _ as _export_sfc } from "./index.js";
+import "/@/components/Form/src/componentMap";
+import "/@/utils/propTypes";
+import "/@/components/Form/index";
+import "/@/utils/http/axios";
 import "/@/components/Form/src/jeecg/components/JUpload";
-import "/@/components/Form/src/componentMap";
+import "/@/views/system/user/user.api";
+import "./_commonjsHelpers.js";
+import "/@/store/modules/user";
+import "/@/utils";
+import "/@/utils/desform/customExpression";
+import "/@/store/modules/permission";
+import "/@/utils/dict/JDictSelectUtil";
+import "./pick.js";
+import "./_flatRest.js";
+import "./isArray.js";
+import "./toString.js";
+import "./_arrayPush.js";
+import "/@/components/Table";
+import "/@/hooks/system/useListPage";
+import "/@/components/Form/src/utils/Area";
+import "/@/components/Preview/index";
+import "./LinkTableListPiece.js";
+import "./OnlineSelectCascade.js";
+import "/@/components/Loading";
+import "/@/utils/auth";
+import "./JModalTip.js";
+import "@vueuse/core";
 import "/@/components/Form/src/helper";
 import "/@/utils/is";
 import "./_baseSlice.js";
-import "./toString.js";
-import "./isArray.js";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
@@ -52,2 +75,3 @@ const FORM_VIEW_TO_QUERY_VIEW = {
 function useSuperQuery() {
+  const { linkTableCard2Select } = useExtendComponent();
   const { createMessage: $message } = useMessage();
@@ -139,2 +163,3 @@ const formRef = ref();
     }
+    linkTableCard2Select(schema);
     return schema;
@@ -554,3 +579,3 @@ }
 };
-const _withScopeId = (n) => (pushScopeId("data-v-050f6852"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-31ffc821"), n = n(), popScopeId(), n);
 const _hoisted_1 = { class: "j-super-query-button" };
@@ -643,3 +668,3 @@ const _hoisted_2 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", null, "\u5DF2\u6709\u9AD8\u7EA7\u67E5\u8BE2\u6761\u4EF6\u751F\u6548", -1));
         canFullscreen: false,
-        width: 700,
+        width: 750,
         onRegister: $setup.registerFormModal,
@@ -873,3 +898,3 @@ onOk: $setup.handleSubmit
                               name: ["values", index, "val"],
-                              style: { "width": "180px" }
+                              style: { "width": "300px" }
                             }, {
@@ -1001,3 +1026,3 @@ default: withCtx(() => [
 }
-var OnlineSuperQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-050f6852"]]);
+var OnlineSuperQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-31ffc821"]]);
 export { OnlineSuperQuery as default };

useCgformList.js

@@ -46,3 +46,3 @@ var __defProp = Object.defineProperty;
 import { useListPage } from "/@/hooks/system/useListPage";
-import { l as list, d as doCopyOnlineView, a as doBatchRemove, b as doBatchDelete, c as doDatabaseSync, e as doCopyTable } from "./CgformModal.js";
+import { l as list, d as doCopyOnlineView, a as doSingleDelete, b as doSingleRemove, c as doBatchRemove, e as doBatchDelete, f as doDatabaseSync, g as doCopyTable } from "./CgformModal.js";
 import { C as Clipboard } from "./clipboard.js";
@@ -165,2 +165,14 @@ import { useMessage } from "/@/hooks/web/useMessage";
   }
+  function handleDelete(id) {
+    return __async(this, null, function* () {
+      yield doSingleDelete(id);
+      reload();
+    });
+  }
+  function handleRemove(id) {
+    return __async(this, null, function* () {
+      yield doSingleRemove(id);
+      reload();
+    });
+  }
   function onDeleteBatch() {
@@ -422,3 +434,3 @@ let idList = selectedRowKeys.value;
           placement: "left",
-          confirm: () => executeDelete(doBatchRemove, [record.id])
+          confirm: () => handleRemove(record.id)
         }
@@ -431,3 +443,3 @@ },
           placement: "left",
-          confirm: () => executeDelete(doBatchDelete, [record.id])
+          confirm: () => handleDelete(record.id)
         },
@@ -434,0 +446,0 @@ ifShow: () => isNormalPage

useListButton.js

@@ -40,13 +40,10 @@ var __defProp = Object.defineProperty;
 };
-import { E as ENHANCEJS, d as SETUP } from "./FormSchemaFactory.js";
+import { E as ENHANCEJS, q as SETUP } from "./useExtendComponent.js";
 import { useRoute } from "vue-router";
 import { router } from "/@/router";
-import * as vue from "vue";
 import { ref, onBeforeUnmount, toRaw, nextTick, reactive } from "vue";
-import * as UTIL_AXIOS from "/@/utils/http/axios";
 import { defHttp } from "/@/utils/http/axios";
-import * as HOOK_MESSAGE from "/@/hooks/web/useMessage";
 import { useMessage } from "/@/hooks/web/useMessage";
-import { randomString, filterObj } from "/@/utils/common/compUtils";
-import * as UTIL_CACHE from "/@/utils/cache";
+import { filterObj } from "/@/utils/common/compUtils";
+import { u as useCustomHook, G as GET_FUN_BODY_REG } from "./OnlineForm.js";
 import { onMountedOrActivated } from "/@/hooks/core/onMountedOrActivated";
@@ -59,43 +56,2 @@ import { useModal } from "/@/components/Modal";
 import { p as pick } from "./pick.js";
-const $exports = {
-  vue,
-  "@": {
-    hooks: {
-      useMessage: HOOK_MESSAGE
-    },
-    utils: {
-      axios: UTIL_AXIOS,
-      cache: UTIL_CACHE
-    }
-  }
-};
-function useCustomHook(otherExports, context) {
-  const assignExports = Object.assign({}, $exports, otherExports);
-  function doImport(path) {
-    if (path != null && path != "") {
-      let paths = path.toString().split("/");
-      let result = assignExports[paths[0]];
-      for (let i = 1; i < paths.length; i++) {
-        result = result[paths[i]];
-      }
-      return result;
-    }
-    return null;
-  }
-  function doExport() {
-  }
-  function executeJsEnhanced(code) {
-    let randomKey = randomString(6);
-    let exportKey = "__export_" + randomKey;
-    const executeCode = `return function (customImport, ${exportKey}) {"use strict"; ${code}}`;
-    console.group("executeJsEnhanced");
-    console.log(executeCode);
-    console.groupEnd();
-    const fun = new Function(executeCode)();
-    fun.call(context, doImport, doExport);
-  }
-  return {
-    executeJsEnhanced
-  };
-}
 const CONTEXT_PROP_DESCRIPTION = {
@@ -157,3 +113,2 @@ acceptHrefParams: "<p> \u8DF3\u8F6C\u65F6\u83B7\u53D6\u7684\u53C2\u6570\u4FE1\u606F",
 const { createMessage: $message, createErrorModal } = useMessage();
-const GET_FUN_BODY_REG = /(?:\/\*[\s\S]*?\*\/|\/\/.*?\r?\n|[^{])+\{([\s\S]*)\}$/;
 function useOnlineTableContext() {
@@ -180,3 +135,8 @@ console.log("-------------------------useOnlineTableContext----------------------->");
       } else if (onlineTableContext[ENHANCEJS][code + "_hook"]) {
-        executeEnhanceJsHook(code + "_hook");
+        if (record) {
+          let row = toRaw(record);
+          executeEnhanceJsHook(code + "_hook", row);
+        } else {
+          executeEnhanceJsHook(code + "_hook");
+        }
       } else {
@@ -195,3 +155,3 @@ console.log("\u589E\u5F3A\u6CA1\u627E\u5230!", code);
   };
-  function executeEnhanceJsHook(code) {
+  function executeEnhanceJsHook(code, row) {
     let str = onlineTableContext[ENHANCEJS][code].toLocaleString();
@@ -201,3 +161,3 @@ let arr = str.match(GET_FUN_BODY_REG);
       let temp = arr[1];
-      executeJsEnhanced(temp);
+      executeJsEnhanced(temp, row);
     }
@@ -663,3 +623,3 @@ }
     let bpmStatusValue = getBpmStatusValue(record);
-    let canEdit = bpmStatusValue && bpmStatusValue == "1" || !bpmStatusValue;
+    let canEdit = bpmStatusValue && (bpmStatusValue == "1" || bpmStatusValue == "3" || bpmStatusValue == "4") || !bpmStatusValue;
     if (toRaw(buttonSwitch.update) === true && canEdit) {
@@ -919,3 +879,3 @@ return [
     const description = onlineTableContext.description;
-    handleExportXlsx(description, url, { paramsStr });
+    return handleExportXlsx(description, url, { paramsStr });
   }
@@ -922,0 +882,0 @@ function showLinkButtonOfExpression(expression, row) {

useSchemas.js

@@ -7,3 +7,3 @@ import { computed, h } from "vue";
 import { rules } from "/@/utils/helper/validator";
-usePermission();
+const { isDisabledAuth } = usePermission();
 function useFormSchemas(_props, handlers) {
@@ -321,12 +321,11 @@ const mapFormSchema = bindMapFormSchema(
       {
-        label: "\u96C6\u6210\u8BBE\u8BA1\u8868\u5355",
-        field: "isDesForm",
+        label: "\u5F39\u7A97\u9ED8\u8BA4\u5168\u5C4F",
+        field: "modelFullscreen",
         component: "RadioButtonGroup",
         componentProps: {
           options: [
-            { label: "\u5F00\u542F", value: "Y" },
-            { label: "\u5173\u95ED", value: "N" }
+            { label: "\u5F00\u542F", value: 1 },
+            { label: "\u5173\u95ED", value: 0 }
           ],
-          buttonStyle: "solid",
-          onChange: handlers.onIsDesformChange
+          buttonStyle: "solid"
         }
@@ -338,11 +337,8 @@ },
       {
-        label: "\u8868\u5355\u7F16\u7801",
-        field: "desFormCode",
-        component: "Input",
+        label: "\u5F39\u7A97\u5BBD\u5EA6",
+        field: "modalMinWidth",
+        component: "InputNumber",
         componentProps: {
-          style: "width: 80%"
-        },
-        dynamicDisabled: ({ model }) => model.isDesForm !== "Y",
-        dynamicRules: ({ model }) => {
-          return [{ required: model.isDesForm === "Y", message: "\u8BF7\u8F93\u5165\u8868\u5355\u7F16\u7801\uFF01" }];
+          style: "width: 80%",
+          placeholder: "\u5F39\u7A97\u6700\u5C0F\u5BBD\u5EA6\uFF08\u5355\u4F4D\uFF1Apx\uFF09"
         }
@@ -354,4 +350,4 @@ },
       {
-        label: "\u96C6\u6210\u79EF\u6728\u62A5\u8868",
-        field: "reportPrintShow",
+        label: "\u5F00\u542F\u8868\u5355\u8BC4\u8BBA",
+        field: "commentStatus",
         component: "RadioButtonGroup",
@@ -363,4 +359,3 @@ componentProps: {
           ],
-          buttonStyle: "solid",
-          onChange: handlers.onReportPrintShowChange
+          buttonStyle: "solid"
         }
@@ -372,22 +367,6 @@ },
       {
-        label: "\u62A5\u8868\u5730\u5740",
-        field: "reportPrintUrl",
-        component: "Input",
-        componentProps: {
-          style: "width: 80%"
-        },
-        dynamicDisabled: ({ model }) => !model.reportPrintShow,
-        dynamicRules: ({ model }) => {
-          return [
-            { required: !!model.reportPrintShow, message: "\u8BF7\u8F93\u5165\u62A5\u8868\u5730\u5740\uFF01" },
-            {
-              validator({}, value) {
-                if (/\/jmreport\/view\/{积木报表ID}/.test(value)) {
-                  return Promise.reject("\u8BF7\u5C06{\u79EF\u6728\u62A5\u8868ID}\u66FF\u6362\u4E3A\u771F\u5B9E\u7684\u79EF\u6728\u62A5\u8868ID\uFF01");
-                }
-                return Promise.resolve();
-              }
-            }
-          ];
-        }
+        label: "",
+        field: "commentStatus",
+        component: "InputNumber",
+        render: () => ""
       },
@@ -398,4 +377,4 @@ "right"
       {
-        label: "\u56FA\u5B9A\u64CD\u4F5C\u5217",
-        field: "tableFixedAction",
+        label: "\u542F\u7528\u8054\u5408\u67E5\u8BE2",
+        field: "joinQuery",
         component: "RadioButtonGroup",
@@ -407,5 +386,5 @@ componentProps: {
           ],
-          buttonStyle: "solid"
-        },
-        defaultValue: 0
+          buttonStyle: "solid",
+          onChange: handlers.onJoinQueryChange
+        }
       },
@@ -416,17 +395,6 @@ "left"
       {
-        label: "\u56FA\u5B9A\u65B9\u5F0F",
-        field: "tableFixedActionType",
-        component: "Select",
-        componentProps: {
-          options: [
-            { label: "\u56FA\u5B9A\u5230\u53F3\u4FA7", value: "right" },
-            { label: "\u56FA\u5B9A\u5230\u5DE6\u4FA7", value: "left" }
-          ],
-          style: "width: 80%"
-        },
-        defaultValue: "right",
-        dynamicDisabled: ({ model }) => !model.tableFixedAction,
-        dynamicRules: ({ model }) => {
-          return [{ required: !!model.tableFixedAction, message: "\u8BF7\u9009\u62E9\u56FA\u5B9A\u65B9\u5F0F\uFF01" }];
-        }
+        label: "",
+        field: "joinQuery",
+        component: "InputNumber",
+        render: () => ""
       },
@@ -437,4 +405,4 @@ "right"
       {
-        label: "\u542F\u7528\u8054\u5408\u67E5\u8BE2",
-        field: "joinQuery",
+        label: "\u96C6\u6210\u79EF\u6728\u62A5\u8868",
+        field: "reportPrintShow",
         component: "RadioButtonGroup",
@@ -447,3 +415,3 @@ componentProps: {
           buttonStyle: "solid",
-          onChange: handlers.onJoinQueryChange
+          onChange: handlers.onReportPrintShowChange
         }
@@ -455,6 +423,22 @@ },
       {
-        label: "",
-        field: "joinQuery",
-        component: "InputNumber",
-        render: () => ""
+        label: "\u62A5\u8868\u5730\u5740",
+        field: "reportPrintUrl",
+        component: "Input",
+        componentProps: {
+          style: "width: 80%"
+        },
+        dynamicDisabled: ({ model }) => !model.reportPrintShow,
+        dynamicRules: ({ model }) => {
+          return [
+            { required: !!model.reportPrintShow, message: "\u8BF7\u8F93\u5165\u62A5\u8868\u5730\u5740\uFF01" },
+            {
+              validator({}, value) {
+                if (/\/jmreport\/view\/{积木报表ID}/.test(value)) {
+                  return Promise.reject("\u8BF7\u5C06{\u79EF\u6728\u62A5\u8868ID}\u66FF\u6362\u4E3A\u771F\u5B9E\u7684\u79EF\u6728\u62A5\u8868ID\uFF01");
+                }
+                return Promise.resolve();
+              }
+            }
+          ];
+        }
       },
@@ -465,11 +449,12 @@ "right"
       {
-        label: "\u5F39\u7A97\u9ED8\u8BA4\u5168\u5C4F",
-        field: "modelFullscreen",
+        label: "\u96C6\u6210\u8BBE\u8BA1\u8868\u5355",
+        field: "isDesForm",
         component: "RadioButtonGroup",
         componentProps: {
           options: [
-            { label: "\u5F00\u542F", value: 1 },
-            { label: "\u5173\u95ED", value: 0 }
+            { label: "\u5F00\u542F", value: "Y" },
+            { label: "\u5173\u95ED", value: "N" }
           ],
-          buttonStyle: "solid"
+          buttonStyle: "solid",
+          onChange: handlers.onIsDesformChange
         }
@@ -481,8 +466,11 @@ },
       {
-        label: "\u5F39\u7A97\u5BBD\u5EA6",
-        field: "modalMinWidth",
-        component: "InputNumber",
+        label: "\u8868\u5355\u7F16\u7801",
+        field: "desFormCode",
+        component: "Input",
         componentProps: {
-          style: "width: 80%",
-          placeholder: "\u5F39\u7A97\u6700\u5C0F\u5BBD\u5EA6\uFF08\u5355\u4F4D\uFF1Apx\uFF09"
+          style: "width: 80%"
+        },
+        dynamicDisabled: ({ model }) => model.isDesForm !== "Y",
+        dynamicRules: ({ model }) => {
+          return [{ required: model.isDesForm === "Y", message: "\u8BF7\u8F93\u5165\u8868\u5355\u7F16\u7801\uFF01" }];
         }
@@ -494,4 +482,4 @@ },
       {
-        label: "\u5F00\u542F\u8868\u5355\u8BC4\u8BBA",
-        field: "commentStatus",
+        label: "\u56FA\u5B9A\u64CD\u4F5C\u5217",
+        field: "tableFixedAction",
         component: "RadioButtonGroup",
@@ -504,3 +492,4 @@ componentProps: {
           buttonStyle: "solid"
-        }
+        },
+        defaultValue: 1
       },
@@ -511,6 +500,17 @@ "left"
       {
-        label: "",
-        field: "commentStatus",
-        component: "InputNumber",
-        render: () => ""
+        label: "\u56FA\u5B9A\u65B9\u5F0F",
+        field: "tableFixedActionType",
+        component: "Select",
+        componentProps: {
+          options: [
+            { label: "\u56FA\u5B9A\u5230\u53F3\u4FA7", value: "right" },
+            { label: "\u56FA\u5B9A\u5230\u5DE6\u4FA7", value: "left" }
+          ],
+          style: "width: 80%"
+        },
+        defaultValue: "right",
+        dynamicDisabled: ({ model }) => !model.tableFixedAction,
+        dynamicRules: ({ model }) => {
+          return [{ required: !!model.tableFixedAction, message: "\u8BF7\u9009\u62E9\u56FA\u5B9A\u65B9\u5F0F\uFF01" }];
+        }
       },
@@ -563,3 +563,4 @@ "right"
             },
-            onSearch: handlers.onProjectPathSearch
+            onSearch: handlers.onProjectPathSearch,
+            disabled: isDisabledAuth("online:codeGenerate:projectPath")
           },
@@ -570,3 +571,4 @@ {
               {
-                preIcon: "ant-design:folder-open"
+                preIcon: "ant-design:folder-open",
+                disabled: isDisabledAuth("online:codeGenerate:projectPath")
               },
@@ -573,0 +575,0 @@ {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

901780

increased by0.87%

Lines of code

26219

increased by0.76%

Worsened metrics

Number of package files

83

decreased by-1.19%

Number of medium supply chain risk alerts

5

increased by25%

No dependency changes