@shijiu/jsview-vue 2.1.482-test.0 → 2.2.35

package/bin/types/JsViewVueWidget/JsvVisibleSensor/JsvVisibleSensor.vue.d.ts

@@ -0,0 +1,84 @@
+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<{}>>, {
+            $props: {
+                readonly left?: number | undefined;
+                readonly top?: number | undefined;
+                readonly enable?: boolean | undefined;
+                readonly height?: number | undefined;
+                readonly width?: number | undefined;
+                readonly container?: Record<string, any> | undefined;
+                readonly horizonShown?: number | undefined;
+                readonly verticalShown?: number | undefined;
+                readonly callback?: Function | 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<{
+        $props: {
+            readonly left?: number | undefined;
+            readonly top?: number | undefined;
+            readonly enable?: boolean | undefined;
+            readonly height?: number | undefined;
+            readonly width?: number | undefined;
+            readonly container?: Record<string, any> | undefined;
+            readonly horizonShown?: number | undefined;
+            readonly verticalShown?: number | undefined;
+            readonly callback?: Function | undefined;
+        };
+    }> & {} & import("vue").ComponentCustomProperties & {};
+    __isFragment?: undefined;
+    __isTeleport?: undefined;
+    __isSuspense?: undefined;
+} & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{}>>, {
+    $props: {
+        readonly left?: number | undefined;
+        readonly top?: number | undefined;
+        readonly enable?: boolean | undefined;
+        readonly height?: number | undefined;
+        readonly width?: number | undefined;
+        readonly container?: Record<string, any> | undefined;
+        readonly horizonShown?: number | undefined;
+        readonly verticalShown?: number | undefined;
+        readonly callback?: Function | undefined;
+    };
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {}, {}, string> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & (new () => {
+    $slots: {
+        default: (_: {}) => any;
+    };
+});
+export default _default;

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

@@ -0,0 +1,84 @@
+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<{}>>, {
+            $props: {
+                readonly left?: number | undefined;
+                readonly top?: number | undefined;
+                readonly enable?: boolean | undefined;
+                readonly height?: number | undefined;
+                readonly width?: number | undefined;
+                readonly container?: Record<string, any> | undefined;
+                readonly horizonShown?: number | undefined;
+                readonly verticalShown?: number | undefined;
+                readonly callback?: Function | 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<{
+        $props: {
+            readonly left?: number | undefined;
+            readonly top?: number | undefined;
+            readonly enable?: boolean | undefined;
+            readonly height?: number | undefined;
+            readonly width?: number | undefined;
+            readonly container?: Record<string, any> | undefined;
+            readonly horizonShown?: number | undefined;
+            readonly verticalShown?: number | undefined;
+            readonly callback?: Function | undefined;
+        };
+    }> & {} & import("vue").ComponentCustomProperties & {};
+    __isFragment?: undefined;
+    __isTeleport?: undefined;
+    __isSuspense?: undefined;
+} & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{}>>, {
+    $props: {
+        readonly left?: number | undefined;
+        readonly top?: number | undefined;
+        readonly enable?: boolean | undefined;
+        readonly height?: number | undefined;
+        readonly width?: number | undefined;
+        readonly container?: Record<string, any> | undefined;
+        readonly horizonShown?: number | undefined;
+        readonly verticalShown?: number | undefined;
+        readonly callback?: Function | undefined;
+    };
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {}, {}, string> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & (new () => {
+    $slots: {
+        default: (_: {}) => any;
+    };
+});
+export default _default;

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

@@ -0,0 +1,37 @@
+export * from "./JsvFreeMoveActor";
+export * from "./JsvFlexCell";
+export * from "./JsvSpriteAnim";
+export { default as JsvApic } from "./JsvApic/JsvApic";
+export { default as JsvApic2 } from "./JsvApic/JsvApic2";
+export { default as JsvQrcode } from "./JsvQrcode";
+export { default as JsvSpray } from "./JsvSpray";
+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";
+export { default as JsvHole } from "./JsvHole.js";
+export { default as JsvMarquee } from "./JsvMarquee.vue";
+export { default as JsvMaskClipDiv } from "./JsvMaskClipDiv.vue";
+export { default as JsvNinePatch } from "./JsvNinePatch.vue";
+export { default as JsvPosterDiv } from "./JsvPosterDiv.vue";
+export { default as JsvPosterImage } from "./JsvPosterImage.vue";
+export { default as JsvScaleTextBox } from "./JsvScaleTextBox.vue";
+export { JsvSoundPool } from "./JsvSoundPool.js";
+export { default as JsvTextBox } from "./JsvTextBox.vue";
+export { default as JsvRadarChart } from "./JsvRadarChart.vue";
+export { default as JsvLine } from "./JsvLine";
+export { default as JsvPieChart } from "./JsvPieChart.vue";
+export { default as JsvSector } from "./JsvSector.vue";
+export { default as JsvConnectLine } from "./JsvConnectLine";
+export { default as JsvProgressBar } from "./JsvProgressBar.vue";
+export { default as JsvEnableRenderBreak } from "./JsvEnableRenderBreak.vue";
+export { JsvMindMap } from "./JsvMindMap";
+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 { 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/bin/types/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./JsViewEngineWidget";
+export * from "./JsViewPlugin";
+export * from "./JsViewVueTools";
+export * from "./JsViewVueWidget";

package/index.d.ts

@@ -1,3 +1,3 @@
 // 二选一 "./bin" 用于执行打包的js，"./utils" 用于调试
-export * from "./bin/types/jsview-vue.d.mjs";
+export * from "./bin/types/index";
 // export * from "./utils";

package/package.json

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

package/tools/config/tsconfig.json

@@ -1,15 +1,15 @@
 {
   "compilerOptions": {
-    "target": "es2022",
-    "module": "es2022",
-    "moduleResolution": "node",
-    "strict": true,
     "allowJs": true,
     "declaration": true,
+    "declarationDir": "../../bin/types",
     "emitDeclarationOnly": true,
-    "declarationDir": "../../bin/types"
+    "module": "es2022",
+    "moduleResolution": "node",
+    "strict": true,
+    "target": "es2022",
   },
   "include": [
-    "../../bin/jsview-vue.mjs"
+    "../../utils/index.js"
   ],
 }

package/tools/jsview-vue-build.mjs

@@ -58,11 +58,10 @@ async function main(argv)
   const noSavePackages = noSavePkgList.toString().replaceAll(',', ' ');
   const version = process.env['JSVIEW_VUE_VERSION'];
 
+  const npmInstalledFlag = path.resolve(jsviewVueDir, 'node_modules', '.cache', '.npm-installed');
   let batchCommand = []
 
-  fs.rmSync(jsviewVueBinDir, { recursive: true, force: true });
-  if(!argv.withoutNpmInstall
-  || fs.existsSync(`${jsviewVueDir}/node_modules`) == false) {
+  if(!argv.withoutNpmInstall || fs.existsSync(npmInstalledFlag) == false) {
     const registry = getNpmRegistry();
     fs.rmSync(`${jsviewVueDir}/node_modules`, { recursive: true, force: true });
     batchCommand = [
@@ -75,14 +74,23 @@ async function main(argv)
     ...batchCommand,
     `JSVIEW_DISABLE_MANUALCHUNKS=true ${jsviewVueDir}/node_modules/.bin/vite build --config ${jsviewVueDir}/tools/config/vite.config.ts`,
     `${version ? 'JSVIEW_VUE_VERSION='+version : ''} ${jsviewVueDir}/node_modules/.bin/rollup  --config ${jsviewVueDir}/tools/config/rollup.config.mjs`,
-    `${jsviewVueDir}/node_modules/.bin/vue-tsc --project ${jsviewVueDir}/tools/config/tsconfig.json`,
   ];
+  if(!argv.withoutTsDeclare) {
+    fs.rmSync(jsviewVueBinDir, { recursive: true, force: true });
+
+    batchCommand = [
+      ...batchCommand,
+      `${jsviewVueDir}/node_modules/.bin/vue-tsc --project ${jsviewVueDir}/tools/config/tsconfig.json`,
+    ];
+  }
   for(const command of batchCommand) {
     execCommand(`cd ${jsviewVueDir} && ${command}`);
   }
 
   formatBannerRecursive(jsviewVueBinDir);
 
+  fs.mkdirSync(path.dirname(npmInstalledFlag), {recursive: true});
+  fs.writeFileSync(npmInstalledFlag, '');
   if(!argv.withoutNpmInstall) {
     fs.rmSync(`${jsviewVueDir}/node_modules`, { recursive: true, force: true });
     fs.rmSync(`${jsviewVueDir}/package-lock.json`, { recursive: true, force: true });
@@ -94,6 +102,7 @@ async function main(argv)
 const requiredUsages = {
 };
 const optionalUsages = {
+  '-t | --without-ts-declare': 'Ignore to generate typescript declaration.',
   '-n | --without-npm-install': 'Ignore to run npm install.',
 };
 const argv = parseArguments(requiredUsages, optionalUsages, false);

package/utils/JsViewEngineWidget/MetroWidget/ListWidget.vue

@@ -123,7 +123,7 @@ const props = defineProps({
   },
   keepTraceRange: {
     type: Number,
-    default: 3,
+    default: -1,
   },
   onScroll: {
     type: Function,
@@ -144,7 +144,7 @@ const props = defineProps({
   },
   touchFlag: {
     type: Number,
-    default: 0
+    default: 0,
   },
 });
 
@@ -200,7 +200,10 @@ const {
   touchDivSize,
   "list"
 );
-
+let touchDivVOn = {};
+if (onTouchRelease) {
+  touchDivVOn["jsv-touchend"] = onTouchRelease;
+}
 defineExpose(exportObject);
 </script>
 
@@ -235,7 +238,7 @@ defineExpose(exportObject);
             width: touchDivSize.width,
             height: touchDivSize.height,
           }"
-          @jsv-touchend="onTouchRelease"
+          v-on="touchDivVOn"
         >
           <div>
             <slot name="background"></slot>

package/utils/JsViewEngineWidget/MetroWidget/MetroWidget.vue

@@ -72,6 +72,7 @@
                                           zIndex {int | object}: item的zIndex, 为object时可以分别设置{focus: 0, normal: 0}, 为number时则同时设置获焦和不获焦的zIndex,
                                           uid {string}: item的uid, 可以通过uid来设置焦点
                                           permanent {boolean}: 出去与是否保留
+                                          enableTap {boolean}: 是否接受触控tap
                                         }
  *
  *      onFocus {function} 控件获取焦点的回调
@@ -82,6 +83,10 @@
                                             "rect": 到达边缘时的区域{x: 0, y: 0, width: 0,height: 0}
                                           }
         onScroll {function} 滚动时的回调 (visibleStart, visibleRange, totalSize) => {}
+                                (TBD: 
+                                  当前版本暂时不支持触控过程的实时回调，
+                                  由于回调js会严重拖慢性能，所以也不会设计实时回调，
+                                  关于边缘的拖动进度展示，将来会有额外组件支撑)
                                 visibleStart: 可视区域的起点
                                 visibleRange: 可视区域大小(不含padding)
                                 totalSize: 所有item的总长
@@ -91,6 +96,7 @@
  *      flingPageWidth {}
  *      flingPageEdge {}
  *      disableClip {boolean} 取消显示范围的clipView
+ *      touchFlag {int} 触控的开关, 0:关闭, 1:打开. 打开后支持drag, fling; item的tap则由measuresObject的enableTap控制
  
  *    methods:
         getFocusBlockRef 获取此MetroWidget的 jsv-focus-block句柄，可以使用requestFocus完成获焦
@@ -177,6 +183,9 @@
           @description 锁定滚动
         unlockSlide
           @description 取消锁定
+        setSlideSetting
+          @description 设置slideSetting
+          @params { SlideSetting | null } setting 滚动设置, 为null时使用props.slideSetting
             
   slots:
     renderItem: 该slot用于描画每个单元格
@@ -358,7 +367,7 @@ const props = defineProps({
   },
   keepTraceRange: {
     type: Number,
-    default: 3,
+    default: -1,
   },
   onScroll: {
     type: Function,
@@ -379,7 +388,7 @@ const props = defineProps({
   },
   touchFlag: {
     type: Number,
-    default: 0
+    default: 0,
   },
 });
 
@@ -436,6 +445,11 @@ const {
   touchDivSize,
   "common"
 );
+let touchDivVOn = {};
+if (onTouchRelease) {
+  touchDivVOn["jsv-touchend"] = onTouchRelease;
+}
+
 defineExpose(exportObject);
 </script>
 
@@ -470,7 +484,7 @@ defineExpose(exportObject);
             width: touchDivSize.width,
             height: touchDivSize.height,
           }"
-          @jsv-touchend="onTouchRelease"
+          v-on="touchDivVOn"
         >
           <div>
             <slot name="background"></slot>
@@ -529,8 +543,7 @@ defineExpose(exportObject);
                     width: item.renderStyle.width - normalizedPlaceHolder.gap,
                     height: item.renderStyle.height - normalizedPlaceHolder.gap,
                     backgroundColor:
-                      currentFocusIndex == item.index
-                      && modeForExport == 2
+                      currentFocusIndex == item.index && modeForExport == 2
                         ? normalizedPlaceHolder.focusBackgroundColor
                         : normalizedPlaceHolder.backgroundColor,
                     borderRadius: normalizedPlaceHolder.borderRadius,