@shijiu/jsview-vue 1.9.839 → 1.9.841

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview-vue",
-  "version": "1.9.839",
+  "version": "1.9.841",
   "license": "MIT",
   "repository": "system/jsview-framework",
   "author": "mengxk",

package/utils/JsViewPlugin/JsvPlayer/index.js

@@ -5,6 +5,7 @@ import { getJsvPlayerCapabilitySet as getCapabilitySet } from "./JsvMedia.js"
 import { setJsvPlayerDebugMode as setDebugMode } from "./JsvMedia.js"
 import { getJsvPlayerRunningNum as getRunningPlayerNum } from "./JsvMedia.js"
 import { globalLoadSetOperator as setOperator } from"./JsvMedia.js"
+import { JsvWidgetWrapperGroup } from '../../JsViewVueWidget/BrowserDebugWidget/WidgetWrapper.js';
 let _JsvPlayer = JsvPlayer;
 
 let globalLoadJsvPlayerPlugin = initPlugin;
@@ -15,7 +16,6 @@ let globalLoadSetOperator = setOperator;
 
 if (window.jsvIsBrowserDebug) {
     // 浏览器版本
-    const { JsvWidgetWrapperGroup } = await import('../../JsViewVueWidget/BrowserDebugWidget/WidgetWrapper.js');
     _JsvPlayer = JsvWidgetWrapperGroup.BrowserJsvPlayer;
 
     // 为Browser重新定义初始化处理

package/utils/JsViewVueWidget/BrowserDebugWidget/BrowserTextureAnim.vue

@@ -102,7 +102,13 @@ export default {
     },
   },
   setup() {
-    let styleShell = getKeyFramesGroup();
+    let styleShell = ref({})
+    // 此处异步import为了处理在fadoration中导致的两个js互相import而加载异常问题。
+    load = async function () {
+      const getKeyFramesGroup = await import("../../JsViewVueTools");
+      styleShell = getKeyFramesGroup();
+    }
+    load();
     return {
       styleShell,
       animName: "browser-texture-anim-" + TOKEN++,

package/utils/JsViewVueWidget/BrowserDebugWidget/WidgetLoader.js

@@ -0,0 +1,27 @@
+/*
+ * @Author: ChenChanghua
+ * @Date: 2021-10-13 15:19:49
+ * @LastEditors: ChenChanghua
+ * @LastEditTime: 2022-02-08 13:32:54
+ * @Description: file content
+ */
+// import { JsvWidgetWrapperGroup } from "./WidgetWrapper";
+//考虑到.vue文件除了import default的component外，还有可能import其他对象,因此使用import * as
+import BrowserApic from "./JsvApic/BrowserApic.vue";
+import BrowserSpray from "./BrowserSpray.vue";
+import BrowserPreload from "./BrowserPreload.vue";
+import BrowserQrcode from "./BrowserQrcode.vue";
+import BrowserTextureAnim from "./BrowserTextureAnim.vue";
+import BrowserJsvPlayer from "../../JsViewPlugin/JsvPlayer/JsvPlayerBrowser.vue";
+
+export {
+  BrowserApic,
+  BrowserSpray,
+  BrowserPreload,
+  BrowserQrcode,
+  BrowserTextureAnim,
+
+  BrowserJsvPlayer,
+}
+
+console.log("JsView Utils: Load browser widgets.");

package/utils/JsViewVueWidget/BrowserDebugWidget/WidgetWrapper.js

@@ -2,26 +2,9 @@
  * Created by ludl on 5/13/21.
  */
 
-import BrowserApic from "./JsvApic/BrowserApic.vue";
-import BrowserSpray from "./BrowserSpray.vue";
-import BrowserPreload from "./BrowserPreload.vue";
-import BrowserQrcode from "./BrowserQrcode.vue";
-import BrowserTextureAnim from "./BrowserTextureAnim.vue";
-import BrowserJsvPlayer from "../../JsViewPlugin/JsvPlayer/JsvPlayerBrowser.vue";
-
-if (!window.jsvIsBrowserDebug) {
-  throw new Error('WidgetWrapper Error: Only support import it on Browser.')
+let JsvWidgetWrapperGroup = {};
+if (window.jsvIsBrowserDebug) {
+  JsvWidgetWrapperGroup = await import('./WidgetLoader');
 }
-console.log("JsView Utils: Load browser widgets.");
-
-const JsvWidgetWrapperGroup = {
-  BrowserApic,
-  BrowserSpray,
-  BrowserPreload,
-  BrowserQrcode,
-  BrowserTextureAnim,
-
-  BrowserJsvPlayer,
-};
 
 export { JsvWidgetWrapperGroup };

package/utils/JsViewVueWidget/JsvApic/index.js

@@ -6,10 +6,10 @@
  * @Description: file content
  */
 //考虑到.vue文件除了export default的component外，还有可能export其他对象,因此使用import * as
+import { JsvWidgetWrapperGroup } from "../BrowserDebugWidget/WidgetWrapper";
 import * as JsvApic from "./JsvApic.vue";
 let _JsvApic = JsvApic.default;
 if (window.jsvIsBrowserDebug) {
-  const { JsvWidgetWrapperGroup } = await import("../BrowserDebugWidget/WidgetWrapper");
   _JsvApic = JsvWidgetWrapperGroup.BrowserApic;
 }
 let component = _JsvApic;

package/utils/JsViewVueWidget/JsvPreload/index.js

@@ -6,10 +6,10 @@
  * @Description: file content
  */
 //考虑到.vue文件除了export default的component外，还有可能export其他对象,因此使用import * as
+import { JsvWidgetWrapperGroup } from "../BrowserDebugWidget/WidgetWrapper";
 import * as JsvPreload from "./JsvPreload.vue";
 let _JsvPreload = JsvPreload.default;
 if (window.jsvIsBrowserDebug) {
-  const { JsvWidgetWrapperGroup } = await import("../BrowserDebugWidget/WidgetWrapper");
   _JsvPreload = JsvWidgetWrapperGroup.BrowserPreload;
 }
 let component = _JsvPreload;

package/utils/JsViewVueWidget/JsvQrcode/index.js

@@ -6,10 +6,10 @@
  * @Description: file content
  */
 //考虑到.vue文件除了export default的component外，还有可能export其他对象,因此使用import * as
+import { JsvWidgetWrapperGroup } from "../BrowserDebugWidget/WidgetWrapper";
 import * as JsvQrcode from "./JsvQrcode.vue";
 let _JsvQrcode = JsvQrcode.default;
 if (window.jsvIsBrowserDebug) {
-  const { JsvWidgetWrapperGroup } = await import("../BrowserDebugWidget/WidgetWrapper");
   _JsvQrcode = JsvWidgetWrapperGroup.BrowserQrcode;
 }
 let component = _JsvQrcode;

package/utils/JsViewVueWidget/JsvSpray/index.js

@@ -6,10 +6,10 @@
  * @Description: file content
  */
 //考虑到.vue文件除了export default的component外，还有可能export其他对象,因此使用import * as
+import { JsvWidgetWrapperGroup } from "../BrowserDebugWidget/WidgetWrapper";
 import * as JsvSpray from "./JsvSpray.vue";
 let _JsvSpray = JsvSpray.default;
 if (window.jsvIsBrowserDebug) {
-  const { JsvWidgetWrapperGroup } = await import("../BrowserDebugWidget/WidgetWrapper");
   _JsvSpray = JsvWidgetWrapperGroup.BrowserSpray;
 }
 let component = _JsvSpray;

package/utils/JsViewVueWidget/JsvTextureAnim/index.js

@@ -6,10 +6,10 @@
  * @Description: file content
  */
 //考虑到.vue文件除了export default的component外，还有可能export其他对象,因此使用import * as
+import { JsvWidgetWrapperGroup } from "../BrowserDebugWidget/WidgetWrapper";
 import * as JsvTextureAnim from "./JsvTextureAnim.vue";
 let _JsvTextureAnim = JsvTextureAnim.default;
 if (window.jsvIsBrowserDebug) {
-  const { JsvWidgetWrapperGroup } = await import("../BrowserDebugWidget/WidgetWrapper");
   _JsvTextureAnim = JsvWidgetWrapperGroup.BrowserTextureAnim;
 }