@shijiu/jsview-vue 0.9.631 → 0.9.684

package/utils/JsViewEngineWidget/MetroWidget/MetroWidget.vue

@@ -2,7 +2,7 @@
  * @Author: ChenChanghua
  * @Date: 2021-09-22 16:08:58
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-08-09 11:10:07
+ * @LastEditTime: 2022-11-07 15:51:14
  * @Description: file content
 -->
 
@@ -52,15 +52,16 @@
  *                              @params item {object} data中的数据
  *                              @return 模板信息，
                                         {
-                                          left: 绝对布局时的left,
-                                          top: 绝对布局时的top,
-                                          width: item的宽,
-                                          height: item的高,
-                                          focusable: item是否可以获得焦点,
-                                          marginBottom: item的下方margin,
-                                          marginRight: item的右方margin,
-                                          findNextAnchor: 自定义上下左右四条边寻找临近item的基准位置，值为0-1 {left: 0.5, right: 0.5, top: 0.5, bottom: 0.5}
-                                          doSlide: item获得焦点时是否滚动, 一般用于嵌套的情景, 由内部组件控制滚动
+                                          left {int}: 绝对布局时的left,
+                                          top {int}: 绝对布局时的top,
+                                          width {int}: item的宽,
+                                          height {int}: item的高,
+                                          focusable {boolean}: item是否可以获得焦点,
+                                          marginBottom {int}: item的下方margin,
+                                          marginRight {int}: item的右方margin,
+                                          findNextAnchor {object}: 自定义上下左右四条边寻找临近item的基准位置，值为0-1 {left: 0.5, right: 0.5, top: 0.5, bottom: 0.5}
+                                          doSlide {boolean}: item获得焦点时是否滚动, 一般用于嵌套的情景, 由内部组件控制滚动,
+                                          zIndex {int | object}: item的zIndex, 为object时可以分别设置{focus: 0, normal: 0}, 为number时则同时设置获焦和不获焦的zIndex
                                         }
  *
  *      onFocus {function} 控件获取焦点的回调
@@ -110,9 +111,25 @@
           @params {int} id 焦点id
           @params {boolean} needSlide 是否需要滚动
           @params {boolean} doAnim 滚动时是否做动画
+          @params {object} extraSetting 额外的参数设置
+                                          {
+                                            lockChildSlideEvent: {boolean} 设置焦点时忽略子发过来的滚动事件
+                                          }
         refreshData
           @description 刷新数据, 只有存在provideData时才会生效
           @params {boolean} forceUpdate 是否强制刷新
+        getVisibleItems
+          @description 获取可视item的列表信息
+          @return {start: 开始的index, end: 结束的index, dataList: 可视item的数据列表}
+        lock
+          @description 设置内部的锁
+          @params {int} type 锁的类型, 通过|来实现多个类型的复合
+                              SLIDE: 滚动动画锁
+                              CHILD_SLIDE_EVENT: 子组件发送的滚动事件锁
+          @return {function} 解锁的函数
+        unlock
+          @description 解锁
+          @params {int} type 参考lock的type参数
  * 【技巧说明】
  * Q: 插槽props如何使用？
  * A: data: 当前item的数据
@@ -123,8 +140,6 @@
                             获取 item 相对 MetroWidget 左上角坐标
                   templatePosition: {Function} (index : int) => {left: 0, top: 0, width: 0, height: 0} 
                                     获取 item 的布局坐标, 一般用于自定义滚动
-                  absolutePosition: {Function} (index : int) => {left: 0, top: 0, width: 0, height: 0}
-                                    获取 item 的绝对坐标, 一般用于控制焦点
                   getCurrentFocusId: {Function} () => {id: 0, index: 0} 
                                      获取当前焦点信息，id 为在可获得焦点元素列表中的索引，index 为在所有元素列表中的索引
                   slideTo: {Function} (targetPosition : int, doAnim : Boolean) => void 
@@ -175,6 +190,7 @@ import { TemplateParser, TemplateItemAdder } from "../TemplateParser";
 import { PageUpdater } from "./PageUpdater";
 import { SingleRangeModel } from "../RangeModel";
 import Dispatcher from "./Dispatcher";
+import { METRO_WIDGET } from "./Const";
 import {
   EdgeDirection,
   VERTICAL,
@@ -409,6 +425,10 @@ let preUpdateVisibleStart = 0;
 let mounted = false;
 let focusNode = ref(null);
 let pageRange = vertical ? props.height : props.width;
+
+let slideLock = false;
+let childSlideEventLock = false;
+
 let visibleInfo = {
   _start: 0,
   range: 0,
@@ -489,10 +509,6 @@ const _getTemplatePosition = (index) => {
   };
 };
 
-const _getAbsolutePosition = (index, targetEle) => {
-  return getPositionRelativeToView(innerData[index].itemDivRef, targetEle);
-};
-
 const _dispatchEvent = (event) => {
   switch (event.type) {
     case Dispatcher.Type.setEnterFocusId:
@@ -539,13 +555,22 @@ const onItemFocus = (index, rect) => {
   }
 };
 
-const setFocusId = (id, needSlide = true, doAnim = false) => {
+const setFocusId = (id, needSlide = true, doAnim = false, extraSetting) => {
+  if (id == focusId) {
+    return;
+  }
   templateItemAdder.tryAddItemById(id);
   let next_focus_item = templateParser.GetItemById(id);
   if (next_focus_item) {
     if (needSlide) {
       slideToItem(templateParser.FocusIdToIndex(id), doAnim);
     }
+    let unlock = null;
+    if (extraSetting) {
+      if (extraSetting.lockChildSlideEvent) {
+        unlock = lock(METRO_WIDGET.CHILD_SLIDE_EVENT);
+      }
+    }
 
     const cur_focus_item = templateParser.GetItemById(focusId);
     preFocusId = focusId;
@@ -566,6 +591,37 @@ const setFocusId = (id, needSlide = true, doAnim = false) => {
     _updateFocusItem();
     onItemBlur(templateParser.FocusIdToIndex(preFocusId));
     onItemFocus(templateParser.FocusIdToIndex(focusId), preEdgeRect);
+    unlock?.();
+  }
+};
+
+const lock = (type) => {
+  const unlocker = [];
+  if (type & METRO_WIDGET.SLIDE) {
+    slideLock = true;
+    unlocker.push(() => {
+      slideLock = false;
+    });
+  }
+  if (type & METRO_WIDGET.CHILD_SLIDE_EVENT) {
+    childSlideEventLock = true;
+    unlocker.push(() => {
+      childSlideEventLock = false;
+    });
+  }
+  return () => {
+    unlocker.map((item) => {
+      item();
+    });
+  };
+};
+
+const unlock = (type) => {
+  if (type & METRO_WIDGET.SLIDE) {
+    slideLock = true;
+  }
+  if (type & METRO_WIDGET.CHILD_SLIDE_EVENT) {
+    childSlideEventLock = true;
   }
 };
 
@@ -693,7 +749,8 @@ const refreshData = (force_update) => {
       dataList,
       props.measures,
       pageRange,
-      _onTemplateAdd
+      _onTemplateAdd,
+      props.name
     );
   }
   if (need_update_content) {
@@ -748,7 +805,24 @@ const refreshData = (force_update) => {
   }
 };
 
+const getVisibleItems = () => {
+  const info = templateParser.GetVisibleItemList(
+    visibleInfo.startWithPadding,
+    visibleInfo.endWithPadding,
+    focusId,
+    false,
+    null
+  );
+  return {
+    start: info.visibleStart,
+    end: info.visibleEnd,
+    dataList: dataList.slice(info.visibleStart, info.visibleEnd + 1),
+  };
+};
+
 const exportObject = {
+  lock,
+  unlock,
   slideTo,
   setFocusId,
   getFocusBlockRef,
@@ -757,7 +831,7 @@ const exportObject = {
   slideToItem,
   refreshData,
   _dispatchEvent,
-  _getAbsolutePosition,
+  getVisibleItems,
 };
 
 const _calculateNearestItemByRect = (visible_range, enter_rect_info) => {
@@ -1001,7 +1075,7 @@ const _onTemplateAdd = (item) => {
     data: item,
     index: innerData.length,
     controller: reactive({
-      zIndex: 0,
+      zIndex: item.normalZIndex >= 0 ? item.normalZIndex : 0,
     }),
     mounted: false,
     itemDivRef: null,
@@ -1059,7 +1133,6 @@ const _onTemplateAdd = (item) => {
       index: item.index,
       position: _getPosition,
       templatePosition: _getTemplatePosition,
-      absolutePosition: _getAbsolutePosition,
       getCurrentFocusId: _getCurrentId,
       slideTo: slideTo,
     },
@@ -1094,6 +1167,9 @@ const _itemOnFocusSideEffect = (item, edgeRect) => {
 
 const _onCustomerEvent = (ev) => {
   if (ev.type === "focusRect") {
+    if (childSlideEventLock) {
+      return true;
+    }
     if (ev.ownerNode == exportObject) {
       return false;
     }
@@ -1198,21 +1274,31 @@ const _moveToNext = (
           onend: _onSlideEnd,
         };
         _slideTo(visibleInfo.start, animObj);
+        pageUpdater.update(
+          templateParser,
+          visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
+          Math.min(
+            visibleInfo.startMax +
+              visibleInfo.range +
+              visibleInfo.padding.end -
+              1,
+            visibleInfo.endWithPadding + props.keepTraceRange * pageRange
+          ),
+          next_item_id,
+          false,
+          permanentItemList
+        );
+      } else {
+        //不做滚动时,保证获焦的item创建
+        pageUpdater.update(
+          templateParser,
+          cur_visible_start,
+          cur_visible_start + visibleInfo.range + visibleInfo.padding.end - 1,
+          next_item_id,
+          false,
+          permanentItemList
+        );
       }
-      pageUpdater.update(
-        templateParser,
-        visibleInfo.startWithPadding - props.keepTraceRange * pageRange,
-        Math.min(
-          visibleInfo.startMax +
-            visibleInfo.range +
-            visibleInfo.padding.end -
-            1,
-          visibleInfo.endWithPadding + props.keepTraceRange * pageRange
-        ),
-        next_item_id,
-        false,
-        permanentItemList
-      );
       pageUpdater.applyTmp();
     }
 
@@ -1303,40 +1389,50 @@ const _calculateVisibleStart = (target_item, direction) => {
       ];
       break;
     case SlideSetting.Type.SEAMLESS:
-      if (direction > 0) {
-        if (
-          target_item[pos_key] + target_item[size_key] >
-          visibleInfo.start + visibleInfo.range * props.slideSetting.EndPercent
-        ) {
-          new_visible_start =
-            target_item[pos_key] +
-            target_item[size_key] -
-            visibleInfo.range * props.slideSetting.EndPercent;
-        }
-      } else if (direction < 0) {
-        if (
-          target_item[pos_key] <
-          visibleInfo.start +
-            visibleInfo.range * props.slideSetting.StartPercent
-        ) {
-          new_visible_start =
-            target_item[pos_key] -
-            visibleInfo.range * props.slideSetting.StartPercent;
-        }
+      if (
+        target_item[size_key] >=
+        visibleInfo.range *
+          (props.slideSetting.EndPercent - props.slideSetting.StartPercent)
+      ) {
+        //尺寸较大的item
+        new_visible_start = target_item[center_key] - visibleInfo.range * 0.5;
       } else {
-        //不是沿widget方向的移动
-        if (target_item[pos_key] < visibleInfo.start) {
-          new_visible_start =
-            target_item[pos_key] -
-            visibleInfo.range * props.slideSetting.StartPercent;
-        } else if (
-          target_item[pos_key] + target_item[size_key] >
-          visibleInfo.end
-        ) {
-          new_visible_start =
-            target_item[pos_key] +
-            target_item[size_key] -
-            visibleInfo.range * props.slideSetting.EndPercent;
+        if (direction > 0) {
+          if (
+            target_item[pos_key] + target_item[size_key] >
+            visibleInfo.start +
+              visibleInfo.range * props.slideSetting.EndPercent
+          ) {
+            new_visible_start =
+              target_item[pos_key] +
+              target_item[size_key] -
+              visibleInfo.range * props.slideSetting.EndPercent;
+          }
+        } else if (direction < 0) {
+          if (
+            target_item[pos_key] <
+            visibleInfo.start +
+              visibleInfo.range * props.slideSetting.StartPercent
+          ) {
+            new_visible_start =
+              target_item[pos_key] -
+              visibleInfo.range * props.slideSetting.StartPercent;
+          }
+        } else {
+          //不是沿widget方向的移动
+          if (target_item[pos_key] < visibleInfo.start) {
+            new_visible_start =
+              target_item[pos_key] -
+              visibleInfo.range * props.slideSetting.StartPercent;
+          } else if (
+            target_item[pos_key] + target_item[size_key] >
+            visibleInfo.end
+          ) {
+            new_visible_start =
+              target_item[pos_key] +
+              target_item[size_key] -
+              visibleInfo.range * props.slideSetting.EndPercent;
+          }
         }
       }
       break;
@@ -1403,9 +1499,16 @@ const _ifValidEnterRect = (rect_info) => {
   return rect_info && rect_info.direction && rect_info.rect;
 };
 
-const _setZIndex = (index, z_index) => {
+const _setZIndex = (index, z_index, is_focus) => {
   if (innerData[index]) {
-    innerData[index].controller.zIndex = z_index;
+    let data = innerData[index].data,
+      i = z_index;
+    if (is_focus && data.focusZIndex >= 0) {
+      i = data.focusZIndex;
+    } else if (data.normalZIndex >= 0) {
+      i = data.normalZIndex;
+    }
+    innerData[index].controller.zIndex = i;
   }
 };
 
@@ -1457,11 +1560,11 @@ const _onSlideEnd = (event) => {
 };
 
 const _updateFocusItem = () => {
-  _setZIndex(templateParser.FocusIdToIndex(focusId), innerData.length);
+  _setZIndex(templateParser.FocusIdToIndex(focusId), innerData.length, true);
 };
 
 const _updateBlurItem = () => {
-  _setZIndex(templateParser.FocusIdToIndex(preFocusId), 0);
+  _setZIndex(templateParser.FocusIdToIndex(preFocusId), 0, false);
 };
 
 const _updateFocusByDragInfo = (viewX, viewY) => {
@@ -1607,21 +1710,23 @@ const _onScroll = () => {
 
 //之前rootview相关的代码
 const _updatePosition = (x, y, anim_info) => {
+  if (slideLock) return;
   if (toRaw(slideDiv.value)) {
-    let pre_pos = toRaw(slideDiv.value).jsvMaskView.GetLayoutParams();
+    let pre_left = toRaw(slideDiv.value).style.left,
+      pre_top = toRaw(slideDiv.value).style.top;
     //jsvMaskView的位置更新时会被设置位0，因此不能通过ResetLayoutParams设置位置
     slideDivLeft.value = x;
     slideDivTop.value = y;
     if (anim_info) {
-      let delta_x = Math.abs(pre_pos.MarginLeft - x);
-      let delta_y = Math.abs(pre_pos.MarginTop - y);
+      let delta_x = Math.abs(pre_left - x);
+      let delta_y = Math.abs(pre_top - y);
       let duration = Math.round(
         delta_x === 0 ? delta_y / anim_info.speed : delta_x / anim_info.speed
       );
       let slide_animation = new Forge.TranslateAnimation(
-        pre_pos.MarginLeft - x,
+        pre_left - x,
         0,
-        pre_pos.MarginTop - y,
+        pre_top - y,
         0,
         duration,
         anim_info.easing
@@ -1708,7 +1813,8 @@ templateItemAdder = new TemplateItemAdder(
   dataList,
   props.measures,
   pageRange,
-  _onTemplateAdd
+  _onTemplateAdd,
+  props.name
 );
 if (props.onScroll) {
   templateItemAdder.tryAddItemByIndex(dataList.length - 1);
@@ -1740,12 +1846,14 @@ slidePile = new Forge.RectArea(
 let init_focus_id = 0;
 let cur_visible_start = 0;
 
-if (props.initFocusId) {
+if (typeof props.initFocusId == 'number') {
   templateItemAdder.tryAddItemById(props.initFocusId);
   const item = templateParser.GetItemById(props.initFocusId);
   if (item) {
     init_focus_id = props.initFocusId;
-    cur_visible_start = _calculateVisibleStart(item, 1);
+    if (item.doSlide) {
+      cur_visible_start = _calculateVisibleStart(item, 1);
+    }
   }
 }
 focusId = init_focus_id;

package/utils/JsViewEngineWidget/TemplateParser.js

@@ -34,12 +34,12 @@ const measureObjectCheckMap = {
   width: (obj) => {
     if (isNaN(obj.width)) {
       if (isNaN(obj.block?.w)) {
+        throw new Error(TAG + "width is not defined");
+      } else {
         console.warn(TAG, "key 'block' is deprecated ");
         return integerCheck(obj.blocks.w, () => {
           console.warn(TAG, "width is not integer", obj);
         });
-      } else {
-        throw new Error(TAG + "width is not definied");
       }
     } else {
       return integerCheck(obj.width, () => {
@@ -50,12 +50,12 @@ const measureObjectCheckMap = {
   height: (obj) => {
     if (isNaN(obj.height)) {
       if (isNaN(obj.block?.h)) {
+        throw new Error(TAG + "height is not defined");
+      } else {
         console.warn(TAG, "key 'block' is deprecated ");
         return integerCheck(obj.blocks.h, () => {
           console.warn(TAG, "height is not integer", obj);
         });
-      } else {
-        throw new Error(TAG + "height is not definied");
       }
     } else {
       return integerCheck(obj.height, () => {
@@ -72,6 +72,26 @@ function measureObjectChecker(obj) {
 
 function getTemplateItem(measure_obj, data_info) {
   measureObjectChecker(measure_obj);
+
+  let focusZIndex = -1,
+    normalZIndex = -1;
+  if (
+    typeof measure_obj["zIndex"] != "undefined" &&
+    measure_obj["zIndex"] != null
+  ) {
+    if (typeof measure_obj["zIndex"] == "object") {
+      if (typeof measure_obj["zIndex"]["focus"] == "number") {
+        focusZIndex = measure_obj["zIndex"]["focus"];
+      }
+      if (typeof measure_obj["zIndex"]["normal"] == "number") {
+        normalZIndex = measure_obj["zIndex"]["normal"];
+      }
+    } else if (typeof measure_obj["zIndex"] == "number") {
+      focusZIndex = measure_obj["zIndex"];
+      normalZIndex = measure_obj["zIndex"];
+    }
+  }
+
   return {
     id: -1,
     index: -1,
@@ -106,6 +126,8 @@ function getTemplateItem(measure_obj, data_info) {
       typeof measure_obj.permanent !== "undefined"
         ? measure_obj.permanent
         : false,
+    focusZIndex,
+    normalZIndex,
   };
 }
 
@@ -867,7 +889,10 @@ class TemplateParser {
         item_key_pos = gap_info.startPos;
         item_second_pos = top_fence.AheadOffset;
       } else {
-        console.error(TAG, "ERROR: coding error, header full gap fence lost");
+        throw new Error(
+          `${TAG} item size ${item_width}x${item_height} is greater than widget line max ${this._Template.Orient.widthMax}`
+        );
+        // console.error(TAG, "ERROR: coding error, header full gap fence lost");
       }
 
       if (this._Template.Orient.type === VERTICAL) {
@@ -1846,7 +1871,14 @@ class TemplateParser {
 }
 
 class TemplateItemAdder {
-  constructor(template_parser, data, measure_func, page_range, side_effect) {
+  constructor(
+    template_parser,
+    data,
+    measure_func,
+    page_range,
+    side_effect,
+    id
+  ) {
     this._TemplateParser = template_parser;
     this._Data = data;
     this._PageRange = page_range;
@@ -1859,6 +1891,7 @@ class TemplateItemAdder {
       this._TemplateParser._Template.Orient.type === HORIZONTAL
         ? "xPos"
         : "yPos";
+    this._ID = id;
   }
 
   tryAddItem(cur_item = null, page_num = 1) {
@@ -1869,15 +1902,23 @@ class TemplateItemAdder {
         cur_item[this._Key] >= (this._CurPage - 1) * this._PageRange)
     ) {
       while (this._CurIndex < this._Data.length) {
-        let item = this._TemplateParser.ParseTemplateItem(
-          this._MeasureFunc(this._Data[this._CurIndex]),
-          this._Data[this._CurIndex]
-        );
-        this._SideEffect?.(item);
-        this._CurIndex++;
-        if (item[this._Key] >= (this._CurPage + page_num) * this._PageRange) {
-          this._CurPage += page_num;
-          break;
+        try {
+          let item = this._TemplateParser.ParseTemplateItem(
+            this._MeasureFunc(this._Data[this._CurIndex]),
+            this._Data[this._CurIndex]
+          );
+          this._SideEffect?.(item);
+          this._CurIndex++;
+          if (item[this._Key] >= (this._CurPage + page_num) * this._PageRange) {
+            this._CurPage += page_num;
+            break;
+          }
+        } catch (e) {
+          console.error(
+            `MetroWidget: ${this._ID} parse template item ${this._CurIndex} failed. data: `,
+            this._Data
+          );
+          throw e;
         }
       }
       this._TemplateParser.CalculateNeighborWhenAddStop();
@@ -1899,14 +1940,22 @@ class TemplateItemAdder {
     let added = false;
     while (this._CurIndex <= _index) {
       added = true;
-      let item = this._TemplateParser.ParseTemplateItem(
-        this._MeasureFunc(this._Data[this._CurIndex]),
-        this._Data[this._CurIndex]
-      );
-      this._SideEffect?.(item);
-      this._CurIndex++;
-      if (item[this._Key] >= (this._CurPage + 1) * this._PageRange) {
-        this._CurPage++;
+      try {
+        let item = this._TemplateParser.ParseTemplateItem(
+          this._MeasureFunc(this._Data[this._CurIndex]),
+          this._Data[this._CurIndex]
+        );
+        this._SideEffect?.(item);
+        this._CurIndex++;
+        if (item[this._Key] >= (this._CurPage + 1) * this._PageRange) {
+          this._CurPage++;
+        }
+      } catch (e) {
+        console.error(
+          `MetroWidget: ${this._ID} parse template item ${this._CurIndex} failed. data:`,
+          this._Data
+        );
+        throw e;
       }
     }
     if (added) {
@@ -1924,16 +1973,24 @@ class TemplateItemAdder {
       let cur_id = last_id;
       while (cur_id < _id && this._CurIndex < this._Data.length) {
         added = true;
-        const item = this._TemplateParser.ParseTemplateItem(
-          this._MeasureFunc(this._Data[this._CurIndex]),
-          this._Data[this._CurIndex]
-        );
-        cur_id = item.id;
-        this._SideEffect?.(item);
-        if (item[this._Key] >= (this._CurPage + 1) * this._PageRange) {
-          this._CurPage++;
+        try {
+          const item = this._TemplateParser.ParseTemplateItem(
+            this._MeasureFunc(this._Data[this._CurIndex]),
+            this._Data[this._CurIndex]
+          );
+          cur_id = item.id;
+          this._SideEffect?.(item);
+          if (item[this._Key] >= (this._CurPage + 1) * this._PageRange) {
+            this._CurPage++;
+          }
+          this._CurIndex++;
+        } catch (e) {
+          console.error(
+            `MetroWidget: ${this._ID} parse template item ${this._CurIndex} failed. data:`,
+            this._Data
+          );
+          throw e;
         }
-        this._CurIndex++;
       }
       if (added) {
         this._TemplateParser.CalculateNeighborWhenAddStop();

package/utils/JsViewEngineWidget/WidgetCommon.js

@@ -2,7 +2,7 @@
  * @Author: ChenChanghua
  * @Date: 2020-12-30 14:08:38
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-06-09 17:16:41
+ * @LastEditTime: 2022-11-09 09:33:15
  * @Description: file content
  */
 class BaseDispatcher {
@@ -75,12 +75,11 @@ function getPositionRelativeToView(divElement, targetElement) {
     return null;
   }
   let element = divElement;
-  const elementLayoutParams = element.jsvMaskView.GetLayoutParams();
   let position = {
     left: 0,
     top: 0,
-    width: elementLayoutParams.Width,
-    height: elementLayoutParams.Height,
+    width: element.style.width,
+    height: element.style.height,
   };
   while (element && element !== targetElement) {
     position.left += element.style.left ? element.style.left : 0;

package/utils/JsViewEngineWidget/index.js

@@ -2,14 +2,15 @@
  * @Author: ChenChanghua
  * @Date: 2021-06-16 10:07:20
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-07-05 15:44:06
+ * @LastEditTime: 2022-11-07 14:50:02
  * @Description: file content
  */
 export * from "./WidgetCommon";
-export * from "./SimpleWidget/Dispatcher";
+export * from "./MetroWidget/Dispatcher";
 
 export { default as SimpleWidget } from "./MetroWidget/MetroWidget.vue";
 export { default as MetroWidget } from "./MetroWidget/MetroWidget.vue";
+export { METRO_WIDGET } from "./MetroWidget/Const.js";
 
 export { default as JsvFocusBlock } from "./JsvFocusBlock.vue";
 export { jsvCreateFocusManager, useFocusHub } from "./JsvFocusManager";