From bcce8aa448f832c3ee3dd5bbe57f63c609ec7bf8 Mon Sep 17 00:00:00 2001 From: yangjian Date: Sat, 26 Sep 2020 21:27:06 +0800 Subject: [PATCH] =?UTF-8?q?0.5.9=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=E8=AF=A6=E8=A7=81?= =?UTF-8?q?change.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 10 + MrDoc/settings.py | 2 +- README.md | 4 +- README_ENG.md | 2 +- app_admin/context_processors.py | 2 +- app_admin/migrations/0008_useroptions.py | 28 + app_admin/models.py | 16 +- app_admin/views.py | 49 +- app_doc/migrations/0025_doc_editor_mode.py | 18 + app_doc/migrations/0026_auto_20200905_2225.py | 18 + app_doc/migrations/0027_projecttoc.py | 26 + app_doc/models.py | 14 + app_doc/util_upload_img.py | 17 +- app_doc/views.py | 234 ++++- static/editor.md/css/font-awesome.min.css | 4 + static/editor.md/editormd.js | 90 +- static/editor.md/lib/codemirror.zip | Bin 0 -> 852052 bytes static/toc/doctoc.js | 10 +- static/viewerjs/viewer.min.css | 2 +- static/viewerjs/viewer.min.js | 10 + template/app_admin/admin_base.html | 4 +- template/app_admin/admin_project.html | 2 +- template/app_admin/admin_setting.html | 59 +- template/app_doc/create_base_2.html | 21 +- template/app_doc/create_base_vditor.html | 807 ++++++++++++++++++ template/app_doc/create_doc.html | 2 +- template/app_doc/create_doc_vditor.html | 448 ++++++++++ template/app_doc/create_doctemp_vditor.html | 87 ++ template/app_doc/doc.html | 2 +- template/app_doc/docs_base.html | 163 +++- template/app_doc/foot_base.html | 4 +- template/app_doc/manage_attachment.html | 4 +- template/app_doc/manage_base.html | 2 +- template/app_doc/manage_image.html | 5 +- template/app_doc/manage_overview.html | 6 +- template/app_doc/manage_project.html | 5 +- template/app_doc/manage_project_options.html | 205 +++++ template/app_doc/manage_self.html | 15 + template/app_doc/modify_doc_vditor.html | 591 +++++++++++++ template/app_doc/modify_doctemp_vditor.html | 87 ++ 40 files changed, 2952 insertions(+), 123 deletions(-) create mode 100644 app_admin/migrations/0008_useroptions.py create mode 100644 app_doc/migrations/0025_doc_editor_mode.py create mode 100644 app_doc/migrations/0026_auto_20200905_2225.py create mode 100644 app_doc/migrations/0027_projecttoc.py create mode 100644 static/editor.md/css/font-awesome.min.css create mode 100644 static/editor.md/lib/codemirror.zip create mode 100644 static/viewerjs/viewer.min.js create mode 100644 template/app_doc/create_base_vditor.html create mode 100644 template/app_doc/create_doc_vditor.html create mode 100644 template/app_doc/create_doctemp_vditor.html create mode 100644 template/app_doc/manage_project_options.html create mode 100644 template/app_doc/modify_doc_vditor.html create mode 100644 template/app_doc/modify_doctemp_vditor.html diff --git a/CHANGES.md b/CHANGES.md index 8dfead0..5a245ec 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,15 @@ ## 版本更新记录 +### v0.5.9 2020-09-26 + +- 新增对Vditor编辑器的支持，个人中心可选择编辑器； +- 新增文档iframe域名白名单配置，后台可设置允许使用的外站iframe视频； +- 调整文集目录渲染方式，改为后端渲染； +- 新增文集目录定位跳转，在长目录下当前文档的目录显示在目录最顶端； +- 新增后台配置允许上传的附件格式和附件大小； +- 新增后台配置允许上传的图片大小； +- EditorMD编辑器模式下优化文档页面JS加载，按需加载各类JS文件，提高文档渲染速度； + ### v0.5.8 2020-08-30 - 优化和调整首页功能链接和样式； diff --git a/MrDoc/settings.py b/MrDoc/settings.py index 5a68eb0..31ff5ae 100644 --- a/MrDoc/settings.py +++ b/MrDoc/settings.py @@ -40,7 +40,7 @@ SECRET_KEY = '5&71mt9@^58zdg*_!t(x6g14q*@84d%ptr%%s6e0l50zs0we3d' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = CONFIG.getboolean('site','debug') -VERSIONS = '0.5.8' +VERSIONS = '0.5.9' ALLOWED_HOSTS = ['*'] diff --git a/README.md b/README.md index 592622c..8143375 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## MrDoc觅道文档 - 记录文档，汇聚思想 - [English](./README_ENG.md) -![mrdoc](https://img.shields.io/badge/MrDoc-v0.5.8-brightgreen.svg) ![python](https://img.shields.io/badge/Python-3.5+-blue.svg) ![mrdoc](https://img.shields.io/badge/Django-v2.2-important.svg) +![mrdoc](https://img.shields.io/badge/MrDoc-v0.5.9-brightgreen.svg) ![python](https://img.shields.io/badge/Python-3.5+-blue.svg) ![mrdoc](https://img.shields.io/badge/Django-v2.2-important.svg) ![Mrdoc首页](./captrue/mrdoc-index.webp) @@ -139,7 +139,7 @@ python manage.py runserver 加入MrDoc交流QQ群: -- 群1（付费） **735507293** [![](http://pub.idqqimg.com/wpa/images/group.png "MrDoc交流群")](http://shang.qq.com/wpa/qunwpa?idkey=143c23a4ffbd0ba9137d2bce3ee86c83532c05259a0542a69527e36615e64dba) +- **735507293** [![](http://pub.idqqimg.com/wpa/images/group.png "MrDoc交流群")](http://shang.qq.com/wpa/qunwpa?idkey=143c23a4ffbd0ba9137d2bce3ee86c83532c05259a0542a69527e36615e64dba) ### 3、联系作者 diff --git a/README_ENG.md b/README_ENG.md index 584fa52..7cd4588 100644 --- a/README_ENG.md +++ b/README_ENG.md @@ -1,6 +1,6 @@ ## MrDoc - Writing documents, gathering ideas -![mrdoc](https://img.shields.io/badge/MrDoc-v0.5.8-brightgreen.svg) ![python](https://img.shields.io/badge/Python-3.5+-blue.svg) ![mrdoc](https://img.shields.io/badge/Django-v2.2-important.svg) +![mrdoc](https://img.shields.io/badge/MrDoc-v0.5.9-brightgreen.svg) ![python](https://img.shields.io/badge/Python-3.5+-blue.svg) ![mrdoc](https://img.shields.io/badge/Django-v2.2-important.svg) ![Mrdoc首页](./captrue/mrdoc-index.webp) diff --git a/app_admin/context_processors.py b/app_admin/context_processors.py index dccfff7..1a86ea3 100644 --- a/app_admin/context_processors.py +++ b/app_admin/context_processors.py @@ -14,7 +14,7 @@ def sys_setting(request): # 设置debug状态 setting_dict['debug'] = settings.DEBUG # 获取系统设置状态 - datas = SysSetting.objects.filter(types="basic") + datas = SysSetting.objects.filter(types__in=["basic","doc"]) for data in datas: setting_dict[data.name] = data.value return setting_dict \ No newline at end of file diff --git a/app_admin/migrations/0008_useroptions.py b/app_admin/migrations/0008_useroptions.py new file mode 100644 index 0000000..87d5f20 --- /dev/null +++ b/app_admin/migrations/0008_useroptions.py @@ -0,0 +1,28 @@ +# Generated by Django 2.2.12 on 2020-09-05 22:25 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('app_admin', '0007_auto_20200222_1106'), + ] + + operations = [ + migrations.CreateModel( + name='UserOptions', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('editor_mode', models.IntegerField(default=1, verbose_name='编辑器选项')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name': '用户设置', + 'verbose_name_plural': '用户设置', + }, + ), + ] diff --git a/app_admin/models.py b/app_admin/models.py index f4b8861..0d000a4 100644 --- a/app_admin/models.py +++ b/app_admin/models.py @@ -8,7 +8,6 @@ class SysSetting(models.Model): value = models.TextField(verbose_name="内容",null=True,blank=True) types = models.CharField(verbose_name="类型",max_length=10,default="basic") - def __str__(self): return self.name @@ -16,6 +15,21 @@ class SysSetting(models.Model): verbose_name = '系统设置' verbose_name_plural = verbose_name + +# 用户选项配置 +class UserOptions(models.Model): + user = models.ForeignKey(User,on_delete=models.CASCADE) + # 用户配置的编辑器选项，1表示Editormd编辑器，2表示Vditor编辑器，默认为1 + editor_mode = models.IntegerField(default=1,verbose_name="编辑器选项") + + def __str__(self): + return self.user + + class Meta: + verbose_name = '用户设置' + verbose_name_plural = verbose_name + + # 电子邮件验证码模型 class EmaiVerificationCode(models.Model): email_name = models.EmailField(verbose_name="电子邮箱") diff --git a/app_admin/views.py b/app_admin/views.py index 1d68126..dd71053 100644 --- a/app_admin/views.py +++ b/app_admin/views.py @@ -342,7 +342,7 @@ def admin_project(request): search_kw = request.GET.get('kw','') if search_kw == '': project_list = Project.objects.all().order_by('-create_time') - paginator = Paginator(project_list,20) + paginator = Paginator(project_list,10) page = request.GET.get('page',1) try: projects = paginator.page(page) @@ -352,7 +352,7 @@ def admin_project(request): projects = paginator.page(paginator.num_pages) else: project_list = Project.objects.filter(intro__icontains=search_kw) - paginator = Paginator(project_list, 20) + paginator = Paginator(project_list, 10) page = request.GET.get('page', 1) try: @@ -625,6 +625,7 @@ def admin_setting(request): ) return render(request,'app_admin/admin_setting.html',locals()) + # 邮箱设置 elif types == 'email': # 读取上传的参数 emailer = request.POST.get("send_emailer",None) @@ -679,3 +680,47 @@ def admin_setting(request): email_ssl = email_settings.get(name="smtp_ssl") email_pwd = email_settings.get(name="pwd") return render(request, 'app_admin/admin_setting.html',locals()) + # 文档全局设置 + elif types == 'doc': + # iframe白名单 + iframe_whitelist = request.POST.get('iframe_whitelist','') + SysSetting.objects.update_or_create( + name = 'iframe_whitelist', + defaults = {'value':iframe_whitelist,'types':'doc'} + ) + # 上传图片大小 + img_size = request.POST.get('img_size', 10) + try: + if int(img_size) == 0: + img_size = 50 + else: + img_size = abs(int(img_size)) + except Exception as e: + # print(repr(e)) + img_size = 10 + SysSetting.objects.update_or_create( + name='img_size', + defaults={'value': img_size, 'types': 'doc'} + ) + + # 附件格式白名单 + attachment_suffix = request.POST.get('attachment_suffix','') + SysSetting.objects.update_or_create( + name = 'attachment_suffix', + defaults = {'value':attachment_suffix,'types':'doc'} + ) + # 附件大小 + attachment_size = request.POST.get('attachment_size',50) + try: + if int(attachment_size) == 0: + attachment_size = 50 + else: + attachment_size = abs(int(attachment_size)) + except Exception as e: + # print(repr(e)) + attachment_size = 50 + SysSetting.objects.update_or_create( + name='attachment_size', + defaults={'value': attachment_size, 'types': 'doc'} + ) + return render(request, 'app_admin/admin_setting.html', locals()) \ No newline at end of file diff --git a/app_doc/migrations/0025_doc_editor_mode.py b/app_doc/migrations/0025_doc_editor_mode.py new file mode 100644 index 0000000..acd2292 --- /dev/null +++ b/app_doc/migrations/0025_doc_editor_mode.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.12 on 2020-09-05 22:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('app_doc', '0024_doctag_tag'), + ] + + operations = [ + migrations.AddField( + model_name='doc', + name='editor_mode', + field=models.IntegerField(default=1, max_length=20, verbose_name='编辑器模式'), + ), + ] diff --git a/app_doc/migrations/0026_auto_20200905_2225.py b/app_doc/migrations/0026_auto_20200905_2225.py new file mode 100644 index 0000000..33c514c --- /dev/null +++ b/app_doc/migrations/0026_auto_20200905_2225.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.12 on 2020-09-05 22:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('app_doc', '0025_doc_editor_mode'), + ] + + operations = [ + migrations.AlterField( + model_name='doc', + name='editor_mode', + field=models.IntegerField(default=1, verbose_name='编辑器模式'), + ), + ] diff --git a/app_doc/migrations/0027_projecttoc.py b/app_doc/migrations/0027_projecttoc.py new file mode 100644 index 0000000..6a50648 --- /dev/null +++ b/app_doc/migrations/0027_projecttoc.py @@ -0,0 +1,26 @@ +# Generated by Django 2.2.12 on 2020-09-12 21:14 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('app_doc', '0026_auto_20200905_2225'), + ] + + operations = [ + migrations.CreateModel( + name='ProjectToc', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('value', models.TextField(verbose_name='文集文档层级目录')), + ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='app_doc.Project')), + ], + options={ + 'verbose_name': '文集目录', + 'verbose_name_plural': '文集目录', + }, + ), + ] diff --git a/app_doc/models.py b/app_doc/models.py index 2cb085d..eaf75af 100644 --- a/app_doc/models.py +++ b/app_doc/models.py @@ -42,6 +42,18 @@ class ProjectCollaborator(models.Model): verbose_name = '文集协作' verbose_name_plural = verbose_name +# 文集目录模型 +class ProjectToc(models.Model): + project = models.ForeignKey(Project,on_delete=models.CASCADE) + value = models.TextField(verbose_name="文集文档层级目录") + + def __str__(self): + return self.project + + class Meta: + verbose_name = '文集目录' + verbose_name_plural = verbose_name + # 文档模型 class Doc(models.Model): name = models.CharField(verbose_name="文档标题",max_length=50) @@ -55,6 +67,8 @@ class Doc(models.Model): modify_time = models.DateTimeField(auto_now=True) # 文档状态说明：0表示草稿状态，1表示发布状态，2表示删除状态 status = models.IntegerField(choices=((0,0),(1,1)),default=1,verbose_name='文档状态') + # 编辑器模式：1表示Editormd编辑器，2表示Vditor编辑器 + editor_mode = models.IntegerField(default=1,verbose_name='编辑器模式') def __str__(self): return self.name diff --git a/app_doc/util_upload_img.py b/app_doc/util_upload_img.py index d982854..11ab1b2 100644 --- a/app_doc/util_upload_img.py +++ b/app_doc/util_upload_img.py @@ -5,6 +5,7 @@ from django.views.decorators.csrf import csrf_exempt from django.contrib.auth.decorators import login_required # 登录需求装饰器 import datetime,time,json,base64,os,uuid from app_doc.models import Image,ImageGroup +from app_admin.models import SysSetting @login_required() @csrf_exempt @@ -27,7 +28,7 @@ def upload_img(request): else: group_id = None - print('分组ID：',group_id) + # print('分组ID：',group_id) if img:# 上传普通图片文件 result = img_upload(img, dir_name,request.user) elif manage_upload: @@ -35,7 +36,7 @@ def upload_img(request): elif base_img: # 上传base64编码图片 result = base_img_upload(base_img,dir_name,request.user) else: - result = {"success": 0, "message": "出错信息"} + result = {"success": 0, "message": "上传出错"} return HttpResponse(json.dumps(result), content_type="application/json") # 目录创建 @@ -50,13 +51,23 @@ def upload_generation_dir(dir_name=''): # 普通图片上传 def img_upload(files, dir_name, user, group_id=None): - #允许上传文件类型 + # 允许上传文件类型 allow_suffix =["jpg", "jpeg", "gif", "png", "bmp", "webp"] file_suffix = files.name.split(".")[-1] # 提取图片格式 # 判断图片格式 if file_suffix.lower() not in allow_suffix: return {"success": 0, "message": "图片格式不正确"} + # 判断图片的大小 + try: + allow_image_size = SysSetting.objects.get(types='doc', name='img_size') + allow_img_size = int(allow_image_size.value) * 1048576 + except Exception as e: + # print(repr(e)) + allow_img_size = 10485760 + if files.size > allow_img_size: + return {"success": 0, "message": "图片大小超出{}MB".format(allow_img_size / 1048576)} + relative_path = upload_generation_dir(dir_name) file_name = files.name.replace(file_suffix,'').replace('.','') + '_' +str(int(time.time())) + '.' + file_suffix path_file=os.path.join(relative_path, file_name) diff --git a/app_doc/views.py b/app_doc/views.py index 0828372..08d5e57 100644 --- a/app_doc/views.py +++ b/app_doc/views.py @@ -14,8 +14,10 @@ from loguru import logger import datetime import traceback import re +import json import random from app_doc.report_utils import * +from app_admin.models import UserOptions,SysSetting from app_admin.decorators import check_headers,allow_report_file import os.path @@ -25,6 +27,80 @@ def validateTitle(title): new_title = re.sub(rstr, "_", title) # 替换为下划线 return new_title +# 获取文集的文档目录 +def get_pro_toc(pro_id): + # try: + # project = Project.objects.get(id=pro_id) + # pro_toc = ProjectToc.objects.get(project=project) + # doc_list = json.loads(pro_toc.value) + # print("使用缓存") + # except: + # print("重新生成") + # 查询存在上级文档的文档 + parent_id_list = Doc.objects.filter(top_doc=pro_id, status=1).exclude(parent_doc=0).values_list('parent_doc', + flat=True) + # 获取存在上级文档的上级文档ID + # print(parent_id_list) + doc_list = [] + n = 0 + # 获取一级文档 + top_docs = Doc.objects.filter(top_doc=pro_id, parent_doc=0, status=1).values('id', 'name').order_by('sort') + # 遍历一级文档 + for doc in top_docs: + top_item = { + 'id': doc['id'], + 'name': doc['name'], + # 'spread': True, + # 'level': 1 + } + # 如果一级文档存在下级文档，查询其二级文档 + if doc['id'] in parent_id_list: + # 获取二级文档 + sec_docs = Doc.objects.filter( + top_doc=pro_id, parent_doc=doc['id'], status=1).values('id', 'name').order_by('sort') + top_item['children'] = [] + for doc in sec_docs: + sec_item = { + 'id': doc['id'], + 'name': doc['name'], + # 'level': 2 + } + # 如果二级文档存在下级文档，查询第三级文档 + if doc['id'] in parent_id_list: + # 获取三级文档 + thr_docs = Doc.objects.filter( + top_doc=pro_id, parent_doc=doc['id'], status=1).values('id','name').order_by('sort') + sec_item['children'] = [] + for doc in thr_docs: + item = { + 'id': doc['id'], + 'name': doc['name'], + # 'level': 3 + } + sec_item['children'].append(item) + n += 1 + top_item['children'].append(sec_item) + n += 1 + else: + top_item['children'].append(sec_item) + n += 1 + doc_list.append(top_item) + n += 1 + # 如果一级文档没有下级文档，直接保存 + else: + doc_list.append(top_item) + n += 1 + # 将文集的大纲目录写入数据库 + # ProjectToc.objects.create( + # project = project, + # value = json.dumps(doc_list) + # ) + # print(doc_list,n) + # if n > 999: + # return ([],n) + # else: + return (doc_list,n) + # 文集列表（首页） @logger.catch() def project_list(request): @@ -199,7 +275,6 @@ def create_project(request): logger.exception("创建文集出错") return JsonResponse({'status':False,'data':'出现异常,请检查输入值！'}) - # 文集页 @require_http_methods(['GET']) @check_headers @@ -208,6 +283,9 @@ def project_index(request,pro_id): try: # 获取文集信息 project = Project.objects.get(id=int(pro_id)) + # 获取文集的文档目录 + toc_list,toc_cnt = get_pro_toc(pro_id) + # toc_list,toc_cnt = ([],1000) # 获取文集的协作用户信息 if request.user.is_authenticated: # 对登陆用户查询其协作文档信息 colla_user = ProjectCollaborator.objects.filter(project=project,user=request.user).count() @@ -262,24 +340,33 @@ def project_index(request,pro_id): # 修改文集 @login_required() -@require_http_methods(['POST']) +@require_http_methods(['GET','POST']) def modify_project(request): - try: - pro_id = request.POST.get('pro_id',None) - project = Project.objects.get(id=pro_id) + if request.method == 'GET': + pro_id = request.GET.get('pro_id', None) + pro = Project.objects.get(id=pro_id) # 验证用户有权限修改文集 - if (request.user == project.create_user) or request.user.is_superuser: - name = request.POST.get('name',None) - content = request.POST.get('desc',None) - project.name = validateTitle(name) - project.intro = content - project.save() - return JsonResponse({'status':True,'data':'修改成功'}) + if (request.user == pro.create_user) or request.user.is_superuser: + return render(request,'app_doc/manage_project_options.html',locals()) else: - return JsonResponse({'status':False,'data':'非法请求'}) - except Exception as e: - logger.exception("修改文集出错") - return JsonResponse({'status':False,'data':'请求出错'}) + return Http404 + elif request.method == 'POST': + try: + pro_id = request.POST.get('pro_id',None) + project = Project.objects.get(id=pro_id) + # 验证用户有权限修改文集 + if (request.user == project.create_user) or request.user.is_superuser: + name = request.POST.get('name',None) + content = request.POST.get('desc',None) + project.name = validateTitle(name) + project.intro = content + project.save() + return JsonResponse({'status':True,'data':'修改成功'}) + else: + return JsonResponse({'status':False,'data':'非法请求'}) + except Exception as e: + logger.exception("修改文集出错") + return JsonResponse({'status':False,'data':'请求出错'}) # 修改文集权限 @@ -529,6 +616,8 @@ def doc(request,pro_id,doc_id): if pro_id != '' and doc_id != '': # 获取文集信息 project = Project.objects.get(id=int(pro_id)) + # 获取文集的文档目录 + toc_list,toc_cnt = get_pro_toc(pro_id) # 获取文集的协作用户信息 if request.user.is_authenticated: colla_user = ProjectCollaborator.objects.filter(project=project,user=request.user) @@ -585,13 +674,26 @@ def doc(request,pro_id,doc_id): @require_http_methods(['GET',"POST"]) @logger.catch() def create_doc(request): + # 获取用户的编辑器模式 + try: + user_opt = UserOptions.objects.get(user=request.user) + if user_opt.editor_mode == 1: + editor_mode = 1 + elif user_opt.editor_mode == 2: + editor_mode = 2 + except ObjectDoesNotExist: + editor_mode = 1 if request.method == 'GET': try: pid = request.GET.get('pid',-999) project_list = Project.objects.filter(create_user=request.user) # 自己创建的文集列表 colla_project_list = ProjectCollaborator.objects.filter(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()) + # 根据编辑器模式返回不同的模板 + if editor_mode == 1: + return render(request, 'app_doc/create_doc.html', locals()) + elif editor_mode == 2: + return render(request, 'app_doc/create_doc_vditor.html', locals()) except Exception as e: logger.exception("访问创建文档页面出错") return render(request,'404.html') @@ -623,7 +725,8 @@ def create_doc(request): top_doc= int(project), sort = sort if sort != '' else 99, create_user=request.user, - status = status + status = status, + editor_mode = editor_mode ) # 设置文档标签 for t in doc_tags.split(","): @@ -653,6 +756,15 @@ def create_doc(request): @login_required() @require_http_methods(['GET',"POST"]) def modify_doc(request,doc_id): + # 获取用户的编辑器模式 + try: + user_opt = UserOptions.objects.get(user=request.user) + if user_opt.editor_mode == 1: + editor_mode = 1 + elif user_opt.editor_mode == 2: + editor_mode = 2 + except ObjectDoesNotExist: + editor_mode = 1 if request.method == 'GET': try: doc = Doc.objects.get(id=doc_id) # 查询文档信息 @@ -674,7 +786,12 @@ def modify_doc(request,doc_id): doc_list = Doc.objects.filter(top_doc=project.id) doctemp_list = DocTemp.objects.filter(create_user=request.user) history_list = DocHistory.objects.filter(doc=doc).order_by('-create_time') - return render(request,'app_doc/modify_doc.html',locals()) + # 获取用户的编辑器模式 + if editor_mode == 1: + return render(request, 'app_doc/modify_doc.html', locals()) + elif editor_mode == 2: + return render(request, 'app_doc/modify_doc_vditor.html', locals()) + else: return render(request,'403.html') except Exception as e: @@ -722,7 +839,8 @@ def modify_doc(request,doc_id): parent_doc=int(parent_doc) if parent_doc != '' else 0, sort=sort if sort != '' else 99, modify_time = datetime.datetime.now(), - status = status + status = status, + editor_mode = editor_mode ) # 更新文档标签 doc_tag_list = doc_tags.split(",") if doc_tags != "" else [] @@ -1196,8 +1314,20 @@ def fast_publish_doc(request): @require_http_methods(['GET',"POST"]) def create_doctemp(request): if request.method == 'GET': + # 获取用户的编辑器模式 + try: + user_opt = UserOptions.objects.get(user=request.user) + if user_opt.editor_mode == 1: + editor_mode = 1 + elif user_opt.editor_mode == 2: + editor_mode = 2 + except ObjectDoesNotExist: + editor_mode = 1 doctemps = DocTemp.objects.filter(create_user=request.user) - return render(request,'app_doc/create_doctemp.html',locals()) + if editor_mode == 1: + return render(request,'app_doc/create_doctemp.html',locals()) + else: + return render(request, 'app_doc/create_doctemp_vditor.html', locals()) elif request.method == 'POST': try: name = request.POST.get('name','') @@ -1225,8 +1355,20 @@ def modify_doctemp(request,doctemp_id): try: doctemp = DocTemp.objects.get(id=doctemp_id) if request.user.id == doctemp.create_user.id: + # 获取用户的编辑器模式 + try: + user_opt = UserOptions.objects.get(user=request.user) + if user_opt.editor_mode == 1: + editor_mode = 1 + elif user_opt.editor_mode == 2: + editor_mode = 2 + except ObjectDoesNotExist: + editor_mode = 1 doctemps = DocTemp.objects.filter(create_user=request.user) - return render(request,'app_doc/modify_doctemp.html',locals()) + if editor_mode == 1: + return render(request,'app_doc/modify_doctemp.html',locals()) + else: + return render(request, 'app_doc/modify_doctemp_vditor.html', locals()) else: return HttpResponse('非法请求') except Exception as e: @@ -1863,6 +2005,7 @@ def manage_attachment(request): if request.method == 'GET': try: search_kw = request.GET.get('kw', None) + # 搜索附件 if search_kw: attachment_list = Attachment.objects.filter( user=request.user, @@ -1877,6 +2020,7 @@ def manage_attachment(request): except EmptyPage: attachments = paginator.page(paginator.num_pages) attachments.kw = search_kw + # 所有附件 else: attachment_list = Attachment.objects.filter(user=request.user).order_by('-create_time') paginator = Paginator(attachment_list, 15) @@ -1897,13 +2041,32 @@ def manage_attachment(request): if types in ['0',0]: attachment = request.FILES.get('attachment_upload',None) if attachment: - attachment_name = attachment.name - attachment_size = sizeFormat(attachment.size) - # 限制附件大小在50mb以内 - if attachment.size > 52428800: + attachment_name = attachment.name # 获取附件文件名 + attachment_size = sizeFormat(attachment.size) # 获取附件文件大小 + + # 限制附件大小 + # 获取系统设置的附件文件大小，如果不存在，默认50MB + try: + allow_attachment_size = SysSetting.objects.get(types='doc',name='attachment_size') + allow_attach_size = int(allow_attachment_size.value) * 1048576 + except Exception as e: + # print(repr(e)) + allow_attach_size = 52428800 + if attachment.size > allow_attach_size: return JsonResponse({'status':False,'data':'文件大小超出限制'}) - # 限制附件为ZIP格式文件 - if attachment_name.endswith('.zip'): + + # 限制附件格式 + # 获取系统设置允许的附件格式，如果不存在，默认仅允许zip格式文件 + try: + attacement_suffix_list = SysSetting.objects.get(types='doc',name='attachment_suffix') + attacement_suffix_list = attacement_suffix_list.value.split(',') + except ObjectDoesNotExist: + attachment_suffix_list = ['zip'] + allow_attachment = False + for suffix in attacement_suffix_list: + if attachment_name.split('.')[-1] in attacement_suffix_list: + allow_attachment = True + if allow_attachment: a = Attachment.objects.create( file_name = attachment_name, file_size = attachment_size, @@ -2347,11 +2510,18 @@ def tag_doc(request,tag_id,doc_id): def manage_self(request): if request.method == 'GET': user = User.objects.get_by_natural_key(request.user) + try: + user_opt = UserOptions.objects.get(user=request.user) + except ObjectDoesNotExist: + user_opt = [] return render(request,'app_doc/manage_self.html',locals()) elif request.method == 'POST': - first_name = request.POST.get('first_name','') - email = request.POST.get('email',None) + first_name = request.POST.get('first_name','') # 昵称 + email = request.POST.get('email',None) # 电子邮箱 + editor_mode = request.POST.get('editor_mode',1) # 编辑器 user = User.objects.get_by_natural_key(request.user) + if len(first_name) < 2 or len(first_name) > 10: + return JsonResponse({'status': False, 'data': '昵称长度不得小于2位大于10位'}) if User.objects.filter(first_name=first_name).count() > 0 and user.first_name != first_name: return JsonResponse({'status':False,'data':'昵称已被使用'}) if User.objects.filter(email=email).count() > 0 and user.email != email: @@ -2360,6 +2530,10 @@ def manage_self(request): user.email = email user.first_name = first_name user.save() + user_opt = UserOptions.objects.update_or_create( + user = user, + defaults={'editor_mode':editor_mode} + ) return JsonResponse({'status':True,'data':'ok'}) else: return JsonResponse({'status':False,'data':'参数不正确'}) \ No newline at end of file diff --git a/static/editor.md/css/font-awesome.min.css b/static/editor.md/css/font-awesome.min.css new file mode 100644 index 0000000..540440c --- /dev/null +++ b/static/editor.md/css/font-awesome.min.css @@ -0,0 +1,4 @@ +/*! + * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) + */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-vcard:before,.fa-address-card:before{content:"\f2bb"}.fa-vcard-o:before,.fa-address-card-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto} diff --git a/static/editor.md/editormd.js b/static/editor.md/editormd.js index 21674f5..69ae2b3 100644 --- a/static/editor.md/editormd.js +++ b/static/editor.md/editormd.js @@ -3484,8 +3484,9 @@ var begin = ""; var end = ""; // console.log(href,title,text) + // console.log(iframe_whitelist) if(/^=(.*?)/.test(text)){ - console.log(text) + // console.log(text) switch(text){ case '=video': if(href.match(/^.+.(mp4|m4v|ogg|ogv|webm)$/)){ @@ -3497,7 +3498,7 @@ return "" } break; - case '=video_iframe': + case '=video_iframe': const youtubeMatch = href.match(/\/\/(?:www\.)?(?:youtu\.be\/|youtube\.com\/(?:embed\/|v\/|watch\?v=|watch\?.+&v=))([\w|-]{11})(?:(?:[\?&]t=)(\S+))?/); const youkuMatch = href.match(/\/\/v\.youku\.com\/v_show\/id_(\w+)=*\.html/); const qqMatch = href.match(/\/\/v\.qq\.com\/x\/cover\/.*\/([^\/]+)\.html\??.*/); @@ -3523,7 +3524,14 @@ return `