@shijiu/jsview-vue 1.9.648 → 1.9.719

package/samples/MetroWidgetDemos/Advanced/{Widgets.vue → widgets/Widgets.vue}

@@ -2,21 +2,46 @@
  * @Author: ChenChanghua
  * @Date: 2022-07-11 13:31:36
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-07-18 09:59:32
+ * @LastEditTime: 2022-11-02 15:35:12
  * @Description: file content
 -->
 <script setup>
-import { MetroWidget, VERTICAL, EdgeDirection } from "jsview";
-import { useFocusHub } from "jsview";
-import { advanceMetroWidget } from "../data";
-import WidgetItem from "../WidgetItem.vue";
+import {
+  MetroWidget,
+  VERTICAL,
+  EdgeDirection,
+  JsvNinePatch,
+  useFocusHub,
+} from "jsview";
+import { advanceMetroWidget } from "../../data";
+import WidgetItem from "../widgets/WidgetItem.vue";
+import focusImg from "./focus1.png";
+import { ref, shallowRef, reactive, provide } from "vue";
 
-const foucsHub = useFocusHub();
+const focusHub = useFocusHub();
+const showFocus = ref(false);
 
-//item为Widgetitem的一些回调
 const provideData = () => {
   return advanceMetroWidget;
 };
+
+const onFocus = () => {
+  console.log("testtest", " widget onfocus");
+  showFocus.value = true;
+};
+
+const onBlur = () => {
+  showFocus.value = false;
+};
+
+const focusSize = reactive({
+  width: 0,
+  height: 0,
+  left: 0,
+  top: 0,
+});
+provide("focusSize", focusSize);
+
 // measures中会返回doSlide: false, 既MetroWidget自身不处理滚动, 滚动由子的sendFocusRectEvent控制
 const measures = (item) => {
   return {
@@ -29,7 +54,7 @@ const measures = (item) => {
 };
 const onEdge = (edgeInfo) => {
   if (edgeInfo.direction == EdgeDirection.left) {
-    foucsHub.setFocus("mwButton");
+    focusHub.setFocus("mwButton");
   }
 };
 </script>
@@ -38,7 +63,7 @@ const onEdge = (edgeInfo) => {
   <div
     :style="{
       left: 500,
-      top: 50,
+      top: 20,
       width: 500,
       height: 400,
       fontSize: 30,
@@ -47,16 +72,20 @@ const onEdge = (edgeInfo) => {
   >
     {{ `进一步, MetroWidget的item\n可以是包含MetroWidget的组件` }}
   </div>
+  <!-- 为了保证边缘的item缩放后依旧完整显示, 需要设置padding, 注意width/height是包含padding的 -->
   <metro-widget
     name="mwWidget"
-    :top="150"
+    :top="100"
     :left="400"
     :provideData="provideData"
-    :width="600"
+    :width="660"
     :height="600"
+    :padding="{ left: 30, right: 30 }"
     :direction="VERTICAL"
     :measures="measures"
     :onEdge="onEdge"
+    :onFocus="onFocus"
+    :onBlur="onBlur"
   >
     <!-- data为每个item的数据, query提供获取MetroWidget内部状态的一些接口, onAction提供item注册自身回调的接口, onItemEdge则是item内部焦点处理到达边缘后, 需要通知MetroWidget时的回调 -->
     <template #renderItem="{ data, query, onAction, onItemEdge }">
@@ -68,4 +97,20 @@ const onEdge = (edgeInfo) => {
       />
     </template>
   </metro-widget>
+  <jsv-nine-patch
+    v-show="showFocus"
+    :style="{
+      width: focusSize.width,
+      height: focusSize.height,
+      top: focusSize.top,
+      left: focusSize.left,
+    }"
+    :imageUrl="focusImg"
+    :imageWidth="55"
+    :centerWidth="1"
+    :borderOutset="13"
+    :imageDspWidth="55"
+    :animTime="0.2"
+    :waitForInit="true"
+  ></jsv-nine-patch>
 </template>

package/samples/MetroWidgetDemos/Item.vue

@@ -2,11 +2,11 @@
  * @Author: ChenChanghua
  * @Date: 2022-05-10 15:21:24
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-07-11 17:00:58
+ * @LastEditTime: 2022-11-01 15:24:26
  * @Description: file content
 -->
 <script setup>
-import { ref } from "vue";
+import { ref, shallowRef, inject } from "vue";
 
 const props = defineProps({
   data: Object,
@@ -14,11 +14,28 @@ const props = defineProps({
   onAction: Object,
 });
 
+const divRef = shallowRef(null);
 const focused = ref(false);
 
+const focusSize = inject("focusSize");
+
 // 自身的焦点状态自己记录, 通过回调来改变
 const onFocus = () => {
   focused.value = true;
+  if (focusSize) {
+    divRef.value?.getBoundingClientRect().then(
+      (data) => {
+        console.log("testtest focus size", data)
+        focusSize.width = data.width;
+        focusSize.height = data.height;
+        focusSize.left = data.left;
+        focusSize.top = data.top;
+      },
+      (error) => {
+        console.log("testtest abs failed", error);
+      }
+    );
+  }
 };
 const onBlur = () => {
   focused.value = false;
@@ -53,6 +70,7 @@ props.onAction.register("onClick", onClick);
       }"
     ></div>
     <div
+      ref="divRef"
       :style="{
         width: data.width,
         height: data.height,

package/samples/MetroWidgetDemos/PerformanceTest/App.vue

@@ -76,7 +76,7 @@ import { data1, data2, data3 } from "./data";
 import borderImgPath from "./border.png";
 import Item from "./components/ContentItem.vue";
 import MyTab from "./components/MyTab.vue";
-import { ref, onMounted, onBeforeUnmount } from "vue";
+import { ref, shallowRef, onMounted, onBeforeUnmount } from "vue";
 import { useRouter } from "vue-router";
 import {
   VERTICAL,
@@ -90,7 +90,7 @@ const router = useRouter();
 const focusHub = useFocusHub();
 let contentData = data1;
 let requestDataTime = 0;
-const mwRef = ref(null);
+const mwRef = shallowRef(null);
 
 const onKeyDown = (ev) => {
   // 8:Backspace, 27:Escape, 10000:盒子返回键
@@ -127,7 +127,7 @@ const onItemFocus = (id) => {
     clearTimeout(requestDataTime);
     requestDataTime = 0;
   }
-  requestDataTime = setTimeout(() => {
+  // requestDataTime = setTimeout(() => {
     switch (id) {
       case 0:
         contentData = data1;
@@ -140,7 +140,7 @@ const onItemFocus = (id) => {
         break;
     }
     mwRef.value?.refreshData(true);
-  }, 0);
+  // }, 0);
 };
 
 onBeforeUnmount(() => {

package/samples/MetroWidgetDemos/PerformanceTest/components/ContentItem.vue

@@ -13,7 +13,7 @@ import couponMid from "../assets/coupon_mid.png";
 import borderLeft from "../assets/line_left.png";
 import borderMid from "../assets/line_mid.png";
 import borderRight from "../assets/line_right.png";
-import { ref, computed } from "vue";
+import { ref, shallowRef, computed } from "vue";
 
 const props = defineProps({
   data: Object,

package/samples/MetroWidgetDemos/PerformanceTest/components/MyTab.vue

@@ -6,7 +6,7 @@
  * @Description: file content
 -->
 <script>
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
 
 export default {
   props: {

package/samples/MetroWidgetDemos/PingPong/App.vue

@@ -2,7 +2,7 @@
  * @Author: ChenChanghua
  * @Date: 2021-12-21 15:36:29
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-07-12 16:11:32
+ * @LastEditTime: 2022-09-01 17:08:21
  * @Description: file content
 -->
 <script>
@@ -20,13 +20,13 @@ for (let i = 0; i < 5; i++) {
     width: 100,
     height: 50,
     marginRight: 10,
-    content: "Tab-" + i,
+    content: "Tab_" + i,
     color: randomColor(),
   });
 
   let data = JSON.parse(JSON.stringify(advanceMetroWidget));
   data.forEach((item) => {
-    item.name = "testPage-" + i + "-" + item.name;
+    item.name = "testPage_" + i + "-" + item.name;
   });
   pageList.push({
     width: 600,

package/samples/MetroWidgetDemos/PingPong/AppPage.vue

@@ -2,13 +2,13 @@
  * @Author: ChenChanghua
  * @Date: 2022-07-12 10:45:38
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-07-12 14:43:49
+ * @LastEditTime: 2022-09-01 17:04:31
  * @Description: file content
 -->
 <script setup>
 import { VERTICAL, MetroWidget } from "jsview";
 import WidgetItem from "../WidgetItem.vue";
-import { reactive } from "vue";
+import { ref, shallowRef, watch, onBeforeUnmount } from "vue";
 
 const props = defineProps({
   data: {
@@ -24,6 +24,8 @@ const props = defineProps({
   },
 });
 
+const widgetRef = shallowRef(null);
+
 const provideData = () => {
   return props.data.data;
 };
@@ -34,10 +36,23 @@ const measures = (item) => {
     doSlide: false,
   };
 };
+
+const watcher = watch(
+  () => props.data,
+  (newValue, oldValue) => {
+    widgetRef.value?.refreshData();
+  }
+);
+
+onBeforeUnmount(() => {
+  watcher();
+})
+
 </script>
 
 <template>
   <metro-widget
+    ref="widgetRef"
     :name="name"
     :width="data.width"
     :height="data.height"

package/samples/MetroWidgetDemos/PingPong/AppTab.vue

@@ -2,19 +2,12 @@
  * @Author: ChenChanghua
  * @Date: 2022-07-12 10:45:19
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-07-12 15:39:29
+ * @LastEditTime: 2022-09-01 16:19:51
  * @Description: file content
 -->
-<!--
- * @Author: ChenChanghua
- * @Date: 2021-12-21 17:18:58
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2021-12-28 10:58:25
- * @Description: 标题 tab
--->
 <script setup>
 import { HORIZONTAL, MetroWidget } from "jsview";
-import Item from "./Item.vue";
+import TabItem from "./TabItem.vue";
 
 const props = defineProps({
   data: {
@@ -62,7 +55,7 @@ const provideData = () => {
       }"
     >
       <template #renderItem="{ data, query, onAction }">
-        <item :data="data" :query="query" :onAction="onAction"></item>
+        <tab-item :data="data" :query="query" :onAction="onAction"></tab-item>
       </template>
     </metro-widget>
   </jsv-focus-block>

package/samples/MetroWidgetDemos/PingPong/{Item.vue → TabItem.vue}

@@ -2,18 +2,11 @@
  * @Author: ChenChanghua
  * @Date: 2022-07-12 14:52:53
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-07-12 16:08:56
- * @Description: file content
--->
-<!--
- * @Author: ChenChanghua
- * @Date: 2022-05-10 15:21:24
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-07-11 17:00:58
+ * @LastEditTime: 2022-09-01 17:10:14
  * @Description: file content
 -->
 <script setup>
-import { ref, inject } from "vue";
+import { ref, shallowRef, inject } from "vue";
 
 const props = defineProps({
   data: Object,
@@ -33,13 +26,12 @@ const onFocus = () => {
   active.value = false;
 };
 const onBlur = () => {
-  console.log("cchtest item onblur");
   focused.value = false;
   active.value =
     props.query.getCurrentFocusId().id === props.query.id ? true : false;
 };
 const onClick = () => {
-  console.log("item onclick ", props.data);
+  console.log("tab item onclick ", props.data);
 };
 
 // 一般在create的时候进行回调的注册, 使用 option api的可以在created时进行注册

package/samples/MetroWidgetDemos/PingPong/ViewSwiper.vue

@@ -2,13 +2,13 @@
  * @Author: ChenChanghua
  * @Date: 2022-07-12 10:30:33
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-07-13 10:50:43
+ * @LastEditTime: 2022-09-01 17:05:07
  * @Description: file content
 -->
 <script>
 import AppPage from "./AppPage.vue";
 import { getKeyFramesGroup } from "jsview";
-import { reactive } from "vue";
+import { reactive, ref, shallowRef } from "vue";
 
 export default {
   components: {

package/samples/MetroWidgetDemos/Simple/AbsoluteTemplate.vue

@@ -10,7 +10,7 @@ import { MetroWidget, WholePageSlide, HORIZONTAL, EdgeDirection } from "jsview";
 import { useFocusHub } from "jsview";
 import { simpleDataAbs } from "../data";
 import Item from "../Item.vue";
-const foucsHub = useFocusHub();
+const focusHub = useFocusHub();
 
 const wholePageSlide = new WholePageSlide();
 
@@ -29,7 +29,7 @@ const measuresAbs = (item) => {
 };
 const onEdgeAbs = (edgeInfo) => {
   if (edgeInfo.direction == EdgeDirection.left) {
-    foucsHub.setFocus("mw");
+    focusHub.setFocus("mw");
   }
 };
 </script>

package/samples/MetroWidgetDemos/Simple/App.vue

@@ -13,10 +13,10 @@ import AbsoluteTemplate from "./AbsoluteTemplate.vue";
 import RelativeTemplate from "./RelativeTemplate.vue";
 
 const router = useRouter();
-const foucsHub = useFocusHub();
+const focusHub = useFocusHub();
 
 const onFocus = () => {
-  foucsHub.setFocus("button");
+  focusHub.setFocus("button");
 };
 const onKeyDown = (ev) => {
   if (ev.keyCode == 8 || ev.keyCode == 27 || ev.keyCode == 10000) {

package/samples/MetroWidgetDemos/Simple/RelativeTemplate.vue

@@ -7,13 +7,13 @@
 -->
 <script setup>
 import { MetroWidget, WholePageSlide, HORIZONTAL, EdgeDirection } from "jsview";
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
 import { useFocusHub } from "jsview";
 import { simpleData } from "../data";
 import Item from "../Item.vue";
 
-const foucsHub = useFocusHub();
-const mwRef = ref(null);
+const focusHub = useFocusHub();
+const mwRef = shallowRef(null);
 
 const wholePageSlide = new WholePageSlide();
 let innerData = simpleData.concat();
@@ -34,9 +34,9 @@ const onEdge = (edgeInfo) => {
   // MetroWidget焦点到达边缘后的回调
   if (edgeInfo.direction == EdgeDirection.top) {
     buttonFocus.value = true;
-    foucsHub.setFocus("button");
+    focusHub.setFocus("button");
   } else if (edgeInfo.direction == EdgeDirection.right) {
-    foucsHub.setFocus("mwAbs");
+    focusHub.setFocus("mwAbs");
   }
 };
 
@@ -45,7 +45,7 @@ const buttonOnKeyDown = (ev) => {
   switch (ev.keyCode) {
     case 40:
       buttonFocus.value = false;
-      foucsHub.setFocus("mw");
+      focusHub.setFocus("mw");
       return true;
     case 13:
       if (innerData.length == simpleData.length) {

package/samples/MetroWidgetDemos/WidgetItem.vue

@@ -1,7 +1,7 @@
 
 <script setup>
 import { HORIZONTAL, MetroWidget, useFocusHub } from "jsview";
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
 import Item from "./Item.vue";
 
 const props = defineProps({
@@ -11,7 +11,7 @@ const props = defineProps({
   onAction: Object,
 });
 const focusHub = useFocusHub();
-const mwRef = ref(null);
+const mwRef = shallowRef(null);
 
 const measures = (item) => {
   return item;

package/samples/MetroWidgetDemos/data.js

@@ -2,7 +2,7 @@
  * @Author: ChenChanghua
  * @Date: 2022-07-11 14:00:33
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-07-12 14:35:01
+ * @LastEditTime: 2022-11-02 15:23:08
  * @Description: file content
  */
 
@@ -177,6 +177,7 @@ for (let i = 0; i < 10; i++) {
     height: 170,
     name: "widget_" + i,
     marginBottom: 10,
+    index: i,
   });
 }
 

package/samples/NinePatchDemo/App.vue

@@ -7,7 +7,7 @@ import {
 } from "jsview";
 import Item from "./Item.vue";
 import borderImageUrl from "./assets/border.png";
-import { ref, onMounted } from "vue";
+import { ref, shallowRef, onMounted } from "vue";
 import { useRouter, useRoute } from "vue-router";
 
 const router = useRouter();
@@ -77,7 +77,7 @@ const _onKeyDown = (ev) => {
   return false;
 };
 
-const myFocusWidget = ref(null);
+const myFocusWidget = shallowRef(null);
 
 onMounted(() => {
   myFocusWidget.value.getFocusBlockRef().requestFocus();

package/samples/NinePatchDemo/Item.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from "vue";
+import { ref, shallowRef, computed } from "vue";
 
 const props = defineProps({
   data: Object,

package/samples/Preload/App.vue

@@ -5,20 +5,21 @@ import {
   JsvPreload,
   buildPreloadInfo,
   buildDownloadInfo,
+  useFocusHub,
 } from "jsview";
 import awesome from "./images/awesomeface.png";
 import cat from "./images/cat.jpg";
 import { data } from "./data.js";
 import Item from "./Item.vue";
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
 import { useRouter } from "vue-router";
 
 const name = "/preload";
+const focusHub = useFocusHub();
 const text = ref("");
-let = preloadInfo = [];
-let = downloadInfo = [];
+let preloadInfo = [];
+let downloadInfo = [];
 const router = useRouter();
-let focusNode = ref(null);
 
 const _onPreloading = (percent) => {
   console.log("preloading ", percent);
@@ -28,9 +29,9 @@ const _onPreloadDone = (imageInfo) => {
   console.log("PRELOAD DONE!", imageInfo);
 };
 
-const _onDownloadDone = () => {
-  console.log("DOWNLOAD DONE!");
-  this.text = `图片下载完成\n${awesome}\n${cat}`;
+const _onDownloadDone = (urls, extra) => {
+  console.log("DOWNLOAD DONE!", urls, extra);
+  text.value = `图片下载完成\n${awesome}\n${cat}`;
 };
 
 const _measures = () => {
@@ -43,13 +44,13 @@ const _measures = () => {
 
 const _onKeyDown = (ev) => {
   if (ev.keyCode == 8 || ev.keyCode == 27 || ev.keyCode == 10000) {
-    router.go(-1); // 有router时，是从DemoHomepage进入，回退
+    router?.go(-1); // 有router时，是从DemoHomepage进入，回退
   }
   return true;
 };
 
 const _onFocus = () => {
-  focusNode.value.findBlockByName(name).requestFocus();
+  focusHub.setFocus(name);
 };
 
 for (const item of data) {
@@ -58,16 +59,20 @@ for (const item of data) {
 }
 preloadInfo.push(null); // 测试item为null的加载
 downloadInfo = [
-  buildDownloadInfo(awesome),
-  buildDownloadInfo(cat),
+  buildDownloadInfo(awesome, null, true),
+  buildDownloadInfo(cat, null, true),
   buildDownloadInfo(null), // 测试URL为null的加载
 ];
 </script>
 
 <template>
   <jsv-focus-block
-    ref="focusNode"
     autoFocus
+    :style="{
+      width: 1920,
+      height: 1080,
+      backgroundColor: '#FFFFFF',
+    }"
     :onAction="{
       onKeyDown: _onKeyDown,
       onFocus: _onFocus,

package/samples/Preload/Item.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
 const props = defineProps({
   data: Object,
   query: Object,

package/samples/QrcodeDemo/App.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { JsvQrcode } from "jsview";
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
 import { useRouter } from "vue-router";
 
 const router = useRouter();