Merge pull request #1 from design61/master

fix component id

Author: LegionFu

scripts/state_api.py

@@ -85,7 +85,7 @@ def set_lightdiffusionflow_file():
 再用json2js的onchange事件触发js来点击隐藏按钮开始触发设置图片的事件队列。
 '''
 def on_after_component(component, **kwargs):
-
+  
   try:
     if(Webui_Comps.get(kwargs["elem_id"], None) == None):
       Webui_Comps[kwargs["elem_id"]] = component
@@ -419,13 +419,49 @@ class Script(scripts.Script):
 
   def __init__(self) -> None:
     super().__init__()
+    #记录无id元素的id
+    self.new_ids={}
 
   def title(self):
     return "lightdiffusionflow plugin"
 
   def show(self, is_img2img):
     return scripts.AlwaysVisible
 
+  def after_component(self, component, **kwargs):
+    #当前模式
+    teb_mode="img2img" if self.is_img2img else "txt2img"
+    #空id补全方法
+    def in_zone(dom,id=""):
+      if dom:
+        if dom.elem_id:
+          id+="-"+dom.elem_id
+          return in_zone(dom.parent,id)
+        elif dom.elem_classes and dom.elem_classes[0]!='gradio-blocks':
+          if dom.elem_classes[0]=='gradio-accordion':
+            id+='-'+dom.label+"?"
+          return in_zone(dom.parent,id)
+      if re.search('2img_(textual|hypernetworks|checkpoints|lora)_',id):
+        return False
+      else:
+        id=re.sub(r'\?[^\?]+$|[ \?]','',id)
+        if id in self.new_ids:
+          self.new_ids[id]+=1
+        else:
+          self.new_ids[id]=1
+        return id+'-'+str(self.new_ids[id])
+  
+    #记录组件
+    try:
+      #拉取id
+      id=component.elem_id
+      #若没有就重构
+      if id==None:
+        id=component.elem_id==in_zone(component.parent,teb_mode)
+      Webui_Comps[id] = component
+    except BaseException as e:
+      pass
+
   def ui(self, is_img2img):
     global File_extension
 
@@ -486,4 +522,4 @@ def on_before_reload():
 api = StateApi()
 script_callbacks.on_app_started(api.start)
 script_callbacks.on_after_component(on_after_component)
-script_callbacks.on_before_reload(on_before_reload)
+script_callbacks.on_before_reload(on_before_reload)