fix/迁移最新comfyui最新弃用api (#148)

Author: Ybqac

bizyui/js/dialog/sam_edit.js

@@ -1,6 +1,7 @@
 import { api } from "../../../scripts/api.js";
 import { ComfyApp } from "../../../scripts/app.js";
-import { $el, ComfyDialog, } from "../../../scripts/ui.js";
+import { ComfyDialog } from "../utils/dialog.js";
+import { $el } from "../utils/el.js";
 
 function loadImage(imagePath) {
     return new Promise((resolve, reject) => {
@@ -123,10 +124,16 @@ class SAMEditorDialog extends ComfyDialog {
 
     is_layout_created = false;
     constructor() {
-      super();
-      this.element = $el("div.comfy-modal", { parent: document.body }, [
-        $el("div.comfy-modal-content", [...this.createButtons()])
-      ]);
+      super(); // super() 已经创建了 this.element，现在只需要添加按钮
+      const content = this.element.querySelector('.comfy-modal-content');
+      if (content) {
+        const buttons = this.createButtons();
+        buttons.forEach(button => {
+          if (button instanceof Element) {
+            content.appendChild(button);
+          }
+        });
+      }
     }
     createButtons() {
       return [];

bizyui/js/menus.js

@@ -1,5 +1,5 @@
 import { app } from "../../scripts/app.js";
-import { $el } from "../../scripts/ui.js";
+import { $el } from "./utils/el.js";
 import { styleMenus } from "./subassembly/styleMenus.js";
 import './bizyair_frontend.js'
 class FloatingButton {

bizyui/js/subassembly/dialog.js

@@ -1,4 +1,4 @@
-import { $el } from "../../../scripts/ui.js";
+import { $el } from "../utils/el.js";
 
 
 function generateUUID() {

bizyui/js/utils/dialog.js

@@ -0,0 +1,45 @@
+// 原生的 ComfyDialog 类实现，提取自 ComfyUI_frontend/src/scripts/ui/dialog.ts
+// 用于替代废弃的 scripts/ui.js 中的 ComfyDialog
+
+import { $el } from './el.js'
+
+export class ComfyDialog extends EventTarget {
+  constructor(type = 'div', buttons = null) {
+    super()
+    this._buttons = buttons
+    this.element = $el(type + '.comfy-modal', { parent: document.body }, [
+      $el('div.comfy-modal-content', [
+        $el('p', { $: (p) => (this.textElement = p) }),
+        ...this.createButtons()
+      ])
+    ])
+  }
+
+  createButtons() {
+    return (
+      this._buttons ?? [
+        $el('button', {
+          type: 'button',
+          textContent: 'Close',
+          onclick: () => this.close()
+        })
+      ]
+    )
+  }
+
+  close() {
+    this.element.style.display = 'none'
+  }
+
+  show(html) {
+    if (typeof html === 'string') {
+      this.textElement.innerHTML = html
+    } else {
+      this.textElement.replaceChildren(
+        ...(html instanceof Array ? html : [html])
+      )
+    }
+    this.element.style.display = 'flex'
+  }
+}
+

bizyui/js/utils/el.js

@@ -0,0 +1,64 @@
+// 原生的 $el 函数实现，提取自 ComfyUI_frontend/src/scripts/ui.ts00
+// 用于替代废弃的 scripts/ui.js 中的 $el
+
+function $el(tag, propsOrChildren, children) {
+  // 解析标签和类名（例如 "div.class1.class2"）
+  const split = tag.split('.')
+  const element = document.createElement(split.shift())
+
+  // 添加类名
+  if (split.length > 0) {
+    element.classList.add(...split)
+  }
+
+  if (propsOrChildren) {
+    if (typeof propsOrChildren === 'string') {
+      propsOrChildren = { textContent: propsOrChildren }
+    } else if (propsOrChildren instanceof Element) {
+      propsOrChildren = [propsOrChildren]
+    }
+
+    if (Array.isArray(propsOrChildren)) {
+      element.append(...propsOrChildren)
+    } else {
+      const { parent, $: cb, dataset, style, ...rest } = propsOrChildren
+
+      // 处理 for 属性（label 的 for 属性）
+      if (rest.for) {
+        element.setAttribute('for', rest.for)
+      }
+
+      // 设置样式
+      if (style) {
+        Object.assign(element.style, style)
+      }
+
+      // 设置 dataset
+      if (dataset) {
+        Object.assign(element.dataset, dataset)
+      }
+
+      // 设置其他属性
+      Object.assign(element, rest)
+
+      // 添加子元素
+      if (children) {
+        element.append(...(Array.isArray(children) ? children : [children]))
+      }
+
+      // 添加到父元素
+      if (parent) {
+        parent.append(element)
+      }
+
+      // 执行回调函数
+      if (cb) {
+        cb(element)
+      }
+    }
+  }
+
+  return element
+}
+
+export { $el }

version.txt

@@ -1 +1 @@
-1.2.78
+1.2.79