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

package/index.d.ts

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

package/package.json

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

package/tools/config/tsconfig.json

@@ -1,18 +1,15 @@
 {
   "compilerOptions": {
-    "target": "es2021",
+    "target": "es2022",
     "module": "es2022",
     "moduleResolution": "node",
     "strict": true,
-    "jsx": "preserve",
-    "resolveJsonModule": true,
-    "noEmit": true,
     "allowJs": true,
-    "paths": {
-      "jsview": [ "./node_modules/@shijiu/jsview-vue" ],
-    }
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "declarationDir": "../../bin/types"
   },
-  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue",
-    "node_modules/@shijiu/jsview-vue/**/*.vue"
-  ]
+  "include": [
+    "../../bin/jsview-vue.mjs"
+  ],
 }

package/tools/jsview-vue-build.mjs

@@ -2,8 +2,8 @@
 'use strict';
 
 import fs from 'node:fs';
-import path from 'path';
-import url from 'url';
+import path from 'node:path';
+import url from 'node:url';
 import {
   checkNodeVersion,
   execCommand,
@@ -11,12 +11,30 @@ import {
   parseArguments,
 } from '../../../@shijiu/jsview/tools/jsview-common.mjs';
 
+function formatBannerRecursive(dir)
+{
+  const fileNameList = fs.readdirSync(dir);
+  for(const fileName of fileNameList) {
+    const filePath = path.resolve(dir, fileName);
+    const stat = fs.statSync(filePath);
+    if(stat.isDirectory()) {
+      formatBannerRecursive(filePath);
+    } else {
+      let content = fs.readFileSync(filePath, 'utf-8');
+      content = content.replace(/\/\/!/g, '//');
+      content = content.replace(/\/\*!/g, '/*');
+      fs.writeFileSync(filePath, content, 'utf-8');
+    }
+  }
+}
+
 async function main(argv)
 {
   checkNodeVersion();
 
   const currJsFilePath = url.fileURLToPath(import.meta.url)
   const jsviewVueDir = path.resolve(currJsFilePath, '../../') // jsview-framework/@shijiu/jsview-vue
+  const jsviewVueBinDir = path.resolve(jsviewVueDir, 'bin') // jsview-framework/@shijiu/jsview-vue/bin
 
   const noSavePkgList = [
     // jsview
@@ -27,6 +45,7 @@ async function main(argv)
     // vue + vite
     'vue@3.2.45',
     'vue-router@4.1.6',
+    '@babel/types',
     '@vitejs/plugin-vue@4.0.0',
     'typescript@4.9.3',
     'vite@4.0.0',
@@ -41,7 +60,7 @@ async function main(argv)
 
   let batchCommand = []
 
-  fs.rmSync(`${jsviewVueDir}/bin`, { recursive: true, force: true });
+  fs.rmSync(jsviewVueBinDir, { recursive: true, force: true });
   if(!argv.withoutNpmInstall
   || fs.existsSync(`${jsviewVueDir}/node_modules`) == false) {
     const registry = getNpmRegistry();
@@ -54,14 +73,16 @@ async function main(argv)
   }
   batchCommand = [
     ...batchCommand,
-    `${jsviewVueDir}/node_modules/.bin/vue-tsc --project ${jsviewVueDir}/tools/config/tsconfig.json`,
     `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`,
   ];
   for(const command of batchCommand) {
     execCommand(`cd ${jsviewVueDir} && ${command}`);
   }
 
+  formatBannerRecursive(jsviewVueBinDir);
+
   if(!argv.withoutNpmInstall) {
     fs.rmSync(`${jsviewVueDir}/node_modules`, { recursive: true, force: true });
     fs.rmSync(`${jsviewVueDir}/package-lock.json`, { recursive: true, force: true });

package/utils/JsViewEngineWidget/MetroWidget/SlotComponent.vue

@@ -5,7 +5,6 @@
 <script setup>
 import { onBeforeUpdate } from "vue";
 onBeforeUpdate(() => {
-  console.log("onBeforeUpdate");
   return false;
 });
 </script>

package/utils/JsViewPlugin/JsvAudio/AudioProxy.js

@@ -5,10 +5,12 @@
  */
 import JsvAudioBridgeProxy from "./JsvAudioBridgeProxy";
 import { checkType, toRawType } from "./CheckType";
-import sPluginLoader from "./PluginLoader";
+import { GetPluginLoader } from "./PluginLoader";
 import Events from "./Events.js"
 import { ScreenLockManager } from "./ScreenLockManager.js";
 
+let sPluginLoader = GetPluginLoader();
+
 const TAG = "JsvAudio";
 
 let keyToken = 0;
@@ -47,8 +49,14 @@ class AudioManager {
     }
   }
 }
-const sAudioManager = new AudioManager();
 
+let sAudioManager = null;
+function getAudioManager() {
+  if (sAudioManager == null) {
+    sAudioManager = new AudioManager();
+  }
+  return sAudioManager;
+}
 
 const AUDIO_PROPS = {
   "src": { type: Object },
@@ -336,4 +344,4 @@ class AudioProxy {
   }
 }
 
-export { sAudioManager, getKeyToken };
+export { getAudioManager, getKeyToken };

package/utils/JsViewPlugin/JsvAudio/JsvAudio.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { sAudioManager, getKeyToken } from "./AudioProxy.js";
+import { getAudioManager, getKeyToken } from "./AudioProxy.js";
 import { onBeforeUnmount } from "vue";
 
 const props = defineProps({
@@ -94,9 +94,12 @@ const props = defineProps({
   },
 });
 
+let sAudioManager = getAudioManager();
+
 //同进程起不同版本的core时, pluginMananger是一个对象, 因此java端的JsvAudio是同一个map, 所以要加jsviewCoreInfo避免id重复导致bug
-const jsviewCoreInfo = window.JsView?.getJsContextId?.() + "_" + window.JsView.CodeRevision
-let key = "JsvAudio_" + jsviewCoreInfo + "_"  + getKeyToken();
+const jsviewCoreInfo =
+  window.JsView?.getJsContextId?.() + "_" + window.JsView.CodeRevision;
+let key = "JsvAudio_" + jsviewCoreInfo + "_" + getKeyToken();
 if (props.playerKey) {
   key = props.playerKey + "_" + jsviewCoreInfo;
 }

package/utils/JsViewPlugin/JsvAudio/JsvAudioProxy.vue

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

package/utils/JsViewPlugin/JsvAudio/PluginLoader.js

@@ -135,6 +135,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/JsvAudio/index.js

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

package/utils/JsViewPlugin/JsvLatex/BrowserJsvLatex.vue

@@ -1,9 +1,8 @@
 <script setup>
 // import "./mathjax-tex-svg.js";
 import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
-import { ref, onMounted } from "vue";
+import { shallowRef, onBeforeUnmount } from "vue";
 import { getHtmlStr } from "./BrowserDomBuilder.js";
-import libPath from "./mathjax-tex-svg.txt";
 
 const props = defineProps({
   latexStr: {
@@ -40,11 +39,29 @@ const props = defineProps({
   },
 });
 
-let layoutView = new Forge.IFrameView();
+let innerViewId = shallowRef(-1);
 
+let layoutView = new Forge.IFrameView();
 layoutView.SetIframeSize(props.width, props.height);
-layoutView.SetInnerHtml(getHtmlStr(libPath, props.latexStr, props.fontSize, props.width, props.height, props.color));
-let innerViewId = Forge.sViewStore.add(new Forge.ViewInfo(layoutView));
+layoutView.SetInnerHtml(
+  getHtmlStr(
+    "https://qcast-image.oss-cn-qingdao.aliyuncs.com/JsViewTestResource/DocResource/mathjax-tex-svg.txt",
+    props.latexStr,
+    props.fontSize,
+    props.width,
+    props.height,
+    props.color
+  )
+);
+innerViewId.value = Forge.sViewStore.add(new Forge.ViewInfo(layoutView));
+
+onBeforeUnmount(() => {
+  if (innerViewId.value != -1) {
+    Forge.sViewStore.remove(innerViewId.value);
+    innerViewId.value = -1;
+    console.log("success remove innerview");
+  }
+});
 </script>
 <template>
   <div

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/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/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");
     }
   },
 };