hortimagic 1.0.1 → 1.0.3

package/dist/index.d.ts

@@ -24,10 +24,20 @@ declare function afterOnmessage(message: string): Promise<string>;
 
 declare function afterSend(message: string): string;
 
+export declare namespace app_tools {
+    export {
+        notice,
+        confirm_2 as confirm
+    }
+}
+
 declare namespace apps {
     export {
         main_app,
-        example_app
+        example_app,
+        dialog_app,
+        script_app,
+        app_tools
     }
 }
 export { apps }
@@ -73,11 +83,23 @@ declare function compressCSS(css: string): string;
  */
 declare function compressHTML(html: string): string;
 
+/**
+ * 确认弹窗函数
+ * @param message 消息提示
+ * @param confirmCallback 选择确认时的回调函数
+ * @param cancelCallback 选择取消时的回调函数
+ * @param closeCallback 关闭弹窗时的回调函数
+ * @example ```javascript
+ * hortimagic.apps.app_tools.confirm('hhhhhhhhhhhhhh',()=>{console.log('qqqqqqqqqqq')},()=>{console.log('cccccccccccc')})
+ * ```
+ */
+declare function confirm_2(message: string, confirmCallback?: Function, cancelCallback?: Function, closeCallback?: Function): void;
+
 declare namespace core {
     export {
         tools,
         iirose_socket,
-        eventEmitter,
+        event_emitter,
         Message,
         encoder,
         decoder,
@@ -131,6 +153,15 @@ export declare namespace dialog {
     }
 }
 
+export declare namespace dialog_app {
+    export {
+        dialogApp,
+        initDialogApp
+    }
+}
+
+declare let dialogApp: HmDialogApp;
+
 /** 移动面板容器 */
 declare let dialogHolder: HTMLDivElement;
 
@@ -186,7 +217,7 @@ declare namespace encoder {
     }
 }
 
-declare namespace eventEmitter {
+declare namespace event_emitter {
     export {
         TinyEmitter,
         emitter
@@ -286,11 +317,11 @@ declare function getUserProfilePictureUrl(): string | null;
 declare function getUserUid(): string | null;
 
 declare class Hidden {
-    /**  */
+    /** 消息的标题，名字？主题 */
     messageName: string;
-    /**  */
+    /** 发送过来的唯一标识 */
     uid: string;
-    /**  */
+    /** 数据 */
     data: string;
     /** 消息类型 */
     readonly messageClass = "hidden";
@@ -535,6 +566,18 @@ declare class HmDialog extends LitElement {
     render(): TemplateResult<1>;
 }
 
+declare class HmDialogApp extends LitElement {
+    dialogOpen: boolean;
+    message: string;
+    closeCallback: Function | null;
+    cancelCallback: Function | null;
+    confirmCallback: Function | null;
+    /** 触发点击事件 */
+    handelClick(): void;
+    static styles: CSSResult;
+    render(): TemplateResult<1>;
+}
+
 declare class HmIcon extends LitElement {
     icon: string;
     size: string;
@@ -852,6 +895,8 @@ export declare const information: {
     name: string;
     /** 项目版本 */
     version: string;
+    /** 项目更新日志 */
+    changelog: string;
     /** 项目描述 */
     description: string;
     /** 项目作者 */
@@ -865,6 +910,8 @@ export declare const information: {
     };
     /** 项目构建时间 */
     buildTime: string;
+    /** 项目是否注入完成 */
+    ingected: boolean;
 };
 
 /**
@@ -874,6 +921,9 @@ declare function ingectlocalScript(): void;
 
 declare function init(): Promise<void>;
 
+/** 初始化对话框模块 */
+declare function initDialogApp(): Promise<void>;
+
 /** 初始化移动面板容器 */
 declare function initDialogHolder(): void;
 
@@ -892,6 +942,8 @@ declare function initMovePanelHolder(): void;
 /** 初始化通知容器 */
 declare function initNotificationHolder(): void;
 
+declare function initScriptApp(): Promise<HmMenu>;
+
 declare function initSocket(): Promise<void>;
 
 /**
@@ -972,6 +1024,9 @@ declare let movePanelItemMaxZindex: number;
  */
 declare function musicCard(typeId: string, title: string, singerName: string, coverUrl: string, color: string, resolutionRatio: string): string;
 
+/**
+ * 消失通知函数
+ */
 declare let notice: {
     success(title: string, content: string, displayTime?: number): void;
     warning(title: string, content: string, displayTime?: number): void;
@@ -982,8 +1037,7 @@ declare let notice: {
 export declare namespace notification {
     export {
         initNotificationHolder,
-        notificationHolder,
-        notice
+        notificationHolder
     }
 }
 
@@ -1094,6 +1148,12 @@ declare class Script {
     constructor(name: string, url: string, enable?: boolean, ingected?: boolean);
 }
 
+export declare namespace script_app {
+    export {
+        initScriptApp
+    }
+}
+
 declare namespace script_tools {
     export {
         Script,

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "hortimagic",
   "private": false,
-  "version": "1.0.1",
+  "version": "1.0.3",
+  "changelog": "修复了对话框注册较晚的bug,增加了初始化完成的标志",
   "author": "Narlen",
   "description": "园艺魔法，花园插件",
   "keywords": [

package/src/components/hm-dialog.ts

@@ -28,7 +28,7 @@ export class HmDialog extends LitElement {
             left: 0;
             width: 100%;
             height: 100%;
-            z-index: 1000;
+            z-index: 999999;
         }
         :host([isopen]) {
             display: block;
@@ -52,6 +52,7 @@ export class HmDialog extends LitElement {
             min-width: 300px;
             box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
             padding: 20px;
+            color:rgb(0,0,0)
         }
         
         .footer {
@@ -82,20 +83,20 @@ export class HmDialog extends LitElement {
         this.isOpen = false;
         this.dispatchEvent(new CustomEvent('hm-dialog-close'));
     }
-    
+
     /** 确认，触发 dialog-close dialog-confirm事件*/
     confirm() {
         // console.debug("确认对话框事件");
         this.close();
         this.dispatchEvent(new CustomEvent('hm-dialog-confirm'));
     }
-    
+
     /** 取消，触发 dialog-close dialog-cancel事件*/
     cancel() {
         this.close();
         this.dispatchEvent(new CustomEvent('hm-dialog-cancel'));
     }
-    
+
     updated(changedProperties: Map<string, unknown>) {
         if (changedProperties.has('isOpen')) {
             if (this.isOpen) {
@@ -105,7 +106,7 @@ export class HmDialog extends LitElement {
             }
         }
     }
-    
+
     render() {
         return html`
 <div class="overlay"

package/src/components/hm-icon.ts

@@ -13,7 +13,8 @@ const iconMap = new Map([
     ['js', '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="currentColor" d="M10.77 7.3h.002c1.045.393 2.479.93 2.479 2.45a2.5 2.5 0 0 1-.224 1.02a2.5 2.5 0 0 1-1.515 1.364a2.5 2.5 0 0 1-1.035.115a2 2 0 0 1-.214.012a2.5 2.5 0 0 1-1.673-.65a2.52 2.52 0 0 1-.838-1.859c0-.202.078-.39.22-.532a.77.77 0 0 1 1.06 0a.74.74 0 0 1 .221.53c0 .952 1.041 1 1.25 1s1.25-.048 1.25-1c0-.413-.447-.648-1.514-1.048h-.003C9.19 8.307 7.753 7.77 7.753 6.25q.005-.537.224-1.02a2.5 2.5 0 0 1 .614-.842a2.5 2.5 0 0 1 .9-.52a3.5 3.5 0 0 1 2.023 0a2.52 2.52 0 0 1 1.738 2.381c0 .201-.078.39-.22.531a.77.77 0 0 1-1.061 0a.74.74 0 0 1-.22-.53c0-.952-1.041-1-1.25-1s-1.25.048-1.25 1c0 .413.447.648 1.514 1.048zM5.751 4.5c0-.2.078-.388.22-.53a.77.77 0 0 1 1.06 0c.142.141.22.33.22.53v5a2.75 2.75 0 0 1-4.695 1.945A2.73 2.73 0 0 1 1.75 9.5V9c0-.2.078-.388.22-.53a.77.77 0 0 1 1.061 0c.142.141.22.33.22.53v.5c0 .33.134.652.366.884c.465.465 1.303.465 1.768 0c.232-.233.366-.555.366-.884z"/></svg>'],
     ['filter', '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" d="M3 4c2.01 2.59 7 9 7 9v7h4v-7s4.98-6.41 7-9z"/></svg>'],
     ['filter-off', '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" d="M3.004 1.59L3 1.586L1.586 3l4.928 4.928L10 12.818V21h4v-5.585l7 7l1.41-1.41L3 1.595zm12.266 9.446L21 3H7.234z"/></svg>'],
-
+    ['eye', '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" d="M16 11v2h-1v1h-1v1h-1v1h-2v-1h-1v-1H9v-1H8v-2h2v-1h1V8h2v1h1v1h1v1z"/><path fill="currentColor" d="M22 11V9h-1V8h-1V7h-1V6h-2V5H7v1H5v1H4v1H3v1H2v2H1v2h1v2h1v1h1v1h1v1h2v1h10v-1h2v-1h1v-1h1v-1h1v-2h1v-2zm-4 2h-1v2h-1v1h-1v1h-2v1h-2v-1H9v-1H8v-1H7v-2H6v-2h1V9h1V8h1V7h2V6h2v1h2v1h1v1h1v2h1z"/></svg>'],
+    ['eye-off', '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" d="M2 13H1v-2h1V9h1V8h1V7h1V6h2V5h8v1h-1v1h-1V6h-2v1H9v1H8v1H7v2H6v2h1v1H6v1H5v1H3v-1H2z"/><path fill="currentColor" d="M8 11h1v1H8zm3-3h1v1h-1zm-2 9H8v1H7v1H6v1H5v1H4v1H3v-1H2v-1h1v-1h1v-1h1v-1h1v-1h1v-1h1v-1h1v-1h1v-1h1v-1h1v-1h1V9h1V8h1V7h1V6h1V5h1V4h1V3h1V2h1v1h1v1h-1v1h-1v1h-1v1h-1v1h-1v1h-1v1h-1v1h-1v1h-1v1h-1v1h-1v1h-1v1H9zm3-2h1v1h-1zm1-1h1v1h-1zm2-2h1v1h-1zm-1 1h1v1h-1z"/><path fill="currentColor" d="M23 11v2h-1v2h-1v1h-1v1h-1v1h-2v1H9v-1h1v-1h1v1h2v-1h2v-1h1v-1h1v-2h1v-2h-1v-1h1V9h1V8h2v1h1v2z"/></svg>'],
 ]);
 
 // 提供静态方法用于外部注册图标

package/src/components/type.d.ts

@@ -45,4 +45,6 @@ declare global {
 //   render() {
 //     return html``;
 //   }
-// }
+// }
+
+// customElements.define('hm-', Hm);