uni-oaview 1.1.3 → 1.1.5

package/components/oa-login/oa-login.vue

@@ -18,7 +18,7 @@
 </template>
 
 <script setup lang="ts">
-  import { ref, reactive } from 'vue';
+  import { ref, reactive, PropType } from 'vue';
   const formRef = ref();
   const props = defineProps({
     password: {
@@ -26,6 +26,10 @@
       default:
         'f0d5937ddef983a4fbf56eec5c84ab78e7402fd6b55b8b7271f75f676b57bae1afe09a476702f414c12b5259899db3790ab1d8915827f2f956f48c8ab4af7541',
     },
+    type: {
+      type: String as PropType<'token' | 'cookie'>,
+      default: 'token',
+    },
   });
   const emit = defineEmits(['loginSuccess']);
   const updateFormData = (key: string, value: any) => {
@@ -101,21 +105,33 @@
           department: '这是一个很长很长的部门部门321312321312',
           position: '这是一个很长很长的职位321312312321321312',
         };
-        uni.request({
-          url: `${baseUrl}/api/gatewayproxy/routing/getToken?t=${Date.now()}`,
-          method: 'POST',
-          success: (res: any) => {
-            uni.hideLoading();
-            emit('loginSuccess', {
-              ...formData,
-              token: res.data.data,
-              userInfo,
-            });
-            uni.showToast({
-              title: '登录成功',
-            });
-          },
-        });
+        if (props.type === 'token') {
+          uni.request({
+            url: `${baseUrl}/api/gatewayproxy/routing/getToken?t=${Date.now()}`,
+            method: 'POST',
+            success: (res: any) => {
+              uni.hideLoading();
+              emit('loginSuccess', {
+                ...formData,
+                token: res.data.data,
+                userInfo,
+              });
+              uni.showToast({
+                title: '登录成功',
+              });
+            },
+          });
+        } else {
+          uni.hideLoading();
+          emit('loginSuccess', {
+            ...formData,
+            userInfo,
+            session: res.header['m_token'],
+          });
+          uni.showToast({
+            title: '登录成功',
+          });
+        }
       },
       complete: () => {
         uni.hideLoading();

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.3",
+  "version": "1.1.5",
   "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,
+      });
     });
   },
   /**