@shijiu/jsview-vue 1.9.783 → 1.9.825

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview-vue",
-  "version": "1.9.783",
+  "version": "1.9.825",
   "license": "MIT",
   "repository": "system/jsview-framework",
   "author": "mengxk",

package/utils/JsViewEngineWidget/MetroWidget/MetroWidget.vue

@@ -2,7 +2,7 @@
  * @Author: ChenChanghua
  * @Date: 2021-09-22 16:08:58
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-11-24 10:28:17
+ * @LastEditTime: 2022-12-19 11:17:10
  * @Description: file content
 -->
 
@@ -86,6 +86,7 @@
  *      loadAll {boolean} 加载不显示的view，触控场景使用
  *      flingPageWidth {}
  *      flingPageEdge {}
+ *      disableClip {boolean} 取消显示范围的clipView
  *    methods:
         getFocusBlockRef 获取此MetroWidget的 jsv-focus-block句柄，可以使用requestFocus完成获焦
 
@@ -407,6 +408,10 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
+  disableClip: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 let dataUpdateToken = ref(0);
@@ -1208,6 +1213,8 @@ const _onCustomerEvent = (ev) => {
       yPos: item_layout.top,
       width: item_layout.width,
       height: item_layout.height,
+      centerYPos: Math.floor(item_layout.top + item_layout.height / 2),
+      centerXPos: Math.floor(item_layout.left + item_layout.width / 2),
       index: templateParser.IdToIndex(focusId),
     };
 
@@ -1392,9 +1399,17 @@ const _calculateVisibleStart = (target_item, direction) => {
       );
       break;
     case SlideSetting.Type.WHOLE_PAGE:
-      new_visible_start = templateParser.GetItem(target_item.pageHeadIndex)[
-        pos_key
-      ];
+      if (typeof target_item.pageHeadIndex == "undefined") {
+        //TODO 子控制滚动时whole page滚动
+        console.error(
+          "child controlled whole page slide type is not supported."
+        );
+      } else {
+        new_visible_start = templateParser.GetItem(target_item.pageHeadIndex)[
+          pos_key
+        ];
+      }
+
       break;
     case SlideSetting.Type.SEAMLESS:
       if (
@@ -1720,8 +1735,8 @@ const _onScroll = () => {
 const _updatePosition = (x, y, anim_info) => {
   if (slideLock) return;
   if (toRaw(slideDiv.value)) {
-    let pre_left = toRaw(slideDiv.value).style.left,
-      pre_top = toRaw(slideDiv.value).style.top;
+    let pre_left = slideDivLeft.value,
+      pre_top = slideDivTop.value;
     //jsvMaskView的位置更新时会被设置位0，因此不能通过ResetLayoutParams设置位置
     slideDivLeft.value = x;
     slideDivTop.value = y;
@@ -1929,7 +1944,7 @@ defineExpose(exportObject);
       top: top,
       width: width,
       height: height,
-      overflow: 'hidden',
+      overflow: disableClip ? null : 'hidden',
     }"
   >
     <div :style="{ left: innerPadding.left, top: innerPadding.top }">

package/utils/JsViewEngineWidget/WidgetCommon.js

@@ -2,7 +2,7 @@
  * @Author: ChenChanghua
  * @Date: 2020-12-30 14:08:38
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-11-22 09:57:18
+ * @LastEditTime: 2022-12-01 16:49:21
  * @Description: file content
  */
 class BaseDispatcher {
@@ -174,7 +174,7 @@ class SeamlessSlide extends SlideSetting {
  **/
 class FixPositionSlide extends SlideSetting {
   constructor({
-    fixPercent,
+    fixPercent = .5,
     speed = defaultSpeed,
     easing = defaultEasing,
     boundaryProtect = SlideSetting.START_PROTECT | SlideSetting.END_PROTECT,

package/utils/JsViewPlugin/JsvPlayer/JsvPlayerBrowser.vue

@@ -38,7 +38,7 @@ export default {
   beforeUnmount() {
     if (this.onRef) {
         // video_ref为null，代表video标签卸载处理
-        this.onshallowRef(null);
+        this.onRef(null);
     }
   }
 };

package/utils/JsViewPlugin/JsvPlayer/index.js

@@ -5,6 +5,7 @@ import { getJsvPlayerCapabilitySet as getCapabilitySet } from "./JsvMedia.js"
 import { setJsvPlayerDebugMode as setDebugMode } from "./JsvMedia.js"
 import { getJsvPlayerRunningNum as getRunningPlayerNum } from "./JsvMedia.js"
 import { globalLoadSetOperator as setOperator } from"./JsvMedia.js"
+import { JsvWidgetWrapperGroup } from '../../JsViewVueWidget/BrowserDebugWidget/WidgetWrapper.js';
 let _JsvPlayer = JsvPlayer;
 
 let globalLoadJsvPlayerPlugin = initPlugin;
@@ -13,9 +14,9 @@ let setJsvPlayerDebugMode = setDebugMode;
 let getJsvPlayerRunningNum = getRunningPlayerNum;
 let globalLoadSetOperator = setOperator;
 
-if (window.JsvWidgetWrapperGroup?.BrowserJsvPlayer) {
+if (window.jsvIsBrowserDebug) {
     // 浏览器版本
-    _JsvPlayer = window.JsvWidgetWrapperGroup.BrowserJsvPlayer;
+    _JsvPlayer = JsvWidgetWrapperGroup.BrowserJsvPlayer;
 
     // 为Browser重新定义初始化处理
     globalLoadJsvPlayerPlugin = (listener) => {

package/utils/JsViewPlugin/JsvPlayer/version.js

@@ -2,16 +2,16 @@ let PluginInfo={
     // downloadUrl:"http://192.168.0.63:8080/plugin/JsvPlayer-164.zip", //插件下载地址
     packageName:"com.qcode.jsvplayer",
     name:"播放器插件",
-    version:"1.8.6",  //插件需要的版本号
-    versionCodeMin:186,
-    versionCodeMax:186,
+    version:"1.9.0",  //插件需要的版本号
+    versionCodeMin:190,
+    versionCodeMax:190,
     bridgeName:"jsvPlayerBridge", //插件bridge注册到jsview的名称
     className:"com.qcode.jsvplayer.JsvPlayer",  //插件初始化类名称
     initMethod:"createInstance",   //插件初始化方法
     listener:"top.JsvPlayerPluginLoadResult",  //插件加载结果回调
     listener2: "top.JsvPlayerPluginStatus",
     // debug:true,
-    md5:"1371d41e658d20b4b29477a3c7649654"
+    md5:"77f0b26e2751998e94220df133bd9b3e"
 };
 
 // 不要用export default，update-env脚本不能解析

package/utils/JsViewVueTools/JsvStyleClass.js

@@ -233,6 +233,7 @@ class JsvTextStyleClass extends JsvStyleClass {
     this.jsvTextAttributes = {
       jsv_text_line_align: "middle", // 文字行内垂直对齐方式
       jsv_text_vertical_align: "top", // 文字区域内垂直对齐方式
+      jsv_text_ellipsis: "end", //文字省略部分
     };
   }
 
@@ -244,6 +245,10 @@ class JsvTextStyleClass extends JsvStyleClass {
     this.jsvTextAttributes.jsv_text_line_align = new_align;
   }
 
+  setEllipsis(new_ellipsis) {
+    this.jsvTextAttributes.jsv_text_ellipsis = new_ellipsis;
+  }
+
   // 注意:此接口仅提供给JsViewReactWidget中的hoc调用，
   getVerticalAlign() {
     return this.jsvTextAttributes.jsv_text_vertical_align;
@@ -254,6 +259,10 @@ class JsvTextStyleClass extends JsvStyleClass {
     return this.jsvTextAttributes.jsv_text_line_align;
   }
 
+  getEllipsis() {
+    return this.jsvTextAttributes.jsv_text_ellipsis;
+  }
+
   // Override
   classType() {
     return CONST_TYPE_TEXT;

package/utils/JsViewVueTools/JsvTextTools.js

@@ -0,0 +1,18 @@
+/*
+ * @Author: ChenChanghua
+ * @Date: 2022-11-29 14:26:20
+ * @LastEditors: ChenChanghua
+ * @LastEditTime: 2022-11-29 14:27:03
+ * @Description: file content
+ */
+const getTextWidth = (text, style) => {
+  const textParams = {
+    str: text ? text : "",
+    font: style.fontFamily ? style.fontFamily : Forge.TextUtils._sDefaultFont,
+    size: style.fontSize ? style.fontSize : Forge.TextUtils._sDefaultFontSize,
+    italic: style.fontStyle === "italic" ? "italic" : "",
+    bold: style.fontWeight === "bold" ? "bold" : "",
+  };
+  return window.PlatformUtils.GetTextWidth(textParams);
+};
+export { getTextWidth };

package/utils/JsViewVueTools/index.js

@@ -2,7 +2,7 @@
  * @Author: ChenChanghua
  * @Date: 2022-07-05 14:09:55
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2022-08-30 10:58:14
+ * @LastEditTime: 2022-11-29 14:34:45
  * @Description: file content
  */
 
@@ -17,4 +17,5 @@ export * from "./JsvStyleClass.js";
 export * from "./DebugContentShellJBridge.js";
 export * from "./DebugTool.js";
 export * from "./JsvImpactTracer.js";
+export * from "./JsvTextTools.js";
 export { default as DefaultKeyCodeMap } from "./DefaultKeyMap.js";

package/utils/JsViewVueWidget/BrowserDebugWidget/WidgetLoader.js

@@ -12,6 +12,7 @@ import BrowserSpray from "./BrowserSpray.vue";
 import BrowserPreload from "./BrowserPreload.vue";
 import BrowserQrcode from "./BrowserQrcode.vue";
 import BrowserTextureAnim from "./BrowserTextureAnim.vue";
+import BrowserJsvPlayer from "../../JsViewPlugin/JsvPlayer/JsvPlayerBrowser.vue";
 
 export {
   BrowserApic,
@@ -19,12 +20,8 @@ export {
   BrowserPreload,
   BrowserQrcode,
   BrowserTextureAnim,
-}
 
-// JsvWidgetWrapperGroup.BrowserApic = BrowserApic;
-// JsvWidgetWrapperGroup.BrowserSpray = BrowserSpray;
-// JsvWidgetWrapperGroup.BrowserPreload = BrowserPreload;
-// JsvWidgetWrapperGroup.BrowserQrcode = BrowserQrcode;
-// JsvWidgetWrapperGroup.BrowserTextureAnim = BrowserTextureAnim;
+  BrowserJsvPlayer,
+}
 
-// console.log("load browser widgets.");
+console.log("JsView Utils: Load browser widgets.");

package/utils/JsViewVueWidget/JsvActorMove/JsvActorMove.vue

@@ -33,32 +33,30 @@
  *              功能：暂停动画，并将JsvActorMove保持在暂停的位置上
 
 -->
-<script>
+<script setup>
 import JsvActorMoveControl from "./JsvActorMoveControl";
-export default {
-  props: {
-    control: {
-      type: JsvActorMoveControl,
-      required: true,
-    },
-    refDefine: Object,
-  },
-  mounted() {
-    this.control._SetView(this.$refs.element.jsvGetProxyView());
-    if (this.refDefine) {
-      const type = typeof this.refDefine;
-      if (type === "object") {
-        this.refDefine.current = this.$refs.element;
-      } else if (type === "function") {
-        this.refDefine(this.$refs.element);
-      }
-    }
+import { shallowRef, onMounted } from "vue";
+
+const props = defineProps({
+  control: {
+    type: JsvActorMoveControl,
+    required: true,
   },
-};
+});
+
+let mainDivRef = shallowRef(null);
+
+onMounted(() => {
+  props.control._SetView(mainDivRef.value.jsvGetProxyView());
+});
+
+defineExpose({
+  mainDiv: mainDivRef,
+});
 </script>
 
 <template>
-  <div ref="element">
+  <div ref="mainDivRef">
     <slot></slot>
   </div>
-</template>
+</template>

package/utils/JsViewVueWidget/JsvGrid.vue

@@ -93,7 +93,7 @@ class LineType extends UpdateType {
   }
 }
 
-export { PageType, LineType };
+export { PageType, LineType, FocusMoveType };
 
 export default {
   props: {

package/utils/JsViewVueWidget/JsvMarquee.vue

@@ -11,7 +11,13 @@
 <script setup>
 import { Forge } from "../../../jsview/dom/jsv-forge-define";
 import { getTextWidth } from "./utils";
-import { ref, shallowRef, computed, toRaw, onMounted, onBeforeUnmount } from "vue";
+import {
+  shallowRef,
+  computed,
+  toRaw,
+  onMounted,
+  onBeforeUnmount,
+} from "vue";
 
 const defaultFontStyle = () => {
   return {
@@ -20,7 +26,7 @@ const defaultFontStyle = () => {
     textAlign: "start",
     lineHeight: "20px",
     whiteSpace: "nowrap",
-    direction: 'ltr'
+    direction: "ltr",
   };
 };
 const props = defineProps({
@@ -41,7 +47,7 @@ const props = defineProps({
         textAlign: "start",
         lineHeight: "20px",
         whiteSpace: "nowrap",
-        direction: 'ltr,'
+        direction: "ltr,",
       };
     },
   },
@@ -71,7 +77,9 @@ const fontStyle = computed(() => {
 });
 //rtl文字需要先获得文字宽度
 let textWidth =
-  fontStyle.value.direction == "rtl" ? getTextWidth(props.text, fontStyle.value) : 0;
+  fontStyle.value.direction == "rtl"
+    ? getTextWidth(props.text, fontStyle.value)
+    : 0;
 const slideDivLeft = computed(() =>
   fontStyle.value.direction == "rtl" && props.style.width < textWidth
     ? props.style.width - textWidth
@@ -112,7 +120,9 @@ const slideStep = () => {
   } else {
     // 文字从屏幕外部，移动回屏幕中的文字原始位置
     let start =
-        fontStyle.value.direction == "rtl" ? -props.style.width : props.style.width,
+        fontStyle.value.direction == "rtl"
+          ? -props.style.width
+          : props.style.width,
       end = 0;
     const anim = new Forge.TranslateFrameAnimation(
       start,

package/utils/JsViewVueWidget/JsvSpray/JsvSpray.vue

@@ -2,7 +2,7 @@
  * @Author: ChenChanghua
  * @Date: 2021-10-12 18:20:43
  * @LastEditors: ChenChanghua
- * @LastEditTime: 2021-11-18 16:42:20
+ * @LastEditTime: 2022-11-25 18:26:40
  * @Description: file content
 -->
 
@@ -12,6 +12,7 @@
  *      prop说明:
  *          pointRes {string} (必需)粒子图案 可选值: 绝对路径url|url(相对路径url)|#FFFFFF|rbga(255,0,0,1.0)
  *          sprayStyle {object}  (必需)粒子效果配置
+ *          ignoreClip {boolean} 无视clipView描画
  *
  * prop中的sprayStyle说明:
  *      type {int} (必需)喷射类型 0: 一次喷射 1: 持续喷射
@@ -34,7 +35,7 @@
 <script>
 import { Forge, ForgeExtension } from "../../../../jsview/dom/jsv-forge-define";
 
-let buildForgeView = (pointRes, sprayStyle, sizeRef) => {
+let buildForgeView = (pointRes, sprayStyle, sizeRef, ignoreClip) => {
   if (!pointRes) {
     return -1;
   }
@@ -56,7 +57,7 @@ let buildForgeView = (pointRes, sprayStyle, sizeRef) => {
       texture_manager.GetImage2(image_url, false, null, "RGB_8888", null)
     );
   }
-  const spray_view = new Forge.SprayView(texture_setting);
+  const spray_view = new Forge.SprayView(texture_setting, ignoreClip);
   const add_num_per_frame = sprayStyle.addNumSpeed
     ? sprayStyle.addNumSpeed
     : 0.001;
@@ -105,6 +106,10 @@ export default {
       type: Object,
       required: true,
     },
+    ignoreClip: {
+      type: Boolean,
+      default: false,
+    }
   },
   data() {
     return {
@@ -124,11 +129,11 @@ export default {
     },
   },
   created() {
-    this.viewId = buildForgeView(this.pointRes, this.sprayStyle, this.size);
+    this.viewId = buildForgeView(this.pointRes, this.sprayStyle, this.size, this.ignoreClip);
   },
   updated() {
     this.unloadView();
-    this.viewId = buildForgeView(this.pointRes, this.sprayStyle, this.size);
+    this.viewId = buildForgeView(this.pointRes, this.sprayStyle, this.size, this.ignoreClip);
   },
   beforeUnmount() {
     this.unloadView();

package/utils/JsViewVueWidget/JsvTextBox.vue

@@ -8,6 +8,7 @@
  *          verticalAlign {string}  垂直对齐方式 (必需) top、middle、bottom
  *          style {object}          样式(必需)
  *          enableLatex {bool}     是否启用Latex文字描画模式
+ *          textDirection {string} 内容文字的方向, 默认是unset, 此时会根据第一个字符的语言确定文字是ltr还是rtl
 -->
 
 <script setup>
@@ -23,8 +24,15 @@ const props = defineProps({
     type: String,
     default: "middle",
   },
-  enableLatex: Boolean,
+  enableLatex: {
+    type: Boolean,
+    default: false,
+  },
   className: String,
+  textDirection: {
+    type: String,
+    default: "unset",
+  },
 });
 
 </script>
@@ -37,6 +45,7 @@ const props = defineProps({
       :jsv_text_latex_enable="enableLatex ? 'true' : ''"
       :jsv_text_vertical_align="verticalAlign"
       :jsv_text_line_align="lineAlign"
+      :jsv_text_inner_direction="textDirection"
       jsv-inherit-class="1"
     >
       <slot></slot>

package/utils/JsViewVueWidget/utils/text.js

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

package/utils/JsViewPlugin/BrowserPluginLoader.js

@@ -1,14 +0,0 @@
-/*
- * @Author: LuDonglin
- * @Date: 2022-2-24 14:00:00
- * @LastEditors: LuDonglin
- * @LastEditTime: 2022-2-24 14:00:00
- * @Description: file content
- */
-import { JsvWidgetWrapperGroup } from '../JsViewVueWidget/BrowserDebugWidget/WidgetWrapper.js';
-//考虑到.vue文件除了export default的component外，还有可能export其他对象,因此使用import * as
-import * as BrowserJsvPlayer from "./JsvPlayer/JsvPlayerBrowser.vue";
-
-JsvWidgetWrapperGroup.BrowserJsvPlayer = BrowserJsvPlayer;
-
-console.log("load browser plugin widgets.");