@shijiu/jsview-vue 0.9.766 → 0.9.804

package/samples/MetroWidgetDemos/basic/Item.vue

@@ -0,0 +1,43 @@
+<!--
+ * @Author: ChenChanghua
+ * @Date: 2023-03-08 14:52:17
+ * @Description: file content
+-->
+<script setup>
+import { ref, shallowRef, inject } from "vue";
+
+const props = defineProps({
+  data: Object,
+  onAction: Object,
+});
+
+const focused = ref(false);
+
+// 注册回调
+const onFocus = () => {
+  focused.value = true;
+};
+const onBlur = () => {
+  focused.value = false;
+};
+const onClick = () => {
+  console.log("item onclick ", props.data);
+};
+props.onAction.register("onFocus", onFocus);
+props.onAction.register("onBlur", onBlur);
+props.onAction.register("onClick", onClick);
+</script>
+
+<template>
+  <div
+    :style="{
+      width: data.width,
+      height: data.height,
+      fontSize: 30,
+      color: focused ? '#FF0000' : '#FFFFFF',
+      backgroundColor: data.color,
+    }"
+  >
+    {{ data.content }}
+  </div>
+</template>

package/samples/MetroWidgetDemos/direction/App.vue

@@ -0,0 +1,158 @@
+<!--
+ * @Author: ChenChanghua
+ * @Date: 2023-03-08 15:17:44
+ * @Description: file content
+-->
+<script setup>
+import {
+  MetroWidget,
+  HORIZONTAL,
+  VERTICAL,
+  useFocusHub,
+  EdgeDirection,
+} from "jsview";
+import Item from "./Item.vue";
+import { onMounted } from "vue";
+
+const TAG = "MetroWidgetDemo";
+
+const focusHub = useFocusHub();
+
+const randomColor = () => {
+  let randomColor = Math.round(Math.random() * 2 ** 24).toString(16);
+  return (
+    "#" + new Array(6 - randomColor.length).fill("0").join("") + randomColor
+  );
+};
+
+const data = [];
+for (let i = 0; i < 30; i++) {
+  data.push({
+    width: 90,
+    height: 90,
+    marginRight: 10,
+    marginBottom: 10,
+    color: randomColor(),
+    content: i,
+  });
+}
+
+const horizontalWidget = {
+  provideData: () => {
+    return data;
+  },
+  measures: (data) => {
+    return {
+      width: data.width,
+      height: data.height,
+      marginRight: data.marginRight,
+      marginBottom: data.marginBottom,
+    };
+  },
+  onEdge: (edgeInfo) => {
+    if (edgeInfo.direction == EdgeDirection.bottom) {
+      focusHub.setFocus("widget2");
+    }
+  },
+  widgetLayout: {
+    left: 50,
+    top: 50,
+    width: 300,
+    height: 200,
+  },
+};
+
+const verticalWidget = {
+  provideData: () => {
+    return data;
+  },
+  measures: (data) => {
+    return {
+      width: data.width,
+      height: data.height,
+      marginRight: data.marginRight,
+      marginBottom: data.marginBottom,
+    };
+  },
+  onEdge: (edgeInfo) => {
+    if (edgeInfo.direction == EdgeDirection.top) {
+      focusHub.setFocus("widget1");
+    }
+  },
+  widgetLayout: {
+    left: 50,
+    top: 300,
+    width: 200,
+    height: 300,
+  },
+};
+
+onMounted(() => {
+  //组件mount后设置焦点
+  focusHub.setFocus("widget1");
+});
+</script>
+
+<template>
+  <div
+    :style="{
+      width: 1920,
+      height: 1080,
+      backgroundColor: '#007788',
+    }"
+  />
+  <div
+    :style="{
+      left: 50,
+      width: 1280,
+      height: 50,
+      fontSize: 25,
+      color: '#FFFFFF',
+    }"
+  >
+    {{ "HORIZONTAL: 向右延伸. 排列顺序从上往下, 从左往右" }}
+  </div>
+  <metro-widget
+    name="widget1"
+    :left="horizontalWidget.widgetLayout.left"
+    :top="horizontalWidget.widgetLayout.top"
+    :width="horizontalWidget.widgetLayout.width"
+    :height="horizontalWidget.widgetLayout.height"
+    :provideData="horizontalWidget.provideData"
+    :measures="horizontalWidget.measures"
+    :onEdge="horizontalWidget.onEdge"
+    :direction="HORIZONTAL"
+  >
+    <template #renderItem="{ data, onAction }">
+      <item :data="data" :onAction="onAction" />
+    </template>
+  </metro-widget>
+
+  <div
+    :style="{
+      left: 50,
+      top: 250,
+      width: 1280,
+      height: 50,
+      fontSize: 25,
+      color: '#FFFFFF',
+    }"
+  >
+    {{ "VERTICAL: 向下延伸. 排列顺序从左往右, 从上往下" }}
+  </div>
+  <metro-widget
+    name="widget2"
+    :left="verticalWidget.widgetLayout.left"
+    :top="verticalWidget.widgetLayout.top"
+    :width="verticalWidget.widgetLayout.width"
+    :height="verticalWidget.widgetLayout.height"
+    :provideData="verticalWidget.provideData"
+    :measures="verticalWidget.measures"
+    :onEdge="verticalWidget.onEdge"
+    :direction="VERTICAL"
+  >
+    <template #renderItem="{ data, onAction }">
+      <item :data="data" :onAction="onAction" />
+    </template>
+  </metro-widget>
+</template>

package/samples/MetroWidgetDemos/direction/Item.vue

@@ -0,0 +1,45 @@
+<!--
+ * @Author: ChenChanghua
+ * @Date: 2023-03-08 14:52:17
+ * @Description: file content
+-->
+<script setup>
+import { ref, shallowRef, inject } from "vue";
+
+const props = defineProps({
+  data: Object,
+  onAction: Object,
+});
+
+const divRef = shallowRef(null);
+const focused = ref(false);
+
+// 注册回调
+const onFocus = () => {
+  focused.value = true;
+};
+const onBlur = () => {
+  focused.value = false;
+};
+const onClick = () => {
+  console.log("item onclick ", props.data);
+};
+props.onAction.register("onFocus", onFocus);
+props.onAction.register("onBlur", onBlur);
+props.onAction.register("onClick", onClick);
+</script>
+
+<template>
+  <div
+    ref="divRef"
+    :style="{
+      width: data.width,
+      height: data.height,
+      fontSize: 30,
+      color: focused ? '#FF0000' : '#FFFFFF',
+      backgroundColor: data.color,
+    }"
+  >
+    {{ data.content }}
+  </div>
+</template>

package/samples/MetroWidgetDemos/focusableItemBasic/App.vue

@@ -0,0 +1,67 @@
+<!--
+ * @Author: ChenChanghua
+ * @Date: 2022-07-11 13:31:36
+ * @Description: file content
+-->
+<script setup>
+import { MetroWidget, HORIZONTAL, EdgeDirection, useFocusHub } from "jsview";
+import { onMounted } from "vue";
+import ButtonItem from "./ButtonItem.vue";
+
+const focusHub = useFocusHub();
+window.focusHub = focusHub
+const provideData = () => {
+  const data = [];
+  for (let i = 0; i < 20; i++) {
+    data.push({
+      width: 200,
+      height: 100,
+      name: "button_" + i,
+      marginRight: 10,
+      marginBottom: 10,
+    });
+  }
+  return data;
+};
+const measures = (item) => {
+  return {
+    width: item.width,
+    height: item.height,
+    marginRight: item.marginRight,
+    marginBottom: item.marginBottom,
+  };
+};
+
+onMounted(() => {
+  focusHub.setFocus("mwButton");
+});
+</script>
+
+<template>
+  <div
+    :style="{
+      left: 50,
+      top: 20,
+      width: 600,
+      height: 400,
+      fontSize: 30,
+      color: '#FFFFFF',
+    }"
+  >
+    {{ "item组件包含JsvFocusBlock, 从而每个item可以在自己内部处理按键事件" }}
+  </div>
+  <metro-widget
+    name="mwButton"
+    :top="120"
+    :left="50"
+    :provideData="provideData"
+    :width="600"
+    :height="400"
+    :direction="HORIZONTAL"
+    :measures="measures"
+  >
+    <template #renderItem="{ data, onAction }">
+      <button-item :data="data" :onAction="onAction" />
+    </template>
+  </metro-widget>
+</template>

package/samples/MetroWidgetDemos/{Advanced → focusableItemBasic}/ButtonItem.vue

@@ -1,9 +1,7 @@
 <!--
  * @Author: ChenChanghua
- * @Date: 2022-07-11 13:26:24
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-12-02 16:10:16
- * @Description: file content
+ * @Date: 2023-03-09 14:19:01
+ * @Description: 一个简单的按左右键, 焦点在左右两个view来回切换的控件
 -->
 <script setup>
 import { ref, shallowRef } from "vue";
@@ -11,27 +9,26 @@ import { useFocusHub } from "jsview";
 
 const props = defineProps({
   data: Object,
-  query: Object,
   onAction: Object,
-  onItemEdge: Function,
 });
 const focusHub = useFocusHub();
 
-let focusIndex = ref(0);
 let focused = ref(false);
-let focusBlock = shallowRef(null);
-
+let focusIndex = ref(0);
 const onFocus = () => {
-  //onFocus时, 获得焦点, 以处理自己内部的焦点逻辑
+  /**重要代码: onFocus时, 获得焦点, 以处理自己内部的焦点逻辑*/
   focusHub.setFocus(props.data.name);
+  /*******/
   focused.value = true;
 };
 const onBlur = () => {
   focused.value = false;
   focusIndex.value = 0;
-  //onBlur的时候, 需要将焦点返还给父
-  focusBlock.value?.returnFocusToParent();
+  /**重要代码: onBlur的时候, 需要将焦点返还给父*/
+  focusHub.returnFocusToParent();
+  /*******/
 };
+
 const onKeyDown = (ev) => {
   if (ev.keyCode == 37 && focusIndex.value == 1) {
     focusIndex.value = 0;
@@ -52,7 +49,6 @@ props.onAction.register("onBlur", onBlur);
 
 <template>
   <jsv-focus-block
-    ref="focusBlock"
     :name="data.name"
     :onAction="{
       onKeyDown: onKeyDown,
@@ -60,8 +56,8 @@ props.onAction.register("onBlur", onBlur);
   >
     <div
       :style="{
-        width: 50,
-        height: 50,
+        width: 100,
+        height: 100,
         fontSize: 20,
         color: '#FFFFFF',
         backgroundColor: '#00AA00',
@@ -70,17 +66,17 @@ props.onAction.register("onBlur", onBlur);
 
     <div
       :style="{
-        left: 50,
-        width: 50,
-        height: 50,
+        left: 100,
+        width: 100,
+        height: 100,
         backgroundColor: '#0000AA',
       }"
     ></div>
 
     <div
       :style="{
-        visibility: this.focused ? 'visible' : 'hidden',
-        left: 50 * focusIndex,
+        visibility: focused ? 'visible' : 'hidden',
+        left: 100 * focusIndex,
         width: 10,
         height: 10,
         backgroundColor: '#FF0000',

package/samples/MetroWidgetDemos/focusableItemMetroWidget/App.vue

@@ -0,0 +1,74 @@
+<!--
+ * @Author: ChenChanghua
+ * @Date: 2022-07-11 13:31:36
+ * @Description: file content
+-->
+<script setup>
+import { MetroWidget, VERTICAL, EdgeDirection, useFocusHub } from "jsview";
+import WidgetItem from "./WidgetItem.vue";
+import { onMounted } from "vue";
+
+const focusHub = useFocusHub();
+
+const provideData = () => {
+  const data = [];
+  for (let i = 0; i < 10; i++) {
+    data.push({
+      width: 500,
+      height: 170,
+      name: "widget_" + i,
+      marginBottom: 10,
+      index: i,
+    });
+  }
+  return data;
+};
+
+const measures = (item) => {
+  return {
+    width: item.width,
+    height: item.height,
+    marginRight: item.marginRight,
+    marginBottom: item.marginBottom,
+    /**重要代码: doSlide设置为false, 由子MetroWidget控制滚动 */
+    doSlide: false,
+  };
+};
+
+onMounted(() => {
+  focusHub.setFocus("mwWidget");
+});
+</script>
+
+<template>
+  <div :style="{ width: 1920, height: 1080, backgroundColor: '#007788' }" />
+  <div
+    :style="{
+      left: 100,
+      top: 20,
+      width: 600,
+      height: 400,
+      fontSize: 30,
+      color: '#FFFFFF',
+    }"
+  >
+    {{ `MetroWidget的item是包含MetroWidget的组件` }}
+  </div>
+  <!-- 为了保证边缘的item缩放后依旧完整显示, 需要设置padding, 注意width/height是包含padding的 -->
+  <metro-widget
+    name="mwWidget"
+    :top="140"
+    :left="50"
+    :width="660"
+    :height="600"
+    :provideData="provideData"
+    :padding="{ left: 30, right: 30 }"
+    :direction="VERTICAL"
+    :measures="measures"
+  >
+    <!-- 重要代码: 为了实现焦点就近移动, 需要传递onItemEdge回调 -->
+    <template #renderItem="{ data, onAction, onItemEdge }">
+      <widget-item :data="data" :onAction="onAction" :onItemEdge="onItemEdge" />
+    </template>
+  </metro-widget>
+</template>

package/samples/MetroWidgetDemos/{Advanced/widgets → focusableItemMetroWidget}/Item.vue

@@ -1,15 +1,6 @@
 <!--
  * @Author: ChenChanghua
- * @Date: 2022-11-01 15:30:14
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-12-02 16:11:54
- * @Description: file content
--->
-<!--
- * @Author: ChenChanghua
- * @Date: 2022-05-10 15:21:24
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-11-01 15:24:26
+ * @Date: 2023-03-09 15:33:54
  * @Description: file content
 -->
 <script setup>
@@ -17,31 +8,14 @@ import { ref, shallowRef, inject } from "vue";
 
 const props = defineProps({
   data: Object,
-  query: Object,
   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) => {
-        focusSize.width = data.width;
-        focusSize.height = data.height;
-        focusSize.left = data.left;
-        focusSize.top = data.top;
-      },
-      (error) => {
-        console.log("get absolute position failed", error);
-      }
-    );
-  }
 };
 const onBlur = () => {
   focused.value = false;
@@ -66,14 +40,22 @@ props.onAction.register("onClick", onClick);
     }"
   >
     <div
-      ref="divRef"
+      v-if="focused"
+      :style="{
+        left: -2,
+        top: -2,
+        width: data.width + 4,
+        height: data.height + 4,
+        backgroundColor: '#FF0000',
+      }"
+    />
+    <div
       :style="{
         width: data.width,
         height: data.height,
-        fontSize: '30px',
+        fontSize: 30,
         color: '#FFFFFF',
         backgroundColor: data.color,
-        borderRadius: '10px',
       }"
     >
       {{ data.content }}

package/samples/MetroWidgetDemos/{Advanced/widgets → focusableItemMetroWidget}/WidgetItem.vue

@@ -6,7 +6,6 @@ import Item from "./Item.vue";
 
 const props = defineProps({
   data: Object,
-  query: Object,
   onItemEdge: Function,
   onAction: Object,
 });
@@ -37,13 +36,15 @@ const provideData = () => {
   return data;
 };
 const onFocus = (rect) => {
-  //获得焦点时需要做就近移动的处理, 因此需要通过setEnterFocusRect设置寻找最近焦点的区域
+  /** 重要代码: 参数rect为父MetroWidget传递的, 焦点过来的区域
+   *  因此需要调用setEnterFocusRect来设置焦点进入区域, 以寻找最近的焦点
+   */
   mwRef.value?.setEnterFocusRect(rect);
   focusHub.setFocus(props.data.name);
 };
 const onBlur = () => {
   //onBlur时需要返还焦点给父MetroWidget
-  mwRef.value?.getFocusBlockRef().returnFocusToParent();
+  focusHub.returnFocusToParent();
 };
 
 props.onAction.register("onFocus", onFocus);
@@ -61,15 +62,15 @@ props.onAction.register("onBlur", onBlur);
   >
     {{ data.name }}
   </div>
-  <!-- sendFocusRectEvent可以让MetroWidget的item在获焦时发送事件, 通知父的MetroWidget进行滚动 -->
-  <!-- onItemEdge直接作为onEdge回调, 既子MetroWidget到达边缘时触发父的onItemEdge -->
+  <!-- 重要代码: sendFocusRectEvent可以让MetroWidget的item在获焦时发送事件, 通知父的MetroWidget进行滚动 -->
+  <!-- 重要代码: onItemEdge直接作为onEdge回调, 既子MetroWidget到达边缘时触发父的onItemEdge -->
   <metro-widget
     ref="mwRef"
-    :top="50"
     :name="data.name"
-    :provideData="provideData"
+    :top="50"
     :width="data.width"
     :height="data.height"
+    :provideData="provideData"
     :direction="HORIZONTAL"
     :padding="{
       left: 30,
@@ -81,8 +82,8 @@ props.onAction.register("onBlur", onBlur);
     :onEdge="onItemEdge"
     :sendFocusRectEvent="true"
   >
-    <template #renderItem="{ data, query, onAction }">
-      <item :data="data" :query="query" :onAction="onAction" />
+    <template #renderItem="{ data, onAction }">
+      <item :data="data" :onAction="onAction" />
     </template>
   </metro-widget>
 </template>

package/samples/MetroWidgetDemos/focusableItemMix/App.vue

@@ -0,0 +1,88 @@
+<!--
+ * @Author: ChenChanghua
+ * @Date: 2022-07-11 13:31:36
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-03-09 15:31:53
+ * @Description: file content
+-->
+<script setup>
+import { MetroWidget, HORIZONTAL, EdgeDirection, useFocusHub } from "jsview";
+import ButtonItem from "./ButtonItem.vue";
+import Item from "./Item.vue";
+import { onMounted } from "vue";
+
+const focusHub = useFocusHub();
+
+const randomColor = () => {
+  let randomColor = Math.round(Math.random() * 2 ** 24).toString(16);
+  return (
+    "#" + new Array(6 - randomColor.length).fill("0").join("") + randomColor
+  );
+};
+//item混排的回调
+const provideData = () => {
+  const advanceMix = [];
+  for (let i = 0; i < 20; i++) {
+    advanceMix.push({
+      width: 200,
+      height: 100,
+      name: "mix_button_" + i,
+      marginRight: 10,
+      marginBottom: 10,
+      type: i % 2 == 0 ? "button" : "item",
+      color: randomColor(),
+      content: i,
+    });
+  }
+  return advanceMix;
+};
+const measures = (item) => {
+  return {
+    width: item.width,
+    height: item.height,
+    marginRight: item.marginRight,
+    marginBottom: item.marginBottom,
+  };
+};
+
+const onEdge = (edgeInfo) => {};
+
+onMounted(() => {
+  focusHub.setFocus("mwMix");
+});
+</script>
+
+<template>
+  <div
+    :style="{
+      left: 50,
+      top: 10,
+      width: 600,
+      height: 400,
+      fontSize: 30,
+      color: '#FFFFFF',
+    }"
+  >
+    {{ "包含JsvFocusBlock的组件和纯描画组件混排" }}
+  </div>
+  <metro-widget
+    name="mwMix"
+    :top="100"
+    :left="50"
+    :provideData="provideData"
+    :width="600"
+    :height="400"
+    :direction="VERTICAL"
+    :measures="measures"
+    :onEdge="onEdge"
+  >
+    <template #renderItem="{ data, onAction }">
+      <button-item
+        v-if="data.type == 'button'"
+        :data="data"
+        :onAction="onAction"
+      />
+      <item v-else :data="data" :onAction="onAction" />
+    </template>
+  </metro-widget>
+</template>