@shijiu/jsview-vue 1.9.888 → 1.9.921

package/utils/JsViewVueWidget/JsvPosterDiv.vue

@@ -38,8 +38,8 @@ watchEffect(()=>{
   <div :style="common_style">
     <slot></slot>
     <div
-      jsv_enable_fade="true"
-      jsv_poster_on_top="true"
+      data-jsv-vw-enable-fade="true"
+      data-jsv-vw-mask-poster-on-top="true"
       :style="image_style"
       v-bind="$attrs"
     />

package/utils/JsViewVueWidget/JsvPosterImage.vue

@@ -41,10 +41,10 @@ watchEffect(()=>{
   <div :style="common_style">
     <slot></slot>
     <img
-      jsv_enable_fade="true"
-      jsv_poster_on_top="true"
-      jsv_img_scaledown_tex="true"
-      :jsv_img_color_space="colorSpace"
+      data-jsv-vw-enable-fade="true"
+      data-jsv-vw-mask-poster-on-top="true"
+      data-jsv-img-scaledown-tex="true"
+      :data-jsv-img-color-space="colorSpace"
       :style="image_style"
       v-bind="$attrs"
     />

package/utils/JsViewVueWidget/JsvPreload/JsvPreload.vue

@@ -104,7 +104,7 @@ export default {
                   view_info.callToken
                 );
               }
-              ForgeExtension.RootActivity.ViewStore.remove(id);
+              Forge.sViewStore.remove(id);
             }
           }
           this.preloadViewList = [];
@@ -125,7 +125,7 @@ export default {
                   view_info.callToken
                 );
               }
-              ForgeExtension.RootActivity.ViewStore.remove(id);
+              Forge.sViewStore.remove(id);
             }
           }
           this.downloadViewList = [];
@@ -177,8 +177,8 @@ export default {
         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;
           }
         }
         let target_size = null;
@@ -226,7 +226,7 @@ export default {
         const texture_setting = new Forge.ExternalTextureSetting(texture);
         const preload_view = new Forge.PreloadView(texture_setting);
         return {
-          viewId: ForgeExtension.RootActivity.ViewStore.add(
+          viewId: Forge.sViewStore.add(
             new Forge.ViewInfo(preload_view)
           ),
           textureRef: texture,
@@ -308,7 +308,7 @@ export default {
         const preload_view = new Forge.PreloadView(texture_setting);
 
         return {
-          viewId: ForgeExtension.RootActivity.ViewStore.add(
+          viewId: Forge.sViewStore.add(
             new Forge.ViewInfo(preload_view)
           ),
           textureRef: texture,
@@ -331,10 +331,10 @@ export default {
 <template>
   <div>
     <div v-for="item in preloadViewList" :key="item.viewId" :id="item.viewId">
-      <div v-if="item.viewId" :jsv_innerview="item.viewId"></div>
+      <div v-if="item.viewId" :data-jsv-vw-innerview="item.viewId"></div>
     </div>
     <div v-for="item in downloadViewList" :key="item.viewId" :id="item.viewId">
-      <div v-if="item.viewId" :jsv_innerview="item.viewId"></div>
+      <div v-if="item.viewId" :data-jsv-vw-innerview="item.viewId"></div>
     </div>
   </div>
 </template>

package/utils/JsViewVueWidget/JsvQrcode/JsvQrcode.vue

@@ -73,7 +73,7 @@ export default {
       if (this.imageSettings && calculatedImageSettings) {
         let url = this.imageSettings.src;
         if (typeof url === "string") {
-          url = new window.JsView.React.UrlRef(this.imageSettings.src).href;
+          url = new window.JsView.Dom.UrlRef(this.imageSettings.src).href;
         }
         const img_texture = texture_manager.GetImage(url);
         const img_view = new Forge.LayoutView(
@@ -115,7 +115,7 @@ export default {
     };
     if (this.jsvBaseView === null) {
       this.jsvBaseView = new Forge.LayoutView();
-      this.innerViewId = ForgeExtension.RootActivity.ViewStore.add(
+      this.innerViewId = Forge.sViewStore.add(
         new Forge.ViewInfo(this.jsvBaseView)
       );
     }
@@ -135,7 +135,7 @@ export default {
   },
   mounted() {
     if (this.innerViewId !== -1) {
-      ForgeExtension.RootActivity.ViewStore.remove(this.innerViewId);
+      Forge.sViewStore.remove(this.innerViewId);
       this.innerViewId = -1;
       this.jsvBaseView = null;
     }
@@ -144,6 +144,6 @@ export default {
 </script>
 
  <template>
-  <div :jsv_innerview="innerViewId"></div>
+  <div :data-jsv-vw-innerview="innerViewId"></div>
 </template>
 

package/utils/JsViewVueWidget/JsvScaleTextBox.vue

@@ -22,7 +22,7 @@ export default {
 </script>
 
 <template>
-  <div :jsv_text_definition="definitionScale">
+  <div :data-jsv-vw-text-definition="definitionScale">
     <slot></slot>
   </div>
 </template>

package/utils/JsViewVueWidget/JsvSoundPool.js

@@ -166,7 +166,7 @@ class JsvSoundPool {
     let realUrl;
     if (window.JsView) {
       // jsview上
-      realUrl = new window.JsView.React.UrlRef(url).href;
+      realUrl = new window.JsView.Dom.UrlRef(url).href;
     } else {
       realUrl = url;
     }

package/utils/JsViewVueWidget/JsvSpray/JsvSpray.vue

@@ -1,8 +1,6 @@
 <!--
  * @Author: ChenChanghua
  * @Date: 2021-10-12 18:20:43
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-11-25 18:26:40
  * @Description: file content
 -->
 
@@ -50,14 +48,14 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
     let image_url = base_url;
     if (base_url && base_url.indexOf("http") === 0) {
       image_url = base_url;
-    } else if (window.JsView.React.UrlRef) {
-      image_url = new window.JsView.React.UrlRef(pointRes).href;
+    } else if (window.JsView.Dom.UrlRef) {
+      image_url = new window.JsView.Dom.UrlRef(pointRes).href;
     }
     texture_setting = new Forge.ExternalTextureSetting(
       texture_manager.GetImage2(image_url, false, null, "RGB_8888", null)
     );
   }
-  const spray_view = new Forge.SprayView(texture_setting, ignoreClip);
+  const spray_view = new Forge.SprayView(texture_setting);
   const add_num_per_frame = sprayStyle.addNumSpeed
     ? sprayStyle.addNumSpeed
     : 0.001;
@@ -83,7 +81,8 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
     accelerate_x,
     accelerate_y,
     sprayStyle.enableFade,
-    sprayStyle.enableShrink
+    sprayStyle.enableShrink,
+    ignoreClip
   );
   const view_width =
     sprayStyle.deltaWidth === 0 ? 1 : 2 * sprayStyle.deltaWidth;
@@ -91,9 +90,7 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
     sprayStyle.deltaHeight === 0 ? 1 : 2 * sprayStyle.deltaHeight;
   sizeRef.width = view_width;
   sizeRef.height = view_height;
-  return ForgeExtension.RootActivity.ViewStore.add(
-    new Forge.ViewInfo(spray_view)
-  );
+  return Forge.sViewStore.add(new Forge.ViewInfo(spray_view, null));
 };
 
 export default {
@@ -109,13 +106,13 @@ export default {
     ignoreClip: {
       type: Boolean,
       default: false,
-    }
+    },
   },
   data() {
     return {
       size: {
         width: 0,
-        height: 0
+        height: 0,
       },
       viewId: -1,
     };
@@ -123,7 +120,7 @@ export default {
   methods: {
     unloadView() {
       if (this.viewId != -1) {
-        ForgeExtension.RootActivity.ViewStore.remove(this.viewId);
+        Forge.sViewStore.remove(this.viewId);
         this.viewId = -1;
       }
     },
@@ -142,7 +139,8 @@ export default {
 </script>
 
 <template>
-  <div 
-    :style="{width: size.width, height: size.height}"
-    :jsv_innerview="viewId"></div>
+  <div
+    :style="{ width: size.width, height: size.height }"
+    :data-jsv-vw-innerview="viewId"
+  ></div>
 </template>

package/utils/JsViewVueWidget/JsvSpriteAnim/JsvSpriteAnim.vue

@@ -117,8 +117,8 @@ export default {
         this.stopFrame = stopFrame;
         this.blinkAnim = null;
         this.blinkAnimCache = null;
-        this.transform_style = this._AnalyzeProp();
         this.sAnimationToken = 0;
+        this.transform_style = this._AnalyzeProp();
     },
 
     unmounted() {

package/utils/JsViewVueWidget/JsvSwiper/JsvSwiper.vue

@@ -30,13 +30,13 @@
 -->
 
 <script>
-import { Forge } from "@shijiu/jsview/dom/jsv-forge-define"
+import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
 import JsvActorMove, {
   JsvActorMoveControl,
-} from "../../JsViewVueWidget/JsvActorMove";
-import JsvVisibleSensor from "../../JsViewVueWidget/JsvVisibleSensor";
+} from "jsview/utils/JsViewVueWidget/JsvActorMove";
+import JsvVisibleSensor from "jsview/utils/JsViewVueWidget/JsvVisibleSensor";
 import Indicator from "./Indicator.vue";
-import { ref, shallowRef } from "vue";
+import { ref } from "vue";
 
 const VIEW_NUM = 3;
 
@@ -370,10 +370,12 @@ export default {
       curViewAnimation.SetAnimationListener(
         new Forge.AnimationListener(null, this._onAnimationEnd, null)
       );
-      this.$refs.element?.[this.currentViewIndex]?.jsvGetProxyView(true).StartAnimation(
-        curViewAnimation
-      );
-      this.$refs.element?.[modToRange(this.currentViewIndex - direction, VIEW_NUM)]?.jsvGetProxyView(true).StartAnimation(preViewAnimation);
+      this.$refs.element[this.currentViewIndex]
+        ?.jsvGetProxyView(true)
+        .StartAnimation(curViewAnimation);
+      this.$refs.element[modToRange(this.currentViewIndex - direction, VIEW_NUM)]
+        ?.jsvGetProxyView(true)
+        .StartAnimation(preViewAnimation);
     },
     _startSmoothTranslateAnimation() {
       let curController = this.controllerList[this.currentViewIndex];
@@ -426,61 +428,62 @@ 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="{
-      onFocus: _onFocus,
-      onBlur: _onBlur,
-      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,
-        overflow: 'hidden',
+  <div>
+    <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="{
+        onFocus: _onFocus,
+        onBlur: _onBlur,
+        onKeyDown: _onKeyDown,
       }"
     >
+      <div v-if="totalFrame == 1">
+        <slot
+          name="itemView"
+          :currentIndex="0"
+          :dataIndex="0"
+          :focused="focused"
+        ></slot>
+      </div>
       <div
+        v-else
         :style="{
-          zIndex: 0,
+          width: layoutInfo.width,
+          height: layoutInfo.height,
+          overflow: 'hidden',
         }"
       >
-        <div v-if="smoothTranslate">
-          <jsv-actor-move
-            v-for="(item, index) in viewInfoList"
-            :key="index"
-            :style="item.style"
-            :control="controllerList[index]"
-          >
-            <!-- 为了保证slot中的页面刷新。不加这个div slot中的img标签不会更新，vue或者是dom的bug？ -->
-            <div :key="item.dataIndex">
-              <slot
-                name="itemView"
-                :currentIndex="currentDataIndex"
-                :dataIndex="item.dataIndex"
-                :focused="focused"
-              ></slot>
-            </div>
+        <div
+          :style="{
+            zIndex: 0,
+          }"
+        >
+          <div v-if="smoothTranslate">
+            <jsv-actor-move
+              v-for="(item, index) in viewInfoList"
+              :key="index"
+              :style="item.style"
+              :control="controllerList[index]"
+            >
+              <!-- 为了保证slot中的页面刷新。不加这个div slot中的img标签不会更新，vue或者是dom的bug？ -->
+              <div :key="item.dataIndex">
+                <slot
+                  name="itemView"
+                  :currentIndex="currentDataIndex"
+                  :dataIndex="item.dataIndex"
+                  :focused="focused"
+                ></slot>
+              </div>
 
-            <!-- <div
+              <!-- <div
               :style="{
                 width: 50,
                 height: 50,
@@ -490,26 +493,26 @@ export default {
             >
               {{ index }}
             </div> -->
-          </jsv-actor-move>
-        </div>
-        <div v-else>
-          <div
-            v-for="(item, index) in viewInfoList"
-            :key="index"
-            :style="item.style"
-            ref="element"
-          >
-            <!-- 为了保证slot中的页面刷新。不加这个div slot中的img标签不会更新，vue或者是dom的bug？ -->
-            <div :key="item.dataIndex">
-              <slot
-                name="itemView"
-                :currentIndex="currentDataIndex"
-                :dataIndex="item.dataIndex"
-                :focused="focused"
-              ></slot>
-            </div>
+            </jsv-actor-move>
+          </div>
+          <div v-else>
+            <div
+              v-for="(item, index) in viewInfoList"
+              :key="index"
+              :style="item.style"
+              ref="element"
+            >
+              <!-- 为了保证slot中的页面刷新。不加这个div slot中的img标签不会更新，vue或者是dom的bug？ -->
+              <div :key="item.dataIndex">
+                <slot
+                  name="itemView"
+                  :currentIndex="currentDataIndex"
+                  :dataIndex="item.dataIndex"
+                  :focused="focused"
+                ></slot>
+              </div>
 
-            <!-- <div
+              <!-- <div
             :style="{
               width: 50,
               height: 50,
@@ -519,43 +522,44 @@ export default {
           >
             {{ index + " " + item.dataIndex }}
           </div> -->
+            </div>
           </div>
         </div>
-      </div>
 
-      <div v-if="showIndicator" :style="indicatorLayout">
-        <indicator
-          :number="totalFrame"
-          :current="currentDataIndex"
-          :itemSize="indicatorDotSize"
-          :vertical="vertical"
-        >
-          <template #current>
-            <slot name="indicatorCur">
-              <div
-                :style="{
-                  width: 10,
-                  height: 10,
-                  backgroundColor: 'rgba(50, 50, 50, 1.0)',
-                  borderRadius: '5px',
-                }"
-              ></div>
-            </slot>
-          </template>
-          <template #normal>
-            <slot name="indicatorNor">
-              <div
-                :style="{
-                  width: 10,
-                  height: 10,
-                  backgroundColor: 'rgba(100, 100, 100, 0.7)',
-                  borderRadius: '5px',
-                }"
-              ></div>
-            </slot>
-          </template>
-        </indicator>
+        <div v-if="showIndicator" :style="indicatorLayout">
+          <indicator
+            :number="totalFrame"
+            :current="currentDataIndex"
+            :itemSize="indicatorDotSize"
+            :vertical="vertical"
+          >
+            <template #current>
+              <slot name="indicatorCur">
+                <div
+                  :style="{
+                    width: 10,
+                    height: 10,
+                    backgroundColor: 'rgba(50, 50, 50, 1.0)',
+                    borderRadius: '5px',
+                  }"
+                ></div>
+              </slot>
+            </template>
+            <template #normal>
+              <slot name="indicatorNor">
+                <div
+                  :style="{
+                    width: 10,
+                    height: 10,
+                    backgroundColor: 'rgba(100, 100, 100, 0.7)',
+                    borderRadius: '5px',
+                  }"
+                ></div>
+              </slot>
+            </template>
+          </indicator>
+        </div>
       </div>
-    </div>
-  </jsv-focus-block>
-</template>
+    </jsv-focus-block>
+  </div>
+</template>

package/utils/JsViewVueWidget/JsvSwiper3D/JsvSwiper.vue

@@ -28,7 +28,7 @@
 
 <script>
 import Indicator from "./Indicator.vue";
-import { ref, shallowRef } from "vue";
+import { ref } from "vue";
 import JsvVisibleSensor from "jsview/utils/JsViewVueWidget/JsvVisibleSensor";
 
 const VIEW_NUM = 4;

package/utils/JsViewVueWidget/JsvTextBox.vue

@@ -8,11 +8,10 @@
  *          verticalAlign {string}  垂直对齐方式 (必需) top、middle、bottom
  *          style {object}          样式(必需)
  *          enableLatex {bool}     是否启用Latex文字描画模式
- *          textDirection {string} 内容文字的方向, 默认是unset, 此时会根据第一个字符的语言确定文字是ltr还是rtl
 -->
 
 <script setup>
-import { ref, shallowRef, computed } from "vue";
+import { ref, computed } from "vue";
 
 const props = defineProps({
   style: Object,
@@ -24,31 +23,54 @@ const props = defineProps({
     type: String,
     default: "middle",
   },
-  enableLatex: {
-    type: Boolean,
-    default: false,
-  },
+  enableLatex: Boolean,
   className: String,
-  textDirection: {
-    type: String,
-    default: "unset",
-  },
 });
 
+const innerStyle = computed(() => {
+  let result = { ...props.style };
+  if (!result.verticalAlign) {
+    result.verticalAlign = props.verticalAlign;
+  }
+  if (!result.lineAlign) {
+    result.lineAlign = props.lineAlign;
+  }
+  return result;
+});
+const disable = window.JsvDisableReactWrapper;
 </script>
 
 <template>
   <div>
+    <div v-if="disable" :style="style">
+      <div :style="{ position: 'static', display: 'table' }">
+        <div
+          :className="className"
+          :style="{
+            position: 'static',
+            display: 'table-cell',
+            width: style.width,
+            height: style.height,
+            verticalAlign: verticalAlign,
+          }"
+          jsv-inherit-class="2"
+        >
+          <slot></slot>
+        </div>
+      </div>
+    </div>
     <div
+      v-else
       :className="className"
-      :style="style"
-      :jsv_text_latex_enable="enableLatex ? 'true' : ''"
-      :jsv_text_vertical_align="verticalAlign"
-      :jsv_text_line_align="lineAlign"
-      :jsv_text_inner_direction="textDirection"
+      :style="{
+        ...style,
+        JsvTextLatex: enableLatex ? 1 : 0,
+        JsvTextVerticalAlign: verticalAlign,
+        JsvTextLineAlign: lineAlign,
+      }"
       jsv-inherit-class="1"
     >
       <slot></slot>
     </div>
   </div>
-</template>
+</template>