@ecolovo/uniapp-components 2.0.8 → 2.0.9

package/composable/message-box.d.ts

@@ -44,9 +44,9 @@ declare const useMessageBoxComponent: (messageBoxRef?: Ref<InstanceType<typeof M
  *
  * @param isInPage 是否在 Page 中使用，当为 `true` 时，须将返回的 `pageRef` 绑定到 `Page` 组件上
  */
-declare function useMessageBox(isInPage: true): UseMessageBoxReturn & {
+declare function useMessageBox(isInPage: true, pageRef?: Ref<InstanceType<typeof Page> | undefined>): UseMessageBoxReturn & {
     /** page 组件实例 */
-    pageRef: Ref<InstanceType<typeof Page>>;
+    pageRef: Ref<InstanceType<typeof Page> | undefined>;
 };
 declare function useMessageBox(isInPage?: false): UseMessageBoxReturn;
 export { useMessageBox, useMessageBoxComponent };

package/composable/message-box.js

@@ -43,7 +43,7 @@ const useMessageBoxComponent = (messageBoxRef) => {
         showMessageBox,
     };
 };
-function useMessageBox(isInPage = false) {
+function useMessageBox(isInPage = false, pageRef) {
     if (!isInPage) {
         const pageMessageBoxRef = inject('ecolovo/page/messageBoxRef');
         if (!pageMessageBoxRef) {
@@ -51,18 +51,18 @@ function useMessageBox(isInPage = false) {
         }
         return useMessageBoxComponent(pageMessageBoxRef);
     }
-    const pageRef = ref();
+    const _pageRef = ref(pageRef);
     const show = async (options) => {
-        await pageRef.value?.show(options);
+        await _pageRef.value?.show(options);
     };
     const showConfirm = async (options) => {
-        await pageRef.value?.showConfirm(options);
+        await _pageRef.value?.showConfirm(options);
     };
     const showMessageBox = async (options) => {
-        await pageRef.value?.showMessageBox(options);
+        await _pageRef.value?.showMessageBox(options);
     };
     return {
-        pageRef,
+        pageRef: _pageRef,
         show,
         showConfirm,
         showMessageBox,

package/composable/message-box.ts

@@ -122,12 +122,18 @@ const useMessageBoxComponent = (
  *
  * @param isInPage 是否在 Page 中使用，当为 `true` 时，须将返回的 `pageRef` 绑定到 `Page` 组件上
  */
-function useMessageBox(isInPage: true): UseMessageBoxReturn & {
+function useMessageBox(
+	isInPage: true,
+	pageRef?: Ref<InstanceType<typeof Page> | undefined>
+): UseMessageBoxReturn & {
 	/** page 组件实例 */
-	pageRef: Ref<InstanceType<typeof Page>>;
+	pageRef: Ref<InstanceType<typeof Page> | undefined>;
 };
 function useMessageBox(isInPage?: false): UseMessageBoxReturn;
-function useMessageBox(isInPage: boolean = false) {
+function useMessageBox(
+	isInPage: boolean = false,
+	pageRef?: Ref<InstanceType<typeof Page> | undefined>
+) {
 	if (!isInPage) {
 		const pageMessageBoxRef = inject<Ref<InstanceType<typeof MessageBox>>>(
 			'ecolovo/page/messageBoxRef'
@@ -138,22 +144,22 @@ function useMessageBox(isInPage: boolean = false) {
 		return useMessageBoxComponent(pageMessageBoxRef);
 	}
 
-	const pageRef = ref<InstanceType<typeof Page>>();
+	const _pageRef = ref(pageRef) as Ref<InstanceType<typeof Page> | undefined>;
 
 	const show: MessageBoxShowCustomFunc = async (options) => {
-		await pageRef.value?.show(options);
+		await _pageRef.value?.show(options);
 	};
 
 	const showConfirm: MessageBoxShowConfirmFunc = async (options) => {
-		await pageRef.value?.showConfirm(options);
+		await _pageRef.value?.showConfirm(options);
 	};
 
 	const showMessageBox: MessageBoxShowMessageBoxFunc = async (options) => {
-		await pageRef.value?.showMessageBox(options);
+		await _pageRef.value?.showMessageBox(options);
 	};
 
 	return {
-		pageRef,
+		pageRef: _pageRef,
 		show,
 		showConfirm,
 		showMessageBox,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ecolovo/uniapp-components",
-	"version": "2.0.8",
+	"version": "2.0.9",
 	"description": "Ecolovo UniApp Vue3 组件库",
 	"keywords": [
 		"components",

package/styles/global.scss

@@ -101,6 +101,9 @@ page {
 }
 
 // flex
+.flexible {
+	display: flex;
+}
 .flex-1 {
 	flex: 1;
 }