@jeecg/online 3.4.3-beta → 3.4.3

package/OnlineCustomModal.js

@@ -32,13 +32,10 @@ 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 "/@/hooks/web/useMessage";
 import "/@/components/Form/index";
 import "/@/utils/dict/JDictSelectUtil";
 import "/@/utils/common/compUtils";
@@ -49,14 +46,15 @@ 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 "@vueuse/core";
 import "/@/components/Loading";
 import "/@/utils/auth";
 import "./JModalTip.js";
 import "ant-design-vue";
-import "@vueuse/core";
 import "/@/components/jeecg/JVxeTable/types";
 import "/@/hooks/core/useContext";
 import "/@/utils/mitt";

package/OnlineDetailModal.js

@@ -46,9 +46,6 @@ 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";
@@ -58,10 +55,11 @@ import "./toString.js";
 import "./_arrayPush.js";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
+import "vue-router";
 import "./LinkTableListPiece.js";
+import "@vueuse/core";
 import "./JModalTip.js";
 import "ant-design-vue";
-import "@vueuse/core";
 import "./OnlineSubFormDetail.js";
 const _sfc_main = defineComponent({
   name: "OnlineDetailModal",

package/OnlineForm.js

@@ -57,21 +57,19 @@ 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 "@vueuse/core";
 import "./JModalTip.js";
 import "ant-design-vue";
-import "@vueuse/core";
 import "./_flatRest.js";
 import "./isArray.js";
 import "./toString.js";
@@ -156,9 +154,7 @@ const _sfc_main = {
       fieldDisplayStatus
     } = useFormItems(props, onlineFormRef);
     let { EnhanceJS, initCgEnhanceJs } = useEnhance(onlineFormContext, false);
-    console.log("--------v3_hello-----------");
     console.log("--formSchemas----------", formSchemas);
-    tableName.value = "v3_hello";
     const [registerForm, { setProps, validate, resetFields, setFieldsValue, updateSchema, getFieldsValue, scrollToField }] = useForm({
       schemas: formSchemas,
       showActionButtonGroup: false,
@@ -739,6 +735,21 @@ const _sfc_main = {
         instance.addRows(record, { isOnlineJS: false, setActive: false, emitChange: true });
       }
     }
+    function onCloseModal() {
+      let arr = subTabInfo.value;
+      if (arr && arr.length > 0) {
+        for (let item of arr) {
+          if (item.relationType == 1)
+            ;
+          else {
+            let inst = getSubTableInstance(item.key);
+            if (inst) {
+              inst.clearSelection();
+            }
+          }
+        }
+      }
+    }
     let context = {
       tableName,
       loading,
@@ -797,7 +808,8 @@ const _sfc_main = {
       registerPopModal,
       popTableName,
       getPopFormData,
-      popModalRequest
+      popModalRequest,
+      onCloseModal
     };
   }
 };
@@ -919,7 +931,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       id: $setup.popTableName,
       onRegister: $setup.registerPopModal,
       onSuccess: $setup.getPopFormData,
-      topTip: ""
+      topTip: "",
+      isVxeTableData: ""
     }, null, 8, ["request", "id", "onRegister", "onSuccess"])
   ], 8, _hoisted_1);
 }

package/OnlineFormDetail.js

@@ -61,9 +61,6 @@ 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";
@@ -73,10 +70,11 @@ import "./toString.js";
 import "./_arrayPush.js";
 import "/@/components/Table";
 import "/@/hooks/system/useListPage";
+import "vue-router";
 import "./LinkTableListPiece.js";
+import "@vueuse/core";
 import "./JModalTip.js";
 import "ant-design-vue";
-import "@vueuse/core";
 const _sfc_main = {
   name: "OnlineFormDetail",
   components: {
@@ -155,7 +153,7 @@ const _sfc_main = {
     }
     function show(_status, record) {
       return __async(this, null, function* () {
-        console.log("\u8FDB\u5165\u8BE6\u60C5\u8868\u5355\u300B\u300Bform", record);
+        console.log("\u8FDB\u5165\u8868\u5355\u8BE6\u60C5\u300B\u300Bform", record);
         yield edit(record);
       });
     }

package/OnlineQueryForm.js

@@ -48,9 +48,6 @@ 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";
@@ -64,14 +61,15 @@ 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 "@vueuse/core";
 import "/@/components/Loading";
 import "/@/utils/auth";
 import "./JModalTip.js";
 import "ant-design-vue";
-import "@vueuse/core";
 var OnlineQueryForm_vue_vue_type_style_index_0_scoped_true_lang = "";
 const _sfc_main = {
   name: "OnlineQueryForm",

package/OnlineSearchFormItem.js

@@ -16,13 +16,10 @@ var __spreadValues = (a, b) => {
 };
 import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, normalizeClass, withCtx, createElementVNode, toDisplayString, createElementBlock, Fragment, createVNode, renderList, createTextVNode, mergeProps, useCssVars, pushScopeId, popScopeId } from "vue";
 import { JDictSelectTag, JTreeSelect, JCategorySelect, JSelectUser, JSelectUserByDept, JSelectDept, JPopup, JAreaLinkage, JAreaSelect, JSelectMultiple } from "/@/components/Form";
-import JOnlineSearchSelect from "./JOnlineSearchSelect.js";
-import { _ as _export_sfc } from "./index.js";
-import "@vueuse/core";
+import { _ as _export_sfc, J as JOnlineSearchSelect } from "./index.js";
 import "/@/utils/http/axios";
 import "/@/hooks/web/useMessage";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
+import "@vueuse/core";
 var OnlineSearchFormItem_vue_vue_type_style_index_0_scoped_true_lang = "";
 const __default__ = defineComponent({
   name: "OnlineSearchFormItem",

package/OnlineSubFormDetail.js

@@ -34,9 +34,6 @@ 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";
@@ -50,13 +47,14 @@ 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 "@vueuse/core";
 import "/@/utils/auth";
 import "./JModalTip.js";
 import "ant-design-vue";
-import "@vueuse/core";
 import "/@/utils/dict";
 import "/@/utils/dict/index";
 import "/@/api/common/api";

package/OnlineSuperQuery.js

@@ -16,7 +16,8 @@ import "/@/utils/is";
 import "./_baseSlice.js";
 import "./toString.js";
 import "./isArray.js";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "/@/utils/http/axios";
+import "@vueuse/core";
 const SAVE_CODE_PRE = "JSuperQuerySaved_";
 function useSuperQuery() {
   const { createMessage: $message } = useMessage();
@@ -466,7 +467,7 @@ const _sfc_main = {
     };
   }
 };
-const _withScopeId = (n) => (pushScopeId("data-v-6b47b90c"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-2878ef8e"), n = n(), popScopeId(), n);
 const _hoisted_1 = { class: "j-super-query-button" };
 const _hoisted_2 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", null, "\u5DF2\u6709\u9AD8\u7EA7\u67E5\u8BE2\u6761\u4EF6\u751F\u6548", -1));
 const _hoisted_3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", null, "\u9AD8\u7EA7\u67E5\u8BE2", -1));
@@ -553,7 +554,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       createVNode(_component_BasicModal, {
         title: "\u9AD8\u7EA7\u67E5\u8BE2\u6784\u9020\u5668",
         canFullscreen: false,
-        width: 1050,
+        width: 1055,
         onRegister: $setup.registerFormModal,
         onOk: $setup.handleSubmit
       }, {
@@ -903,5 +904,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["visible", "onOk"])
   ], 64);
 }
-var OnlineSuperQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-6b47b90c"]]);
+var OnlineSuperQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-2878ef8e"]]);
 export { OnlineSuperQuery as default };

package/PageAttributeTable.js

@@ -39,8 +39,7 @@ import "./omit.js";
 import "./_baseClone.js";
 import "./_baseSlice.js";
 import "/@/hooks/web/useMessage";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "vue-router";
+import "@vueuse/core";
 var PageAttributeTable_vue_vue_type_style_index_0_scoped_true_lang = "";
 const commonPageOptions = [
   { title: "\u6587\u672C\u6846", value: "text" },

package/ProcessOnlineForm.js

@@ -48,21 +48,19 @@ 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 "@vueuse/core";
 import "./JModalTip.js";
 import "ant-design-vue";
-import "@vueuse/core";
 var ProcessOnlineForm_vue_vue_type_style_index_0_scoped_true_lang = "";
 const _sfc_main = defineComponent({
   name: "ProcessOnlineForm",

package/QueryTable.js

@@ -30,9 +30,9 @@ import "./_flatRest.js";
 import "./isArray.js";
 import "./toString.js";
 import "./_arrayPush.js";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "/@/utils/http/axios";
 import "/@/hooks/web/useMessage";
-import "vue-router";
+import "@vueuse/core";
 const _sfc_main = defineComponent({
   name: "QueryTable",
   emits: ["query"],