فهرست منبع

feat(module): Hide option values on the oasx GUI

Neptine 1 سال پیش
والد
کامیت
375e41b703
4فایلهای تغییر یافته به همراه41 افزوده شده و 16 حذف شده
  1. 7 2
      module/config/config_model.py
  2. 15 1
      tasks/Component/config_base.py
  3. 9 3
      tasks/GuildBanquet/config.py
  4. 10 10
      tasks/GuildBanquet/res/image.json

+ 7 - 2
module/config/config_model.py

@@ -308,6 +308,10 @@ class ConfigModel(ConfigBase):
             # 将 groups的参数,同导出的json一起合并, 用于前端显示
             # 将 groups的参数,同导出的json一起合并, 用于前端显示
             result = []
             result = []
             for key, value in groups["properties"].items():
             for key, value in groups["properties"].items():
+                # deal with exclude 
+                if key in jsons and jsons[key] == 0xABCDEF:
+                    continue
+
                 item = {}
                 item = {}
                 item["name"] = key
                 item["name"] = key
                 item["title"] = value["title"] if "title" in value else inflection.underscore(key)
                 item["title"] = value["title"] if "title" in value else inflection.underscore(key)
@@ -330,7 +334,7 @@ class ConfigModel(ConfigBase):
         groups_value = groups.copy()
         groups_value = groups.copy()
 
 
         result: dict[str, list] = {}
         result: dict[str, list] = {}
-        for key, value in task.model_dump().items():
+        for key, value in task.model_dump(context={'hide': True}).items():
             if key not in groups:
             if key not in groups:
                 for group_name in groups.keys():
                 for group_name in groups.keys():
                     if group_name in key:
                     if group_name in key:
@@ -436,4 +440,5 @@ if __name__ == "__main__":
         print(e)
         print(e)
         c = ConfigModel()
         c = ConfigModel()
 
 
-    c.script_set_arg('Duel', 'test_list_2', 'switch_all_soul', 'false')
+    print(c.script_task('GuildBanquet'))
+

+ 15 - 1
tasks/Component/config_base.py

@@ -8,7 +8,9 @@ from typing import Any
 from pydantic import BaseModel
 from pydantic import BaseModel
 from pydantic import (BeforeValidator,
 from pydantic import (BeforeValidator,
                       PlainSerializer,
                       PlainSerializer,
-                      WithJsonSchema)
+                      WithJsonSchema,
+                      field_serializer,
+                      SerializationInfo)
 from typing_extensions import Annotated
 from typing_extensions import Annotated
 
 
 
 
@@ -65,5 +67,17 @@ Time = Annotated[time,
                  WithJsonSchema({'type': 'time'}),]
                  WithJsonSchema({'type': 'time'}),]
 
 
 # ---------------------------------------------------------------------------------------------------------------------
 # ---------------------------------------------------------------------------------------------------------------------
+
+@classmethod
+def serializer_exclude(cls, value: any, info: SerializationInfo):
+    if info.context and info.context.get('hide', False):
+        return 0xABCDEF
+    return value
+
+
+def dynamic_hide(*fields: str,):
+    return field_serializer(*fields)(serializer_exclude)
+
+
 class ConfigBase(BaseModel):
 class ConfigBase(BaseModel):
     pass
     pass

+ 9 - 3
tasks/GuildBanquet/config.py

@@ -3,10 +3,10 @@
 # github https://github.com/ohspecial
 # github https://github.com/ohspecial
 from enum import Enum  
 from enum import Enum  
 
 
-from pydantic import Field, BaseModel
+from pydantic import Field, BaseModel, SerializationInfo, field_serializer
 
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase, Time
+from tasks.Component.config_base import ConfigBase, Time, dynamic_hide
 
 
 
 
 class Weekday(str,Enum):
 class Weekday(str,Enum):
@@ -29,9 +29,15 @@ class GuildBanquetTime(BaseModel):
         default=Weekday.Saturday,
         default=Weekday.Saturday,
         description="每周第2次运行时间设置",
         description="每周第2次运行时间设置",
     )
     )
-    run_time_2: Time = Field(default=Time(hour=19, minute=0, second=0))
+    run_time_2: Time = Field(
+        default=Time(hour=19, minute=0, second=0), 
+        description="每周第2次运行时间设置"
+    )
+
+    hide_fileds = dynamic_hide('run_time_1', 'run_time_2')
 
 
 
 
 class GuildBanquet(ConfigBase):
 class GuildBanquet(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
     guild_banquet_time: GuildBanquetTime = Field(default_factory=GuildBanquetTime)
     guild_banquet_time: GuildBanquetTime = Field(default_factory=GuildBanquetTime)
+

+ 10 - 10
tasks/GuildBanquet/res/image.json

@@ -1,11 +1,11 @@
-[
-  {
-    "itemName": "flag",
-    "imageName": "res_flag.png",
-    "roiFront": "1035,12,33,60",
-    "roiBack": "1035,12,33,60",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  }
+[
+  {
+    "itemName": "flag",
+    "imageName": "res_flag.png",
+    "roiFront": "1035,12,33,60",
+    "roiBack": "1035,12,33,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
 ]
 ]