- 增加ui适配

- 资源优化

README.md

@@ -179,6 +179,7 @@ v3.9.9.16   新增模板编辑功能,增加嵌入报表TOKEN方式,优化编辑
 v3.9.9.18   修复vue bug, 增加elementUI支持, 优化DataV开发体验
 v3.9.9.24   模板开发界面增加编辑功能,自动建立数据集,新增数据集测试功能,Echarts升级到5.2
 v3.9.9.25   增加变更未保存提示,数据集选择执行,优化保存模板重复提交的问题
+v3.9.9.28   Admin适配UI, 资源文件优化
 ```
 
 -------------------------------------------------------------------------------

django_smartchart/settings.py

@@ -32,6 +32,7 @@ ALLOWED_HOSTS = ['*']
 # Application definition
 
 INSTALLED_APPS = [
+    'smart_chart.smartui',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',

static/editor/common.js

@@ -66,8 +66,8 @@ function insert_span() {
     if(seqList.length>0){console.log(seqList); seqList.sort(desc); maxSeq=seqList[0] + 1;
        if(maxSeq!==seqList.length){alert('序号不连续,请检查'+ seqList);return} }
     if(r){editor1.insert(`<el-row>
-  <el-col :span="24" >{{div_list.${maxSeq}|safe}}</el-col>
-</el-row>`);} else {editor1.insert(`{{div_list.${maxSeq}|safe}}`)}
+  <el-col :span="24" >{{div_list.${maxSeq}}}</el-col>
+</el-row>`);} else {editor1.insert(`{{div_list.${maxSeq}}}`)}
 }
 
 function open_select(name) {

templates/echart/base.html

@@ -2,8 +2,7 @@
 {% block head %}{% endblock %}</head>
 <link rel="icon" type="image.png" href="/static/images/favicon.ico"><link rel="stylesheet" href="/static/js/fun.css"><link rel="stylesheet" href="/static/bootstrap/css/bootstrap.min.css">
 {% if dv %}<script src="/static/echart/opt/vue.js"></script><script src="/static/echart/opt/dv.js"></script>{% endif %}<script src="/static/js/jquery-2.2.3.min.js"></script>
-{{devhead|safe}}
-{% block body %}{% endblock %}
+{{devhead|safe}} {% autoescape off %}{% block body %}{% endblock %}{% endautoescape %}
 </html><script type="text/javascript" src="/static/echart/dist/echarts.min.js"></script><script src="/static/echart/dist/china.js"></script><script src="/static/js/fun.js"></script><script src="/static/js/scroll.js"></script><script src="/static/echart/theme/{{theme}}"></script><script type="text/javascript" src="/static/bootstrap/js/bootstrap.min.js"></script>
 {{footer|safe}}{% block javascript %}{% endblock %}
 <script>function print(item){console.log(item)};$("#smartcharthead").on("click",function(){if($("#id_devhead").hasClass('devhead')){$("#id_devhead").removeClass('devhead');}else{$("#id_devhead").addClass('devhead')}});{% if dv %}if("undefined" == typeof vapp){var vapp = new Vue({el: '#vue_app', data: {d0:'',d1:'',d2:'',d3:'',d4:'',d5:'',d6:'',d7:'',d8:'',d9:'',d10:'',d11:'',d12:'',d13:'',d14:'',d15:'',d16:''}})}{% endif %}var app = {};var charts = [];{{echart_main|safe}}window.onresize = function(){for(var i = 0; i < charts.length; i++){charts[i].resize();}};

templates/echart/basevue.html

@@ -28,11 +28,7 @@ a {
     line-height: 1.42857143;
 }
 </style>
-<!-- 引入样式 -->
-{#<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">#}
-<!-- 引入组件库 -->
-{#<script src="https://unpkg.com/element-ui/lib/index.js"></script>#}
-{{devhead|safe}}<div id="vue_app">{% block body %}{% endblock %}</div>
+{{devhead|safe}}<div id="vue_app">{% autoescape off %}{% block body %}{% endblock %}{% endautoescape %}</div>
 </html><script type="text/javascript" src="/static/echart/dist/echarts.min.js"></script><script src="/static/js/fun.js"></script><script src="/static/echart/theme/{{theme}}"></script>
 {{footer|safe}}{% block javascript %}{% endblock %}
 <script>function print(item){console.log(item)};$("#smartcharthead").on("click",function(){if($("#id_devhead").hasClass('devhead')){$("#id_devhead").removeClass('devhead');}else{$("#id_devhead").addClass('devhead')}});if("undefined" == typeof vapp){var vapp = new Vue({el: '#vue_app', delimiters: ['{[', ']}'], data: {d0:'',d1:'',d2:'',d3:'',d4:'',d5:'',d6:'',d7:'',d8:'',d9:'',d10:'',d11:'',d12:'',d13:'',d14:'',d15:'',d16:''}});}var charts = [];{{echart_main|safe}}window.onresize = function(){for(var i = 0; i < charts.length; i++){charts[i].resize();}};

templates/echart/common.html

@@ -6,7 +6,7 @@
 <div class="container_fluid">
 <div class="row_fluid" id="vue_app">
     {% for div in div_list %}
-      {{div|safe}}
+      {{div}}
     {% endfor %}    
 </div>
 </div>

templates/echart/common2.html

@@ -6,7 +6,7 @@
 <div class="container_fluid">
 <div class="row_fluid" id="vue_app">
     {% for div in div_list %}
-      {{div|safe}}
+      {{div}}
     {% endfor %}    
 </div>
 </div>

templates/echart/common3.html

@@ -2,7 +2,7 @@
 {% block head %}{% endblock %}
 {% block body %}
     {% for div in div_list %}
-      {{div|safe}}
+      {{div}}
     {% endfor %}
 {% endblock %}
 {% block javascript %}{% endblock %}