@shijiu/jsview-vue 0.9.766 → 0.9.783

package/samples/MetroWidgetDemos/PingPong/App.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ChenChanghua
  * @Date: 2021-12-21 15:36:29
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-09-01 17:08:21
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-03-09 16:28:50
  * @Description: file content
 -->
 <script>
@@ -10,12 +10,18 @@ import ViewSwiper from "./ViewSwiper.vue";
 import AppTab from "./AppTab.vue";
 import { reactive } from "vue";
 import { EdgeDirection } from "jsview";
-import { advanceMetroWidget, randomColor } from "../data.js";
 
 const pageList = [];
 const tabData = [];
 
-for (let i = 0; i < 5; i++) {
+const randomColor = () => {
+  let randomColor = Math.round(Math.random() * 2 ** 24).toString(16);
+  return (
+    "#" + new Array(6 - randomColor.length).fill("0").join("") + randomColor
+  );
+};
+
+for (let i = 0; i < 10; ++i) {
   tabData.push({
     width: 100,
     height: 50,
@@ -23,15 +29,20 @@ for (let i = 0; i < 5; i++) {
     content: "Tab_" + i,
     color: randomColor(),
   });
-
-  let data = JSON.parse(JSON.stringify(advanceMetroWidget));
-  data.forEach((item) => {
-    item.name = "testPage_" + i + "-" + item.name;
-  });
+  const pageData = [];
+  for (let j = 0; j < 10; ++j) {
+    pageData.push({
+      width: 500,
+      height: 170,
+      name: "testPage_" + i + "-" + "widget_" + j,
+      marginBottom: 10,
+      index: j,
+    });
+  }
   pageList.push({
     width: 600,
     height: 600,
-    data: data,
+    data: pageData,
     name: "testPage-" + i,
   });
 }
@@ -112,7 +123,7 @@ export default {
       <app-tab
         :data="tabData"
         :name="appTabName"
-        :layout="{ width: 1920, height: 100 }"
+        :layout="{ width: 600, height: 100 }"
         :onEdge="$_app_tabOnEdge"
         :style="{
           top: 15,

package/samples/MetroWidgetDemos/PingPong/AppPage.vue

@@ -1,13 +1,13 @@
 <!--
  * @Author: ChenChanghua
  * @Date: 2022-07-12 10:45:38
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-09-01 17:04:31
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-03-09 16:27:44
  * @Description: file content
 -->
 <script setup>
 import { VERTICAL, MetroWidget } from "jsview";
-import WidgetItem from "../WidgetItem.vue";
+import WidgetItem from "./WidgetItem.vue";
 import { ref, shallowRef, watch, onBeforeUnmount } from "vue";
 
 const props = defineProps({

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

@@ -1,8 +1,6 @@
 <!--
  * @Author: ChenChanghua
- * @Date: 2022-05-10 15:21:24
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-12-02 16:12:43
+ * @Date: 2023-03-09 16:28:25
  * @Description: file content
 -->
 <script setup>

package/samples/MetroWidgetDemos/PingPong/ViewSwiper.vue

@@ -1,14 +1,14 @@
 <!--
  * @Author: ChenChanghua
  * @Date: 2022-07-12 10:30:33
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-09-01 17:05:07
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-03-09 16:00:38
  * @Description: file content
 -->
 <script>
 import AppPage from "./AppPage.vue";
 import { getKeyFramesGroup } from "jsview";
-import { reactive, ref, shallowRef } from "vue";
+import { reactive } from "vue";
 
 export default {
   components: {

package/samples/MetroWidgetDemos/{WidgetItem.vue → PingPong/WidgetItem.vue}

@@ -1,3 +1,8 @@
+<!--
+ * @Author: ChenChanghua
+ * @Date: 2023-03-09 16:27:38
+ * @Description: file content
+-->
 
 <script setup>
 import { HORIZONTAL, MetroWidget, useFocusHub } from "jsview";
@@ -43,7 +48,7 @@ const onFocus = (rect) => {
 };
 const onBlur = () => {
   //onBlur时需要返还焦点给父MetroWidget
-  mwRef.value?.getFocusBlockRef().returnFocusToParent();
+  focusHub.returnFocusToParent();
 };
 
 props.onAction.register("onFocus", onFocus);

package/samples/MetroWidgetDemos/basic/App.vue

@@ -0,0 +1,162 @@
+<!--
+ * @Author: ChenChanghua
+ * @Date: 2023-03-08 14:52:08
+ * @Description: file content
+-->
+<script setup>
+import { MetroWidget, HORIZONTAL, useFocusHub } 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 provideData = () => {
+  const data = [
+    {
+      width: 90,
+      height: 90,
+      marginRight: 10,
+      marginBottom: 10,
+      color: randomColor(),
+      content: 0,
+    },
+    {
+      width: 90,
+      height: 90,
+      marginRight: 10,
+      marginBottom: 10,
+      color: randomColor(),
+      content: 1,
+    },
+    {
+      width: 90,
+      height: 90,
+      marginRight: 10,
+      marginBottom: 10,
+      color: randomColor(),
+      content: 2,
+    },
+    {
+      width: 190,
+      height: 190,
+      marginRight: 10,
+      marginBottom: 10,
+      color: randomColor(),
+      content: 3,
+    },
+    {
+      width: 90,
+      height: 90,
+      marginRight: 10,
+      marginBottom: 10,
+      color: randomColor(),
+      content: 4,
+    },
+    {
+      width: 90,
+      height: 90,
+      marginRight: 10,
+      marginBottom: 10,
+      color: randomColor(),
+      content: 5,
+    },
+  ];
+
+  for (let i = 0; i < 5; i++) {
+    data.push(
+      {
+        width: 90,
+        height: 190,
+        marginRight: 10,
+        marginBottom: 10,
+        color: randomColor(),
+        content: 6 + i * 2,
+      },
+      {
+        width: 90,
+        height: 90,
+        marginRight: 10,
+        marginBottom: 10,
+        color: randomColor(),
+        content: 6 + i * 2 + 1,
+      }
+    );
+  }
+  return data;
+};
+
+const measures = (data) => {
+  return {
+    width: data.width,
+    height: data.height,
+    marginRight: data.marginRight,
+    marginBottom: data.marginBottom,
+  };
+};
+
+// callbacks
+const onEdge = (edgeInfo) => {
+  console.log(TAG, "onEdge", edgeInfo);
+};
+
+const onFocus = () => {
+  console.log(TAG, "onFocus");
+};
+
+const onBlur = () => {
+  console.log(TAG, "onBlur");
+};
+
+const onScroll = (start, range, totalSize) => {
+  console.log(TAG, "onScroll", start, range, totalSize);
+};
+
+const widgetLayout = {
+  left: 50,
+  top: 50,
+  width: 500,
+  height: 300,
+};
+
+onMounted(() => {
+  //组件mount后设置焦点
+  focusHub.setFocus("mainMw");
+});
+</script>
+
+<template>
+  <div
+    :style="{
+      width: 1920,
+      height: 1080,
+      backgroundColor: '#007788',
+    }"
+  />
+  <metro-widget
+    name="mainMw"
+    :left="widgetLayout.left"
+    :top="widgetLayout.top"
+    :width="widgetLayout.width"
+    :height="widgetLayout.height"
+    :provideData="provideData"
+    :direction="HORIZONTAL"
+    :measures="measures"
+    :onEdge="onEdge"
+    :onFocus="onFocus"
+    :onBlur="onBlur"
+    :onScroll="onScroll"
+  >
+    <template #renderItem="{ data, onAction }">
+      <item :data="data" :onAction="onAction" />
+    </template>
+  </metro-widget>
+</template>

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',