Merge pull request #78 from newpanjing/dev

Dev
newpanjing · Jun 10, 2019 · cb0261c · cb0261c
2 parents 0ef9270 + 3d6ed75
commit cb0261c
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 17 deletions.
diff --git a/QUICK.md b/QUICK.md
@@ -37,6 +37,8 @@ simpleui 快速上手指南
   + [头部添加自定义代码](#头部添加自定义代码)
   + [底部添加自定义代码](#底部添加自定义代码)
   + [自定义按钮](#自定义按钮)
+  + [离线模式](#离线模式)
+
 # 常见问题
   + [settings.py](#settingspy-找不到)
   + [python版本问题](#python版本问题)
@@ -355,6 +357,7 @@ python setup.py sdist install
 例如重写首页，在templates目录中新建admin文件夹，然后添加index.html
 如果选择继承方式，就只能采用block
 代码如下：
+
 ```html
     {% extends 'admin/index.html' %}
     {% load static %}
@@ -444,6 +447,16 @@ class EmployeAdmin(admin.ModelAdmin):
 |type|按钮类型，参考：https://element.eleme.cn/#/zh-CN/component/button|
 |style|自定义css样式|
 
+## 离线模式
+> 在2.1.3或以上的版本中生效
+在settings.py中加入
+```python
+SIMPLEUI_STATIC_OFFLINE = True
+```
+指定simpleui 是否以脱机模式加载静态资源，为True的时候将默认从本地读取所有资源，即使没有联网一样可以。适合内网项目
+
+ 不填该项或者为False的时候，默认从第三方的cdn获取
+
 ## 常见问题
   ### settings.py 找不到
 

diff --git a/doc/en/QUICK_en.md b/doc/en/QUICK_en.md
@@ -35,6 +35,8 @@ Before starting，please take a minte to understand **settings.py**, because it'
   + [Custom code to Header](#Custom%2dcode%2dto%2dHeader)
   + [Custom code to Footer](#Custom%2dcode%2dto%2dFooter)
   + [Custom Action](#Custom%2dAction)
+  + [Offline](#Offline)
+
 # Common Problems
   + [settings.py](#Not%2dfound%2dsettings.py)
   + [python version problem](#python%2dversion%2dproblem)
@@ -429,6 +431,18 @@ Configuration compatible with native admin
 |type|Button type，Reference：https://element.eleme.cn/#/zh-CN/component/button|
 |style|Customize CSS styles|
 
+## Offline
+
+> Requires version 2.1.3 or above
+
+settings.py:
+```python
+SIMPLEUI_STATIC_OFFLINE = True
+```
+Specifies whether simpleui loads static resources in offline mode. When true, all resources will be read locally by default, even if there is no networking. Suitable for intranet projects
+
+If you do not fill in the item or are false, the default is obtained from the third-party CDN.
+
 ## Common Problems
   ### Not found settings.py
 

diff --git a/simpleui/__init__.py b/simpleui/__init__.py
@@ -1,2 +1,2 @@
 def get_version():
-    return '2.1.2.0603'
+    return '2.1.3'
diff --git a/simpleui/templates/admin/base.html b/simpleui/templates/admin/base.html
@@ -10,20 +10,31 @@
     <head>
         <title>{% block title %}{% endblock %}</title>
 
-        <link rel="stylesheet" href="{% static '/admin/simpleui-x/elementui/theme-chalk/index.css' %}">
+         {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %}
+            <link rel="stylesheet" href="{% static '/admin/simpleui-x/elementui/theme-chalk/index.css' %}">
+            <link rel="stylesheet" href="{% static '/admin/simpleui-x/fontawesome-free-5.8.1-web/css/all.min.css' %}">
+        {% else %}
+            <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+            <link rel="stylesheet" href="https://cdn.bootcss.com/font-awesome/5.8.1/css/all.min.css">
+        {% endif %}
 
-        <link rel="stylesheet" href="{% static '/admin/simpleui-x/fontawesome-free-5.8.1-web/css/all.min.css' %}">
         <link rel="stylesheet" type="text/css" href="{% static "admin/css/base.css" %}">
         <link rel="stylesheet" href="{% static '/admin/simpleui-x/css/base.css' %}?_=2.1">
         <link rel="stylesheet" href="{% static '/admin/simpleui-x/theme/simpleui.css' %}">
 
-{#    <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>#}
 
+    {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %}
         <script type="text/javascript" src="{% static '/admin/simpleui-x/js/vue.min.js' %}"></script>
+        <script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/index.js' %}"></script>
+    {% else %}
+        <script src="https://cdn.jsdelivr.net/npm/vue"></script>
+        <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+    {% endif %}
+
         <script type="text/javascript" src="{% static '/admin/simpleui-x/js/language.js' %}?_=2.1.2"></script>
         <script type="text/javascript" src="{% static '/admin/simpleui-x/locale/en-us.js' %}?_=2.1.2"></script>
         <script type="text/javascript" src="{% static '/admin/simpleui-x/locale/' %}{% get_language %}.js"></script>
-        <script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/index.js' %}"></script>
+
         {% if ""|get_language_code != 'zh-hans' %}
 
             <script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/umd/locale/en.js' %}?_=2.1.2"></script>

diff --git a/simpleui/templates/admin/index.html b/simpleui/templates/admin/index.html
@@ -16,8 +16,14 @@
     <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport"/>
     <title>{{ site_title }}</title>
 
-    <link rel="stylesheet" href="{% static '/admin/simpleui-x/elementui/theme-chalk/index.css' %}">
-    <link rel="stylesheet" href="{% static '/admin/simpleui-x/fontawesome-free-5.8.1-web/css/all.min.css' %}">
+    {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %}
+        <link rel="stylesheet" href="{% static '/admin/simpleui-x/elementui/theme-chalk/index.css' %}">
+        <link rel="stylesheet" href="{% static '/admin/simpleui-x/fontawesome-free-5.8.1-web/css/all.min.css' %}">
+    {% else %}
+        <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+        <link rel="stylesheet" href="https://cdn.bootcss.com/font-awesome/5.8.1/css/all.min.css">
+    {% endif %}
+
     <link rel="stylesheet" href="{% static '/admin/simpleui-x/css/index.css' %}?_=2.1.2">
     <link rel="stylesheet" href="{% static '/admin/simpleui-x/waves/waves.min.css' %}?_=2.1">
     {% block head %}
@@ -282,22 +288,25 @@
 
     }
 </script>
-<script type="text/javascript" src="{% static '/admin/simpleui-x/js/vue.min.js' %}"></script>
 
-<script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/index.js' %}"></script>
+{% if "SIMPLEUI_STATIC_OFFLINE"|get_config %}
+    <script type="text/javascript" src="{% static '/admin/simpleui-x/js/vue.min.js' %}"></script>
+    <script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/index.js' %}"></script>
+{% else %}
+    <script src="https://cdn.jsdelivr.net/npm/vue"></script>
+    <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+{% endif %}
 
 <script type="text/javascript" src="{% static '/admin/simpleui-x/automatic/dicts.js' %}?_=2.1"></script>
 <script type="text/javascript" src="{% static '/admin/simpleui-x/automatic/segment.js' %}"></script>
-
 <script type="text/javascript" src="{% static '/admin/simpleui-x/locale/en-us.js' %}?_=2.1.2"></script>
-<script type="text/javascript" src="{% static '/admin/simpleui-x/locale/' %}{% get_language %}.js?_=2.1.2"
-        onerror="localeError()"></script>
+<script type="text/javascript" src="{% static '/admin/simpleui-x/locale/' %}{% get_language %}.js?_=2.1.2" onerror="localeError()"></script>
 <script type="text/javascript" src="{% static '/admin/simpleui-x/js/cookie.js' %}"></script>
 <script type="text/javascript" src="{% static '/admin/simpleui-x/theme/theme.js' %}"></script>
 <script type="text/javascript" src="{% static '/admin/simpleui-x/waves/waves.min.js' %}?_=2.0.5"></script>
 <script type="text/javascript" src="{% static '/admin/simpleui-x/js/index.js' %}?_=2.1.2"></script>
-{% load_analysis %}
 
+{% load_analysis %}
 {% block script %}
     {#    预留脚本block 可以实现基础该页面，添加自定义脚本#}
 {% endblock %}

diff --git a/simpleui/templates/admin/login.html b/simpleui/templates/admin/login.html
@@ -15,8 +15,15 @@
     <title>{{ site_title }}-{% trans 'Log in' %}</title>
     <link rel="icon" href="{% static '/admin/simpleui-x/img/favicon.png' %}">
 
-    <link rel="stylesheet" href="{% static '/admin/simpleui-x/elementui/theme-chalk/index.css' %}">
-    <link rel="stylesheet" href="{% static '/admin/simpleui-x/fontawesome-free-5.8.1-web/css/all.min.css' %}">
+    {% if "SIMPLEUI_STATIC_OFFLINE"|get_config %}
+        <link rel="stylesheet" href="{% static '/admin/simpleui-x/elementui/theme-chalk/index.css' %}">
+        <link rel="stylesheet" href="{% static '/admin/simpleui-x/fontawesome-free-5.8.1-web/css/all.min.css' %}">
+    {% else %}
+        <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+        <link rel="stylesheet" href="https://cdn.bootcss.com/font-awesome/5.8.1/css/all.min.css">
+    {% endif %}
+
+
     <link rel="stylesheet" href="{% static '/admin/simpleui-x/css/login.css' %}?_=2.1">
     <style type="text/css">
         .bg {
@@ -91,8 +98,15 @@
     {% endblock %}
 </div>
 
-<script type="text/javascript" src="{% static '/admin/simpleui-x/js/vue.min.js' %}"></script>
-<script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/index.js' %}"></script>
+
+{% if "SIMPLEUI_STATIC_OFFLINE"|get_config %}
+    <script type="text/javascript" src="{% static '/admin/simpleui-x/js/vue.min.js' %}"></script>
+    <script type="text/javascript" src="{% static '/admin/simpleui-x/elementui/index.js' %}"></script>
+{% else %}
+    <script src="https://cdn.jsdelivr.net/npm/vue"></script>
+    <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+{% endif %}
+
 <script type="text/javascript" src="{% static '/admin/simpleui-x/js/login.js' %}"></script>
 
 {% if 'SIMPLEUI_LOGIN_PARTICLES'|get_config != False %}