uni-oaview 1.0.23 → 1.0.25

package/components/oa-page/nextwork-error.vue

@@ -0,0 +1,32 @@
+<template>
+  <view class="network-error" v-if="networkErrorInfo">
+    <image style="width: 13px; height: 13px" src="../../imgs/warn.svg" />
+    <span style="margin-left: 5px; line-height: 10px">{{ networkErrorInfo }}</span>
+  </view>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  const networkErrorInfo = ref();
+  /** 监听网络状态 */
+  uni.onNativeEventReceive(function (event: string, data: string) {
+    if (event === 'networkStatusInfo') {
+      networkErrorInfo.value = data;
+    }
+  });
+</script>
+<style scoped lang="scss">
+  .network-error {
+    position: absolute;
+    z-index: 1000;
+    top: 0;
+    width: 100vw;
+    background-color: rgba(255, 0, 0, 0.1);
+    font-size: 10px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 25px;
+    color: #3c3c3c;
+  }
+</style>

package/components/oa-page/oa-page.vue

@@ -1,11 +1,27 @@
 <template>
-  <Logs />
-  <view @click="clickHandler">
+  <oa-vconsole v-if="showLog" />
+  <view class="oa-page" :style="{ height: windowHeight }" @click="clickHandler">
+    <NetworkError />
     <slot />
   </view>
 </template>
 <script lang="ts" setup>
-  import Logs from '../oa-vconsole/oa-vconsole.vue';
+  import { ref } from 'vue';
+  import OaVconsole from '../oa-vconsole/oa-vconsole.vue';
+  import NetworkError from './nextwork-error.vue';
+  const whiteUrls = [
+    'http://192.168.11.231:6174',
+    'http://192.168.10.11:6174',
+    'http://dev-oa.ge.cn:6174',
+    'http://test-oa.ge.cn:6174',
+  ];
+  /** oa-page高度，使用的是安全高度，windowHeight不包含NavigationBar和TabBar的高度
+   * https://uniapp.dcloud.net.cn/api/system/info.html#safearea
+   */
+  const windowHeight = uni.getSystemInfoSync()?.windowHeight ?? 'auto';
+  const baseUrl = uni.getStorageSync('baseUrl');
+  /** 如果在debug状态，或者是在白名单里面，则展示vconsole */
+  const showLog = ref(whiteUrls.some((url) => url.includes(baseUrl)) || !!uni.getStorageSync('isDebug'));
   let isLock = false;
   setTimeout(function () {
     isLock = true;
@@ -22,7 +38,7 @@
         if (clickCount === count) {
           secretArray.push(count);
           if (secretArray.join('') === secret) {
-            uni.$emit('show-debug-button');
+            showLog.value = true;
           }
         } else {
           clickCount = 0;
@@ -40,3 +56,9 @@
     });
   };
 </script>
+
+<style lang="scss" scoped>
+  .oa-page {
+    position: relative;
+  }
+</style>

package/components/oa-vconsole/oa-vconsole.vue

@@ -1,5 +1,5 @@
 <template>
-  <uni-popup ref="popupRef" v-if="isShowDebugButton" background-color="#fff">
+  <uni-popup ref="popupRef" background-color="#fff">
     <view style="height: 500px; background-color: white; width: 100vw">
       <uni-segmented-control
         styleType="text"
@@ -30,7 +30,6 @@
     </view>
   </uni-popup>
   <view
-    v-if="isShowDebugButton"
     @click="openDebug"
     class="debug-button"
     :style="{
@@ -40,7 +39,7 @@
     @touchstart="start"
     @touchmove="move"
   >
-    <image style="width: 40rpx; height: 40rpx" src="../../imgs/debug.svg" />
+    <image style="width: 20px; height: 20px" src="../../imgs/debug.svg" />
   </view>
 </template>
 
@@ -52,24 +51,12 @@
   import Storage from './storage.vue';
   import Console from './console.vue';
   import System from './system.vue';
-  const whiteUrls = [
-    'http://192.168.11.231:6174',
-    'http://192.168.10.11:6174',
-    'http://dev-oa.ge.cn:6174',
-    'http://test-oa.ge.cn:6174',
-  ];
-  const show = ref(false);
   const popupRef = ref();
-  const baseUrl = uni.getStorageSync('baseUrl');
-  const isShowDebugButton = ref(whiteUrls.some((url) => url.includes(baseUrl)) || !!uni.getStorageSync('isDebug'));
   const list = ref(['console', 'network', 'event', 'error', 'storage', 'system']);
   const current = ref(0);
   const openDebug = () => {
     popupRef.value?.open('bottom');
   };
-  uni.$once('show-debug-button', () => {
-    isShowDebugButton.value = true;
-  });
   const bottom = ref(200);
   const right = ref(10);
   let pageX: number, pageY: number;
@@ -91,8 +78,8 @@
 
 <style lang="scss" scoped>
   .debug-button {
-    width: 80rpx;
-    height: 80rpx;
+    width: 40px;
+    height: 40px;
     position: fixed;
     z-index: 1000;
     border-radius: 50%;

package/dist/index.d.ts

@@ -1,19 +1,7 @@
-/**
- * 上报APP启动小程序的时候的入参
- * @param params
- */
-declare function sendLaunchAppParamsLog(params: any): void;
-
-/**
- * 防抖函数
- * @param callback
- * @param time
- * @returns
- */
-declare function createDebounceFn(callback: (...params: any[]) => void, time: number): (...params: any[]) => void;
+import { App } from 'vue';
 
 declare const _default: {
-    install: (Vue: any) => void;
+    install: (app: App<Element>, options: any) => void;
 };
 
-export { createDebounceFn, _default as default, sendLaunchAppParamsLog };
+export { _default as default };

package/dist/index.umd.js

@@ -10,6 +10,7 @@
    */
   function sendLaunchAppParamsLog(params) {
     var _a;
+    console.log('小程序启动入参：', params);
     // #ifndef H5
     try {
       var outputData = JSON.parse(JSON.stringify((_a = params === null || params === void 0 ? void 0 : params.referrerInfo) === null || _a === void 0 ? void 0 : _a.extraData));
@@ -21,33 +22,18 @@
     // #endif
   }
 
-  /**
-   * 防抖函数
-   * @param callback
-   * @param time
-   * @returns
-   */
-  function createDebounceFn(callback, time) {
-    var timer = null;
-    return function () {
-      for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
-        params[_key] = arguments[_key];
+  var install = function install(app, options) {
+    app.mixin({
+      onLaunch: function onLaunch(params) {
+        sendLaunchAppParamsLog(params);
       }
-      clearTimeout(timer);
-      timer = setTimeout(function () {
-        callback.apply(void 0, params);
-      }, time);
-    };
-  }
-
-  var install = function install(Vue) {};
+    });
+  };
   var index = {
     install: install
   };
 
-  exports.createDebounceFn = createDebounceFn;
   exports["default"] = index;
-  exports.sendLaunchAppParamsLog = sendLaunchAppParamsLog;
 
   Object.defineProperty(exports, '__esModule', { value: true });
 

package/imgs/warn.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686388435978" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2392" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 992C246.912 992 32 777.088 32 512 32 246.912 246.912 32 512 32c265.088 0 480 214.912 480 480 0 265.088-214.912 480-480 480zM480 256v352a32 32 0 0 0 64 0V256a32 32 0 0 0-64 0z m-16 528a48 48 0 1 0 96 0 48 48 0 0 0-96 0z" p-id="2393" fill="red"></path></svg>

package/package.json

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

package/src/index.ts

@@ -1,6 +1,14 @@
-export * from './utils';
+import { App } from 'vue';
 
-const install = (Vue: any) => {};
+import { sendLaunchAppParamsLog } from './utils';
+
+const install = (app: App<Element>, options: any) => {
+  app.mixin({
+    onLaunch(params: any) {
+      sendLaunchAppParamsLog(params);
+    },
+  });
+};
 
 export default {
   install,

package/src/utils/send-log.ts

@@ -5,6 +5,7 @@ import { reportLog } from 'uniapp-log-sdk';
  * @param params
  */
 export function sendLaunchAppParamsLog(params: any) {
+  console.log('小程序启动入参：', params);
   // #ifndef H5
   try {
     const outputData = JSON.parse(JSON.stringify(params?.referrerInfo?.extraData));