@shijiu/jsview-vue 0.9.283-alpha.0 → 0.9.291-alpha.0

package/dom/target_core_revision.js

@@ -3,10 +3,10 @@
  */
 
 const TargetRevision = {
-  "CoreRevision": 810895,
-  "JseRevision": "1.0.772",
+  "CoreRevision": 810953,
+  "JseRevision": "1.0.774",
   "JseUrl":
-	"http://cdn.release.qcast.cn/forge_js/master/JsViewES6_react_r772.jsv.91a55796.js"
+	"http://cdn.release.qcast.cn/forge_js/master/JsViewES6_react_r774.jsv.dfae49bd.js"
 };
 
 // 不要用export default，update-env脚本不能解析

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview-vue",
-  "version": "0.9.283-alpha.0",
+  "version": "0.9.291-alpha.0",
   "bin": {
     "jsview-post-build": "./scripts/jsview-post-build.js",
     "jsview-post-install": "./scripts/jsview-post-install.js",

package/patches/node_modules/@vue/compiler-sfc/dist/jsview-css-to-js.js

@@ -210,7 +210,9 @@ function compileAndSaveImportedNode(styleFilePath, styleNodes) {
     let styleContent = "";
 
     styleNodes.forEach(node => {
-        if(!!node.selector) {
+        if(node.name === "keyframes") {
+            styleContent += compileKeyframesNode(node);
+        } else if(!!node.selector) {
             styleContent += compileSelectorNode(node);
             styleSelectors.add(node.selector);
         } else {
@@ -237,13 +239,39 @@ function compileAndSaveImportedNode(styleFilePath, styleNodes) {
     };
 }
 
+function getStringOffset(source, line, column) {
+    check(!isNaN(line), source, "JsView Error: Failed to get string offset, line is NaN.");
+    check(!isNaN(column), source, "JsView Error: Failed to get string offset, column is NaN.");
+
+    line -= 1;
+    column -= 1;
+
+    var offset = 0;
+    for (var idx = 0; idx < line; idx++) {
+        offset = source.indexOf('\n', offset + 1);
+        check(offset >= 0, source, "JsView Error: Failed to get string offset, line=" + line + ", column=" + column);
+    }
+    offset += column;
+
+    return offset;
+}
+
 function compileKeyframesNode(node) {
     const name = node.name;
     check(name, node.source.input.css, "JsView Error: name is not found!");
 
     check(name === "keyframes", node.source.input.css, "JsView Error: @keyframes name is not found!");
 
-    const content = node.source.input.css.slice(node.source.start.offset, node.source.end.offset + 1);
+    let startOffset = node.source.start.offset;
+    let endOffset = node.source.end.offset;
+    if (typeof (startOffset) == 'undefined') {
+        startOffset = getStringOffset(node.source.input.css, node.source.start.line, node.source.start.column);
+    }
+    if (typeof (endOffset) == 'undefined') {
+        endOffset = getStringOffset(node.source.input.css, node.source.end.line, node.source.end.column);
+    }
+    const content = node.source.input.css.slice(startOffset, endOffset + 1);
+    // console.log('jsview-css-to-js.compileKeyframesNode() \n', startOffset, endOffset, content);
 
     let styleContent = "'" + node.params + "':'";
     styleContent += content.replace(/\n/g, " ");

package/utils/JsViewVueWidget/JsvNativeSharedDiv.vue

@@ -48,12 +48,14 @@ export default {
     );
 
     // 更新宽高
-    this.jsvMainView.ResetLayoutParams({
-      width: this.style.width,
-      height: this.style.height,
-    });
+    if(typeof this.jsvMainView!="undefined" && this.jsvMainView){
+      this.jsvMainView.ResetLayoutParams({
+        width: this.style.width,
+        height: this.style.height,
+      });
 
-    this.getId?.(this.jsvMainView?.GetTrackId());
+      this.getId?.(this.jsvMainView?.GetTrackId());
+    }
   },
   beforeUnmount() {
     if(this.isBrowserDebug) {
@@ -69,10 +71,12 @@ export default {
   },
   updated() {
     // 更新宽高
-    this.jsvMainView.ResetLayoutParams({
-      width: this.style.width,
-      height: this.style.height,
-    });
+    if(typeof this.jsvMainView!="undefined" && this.jsvMainView){
+      this.jsvMainView.ResetLayoutParams({
+        width: this.style.width,
+        height: this.style.height,
+      });
+    }
   }
 };
 </script>
@@ -84,7 +88,7 @@ export default {
   >
     <slot/>
   </div> <div v-else
-    :style="{...style, backgroundColor: '#000000'}"
+    :style="{...style}"
   >
     <slot/>
   </div>

package/utils/JsViewVueWidget/JsvPosterDiv.vue

@@ -0,0 +1,19 @@
+<!--
+ * @Author: ChenChanghua
+ * @Date: 2021-12-27 10:02:13
+ * @LastEditors: ChenChanghua
+ * @LastEditTime: 2021-12-31 11:03:18
+ * @Description: file content
+-->
+<script>
+export default {
+  //不让根元素继承style，以导致多画一个图片。同时注意slot和div的位置
+  inheritAttrs: false,
+};
+</script>
+<template>
+  <div>
+    <slot></slot>
+    <div jsv_enable_fade="true" jsv_poster_on_top="true" v-bind="$attrs" />
+  </div>
+</template>

package/utils/JsViewVueWidget/JsvPosterImage.vue

@@ -0,0 +1,31 @@
+<!--
+ * @Author: ChenChanghua
+ * @Date: 2021-12-27 10:02:20
+ * @LastEditors: ChenChanghua
+ * @LastEditTime: 2021-12-27 10:07:25
+ * @Description: file content
+-->
+<script>
+export default {
+  props: {
+    colorSpace: {
+      type: String,
+      default: "RGBA_8888",
+    },
+  },
+  inheritAttrs: false,
+};
+</script>
+
+<template>
+  <div>
+    <slot></slot>
+    <img
+      jsv_enable_fade="true"
+      jsv_poster_on_top="true"
+      jsv_img_scaledown_tex="true"
+      :jsv_img_color_space="{ colorSpace }"
+      v-bind="$attrs"
+    />
+  </div>
+</template>

package/utils/JsViewVueWidget/JsvPreload/JsvPreload.vue

@@ -263,7 +263,6 @@ export default {
         if (!state) return;
       }
       if (this.$props.onDownloadDone) {
-        console.log("zhang $props downloadStateList =",this.downloadStateList)
         this.$props.onDownloadDone(this.downloadStateList);
       }
     },
@@ -286,12 +285,13 @@ export default {
             "Error:format mismatch, data should comes from function buildDownloadInfo()"
           );
         }
+        console.log(`OnDownload get${index} url=${item.url}`)
         const base_url = item.url;
         let image_url = base_url;
         if (base_url && base_url.indexOf("http") < 0) {
           // 包含http和https两种请求
-          if (window.JsView.React.UrlRef) {
-            image_url = new window.JsView.React.UrlRef(base_url).href;
+          if (window.JsView.Dom.UrlRef) {
+            image_url = new window.JsView.Dom.UrlRef(base_url).href;
           }
         }
         const texture =
@@ -303,7 +303,7 @@ export default {
         return;
       }
       const callback_token = texture.RegisterLoadImageCallback(null, (texture_info) => {
-        console.log("zhang texture_info =",texture_info);
+        console.log(`OnDownload done index${index}`)
         this.downloadStateList[index] = texture_info.extra.absolutePath;
         this._checkDownload();
       });

package/utils/JsViewVueWidget/JsvSwiper/JsvSwiper.vue

@@ -2,7 +2,7 @@
  * @Author: ChenChanghua
  * @Date: 2021-11-23 09:42:26
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2021-12-02 15:47:26
+ * @LastEditTime: 2022-01-04 16:42:36
  * @Description: file content
 -->
 <script>
@@ -233,7 +233,7 @@ export default {
       this.timeoutHandler = -1;
     },
     startAutoplay() {
-      if (this.autoplayInterval > 0) {
+      if (this.autoplayInterval > 0 && this.totalFrame > 1) {
         if (this.timeoutHandler > 0) {
           clearTimeout(this.timeoutHandler);
         }
@@ -360,6 +360,7 @@ export default {
       }
     },
     _trigger(direction) {
+      if (this.totalFrame <= 1) return;
       this.preOffset = this.offset;
       this.offset += direction;
       this._startAnimation();
@@ -385,7 +386,16 @@ export default {
       onKeyDown: _onKeyDown,
     }"
   >
+    <div v-if="totalFrame == 1">
+      <slot
+        name="itemView"
+        :currentIndex="0"
+        :dataIndex="0"
+        :focused="focused"
+      ></slot>
+    </div>
     <div
+      v-else
       :style="{
         width: layoutInfo.width,
         height: layoutInfo.height,

package/utils/JsViewVueWidget/JsvVideo.vue

@@ -16,7 +16,6 @@ import { Options, Vue } from "vue-class-component";
   props: {
     onRef: { type: Function, default: () => {} },
     useTexture: { type: Boolean, default: false },
-    autoplay: { type: String, default: undefined },
   },
 })
 class JsvVideo extends Vue {