@jeecg/online 3.4.4-beta2 → 3.5.3-beta2

package/OnlineCustomModal.js

@@ -20,26 +20,22 @@ var __async = (__this, __arguments, generator) => {
 };
 import { defineComponent, ref, nextTick, watch, reactive, markRaw, defineAsyncComponent, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createVNode, createTextVNode, resolveDynamicComponent } from "vue";
 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";
 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 "/@/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";
 import "/@/utils/common/compUtils";
 import "./pick.js";
@@ -49,9 +45,12 @@ import "./toString.js";
 import "./_arrayPush.js";
 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 "/@/components/Loading";
 import "/@/utils/auth";
 import "./JModalTip.js";
@@ -60,6 +59,7 @@ import "@vueuse/core";
 import "/@/components/jeecg/JVxeTable/types";
 import "/@/hooks/core/useContext";
 import "/@/utils/mitt";
+import "/@/utils/cache";
 import "./omit.js";
 import "./_baseClone.js";
 import "./_baseSlice.js";
@@ -233,7 +233,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   }, _ctx.$attrs, {
     style: _ctx.modalStyle,
     onRegister: _ctx.registerModal,
-    wrapClassName: "jeecg-online-modal",
+    wrapClassName: "jeecg-online-modal2",
     onOk: _ctx.handleSubmit
   }), {
     footer: withCtx(() => [
@@ -266,7 +266,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             id: _ctx.id,
             "form-template": _ctx.formTemplate,
             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), {
             key: 1,
             ref: "customFormRef",

package/OnlineDetailModal.js

@@ -18,10 +18,10 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-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";
 import { _ as _export_sfc } from "./index.js";
 import "/@/hooks/web/useMessage";
@@ -39,18 +39,14 @@ import "/@/utils/http/axios";
 import "/@/components/Form/src/utils/Area";
 import "/@/utils/common/compUtils";
 import "/@/components/Preview/index";
-import "./FormSchemaFactory.js";
+import "/@/components/Form/src/componentMap";
+import "/@/components/Form/index";
 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 "/@/components/Form/index";
 import "./pick.js";
 import "./_flatRest.js";
 import "./isArray.js";
@@ -58,7 +54,10 @@ import "./toString.js";
 import "./_arrayPush.js";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
+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";
@@ -78,8 +77,13 @@ const _sfc_main = defineComponent({
     CommentPanel
   },
   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 {
       title,
       modalWidth,
@@ -101,7 +105,7 @@ const _sfc_main = defineComponent({
       tableName,
       formDataId,
       enableComment
-    } = useAutoModal();
+    } = useAutoModal(false, { emit }, reloadComment);
     watch(() => props.id, renderFormItems, { immediate: true });
     function renderFormItems() {
       return __async(this, null, function* () {
@@ -131,7 +135,8 @@ const _sfc_main = defineComponent({
       showSub,
       tableName,
       formDataId,
-      enableComment
+      enableComment,
+      commentPanelRef
     };
     return that;
   }
@@ -164,6 +169,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ]),
     comment: withCtx(() => [
       createVNode(_component_comment_panel, {
+        ref: "commentPanelRef",
         tableName: _ctx.tableName,
         dataId: _ctx.formDataId
       }, null, 8, ["tableName", "dataId"])

package/OnlineForm.js

@@ -34,13 +34,15 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+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";
 import "/@/components/jeecg/JVxeTable/types";
 import { getToken } from "/@/utils/auth";
@@ -48,36 +50,64 @@ import { PrinterOutlined, DiffOutlined, FormOutlined } from "@ant-design/icons-v
 import "/@/hooks/core/useContext";
 import "/@/utils/mitt";
 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 = {
   optPre: "/online/cgform/api/form/",
   urlButtonAction: "/online/cgform/api/doButton"
@@ -117,6 +147,10 @@ const _sfc_main = {
     submitTip: {
       type: Boolean,
       default: true
+    },
+    modalClass: {
+      type: String,
+      default: ""
     }
   },
   emits: ["success", "rendered"],
@@ -156,6 +190,7 @@ const _sfc_main = {
       fieldDisplayStatus
     } = useFormItems(props, onlineFormRef);
     let { EnhanceJS, initCgEnhanceJs } = useEnhance(onlineFormContext, false);
+    const { executeJsEnhanced } = useCustomHook({}, onlineFormContext);
     const [registerForm, { setProps, validate, resetFields, setFieldsValue, updateSchema, getFieldsValue, scrollToField }] = useForm({
       schemas: formSchemas,
       showActionButtonGroup: false,
@@ -296,11 +331,21 @@ const _sfc_main = {
           if (changeFormData) {
             setFieldsValue(changeFormData);
           }
+          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) {
         extConfigJson = JSON.parse(jsonStr);
       }
@@ -532,7 +577,9 @@ const _sfc_main = {
     }
     function handleAdded(sub, event) {
       console.log("handleAdded", sub, event);
-      handleSubTableDefaultValue(sub, event);
+      if (!event.isModalData) {
+        handleSubTableDefaultValue(sub, event);
+      }
     }
     function getSubTableAuthPre(table) {
       return "online_" + table + ":";
@@ -557,10 +604,21 @@ const _sfc_main = {
         }
       });
     }
+    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]);
         }
       } else if ("action" == optType) {
         let formData = dbData.value;
@@ -653,7 +711,7 @@ const _sfc_main = {
     }
     function handleCustomFormEdit(record, editSubmitUrl) {
       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;
         yield resetFields();
         dbData.value = "";
@@ -688,7 +746,7 @@ const _sfc_main = {
       console.log("openSubFormModalForAdd", sub);
       popTableName.value = sub.id;
       popModalRequest.value = false;
-      openPopModal(true, { isUpdate: false });
+      openPopModal(true, { isUpdate: false, tableType: "3" });
     }
     function openSubFormModalForEdit(sub) {
       let ref2 = getSubTableInstance(sub.key);
@@ -711,7 +769,7 @@ const _sfc_main = {
         instance.setValues(arr);
       } else {
         let instance = getSubTableInstance(tableName2);
-        instance.addRows(record, { isOnlineJS: false, setActive: false, emitChange: true });
+        instance.addRows(record, { isOnlineJS: false, setActive: false, emitChange: true, isModalData: true });
       }
     }
     function onCloseModal() {
@@ -780,7 +838,10 @@ const _sfc_main = {
       getSubTableInstance,
       updateSchema,
       executeMainFillRule,
-      executeSubFillRule
+      executeSubFillRule,
+      changEvent: () => {
+      },
+      onlineFormValueChange
     };
     resetContext(context);
     return {
@@ -902,7 +963,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   onExecuteFillRule: ($event) => $setup.handleSubTableDefaultValue(sub, $event)
                 }, {
                   toolbarSuffix: withCtx(() => [
-                    createVNode(_component_a_button, {
+                    !$setup.onlineFormDisabled ? (openBlock(), createBlock(_component_a_button, {
+                      key: 0,
                       type: "primary",
                       onClick: ($event) => $setup.openSubFormModalForAdd(sub)
                     }, {
@@ -910,8 +972,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                         createVNode(_component_diff_outlined)
                       ]),
                       _: 2
-                    }, 1032, ["onClick"]),
-                    createVNode(_component_a_button, {
+                    }, 1032, ["onClick"])) : createCommentVNode("", true),
+                    !$setup.onlineFormDisabled ? (openBlock(), createBlock(_component_a_button, {
+                      key: 1,
                       type: "primary",
                       onClick: ($event) => $setup.openSubFormModalForEdit(sub)
                     }, {
@@ -919,7 +982,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                         createVNode(_component_form_outlined)
                       ]),
                       _: 2
-                    }, 1032, ["onClick"])
+                    }, 1032, ["onClick"])) : createCommentVNode("", true)
                   ]),
                   _: 2
                 }, 1032, ["height", "disabled", "columns", "dataSource", "onValueChange", "authPre", "onAdded", "onExecuteFillRule"])
@@ -937,6 +1000,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, null, 8, ["loading"]),
     renderSlot(_ctx.$slots, "bottom"),
     createVNode(_component_online_pop_modal, {
+      formTableType: "3",
       request: $setup.popModalRequest,
       id: $setup.popTableName,
       onRegister: $setup.registerPopModal,
@@ -947,4 +1011,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   ], 8, _hoisted_1);
 }
 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 };

package/OnlineFormDetail.js

@@ -42,7 +42,7 @@ import { goJmReportViewPage } from "/@/utils";
 import { PrinterOutlined } from "@ant-design/icons-vue";
 import DetailForm from "./DetailForm.js";
 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";
 import { _ as _export_sfc } from "./index.js";
 import "/@/utils/propTypes";
@@ -54,18 +54,14 @@ import "/@/components/Form/src/utils/Area";
 import "/@/utils/common/compUtils";
 import "/@/components/Preview/index";
 import "/@/components/Form/index";
-import "./FormSchemaFactory.js";
+import "/@/components/Form/src/componentMap";
+import "/@/components/Modal";
 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 "/@/components/Modal";
 import "./pick.js";
 import "./_flatRest.js";
 import "./isArray.js";
@@ -73,7 +69,10 @@ import "./toString.js";
 import "./_arrayPush.js";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
+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";
@@ -133,7 +132,7 @@ const _sfc_main = {
       modelFullscreen: 0,
       modalMinWidth: ""
     });
-    const { detailFormSchemas, hasSubTable, subTabInfo, refMap, subDataSource, createFormSchemas, formSpan } = getDetailFormSchemas(props);
+    const { detailFormSchemas, hasSubTable, subTabInfo, refMap, showStatus, subDataSource, createFormSchemas, formSpan } = getDetailFormSchemas(props);
     function handleExtConfigJson(jsonStr) {
       let extConfigJson = { reportPrintShow: 0, reportPrintUrl: "", joinQuery: 0, modelFullscreen: 1, modalMinWidth: "" };
       if (jsonStr) {
@@ -157,6 +156,7 @@ const _sfc_main = {
       return __async(this, null, function* () {
         console.log("\u8FDB\u5165\u8868\u5355\u8BE6\u60C5\u300B\u300Bform", record);
         yield edit(record);
+        changeShowStatus(true);
       });
     }
     function getFormData(dataId) {
@@ -174,6 +174,17 @@ const _sfc_main = {
         });
       });
     }
+    function changeShowStatus(flag) {
+      Object.keys(showStatus).map((k) => {
+        showStatus[k] = flag;
+      });
+    }
+    function onTabChange() {
+      changeShowStatus(false);
+      setTimeout(() => {
+        changeShowStatus(true);
+      }, 300);
+    }
     function edit(record) {
       return __async(this, null, function* () {
         let temp = yield getFormData(record.id);
@@ -235,13 +246,15 @@ const _sfc_main = {
       subFormHeight,
       subTableHeight,
       refMap,
+      onTabChange,
       subDataSource,
       getSubTableAuthPre,
       show,
       createRootProperties,
       onOpenReportPrint,
       onlineExtConfigJson,
-      getSubTableForeignKeyValue
+      getSubTableForeignKeyValue,
+      showStatus
     };
   }
 };
@@ -256,6 +269,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_detail_form = resolveComponent("detail-form");
   const _component_online_sub_form_detail = resolveComponent("online-sub-form-detail");
   const _component_JVxeTable = resolveComponent("JVxeTable");
+  const _component_a_spin = resolveComponent("a-spin");
   const _component_a_tab_pane = resolveComponent("a-tab-pane");
   const _component_a_tabs = resolveComponent("a-tabs");
   const _component_Loading = resolveComponent("Loading");
@@ -274,7 +288,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       data: $setup.formData,
       span: $setup.formSpan
     }, 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(() => [
         (openBlock(true), createElementBlock(Fragment, null, renderList($setup.subTabInfo, (sub, index) => {
           return openBlock(), createBlock(_component_a_tab_pane, {
@@ -294,7 +311,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   properties: sub.properties
                 }, null, 8, ["table", "form-template", "main-id", "properties"])
               ], 4)) : (openBlock(), createElementBlock("div", _hoisted_3, [
-                createVNode(_component_JVxeTable, {
+                $setup.showStatus[sub.key] ? (openBlock(), createBlock(_component_JVxeTable, {
+                  key: 0,
                   ref_for: true,
                   ref: $setup.refMap[sub.key],
                   toolbar: "",
@@ -306,7 +324,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   columns: sub.columns,
                   dataSource: $setup.subDataSource[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
+                }))
               ]))
             ]),
             _: 2
@@ -314,7 +335,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         }), 128))
       ]),
       _: 1
-    })) : createCommentVNode("", true),
+    }, 8, ["onChange"])) : createCommentVNode("", true),
     createVNode(_component_Loading, {
       loading: $setup.loading,
       absolute: false

package/OnlineQueryForm.js

@@ -38,23 +38,19 @@ import { BasicForm, useForm } from "/@/components/Form/index";
 import { ref, reactive, watch, toRaw, resolveComponent, openBlock, createElementBlock, createVNode, withCtx, createElementVNode, createTextVNode, toDisplayString, createCommentVNode, pushScopeId, popScopeId } from "vue";
 import { defHttp } from "/@/utils/http/axios";
 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";
 import "/@/views/system/user/user.api";
 import "./_commonjsHelpers.js";
 import "/@/store/modules/user";
 import "/@/utils";
 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";
 import "/@/utils/common/compUtils";
 import "./pick.js";
@@ -64,9 +60,12 @@ import "./toString.js";
 import "./_arrayPush.js";
 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 "/@/components/Loading";
 import "/@/utils/auth";
 import "./JModalTip.js";
@@ -95,6 +94,7 @@ const _sfc_main = {
     const queryParams = ref({});
     const hideList = ref([]);
     const { createMessage: $message } = useMessage();
+    const { linkTableCard2Select } = useExtendComponent();
     const defaultValues = reactive({
       config: {},
       cache: {},
@@ -136,6 +136,11 @@ const _sfc_main = {
         let keys = Object.keys(formProperties);
         for (let key of keys) {
           const item = formProperties[key];
+          if (key === "sys_org_code") {
+            if (!item.fieldExtendJson) {
+              item.fieldExtendJson = '{"store":"orgCode"}';
+            }
+          }
           let view = item.view;
           if (FORM_VIEW_TO_QUERY_VIEW[view]) {
             item.view = FORM_VIEW_TO_QUERY_VIEW[view];
@@ -186,6 +191,7 @@ const _sfc_main = {
           if (item.slot == "groupDatetime") {
             tempSchema["colProps"] = { xs: 24, sm: 24, md: 12, lg: 8, xl: 8 };
           }
+          linkTableCard2Select(tempSchema);
           schemaArray.push(tempSchema);
         }
         hideList.value = hideFieldName;
@@ -350,7 +356,7 @@ const _sfc_main = {
     };
   }
 };
-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 = {
   key: 0,
   class: "jeecg-basic-table-form-container p-0"
@@ -474,5 +480,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["onRegister"])
   ])) : createCommentVNode("", true);
 }
-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 };