bl-common-vue3 3.8.66 → 3.8.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bl-common-vue3",
-  "version": "3.8.66",
+  "version": "3.8.68",
   "main": "index.js",
   "module": "index.js",
   "description": "bailing vue3 common components lib",

package/src/components/ApprovalDetail/modules/ApprovalAddComment.vue

@@ -895,10 +895,6 @@ export default {
   overflow: auto;
 
   scroll-behavior: smooth;
-
-  &-focus {
-    //outline: none;
-  }
 }
 
 [contenteditable] {

package/src/components/BlMobileAnnexUpload/index.vue

@@ -9,7 +9,7 @@
 		</div>
 
 		<!-- 二维码弹框 -->
-		<QrcodeModal :visible="qrcodeModalVisible" :isCopy="true" :download="false" :urls="annexUploadPageUrl" @cancel="handleCancelQrcode" :zIndex="visible ? 1001 : 1000" :title="t('BlMobileAnnexUpload.index-1')"></QrcodeModal>
+		<QrcodeModal :visible="qrcodeModalVisible" :isCopy="true" :download="false" :urls="annexUploadPageUrl" @cancel="handleCancelQrcode" @request="handleRequest" :zIndex="visible ? 1001 : 1000" :title="t('BlMobileAnnexUpload.index-1')"></QrcodeModal>
 
 		<!-- 批量上传弹框 -->
 		<a-modal
@@ -21,6 +21,7 @@
 			@ok="onSave"
 			:maskClosable="false"
 			:bodyStyle="{ maxHeight: '450px', overflow: 'scroll' }"
+			:getContainer="getPopupContainer"
 			destroy-on-close>
 			<template #title>
 				<a-space>
@@ -174,7 +175,15 @@ export default defineComponent({
 					},
 				};
 			}
-			state.annexUploadPageUrl = `${props.h5Domain}/h5_orgs/pages/common/annexUpload?key=${encodeURIComponent(state.key)}&uploadConfig=${encodeURIComponent(JSON.stringify(uploadConfig))}`;
+			Object.keys(uploadConfig).forEach((key) => {
+				const cfg = uploadConfig[key] || {};
+				if (!Number.isFinite(cfg.count)) cfg.count = 999999;
+				if (!Number.isFinite(cfg.size)) cfg.size = 999999;
+				uploadConfig[key] = cfg;
+			});
+
+			const h5Domain = (props.h5Domain || location.origin).replace(/\/$/, "");
+			state.annexUploadPageUrl = `${h5Domain}/h5_orgs/pages/common/annexUpload?key=${encodeURIComponent(state.key || "")}&uploadConfig=${encodeURIComponent(JSON.stringify(uploadConfig))}`;
 		};
 
 		// 获取key
@@ -353,6 +362,10 @@ export default defineComponent({
 			}
 		};
 
+		const getPopupContainer = (trigger) => {
+            return window?.rawDocument?.body || document?.body;
+        };
+
 		onUnmounted(() => {
 			state.timer && clearInterval(state.timer);
 		});
@@ -364,6 +377,10 @@ export default defineComponent({
 			loadLanguageAsync(newLang);
 		});
 
+		const handleRequest = (emitObj) => {
+			emit("request", emitObj);
+		};
+
 		return {
 			btnTitle,
 			...toRefs(state),
@@ -374,6 +391,8 @@ export default defineComponent({
 			onSave,
 			handleCancel,
 			handleCancelQrcode,
+			getPopupContainer,
+			handleRequest,
 			t,
 		};
 	},

package/src/components/QrcodeModal/index.vue

@@ -4,9 +4,10 @@
     :title="titleProps"
     centered
     :footer="null"
-    @close="handleClose"
+    @cancel="handleClose"
     :width="modalWidth"
     :zIndex="zIndex"
+    :getContainer="getPopupContainer"
   >
     <Row :gutter="[12, 12]" :wrap="true">
       <Col
@@ -227,6 +228,10 @@ export default defineComponent({
       message.success(t('QrcodeModal.index.612016-2'))
     }
 
+    const getPopupContainer = () => {
+      return window?.rawDocument?.body || document?.body;
+    };
+
     return {
       t,
       ...toRefs(state),
@@ -235,7 +240,8 @@ export default defineComponent({
       titleProps,
       handleClose,
       downloadCode,
-      copy
+      copy,
+      getPopupContainer
     };
   },
 });

package/src/components/TenantComponent/index.vue

@@ -105,7 +105,7 @@ export default defineComponent({
       }
       state.owner_id = option.value;
       state.SelectTenant = option
-      context.emit("selectcancel" , state.owner_id , state.SelectTenant);
+      context.emit("noChangeNewInfo" , state.owner_id , state.SelectTenant);
     };
 
     //清除功能,如果不需要清除功能可以不调用