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

package/utils/JsViewPlugin/JsvLatex/JsvLatex.vue

@@ -26,7 +26,9 @@ import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
 import ForgeHandles from "../../JsViewVueTools/ForgeHandles";
 import JsvLatexBridgeProxy from "./JsvLatexBridgeProxy";
 import { cssColor2Android } from "./Color";
-import sPluginLoader from "./PluginLoader";
+import { GetPluginLoader } from "./PluginLoader";
+
+let sPluginLoader = GetPluginLoader();
 
 const props = defineProps({
   latexStr: {

package/utils/JsViewPlugin/JsvLatex/JsvLatexProxy.vue

@@ -0,0 +1,20 @@
+<script setup>
+import { defineAsyncComponent } from "vue";
+import JsvLatex from "./JsvLatex.vue";
+
+const AsyncComp = defineAsyncComponent(() => {
+  return new Promise((resolve, reject) => {
+    if (!window.JsView) {
+      console.log("Load BrowserJsvLatex");
+      const BrowserJsvLatex = import("./BrowserJsvLatex.vue");
+      resolve(BrowserJsvLatex);
+    } else {
+      resolve(JsvLatex);
+    }
+  });
+});
+</script>
+
+<template>
+  <AsyncComp v-bind="$attrs" />
+</template>

package/utils/JsViewPlugin/JsvLatex/PluginLoader.js

@@ -166,6 +166,16 @@ class PluginLoader {
   }
 }
 
-const sPluginLoader = new PluginLoader();
-sPluginLoader.registerGlobalListener();
-export default sPluginLoader;
+let sPluginLoader = null;
+
+function GetPluginLoader() {
+  if (sPluginLoader == null) {
+    sPluginLoader = new PluginLoader();
+    sPluginLoader.registerGlobalListener();
+  }
+  return sPluginLoader;
+}
+
+export {
+  GetPluginLoader
+}

package/utils/JsViewPlugin/JsvLatex/index.js

@@ -3,26 +3,21 @@
  * @Date: 2023-02-28 10:18:42
  * @Description: file content
  */
-import sPluginLoader from "./PluginLoader.js";
-import JsvLatex from "./JsvLatex.vue"
+import { GetPluginLoader } from "./PluginLoader.js";
+import JsvLatex from "./JsvLatexProxy.vue"
 
-let globalLoadJsvLatexPlugin;
-let _JsvLatex;
-
-if (!window.JsView) {
-  const BrowserJsvLatex = await import("./BrowserJsvLatex.vue");
-  //browser
-  globalLoadJsvLatexPlugin = (listener) => {
+const globalLoadJsvLatexPlugin = (listener) => {
+  if (!window.JsView) {
     setTimeout(listener, 0);
-  };
-  _JsvLatex = BrowserJsvLatex.default;
-} else {
-  //jsview
-  globalLoadJsvLatexPlugin = sPluginLoader.loadPlugin.bind(sPluginLoader);
-  _JsvLatex = JsvLatex;
+  } else {
+    //jsview
+    let pluginLoader = GetPluginLoader();
+    let innerFunc = pluginLoader.loadPlugin.bind(pluginLoader);
+    innerFunc(listener);
+  }
 }
 
 export {
-  _JsvLatex as JsvLatex,
+  JsvLatex,
   globalLoadJsvLatexPlugin,
 }

package/utils/JsViewPlugin/index.js

@@ -1,4 +1,4 @@
 export { default as JsvAccount } from "./JsvAccount/JsvAccount";
-export * from "./JsvPlayer";
+// export * from "./JsvPlayer"; // JsvPlayer已改为独立模块
 export * from "./JsvAudio";
 export * from "./JsvLatex";

package/utils/JsViewVueTools/ForgeHandles.ts

@@ -0,0 +1,14 @@
+let handles = {
+    TextureManager: null,
+    RootView: null,
+    RootActivity: null
+}
+
+const jsvCode = (window as any).JsvCode;
+jsvCode.ForgeHandles.listenToReady(()=>{
+    handles.TextureManager = jsvCode.ForgeHandles.TextureManager;
+    handles.RootView = jsvCode.ForgeHandles.RootView;
+    handles.RootActivity = jsvCode.ForgeHandles.RootActivity;    
+})
+
+export default handles;

package/utils/JsViewVueTools/{JsvDynamicKeyFrames.js → JsvDynamicKeyFrames.ts}

@@ -19,8 +19,8 @@
  *  返回值:
  *      KeyFrameStyleSheet  以anchor_tag为锚点，找到对应的cssRule，以此cssRule创建出的KeyFrame管理句柄
  */
-function getKeyFramesGroup(anchor_tag) {
-  return window.JsvCode.Dom.getKeyFrameGroup(anchor_tag);
+function getKeyFramesGroup(anchor_tag: string | null) {
+  return (window as any).JsvCode.Dom.getKeyFrameGroup(anchor_tag);
 }
 
 export {

package/utils/JsViewVueTools/JsvFederationTools.ts

@@ -0,0 +1,35 @@
+
+/**
+ * alterModuleUrl
+ * 
+ * 配置federation remote模块的加载url
+ * 注意: 需要在模块进行加载前使用才能生效，否则不生效
+ * 
+ * @param {string} moduleName 
+ *         远程模块名，例如: RemoteEntry
+ * @param {string} newUrl
+ *         模块远程url, 此url对应remote build后dist部署的服务器位置，例如: "http://localhost:8088/dist/js/remoteEntry.js"
+ */
+function alterModuleUrl(moduleName: string, newUrl: string) {
+    let moduleRef = (window as any).JsvCode.Federation.remotesMap[moduleName];
+    if (moduleRef) {
+        if (moduleRef.inited) { // 按照Module federation 1.3.4的数据规则, 未加载时, inited为false
+            console.error(`Error: can't change INITED module name '${moduleName}'`);
+        } else {
+            moduleRef.url = newUrl;
+            console.log(`Info: set '${moduleName}' to '${newUrl}' succcess`);
+        }
+    } else {
+        console.error(`Error: module '${moduleName}' not found`);
+    }
+}
+
+const JsvFederationTools = {
+    alterModuleUrl
+}
+
+export {
+    JsvFederationTools
+}
+
+

package/utils/JsViewVueTools/JsvPreDownloader.ts

@@ -24,7 +24,7 @@ interface DownloadListItem {
   netSetting?: string,
   isImage?: boolean,
 }
-interface infoObject{
+interface infoObject {
   errorCode: number
   errorInfo: string
   url: null
@@ -39,16 +39,16 @@ abstract class JsvPreDownloaderBase {
       if (typeof url === "string") {
         this.downloadInner(url, netSetting, isImage).then(resolve, reject);
       } else if (Array.isArray(url) && url.length > 0) {
-        const downloadResult = new Array(url.length); 
+        const downloadResult = new Array(url.length);
         const check = () => {
           let allDone = false;
-          let allSuccess = true;  
+          let allSuccess = true;
           for (let i of downloadResult) {
-              if (!i?.succeed) {
-                allSuccess = false;
-              }
+            if (!i?.succeed) {
+              allSuccess = false;
+            }
           }
-          if(isNullNumber + workNumber == url.length ){
+          if (isNullNumber + workNumber == url.length) {
 
             allDone = true;
           }
@@ -61,10 +61,10 @@ abstract class JsvPreDownloaderBase {
           }
         }
         for (let i = 0; i < url.length; ++i) {
-          if(url[i]==null || url[i].url == null  ){
-            downloadResult[i]={
-              succeed:false,
-              info:{
+          if (url[i] == null || url[i].url == null) {
+            downloadResult[i] = {
+              succeed: false,
+              info: {
                 errorCode: 100,
                 errorInfo: "This item is null or url is null",
                 url: null
@@ -73,24 +73,24 @@ abstract class JsvPreDownloaderBase {
             isNullNumber += 1
           } else {
             this.downloadInner(url[i].url, url[i].netSetting, !!url[i].isImage)
-            .then(
-              (info) => {
-                downloadResult[i] = {
-                  succeed: true,
-                  info: info,
-                };
-                workNumber += 1
-                check();
-              },
-              (errorInfo) => {
-                downloadResult[i] = {
-                  succeed: false,
-                  info: errorInfo,
-                };
-                workNumber += 1
-                check();
-              })
-          } 
+              .then(
+                (info) => {
+                  downloadResult[i] = {
+                    succeed: true,
+                    info: info,
+                  };
+                  workNumber += 1
+                  check();
+                },
+                (errorInfo) => {
+                  downloadResult[i] = {
+                    succeed: false,
+                    info: errorInfo,
+                  };
+                  workNumber += 1
+                  check();
+                })
+          }
         }
       } else {
         console.error(TAG, "download url invalid", url);
@@ -99,13 +99,13 @@ abstract class JsvPreDownloaderBase {
     });
   }
 
-  public buildDownloadItem(url: string, netSetting: string = "", isImage: boolean = false) : DownloadListItem {
-      const item: DownloadListItem = {
-        url: url,
-        netSetting: netSetting,
-        isImage: isImage,
-      }
-      return item
+  public buildDownloadItem(url: string, netSetting: string = "", isImage: boolean = false): DownloadListItem {
+    const item: DownloadListItem = {
+      url: url,
+      netSetting: netSetting,
+      isImage: isImage,
+    }
+    return item
   }
   protected abstract downloadInner(url: string, netSetting: string | undefined, isImage: boolean): Promise<Object>;
 }
@@ -181,5 +181,4 @@ class JsvPreDownloaderInBrowser extends JsvPreDownloaderBase {
 }
 
 const exportObj = (window as any).JsView ? JsvPreDownloaderInJsView : JsvPreDownloaderInBrowser;
-(window as any).Test = exportObj;
 export { exportObj as JsvPreDownloader }

package/utils/JsViewVueTools/JsvTextureStore/CanvasTexture/CanvasTexture.ts

@@ -1,4 +1,4 @@
-import ForgeHandles from "../../../JsViewVueTools/ForgeHandles.js";
+import ForgeHandles from "../../../JsViewVueTools/ForgeHandles";
 import { TextureBase } from "../Texture"
 import * as Constants from "./CommandList"
 import { RectPath, CirclePath, CustomPath } from "./Path"

package/utils/JsViewVueTools/index.js

@@ -6,7 +6,7 @@
 
 export * from "./JsvHashHistory";
 export * from "./JsvDynamicCssStyle.js";
-export * from "./JsvDynamicKeyFrames.js";
+export * from "./JsvDynamicKeyFrames.ts";
 export * from "./JsvRuntimeBridge.js";
 export * from "./NinePatchHelper";
 export * from "./TypeCheckAndSet";
@@ -23,3 +23,4 @@ export * from "./JsvDemoTester.js"
 export * from "./JsvPerformance.ts"
 export * from "./JsvTextureStore/JsvTextureStore.ts"
 export * from "./JsvTextureDefines.ts"
+export * from "./JsvFederationTools.ts"

package/utils/JsViewVueWidget/JsvFreeMoveActor/ActorControl.ts

@@ -33,6 +33,10 @@ class ActorControl {
     this._StatePackBuilder = new StatePackBuilder();
   }
 
+  // debugGetAnimId() {
+  //   return this._BindAnim?.AnimNativeId;
+  // }
+
   bindForgeView(bindView: any, instantActive: boolean) {
     this._BindView = bindView;
 
@@ -138,8 +142,8 @@ class ActorControl {
 
   _OnEchoEvent(retJson: string) {
     // 遇到layout后仍然会因为新broadcast有动作时，一帧中可能会有多次回调
-    let retJsonObject: Object = JSON.parse(retJson);
-    let echoRetList = retJsonObject["retList"];
+    let retJsonObject: any = JSON.parse(retJson);
+    let echoRetList: Array<any> = retJsonObject["retList"];
     if (echoRetList) {
       for (let echoRet of echoRetList) {
         let renderBreakId = echoRet["rbTkn"];
@@ -147,7 +151,7 @@ class ActorControl {
           // 标识此RenderBreak完成
           FinishRenderBreak(renderBreakId);
         }
-        this._Callbacks.invokeCallback(echoRet["eTkn"], retJsonObject);
+        this._Callbacks.invokeCallback(echoRet["eTkn"], retJsonObject, echoRet["cds"], echoRet["ncds"]);
       }
     }
   }

package/utils/JsViewVueWidget/JsvFreeMoveActor/CallbackManager.ts

@@ -49,7 +49,9 @@ class CallbackManager {
     }
   }
 
-  public invokeCallback(id: string, actorState: Object) {
+  public invokeCallback(id: string, actorState: Object, 
+    customDataStr: string | null | undefined, 
+    nexusCustomDataStr:string | null | undefined) {
     let callbackObj = this._CallbackMap.get(id);
     if (callbackObj) {
       if (callbackObj.once) {
@@ -58,7 +60,7 @@ class CallbackManager {
         callbackObj.times++;
       }
       try {
-        callbackObj.funcRef?.(actorState);
+        callbackObj.funcRef?.(actorState, customDataStr, nexusCustomDataStr);
       } catch (e) {
         // 规避 callback 执行出错导致流程执行不下去
         console.error("Error: callback error", e);

package/utils/JsViewVueWidget/JsvFreeMoveActor/JsvEnvBlocker.vue

@@ -1,12 +1,16 @@
 <!--
  * 【模块 export 内容】
  * JsvEnvBlocker: 触发FreeMoveAnimation的 blockerCondition 的全屏碰撞体
+ *                与FreeMoveAnimation的 setCondition.onHitBlock 配合使用
  *      props说明:
  *          top, left, width, height(Number): 关联的div的定位信息
  *          topGID(Number): 上边缘响应监听的组id(用于blockerCondition的组参数), 0或者undefined代表不激活这条边的测试
  *          bottomGID(Number): 下边缘响应监听的组id
  *          leftGID(Number): 左边缘响应监听的组id
  *          rightGID(Number): 右边缘响应监听的组id
+ *
+ *          特别说明 GID 是全局共享的，例如多个EnvBlocker都有GID=2设置的边时，某个FreeMove实例设置setCondition.onHitBlock(2), 
+ *          意味着此FreeMoveAnimation碰撞任何一个EnvBlocker的GID=2的边都会触发回调
  * 
 -->
 

package/utils/JsViewVueWidget/JsvFreeMoveActor/SetCondition.ts

@@ -194,6 +194,16 @@ class ConditionPackBuilder {
     return this._BuildPack(ConditionSetBuilder.OnNextTick(tickGap, this._CommonInfo));
   }
 
+  /** 指定的swapcount前才能执行 */
+  onSwapCount() {
+    // CommonInfo 只能使用一次，规避多次使用问题
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    return this._BuildPack(ConditionSetBuilder.onSwapCount(0, this._CommonInfo));
+  }
+
   onDragStart() {
     if (!this._CheckCommonInfo()) {
       return null;
@@ -259,6 +269,14 @@ class ConditionPackBuilder {
     return this._BuildPack(ConditionSetBuilder.OnFlingCancel(this._CommonInfo, this._ContorlSlefNexus.token));
   }
 
+  touchCount(count: number) {
+    if (!this._CheckCommonInfo()) {
+      return null;
+    }
+    this._CommonInfoValid = false;
+    return this._BuildPack(ConditionSetBuilder.TouchCount(this._CommonInfo, count));
+  }
+
   _CheckCommonInfo(): boolean {
     if (!this._CommonInfoValid) {
       console.error("Error: must call from new conditoin()");

package/utils/JsViewVueWidget/JsvMindMap/JsvMindMap.vue

@@ -617,7 +617,7 @@ defineExpose(exposeObj);
     >
       <slot name="background"></slot>
       <jsv-focus-block
-        autoFocus
+        :name="props.name"
         :onAction="{
           onKeyDown,
           onFocus: focusBlockOnFocus,

package/utils/JsViewVueWidget/JsvQrcode/JsvQrcode.vue

@@ -154,11 +154,12 @@ export default {
       qrCodeView: null,
     };
   },
-  mounted() {
+  beforeUnmount() {
     if (this.innerViewId !== -1) {
       Forge.sViewStore.remove(this.innerViewId);
       this.innerViewId = -1;
       this.jsvBaseView = null;
+      console.log("success remove innerview");
     }
   },
 };

package/utils/JsViewVueWidget/JsvSpriteAnim/FrameBuidler.ts

@@ -1,5 +1,5 @@
-import { getKeyFramesGroup } from "../../JsViewVueTools/JsvDynamicKeyFrames.js";
-import { getsAnimationToken } from "./sAnimationToken.js";
+import { getKeyFramesGroup } from "../../JsViewVueTools/JsvDynamicKeyFrames";
+import { getsAnimationToken } from "./sAnimationToken";
 
 let keyFrameStyleSheet = getKeyFramesGroup(null);
 
@@ -17,7 +17,7 @@ class TransformInfoResule {
 }
 
 class SpritePack {
-  public keyFrameRefName: String | null = null;
+  public keyFrameRefName: String | null = null; // 可用来识别是否有动画(静图无动画)
   public clipKeyFrameName: String | null = null;
   public transKeyFrameName: String | null = null;
   public clipStyle: any = null; // 对应clip div的style控制
@@ -73,11 +73,15 @@ function expireAnimates(runningSprite: SpritePack | null) {
   if (!runningSprite) {
     return;
   }
-  let keyFrameRefName = runningSprite.keyFrameRefName;
-  const names_array = [`${keyFrameRefName}-clip`, `${keyFrameRefName}-image`];
 
-  if (keyFrameStyleSheet) {
-    keyFrameStyleSheet.removeMultiRules(names_array);
+  if (runningSprite.keyFrameRefName) {
+    // 动态frame要进行keyFrame清理，静态则不需要
+    let keyFrameRefName = runningSprite.keyFrameRefName;
+    const names_array = [`${keyFrameRefName}-clip`, `${keyFrameRefName}-image`];
+
+    if (keyFrameStyleSheet) {
+      keyFrameStyleSheet.removeMultiRules(names_array);
+    }
   }
 }