huangrunheng пре 3 година
родитељ
комит
94181027d0
3 измењених фајлова са 21 додато и 2 уклоњено
  1. 2 0
      module/config/config_menu.py
  2. 4 2
      module/config/config_model.py
  3. 15 0
      tasks/Component/config_base.py

+ 2 - 0
module/config/config_menu.py

@@ -45,6 +45,8 @@ class ConfigMenu:
 
 
     @cached_property
     @cached_property
     def gui_menu_list(self) -> dict:
     def gui_menu_list(self) -> dict:
+        del self.menu['TaskList']
+        del self.menu['Tools']
         return self.menu
         return self.menu
 
 
 
 

+ 4 - 2
module/config/config_model.py

@@ -299,6 +299,7 @@ class ConfigModel(ConfigBase):
             result = []
             result = []
             for key, value in groups["properties"].items():
             for key, value in groups["properties"].items():
                 item = {}
                 item = {}
+                item["name"] = key
                 item["title"] = value["title"] if "title" in value else inflection.humanize(key)
                 item["title"] = value["title"] if "title" in value else inflection.humanize(key)
                 if "description" in value:
                 if "description" in value:
                     item["description"] = value["description"]
                     item["description"] = value["description"]
@@ -307,7 +308,8 @@ class ConfigModel(ConfigBase):
                 item["type"] = value["type"] if "type" in value else "enum"
                 item["type"] = value["type"] if "type" in value else "enum"
                 if 'allOf' in value:
                 if 'allOf' in value:
                     # list
                     # list
-                    item["enumEnum"] = definitions[inflection.camelize(key, uppercase_first_letter=True)]["enum"]
+                    enum_key = re.search(r"/([^/]+)$", value['allOf'][0]['$ref']).group(1)
+                    item["enumEnum"] = definitions[enum_key]["enum"]
                 # TODO: 最大值最小值
                 # TODO: 最大值最小值
                 result.append(item)
                 result.append(item)
             return result
             return result
@@ -339,6 +341,6 @@ if __name__ == "__main__":
         c = ConfigModel()
         c = ConfigModel()
 
 
     # c.save()
     # c.save()
-    print(c.script_task('Script'))
+    print(c.script_task('Orochi'))
 
 
 
 

+ 15 - 0
tasks/Component/config_base.py

@@ -23,7 +23,15 @@ class TimeDelta(timedelta):
     def __repr__(self):
     def __repr__(self):
         return format_timedelta(self)
         return format_timedelta(self)
 
 
+    @classmethod
+    def __modify_schema__(
+            cls, field_schema: dict[str, Any], field: ModelField | None
+    ):
+        if field:
+            field_schema['type'] = 'time_delta'
+
 class ConfigBase(BaseModel):
 class ConfigBase(BaseModel):
+    # 这个是导出json时候的配置,但是新的是导出dict,所以的无效
     class Config:
     class Config:
         json_encoders = {
         json_encoders = {
             TimeDelta: format_timedelta
             TimeDelta: format_timedelta
@@ -65,3 +73,10 @@ class Time(time):
             return value
             return value
         else:
         else:
             raise ValueError("Invalid time format")
             raise ValueError("Invalid time format")
+
+    # @classmethod
+    # def __modify_schema__(
+    #         cls, field_schema: dict[str, Any], field: ModelField | None
+    # ):
+    #     if field:
+    #         field_schema['type'] = 'time'