pycoze 0.1.61__tar.gz → 0.1.63__tar.gz

{pycoze-0.1.61 → pycoze-0.1.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.61
+Version: 0.1.63
 Summary: Package for pycoze only!
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com

{pycoze-0.1.61 → pycoze-0.1.63}/pycoze/ui/base.py

@@ -19,7 +19,7 @@ def get_ui():
     stack_files = list(reversed([s.filename.replace('\\', '/') for s in stack]))
     match_item = None
     for f in stack_files:
-        for v in params["uiRecords"]:
+        for v in params["uiData"]:
             if v["uiFile"] == f:
                 match_item = v
                 break
@@ -27,7 +27,7 @@ def get_ui():
             break
 
     if not match_item:
-        raise Exception("uiRecords not found for file")
+        raise Exception("uiData not found for file")
 
     by = match_item["by"]
 

{pycoze-0.1.61 → pycoze-0.1.63}/pycoze/ui/ui_def.py

@@ -3,6 +3,7 @@ from .typ import useDefaultType
 from typing import Union, List
 from .color import hex_to_rgb, rgb_to_hsl, ColorFormat
 import sys
+import inspect
 
 
 def useDefault(name, default):
@@ -51,7 +52,20 @@ def password(name, default, tip="", hide_if="", style="", cls="") -> str:
 
 
 def tool(name, default, tools, tip="", hide_if="", style="", cls="") -> str:
-    return eval(useDefault(name, default))
+    ret = useDefault(name, default)
+    if isinstance(ret, str):
+        # 获取调用栈
+        frame = inspect.currentframe()
+        try:
+            # 获取调用者的全局变量
+            caller_globals = frame.f_back.f_globals
+        finally:
+            del frame
+
+        ret = eval(ret, caller_globals)
+        return ret
+    else:
+        return ret
 
 
 def color(

{pycoze-0.1.61 → pycoze-0.1.63}/pycoze.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.61
+Version: 0.1.63
 Summary: Package for pycoze only!
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com

{pycoze-0.1.61 → pycoze-0.1.63}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pycoze",
-    version="0.1.61",
+    version="0.1.63",
     packages=find_packages(),
     install_requires=[],
     author="Yuan Jie Xiong",