diff --git a/.gitignore b/.gitignore index 11614af..5e5c966 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,5 @@ dmypy.json # Pyre type checker .pyre/ + +.idea/ \ No newline at end of file diff --git a/app_doc/views.py b/app_doc/views.py index b87a9d9..663da22 100644 --- a/app_doc/views.py +++ b/app_doc/views.py @@ -99,7 +99,7 @@ def create_doc(request): if request.method == 'GET': # doc_list = Doc.objects.filter(create_user=request.user) project_list = Project.objects.filter(create_user=request.user) - doctemp_list = DocTemp.objects.filter(create_user=request.user) + doctemp_list = DocTemp.objects.filter(create_user=request.user).values('id','name','create_time') return render(request,'app_doc/create_doc.html',locals()) elif request.method == 'POST': project = request.POST.get('project','') @@ -169,9 +169,9 @@ def create_doctemp(request): if request.method == 'GET': return render(request,'app_doc/create_doctemp.html',locals()) elif request.method == 'POST': - name = request.POST.get('name',None) + name = request.POST.get('name','') content = request.POST.get('content','') - if name: + if name != '': doctemp = DocTemp.objects.create( name = name, content = content, diff --git a/template/app_doc/create_doc.html b/template/app_doc/create_doc.html index 5977a96..e5aaa6e 100644 --- a/template/app_doc/create_doc.html +++ b/template/app_doc/create_doc.html @@ -9,12 +9,12 @@ -
- -
+ + + + + +
{# 文档标题#} @@ -187,6 +187,16 @@ area:['530px','300px'], }); }); + //插入模板 + insertTemp = function(doctemp_id){ + //$.post("get_doctemp",data.function(r){ + // if(r.status){ + // editor.insertValue(r.data) + // }else{ + // } + //}); + //layer.close() + }; {% endblock %} @@ -213,9 +223,9 @@ {{ temp.name }} {{ temp.create_time }} - 插入 - 修改 - 删除 + 插入 + 修改 + 删除 {% endfor %} diff --git a/template/app_doc/create_doctemp.html b/template/app_doc/create_doctemp.html index 566549b..50aae17 100644 --- a/template/app_doc/create_doctemp.html +++ b/template/app_doc/create_doctemp.html @@ -1,10 +1,112 @@ +{% load staticfiles %} - + - Title + 新建文档模板 - MrDoc + + + - + + + + + + + +
+
+
+ +
+ +
+ +
+
+
+ + +
+
+ + + +{% block custom_script %} + +{% endblock %} \ No newline at end of file