@shijiu/jsview-vue 2.1.25 → 2.1.200

package/utils/JsViewEngineWidget/TemplateParser/CommonMetroTemplate.ts

@@ -277,6 +277,7 @@ class CommonMetroTemplate extends MetroTemplate {
     templateItem.top = yPos;
     templateItem.centerXPos = Math.floor(xPos + xWidth / 2) - 1;
     templateItem.centerYPos = Math.floor(yPos + yWidth / 2) - 1;
+
     //分页相关的计算
     let curPageNumber = 0;
     let curPageHeadIndex = 0;
@@ -305,6 +306,24 @@ class CommonMetroTemplate extends MetroTemplate {
     templateItem.pageNumber = curPageNumber;
     templateItem.pageHeadIndex = curPageHeadIndex;
     this.addTemplateItem(templateItem);
+
+    //记录尾元素
+    if (this.tailItemIndex < 0) {
+      this.tailItemIndex = templateItem.index;
+    } else {
+      let pre: number, cur: number;
+      if (this.direction === VERTICAL) {
+        cur = templateItem.height + templateItem.top;
+        pre = this.templateList[this.tailItemIndex].height + this.templateList[this.tailItemIndex].top;
+      } else {
+        cur = templateItem.width + templateItem.left;
+        pre = this.templateList[this.tailItemIndex].width + this.templateList[this.tailItemIndex].left;
+      }
+      if (cur >= pre) {
+        this.tailItemIndex = templateItem.index;
+      }
+    }
+
     // 计算相邻项
     this._TryCalculateNeighborItem(
       this.templateList.length - 1,
@@ -396,7 +415,8 @@ class CommonMetroTemplate extends MetroTemplate {
     let nextTemplateItem = this.getNextItemInner(
       itemIndex,
       offset,
-      vOffset !== 0
+      vOffset !== 0,
+      this.supportHistoryPath
     );
     const isVertical = this.direction === VERTICAL;
 
@@ -444,50 +464,61 @@ class CommonMetroTemplate extends MetroTemplate {
   }
 
 
-  private getNextItemInner(index: number, offset: number, vertical: boolean) {
+  private getNextItemInner(index: number, offset: number,
+    vertical: boolean, useHistory: boolean, checkAnchor: number = -1) {
     const templateList = this.templateList;
     const baseItem = templateList[index];
-    let checkAnchor = -1;
-    if (baseItem.findNextAnchor) {
-      //有自定义的 anchor
-      // TODO 优化
-      if (vertical) {
-        if (offset > 0) {
-          if (baseItem.findNextAnchor.bottom) {
-            checkAnchor =
-              baseItem.left +
-              baseItem.findNextAnchor.bottom *
-              (baseItem.width + baseItem.marginRight);
+    if (checkAnchor < 0) {
+      // let checkAnchor = -1;
+      if (baseItem.findNextAnchor) {
+        //有自定义的 anchor
+        // TODO 优化
+        if (vertical) {
+          if (offset > 0) {
+            if (baseItem.findNextAnchor.bottom) {
+              checkAnchor =
+                baseItem.left +
+                baseItem.findNextAnchor.bottom *
+                (baseItem.width + baseItem.marginRight);
+            }
+          } else {
+            if (baseItem.findNextAnchor.top) {
+              checkAnchor =
+                baseItem.left +
+                baseItem.findNextAnchor.top *
+                (baseItem.width + baseItem.marginRight);
+            }
           }
         } else {
-          if (baseItem.findNextAnchor.top) {
-            checkAnchor =
-              baseItem.left +
-              baseItem.findNextAnchor.top *
-              (baseItem.width + baseItem.marginRight);
+          if (offset > 0) {
+            if (baseItem.findNextAnchor.right) {
+              checkAnchor =
+                baseItem.top +
+                baseItem.findNextAnchor.right *
+                (baseItem.height + baseItem.marginBottom);
+            }
+          } else {
+            if (baseItem.findNextAnchor.left) {
+              checkAnchor =
+                baseItem.top +
+                baseItem.findNextAnchor.left *
+                (baseItem.height + baseItem.marginBottom);
+            }
           }
         }
+      }
+      if (checkAnchor < 0) {
+        checkAnchor = vertical ? baseItem.centerXPos : baseItem.centerYPos;
+      }
+    } else {
+      // checkAncher可能在baseItem的范围之外, 将其调整至自身范围内
+      if (vertical) {
+        checkAnchor = Math.max(Math.min(checkAnchor, baseItem.left + baseItem.width - 1), baseItem.left)
       } else {
-        if (offset > 0) {
-          if (baseItem.findNextAnchor.right) {
-            checkAnchor =
-              baseItem.top +
-              baseItem.findNextAnchor.right *
-              (baseItem.height + baseItem.marginBottom);
-          }
-        } else {
-          if (baseItem.findNextAnchor.left) {
-            checkAnchor =
-              baseItem.top +
-              baseItem.findNextAnchor.left *
-              (baseItem.height + baseItem.marginBottom);
-          }
-        }
+        checkAnchor = Math.max(Math.min(checkAnchor, baseItem.top + baseItem.height - 1), baseItem.top)
       }
     }
-    if (checkAnchor < 0) {
-      checkAnchor = vertical ? baseItem.centerXPos : baseItem.centerYPos;
-    }
+
     const posKey = vertical ? "left" : "top";
     const sizeKey = vertical ? "width" : "height";
     let direction = vertical ? "top" : "left";
@@ -512,7 +543,7 @@ class CommonMetroTemplate extends MetroTemplate {
     let found = false;
     let nextIndex = -1;
     let pathHistoryIndex = -1;
-    if (this.supportHistoryPath && !baseItem.findNextAnchor) {
+    if (useHistory && !baseItem.findNextAnchor) {
       pathHistoryIndex = templateList[index].pathHistory[direction];
     }
     if (pathHistoryIndex < 0) {
@@ -600,7 +631,7 @@ class CommonMetroTemplate extends MetroTemplate {
     if (found) {
       if (!templateList[nextIndex].focusable) {
         // 如果是占位符，则查找占位符的下一个
-        return this.getNextItemInner(nextIndex, offset, vertical);
+        return this.getNextItemInner(nextIndex, offset, vertical, false, checkAnchor);
       }
       return templateList[nextIndex];
     }
@@ -723,6 +754,12 @@ class CommonMetroTemplate extends MetroTemplate {
     console.error(TAG, "updateItemSize is not supported.");
   }
 
+  static intersects(s0: number, e0: number, s1: number, e1: number): boolean {
+    return s0 <= e1 && s1 <= e0;
+  }
+
+  static iterCount = 0;
+
   /** get visible item list functions */
   public getVisibleItemList(
     visibleStart: number,
@@ -732,229 +769,72 @@ class CommonMetroTemplate extends MetroTemplate {
       // No visible item
       return [-1, -1];
     }
-    //取整以避免starline和endline找不到骑线的item的bug
+
     visibleStart = Math.round(visibleStart);
     visibleEnd = Math.round(visibleEnd);
     let searchBaseItemIdx = this.id2Index(baseId);
     if (searchBaseItemIdx < 0) searchBaseItemIdx = 0;
-    const commonData: VisibleSearchConfigCommon = {
-      resultStartIdx: -1,
-      resultEndIdx: -1,
-      enableBackwardSearching: true,
-      enableForwardSearching: true,
-      checkingStartLinePos: visibleStart,
-      checkingEndLinePos: visibleEnd,
-    };
-    const backwardConfigure: VisibleSearchConfig = {
-      searchDirect: -1,
-      baseIdx: searchBaseItemIdx,
-      checkingStartLineRanges: new RangesModel(0, 0),
-      startLineRangesFulled: false,
-      latestOverStartLineIdx: -1,
-      checkingEndLineRanges: new RangesModel(0, 0),
-      endLineRangesFulled: false,
-      latestOverEndLineIdx: -1,
-      endSearchingIndex: 0,
-      firstStartLineBlockIdx: -1,
-      firstEndLineBlockIdx: -1,
-      searchToBorder: false,
-      common: commonData,
-    };
-    const forwardConfigure: VisibleSearchConfig = {
-      searchDirect: 1,
-      baseIdx: searchBaseItemIdx,
-      checkingStartLineRanges: new RangesModel(0, 0),
-      startLineRangesFulled: false,
-      latestOverStartLineIdx: -1,
-      checkingEndLineRanges: new RangesModel(0, 0),
-      endLineRangesFulled: false,
-      latestOverEndLineIdx: -1,
-      endSearchingIndex: this.templateList.length - 1,
-      firstStartLineBlockIdx: -1,
-      firstEndLineBlockIdx: -1,
-      searchToBorder: false,
-      common: commonData,
-    };
-
-    const isTemplateVertical = this.direction === VERTICAL;
-    let offset = 0;
-    while (
-      commonData.enableBackwardSearching ||
-      commonData.enableForwardSearching
-    ) {
-      if (commonData.enableBackwardSearching) {
-        this._DoSearching(backwardConfigure, -offset, isTemplateVertical);
-      }
+    const vertical = this.direction === VERTICAL;
+    const sizeKey = vertical ? "height" : "width";
+    const posKey = vertical ? "top" : "left"
 
-      if (commonData.enableForwardSearching) {
-        this._DoSearching(forwardConfigure, offset, isTemplateVertical);
-      }
-      offset++;
+    const visible = (s: number, e: number) => {
+      return CommonMetroTemplate.intersects(visibleStart, visibleEnd, s, e);
     }
-    // console.log(
-    //   "GetVisibleItemList [" +
-    //     JSON.stringify(commonData) +
-    //     ", " +
-    //     JSON.stringify(backwardConfigure) +
-    //     ", " +
-    //     JSON.stringify(forwardConfigure) +
-    //     "]"
-    // );
 
-    if (commonData.resultStartIdx < 0) {
-      // When start index not found
-      // Use just over start line block as start idx
-      if (
-        backwardConfigure.latestOverStartLineIdx >= 0 &&
-        backwardConfigure.firstStartLineBlockIdx >= 0
-      )
-        commonData.resultStartIdx = backwardConfigure.latestOverStartLineIdx;
-      else if (forwardConfigure.firstStartLineBlockIdx >= 0)
-        commonData.resultStartIdx = forwardConfigure.firstStartLineBlockIdx;
-    }
-
-    if (commonData.resultEndIdx < 0) {
-      // When end index not found
-      // Use just over end line block as end idx
-      if (
-        forwardConfigure.latestOverEndLineIdx >= 0 &&
-        forwardConfigure.firstEndLineBlockIdx >= 0
-      )
-        commonData.resultEndIdx = forwardConfigure.latestOverEndLineIdx;
-      else if (backwardConfigure.firstEndLineBlockIdx >= 0)
-        commonData.resultEndIdx = backwardConfigure.firstEndLineBlockIdx;
-    }
-    // Recheck if whole contents inside the range
-    if (commonData.resultStartIdx < 0 && commonData.resultEndIdx < 0) {
-      // Check if whole contents inside the range
-      const firstItem = this.templateList[0];
-      const firstSecondPos = isTemplateVertical
-        ? firstItem.top
-        : firstItem.left;
-      const lastItem = this.templateList[this.templateList.length - 1];
-      const lastSecondPos = isTemplateVertical
-        ? lastItem.top
-        : lastItem.left;
-      const lastSecondWidth = isTemplateVertical
-        ? lastItem.height
-        : lastItem.width;
-      if (
-        firstSecondPos > visibleStart &&
-        lastSecondPos + lastSecondWidth < visibleEnd
-      ) {
-        commonData.resultStartIdx = 0;
-        commonData.resultEndIdx = this.templateList.length - 1;
-      }
-    }
-    let ret: [number, number] = [-1, -1];
-    if (commonData.resultStartIdx >= 0 || commonData.resultEndIdx >= 0) {
-      const startIdx =
-        commonData.resultStartIdx >= 0 ? commonData.resultStartIdx : 0;
-      const endIdx =
-        commonData.resultEndIdx >= 0
-          ? commonData.resultEndIdx
-          : this.templateList.length - 1;
-      ret = [startIdx, endIdx];
-    }
-    return ret;
-  }
+    let baseItem = this.templateList[searchBaseItemIdx];
 
-  private _DoSearching(configures: VisibleSearchConfig, offset: number, beVerticalTemplate: boolean) {
-    const checkItem = this.templateList[configures.baseIdx + offset];
-    const keyPos = beVerticalTemplate ? checkItem.left : checkItem.top;
-    const keyWidth = beVerticalTemplate
-      ? checkItem.width + checkItem.marginRight
-      : checkItem.height + checkItem.marginBottom;
-    const keyStart = Math.round(keyPos);
-    const keyEnd = Math.round(keyPos + keyWidth - 1);
-    const secondPos = beVerticalTemplate ? checkItem.top : checkItem.left;
-    const secondWidth = beVerticalTemplate
-      ? checkItem.height + checkItem.marginBottom
-      : checkItem.width + checkItem.marginRight;
-    const secondStart = Math.round(secondPos);
-    const secondEnd = Math.round(secondPos + secondWidth - 1);
-    // console.log(
-    //   "idx=" +
-    //     (configures.baseIdx + offset) +
-    //     " pos=" +
-    //     secondPos +
-    //     " posend=" +
-    //     (secondPos + secondWidth - 1) +
-    //     " linePos=" +
-    //     configures.common.checkingStartLinePos
-    // );
+    //寻找首个在范围内的item
+    let startIndex = 0, endIndex = this.templateList.length - 1;
 
-    if (
-      configures.common.resultStartIdx < 0 &&
-      !configures.startLineRangesFulled
-    ) {
-      let isRangeChanged = false;
-      if (
-        secondStart <= configures.common.checkingStartLinePos &&
-        secondEnd >= configures.common.checkingStartLinePos
-      ) {
-        // Overlap the visbible start line
-        configures.latestOverStartLineIdx = configures.baseIdx + offset;
-        if (configures.firstStartLineBlockIdx < 0)
-          configures.firstStartLineBlockIdx = configures.baseIdx + offset;
-        configures.checkingStartLineRanges.Merge(
-          new SingleRangeModel(keyStart, keyEnd)
-        );
-        isRangeChanged = true;
-      } else if (
-        configures.searchDirect < 0 &&
-        secondEnd <= configures.common.checkingStartLinePos
-      ) {
-        // above the visible start line
-        configures.checkingStartLineRanges.Merge(
-          new SingleRangeModel(keyStart, keyEnd)
-        );
-        isRangeChanged = true;
+    while (baseItem && !visible(baseItem[posKey], baseItem[posKey] + baseItem[sizeKey])) {
+      if (baseItem[posKey] < visibleStart) {
+        startIndex = baseItem.index;
+      } else {
+        endIndex = baseItem.index;
       }
-    }
-    // console.log(
-    //   "idx=" +
-    //     (configures.baseIdx + offset) +
-    //     " pos=" +
-    //     secondPos +
-    //     " posend=" +
-    //     (secondPos + secondWidth - 1) +
-    //     " linePos=" +
-    //     configures.common.checkingEndLinePos
-    // );
-    if (configures.common.resultEndIdx < 0 && !configures.endLineRangesFulled) {
-      let isRangeChanged = false;
-      if (
-        secondStart <= configures.common.checkingEndLinePos &&
-        secondEnd >= configures.common.checkingEndLinePos
-      ) {
-        // Overlap the visbible end line
-        configures.latestOverEndLineIdx = configures.baseIdx + offset;
-        if (configures.firstEndLineBlockIdx < 0)
-          configures.firstEndLineBlockIdx = configures.baseIdx + offset;
-        configures.checkingEndLineRanges.Merge(
-          new SingleRangeModel(keyStart, keyEnd)
-        );
-        isRangeChanged = true;
-      } else if (
-        configures.searchDirect > 0 &&
-        secondStart >= configures.common.checkingEndLinePos
-      ) {
-        // below the visible end line
-        configures.checkingEndLineRanges.Merge(
-          new SingleRangeModel(keyStart, keyEnd)
-        );
-        isRangeChanged = true;
+      if (Math.abs(startIndex - endIndex) <= 1) {
+        const tailItem = this.templateList[this.getTailItemIndex()];
+        let tailInfo: any = null;
+        if (tailItem) {
+          tailInfo = {
+            left: tailItem.left,
+            top: tailItem.top,
+            width: tailItem.width,
+            height: tailItem.height,
+          }
+        }
+        console.log("MetroWidget: can not find visible item", visibleStart, visibleEnd, tailInfo);
+        return [-1, -1];
+      } else {
+        baseItem = this.templateList[Math.round((startIndex + endIndex) / 2)];
       }
     }
-    if (configures.baseIdx + offset === configures.endSearchingIndex) {
-      if (configures.searchDirect > 0) {
-        configures.common.enableForwardSearching = false;
-      } else {
-        configures.common.enableBackwardSearching = false;
+
+    CommonMetroTemplate.iterCount = 0;
+
+    let visibleItem: Set<number> = new Set();
+    visibleItem.add(baseItem.index);
+    const nKeys = ["left", "top", "bottom", "right"];
+    const addVisibleNeighbor = (targetItem: TemplateItem) => {
+      for (let key of nKeys) {
+        let n = this._GetTotalNeighbor(targetItem.index, key);
+        if (n && n.length > 0) {
+          for (let i of n) {
+            let item = this.templateList[i];
+            if (visible(item[posKey], item[posKey] + item[sizeKey]) && !visibleItem.has(i)) {
+              visibleItem.add(i);
+              addVisibleNeighbor(item);
+            }
+          }
+        }
       }
-      configures.searchToBorder = true;
     }
+    addVisibleNeighbor(baseItem);
+    return [
+      Math.min(...visibleItem),
+      Math.max(...visibleItem),
+    ]
   }
 
   /** neighbor calculate functions */

package/utils/JsViewEngineWidget/TemplateParser/ListMetroTemplate.ts

@@ -14,6 +14,7 @@ class ListMetroTemplate extends MetroTemplate {
   public addItem(itemObj: MeasureInfo): TemplateItem {
     const templateItem = MetroTemplate.getTemplateItem(itemObj);
     this._addTemplateItem(templateItem);
+    this.tailItemIndex = templateItem.index;
     return templateItem;
   }
 

package/utils/JsViewEngineWidget/TemplateParser/MetroTemplate.ts

@@ -159,6 +159,7 @@ interface TemplateItem {
     bottom: number,
   }
   findNextAnchor: FindNextAnchor | null,
+  layoutCache: { top: number, left: number, width: number, height: number } | null,
 }
 
 interface MeasureInfo {
@@ -184,6 +185,8 @@ abstract class MetroTemplate {
   public readonly lineMax: number;
   public readonly pageSize: number;
   public readonly layoutType: string;
+  protected tailItemIndex: number = -1;
+  private cachedLayoutRange: Array<[number, number]> = [];
 
   constructor(direction: Symbol, lineMax: number, pageSize: number, layoutType: string, supportHistoryPath: boolean) {
     this.idsMap = [];
@@ -217,7 +220,7 @@ abstract class MetroTemplate {
   public index2Id(index: number): number {
     const item = this.templateList[index];
     if (typeof item == "undefined") {
-      console.warn(TAG, "index not exist", index, ", template length", this.templateList.length);
+      console.log(TAG, "index not exist", index, ", template length", this.templateList.length);
       return -1;
     } else {
       return item.id
@@ -227,7 +230,7 @@ abstract class MetroTemplate {
   public id2Index(id: number): number {
     const index = this.idsMap[id];
     if (typeof index == "undefined") {
-      console.warn(TAG, "id not exist", id);
+      console.log(TAG, "id not exist", id);
       return -1;
     }
     return index;
@@ -255,6 +258,36 @@ abstract class MetroTemplate {
   public abstract updateItemSize(index: number,
     newSize: { width: number, height: number }): void;
 
+  public getTailItemIndex() {
+    return this.tailItemIndex;
+  }
+
+  public cacheLayout(start: number, end: number) {
+    if (typeof end == "undefined") {
+      end = this.templateList.length;
+    }
+    end = Math.min(end, this.templateList.length);
+    for (let i = start; i < end; ++i) {
+      let item = this.templateList[i];
+      item.layoutCache = {
+        left: item.left,
+        top: item.top,
+        width: item.width,
+        height: item.height,
+      }
+    }
+    this.cachedLayoutRange.push([start, end]);
+  }
+
+  public cleanLayoutCache() {
+    for (let r of this.cachedLayoutRange) {
+      for (let i = r[0]; i < r[1]; ++i) {
+        this.templateList[i].layoutCache = null;
+      }
+    }
+    this.cachedLayoutRange = [];
+  }
+
   protected static getTemplateItem(itemObj: MeasureInfo): TemplateItem {
     const valid = this.checkMeasureObject(itemObj);
     if (!valid) {
@@ -296,6 +329,7 @@ abstract class MetroTemplate {
         top: -1,
         bottom: -1,
       },
+      layoutCache: null,
     }
   }
 

package/utils/JsViewEngineWidget/WidgetCommon.ts

@@ -107,14 +107,20 @@ export class SlideSetting {
   public static END_PROTECT = 2;
 
   public readonly Type: number;
-  public readonly Speed: number;
+  public readonly Speed: number | null = null;
   public readonly Easing: string;
   public readonly BoundaryProtect: number;
+  public readonly Duration: number | null = null;
 
-  protected constructor(type: number, speed: number, easing: string, boundaryProtect: number) {
+  protected constructor(type: number, speed: number, duration: number | null, easing: string, boundaryProtect: number) {
+    if (typeof speed != "number" || speed <= 0) {
+      console.error("SlideSetting error: speed must be number greater than 0.");
+      speed = defaultSpeed;
+    }
     this.Type = type;
     this.Speed = speed;
     this.Easing = easing;
+    this.Duration = duration;
     this.BoundaryProtect = boundaryProtect;
   }
 }
@@ -136,8 +142,9 @@ export class WholePageSlide extends SlideSetting {
     speed = defaultSpeed,
     easing = defaultEasing,
     boundaryProtect = SlideSetting.START_PROTECT,
+    duration = null,
   } = {}) {
-    super(SlideSetting.Type.WHOLE_PAGE, speed, easing, boundaryProtect);
+    super(SlideSetting.Type.WHOLE_PAGE, speed, duration, easing, boundaryProtect);
   }
 }
 
@@ -153,22 +160,27 @@ export class WholePageSlide extends SlideSetting {
  *                                      speed: 滚动速度, 像素/毫秒 
  *                                      easing: 滚动动画的easing
  *                                      boundaryProtect: 确定滚动位置能否小于0或者大于最大长度
+ *                                      fixFirstPage: 首页不滚动
  *                                    }
  **/
 export class SeamlessSlide extends SlideSetting {
   public readonly StartPercent: number;
   public readonly EndPercent: number;
+  public readonly FixFirstPage: boolean;
 
   constructor({
     startPercent = 0.2,
     endPercent = 0.8,
     speed = defaultSpeed,
+    duration = null,
     easing = defaultEasing,
+    fixFirstPage = false,
     boundaryProtect = SlideSetting.START_PROTECT | SlideSetting.END_PROTECT,
   } = {}) {
-    super(SlideSetting.Type.SEAMLESS, speed, easing, boundaryProtect);
+    super(SlideSetting.Type.SEAMLESS, speed, duration, easing, boundaryProtect);
     this.StartPercent = startPercent;
     this.EndPercent = endPercent;
+    this.FixFirstPage = fixFirstPage;
   }
 }
 
@@ -183,19 +195,24 @@ export class SeamlessSlide extends SlideSetting {
  *                                      speed: 滚动速度, 像素/毫秒 
  *                                      easing: 滚动动画的easing
  *                                      boundaryProtect: 确定滚动位置能否小于0或者大于最大长度
+ *                                      fixFirstPage: 首页不滚动
  *                                    }
  **/
 export class FixPositionSlide extends SlideSetting {
   public readonly FixPercent: number;
+  public readonly FixFirstPage: boolean;
 
   constructor({
     fixPercent = .5,
     speed = defaultSpeed,
+    duration = null,
     easing = defaultEasing,
+    fixFirstPage = false,
     boundaryProtect = SlideSetting.START_PROTECT | SlideSetting.END_PROTECT,
   } = {}) {
-    super(SlideSetting.Type.FIX_POSITION, speed, easing, boundaryProtect);
+    super(SlideSetting.Type.FIX_POSITION, speed, duration, easing, boundaryProtect);
     this.FixPercent = fixPercent;
+    this.FixFirstPage = fixFirstPage;
   }
 }
 
@@ -205,4 +222,6 @@ export const FocusMoveType = {
   ROW_LOOP: 0x00000001 << 1,
   COLUMN_FIND_NEAR: 0x00000001 << 2,
   ROW_FIND_NEAR: 0x00000001 << 3,
-};
+};
+
+export const RENDER_ITEM_BREAK_KEY = "__QcodeJsviewMetroWidgetSlot";

package/utils/JsViewPlugin/JsvAudio/{JsvAudioBrowser.vue → BrowserAudio/BrowserAudio.vue}

@@ -1,6 +1,6 @@
 <script>
 // import playerExMethods from "./JsvMediaBrowserInterface.js"
-import JsvSystemAudio from '../../JsViewVueWidget/JsvSystemAudio.vue';
+import JsvSystemAudio from './JsvSystemAudio.vue';
 
 export default {
   components: {

package/utils/JsViewPlugin/JsvAudio/index.js

@@ -10,7 +10,7 @@ let globalLoadJsvAudioPlugin;
 let _JsvAudio;
 
 if (!window.JsView) {
-  const BrowserJsvAudio = await import("./JsvAudioBrowser.vue");
+  const BrowserJsvAudio = await import("./BrowserAudio/BrowserAudio.vue");
   //browser
   globalLoadJsvAudioPlugin = (listener) => {
     setTimeout(listener, 0);