uni-oaview 1.1.2 → 1.1.4

package/components/oa-confirm/oa-confirm.vue

@@ -15,8 +15,18 @@
 <script lang="ts" setup>
   import { reactive, ref } from 'vue';
   import { OPEN_CONFIRM_BOX } from '../../constants';
+  import { onHide, onShow } from '@dcloudio/uni-app';
+
   const popupRef = ref();
+  const isPageAlive = ref(false);
+
   const isShow = ref(false);
+  onShow(() => {
+    isPageAlive.value = true;
+  });
+  onHide(() => {
+    isPageAlive.value = false;
+  });
   const state = reactive({
     title: '温馨提示',
     content: '请输入提醒内容',
@@ -30,6 +40,8 @@
     popupRef.value.close();
   };
   uni.$on(OPEN_CONFIRM_BOX, (params: any) => {
+    /** 如果页面非alive状态，则不执行操作 */
+    if (!isPageAlive.value) return;
     isShow.value = true;
     setTimeout(() => {
       const { title, content, confirmText, cancelText, callback } = params;

package/components/oa-toast/oa-toast.vue

@@ -4,13 +4,13 @@
       <image :src="state.imagePath" style="width: 32px; height: 32px" />
       <span class="title">{{ state.title }}</span>
       <div class="content">{{ state.content }}</div>
-      <div class="confirm-button" @click="() => popupRef.close()">{{ state.confirmText }}</div>
+      <div class="confirm-button" @click="submitClick">{{ state.confirmText }}</div>
     </view>
   </uni-popup>
 </template>
 
 <script lang="ts" setup>
-  import { Prop, PropType, reactive, ref, nextTick } from 'vue';
+  import { reactive, ref } from 'vue';
   import successPath from '../../imgs/toast/success.svg';
   import warningPath from '../../imgs/toast/warning.svg';
   import { OPEN_TOAST } from '../../constants';
@@ -26,6 +26,12 @@
     imagePath: successPath,
   });
 
+  /** 接收外部的回调函数，用于给外部发事件 */
+  let innerCallback: any = null;
+  const submitClick = () => {
+    innerCallback?.();
+    popupRef.value.close();
+  };
   const open = () => {
     popupRef.value?.open('center');
   };
@@ -40,7 +46,8 @@
     if (!isPageAlive.value) return;
     isShow.value = true;
     setTimeout(() => {
-      const { title, content, confirmText, type } = params;
+      const { title, content, confirmText, type, callback } = params;
+      innerCallback = callback;
       state.imagePath = type === 'success' ? successPath : warningPath;
       state.title = title || '请输入标题';
       state.content = content || '请输入内容';
@@ -71,6 +78,7 @@
       font-size: 16px;
     }
     & > .content {
+      box-sizing: border-box;
       text-align: center;
       padding: 12px 16px 16px;
       color: rgba(97, 105, 111, 1);

package/dist/index.d.ts

@@ -25,14 +25,14 @@ declare const Message: {
      * @param content  内容
      * @param confirmText  确认按钮文本
      */
-    success(title: string, content: string, confirmText?: string): void;
+    success(title: string, content: string, confirmText?: string): Promise<unknown>;
     /**
      * 警告弹框提醒
      * @param title 警告标题
      * @param content 警告内容
      * @param confirmText 警告按钮文本
      */
-    warning(title: string, content: string, confirmText?: string): void;
+    warning(title: string, content: string, confirmText?: string): Promise<unknown>;
     /**
      * 确认弹窗
      * @param content 确认内容

package/dist/index.esm.js

@@ -70,11 +70,14 @@ var Message = {
    * @param confirmText  确认按钮文本
    */
   success: function success(title, content, confirmText) {
-    uni.$emit(OPEN_TOAST, {
-      type: 'success',
-      title: title,
-      content: content,
-      confirmText: confirmText
+    return new Promise(function (res) {
+      uni.$emit(OPEN_TOAST, {
+        type: 'success',
+        title: title,
+        content: content,
+        confirmText: confirmText,
+        callback: res
+      });
     });
   },
   /**
@@ -84,11 +87,14 @@ var Message = {
    * @param confirmText 警告按钮文本
    */
   warning: function warning(title, content, confirmText) {
-    uni.$emit(OPEN_TOAST, {
-      type: 'warning',
-      title: title,
-      content: content,
-      confirmText: confirmText
+    return new Promise(function (res) {
+      uni.$emit(OPEN_TOAST, {
+        type: 'warning',
+        title: title,
+        content: content,
+        confirmText: confirmText,
+        callback: res
+      });
     });
   },
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni-oaview",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "uniapp小程序组件库",
   "main": "dist/index.esm.js",
   "typings": "dist/index.d.ts",

package/src/utils/index.ts

@@ -29,11 +29,14 @@ export const Message = {
    * @param confirmText  确认按钮文本
    */
   success(title: string, content: string, confirmText?: string) {
-    uni.$emit(OPEN_TOAST, {
-      type: 'success',
-      title,
-      content,
-      confirmText,
+    return new Promise((res) => {
+      uni.$emit(OPEN_TOAST, {
+        type: 'success',
+        title,
+        content,
+        confirmText,
+        callback: res,
+      });
     });
   },
   /**
@@ -43,11 +46,14 @@ export const Message = {
    * @param confirmText 警告按钮文本
    */
   warning(title: string, content: string, confirmText?: string) {
-    uni.$emit(OPEN_TOAST, {
-      type: 'warning',
-      title,
-      content,
-      confirmText,
+    return new Promise((res) => {
+      uni.$emit(OPEN_TOAST, {
+        type: 'warning',
+        title,
+        content,
+        confirmText,
+        callback: res,
+      });
     });
   },
   /**