@shijiu/jsview-vue 1.9.921 → 1.9.943-next-vue.0

package/package.json

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

package/utils/JsViewVueTools/ForgeHandles.js

@@ -0,0 +1,13 @@
+let handles = {
+    TextureManager: null,
+    RootView: null,
+    RootActivity: null
+}
+
+window.JsvCode.ForgeHandles.listenToReady(()=>{
+    handles.TextureManager = window.JsvCode.ForgeHandles.TextureManager;
+    handles.RootView = window.JsvCode.ForgeHandles.RootView;
+    handles.RootActivity = window.JsvCode.ForgeHandles.RootActivity;    
+})
+
+export default handles;

package/utils/JsViewVueWidget/JsvApic/JsvApic.vue

@@ -20,7 +20,7 @@
  *          play(): 开始播放
 -->
 <script>
-import { ForgeExtension } from "@shijiu/jsview/dom/jsv-forge-define";
+import ForgeHandles from "../../JsViewVueTools/ForgeHandles";
 
 let LOOP_DEFAULT = 0;
 let LOOP_INFINITE = 1;
@@ -69,7 +69,7 @@ export default {
     play() {
       if (this.$refs.element) {
         let mainViewTexture = this.$refs.element.jsvGetProxyTexture(
-          ForgeExtension.TextureManager
+          ForgeHandles.TextureManager
         );
 
         let params = {
@@ -93,7 +93,7 @@ export default {
     stop() {
       if (this.$refs.element) {
         let mainViewTexture = this.$refs.element.jsvGetProxyTexture(
-          ForgeExtension.TextureManager
+          ForgeHandles.TextureManager
         );
         mainViewTexture.DispatchCommand(Forge.NativeConstant.APIC_STOP, "");
       }
@@ -106,7 +106,7 @@ export default {
     if (this.onLoad) {
       if (this.$refs.element) {
         let mainViewTexture = this.$refs.element.jsvGetProxyTexture(
-          ForgeExtension.TextureManager
+          ForgeHandles.TextureManager
         );
         mainViewTexture.RegisterLoadImageCallback(null, this.onLoad, null);
       }
@@ -116,7 +116,7 @@ export default {
     this.stop();
     if (this.$refs.element) {
       let mainViewTexture = this.$refs.element.jsvGetProxyTexture(
-        ForgeExtension.TextureManager
+        ForgeHandles.TextureManager
       );
 
       if (this.onStart) {

package/utils/JsViewVueWidget/JsvInput/JsvInput.vue

@@ -6,7 +6,7 @@
 -->
 <script>
 import { EdgeDirection } from "jsview/utils/JsViewEngineWidget";
-import { Forge, ForgeExtension } from "@shijiu/jsview/dom/jsv-forge-define";
+import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
 import CursorVue from "./Cursor.vue";
 
 const InputType = {

package/utils/JsViewVueWidget/JsvMaskClipDiv.vue

@@ -13,6 +13,7 @@
 -->
 <script>
 import { Forge, ForgeExtension } from "@shijiu/jsview/dom/jsv-forge-define";
+import ForgeHandles from "../JsViewVueTools/ForgeHandles";
 export default {
   props: {
     class: {

package/utils/JsViewVueWidget/JsvNativeSharedDiv.vue

@@ -8,7 +8,8 @@
  -->
 
 <script>
-import { Forge, ForgeExtension } from "@shijiu/jsview/dom/jsv-forge-define";
+import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
+import ForgeHandles from "../JsViewVueTools/ForgeHandles";
 
 export default {
   props: {
@@ -44,7 +45,7 @@ export default {
     let textureSetting = null;
     if (this.seeThrough) {
       const seeThroughTexture =
-        ForgeExtension.TextureManager.GetColorTexture("rgba(0,0,0,0)");
+      ForgeHandles.TextureManager.GetColorTexture("rgba(0,0,0,0)");
       textureSetting = new Forge.TextureSetting(
         seeThroughTexture,
         null,
@@ -55,7 +56,7 @@ export default {
 
     // 通过内置函数构造定制的NativeSharedView
     this.jsvMainView = new Forge.NativeSharedView(textureSetting);
-    this.innerViewId = ForgeExtension.RootActivity.ViewStore.add(
+    this.innerViewId = ForgeHandles.RootActivity.ViewStore.add(
       new Forge.ViewInfo(this.jsvMainView)
     );
 
@@ -76,7 +77,7 @@ export default {
 
     // 清理View管理缓存
     if (this.innerViewId !== -1) {
-      ForgeExtension.RootActivity.ViewStore.remove(this.innerViewId);
+      ForgeHandles.RootActivity.ViewStore.remove(this.innerViewId);
       this.innerViewId = -1;
       this.jsvMainView = null;
     }

package/utils/JsViewVueWidget/JsvNinePatch.vue

@@ -16,64 +16,77 @@
  *          waitForInit {boolean}  (选填)尺寸为0时是否进行描画(例如: 首次显示不展示动画的场合，设置为true),默认值为true
 -->
 
-<script>
-export default {
-  name: "JsvNinePatch",
-  props: {
-    style: {
-      type: Object,
-      default: () => {
-        return {};
-      },
-    },
-    top: { type: Number, default: 0 },
-    left: { type: Number, default: 0 },
-    waitForInit: { type: Boolean, default: true },
-
-    imageUrl: { type:String, required: true },
-    imageWidth: { type:Number, required: true },
-    imageDspWidth: { type:Number, default:0 },
-    contentWidth: { type:Number, default: -1},
-    centerWidth: { type:Number, default: -1, required: true },
-    borderOutset: { type:Number, required: true },
-    animTime: Number,
-  },
+<script setup>
+import { ref, watchEffect, computed } from "vue";
 
-  methods: {
-    isReady() {
-      if (!this.waitForInit) {
-        return true;
-      }
-      return this.style && this.style.width !== 0 && this.style.height !== 0;
-    },
-    getTransition() {
-      let transition = "";
-      if (this.animTime) {
-        transition = `left ${this.animTime}s, top ${this.animTime}s, width ${this.animTime}s, height ${this.animTime}s`;
-      }
-
-      return transition;
+const props = defineProps({
+  style: {
+    type: Object,
+    default: () => {
+      return {};
     },
   },
+  top: { type: Number, default: 0 },
+  left: { type: Number, default: 0 },
+  waitForInit: { type: Boolean, default: true },
 
-  data() {
-    let center_width = (this.contentWidth >= 0 ? this.contentWidth : 0); // 兼容处理，contentWidth变更为centerWidth
-    if (this.centerWidth >= 0) {
-      center_width = this.centerWidth;
-    }
+  imageUrl: { type: String, required: true },
+  imageWidth: { type: Number, required: true },
+  imageDspWidth: { type: Number, default: 0 },
+  contentWidth: { type: Number, default: -1 },
+  centerWidth: { type: Number, default: -1, required: true },
+  borderOutset: { type: Number, required: true },
+  animTime: { type: Number, default: 0 },
+});
 
-    // slice_width 获取
-    let slice_width = Math.ceil(Math.max(0, (this.imageWidth - center_width) / 2));
+const isReady = () => {
+  if (!props.waitForInit) {
+    return true;
+  }
+  return props.style && props.style.width !== 0 && props.style.height !== 0;
+};
 
-    let image_dsp_width = this.imageDspWidth > 0 ? this.imageDspWidth : this.imageWidth;
+const getTransition = () => {
+  let transition = "";
+  if (props.animTime && props.animTime > 0) {
+    transition = `left ${props.animTime}s, top ${props.animTime}s, width ${props.animTime}s, height ${props.animTime}s`;
+  }
 
-    return {
-      sliceWidth: slice_width,
-      borderDspWidth: Math.ceil(slice_width * image_dsp_width / this.imageWidth), // 跟进图片的缩放信息
-      convertedBorderOutset: Math.ceil(this.borderOutset * image_dsp_width / this.imageWidth),
-    };
-  },
+  return transition;
 };
+
+let centerWidth = props.contentWidth >= 0 ? props.contentWidth : 0; // 兼容处理，contentWidth变更为centerWidth
+if (props.centerWidth >= 0) {
+  centerWidth = props.centerWidth;
+}
+
+const imageDspWidthInner = computed(() =>
+  props.imageDspWidth > 0 ? props.imageDspWidth : props.imageWidth
+);
+// slice_width 获取
+const sliceWidth = ref(
+  Math.ceil(Math.max(0, (props.imageWidth - centerWidth) / 2))
+);
+const borderDspWidth = ref(
+  Math.ceil((sliceWidth.value * imageDspWidthInner.value) / props.imageWidth)
+);
+const convertedBorderOutset = ref(
+  Math.ceil((props.borderOutset * imageDspWidthInner.value) / props.imageWidth)
+);
+
+watchEffect(() => {
+  if (
+    (props.style?.width && props.style.width <= imageDspWidthInner.value) ||
+    (props.style?.height && props.style.height <= imageDspWidthInner.value)
+  ) {
+    console.warn(
+      "JsvNinePatch: style size must be larger than imageDspWidth. style is",
+      props.style,
+      "imageDspWidth is",
+      imageDspWidthInner.value
+    );
+  }
+});
 </script>
 
 <template>
@@ -88,6 +101,3 @@ export default {
     }"
   />
 </template>
-
-<style scoped>
-</style>

package/utils/JsViewVueWidget/JsvPreload/JsvPreload.vue

@@ -34,7 +34,8 @@
  *        net_setting {object}:  (未实现)网络加载参数，cookie, refer等，默认值 null
  -->
 <script>
-import { Forge, ForgeExtension } from "@shijiu/jsview/dom/jsv-forge-define";
+import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
+import ForgeHandles from "../../JsViewVueTools/ForgeHandles";
 
 const CONST_FORMAT_TOKEN = "_JsvP_";
 const buildPreloadInfo = (
@@ -191,9 +192,9 @@ export default {
           (image_url.toLowerCase().indexOf(".webp") >= 0 ||
             image_url.toLowerCase().indexOf(".gif") >= 0)
         ) {
-          texture = ForgeExtension.TextureManager.GetGifImage(image_url, false);
+          texture = ForgeHandles.TextureManager.GetGifImage(image_url, false);
         } else {
-          texture = ForgeExtension.TextureManager.GetImage2(
+          texture = ForgeHandles.TextureManager.GetImage2(
             image_url,
             false,
             target_size,
@@ -274,7 +275,7 @@ export default {
             image_url = new window.JsView.Dom.UrlRef(base_url).href;
           }
         }
-        const texture = ForgeExtension.TextureManager.GetDownloadTexture(
+        const texture = ForgeHandles.TextureManager.GetDownloadTexture(
           image_url,
           null,
           item.getImageSize

package/utils/JsViewVueWidget/JsvQrcode/JsvQrcode.vue

@@ -16,7 +16,8 @@
  */
  -->
  <script>
-import { Forge, ForgeExtension } from "@shijiu/jsview/dom/jsv-forge-define";
+import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
+import ForgeHandles from "../../JsViewVueTools/ForgeHandles";
 
 export default {
   props: {
@@ -57,7 +58,7 @@ export default {
 
       let view = null;
       let lp_params = null;
-      const texture_manager = ForgeExtension.TextureManager;
+      const texture_manager = ForgeHandles.TextureManager;
       const qrcode_texture = texture_manager.GetQRCodeTexture(
         this.value,
         this.size,

package/utils/JsViewVueWidget/JsvSpray/JsvSpray.vue

@@ -29,15 +29,20 @@
  *      addNumSpeed {float} 持续喷射时，起始粒子添加速度(个/ms), 默认为0.001
  *      enableFade {boolean} 粒子淡出开关, 默认为false
  *      enableShrink {boolean} 粒子缩小开关, 默认为false
+ *      angularVelocityMin {float} 角速度最小值, 默认为0
+ *      angularVelocityMax {float} 角速度最大值, 默认为0
+ *      alphaMin {float} 透明度最小值, 默认为1
+ *      alphaMax {float} 透明度最大值, 默认为1
 -->
 <script>
-import { Forge, ForgeExtension } from "@shijiu/jsview/dom/jsv-forge-define";
+import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
+import ForgeHandles from "../../JsViewVueTools/ForgeHandles";
 
 let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
   if (!pointRes) {
     return -1;
   }
-  const texture_manager = ForgeExtension.TextureManager;
+  const texture_manager = ForgeHandles.TextureManager;
   let texture_setting;
   if (pointRes.trim().startsWith("#") || pointRes.trim().startsWith("rgba")) {
     texture_setting = new Forge.TextureSetting(
@@ -65,6 +70,24 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
     typeof sprayStyle.accelerateY !== "undefined"
       ? sprayStyle.accelerateY
       : -100;
+  let angularVelocityMin = 0,
+    angularVelocityMax = 0;
+  if (
+    typeof sprayStyle.angularVelocityMin === "number" &&
+    typeof sprayStyle.angularVelocityMax === "number"
+  ) {
+    angularVelocityMin = sprayStyle.angularVelocityMin;
+    angularVelocityMax = sprayStyle.angularVelocityMax;
+  }
+  let alphaMin = 1,
+    alphaMax = 1;
+  if (
+    typeof sprayStyle.alphaMin === "number" &&
+    typeof sprayStyle.alphaMax === "number"
+  ) {
+    alphaMin = sprayStyle.alphaMin;
+    alphaMax = sprayStyle.alphaMax;
+  }
   spray_view.SetSprayInfo(
     sprayStyle.type,
     sprayStyle.particleNum,
@@ -82,7 +105,11 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
     accelerate_y,
     sprayStyle.enableFade,
     sprayStyle.enableShrink,
-    ignoreClip
+    ignoreClip,
+    angularVelocityMin,
+    angularVelocityMax,
+    alphaMin,
+    alphaMax
   );
   const view_width =
     sprayStyle.deltaWidth === 0 ? 1 : 2 * sprayStyle.deltaWidth;
@@ -126,11 +153,21 @@ export default {
     },
   },
   created() {
-    this.viewId = buildForgeView(this.pointRes, this.sprayStyle, this.size, this.ignoreClip);
+    this.viewId = buildForgeView(
+      this.pointRes,
+      this.sprayStyle,
+      this.size,
+      this.ignoreClip
+    );
   },
   updated() {
     this.unloadView();
-    this.viewId = buildForgeView(this.pointRes, this.sprayStyle, this.size, this.ignoreClip);
+    this.viewId = buildForgeView(
+      this.pointRes,
+      this.sprayStyle,
+      this.size,
+      this.ignoreClip
+    );
   },
   beforeUnmount() {
     this.unloadView();

package/utils/JsViewVueWidget/JsvTextureAnim/JsvTextureAnim.vue

@@ -6,7 +6,8 @@
  * @Description: file content
 -->
 <script>
-import { Forge, ForgeExtension } from "@shijiu/jsview/dom/jsv-forge-define";
+import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
+import ForgeHandles from "../../JsViewVueTools/ForgeHandles";
 import {
   numberCheckSet,
   urlCheckSet,
@@ -194,7 +195,7 @@ export default {
     },
 
     _createNinePatchAlphaMixView(view_texture, decorate_setting) {
-      const textureManager = ForgeExtension.TextureManager;
+      const textureManager = ForgeHandles.TextureManager;
 
       // NinePatch alpha mix view
       let texture_set = new Forge.ExternalTextureSetting(view_texture);
@@ -298,7 +299,7 @@ export default {
 
   created() {
     if (window.JsView) {
-      const textureManager = ForgeExtension.TextureManager;
+      const textureManager = ForgeHandles.TextureManager;
 
       // 1.获得主view的展示内容图片 texture
       let image_url = urlCheckSet(this.src);

package/utils/JsViewVueWidget/JsvTransparentDiv.vue

@@ -7,7 +7,8 @@
 -->
 
 <script>
-import { Forge, ForgeExtension } from "@shijiu/jsview/dom/jsv-forge-define";
+import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
+import ForgeHandles from "../JsViewVueTools/ForgeHandles";
 
 export default {
   inheritAttrs: false,
@@ -29,8 +30,7 @@ export default {
         // 初始化View
 
         // 创建JsView图层穿透的texture，抠洞处理
-        const seeThroughTexture =
-          ForgeExtension.TextureManager.GetColorTexture("rgba(0,0,0,0)");
+        const seeThroughTexture = ForgeHandles.TextureManager.GetColorTexture("rgba(0,0,0,0)");
         const textureSetting = new Forge.TextureSetting(
           seeThroughTexture,
           null,
@@ -40,7 +40,7 @@ export default {
 
         // 通过内置函数构造定制的LayoutView
         this.innerView = new Forge.LayoutView(textureSetting);
-        this.innerViewId = ForgeExtension.RootActivity.ViewStore.add(
+        this.innerViewId = ForgeHandles.RootActivity.ViewStore.add(
           new Forge.ViewInfo(this.innerView)
         );
       }
@@ -54,7 +54,7 @@ export default {
   },
   beforeUnmount() {
     if (this.innerViewId !== -1) {
-      ForgeExtension.RootActivity.ViewStore.remove(this.innerViewId);
+      ForgeHandles.RootActivity.ViewStore.remove(this.innerViewId);
       this.innerViewId = -1;
       this.innerView = null;
     }