@shijiu/jsview-vue 2.2.201 → 2.2.426-test.0

package/utils/JsViewVueWidget/JsvInput/SharedDefine.ts

@@ -0,0 +1,17 @@
+import { Forge } from "@shijiu/jsview/dom/jsv-forge-define.mjs";
+
+export const InputType = {
+    TEXT: Forge.TextInputType.TEXT,
+    NUMBER: Forge.TextInputType.NUMBER,
+    PASSWORD: Forge.TextInputType.PASSWORD,
+};
+
+export declare interface FontStyleDefine {
+    fontSize: number,
+    fontFamily: string,
+    textAlign: string,
+    fontStyle: string,
+    fontWeight: string
+}
+
+export const MAX_WIDTH = 2000;

package/utils/JsViewVueWidget/JsvInput/SystemTextTools.ts

@@ -0,0 +1,61 @@
+import {
+    TextTools
+} from "../../JsViewVueTools/JsvTextTools"
+
+declare interface FontStyleDefine {
+    fontSize: number,
+    fontFamily: string,
+    textAlign: string,
+    fontStyle: string,
+    fontWeight: string
+}
+
+export interface CursorResult {
+    x: number,
+    cachedId: number
+}
+
+// 获取单行输入框光标所在位置
+export function calculateCursorPosition(
+    display_text: string,
+    cursor_offset: number,
+    rect_width: number,
+    rect_height: number,
+    line_height: number,
+    font_style: FontStyleDefine): CursorResult {
+
+    let css_font_style = {
+        fontFamily: font_style.fontFamily,
+        fontSize: font_style.fontSize,
+        fontStyle: font_style.fontStyle,
+        fontWeight: font_style.fontWeight
+    };
+
+    let css_textlayout_style = {
+        width: rect_width,
+        height: rect_height,
+        lineHeight: line_height,
+    };
+
+    let cursor_info = TextTools.getCursorPosition(cursor_offset, display_text, css_font_style, css_textlayout_style, true);
+
+    return {
+        x: cursor_info.x,
+        cachedId: cursor_info.cachedId
+    }
+}
+
+export function calculateCursorPositionCached(
+    cursor_offset: number,
+    cached_id: number): number {
+    let cursor_info = TextTools.getCursorPositionCached(cached_id, cursor_offset);
+    return cursor_info.x;
+}
+
+export function recycleCursorMeasureCache(cached_id: any) {
+    TextTools.recycleCursorPositionCache(cached_id);
+}
+
+export function getTextDisplayWidth(text: string, font_style: FontStyleDefine) {
+    return TextTools.getTextWidth(text, font_style);
+}

package/utils/JsViewVueWidget/JsvLine/JsvLine.vue

@@ -1,4 +1,6 @@
 <!--
+ * @file
+ *
  * 【模块 export 内容】
  * JsvLine：Vue高阶组件，用于划线。支持横线、竖线和斜线。
  *      props说明:(注意:全部属性非响应式, 需要变更时用 key 来触发重绘)

package/utils/JsViewVueWidget/JsvMarquee.vue

@@ -1,4 +1,6 @@
 <!--
+ * @file
+ *
  * 【模块 export 内容】
  * JsvMarquee：Vue高阶组件，文字跑马灯
  *      props说明:

package/utils/JsViewVueWidget/JsvMaskClipDiv.vue

@@ -1,4 +1,6 @@
 <!--
+ * @file
+ *
  *
  * JsvMaskClipDiv：蒙版遮罩处理组件
  *      props说明:
@@ -13,11 +15,6 @@
 -->
 <script>
 import { Forge, ForgeExtension } from "@shijiu/jsview/dom/jsv-forge-define";
-import ForgeHandles from "../JsViewVueTools/ForgeHandles";
-
-const renderDocument = window.JsvCode.Dom.RenderDocument
-  ? window.JsvCode.Dom.RenderDocument
-  : window.JsvCode.Dom.BrowserDocument;
 
 export default {
   props: {
@@ -57,7 +54,6 @@ export default {
       innerView: null,
       innerViewId: -1,
       styleDetail: null,
-      html: !window.JsView,
       cache: {
         viewSrc: null,
         maskSrc: null,
@@ -112,37 +108,6 @@ export default {
       this.cache.maskWidth = this.maskWidth;
       this.cache.maskHeight = this.maskHeight;
     },
-    _initForHtml() {
-      let _this = this;
-      this.$refs.innerViewDiv
-        ?.jsvGetProxyView(true)
-        .RegisterOnProxyReady(() => {
-          const canvas = renderDocument.createElement("canvas");
-          canvas.style.width = _this.style.width + "px";
-          canvas.style.height = _this.style.height + "px";
-          _this.$refs.innerViewDiv
-            ?.jsvGetProxyView(true)
-            .HtmlGetElement()
-            .appendChild(canvas);
-
-          const clip_image = new Image();
-          const bg_image = new Image();
-          clip_image.src = _this.maskSrc;
-          bg_image.src = _this.viewSrc;
-          let clip_ready = false;
-          let bg_ready = false;
-
-          clip_image.onload = () => {
-            clip_ready = true;
-            _this._drawClip(canvas, clip_image, clip_ready, bg_image, bg_ready);
-          };
-
-          bg_image.onload = () => {
-            bg_ready = true;
-            _this._drawClip(canvas, clip_image, clip_ready, bg_image, bg_ready);
-          };
-        });
-    },
     _updateInnerView() {
       if (this.innerView === null) {
         // 初始化View
@@ -184,19 +149,11 @@ export default {
     },
   },
   created() {
-    if (window.JsView) {
-      this._updateInnerView();
-    }
-  },
-  mounted() {
-    if (!window.JsView) {
-      this._initForHtml();
-    }
+    this._updateInnerView();
   },
+  mounted() {},
   updated() {
-    if (window.JsView) {
-      this._updateInnerView();
-    }
+    this._updateInnerView();
   },
   beforeUnmount() {
     // 清理View管理缓存

package/utils/JsViewVueWidget/JsvMindMap/DataTree.ts

@@ -2,6 +2,8 @@ import { Rect, Line } from "./Geometry";
 import * as CONST from "./Constant"
 import { Direction } from "./CommonType";
 import { opposite } from "./Geometry";
+import { computed } from "vue"
+import { ForgeConst } from "../../JsViewVueTools/ForgeConstDefine";
 
 type MoveType = "star" | "layer" | "inherit"
 const NO_NEIGHBOR = Symbol("noNeighbor");
@@ -40,12 +42,13 @@ export class DataNode {
     bottom: null,
   }
 
-  constructor(rect: Rect, depth: number, id: string, data: any, moveType: MoveType = "inherit") {
+  constructor(rect: Rect, depth: number, id: string, data: any, moveType: MoveType = "inherit", enableTap: boolean = false) {
     this.rect = rect;
     this.depth = depth;
     this.customerData = data;
     this.moveType = moveType;
     this.customerId = id;
+    this.enableTap = enableTap;
   }
 
   //>>>>为了对接rtree库>>>>
@@ -349,6 +352,11 @@ export class DataNode {
   private focused: boolean = false;
   private divRef: any = null;
   private lineStyle: any = null;
+  public enableTap: boolean = false;
+
+  public onTap = computed(() => {
+    return this.enableTap ? this.onClick.bind(this) : null;
+  });
 
   public setLineStyle(style: any) {
     this.lineStyle = style;
@@ -384,6 +392,11 @@ export class DataNode {
       if (this.focused) {
         this.customerListener.onFocus?.();
       }
+
+      if (this.enableTap && divRef) {
+        const divView = (divRef as any).jsvGetProxyView();
+        divView.DragEnables?.(ForgeConst.DragFlags.TOUCH_RECV_CLICK_BIT); // 只激活tap
+      }
     } else if (this.divRef != null && !divRef) {
       // unmounted
       this.divRef = null;