@widget-js/core 0.10.27 → 0.11.4

package/dist/index.d.ts

@@ -1099,20 +1099,34 @@ declare class GridSystem extends GridRect {
     verticalCellCount: number;
     screenWidth: number;
     screenHeight: number;
+    /**
+     * 屏幕x坐标，用于解决多块屏幕坐标计算问题
+     */
+    screenLeft?: number;
+    /**
+     * 屏幕y坐标，用于解决多块屏幕坐标计算问题
+     */
+    screenTop?: number;
+    canvasScreenTop: number;
+    canvasScreenLeft: number;
     /**
      *
      * @param cellSize
      * @param padding     至少保留的边距
      * @param screenWidth
      * @param screenHeight
+     * @param screenX
+     * @param screenY
      */
-    constructor(cellSize: number, padding: number, screenWidth: number, screenHeight: number);
+    constructor(cellSize: number, padding: number, screenWidth: number, screenHeight: number, screenX?: number, screenY?: number);
     /**
      * 将坐标对齐到网格上
      * @param x
      * @param y
+     * @param gridSystem
      */
-    snapPosition(x: number, y: number): number[];
+    snapCanvasPosition(x: number, y: number): number[];
+    private snapPosition;
     snapSize(width: number, height: number): number[];
     /**
      * 将矩形对齐到网格上
@@ -1122,7 +1136,24 @@ declare class GridSystem extends GridRect {
      * @param minHeight
      * @param maxHeight
      */
-    snapRect(rect: GridRect, minWidth: number, maxWidth: number, minHeight: number, maxHeight: number): IGridRect;
+    snapCanvasRect(rect: GridRect, minWidth: number, maxWidth: number, minHeight: number, maxHeight: number): IGridRect;
+    private snapRect;
+    /**
+     * 将矩形对齐到网格上，与snapRect的区别是，这个会加上屏幕x和y坐标，用于适配多个显示器
+     * @param rect
+     * @param minWidth
+     * @param maxWidth
+     * @param minHeight
+     * @param maxHeight
+     */
+    snapWindow(rect: GridRect, minWidth: number, maxWidth: number, minHeight: number, maxHeight: number): IGridRect;
+    /**
+     * 限制值不超出屏幕
+     * @param value
+     * @param min
+     * @param max
+     * @private
+     */
     private getRangeValue;
     getWidth(): number;
     getHeight(): number;
@@ -1412,7 +1443,14 @@ declare class ApiConstants {
 }
 
 interface IShortcutApi {
-    register(shortcut: string): void;
+    /**
+     * register shortcut for widget, if registered successful, {@link BroadcastEvent} will be sent once shortcut hits
+     * @see https://www.electronjs.org/docs/latest/api/accelerator
+     * @example Ctrl+Meta+Y, Meta for windows key
+     * @param shortcut
+     * @return true if register success
+     */
+    register(shortcut: string): Promise<boolean>;
     unregister(shortcut: string): void;
 }
 type ShortcutApiMethods = keyof IShortcutApi;
@@ -1474,16 +1512,33 @@ interface ILogApi {
 type LogApiMethods = keyof ILogApi;
 declare const LogApi: ILogApi;
 
+interface SystemFile {
+    isDir: boolean;
+    name: string;
+    absolutePath: string;
+    /**
+     * mine type
+     */
+    type: string;
+    children?: SystemFile[];
+    /**
+     * 上传后的ID
+     */
+    uploadId?: string;
+}
 interface ReadDirOptions {
     ignoreDir?: boolean;
     traverseDir?: boolean;
 }
 interface IFileApi {
-    readDirectory(path: string, options?: ReadDirOptions): Promise<string[]>;
+    readDirectory(path: string, options?: ReadDirOptions): Promise<SystemFile[]>;
     isDirectory(filePath: string): Promise<boolean>;
     getFileType(filePath: string): Promise<FileTypeResult>;
+    downloadUrl(url: string): Promise<string>;
+    exists(filePath: string): Promise<boolean>;
+    delete(filePath: string): Promise<boolean>;
 }
 type FileApiMethods = keyof IFileApi;
 declare const FileApi: IFileApi;
 
-export { AlignPosition, ApiConstants, AppApi, AppApiConstants, AppApiEvent, AppApiMethods, AppMouseEvent, AppNotification, BaseApi, BroadcastApi, BroadcastApiMethods, BroadcastEvent, BroadcastEventType, BrowserWindowApi, BrowserWindowApiEvent, BrowserWindowApiMethods, Channel, ClipboardApi, ClipboardApiEvent, ClipboardApiMethods, DeployMode, DeployedPage, DeployedWidget, DeployedWidgetApi, DeployedWidgetApiMethods, DevOptions, DeviceApi, DeviceApiMethods, DialogApi, DialogApiMethods, ElectronApi, ElectronUtils, FileApi, FileApiMethods, Gravity, GridRect, GridSystem, HostedMode, IGridRect, IPage, IPageOptions, IWidgetDataApi, IWidgetOptions, IWindowSize, LanguageCode, LanguageTextMap, LocalPackageUrlInfo, LocationQuery, LocationQueryRaw, LocationQueryValue, LocationQueryValueRaw, LogApi, LogApiMethods, MetaInfo, NativeKeyboardEvent, NormalizeOptions, NotificationApi, NotificationApiEvent, NotificationApiMethods, NotificationOption, NotificationSize, NotificationType, OpenUrlOptions, Page, Point, Position, ProcessApi, ProcessApiMethods, ReadDirOptions, Rectangle, RemotePackageUrlInfo, SaveWidgetOption, SetPositionOptions, ShortcutApi, ShortcutApiEvent, ShortcutApiMethods, StoreApi, StoreApiMethods, ThemeMode, WebSocketEvent, WebSocketEventType, Widget, WidgetApi, WidgetApiEvent, WidgetApiMethods, WidgetData, WidgetDataApi, WidgetDataApiMethods, WidgetKeyword, WidgetPackage, WidgetPackageOptions, WidgetParams, WidgetPermission, WidgetRoute, WidgetUrlUtils, getTextByLanguageCode, normalizeUrl, parseQuery, stringifyQuery };
+export { AlignPosition, ApiConstants, AppApi, AppApiConstants, AppApiEvent, AppApiMethods, AppMouseEvent, AppNotification, BaseApi, BroadcastApi, BroadcastApiMethods, BroadcastEvent, BroadcastEventType, BrowserWindowApi, BrowserWindowApiEvent, BrowserWindowApiMethods, Channel, ClipboardApi, ClipboardApiEvent, ClipboardApiMethods, DeployMode, DeployedPage, DeployedWidget, DeployedWidgetApi, DeployedWidgetApiMethods, DevOptions, DeviceApi, DeviceApiMethods, DialogApi, DialogApiMethods, ElectronApi, ElectronUtils, FileApi, FileApiMethods, Gravity, GridRect, GridSystem, HostedMode, IGridRect, IPage, IPageOptions, IWidgetDataApi, IWidgetOptions, IWindowSize, LanguageCode, LanguageTextMap, LocalPackageUrlInfo, LocationQuery, LocationQueryRaw, LocationQueryValue, LocationQueryValueRaw, LogApi, LogApiMethods, MetaInfo, NativeKeyboardEvent, NormalizeOptions, NotificationApi, NotificationApiEvent, NotificationApiMethods, NotificationOption, NotificationSize, NotificationType, OpenUrlOptions, Page, Point, Position, ProcessApi, ProcessApiMethods, ReadDirOptions, Rectangle, RemotePackageUrlInfo, SaveWidgetOption, SetPositionOptions, ShortcutApi, ShortcutApiEvent, ShortcutApiMethods, StoreApi, StoreApiMethods, SystemFile, ThemeMode, WebSocketEvent, WebSocketEventType, Widget, WidgetApi, WidgetApiEvent, WidgetApiMethods, WidgetData, WidgetDataApi, WidgetDataApiMethods, WidgetKeyword, WidgetPackage, WidgetPackageOptions, WidgetParams, WidgetPermission, WidgetRoute, WidgetUrlUtils, getTextByLanguageCode, normalizeUrl, parseQuery, stringifyQuery };

package/dist/index.js

@@ -1031,14 +1031,26 @@ var GridSystem = class extends GridRect {
   verticalCellCount;
   screenWidth;
   screenHeight;
+  /**
+   * 屏幕x坐标，用于解决多块屏幕坐标计算问题
+   */
+  screenLeft;
+  /**
+   * 屏幕y坐标，用于解决多块屏幕坐标计算问题
+   */
+  screenTop;
+  canvasScreenTop;
+  canvasScreenLeft;
   /**
    *
    * @param cellSize
    * @param padding     至少保留的边距
    * @param screenWidth
    * @param screenHeight
+   * @param screenX
+   * @param screenY
    */
-  constructor(cellSize, padding, screenWidth, screenHeight) {
+  constructor(cellSize, padding, screenWidth, screenHeight, screenX, screenY) {
     let gridMaxWidth = screenWidth - padding * 2;
     let gridMaxHeight = screenHeight - padding * 2;
     let horizontalPadding = gridMaxWidth % cellSize / 2 + padding;
@@ -1046,20 +1058,28 @@ var GridSystem = class extends GridRect {
     const horizontalCellCount = Math.floor(gridMaxWidth / cellSize);
     const verticalCellCount = Math.floor(gridMaxHeight / cellSize);
     super(horizontalPadding, verticalPadding, horizontalCellCount * cellSize, verticalCellCount * cellSize);
+    this.canvasScreenLeft = horizontalPadding + (screenX ?? 0);
+    this.canvasScreenTop = verticalPadding + (screenY ?? 0);
     this.cellSize = cellSize;
     this.screenWidth = screenWidth;
     this.screenHeight = screenHeight;
     this.horizontalCellCount = horizontalCellCount;
     this.verticalCellCount = verticalCellCount;
+    this.screenLeft = screenX;
+    this.screenTop = screenY;
   }
   /**
    * 将坐标对齐到网格上
    * @param x
    * @param y
+   * @param gridSystem
    */
-  snapPosition(x, y) {
-    let newX = this.getRangeValue(x - this.left, 0, this.width);
-    let newY = this.getRangeValue(y - this.top, 0, this.height);
+  snapCanvasPosition(x, y) {
+    let newX = this.getRangeValue(x - this.left, 0, this.right);
+    let newY = this.getRangeValue(y - this.top, 0, this.bottom);
+    return this.snapPosition(newX, newY);
+  }
+  snapPosition(newX, newY) {
     const diffX = newX % this.cellSize;
     if (diffX >= this.cellSize / 2) {
       newX = newX + this.cellSize - diffX;
@@ -1099,8 +1119,11 @@ var GridSystem = class extends GridRect {
    * @param minHeight
    * @param maxHeight
    */
-  snapRect(rect, minWidth, maxWidth, minHeight, maxHeight) {
-    let [newX, newY] = this.snapPosition(rect.left, rect.top);
+  snapCanvasRect(rect, minWidth, maxWidth, minHeight, maxHeight) {
+    let [newX, newY] = this.snapCanvasPosition(rect.left, rect.top);
+    return this.snapRect(rect, minWidth, maxWidth, minHeight, maxHeight, newX, newY);
+  }
+  snapRect(rect, minWidth, maxWidth, minHeight, maxHeight, newX, newY) {
     let [newWidth, newHeight] = this.snapSize(rect.width, rect.height);
     newWidth = this.getRangeValue(newWidth, minWidth, maxWidth);
     newHeight = this.getRangeValue(newHeight, minHeight, maxHeight);
@@ -1112,6 +1135,32 @@ var GridSystem = class extends GridRect {
     }
     return new GridRect(newX, newY, newWidth, newHeight);
   }
+  /**
+   * 将矩形对齐到网格上，与snapRect的区别是，这个会加上屏幕x和y坐标，用于适配多个显示器
+   * @param rect
+   * @param minWidth
+   * @param maxWidth
+   * @param minHeight
+   * @param maxHeight
+   */
+  snapWindow(rect, minWidth, maxWidth, minHeight, maxHeight) {
+    rect.left = rect.left - (this.screenLeft ?? 0);
+    rect.top = rect.top - (this.screenTop ?? 0);
+    let result = this.snapCanvasRect(rect, minWidth, maxWidth, minHeight, maxHeight);
+    return new GridRect(
+      result.left + (this.screenLeft ?? 0),
+      result.top + (this.screenTop ?? 0),
+      result.width,
+      result.height
+    );
+  }
+  /**
+   * 限制值不超出屏幕
+   * @param value
+   * @param min
+   * @param max
+   * @private
+   */
   getRangeValue(value, min, max) {
     if (value < min) {
       return min;
@@ -1122,10 +1171,10 @@ var GridSystem = class extends GridRect {
     return value;
   }
   getWidth() {
-    return this.right - this.left;
+    return this.width;
   }
   getHeight() {
-    return this.bottom - this.top;
+    return this.height;
   }
 };
 
@@ -1982,6 +2031,15 @@ var FileApiImpl = class extends BaseApi {
   readDirectory(path, options) {
     return this.invokeMethod("readDirectory", path, options);
   }
+  delete(filePath) {
+    return this.invokeMethod("delete", filePath);
+  }
+  downloadUrl(url) {
+    return this.invokeMethod("downloadUrl", url);
+  }
+  exists(filePath) {
+    return this.invokeMethod("exists", filePath);
+  }
 };
 var FileApi = new FileApiImpl();
 export {