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

package/utils/JsViewVueTools/JsvRuntimeBridge.js

@@ -21,7 +21,7 @@ function direct_call(name, ...args) {
         direct_call_map[name] = func;
         if (func) {
             return func(...args);
-        }        
+        }
     }
 
     return null;
@@ -47,7 +47,7 @@ function getExtFeatureSupports() {
  * @returns {string} mac address
  *
  */
-function getMac(){
+function getMac() {
     return direct_call("getMac");
 }
 
@@ -56,7 +56,7 @@ function getMac(){
  * @returns {string} mac address
  *
  */
-function getWireMac(){
+function getWireMac() {
     return direct_call("getWireMac");
 }
 
@@ -65,7 +65,7 @@ function getWireMac(){
  * @returns {string} mac address
  *
  */
-function getWifiMac(){
+function getWifiMac() {
     return direct_call("getWifiMac");
 }
 
@@ -74,7 +74,7 @@ function getWifiMac(){
  * @returns {string} UUID
  *
  */
-function getDeviceUUID(){
+function getDeviceUUID() {
     return direct_call("getDeviceUUID");
 }
 
@@ -83,7 +83,7 @@ function getDeviceUUID(){
  * @returns {string} Android ID
  *
  */
-function getAndroidId(){
+function getAndroidId() {
     return direct_call("getAndroidId");
 }
 
@@ -96,12 +96,12 @@ function getAndroidId(){
  * @param {int} add_history 是否添加历史，0不添加，1添加
  * @returns {Promise} 可用于监听新的小程序返回的结果
  */
-function openWindow(url, startup_image, startup_video, startup_duration, add_history){
+function openWindow(url, startup_image, startup_video, startup_duration, add_history) {
     let setting = {};
-    if(startup_image !== null && startup_image !== "")
+    if (startup_image !== null && startup_image !== "")
         setting.startupImage = startup_image;
 
-    if(startup_video !== null && startup_video !== ""){
+    if (startup_video !== null && startup_video !== "") {
         setting.startupVideo = startup_video;
     }
 
@@ -121,12 +121,12 @@ function openWindow(url, startup_image, startup_video, startup_duration, add_his
  * @param {int} add_history 是否添加历史，0不添加，1添加
  * @returns {Promise} 可用于监听新的小程序返回的结果
  */
-function startUrlInNewTab(url, startup_image, startup_video, startup_duration, add_history){
+function startUrlInNewTab(url, startup_image, startup_video, startup_duration, add_history) {
     let setting = {};
-    if(startup_image !== null && startup_image !== "")
+    if (startup_image !== null && startup_image !== "")
         setting.startupImage = startup_image;
 
-    if(startup_video !== null && startup_video !== ""){
+    if (startup_video !== null && startup_video !== "") {
         setting.startupVideo = startup_video;
     }
 
@@ -140,8 +140,8 @@ function startUrlInNewTab(url, startup_image, startup_video, startup_duration, a
  * 用于给上一个小程序返回结果，通常与startUrlInNewTab和openWindow配合使用
  * @param {string} data 返回给上一个小程序的结果
  */
-function onWindowResult(data){
-    direct_call("onWindowResult",data)
+function onWindowResult(data) {
+    direct_call("onWindowResult", data)
 }
 
 /**
@@ -152,12 +152,12 @@ function onWindowResult(data){
  * @param {int} startup_duration 启动图时长，默认0
  * @param {int} add_history 是否添加历史，0不添加，1添加
  */
-function reloadWindow(url, startup_image, startup_video, startup_duration, add_history){
+function reloadWindow(url, startup_image, startup_video, startup_duration, add_history) {
     let setting = {};
-    if(startup_image !== null && startup_image !== "")
+    if (startup_image !== null && startup_image !== "")
         setting.startupImage = startup_image;
 
-    if(startup_video !== null && startup_video !== ""){
+    if (startup_video !== null && startup_video !== "") {
         setting.startupVideo = startup_video;
     }
 
@@ -171,7 +171,7 @@ function reloadWindow(url, startup_image, startup_video, startup_duration, add_h
  * 关闭当前小程序
  *
  */
-function closePage(){
+function closePage() {
     direct_call("closePage");
 }
 
@@ -181,7 +181,7 @@ function closePage(){
  * @returns {string} 属性值
  *
  */
-function getSystemProperty(key){
+function getSystemProperty(key) {
     return direct_call("getSystemProperty", key);
 }
 
@@ -190,7 +190,7 @@ function getSystemProperty(key){
  * @returns {string} 应用列表，JSON结构的数组
  *
  */
-function getInstalledApps(){
+function getInstalledApps() {
     return direct_call("getInstalledApps");
 }
 
@@ -204,24 +204,24 @@ function getInstalledApps(){
  * @param {Array} param JSON格式数组，数组元素是 object ，object中的内容用于intent.putExtra
  *
  */
-function startNativeApp(package_name, activity, action, uri, flags, param){
+function startNativeApp(package_name, activity, action, uri, flags, param) {
     var obj = {};
-    if(package_name !== null && package_name !== "")
+    if (package_name !== null && package_name !== "")
         obj.packageName = package_name;
 
-    if(activity !== null && activity !== "")
+    if (activity !== null && activity !== "")
         obj.activity = activity;
 
-    if(action !== null && action !== "")
+    if (action !== null && action !== "")
         obj.action = action;
 
-    if(uri !== null && uri !== "")
+    if (uri !== null && uri !== "")
         obj.uri = uri;
 
-    if(flags !== null && flags.length > 0)
+    if (flags !== null && flags.length > 0)
         obj.flags = flags;
 
-    if(param !== null && param.length > 0)
+    if (param !== null && param.length > 0)
         obj.param = param;
 
     direct_call("startNativeApp", JSON.stringify(obj));
@@ -237,25 +237,25 @@ function startNativeApp(package_name, activity, action, uri, flags, param){
  * @param {Array} param JSON格式数组，数组元素是 object ，object中的内容用于intent.putExtra
  *
  */
-function sendNativeBroadcast(package_name, broadcast, action, uri, flags, param){
+function sendNativeBroadcast(package_name, broadcast, action, uri, flags, param) {
 
     var obj = {};
-    if(typeof package_name != undefined && package_name !== null && package_name !== "")
+    if (typeof package_name != undefined && package_name !== null && package_name !== "")
         obj.packageName = package_name;
 
-    if(typeof broadcast != undefined && broadcast !== null && broadcast !== "")
+    if (typeof broadcast != undefined && broadcast !== null && broadcast !== "")
         obj.broadcast = broadcast;
 
-    if(typeof action != undefined && action !== null && action !== "")
+    if (typeof action != undefined && action !== null && action !== "")
         obj.action = action;
 
-    if(typeof uri != undefined && uri !== null && uri !== "")
+    if (typeof uri != undefined && uri !== null && uri !== "")
         obj.uri = uri;
 
-    if(typeof flags != undefined && flags !== null && flags.length > 0)
+    if (typeof flags != undefined && flags !== null && flags.length > 0)
         obj.flags = flags;
 
-    if(typeof param != undefined && param !== null && param.length > 0)
+    if (typeof param != undefined && param !== null && param.length > 0)
         obj.param = param;
     direct_call("sendNativeBroadcast", JSON.stringify(obj));
 }
@@ -271,27 +271,27 @@ function sendNativeBroadcast(package_name, broadcast, action, uri, flags, param)
  * @param {boolean} is_foreground 是否使用startForegroundService
  *
  */
-function startService(package_name, services, action, uri, flags, param,is_foreground){
+function startService(package_name, services, action, uri, flags, param, is_foreground) {
 
     var obj = {};
-    if(typeof package_name != undefined && package_name !== null && package_name !== "")
+    if (typeof package_name != undefined && package_name !== null && package_name !== "")
         obj.packageName = package_name;
 
-    if(typeof services != undefined && services !== null && services !== "")
+    if (typeof services != undefined && services !== null && services !== "")
         obj.services = services;
 
-    if(typeof action != undefined && action !== null && action !== "")
+    if (typeof action != undefined && action !== null && action !== "")
         obj.action = action;
 
-    if(typeof uri != undefined && uri !== null && uri !== "")
+    if (typeof uri != undefined && uri !== null && uri !== "")
         obj.uri = uri;
 
-    if(typeof flags != undefined && flags !== null && flags.length > 0)
+    if (typeof flags != undefined && flags !== null && flags.length > 0)
         obj.flags = flags;
 
-    if(typeof param != undefined && param !== null && param.length > 0)
+    if (typeof param != undefined && param !== null && param.length > 0)
         obj.param = param;
-    direct_call("startServices", JSON.stringify(obj),is_foreground);
+    direct_call("startServices", JSON.stringify(obj), is_foreground);
 }
 
 /**
@@ -307,7 +307,7 @@ function getDeviceInfo() {
  * 获取自己的app信息
  * @returns 
  */
-function getAppInfo(){
+function getAppInfo() {
     return direct_call("getAppInfo");
 }
 
@@ -321,7 +321,7 @@ function notifyPageLoadDone() {
 
 function notifyPageLoaded() {
     // 激活JsView的按键优化处理逻辑
-    window.JsView?.enableReceivingUserInput?.();
+    window.JsvCoreApi.enableReceivingUserInput?.();
 
     direct_call("notifyPageLoaded");
 }
@@ -331,7 +331,7 @@ function notifyPageLoaded() {
  * @returns {boolean} true支持，false不支持
  *
  */
-function hasFavouriteFunction(){
+function hasFavouriteFunction() {
     let features = getExtFeatureSupports();
     if (features && features.indexOf("favourite") >= 0) {
         return true;
@@ -363,11 +363,11 @@ function getStartParams() {
 function addFavourite(url, callback) {
     if (window.jJsvRuntimeBridge && typeof window.jJsvRuntimeBridge.addFavourite === "function") {
         let async_message = window.jJsvRuntimeBridge.addFavourite(url);
-        async_message.then((result)=>{
+        async_message.then((result) => {
             if (callback) {
                 callback(result);
             }
-        }).catch((result)=>{
+        }).catch((result) => {
             if (callback) {
                 callback(result);
             }
@@ -384,11 +384,11 @@ function addFavourite(url, callback) {
 function updateFavourite(url, callback) {
     if (window.jJsvRuntimeBridge && typeof window.jJsvRuntimeBridge.updateFavourite === "function") {
         let async_message = window.jJsvRuntimeBridge.updateFavourite(url);
-        async_message.then((result)=>{
+        async_message.then((result) => {
             if (callback) {
                 callback(result)
             }
-        }).catch((result)=>{
+        }).catch((result) => {
             if (callback) {
                 callback(result);
             }
@@ -405,11 +405,11 @@ function updateFavourite(url, callback) {
 function removeFavourite(app_name, callback) {
     if (window.jJsvRuntimeBridge && typeof window.jJsvRuntimeBridge.removeFavourite === "function") {
         let async_message = window.jJsvRuntimeBridge.removeFavourite(app_name);
-        async_message.then((result)=>{
+        async_message.then((result) => {
             if (callback) {
                 callback(result)
             }
-        }).catch((result)=>{
+        }).catch((result) => {
             if (callback) {
                 callback(result);
             }
@@ -468,7 +468,7 @@ function popupGainFocus() {
     direct_call("popupGainFocus");
 }
 
-function popupDiscardFocus(){
+function popupDiscardFocus() {
     direct_call("popupGainFocus");
 }
 
@@ -488,12 +488,12 @@ function popupDiscardFocus(){
  *      int: 为view_refer_id值，预热后的View的ID，用于后续的warmLoadView和closeWarmView使用
  */
 function warmUpView(mode, app_url) {
-    if(mode !== 1 && mode !== 2) {
+    if (mode !== 1 && mode !== 2) {
         console.error(`not support mode(${mode})`);
         return -1;
     }
 
-    if(mode === 1 && (app_url === null || app_url.length === 0)) {
+    if (mode === 1 && (app_url === null || app_url.length === 0)) {
         console.error(`not support params(${mode} ${app_url})`);
         return -1;
     }
@@ -528,27 +528,27 @@ function closeWarmedView(view_refer_id) {
  *                              例如: 1021265_release_build_xxx
  * @returns promise 对象，用于监听下载完成与下载失败
  */
-function preDownloadSdk(core_version){
+function preDownloadSdk(core_version) {
     return direct_call("preDownloadSdk", core_version);
 }
 
-function getNetworkTypeStatusImmediate(){
+function getNetworkTypeStatusImmediate() {
     return direct_call("getNetworkTypeStatusImmediate");
 }
 
-function registerNetStateListener(callback){
+function registerNetStateListener(callback) {
     return direct_call("registerNetStateListener", callback);
 }
 
-function unRegisterNetStateListener(callback){
+function unRegisterNetStateListener(callback) {
     return direct_call("unRegisterNetStateListener", callback);
 }
 
-function getSnId(){
+function getSnId() {
     return direct_call("getSnId");
 }
 
-function getEmmcCid(){
+function getEmmcCid() {
     return direct_call("getEmmcCid");
 }
 
@@ -561,10 +561,10 @@ function getEmmcCid(){
  * @param {string} sortOrder 
  * @returns 
  */
-function providerQuery(uri,projection,selection,selectionArgs,sortOrder){
-    let jsonProjection = projection?JSON.stringify(projection):null
-    let jsonSelectionArgs = selectionArgs?JSON.stringify(selectionArgs):null
-    return direct_call("providerQuery",uri,jsonProjection,selection,jsonSelectionArgs,sortOrder);
+function providerQuery(uri, projection, selection, selectionArgs, sortOrder) {
+    let jsonProjection = projection ? JSON.stringify(projection) : null
+    let jsonSelectionArgs = selectionArgs ? JSON.stringify(selectionArgs) : null
+    return direct_call("providerQuery", uri, jsonProjection, selection, jsonSelectionArgs, sortOrder);
 }
 
 /**
@@ -573,8 +573,8 @@ function providerQuery(uri,projection,selection,selectionArgs,sortOrder){
  * @param {object} contentValue 
  * @returns 
  */
-function providerInsert(uri,contentValue){
-    return direct_call("providerInsert",uri,contentValue?JSON.stringify(contentValue):null)
+function providerInsert(uri, contentValue) {
+    return direct_call("providerInsert", uri, contentValue ? JSON.stringify(contentValue) : null)
 }
 
 /**
@@ -584,8 +584,8 @@ function providerInsert(uri,contentValue){
  * @param {string[]} selectionArgs 
  * @returns 
  */
-function providerDelete(uri,selection,selectionArgs){
-    return direct_call("providerDelete",uri,selection,selectionArgs?JSON.stringify(selectionArgs):null)
+function providerDelete(uri, selection, selectionArgs) {
+    return direct_call("providerDelete", uri, selection, selectionArgs ? JSON.stringify(selectionArgs) : null)
 }
 
 /**
@@ -596,8 +596,8 @@ function providerDelete(uri,selection,selectionArgs){
  * @param {string[]} selectionArgs 
  * @returns 
  */
-function providerUpdate(uri,contentValue,selection,selectionArgs){
-    return direct_call("providerUpdate",uri,contentValue?JSON.stringify(contentValue):null,selection,selectionArgs?JSON.stringify(selectionArgs):null)
+function providerUpdate(uri, contentValue, selection, selectionArgs) {
+    return direct_call("providerUpdate", uri, contentValue ? JSON.stringify(contentValue) : null, selection, selectionArgs ? JSON.stringify(selectionArgs) : null)
 }
 
 

package/utils/JsViewVueTools/JsvTextTools.ts

@@ -1,5 +1,6 @@
 import { Forge } from "@shijiu/jsview/dom/jsv-forge-define.mjs";
 
+// 按照Css的style设置名称对应
 declare interface FontStyleDefine {
   fontFamily: string,
   fontSize: number,
@@ -23,14 +24,8 @@ declare interface FontStyleDefine {
  * @return {int} 文字宽度
  **/
 const getTextWidth = (text: string, style: FontStyleDefine) => {
-  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 as any).PlatformUtils.GetTextWidth(textParams);
+  let forgeRef = Forge;
+  return Forge.TextUtils.GetTextWidth(text, style);
 };
 
 /*!
@@ -57,27 +52,8 @@ const getOneLineTextDrawWidth = (text: string, style: FontStyleDefine) => {
   if (text && typeof text != "string") {
     text = "" + text; // 规避text为非字符串导致接口调用错误的问题
   }
-  const info: Array<any> = (window as any).PlatformUtils.GetOneLineTextDrawWidth(
-    text ?? "",
-    style.fontFamily ?? Forge.TextUtils.sDefaultFont,
-    style.fontSize ?? Forge.TextUtils.sDefaultFontSize,
-    style.fontStyle === "italic" ? "italic" : "",
-    style.fontWeight === "bold" ? "bold" : "");
-  const result: {
-    totalWidth: number,
-    sliceInfo: Array<any>
-  } = {
-    totalWidth: info[0],
-    sliceInfo: [],
-  }
-  for (let i = 1; i < info.length; i += 3) {
-    result.sliceInfo.push({
-      start: info[i],
-      end: info[i + 1],
-      width: info[2 + 2],
-    })
-  }
-  return result;
+
+  return Forge.TextUtils.GetOneLineTextDrawWidth(text, style);
 }
 
 const isRtl = (str: string) => {
@@ -95,16 +71,28 @@ const isRtl = (str: string) => {
   return false;
 }
 
+declare interface CssFontStyle {
+  fontFamily: string,
+  fontSize: number,
+  fontStyle: string,
+  fontWeight: string
+}
 
-
-declare interface RectSize {
-  width: number,
-  height: number,
+declare interface CssTextLayoutStyle {
+  width?: number,
+  height?: number,
+  textAlign?: String,
+  lineHeight?: number,
+  whiteSpace?: String, // normal, nowrap (换行规则)
+  wordWrap?: String, // break-word, normal, (仅对英文有效, 只在whiteSpace规定为非换行时生效)
+  textOverflow?: String,
 }
 
-declare interface PostionDefine {
+declare interface CursorResult {
+  parseSuccess: boolean,
   x: number,
-  y: number
+  y: number,
+  cachedId: number, // 解析缓存的id，当设置不变的时候使用cache, 0为无效cache
 }
 
 /**
@@ -112,112 +100,57 @@ declare interface PostionDefine {
  *
  * @public
  * @func GetCursorPosition
- * @memberof Forge.TextUtils
- * @params {string} str	文字字符串
- * @params {Forge.RectArea} max_rect
- * @param {PackedFontParams} font_params	文本描述符(来源自 PackFontParams 函数)
- * @param {PackedTextAttrs} text_attr  (来源自 PackTextAttrs 函数)
- * @param {int} line_height
- * @param {int} pos_x   光标的偏移
- * @return {Object}	 光标的所在位置{x:0,y:0}
+ * @return {CursorResult}	 光标的所在位置{x:0,y:0}
  **/
-function GetCursorPosition(
-  str: string,
-  max_rect: RectSize,
-  font_params: PackedFontParams,
-  text_attr: PackedTextAttrs,
-  line_height: number,
-  cursor_offset: number
-): PostionDefine {
-  let api = (window as any).PlatformUtils?.GetCursorPosition.bind((window as any).PlatformUtils);
-
-  if (api) {
-    return api(str, max_rect, font_params, text_attr, line_height, cursor_offset);
-  } else {
-    return { x: 0, y: 0 }
-  }
-}
-
-class PackedFontParams {
-  public font?: string;  // font family name
-  public size?: number;  // font size
-  public bold?: string;  // ""/"bold"
-  public italic?: string; // ""/"italic"
-  public alignment?: string; // left / right /center
-  public textColour?: string;
-}
-
-/**k
-   * 创建文本描述符
-   *
-   * @public
-   * @func PackFontParam
-   * @param {string} font_family 			CSS字体名字，如“黑体 欧文”（支持多字体设置）
-   * @param {int} font_size
-   * @param {boolean} italic			是否为斜体
-   * @param {boolean} bold			是否加粗
-   * @param {string} alignment 		水平对齐方式，支持("left", "middle", "right", "justify")
-   * @param {string} text_color		文字颜色(format "#FFFFFF")
-   **/
-function PackFontParams(
-  font_family: string | null,
-  font_size: number,
-  bold: boolean,
-  italic: boolean,
-  alignment: string,
-  text_color: string | null): PackedFontParams {
-
-  let packed = new PackedFontParams();
-
-  if (!font_size) font_size = Forge.TextUtils.sDefaultFontSize;
-  if (!font_family) font_family = Forge.TextUtils.sDefaultFont;
-
-  packed.size = font_size;
-  packed.font = font_family!;
-  packed.italic = italic ? "italic" : "";
-  packed.bold = bold ? "bold" : "";
-
-  packed.alignment = (alignment && alignment.length > 0) ? alignment : "left";
-  packed.textColour = text_color ? text_color : Forge.TextUtils.sDefaultFontColor;
-
-  return packed;
+function getCursorPosition(
+  cursorOffset: number,
+  text: String,
+  fontStyle: CssFontStyle,
+  textLayoutStyle: CssTextLayoutStyle,
+  buildCache: boolean
+): CursorResult {
+  let result: CursorResult = Forge.TextUtils.GetCursorPosition(
+    0,
+    cursorOffset, text,
+    fontStyle, textLayoutStyle,
+    buildCache);
+  return result;
 }
 
-declare interface PackedTextAttrs {
-  text_overflow: string;
-  word_wrap: string;
+/**
+ * 获取光标的位置
+ *
+ * @public
+ * @func GetCursorPositionCached
+ * @return {CursorResult}	 光标的所在位置{x:0,y:0}
+ **/
+function getCursorPositionCached(
+  cachedId: number,
+  cursorOffset: number
+): CursorResult {
+  let result: CursorResult = Forge.TextUtils.GetCursorPosition(
+    cachedId,
+    cursorOffset,
+    null,
+    null,
+    null,
+    true);
+  return result;
 }
 
-/**
-   * 创建文本区域描述符
-   *
-   * @public
-   * @func PackTextAttrs
-   * @param {String} text_overflow 超过描画边界时的处理方式：<br>
-   *     							"none" 按照文字宽度描画<br>
-   *     							"clip" 超出本分不显示（默认）<br>
-   *     							"ellipsis" 如果超出，则末尾显示“...”
-   *     							其余字符 当文字超出时，用此字符替换“...”的位置
-   * @param {String} word_wrap  设置自然换行规则<br>
-   *     							"none":“不折行”<br>
-   *     							"normal"：折行时，尽量不切断单词（仅支持英文单词）<br>
-   *     							"break_word"：不去识别单词，到达边缘就折行（执行效率高）
-   * @return {PackedTextAttrs} 文本区域描述符
-   **/
-function PackTextAttrs(text_overflow: string, word_wrap: string): PackedTextAttrs {
-  if (!text_overflow) text_overflow = "none";
-  if (!word_wrap) word_wrap = "none";
-
-  return { text_overflow: text_overflow, word_wrap: word_wrap };
+function recycleCursorPositionCache(
+  cached_id: number
+) {
+  Forge.TextUtils.RemoveCursorTextCache(cached_id);
 }
 
 const TextTools = {
   getOneLineTextDrawWidth,
   getTextWidth,
   isRtl,
-  PackFontParams,
-  PackTextAttrs,
-  GetCursorPosition
+  getCursorPosition,
+  getCursorPositionCached,
+  recycleCursorPositionCache
 }
 
 export { getTextWidth, TextTools };