yanleafadmin 2.0.2__tar.gz → 2.0.3__tar.gz

{yanleafadmin-2.0.2/yanleafadmin.egg-info → yanleafadmin-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yanleafadmin
-Version: 2.0.2
+Version: 2.0.3
 Summary: 极简白色现代 Django Admin 主题体系 — 基于 Django + Bulma CSS
 Home-page: https://github.com/zhouyanye/yanleafadmin
 Author: zhouyanye
@@ -219,6 +219,22 @@ yanleaf_admin_project/
 └── README.md
 ```
 
+### URL 配置
+
+如果使用了 ER 图、AI 助手等功能，需要在 `urls.py` 中添加对应路由：
+
+```python
+from django.urls import path, include
+
+urlpatterns = [
+    path('i18n/', include('django.conf.urls.i18n')),   # 语言切换（必须）
+    path('admin/', admin.site.urls),
+    path('admin/erd/', include('apps.erd_engine.urls')),  # ER 图
+    path('api/ai/', include('apps.ai_assistant.urls')),   # AI 助手
+    path('yla-api/', include('apps.theme.urls')),          # SmartChart 等
+]
+```
+
 ## YANLEAF_ADMIN 完整配置项
 
 | 配置项 | 类型 | 默认值 | 说明 |

{yanleafadmin-2.0.2 → yanleafadmin-2.0.3}/README.md

@@ -200,6 +200,22 @@ yanleaf_admin_project/
 └── README.md
 ```
 
+### URL 配置
+
+如果使用了 ER 图、AI 助手等功能，需要在 `urls.py` 中添加对应路由：
+
+```python
+from django.urls import path, include
+
+urlpatterns = [
+    path('i18n/', include('django.conf.urls.i18n')),   # 语言切换（必须）
+    path('admin/', admin.site.urls),
+    path('admin/erd/', include('apps.erd_engine.urls')),  # ER 图
+    path('api/ai/', include('apps.ai_assistant.urls')),   # AI 助手
+    path('yla-api/', include('apps.theme.urls')),          # SmartChart 等
+]
+```
+
 ## YANLEAF_ADMIN 完整配置项
 
 | 配置项 | 类型 | 默认值 | 说明 |

{yanleafadmin-2.0.2 → yanleafadmin-2.0.3}/apps/dashboard_engine/apps.py

@@ -8,8 +8,14 @@ class DashboardEngineConfig(AppConfig):
     def ready(self):
         from django.contrib import admin
         from django.contrib.auth import get_user_model
-        import psutil
         import json
+
+        try:
+            import psutil
+            _has_psutil = True
+        except ImportError:
+            _has_psutil = False
+
         original_index = admin.site.index
 
         def custom_index(request, extra_context=None):
@@ -23,7 +29,7 @@ class DashboardEngineConfig(AppConfig):
                 today_start = timezone.now().replace(hour=0, minute=0, second=0, microsecond=0)
                 today_count = User.objects.filter(date_joined__gte=today_start).count()
 
-                memory_percent = psutil.virtual_memory().percent
+                memory_percent = psutil.virtual_memory().percent if _has_psutil else 0.0
             except Exception:
                 total_users = 0
                 active_users = 0

{yanleafadmin-2.0.2 → yanleafadmin-2.0.3}/apps/erd_engine/views.py

@@ -145,8 +145,11 @@ def er_word_export(request):
     except (json.JSONDecodeError, TypeError):
         return HttpResponse('Invalid data', status=400)
 
-    from docx import Document
-    from docx.shared import Pt
+    try:
+        from docx import Document
+        from docx.shared import Pt
+    except ImportError:
+        return HttpResponse('Word 导出需要安装 python-docx：pip install yanleafadmin[word]', status=500)
     from docx.enum.text import WD_ALIGN_PARAGRAPH
     from docx.oxml.ns import qn
     from docx.oxml import OxmlElement

{yanleafadmin-2.0.2 → yanleafadmin-2.0.3}/apps/theme/context_processors.py

@@ -4,9 +4,18 @@ from .settings import get_config
 
 def yanleaf_settings(request):
     config = get_config()
+    # 安全检测 set_language URL 是否可用
+    try:
+        from django.urls import reverse
+        reverse('set_language')
+        has_i18n = True
+    except Exception:
+        has_i18n = False
+
     return {
         'YANLEAF_CONFIG': config,
         'YANLEAF_SHOW_CREDIT': config.get('show_credit', True),
         'YANLEAF_SIDEBAR_WIDTH': config.get('sidebar_width', '250px'),
         'YANLEAF_THEME_COLOR': config.get('theme_color', '#485fc7'),
+        'YLA_HAS_SET_LANGUAGE': has_i18n,
     }

yanleafadmin-2.0.3/apps/theme/forms.py

@@ -0,0 +1,24 @@
+from django import forms
+from django.contrib.auth.forms import AuthenticationForm
+
+try:
+    from captcha.fields import CaptchaField
+    _has_captcha = True
+except ImportError:
+    _has_captcha = False
+    CaptchaField = None
+
+
+class YanleafAdminLoginForm(AuthenticationForm):
+    """重写 Admin 登录表单，可选 captcha"""
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if _has_captcha and CaptchaField:
+            self.fields['captcha'] = CaptchaField(
+                label="验证码",
+                error_messages={
+                    'invalid': '验证码输入错误，请重新输入',
+                    'required': '请输入验证码'
+                }
+            )

{yanleafadmin-2.0.2 → yanleafadmin-2.0.3}/apps/theme/static/yanleafadmin/js/core.js

@@ -72,7 +72,7 @@
 
     window.YLA.initDataTable = function(tableSelector, options) {
         var langCode = window.YLA.lang || 'zh-hans';
-        var langUrl = '/static/yanleafadmin/js/i18n/datatables.' + langCode + '.json';
+        var langUrl = (window.YLA.staticUrl || '/static/yanleafadmin/') + 'js/i18n/datatables.' + langCode + '.json';
         var defaults = {
             language: { url: langUrl },
             pageLength: 25,

{yanleafadmin-2.0.2 → yanleafadmin-2.0.3}/apps/theme/templates/admin/base.html

@@ -142,6 +142,7 @@
 
                     <!-- 语言切换 -->
                     {% block language_switcher %}
+                    {% if YLA_HAS_SET_LANGUAGE %}
                     <div class="dropdown is-right" id="lang-dropdown">
                         <div class="dropdown-trigger">
                             <button class="icon-btn" title="{% translate '切换语言' %}">
@@ -167,6 +168,7 @@
                             </div>
                         </div>
                     </div>
+                    {% endif %}
                     {% endblock %}
 
                     <!-- 用户菜单 -->
@@ -250,7 +252,7 @@
     <!-- ============================================================
     YanLeafAdmin 核心脚本
     ============================================================ -->
-    <script>window.YLA=window.YLA||{};window.YLA.lang='{{ request.LANGUAGE_CODE|default:"zh-hans" }}';</script>
+    <script>window.YLA=window.YLA||{};window.YLA.lang='{{ request.LANGUAGE_CODE|default:"zh-hans" }}';window.YLA.staticUrl='{% static 'yanleafadmin/' %}';</script>
 <script>window.YLA.aiEnabled = {{ YANLEAF_CONFIG.ai_assistant_enabled|default:True|yesno:'true,false' }};</script>
     <script src="{% static 'yanleafadmin/js/core.js' %}"></script>
     <script src="{% static 'yanleafadmin/js/components.js' %}"></script>

{yanleafadmin-2.0.2 → yanleafadmin-2.0.3}/apps/theme/templates/admin/change_list.html

@@ -167,7 +167,7 @@
                 { extend: 'print', text: '打印' }
             ],
             language: {
-                url: '/static/yanleafadmin/js/i18n/datatables.' + langCode + '.json'
+                url: (window.YLA.staticUrl || '/static/yanleafadmin/') + 'js/i18n/datatables.' + langCode + '.json'
             }
         });
 

{yanleafadmin-2.0.2 → yanleafadmin-2.0.3}/apps/theme/templates/admin/login.html

@@ -69,6 +69,7 @@
                     {{ form.password.errors }}
                 </div>
 
+                {% if form.captcha %}
                 <div class="field mb-5">
                     <label class="label is-size-7 has-text-weight-semibold">{% translate '安全验证' %}</label>
                     <div class="captcha-field-wrapper">
@@ -76,6 +77,7 @@
                     </div>
                     {{ form.captcha.errors }}
                 </div>
+                {% endif %}
 
                 <div class="field mt-5">
                     <button class="button is-dark is-fullwidth has-text-weight-medium" type="submit">

{yanleafadmin-2.0.2 → yanleafadmin-2.0.3}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='yanleafadmin',
-    version='2.0.2',
+    version='2.0.3',
     description='极简白色现代 Django Admin 主题体系 — 基于 Django + Bulma CSS',
     long_description=open('README.md', encoding='utf-8').read() if __import__('os').path.exists('README.md') else '',
     long_description_content_type='text/markdown',

{yanleafadmin-2.0.2 → yanleafadmin-2.0.3/yanleafadmin.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yanleafadmin
-Version: 2.0.2
+Version: 2.0.3
 Summary: 极简白色现代 Django Admin 主题体系 — 基于 Django + Bulma CSS
 Home-page: https://github.com/zhouyanye/yanleafadmin
 Author: zhouyanye
@@ -219,6 +219,22 @@ yanleaf_admin_project/
 └── README.md
 ```
 
+### URL 配置
+
+如果使用了 ER 图、AI 助手等功能，需要在 `urls.py` 中添加对应路由：
+
+```python
+from django.urls import path, include
+
+urlpatterns = [
+    path('i18n/', include('django.conf.urls.i18n')),   # 语言切换（必须）
+    path('admin/', admin.site.urls),
+    path('admin/erd/', include('apps.erd_engine.urls')),  # ER 图
+    path('api/ai/', include('apps.ai_assistant.urls')),   # AI 助手
+    path('yla-api/', include('apps.theme.urls')),          # SmartChart 等
+]
+```
+
 ## YANLEAF_ADMIN 完整配置项
 
 | 配置项 | 类型 | 默认值 | 说明 |

{yanleafadmin-2.0.2 → yanleafadmin-2.0.3}/yanleafadmin.egg-info/SOURCES.txt

@@ -77,7 +77,6 @@ apps/theme/static/yanleafadmin/vendor/fontawesome/webfonts/fa-solid-900.woff2
 apps/theme/static/yanleafadmin/vendor/gojs/go.js
 apps/theme/static/yanleafadmin/vendor/jquery/jquery.min.js
 apps/theme/static/yanleafadmin/vendor/jszip/jszip.min.js
-apps/theme/static/yanleafadmin/vendor/mermaid/mermaid.min.js
 apps/theme/static/yanleafadmin/vendor/select2/css/select2.min.css
 apps/theme/static/yanleafadmin/vendor/select2/js/select2.min.js
 apps/theme/static/yanleafadmin/vendor/sweetalert2/sweetalert2.all.min.js

yanleafadmin-2.0.2/apps/theme/forms.py

@@ -1,13 +0,0 @@
-from django import forms
-from django.contrib.auth.forms import AuthenticationForm
-from captcha.fields import CaptchaField
-
-class YanleafAdminLoginForm(AuthenticationForm):
-    """重写 Admin 登录表单，强行塞入 captcha 校验字段"""
-    captcha = CaptchaField(
-        label="验证码",
-        error_messages={
-            'invalid': '验证码输入错误，请重新输入',
-            'required': '请输入验证码'
-        }
-    )