@shijiu/jsview-vue 2.1.5 → 2.1.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview-vue",
-  "version": "2.1.5",
+  "version": "2.1.23",
   "license": "MIT",
   "repository": "system/jsview-framework",
   "author": "mengxk",

package/utils/JsViewEngineWidget/JsvFocusBlock.vue

@@ -35,8 +35,11 @@ import {
   inject,
   provide,
   onUnmounted,
+  onActivated,
+  onDeactivated,
 } from "vue";
 import { HUB_NS_PROVIDE_NAME } from "./JsvFocusManager.js";
+
 const props = defineProps({
   name: String,
   namespace: String,
@@ -111,7 +114,7 @@ const exportObject = {
   getFullName,
   requestFocus,
   bubbleCustomerEvent,
-  returnFocusToParent
+  returnFocusToParent,
 };
 const _mountToFocusSystem = () => {
   const focusNode = toRaw(fDivRef.value)?.FocusNodeRef;
@@ -213,6 +216,24 @@ onUnmounted(() => {
   focusNodeRef = null;
 });
 
+onActivated(() => {
+  //TODO 首次mounted后会调用onActivated, 考虑避免重复添加
+  focusNodeRef = toRaw(fDivRef.value)?.FocusNodeRef;
+  _mountToFocusSystem();
+
+  if (!!props.autoFocus || props.autoFocus === "") {
+    requestFocus(props.autoFocus !== "exact");
+  }
+});
+
+onDeactivated(() => {
+  focusNodeRef?.onUnMount();
+  if (focusNodeRef?.jsvVueComponent) {
+    focusNodeRef.jsvVueComponent = undefined;
+  }
+  focusNodeRef = null;
+});
+
 defineExpose(exportObject);
 </script>
 

package/utils/JsViewEngineWidget/MetroWidget/MetroWidget.vue

@@ -148,6 +148,12 @@
                                                   3. EdgeDirection
         getCustomerDataSize
           @description 获取用户数据长度
+        setZIndex
+          @description 设置item的zIndex
+          @params {int} index: item的index
+          @params {int} blurZIndex: blur状态下的zIndex
+          @params {int} focusZIndex: focus状态下的zIndex, 缺省时采用blurZIndex相同的值
+            
   slots:
     renderItem: 该slot用于描画每个单元格
     background: 该slot描画在item后, 一般用于描画需要跟随MetroWidget滚动的内容

package/utils/JsViewEngineWidget/MetroWidget/MetroWidgetSetup.js

@@ -286,6 +286,7 @@ export const setup = (
       } else if (item.itemConfig.normalZIndex >= 0) {
         i = item.itemConfig.normalZIndex;
       }
+
       item.renderStyle.zIndex = i;
     }
   };
@@ -445,11 +446,23 @@ export const setup = (
     }
   };
 
+  const setZIndex = (index, normalZIndex, focusZIndex) => {
+    const targetItem = getItemByIndex(index);
+    if (targetItem) {
+      const n = normalZIndex, f = focusZIndex ?? normalZIndex;
+
+      targetItem.itemConfig.focusZIndex = f;
+      targetItem.itemConfig.normalZIndex = n;
+      const focused = isFocus && focusId == index2Id(index);
+      setItemZIndex(targetItem, focused ? f : n, focused);
+    }
+  }
+
   const slideToItem = (index, doAnim) => {
     templateItemAdder.tryAddItemByIndex(index);
     const targetItem = getItemByIndex(index);
     if (targetItem) {
-      const direction = index - preAnchorItemIndex > 0 ? 1 : -1;
+      const direction = index - preAnchorItemIndex >= 0 ? 1 : -1;
       const visible_start = _calculateVisibleStart(targetItem.templateInfo, direction);
       slideTo(visible_start, doAnim);
     }
@@ -466,14 +479,9 @@ export const setup = (
       _force_update = true;
     }
     let new_list = toRaw(props.provideData());
-    let needSlide = false;
     if (focusId >= new_list.length) {
-      focusId = 0;
+      focusId = new_list.length - 1;
       preFocusId = -1;
-      if (visibleInfo.start !== 0) {
-        visibleInfo.start = 0;
-        needSlide = true;
-      }
     }
     let new_index = 0;
     if (!_force_update) {
@@ -562,11 +570,7 @@ export const setup = (
     );
     updater.apply();
     onItemFocus(getItemById(focusId), null);
-    if (needSlide) {
-      _slideTo(visibleInfo.start, null);
-    } else if (need_update_content) {
-      _onScroll();
-    }
+    slideToItem(focusId, false);
   };
 
   const getVisibleItems = () => {
@@ -578,10 +582,12 @@ export const setup = (
     return {
       start: visibleStart,
       end: visibleEnd,
-      dataList: dataList.slice(info.visibleStart, info.visibleEnd + 1),
+      dataList: dataList.slice(visibleStart, visibleEnd + 1),
     };
   };
 
+  window.aaa = getVisibleItems;
+
   const moveFocus = (direction) => {
     if (direction == "left" || direction == 37 || direction == EdgeDirection.left) {
       _moveToNext(-1, 0);
@@ -614,6 +620,7 @@ export const setup = (
     getVisibleItems,
     moveFocus,
     getCustomerDataSize,
+    setZIndex,
   };
 
   const _calculateNearestItemByRect = (visibleSet, enter_rect_info) => {
@@ -1847,8 +1854,9 @@ export const setup = (
     if (visibleInfo.start) {
       _slideTo(visibleInfo.start, null);
     }
-
-    onItemFocus(getItemById(focusId), preEdgeRect);
+    if (isFocus) {
+      onItemFocus(getItemById(focusId), preEdgeRect);
+    }
 
     if (props.enableItemRenderBreak) {
       nextTick(() => {
@@ -1877,6 +1885,7 @@ export const setup = (
     focusBlockOnCustomerEvent,
     _onFocusableItemEdge,
     exportObject,
+    setZIndex,
   }
 }
 

package/utils/JsViewPlugin/JsvAudio/JsvAudio.vue

@@ -94,9 +94,9 @@ const props = defineProps({
   },
 });
 
-let key = "JsvAudio_" + getKeyToken();
+let key = "JsvAudio_" + window.JsView?.getJsContextId?.() + "_"  + getKeyToken();
 if (props.playerKey) {
-  key = props.playerKey;
+  key = props.playerKey + "_" + window.JsView?.getJsContextId?.();
 }
 console.log("player key:" + key);
 const audio = sAudioManager.createAudio(key);
@@ -137,4 +137,4 @@ onBeforeUnmount(() => {
 
 <template>
   <div :style="{ width: 1, height: 1 }" backgroundColor="rgba(0,0,0,1)"></div>
-</template>
+</template>

package/utils/JsViewPlugin/JsvPlayer/GetVersion.js

@@ -0,0 +1,20 @@
+import PluginInfo from './version.mjs'
+
+function reconfigPluginInfo() {
+    if(typeof window.jJsvRuntimeBridge!=='undefined' && window.jJsvRuntimeBridge && typeof window.jJsvRuntimeBridge.getPluginBaseUrl !== "undefined"){
+        let plugin_base_url = window.jJsvRuntimeBridge.getPluginBaseUrl();
+        if(plugin_base_url){
+            PluginInfo.downloadUrl = (plugin_base_url[plugin_base_url.length-1]==="/"?plugin_base_url:(plugin_base_url+"/"))+PluginInfo.packageName+"/JsvPlayer-"+PluginInfo.versionCodeMax+".dat?md5="+PluginInfo.md5;
+        }
+    }
+}
+
+reconfigPluginInfo();
+
+function getPluginInfo(){
+    return PluginInfo;
+}
+
+export {
+    getPluginInfo
+}