@shijiu/jsview-vue 1.9.650 → 1.9.720

package/utils/JsViewVueWidget/JsvNativeSharedDiv.vue

@@ -7,42 +7,51 @@
  *                                 例如`${window.JsView?.getJsContextId()}_${you_name}`
  -->
 
- <script>
-import { Forge, ForgeExtension } from "../../dom/jsv-forge-define";
+<script>
+import { Forge, ForgeExtension } from "../../../jsview/dom/jsv-forge-define";
 
 export default {
   props: {
     style: {
       type: Object,
-      default: () => { return {} }
+      default: () => {
+        return {};
+      },
     },
     getId: Function,
     setId: String,
+    seeThrough: {
+      type: Boolean,
+      default: true,
+    },
   },
   setup() {
     return {
       isBrowserDebug: window.jsvIsBrowserDebug,
       jsvMainView: undefined,
       innerViewId: undefined,
-    }
+    };
   },
   beforeMount() {
-    if(this.isBrowserDebug) {
+    if (this.isBrowserDebug) {
       return;
     }
 
     // 初始化View
 
     // 创建JsView图层穿透的texture，抠洞处理
-    const seeThroughTexture = ForgeExtension.TextureManager.GetColorTexture(
-      "rgba(0,0,0,0)"
-    );
-    const textureSetting = new Forge.TextureSetting(
-      seeThroughTexture,
-      null,
-      null,
-      false
-    );
+    // 默认为扣洞，有的场景不需要扣洞
+    let textureSetting = null;
+    if (this.seeThrough) {
+      const seeThroughTexture =
+        ForgeExtension.TextureManager.GetColorTexture("rgba(0,0,0,0)");
+      textureSetting = new Forge.TextureSetting(
+        seeThroughTexture,
+        null,
+        null,
+        false
+      );
+    }
 
     // 通过内置函数构造定制的NativeSharedView
     this.jsvMainView = new Forge.NativeSharedView(textureSetting);
@@ -51,7 +60,7 @@ export default {
     );
 
     // 更新宽高
-    if(typeof this.jsvMainView!="undefined" && this.jsvMainView){
+    if (typeof this.jsvMainView != "undefined" && this.jsvMainView) {
       if (this.setId) {
         // 使用设置进来的track id，而非自动生成
         this.jsvMainView.SetTrackId(this.setId);
@@ -61,7 +70,7 @@ export default {
     }
   },
   beforeUnmount() {
-    if(this.isBrowserDebug) {
+    if (this.isBrowserDebug) {
       return;
     }
 
@@ -75,21 +84,20 @@ export default {
 };
 </script>
 
- <template>
-  <div v-if="!isBrowserDebug"
+<template>
+  <div
+    v-if="!isBrowserDebug"
     :style="{
-      left: style.left, 
+      left: style.left,
       top: style.top,
       width: style.width,
-      height: style.height
-      }"
+      height: style.height,
+    }"
     :jsv_innerview="innerViewId"
   >
-    <slot/>
-  </div> <div v-else
-    :style="{...style}"
-  >
-    <slot/>
+    <slot />
+  </div>
+  <div v-else :style="{ ...style }">
+    <slot />
   </div>
 </template>
-

package/utils/JsViewVueWidget/JsvNinePatch.vue

@@ -44,7 +44,6 @@ export default {
       if (!this.waitForInit) {
         return true;
       }
-
       return this.style && this.style.width !== 0 && this.style.height !== 0;
     },
     getTransition() {
@@ -79,7 +78,7 @@ export default {
 
 <template>
   <div
-    v-if="isReady"
+    v-if="isReady()"
     :style="{
       ...style,
       transition: getTransition(),

package/utils/JsViewVueWidget/JsvPreload/JsvPreload.vue

@@ -7,8 +7,8 @@
  *                                  列表的内容可以是图片，音频等任何网络资源，下载后缓存在本地，归入本地缓存管理(LRU清理策略)
  *      onPreloading {Function(float percent)}: 预加载中回调，返回预加载进度
  *      onPreloadDone {Function(sizeArray)}: 预加载完成回调，sizeArray(格式Object[])，每个的格式为{width, height}
- *      onDownloadDone {Function(pathesArray)}: 预下载完成回调,pathesArray(格式为String[])为下载好回调的地址, 
- *                                         其中pathesArray为存储位置的路径列表
+ *      onDownloadDone {Function(pathesArray, extra)}: 预下载完成回调,pathesArray(格式为String[])为下载好回调的地址, 
+ *                                         其中pathesArray为存储位置的路径列表, extra为额外信息(目前只有下载图片时的尺寸)
  *
  * 注意事项:
  *      指定加载时的尺寸(0为不指定)，与img标签中的 jsv_img_scaledown_tex 属性一起使用
@@ -34,7 +34,7 @@
  *        net_setting {object}:  (未实现)网络加载参数，cookie, refer等，默认值 null
  -->
 <script>
-import { Forge, ForgeExtension } from "../../../dom/jsv-forge-define";
+import { Forge, ForgeExtension } from "../../../../jsview/dom/jsv-forge-define";
 
 const CONST_FORMAT_TOKEN = "_JsvP_";
 const buildPreloadInfo = (
@@ -54,10 +54,11 @@ const buildPreloadInfo = (
   };
 };
 
-const buildDownloadInfo = (url, net_setting = null) => {
+const buildDownloadInfo = (url, net_setting = null, get_image_size) => {
   return {
     url,
     netSetting: net_setting,
+    getImageSize: get_image_size,
     magicToken: CONST_FORMAT_TOKEN, // 用于格式校验
   };
 };
@@ -79,6 +80,7 @@ export default {
       downloadViewList: [],
       preloadStateList: [],
       downloadStateList: [],
+      downloadResultMap: {},
       preloadResultMap: {},
       CONST_FORMAT_TOKEN: "_JsvP_",
       preloadIsNullNum: 0, // 纪录传入的preload为null的数量，由于vue不支持在子组件修改props值，所有在删除值为null时，需要++，这样才能保证与传入数据的length相等从而触发回调
@@ -136,29 +138,6 @@ export default {
       }
     },
 
-    // shouldComponentUpdate(nextProps, nextState) {
-    //     if (
-    //         nextProps.preloadList.length === this.preloadList.length &&
-    //         nextProps.downloadList.length === this.downloadList.length
-    //     ) {
-    //     let same = true;
-    //     for (let i = 0; i < nextProps.preloadList.length; i++) {
-    //         if (nextProps.preloadList[i].url !== this.preloadList[i].url) {
-    //             same = false;
-    //             break;
-    //         }
-    //     }
-    //     for (let i = 0; i < nextProps.downloadList.length; i++) {
-    //         if (nextProps.downloadList[i].url !== this.downloadList[i].url) {
-    //             same = false;
-    //             break;
-    //         }
-    //     }
-    //     return !same;
-    //     }
-    //     return true;
-    // },
-
     _checkPreload() {
       let loadedNum = 0;
       this.preloadStateList.forEach((state) => {
@@ -261,7 +240,10 @@ export default {
         if (!state) return;
       }
       if (this.$props.onDownloadDone) {
-        this.$props.onDownloadDone(this.downloadStateList);
+        this.$props.onDownloadDone(
+          this.downloadStateList,
+          this.downloadResultMap
+        );
       }
     },
 
@@ -269,7 +251,6 @@ export default {
       if (!this.downloadList) {
         return;
       }
-      this.downloadStateList = new Array(this.downloadList.length).fill(null);
       // 直接在map前将url为null的值清除掉
       let downloadListData = this.downloadList;
       for (let i = 0; i < downloadListData.length; i++) {
@@ -277,13 +258,14 @@ export default {
           downloadListData.splice(i, 1);
         }
       }
+      this.downloadStateList = new Array(downloadListData.length).fill(null);
       this.downloadViewList = downloadListData.map((item, index) => {
         if (item.magicToken !== this.CONST_FORMAT_TOKEN) {
           console.error(
             "Error:format mismatch, data should comes from function buildDownloadInfo()"
           );
         }
-        console.log(`OnDownload get${index} url=${item.url}`)
+        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) {
@@ -292,19 +274,33 @@ export default {
             image_url = new window.JsView.Dom.UrlRef(base_url).href;
           }
         }
-        const texture =
-          ForgeExtension.TextureManager.GetDownloadTexture(image_url);
+        const texture = ForgeExtension.TextureManager.GetDownloadTexture(
+          image_url,
+          null,
+          item.getImageSize
+        );
         if (!texture) {
-        console.error("Error: Down view build texture failed for " + image_url);
-        // 无法创建texture的图片先认为加载完成
-        this.downloadStateList[index] = "invalid";
-        return;
-      }
-      const callback_token = texture.RegisterLoadImageCallback(null, (texture_info) => {
-        console.log(`OnDownload done index${index}`)
-        this.downloadStateList[index] = texture_info.extra.absolutePath;
-        this._checkDownload();
-      });
+          console.error(
+            "Error: Down view build texture failed for " + image_url
+          );
+          // 无法创建texture的图片先认为加载完成
+          this.downloadStateList[index] = "invalid";
+          return;
+        }
+        const callback_token = texture.RegisterLoadImageCallback(
+          null,
+          (texture_info) => {
+            console.log(`OnDownload done index${index}`);
+            this.downloadStateList[index] = texture_info.extra.absolutePath;
+            if (item.getImageSize && texture_info.extra.width && texture_info.extra.height) {
+              this.downloadResultMap[texture_info.extra.absolutePath] = {
+                width: texture_info.extra.width,
+                height: texture_info.extra.height,
+              };
+            }
+            this._checkDownload();
+          }
+        );
         if (texture.EnableBackgroundLoad) {
           texture.EnableBackgroundLoad(this);
         }

package/utils/JsViewVueWidget/JsvQrcode/JsvQrcode.vue

@@ -16,7 +16,7 @@
  */
  -->
  <script>
-import { Forge, ForgeExtension } from "../../../dom/jsv-forge-define";
+import { Forge, ForgeExtension } from "../../../../jsview/dom/jsv-forge-define";
 
 export default {
   props: {

package/utils/JsViewVueWidget/JsvSpray/JsvSpray.vue

@@ -32,7 +32,7 @@
  *      enableShrink {boolean} 粒子缩小开关, 默认为false
 -->
 <script>
-import { Forge, ForgeExtension } from "../../../dom/jsv-forge-define";
+import { Forge, ForgeExtension } from "../../../../jsview/dom/jsv-forge-define";
 
 let buildForgeView = (pointRes, sprayStyle, sizeRef) => {
   if (!pointRes) {

package/utils/JsViewVueWidget/JsvSwiper/JsvSwiper.vue

@@ -30,12 +30,13 @@
 -->
 
 <script>
-import { Forge } from "../../../dom/jsv-forge-define";
+import { Forge } from "../../../../jsview/dom/jsv-forge-define";
 import JsvActorMove, {
   JsvActorMoveControl,
-} from "jsview/utils/JsViewVueWidget/JsvActorMove";
+} from "../../JsViewVueWidget/JsvActorMove";
+import JsvVisibleSensor from "../../JsViewVueWidget/JsvVisibleSensor";
 import Indicator from "./Indicator.vue";
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
 
 const VIEW_NUM = 3;
 
@@ -50,7 +51,7 @@ function modToRange(value, mod, start = 0) {
 }
 
 export default {
-  components: { Indicator, JsvActorMove },
+  components: { Indicator, JsvActorMove, JsvVisibleSensor },
   props: {
     showIndicator: {
       type: Boolean,
@@ -127,7 +128,7 @@ export default {
     reverseSwipe: {
       type: Boolean,
       default: false,
-    }
+    },
   },
   computed: {
     indicatorLayout() {
@@ -369,12 +370,12 @@ export default {
       curViewAnimation.SetAnimationListener(
         new Forge.AnimationListener(null, this._onAnimationEnd, null)
       );
-      this.$refs["element" + this.currentViewIndex]?.jsvMaskView.StartAnimation(
+      this.$refs["element" + this.currentViewIndex]?.jsvGetProxyView(true).StartAnimation(
         curViewAnimation
       );
       this.$refs[
         "element" + modToRange(this.currentViewIndex - direction, VIEW_NUM)
-      ]?.jsvMaskView.StartAnimation(preViewAnimation);
+      ]?.jsvGetProxyView(true).StartAnimation(preViewAnimation);
     },
     _startSmoothTranslateAnimation() {
       let curController = this.controllerList[this.currentViewIndex];
@@ -407,6 +408,13 @@ export default {
       this.offset += direction;
       this._startAnimation(direction > 0 ? 1 : -1);
     },
+    onBeVisible(old_h, new_h, old_v, new_v) {
+      if ((old_h && !new_h) || (old_v && !new_h)) {
+        this.stopAutoplay();
+      } else if ((!old_h && new_h) || (!old_v && new_h)) {
+        this.startAutoplay();
+      }
+    },
   },
   mounted() {
     if (!this.focused) {
@@ -420,6 +428,14 @@ export default {
 </script>
 
 <template>
+  <jsv-visible-sensor
+    :horizonShown="0.2"
+    :verticalShown="0.2"
+    :width="layoutInfo.width"
+    :height="layoutInfo.height"
+    :enable="true"
+    :callback="onBeVisible"
+  ></jsv-visible-sensor>
   <jsv-focus-block
     :name="name"
     :onAction="{
@@ -544,4 +560,4 @@ export default {
       </div>
     </div>
   </jsv-focus-block>
-</template>
+</template>

package/utils/JsViewVueWidget/JsvSwiper3D/JsvSwiper.vue

@@ -28,7 +28,8 @@
 
 <script>
 import Indicator from "./Indicator.vue";
-import { ref } from "vue";
+import { ref, shallowRef } from "vue";
+import JsvVisibleSensor from "jsview/utils/JsViewVueWidget/JsvVisibleSensor";
 
 const VIEW_NUM = 4;
 
@@ -45,7 +46,7 @@ function modToRange(value, mod, start = 0) {
 window.modToRange = modToRange;
 
 export default {
-  components: { Indicator },
+  components: { Indicator, JsvVisibleSensor },
   props: {
     showIndicator: {
       type: Boolean,
@@ -124,7 +125,7 @@ export default {
     reverseSwipe: {
       type: Boolean,
       default: false,
-    }
+    },
   },
   computed: {
     indicatorLayout() {
@@ -320,6 +321,10 @@ export default {
         }, this.autoplayInterval);
       }
     },
+    _stopAutoPlay() {
+      clearInterval(this.intervalHandler);
+      this.intervalHandler = -1;
+    },
     _onFocus() {
       this.focused = true;
       clearInterval(this.intervalHandler);
@@ -330,6 +335,13 @@ export default {
       this._enableAutoplay();
       this.onBlur?.();
     },
+    onBeVisible(old_h, new_h, old_v, new_v) {
+      if ((old_h && !new_h) || (old_v && !new_h)) {
+        this._stopAutoPlay();
+      } else if ((!old_h && new_h) || (!old_v && new_h)) {
+        this._enableAutoplay();
+      }
+    },
   },
   created() {
     this._enableAutoplay();
@@ -338,6 +350,14 @@ export default {
 </script>
 
 <template>
+  <jsv-visible-sensor
+    :horizonShown="0.2"
+    :verticalShown="0.2"
+    :width="layoutInfo.widgetWidth"
+    :height="layoutInfo.widgetHeight"
+    :enable="true"
+    :callback="onBeVisible"
+  ></jsv-visible-sensor>
   <jsv-focus-block
     :name="name"
     :onAction="{

package/utils/JsViewVueWidget/JsvTextBox.vue

@@ -6,106 +6,40 @@
  * JsvTextBox：Vue高阶组件，文字的垂直对齐方式显示控件
  *      props说明:
  *          verticalAlign {string}  垂直对齐方式 (必需) top、middle、bottom
- *          stylesList {array}    布局样式(必需)，数组中可包含样式对象或者JsvStyleClass，或者JsvTextStyleClass对象，
- *                                  样式对象内容为{left:0, top:0, width:xxx, height:xxx}，
- *                                  布局样式为数组中所有样式的合并。
- *          styleToken {string}     类似于react html元素的key，当style变化时，由使用者改变此Token通知hoc进行style重新识别。
- *                                  Token不变的场景，props变化不会引起render，以提高渲染性能
+ *          style {object}          样式(必需)
  *          enableLatex {bool}     是否启用Latex文字描画模式
 -->
 
-<script>
-import {
-  JsvTextStyleClass,
-  combinedStyles,
-} from "jsview/utils/JsViewVueTools/JsvStyleClass.js";
+<script setup>
+import { ref, shallowRef, computed } from "vue";
 
-let sAreaAlignStyleMap = new Map();
-export default {
-  props: {
-    styleToken: String,
-    stylesList: Object,
-    verticalAlign: {
-      type: String,
-      default: "middle",
-    },
-    lineAlign: {
-      type: String,
-      default: "middle",
-    },
-    enableLatex: Boolean,
+const props = defineProps({
+  style: Object,
+  verticalAlign: {
+    type: String,
+    default: "middle",
   },
-  data() {
-    return {
-      styleCombined: null,
-      styleClasses: null,
-      tokenProcesses: null,
-    };
+  lineAlign: {
+    type: String,
+    default: "middle",
   },
-  beforeMount() {
-    if (this.styleToken !== this.tokenProcesses) {
-      // Token变化时，重新解析style array
-      const style_set = combinedStyles(
-        this.stylesList,
-        !window.JsvDisableReactWrapper // 无ReactWrapper时，全解析style属性
-      );
+  enableLatex: Boolean,
+  className: String,
+});
 
-      this.styleCombined = style_set.combinedStyle;
-      // console.log("styleCombined = ", this.styleCombined);
-      if (!window.JsvDisableReactWrapper) {
-        this.styleClasses = style_set.combinedClass;
-        let key = this.verticalAlign + "_" + this.lineAlign;
-        if (!sAreaAlignStyleMap.has(key)) {
-          const text_class = new JsvTextStyleClass({});
-          text_class.setVerticalAlign(this.verticalAlign);
-          text_class.setLineAlign(this.lineAlign);
-          sAreaAlignStyleMap.set(key, text_class);
-        }
-        const va_set_class = sAreaAlignStyleMap.get(key);
-        if (this.styleClasses.length === 0) {
-          this.styleClasses += va_set_class.getName();
-        } else {
-          this.styleClasses = this.styleClasses + " " + va_set_class.getName();
-        }
-      }
-      this.tokenProcesses = this.styleToken;
-    }
-  },
-  methods: {
-    isJsvDisableReactWrapper() {
-      if (window.JsvDisableReactWrapper) {
-        return true;
-      }
-      return false;
-    },
-  },
-};
 </script>
 
 <template>
   <div>
-    <div v-if="isJsvDisableReactWrapper()" :style="styleCombined">
-      <div :style="{ position: 'static', display: 'table' }">
-        <div
-          :style="{
-            position: 'static',
-            display: 'table-cell',
-            width: styleCombined.width,
-            height: styleCombined.height,
-            verticalAlign: verticalAlign,
-          }"
-        >
-          <slot></slot>
-        </div>
-      </div>
-    </div>
     <div
-      v-else
-      :className="styleClasses"
-      :style="{ ...styleCombined }"
+      :className="className"
+      :style="style"
       :jsv_text_latex_enable="enableLatex ? 'true' : ''"
+      :jsv_text_vertical_align="verticalAlign"
+      :jsv_text_line_align="lineAlign"
+      jsv-inherit-class="1"
     >
       <slot></slot>
     </div>
   </div>
-</template>
+</template>

package/utils/JsViewVueWidget/JsvTextureAnim/JsvTextureAnim.vue

@@ -2,11 +2,11 @@
  * @Author: ChenChanghua
  * @Date: 2022-02-07 14:21:37
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-08-23 11:33:56
+ * @LastEditTime: 2022-08-24 13:18:21
  * @Description: file content
 -->
 <script>
-import { Forge, ForgeExtension } from "../../../dom/jsv-forge-define";
+import { Forge, ForgeExtension } from "../../../../jsview/dom/jsv-forge-define";
 import {
   numberCheckSet,
   urlCheckSet,
@@ -117,11 +117,6 @@ export default {
       type: Object,
     },
   },
-  data() {
-    return {
-      test: 0,
-    }
-  },
   watch: {
     texCoord: {
       handler(newValue, oldValue) {
@@ -203,7 +198,6 @@ export default {
       if (decorate_setting.url) {
         let converted_url = urlCheckSet(decorate_setting.url);
         let view_texture = textureManager.GetImage2(converted_url);
-
         nine_patch_view.EnableAlphaMix(view_texture);
       } else {
         console.error("ninepatch url not set");
@@ -308,7 +302,6 @@ export default {
         "RGB_8888",
         null
       );
-
       // 1.1 兼容border转为decorate
       let decorate = this.$props.decorate;
       if (this.$props.borderRadius) {

package/utils/JsViewVueWidget/JsvTouchContainer.vue

@@ -2,11 +2,11 @@
  * @Author: ChenChanghua
  * @Date: 2022-04-10 20:46:53
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-04-10 23:07:54
+ * @LastEditTime: 2022-11-07 14:43:44
  * @Description: file content
 -->
 <script>
-import { Forge } from "../../dom/jsv-forge-define";
+import { Forge } from "../../../jsview/dom/jsv-forge-define";
 
 const DIRECTION_HORIZONTAL = Forge.DragSetting.DIRECTION_HORIZONTAL;
 const DIRECTION_VERTICAL = Forge.DragSetting.DIRECTION_VERTICAL;
@@ -66,9 +66,8 @@ export default {
   },
   created() {},
   mounted() {
-    if (this.$refs.touchContainer && this.$refs.touchContainer.jsvMaskView) {
-      const view = this.$refs.touchContainer.jsvMaskView;
-      const view_lp = view.GetLayoutParams();
+    const view = this.$refs.touchContainer?.jsvGetProxyView(true);
+    if (view) {
       const page_width = this.flingPageWidth;
       const page_edge = this.flingPageEdge;
       const direction = this.direction;
@@ -80,13 +79,13 @@ export default {
             x: 0,
             y: 0,
             width: page_width,
-            height: view_lp.Height,
+            height: this.$refs.touchContainer.style.height,
           };
         } else {
           drag_limit_area = {
             x: 0,
             y: 0,
-            width: view_lp.Width,
+            width: this.$refs.touchContainer.style.width,
             height: page_width,
           };
         }

package/utils/JsViewVueWidget/JsvTransparentDiv.vue

@@ -7,7 +7,7 @@
 -->
 
 <script>
-import { Forge, ForgeExtension } from "../../dom/jsv-forge-define";
+import { Forge, ForgeExtension } from "../../../jsview/dom/jsv-forge-define";
 
 export default {
   inheritAttrs: false,