@shijiu/jsview-vue 1.9.888 → 1.9.921

package/utils/JsViewVueWidget/JsvTextureAnim/JsvTextureAnim.vue

@@ -1,12 +1,12 @@
 <!--
  * @Author: ChenChanghua
  * @Date: 2022-02-07 14:21:37
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-08-24 13:18:21
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2023-02-13 13:27:12
  * @Description: file content
 -->
 <script>
-import { Forge, ForgeExtension } from "@shijiu/jsview/dom/jsv-forge-define"
+import { Forge, ForgeExtension } from "@shijiu/jsview/dom/jsv-forge-define";
 import {
   numberCheckSet,
   urlCheckSet,
@@ -90,7 +90,7 @@ export default {
     left: Number,
     width: Number,
     height: Number,
-    borderRadius: String,
+    borderRadius: [String, Number],
     decorate: Object,
     animation: String,
     duration: Number,
@@ -129,7 +129,6 @@ export default {
     return {
       forgeAnimation: null,
       innerViewId: -1,
-      viewStoreRef: null,
     };
   },
   methods: {
@@ -147,7 +146,15 @@ export default {
     },
 
     _readRadius(setting) {
-      if (setting) {
+      if (typeof setting == "number") {
+        return {
+          type: DECORATE_BORDER_RADIUS,
+          topLeft: setting,
+          topRight: setting,
+          bottomRight: setting,
+          bottomLeft: setting,
+        };
+      } else if (typeof setting == "string" && setting.length > 0) {
         const pattern = /\d+/g;
         let match = setting.match(pattern);
         if (match.length > 0) {
@@ -337,18 +344,15 @@ export default {
       }
 
       // 5. inner view标准处理
-      this.viewStoreRef = ForgeExtension.RootActivity
-        ? ForgeExtension.RootActivity.ViewStore
-        : Forge.sViewStore;
 
-      this.innerViewId = this.viewStoreRef.add(
+      this.innerViewId = Forge.sViewStore.add(
         new Forge.ViewInfo(this.innerView)
       );
     }
   },
   beforeUnmount() {
     if (this.innerViewId !== -1) {
-      this.viewStoreRef.remove(this.innerViewId);
+      Forge.sViewStore.remove(this.innerViewId);
       this.innerViewId = -1;
     }
   },
@@ -369,6 +373,6 @@ export default {
       height: height,
       transition: getTransition(),
     }"
-    :jsv_innerview="innerViewId"
+    :data-jsv-vw-innerview="innerViewId"
   ></div>
 </template>

package/utils/JsViewVueWidget/JsvTransparentDiv.vue

@@ -25,7 +25,7 @@ export default {
   },
   methods: {
     _updateInnerView() {
-      if (this.innerView === null && !this.html) {
+      if (this.innerView === null) {
         // 初始化View
 
         // 创建JsView图层穿透的texture，抠洞处理

package/utils/JsViewVueWidget/JsvVisibleSensor/JsvVisibleSensor.vue

@@ -29,8 +29,8 @@
 </template>
 
 <script setup>
-import { Forge } from "@shijiu/jsview/dom/jsv-forge-define"
-import { reactive, ref, shallowRef, toRaw, watchEffect, onMounted } from 'vue'
+import { reactive, ref, toRaw, watchEffect, onMounted } from 'vue'
+import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
 
 const props = defineProps({
     // (支持reactive)可视区域设定
@@ -69,7 +69,7 @@ const props = defineProps({
 });
 
 // 内部状态变量
-const viewRef = shallowRef(null);
+const viewRef = ref(null);
 const viewMounted = reactive({status: false})
 let sensorRef = null;
 

package/utils/JsViewVueWidget/JsvVisibleSensor/index.js

@@ -2,8 +2,5 @@
 import * as JsvVisibleSensor from "./JsvVisibleSensor.vue";
 
 let _JsvVisibleSensor = JsvVisibleSensor;
-// if (window.JsvWidgetWrapperGroup && window.JsvWidgetWrapperGroup.BrowserVisibleSensor) {
-//     JsvVisibleSensor = window.JsvWidgetWrapperGroup.BrowserVisibleSensor;
-// }
 
 export default _JsvVisibleSensor.default

package/utils/JsViewVueWidget/index.js

@@ -2,14 +2,9 @@
  * @Author: ChenChanghua
  * @Date: 2022-07-05 11:00:51
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-11-23 14:06:24
+ * @LastEditTime: 2022-08-18 13:17:17
  * @Description: file content
  */
-
-// 动态import可以拆解JsvDynamicKeyFrames为单独的chunk？
-// 解决ModuleFederation中BrowserDebugWidget依赖导致的循环import的问题。
-import("./BrowserDebugWidget/WidgetWrapper.js");
-
 export { default as JsvActorMove, JsvActorMoveControl } from "./JsvActorMove";
 export { default as JsvApic, LoopType } from "./JsvApic";
 export { default as JsvInput, InputType } from "./JsvInput";
@@ -23,15 +18,15 @@ export { default as JsvSpray } from "./JsvSpray";
 export { default as JsvSpriteAnim, SpriteController } from "./JsvSpriteAnim";
 export { default as JsvSwiper } from "./JsvSwiper";
 export { default as JsvSwiper3D } from "./JsvSwiper3D";
-export {
-  default as JsvTextureAnim,
-  TexAlignAnchor,
-  DECORATE_NINEPATCH_ALPHA_MIX,
-  DECORATE_BORDER_RADIUS,
-} from "./JsvTextureAnim";
+export { default as JsvTextureAnim, TexAlignAnchor, DECORATE_NINEPATCH_ALPHA_MIX, DECORATE_BORDER_RADIUS } from "./JsvTextureAnim";
 export { default as JsvVisibleSensor } from "./JsvVisibleSensor";
 export { default as JsvFilterView } from "./JsvFilterView.vue";
-export { default as JsvGrid, PageType, LineType } from "./JsvGrid.vue";
+export {
+  default as JsvGrid,
+  PageType,
+  LineType,
+  FocusMoveType,
+} from "./JsvGrid.vue";
 export { default as JsvHole } from "./JsvHole.js";
 export { default as JsvMarquee } from "./JsvMarquee.vue";
 export { default as JsvMaskClipDiv } from "./JsvMaskClipDiv.vue";

package/utils/JsViewVueWidget/utils/text.js

@@ -1,8 +1,6 @@
 /*
  * @Author: ChenChanghua
- * @Date: 2022-11-29 14:26:20
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-11-29 14:27:03
+ * @Date: 2022-11-09 15:18:43
  * @Description: file content
  */
 const getTextWidth = (text, style) => {
@@ -15,4 +13,5 @@ const getTextWidth = (text, style) => {
   };
   return window.PlatformUtils.GetTextWidth(textParams);
 };
-export { getTextWidth };
+
+export { getTextWidth };