@shijiu/jsview-vue 2.3.0 → 2.3.151-test.0

package/bin/types/utils/JsViewVueWidget/JsvSwiper/JsvSwiper2.vue.d.ts

@@ -0,0 +1,142 @@
+declare const _default: {
+    new (...args: any[]): {
+        $: import("vue").ComponentInternalInstance;
+        $data: {};
+        $props: Partial<{}> & Omit<Readonly<import("vue").ExtractPropTypes<{}>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, never>;
+        $attrs: {
+            [x: string]: unknown;
+        };
+        $refs: {
+            [x: string]: unknown;
+        };
+        $slots: Readonly<{
+            [name: string]: import("vue").Slot | undefined;
+        }>;
+        $root: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}, {}, string>, {}> | null;
+        $parent: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}, {}, string>, {}> | null;
+        $emit: (event: string, ...args: any[]) => void;
+        $el: any;
+        $options: import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{}>>, {
+            getFocusBlockRef: () => import("vue").Ref<any>;
+            slideTo: (id: any, direction?: number) => void;
+            $props: {
+                readonly animation?: Record<string, any> | undefined;
+                readonly vertical?: boolean | undefined;
+                readonly showIndicator?: boolean | undefined;
+                readonly dotSize?: number | undefined;
+                readonly dotGap?: number | undefined;
+                readonly indicatorPos?: number | undefined;
+                readonly indicatorAlign?: string | undefined;
+                readonly totalFrame?: number | undefined;
+                readonly firstFrame?: number | undefined;
+                readonly layoutInfo?: Record<string, any> | undefined;
+                readonly autoplayInterval?: number | undefined;
+                readonly swipeType?: string | undefined;
+                readonly smoothTranslate?: boolean | undefined;
+                readonly reverseSwipe?: boolean | undefined;
+                readonly disableLoopWhenFocus?: boolean | undefined;
+                readonly itemGap?: number | undefined;
+                readonly name?: string | undefined;
+                readonly onFocus?: Function | undefined;
+                readonly onBlur?: Function | undefined;
+                readonly onChange?: Function | undefined;
+                readonly onClick?: Function | undefined;
+                readonly onEdge?: Function | undefined;
+                readonly itemSize?: Record<string, any> | undefined;
+            };
+        }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {}, {}, string> & {
+            beforeCreate?: ((() => void) | (() => void)[]) | undefined;
+            created?: ((() => void) | (() => void)[]) | undefined;
+            beforeMount?: ((() => void) | (() => void)[]) | undefined;
+            mounted?: ((() => void) | (() => void)[]) | undefined;
+            beforeUpdate?: ((() => void) | (() => void)[]) | undefined;
+            updated?: ((() => void) | (() => void)[]) | undefined;
+            activated?: ((() => void) | (() => void)[]) | undefined;
+            deactivated?: ((() => void) | (() => void)[]) | undefined;
+            beforeDestroy?: ((() => void) | (() => void)[]) | undefined;
+            beforeUnmount?: ((() => void) | (() => void)[]) | undefined;
+            destroyed?: ((() => void) | (() => void)[]) | undefined;
+            unmounted?: ((() => void) | (() => void)[]) | undefined;
+            renderTracked?: (((e: import("vue").DebuggerEvent) => void) | ((e: import("vue").DebuggerEvent) => void)[]) | undefined;
+            renderTriggered?: (((e: import("vue").DebuggerEvent) => void) | ((e: import("vue").DebuggerEvent) => void)[]) | undefined;
+            errorCaptured?: (((err: unknown, instance: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}, {}, string>, {}> | null, info: string) => boolean | void) | ((err: unknown, instance: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}, {}, string>, {}> | null, info: string) => boolean | void)[]) | undefined;
+        };
+        $forceUpdate: () => void;
+        $nextTick: typeof import("vue").nextTick;
+        $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (args_0: R, args_1: R) => any : (...args: any) => any, options?: import("vue").WatchOptions<boolean> | undefined): import("vue").WatchStopHandle;
+    } & Readonly<import("vue").ExtractPropTypes<{}>> & import("vue").ShallowUnwrapRef<{
+        getFocusBlockRef: () => import("vue").Ref<any>;
+        slideTo: (id: any, direction?: number) => void;
+        $props: {
+            readonly animation?: Record<string, any> | undefined;
+            readonly vertical?: boolean | undefined;
+            readonly showIndicator?: boolean | undefined;
+            readonly dotSize?: number | undefined;
+            readonly dotGap?: number | undefined;
+            readonly indicatorPos?: number | undefined;
+            readonly indicatorAlign?: string | undefined;
+            readonly totalFrame?: number | undefined;
+            readonly firstFrame?: number | undefined;
+            readonly layoutInfo?: Record<string, any> | undefined;
+            readonly autoplayInterval?: number | undefined;
+            readonly swipeType?: string | undefined;
+            readonly smoothTranslate?: boolean | undefined;
+            readonly reverseSwipe?: boolean | undefined;
+            readonly disableLoopWhenFocus?: boolean | undefined;
+            readonly itemGap?: number | undefined;
+            readonly name?: string | undefined;
+            readonly onFocus?: Function | undefined;
+            readonly onBlur?: Function | undefined;
+            readonly onChange?: Function | undefined;
+            readonly onClick?: Function | undefined;
+            readonly onEdge?: Function | undefined;
+            readonly itemSize?: Record<string, any> | undefined;
+        };
+    }> & {} & import("vue").ComponentCustomProperties & {};
+    __isFragment?: undefined;
+    __isTeleport?: undefined;
+    __isSuspense?: undefined;
+} & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{}>>, {
+    getFocusBlockRef: () => import("vue").Ref<any>;
+    slideTo: (id: any, direction?: number) => void;
+    $props: {
+        readonly animation?: Record<string, any> | undefined;
+        readonly vertical?: boolean | undefined;
+        readonly showIndicator?: boolean | undefined;
+        readonly dotSize?: number | undefined;
+        readonly dotGap?: number | undefined;
+        readonly indicatorPos?: number | undefined;
+        readonly indicatorAlign?: string | undefined;
+        readonly totalFrame?: number | undefined;
+        readonly firstFrame?: number | undefined;
+        readonly layoutInfo?: Record<string, any> | undefined;
+        readonly autoplayInterval?: number | undefined;
+        readonly swipeType?: string | undefined;
+        readonly smoothTranslate?: boolean | undefined;
+        readonly reverseSwipe?: boolean | undefined;
+        readonly disableLoopWhenFocus?: boolean | undefined;
+        readonly itemGap?: number | undefined;
+        readonly name?: string | undefined;
+        readonly onFocus?: Function | undefined;
+        readonly onBlur?: Function | undefined;
+        readonly onChange?: Function | undefined;
+        readonly onClick?: Function | undefined;
+        readonly onEdge?: Function | undefined;
+        readonly itemSize?: Record<string, any> | undefined;
+    };
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {}, {}, string> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & (new () => {
+    $slots: {
+        itemView: (_: {
+            currentIndex: number;
+            dataIndex: number;
+            focused: boolean;
+            distanceToCenter: number;
+        }) => any;
+        indicatorDot: (_: {
+            dataIndex: number;
+            currentIndex: number;
+            focused: boolean;
+        }) => any;
+    };
+});
+export default _default;

package/bin/types/utils/JsViewVueWidget/JsvSwiper/index.d.ts

@@ -1,2 +1,4 @@
-export default JsvSwiper;
 import JsvSwiper from "./JsvSwiper.vue";
+import JsvSwiper2 from "./JsvSwiper2.vue";
+import JsvSmoothSwiper from "./JsvSmoothSwiper.vue";
+export { JsvSwiper, JsvSwiper2, JsvSmoothSwiper };

package/bin/types/utils/JsViewVueWidget/JsvTextureAnim/JsvTextureAnim.vue.d.ts

@@ -53,8 +53,8 @@ declare const _default: import("vue").DefineComponent<{
     _createBorderRadius(view_texture: any, decorate_setting: any): any;
     _onAnimationEnd(normal_end: any): void;
     _updateTexCoord(): void;
-    _buildAnimation(): any;
-    start(): void;
+    _buildAnimation(a: any): any;
+    start(customAnim: any): void;
     getTransition(): string;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     src: StringConstructor;

package/bin/types/utils/JsViewVueWidget/index.d.ts

@@ -8,7 +8,6 @@ export { default as JsvApic } from "./JsvApic/JsvApic";
 export { default as JsvApic2 } from "./JsvApic/JsvApic2";
 export { default as JsvQrcode } from "./JsvQrcode/JsvQrcode.vue";
 export { default as JsvSpray } from "./JsvSpray/JsvSpray.vue";
-export { default as JsvSwiper } from "./JsvSwiper";
 export { default as JsvSwiper3D } from "./JsvSwiper3D";
 export { default as JsvVisibleSensor } from "./JsvVisibleSensor";
 export { default as JsvFilterView } from "./JsvFilterView.vue";
@@ -34,12 +33,14 @@ export { default as JsvTouchModeSwitcher } from "./JsvTouchModeSwitcher.vue";
 export { default as JsvDragBox } from "./JsvDragBox/JsvDragBox.vue";
 export { default as Jsv3dDiv } from "./Jsv3dDiv.vue";
 export { default as Jsv3dStage } from "./Jsv3dStage.vue";
+export { default as JsvDashPath } from "./JsvDashPath.vue";
 import JsvNativeSharedDiv from "./JsvNativeSharedDiv.vue";
 export { JsvNativeSharedDiv as JsvTransparentDiv, JsvNativeSharedDiv };
 export { default as JsvActorMove, JsvActorMoveControl } from "./JsvActorMove";
 export { LoopType, ApicEndState } from "./JsvApic/JsvCommonLoopToolBase.js";
 export { default as JsvInput, InputType } from "./JsvInput";
 export { default as JsvPreload, buildPreloadInfo, buildDownloadInfo } from "./JsvPreload";
+export { JsvSwiper, JsvSwiper2, JsvSmoothSwiper } from "./JsvSwiper";
 export { default as JsvTextureAnim, TexAlignAnchor, DECORATE_NINEPATCH_ALPHA_MIX, DECORATE_BORDER_RADIUS } from "./JsvTextureAnim";
 export { default as JsvGrid, PageType, LineType, FocusMoveType } from "./JsvGrid.vue";
 export { default as JsvRipple, JsvRippleShape } from "./JsvRipple";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview-vue",
-  "version": "2.3.0",
+  "version": "2.3.151-test.0",
   "license": "MIT",
   "repository": "system/jsview-framework",
   "author": "mengxk",

package/utils/JsViewEngineWidget/JsvFocus/JsvFocusHub.ts

@@ -43,7 +43,8 @@ class JsvFocusHubApi {
      * getCurrentFocus
      * 
      * 获取当前焦点的的 focusName 信息，用于后续的进行的 setFocus 操作
-     * (注意, 不带NameSpace)
+     * (注意1: 获取的NameSpace不带NameSpace)
+     * (注意2: 如果当前状态所设焦点还没Mounted时，也会返回null)
      * 
      * @return {string} 当前焦点的focusName
      */
@@ -117,6 +118,31 @@ class JsvFocusHubApi {
     public getCurrentFocusStack(): Array<Object> {
         return this._FocusHub.getCurrentFocusStack();
     }
+
+    /**
+     * addFocusChangeListener
+     * 
+     * 添加焦点变化监听器, 主要用来追踪焦点name的变化，例如路由切换的场景
+     * 
+     * @param {Function} listener 焦点变化监听器, 参数为 {focusName: string}
+     * @param {boolean} onRequest 监听时机，true: 在focus请求时即回调，无论节点是否存在；
+     *                             false: 在节点真实存在后，确认进行focus时才回调(在正准备Focus()调用前)
+     */
+    addFocusChangeListener(listener: Function, onRequest: boolean = false) {
+        this._FocusHub.addFocusChangeListener(listener, onRequest);
+    }
+
+    /**
+     * removeFocusChangeListener
+     * 
+     * 删除焦点变化监听器
+     * 
+     * @param {Function} listener 由addFocusChangeListener添加的变化监听器
+     * @param {boolean} onRequest 和addFocusChangeListener时设置的参数要完全对应
+     */
+    removeFocusChangeListener(listener: Function, onRequest: boolean = false) {
+        this._FocusHub.delFocusChangeListener(listener, onRequest);
+    }
 }
 
 const ROOT_HUB_PROVIDE_NAME = "__jsvFocusRootHub__";

package/utils/JsViewEngineWidget/MetroWidget/MetroWidget.vue

@@ -58,6 +58,9 @@
                                       focusBackgroundColor: 获焦时的颜色
                                       borderRadius: 占位符圆角设置
                                       gap: 占位符之间的gap
+                                      logoUrl: 占位符logo的url
+                                      logoWidth: 占位符logo的宽度
+                                      logoHeight: 占位符logo的高度
                                     }
  *      sendFocusRectEvent {boolean} item获焦时在焦点树上冒泡一个事件, MetroWidget接收到事件时会触发滚动操作, 一般用于嵌套
                                      时的滚动
@@ -85,6 +88,8 @@
                                           permanent {boolean}: 出去与是否保留
                                           enableTap {boolean}: 是否接受触控tap
                                           showSkeleton {boolean}: 打断描画时, 是否显示骨架图, 默认为true
+                                          enableLongPress {boolean}: item是否支持长按, 默认值为props.enableLongPress
+                                          placeHolderLayout{{left: number, top: number, width: number, height: number}}: 占位符的布局信息
                                         }
  *
  *      onFocus {function} 控件获取焦点的回调
@@ -100,6 +105,7 @@
                                 totalSize: 所有item的总长
  *      onFocusRectChange {() => void} 焦点区域变化的回调
  *      onAllItemResizeDone {() => void} 所有item resize完成的回调
+ *      onFocusChange {(id: number) => void} 焦点变化的回调
  *      loadAll {boolean} 加载不显示的view，触控场景使用
  *      flingPageWidth {}
  *      flingPageEdge {}
@@ -468,8 +474,21 @@ const touchDivSize = reactive({
 });
 
 const normalizedPlaceHolder = computed(() => {
+  let logoInfo = null;
+  if (
+    typeof props.placeHolderSetting.logoUrl == "string" &&
+    typeof props.placeHolderSetting.logoWidth == "number" &&
+    typeof props.placeHolderSetting.logoHeight == "number"
+  ) {
+    logoInfo = {
+      url: props.placeHolderSetting.logoUrl,
+      width: props.placeHolderSetting.logoWidth,
+      height: props.placeHolderSetting.logoHeight,
+    };
+  }
   return {
     gap: props.placeHolderSetting.gap ?? 0,
+    logoInfo: logoInfo,
     borderRadius: props.placeHolderSetting.borderRadius ?? 0,
     backgroundColor: props.placeHolderSetting.backgroundColor,
     focusBackgroundColor:
@@ -640,15 +659,28 @@ defineExpose(exportObject);
                     item.itemConfig.showSkeleton
                   "
                   :style="{
-                    width: item.renderStyle.width - normalizedPlaceHolder.gap,
-                    height: item.renderStyle.height - normalizedPlaceHolder.gap,
+                    left: item.placeHolderLayout.left,
+                    top: item.placeHolderLayout.top,
+                    width: item.placeHolderLayout.width,
+                    height: item.placeHolderLayout.height,
                     backgroundColor:
                       currentFocusIndex == item.index && modeForExport == 2
                         ? normalizedPlaceHolder.focusBackgroundColor
                         : normalizedPlaceHolder.backgroundColor,
                     borderRadius: normalizedPlaceHolder.borderRadius,
                   }"
-                ></div>
+                >
+                  <img
+                    v-if="normalizedPlaceHolder.logoInfo"
+                    :src="`url(${normalizedPlaceHolder.logoInfo.url})`"
+                    :style="{
+                      left: (item.placeHolderLayout.width - normalizedPlaceHolder.logoInfo.width) / 2,
+                      top: (item.placeHolderLayout.height - normalizedPlaceHolder.logoInfo.height) / 2,
+                      width: normalizedPlaceHolder.logoInfo.width,
+                      height: normalizedPlaceHolder.logoInfo.height,
+                    }"
+                  />
+                </div>
               </div>
             </jsv-focus-block>
           </div>