vite-uni-dev-tool 1.0.0 → 1.1.0

package/dist/v3/{DevToolWindow → DevTool/components/DevToolWindow}/hooks/useDevToolOverlay.ts

@@ -1,184 +1,197 @@
-import { ref, reactive, shallowRef, nextTick } from 'vue';
-import type { DevTool } from '../../../type';
-import { isMockWX, isAndroid } from '../../../utils/index';
-import { emptyNetwork } from '../const';
-
-export function useDevToolOverlay(props: any) {
-  const openCode = ref(false);
-  const stack = ref('');
-  const showNetworkSend = ref(false);
-  const showNetworkDetail = ref(false);
-  const showNetworkIntercept = ref(false);
-  const showInterceptConfig = ref(false);
-  const showJsonDetail = ref(false);
-  const jsonData = shallowRef<
-    { title?: string; data: Record<string, any> } | undefined
-  >();
-  const showNfcTool = ref(false);
-  const showTransferDetail = ref(false);
-  const showWebSocketDetail = ref(false);
-
-  const network = reactive<DevTool.NetworkItem>({ ...emptyNetwork });
-  const transfer = reactive<DevTool.TransferItem>({
-    index: 0,
-    status: '',
-    type: 'upload',
-  });
-  const webSocket = reactive<DevTool.WS>({ url: '', message: [] });
-
-  function onCloseCode() {
-    openCode.value = false;
-    stack.value = '';
-  }
-
-  function onOpenCode(value?: string) {
-    if (!value) return;
-    stack.value = value;
-    const isWXLink = isMockWX(value ?? '') || props.mode !== 'development';
-    const isUseDevSource = !isWXLink && props.useDevSource;
-
-    if (isWXLink) {
-      uni.showToast({
-        icon: 'none',
-        title: '[DevTool] 请在小程序真机调试模式下查看源码',
-      });
-      return;
-    }
-    if (!isUseDevSource) return;
-
-    if (isAndroid()) {
-      if (props.sourceFileServers && props.sourceFileServers?.length > 0) {
-        openCode.value = true;
-      } else {
-        uni.showToast({
-          icon: 'none',
-          title: '[DevTool] sourceFileServers 配置异常',
-        });
-      }
-    } else {
-      openCode.value = true;
-    }
-  }
-
-  function onOpenJson(data?: { title?: string; data: Record<string, any> }) {
-    showJsonDetail.value = true;
-    jsonData.value = data;
-  }
-  function onCloseJson() {
-    showJsonDetail.value = false;
-    jsonData.value = undefined;
-  }
-
-  function onOpenNfcTool() {
-    showNfcTool.value = true;
-  }
-  function onCloseNfcTool() {
-    showNfcTool.value = false;
-  }
-
-  function onOpenNetworkDetail(ni?: DevTool.NetworkItem) {
-    Object.assign(network, emptyNetwork);
-    Object.assign(network, ni);
-    showNetworkDetail.value = true;
-  }
-  function onCloseNetworkDetail() {
-    showNetworkDetail.value = false;
-  }
-
-  function onOpenNetworkSend(ni?: DevTool.NetworkItem) {
-    Object.assign(network, emptyNetwork);
-    Object.assign(network, ni);
-    showNetworkSend.value = true;
-  }
-  function onCloseNetworkSend() {
-    showNetworkSend.value = false;
-  }
-
-  function onOpenNetworkIntercept() {
-    showNetworkIntercept.value = true;
-  }
-  function onCloseNetworkIntercept() {
-    showNetworkIntercept.value = false;
-  }
-
-  function onOpenInterceptConfig(ni?: DevTool.NetworkItem) {
-    Object.assign(network, emptyNetwork);
-    if (ni) Object.assign(network, ni);
-    showInterceptConfig.value = true;
-  }
-  function onCloseInterceptConfig() {
-    showInterceptConfig.value = false;
-  }
-
-  function onOpenTransferDetail(item?: DevTool.TransferItem) {
-    if ((item as any).formData) {
-      delete (transfer as any).formData;
-    }
-    if ((item as any).filePath) {
-      delete (transfer as any).filePath;
-    }
-    Object.assign(transfer, item);
-    showTransferDetail.value = true;
-  }
-  function onCloseTransferDetail() {
-    showTransferDetail.value = false;
-  }
-
-  function onOpenWebSocketDetail(ws?: DevTool.WS, currentWebSocket?: any) {
-    Object.assign(webSocket, ws);
-    nextTick(() => {
-      // 兼容直接传入对象或传入 Ref 的情况
-      if (
-        currentWebSocket === undefined ||
-        currentWebSocket?.value ||
-        currentWebSocket
-      ) {
-        showWebSocketDetail.value = true;
-      }
-    });
-  }
-  function onCloseWebSocketDetail() {
-    showWebSocketDetail.value = false;
-  }
-
-  return {
-    state: reactive({
-      openCode,
-      stack,
-      showNetworkSend,
-      showNetworkDetail,
-      showNetworkIntercept,
-      showInterceptConfig,
-      showJsonDetail,
-      jsonData,
-      showNfcTool,
-      showTransferDetail,
-      showWebSocketDetail,
-    }),
-    network,
-    transfer,
-    webSocket,
-    handlers: {
-      onCloseCode,
-      onOpenCode,
-      onOpenJson,
-      onCloseJson,
-      onOpenNfcTool,
-      onCloseNfcTool,
-      onOpenNetworkDetail,
-      onCloseNetworkDetail,
-      onOpenNetworkSend,
-      onCloseNetworkSend,
-      onOpenNetworkIntercept,
-      onCloseNetworkIntercept,
-      onOpenInterceptConfig,
-      onCloseInterceptConfig,
-      onOpenTransferDetail,
-      onCloseTransferDetail,
-      onOpenWebSocketDetail,
-      onCloseWebSocketDetail,
-    },
-  };
-}
-
-import { emptyNetwork as _emptyNetwork } from '../const';
+import { ref, reactive, shallowRef, nextTick } from 'vue';
+import type { DevTool } from '../../../../../type';
+import { isMockWX, isAndroid } from '../../../../../utils/index';
+import { emptyNetwork } from '../const';
+
+export function useDevToolOverlay(props: any) {
+  const openCode = ref(false);
+  const stack = ref('');
+  const showNetworkSend = ref(false);
+  const showNetworkDetail = ref(false);
+  const showNetworkIntercept = ref(false);
+  const showInterceptConfig = ref(false);
+  const showJsonDetail = ref(false);
+  const jsonData = shallowRef<
+    { title?: string; data: Record<string, any> } | undefined
+  >();
+  const showNfcTool = ref(false);
+  const showTransferDetail = ref(false);
+  const showWebSocketDetail = ref(false);
+  const showBluetoothTool = ref(false);
+  const bluetoothDevice = shallowRef<DevTool.BluetoothItem | null>(null);
+
+  const network = reactive<DevTool.NetworkItem>({ ...emptyNetwork });
+  const transfer = reactive<DevTool.TransferItem>({
+    index: 0,
+    status: '',
+    type: 'upload',
+  });
+  const webSocket = reactive<DevTool.WS>({ url: '', message: [] });
+
+  function onCloseCode() {
+    openCode.value = false;
+    stack.value = '';
+  }
+
+  function onOpenCode(value?: string) {
+    if (!value) return;
+    stack.value = value;
+    const isWXLink = isMockWX(value ?? '') || props.mode !== 'development';
+    const isUseDevSource = !isWXLink && props.useDevSource;
+
+    if (isWXLink) {
+      uni.showToast({
+        icon: 'none',
+        title: '[DevTool] 请在小程序真机调试模式下查看源码',
+      });
+      return;
+    }
+    if (!isUseDevSource) return;
+
+    if (isAndroid()) {
+      if (props.sourceFileServers && props.sourceFileServers?.length > 0) {
+        openCode.value = true;
+      } else {
+        uni.showToast({
+          icon: 'none',
+          title: '[DevTool] sourceFileServers 配置异常',
+        });
+      }
+    } else {
+      openCode.value = true;
+    }
+  }
+
+  function onOpenJson(data?: { title?: string; data: Record<string, any> }) {
+    showJsonDetail.value = true;
+    jsonData.value = data;
+  }
+  function onCloseJson() {
+    showJsonDetail.value = false;
+    jsonData.value = undefined;
+  }
+
+  function onOpenNfcTool() {
+    showNfcTool.value = true;
+  }
+  function onCloseNfcTool() {
+    showNfcTool.value = false;
+  }
+
+  function onOpenBluetoothTool(device: DevTool.BluetoothItem) {
+    bluetoothDevice.value = device;
+    showBluetoothTool.value = true;
+  }
+  function onCloseBluetoothTool() {
+    showBluetoothTool.value = false;
+    bluetoothDevice.value = null;
+  }
+
+  function onOpenNetworkDetail(ni?: DevTool.NetworkItem) {
+    Object.assign(network, emptyNetwork);
+    Object.assign(network, ni);
+    showNetworkDetail.value = true;
+  }
+  function onCloseNetworkDetail() {
+    showNetworkDetail.value = false;
+  }
+
+  function onOpenNetworkSend(ni?: DevTool.NetworkItem) {
+    Object.assign(network, emptyNetwork);
+    Object.assign(network, ni);
+    showNetworkSend.value = true;
+  }
+  function onCloseNetworkSend() {
+    showNetworkSend.value = false;
+  }
+
+  function onOpenNetworkIntercept() {
+    showNetworkIntercept.value = true;
+  }
+  function onCloseNetworkIntercept() {
+    showNetworkIntercept.value = false;
+  }
+
+  function onOpenInterceptConfig(ni?: DevTool.NetworkItem) {
+    Object.assign(network, emptyNetwork);
+    if (ni) Object.assign(network, ni);
+    showInterceptConfig.value = true;
+  }
+  function onCloseInterceptConfig() {
+    showInterceptConfig.value = false;
+  }
+
+  function onOpenTransferDetail(item?: DevTool.TransferItem) {
+    if ((item as any).formData) {
+      delete (transfer as any).formData;
+    }
+    if ((item as any).filePath) {
+      delete (transfer as any).filePath;
+    }
+    Object.assign(transfer, item);
+    showTransferDetail.value = true;
+  }
+  function onCloseTransferDetail() {
+    showTransferDetail.value = false;
+  }
+
+  function onOpenWebSocketDetail(ws?: DevTool.WS, currentWebSocket?: any) {
+    Object.assign(webSocket, ws);
+    nextTick(() => {
+      // 兼容直接传入对象或传入 Ref 的情况
+      if (
+        currentWebSocket === undefined ||
+        currentWebSocket?.value ||
+        currentWebSocket
+      ) {
+        showWebSocketDetail.value = true;
+      }
+    });
+  }
+  function onCloseWebSocketDetail() {
+    showWebSocketDetail.value = false;
+  }
+
+  return {
+    state: reactive({
+      openCode,
+      stack,
+      showNetworkSend,
+      showNetworkDetail,
+      showNetworkIntercept,
+      showInterceptConfig,
+      showJsonDetail,
+      jsonData,
+      showNfcTool,
+      showTransferDetail,
+      showWebSocketDetail,
+      showBluetoothTool,
+      bluetoothDevice,
+    }),
+    network,
+    transfer,
+    webSocket,
+    handlers: {
+      onCloseCode,
+      onOpenCode,
+      onOpenJson,
+      onCloseJson,
+      onOpenNfcTool,
+      onCloseNfcTool,
+      onOpenNetworkDetail,
+      onCloseNetworkDetail,
+      onOpenNetworkSend,
+      onCloseNetworkSend,
+      onOpenNetworkIntercept,
+      onCloseNetworkIntercept,
+      onOpenInterceptConfig,
+      onCloseInterceptConfig,
+      onOpenTransferDetail,
+      onCloseTransferDetail,
+      onOpenWebSocketDetail,
+      onCloseWebSocketDetail,
+      onOpenBluetoothTool,
+      onCloseBluetoothTool,
+    },
+  };
+}

package/dist/v3/{DevToolWindow → DevTool/components/DevToolWindow}/index.vue

@@ -282,6 +282,17 @@
               @openTool="overlay.handlers.onOpenNfcTool" />
           </CustomSwiperItem>
 
+          <!-- Bluetooth -->
+          <CustomSwiperItem
+            v-if="isTabVisible('Bluetooth')"
+            :key="tabIndex.Bluetooth"
+            style="width: 100%; height: 100%">
+            <BluetoothList
+              v-if="swiperShow(tabIndex.Bluetooth)"
+              :contentHeight="dynamicContentHeight"
+              @openTool="overlay.handlers.onOpenBluetoothTool" />
+          </CustomSwiperItem>
+
           <!-- Storage -->
           <CustomSwiperItem
             v-if="isTabVisible('Storage')"
@@ -341,6 +352,14 @@
               :performanceVisible="performanceVisible"
               :performanceShowFps="performanceShowFps"
               :performanceShowCpu="performanceShowCpu"
+              :barrage-visible="barrageVisible"
+              :barrage-max-tracks="barrageMaxTracks"
+              :barrage-track-height="barrageTrackHeight"
+              :barrage-start-top="barrageStartTop"
+              :barrage-duration="barrageDuration"
+              :barrage-max-length="barrageMaxLength"
+              :barrage-types="barrageTypes"
+              :barrage-show-when-open="barrageShowWhenOpen"
               :sizeFormat="sizeFormat"
               :buildInfo="buildInfo"
               :cache-intercept-config="cacheInterceptConfig"
@@ -365,6 +384,14 @@
               @change-cache-intercept-config="onChangeCacheInterceptConfig"
               @change-cache-network-log="onChangeCacheNetworkLog"
               @change-cache-console-log="onChangeCacheConsoleLog"
+              @change-barrage="onChangeBarrage"
+              @change-barrage-max-tracks="onChangeBarrageMaxTracks"
+              @change-barrage-track-height="onChangeBarrageTrackHeight"
+              @change-barrage-start-top="onChangeBarrageStartTop"
+              @change-barrage-duration="onChangeBarrageDuration"
+              @change-barrage-max-length="onChangeBarrageMaxLength"
+              @change-barrage-types="onChangeBarrageTypes"
+              @change-barrage-show-when-open="onChangeBarrageShowWhenOpen"
               @change-use-transition="onChangeUseTransition"
               @changeFont="onChangeFontSize"
               @onChangePerformanceShowFps="onChangePerformanceShowFps"
@@ -414,8 +441,8 @@ import {
   ref,
   watch,
 } from 'vue';
-import AppTransition from '../AppTransition/index.vue';
-import Tabs from '../Tabs/index.vue';
+import AppTransition from '../../../components/AppTransition/index.vue';
+import Tabs from '../../../components/Tabs/index.vue';
 import ConsoleList from '../ConsoleList/index.vue';
 import NetworkList from '../NetworkList/index.vue';
 import StorageList from '../StorageList/index.vue';
@@ -431,18 +458,22 @@ import UniEvent from '../UniEvent/index.vue';
 import CaptureScreen from '../CaptureScreen/index.vue';
 import ScanCodeList from '../ScanCodeList/index.vue';
 import NFCList from '../NFCList/index.vue';
+import BluetoothList from '../BluetoothList/index.vue';
 import InstanceDetail from '../InstanceDetail/index.vue';
 import DevToolOverlay from './DevToolOverlay.vue';
-import CustomSwiper from '../CustomSwiper/index.vue';
-import CustomSwiperItem from '../CustomSwiper/CustomSwiperItem.vue';
-import DraggableContainer from '../DraggableContainer/index.vue';
-import CircularButton from '../CircularButton/index.vue';
-import { useI18n } from '../../i18n';
-
-import { DEV_CORE_MESSAGE, MSG_TYPE, CMD_TYPE } from '../../const';
-import { getCurrentPagePath } from '../../utils/index';
-import type { DevTool } from '../../type';
-import { getDevToolInfo, setDevToolInfo } from '../../modules/devToolInfo';
+import CustomSwiper from '../../../components/CustomSwiper/index.vue';
+import CustomSwiperItem from '../../../components/CustomSwiper/CustomSwiperItem.vue';
+import DraggableContainer from '../../../components/DraggableContainer/index.vue';
+import CircularButton from '../../../components/CircularButton/index.vue';
+import { useI18n } from '../../../../i18n';
+
+import { DEV_CORE_MESSAGE, MSG_TYPE, CMD_TYPE } from '../../../../const';
+import { getCurrentPagePath } from '../../../../utils/index';
+import type { DevTool } from '../../../../type';
+import {
+  getDevToolInfo,
+  setDevToolInfo,
+} from '../../../../modules/devToolInfo';
 import { getTabItems, tabIndex } from './const';
 
 // 引入 Hooks
@@ -532,6 +563,14 @@ const {
   performanceVisible,
   performanceShowFps,
   performanceShowCpu,
+  barrageVisible,
+  barrageMaxTracks,
+  barrageTrackHeight,
+  barrageStartTop,
+  barrageDuration,
+  barrageMaxLength,
+  barrageTypes,
+  barrageShowWhenOpen,
   isFullScreen,
   windowX,
   windowY,
@@ -640,6 +679,14 @@ const {
   onChangePerformance,
   onChangePerformanceShowFps,
   onChangePerformanceShowCpu,
+  onChangeBarrage,
+  onChangeBarrageMaxTracks,
+  onChangeBarrageTrackHeight,
+  onChangeBarrageStartTop,
+  onChangeBarrageDuration,
+  onChangeBarrageMaxLength,
+  onChangeBarrageTypes,
+  onChangeBarrageShowWhenOpen,
   basicSendMessage,
 } = handlers;
 
@@ -811,6 +858,10 @@ onMounted(() => {
       'ElEvent',
       'UniEvent',
     ];
+    barrageShowWhenOpen.value =
+      devToolInfo?.barrageShowWhenOpen !== undefined
+        ? devToolInfo.barrageShowWhenOpen
+        : false;
 
     // 延迟恢复滚动位置，确保布局已渲染
     setTimeout(() => {
@@ -824,10 +875,10 @@ onMounted(() => {
 
     if (devToolInfo.windowSettings) {
       isFullScreen.value = devToolInfo.windowSettings.isFullScreen ?? true;
-      windowX.value = devToolInfo.windowSettings.x ?? 10;
-      windowY.value = devToolInfo.windowSettings.y ?? 100;
-      windowWidth.value = devToolInfo.windowSettings.width ?? 375;
-      windowHeight.value = devToolInfo.windowSettings.height ?? 450;
+      windowX.value = Number(devToolInfo.windowSettings.x) || 10;
+      windowY.value = Number(devToolInfo.windowSettings.y) || 100;
+      windowWidth.value = Number(devToolInfo.windowSettings.width) || 375;
+      windowHeight.value = Number(devToolInfo.windowSettings.height) || 450;
     }
   }
   if (props.data) {