vite-uni-dev-tool 0.0.15 → 0.0.17

package/dist/v2/ConsoleList/ConsoleItem.vue

@@ -176,6 +176,7 @@ export default {
   margin-top: 4px;
   /* color: #616161; */
   text-align: right;
+  color: var(--dev-tool-text-color);
 }
 
 .console-tags {
@@ -208,10 +209,10 @@ export default {
   background-color: var(--dev-tool-success-color);
 }
 .console-item-info {
-  color: var(--dev-tool-log-color);
+  color: var(--dev-tool-info-color);
 }
 .console-item-log {
-  color: #f9f9f9;
+  color: var(--dev-tool-info-color);
 }
 
 .console-arg-null {

package/dist/v2/NetworkList/NetworkDetail.vue

@@ -10,7 +10,7 @@
       >
         {{ item.label }}
       </Tag>
-      <CloseButton style="margin-left: auto" @click="onClose" />
+      <CircularButton style="margin-left: auto" text="×" @click="onClose" />
     </view>
 
     <view class="network-detail-header" v-if="currentSelect === 'header'">
@@ -79,14 +79,14 @@
 import JsonPretty from '../JsonPretty/index.vue';
 import Tag from '../Tag/index.vue';
 import Empty from '../Empty/index.vue';
-import CloseButton from '../CloseButton/index.vue';
+import CircularButton from '../CircularButton/index.vue';
 
 export default {
   components: {
     JsonPretty,
     Tag,
     Empty,
-    CloseButton,
+    CircularButton,
   },
   props: {
     network: {

package/dist/v2/NetworkList/NetworkItem.vue

@@ -32,14 +32,16 @@
         >开始:
         {{
           network.startTime
-            ? formatDate(network.startTime, 'HH:mm:ss')
-            : '--:--:--'
+            ? formatDate(network.startTime, 'HH:mm:ss:SS')
+            : '--:--:--:---'
         }}</view
       >
       <view>
         结束:
         {{
-          network.endTime ? formatDate(network.endTime, 'HH:mm:ss') : '--:--:--'
+          network.endTime
+            ? formatDate(network.endTime, 'HH:mm:ss:SS')
+            : '--:--:--:---'
         }}
       </view>
     </view>

package/dist/v2/SettingList/index.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="setting-content">
     <view class="setting-item">
-      <DevToolTitle>DevTool(v0.0.12-vue2)</DevToolTitle>
+      <DevToolTitle>DevTool(v0.0.16-vue2)</DevToolTitle>
       <view class="setting-item-content">
         <view class="setting-row">
           <view>显示调试按钮：</view>

package/dist/v2/SourceCode/index.vue

@@ -6,7 +6,7 @@
         style="width: 100%"
         @search="onSearch"
       />
-      <CloseButton style="margin-left: auto" @click="onClose" />
+      <CircularButton style="margin-left: auto" text="×" @click="onClose" />
     </view>
     <view class="dev-tool-code-title">{{ fileName }}</view>
     <scroll-view
@@ -36,14 +36,14 @@
 
 <script>
 import FilterInput from '../FilterInput/index.vue';
-import CloseButton from '../CloseButton/index.vue';
+import CircularButton from '../CircularButton/index.vue';
 import Empty from '../Empty/index.vue';
 import { escapeHTML, hightLight, isAndroid, parseStock } from '../../utils';
 
 export default {
   components: {
     FilterInput,
-    CloseButton,
+    CircularButton,
     Empty,
   },
   props: {

package/dist/v2/StorageList/index.vue

@@ -24,7 +24,11 @@
             <view>key: </view>
             <view v-html="item._oldKey" />
           </view>
-          <CloseButton style="margin-left: auto" @click="onRemove(item.key)" />
+          <CircularButton
+            style="margin-left: auto"
+            text="×"
+            @click="onRemove(item.key)"
+          />
         </view>
 
         <JsonPretty
@@ -46,7 +50,7 @@
 import Tag from '../Tag/index.vue';
 import JsonPretty from '../JsonPretty/index.vue';
 import Empty from '../Empty/index.vue';
-import CloseButton from '../CloseButton/index.vue';
+import CircularButton from '../CircularButton/index.vue';
 import FilterInput from '../FilterInput/index.vue';
 
 export default {
@@ -54,7 +58,7 @@ export default {
     Tag,
     JsonPretty,
     Empty,
-    CloseButton,
+    CircularButton,
     FilterInput,
   },
   props: {

package/dist/v2/Tabs/index.vue

@@ -24,17 +24,17 @@
     </scroll-view>
     <view class="tabs-extra">
       <slot name="extra"></slot>
-      <CloseButton style="margin: 0 16px" @click="onClose" />
+      <CircularButton style="margin: 0 16px" text="×" @click="onClose" />
     </view>
   </view>
 </template>
 
 <script>
-import CloseButton from '../CloseButton/index.vue';
+import CircularButton from '../CircularButton/index.vue';
 
 export default {
   components: {
-    CloseButton,
+    CircularButton,
   },
   props: {
     modelValue: {

package/dist/v2/UploadList/UploadDetail.vue

@@ -11,7 +11,7 @@
         {{ item.label }}
       </Tag>
 
-      <CloseButton style="margin-left: auto" @click="onClose" />
+      <CircularButton style="margin-left: auto" text="×" @click="onClose" />
     </view>
 
     <view class="upload-detail-header" v-if="currentSelect === 'header'">
@@ -71,14 +71,14 @@
 import JsonPretty from '../JsonPretty/index.vue';
 import Tag from '../Tag/index.vue';
 import Empty from '../Empty/index.vue';
-import CloseButton from '../CloseButton/index.vue';
+import CircularButton from '../CircularButton/index.vue';
 
 export default {
   components: {
     JsonPretty,
     Tag,
     Empty,
-    CloseButton,
+    CircularButton,
   },
   props: {
     upload: {

package/dist/v2/WebSocket/WebSocketList.vue

@@ -3,7 +3,7 @@
     <view class="web-socket-top">
       请求url:
 
-      <CloseButton style="margin-left: auto" @click="onClose" />
+      <CircularButton style="margin-left: auto" text="×" @click="onClose" />
     </view>
     <view class="web-socket-url">
       {{ ws.url }}
@@ -45,13 +45,13 @@
 
 <script>
 import Tag from '../Tag/index.vue';
-import CloseButton from '../CloseButton/index.vue';
+import CircularButton from '../CircularButton/index.vue';
 import { formatDate } from '../../utils/index';
 
 export default {
   components: {
     Tag,
-    CloseButton,
+    CircularButton,
   },
   props: {
     /** @type {{url:string; method:string; headers: {key:string; value:string}[]; message: { time:string; data:string }[] }} */

package/dist/v3/{CloseButton → CircularButton}/index.vue

@@ -1,7 +1,9 @@
 <template>
-  <view class="close-button" @click="onClick"> × </view>
+  <view class="circular-button" @click="onClick"> {{ text }} </view>
 </template>
 <script lang="ts" setup>
+defineProps<{ text: string }>();
+
 const emit = defineEmits<{ (e: 'click'): void }>();
 
 function onClick() {
@@ -10,7 +12,7 @@ function onClick() {
 </script>
 
 <style scoped>
-.close-button {
+.circular-button {
   flex-shrink: 0;
   display: flex;
   align-items: center;

package/dist/v3/ConsoleList/ConsoleItem.vue

@@ -1,68 +1,56 @@
 <template>
   <view :id="id" :class="`console-item console-item-${consoleItem.type}`">
-    <view class="console-info">
-      <view class="console-args">
-        <template v-for="(item, index) in consoleItem.args">
-          <view
-            v-if="item.type !== 'array' && item.type !== 'object'"
-            :class="`console-arg console-arg-${item.type}`"
-            :key="index"
-            v-html="item.value"
-          >
-          </view>
-          <JsonPretty
-            v-else
-            :data="item.value"
-            collapsed
-            showLength
-            :autoVirtualRow="100"
-          />
-        </template>
-      </view>
-      <view class="console-position">
-        <view class="console-tags">
-          <Tag
-            v-if="consoleItem.mode"
-            mode="log"
-            style="margin-right: 6px; justify-content: center"
-          >
-            {{ consoleItem.mode }}
-          </Tag>
-          <Tag :mode="consoleItem.type">
-            {{ consoleItem.type }}
-          </Tag>
+    <view class="console-args">
+      <template v-for="(item, index) in consoleItem.args">
+        <view
+          v-if="item.type !== 'array' && item.type !== 'object'"
+          :class="`console-arg console-arg-${item.type}`"
+          :key="index"
+          v-html="item.value"
+        >
         </view>
+        <JsonPretty
+          v-else
+          collapsed
+          showLength
+          :data="item.value"
+          :autoVirtualRow="100"
+        />
+      </template>
+    </view>
+    <view class="console-position">
+      <view class="console-tags">
+        <Tag
+          v-if="consoleItem.mode"
+          mode="log"
+          style="margin-right: 6px; justify-content: center"
+        >
+          {{ consoleItem.mode }}
+        </Tag>
+        <Tag :mode="consoleItem.type">
+          {{ consoleItem.type }}
+        </Tag>
+      </view>
 
-        <view>
-          <view class="console-time">{{ consoleItem.time }}</view>
-          <view class="console-other" v-html="consoleItem.position"></view>
-          <view
-            :class="`console-other ${isUseDevSource ? 'console-stack' : ''}`"
-            v-if="consoleItem.stack"
-            v-html="consoleItem.stack"
-            @click="onStackClick"
-          ></view>
-        </view>
+      <view>
+        <view class="console-time">{{ consoleItem.time }}</view>
+        <view class="console-other" v-html="consoleItem.position"></view>
+        <view
+          :class="`console-other ${isUseDevSource ? 'console-stack' : ''}`"
+          v-if="consoleItem.stack"
+          v-html="consoleItem.stack"
+          @click="emit('openCode', consoleItem.stack)"
+        ></view>
       </view>
     </view>
-    <!-- <view class="console-copy">C</view> -->
-    <SourceCode
-      v-if="openCode && consoleItem.stack"
-      :url="consoleItem.stack"
-      :sourceFileServers="sourceFileServers"
-      :mode="mode"
-      :zIndex="zIndex"
-      @close="onCloseCode"
-    />
   </view>
 </template>
 
 <script setup lang="ts">
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import Tag from '../Tag/index.vue';
-import SourceCode from '../SourceCode/index.vue';
 import type { DevTool } from '../../type';
-import { isAndroid, isMockWX } from '../../utils';
+import { isMockWX } from '../../utils';
 import JsonPretty from '../JsonPretty/index.vue';
 const props = defineProps<{
   consoleItem: DevTool.ConsoleItem;
@@ -73,7 +61,9 @@ const props = defineProps<{
   id: string;
 }>();
 
-const openCode = ref(false);
+const emit = defineEmits<{
+  (e: 'openCode', value: string): void;
+}>();
 
 const isUseDevSource = computed(() => {
   return (
@@ -82,55 +72,13 @@ const isUseDevSource = computed(() => {
     props.useDevSource
   );
 });
-
-const isWXLink = computed(() => {
-  return (
-    isMockWX(props?.consoleItem?.stack ?? '') || props.mode !== 'development'
-  );
-});
-
-function onStackClick() {
-  if (isWXLink.value) {
-    uni.showToast({
-      icon: 'none',
-      title: '[DevTool] 请在小程序真机调试模式下查看源码',
-    });
-    return;
-  }
-
-  if (!isUseDevSource.value) {
-    return;
-  }
-
-  if (isAndroid()) {
-    if (props.sourceFileServers && props.sourceFileServers.length > 0) {
-      openCode.value = true;
-    } else {
-      uni.showToast({
-        icon: 'none',
-        title: '[DevTool] sourceFileServers 配置异常',
-      });
-      uni?.__dev__console?.log('[DevTool] sourceFileServers 配置异常');
-    }
-  } else {
-    openCode.value = true;
-  }
-}
-
-function onCloseCode() {
-  openCode.value = false;
-}
 </script>
 <style scoped>
 .console-item {
-  display: flex;
   padding: 16px;
   border-bottom: 1px solid var(--dev-tool-border-color);
   font-size: var(--dev-tool-base-font-size);
 }
-.console-info {
-  flex: 1;
-}
 .console-args {
   display: flex;
   flex-wrap: wrap;
@@ -147,8 +95,8 @@ function onCloseCode() {
   align-items: flex-start;
   justify-content: space-between;
   margin-top: 4px;
-  /* color: #616161; */
   text-align: right;
+  color: var(--dev-tool-text-color);
 }
 
 .console-tags {
@@ -181,10 +129,10 @@ function onCloseCode() {
   background-color: var(--dev-tool-success-color);
 }
 .console-item-info {
-  color: var(--dev-tool-log-color);
+  color: var(--dev-tool-info-color);
 }
 .console-item-log {
-  color: #f9f9f9;
+  color: var(--dev-tool-info-color);
 }
 
 .console-arg-null {

package/dist/v3/ConsoleList/index.vue

@@ -38,6 +38,7 @@
             :useDevSource="useDevSource"
             :id="`dev-console-${index}`"
             :zIndex="zIndex"
+            @openCode="emit('openCode', $event)"
           />
         </AutoSize>
         <Empty v-if="!consoleList || consoleList.length === 0" />
@@ -73,6 +74,7 @@ const emit = defineEmits<{
   (e: 'search', value: string): void;
   (e: 'update:modelValue', value: string): void;
   (e: 'run', value: string): void;
+  (e: 'openCode', value: string): void;
 }>();
 const consoleFilterItems: {
   label: string;

package/dist/v3/DevTool/index.vue

@@ -169,10 +169,10 @@ onShow(() => {
     });
   }
 });
-onHide(() => {
-  isActive = false;
-  devToolWindowVisible.value = false;
-});
+// onHide(() => {
+//   isActive = false;
+//   devToolWindowVisible.value = false;
+// });
 </script>
 <style scoped>
 .dev-tool {