diff --git a/.gitignore b/.gitignore index 5f15800..0567a0d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ media/ *.log .DS_Store debug/ +*.code-workspace \ No newline at end of file diff --git a/apps/news/admin.py b/apps/news/admin.py index 9417626..02882f4 100644 --- a/apps/news/admin.py +++ b/apps/news/admin.py @@ -1,4 +1,6 @@ from django.contrib import admin +from django.db import models +from ckeditor_uploader.widgets import CKEditorUploadingWidget from .models import NewsCategory, News @@ -19,6 +21,9 @@ class NewsAdmin(admin.ModelAdmin): prepopulated_fields = {'slug': ('title_en',)} date_hierarchy = 'created_at' readonly_fields = ('view_count',) + formfield_overrides = { + models.TextField: {'widget': CKEditorUploadingWidget}, + } fieldsets = ( ('基本信息', { 'fields': ('category', 'title_zh', 'title_en', 'slug', 'cover_image') diff --git a/apps/products/admin.py b/apps/products/admin.py index e4003b8..a6e2e06 100644 --- a/apps/products/admin.py +++ b/apps/products/admin.py @@ -1,4 +1,6 @@ from django.contrib import admin +from django.db import models +from ckeditor_uploader.widgets import CKEditorUploadingWidget from .models import ProductCategory, Product, ProductImage @@ -15,13 +17,15 @@ class ProductCategoryAdmin(admin.ModelAdmin): list_editable = ('sort_order', 'is_active') search_fields = ('name_zh', 'name_en', 'slug') prepopulated_fields = {'slug': ('name_en',)} + formfield_overrides = { + models.TextField: {'widget': CKEditorUploadingWidget}, + } fieldsets = ( ('基本信息', { 'fields': ('name_zh', 'name_en', 'slug', 'image') }), ('描述', { 'fields': ('description_zh', 'description_en'), - 'classes': ('collapse',) }), ('排序', { 'fields': ('sort_order', 'is_active') @@ -37,6 +41,9 @@ class ProductAdmin(admin.ModelAdmin): search_fields = ('name_zh', 'name_en', 'model', 'slug') prepopulated_fields = {'slug': ('name_en',)} inlines = [ProductImageInline] + formfield_overrides = { + models.TextField: {'widget': CKEditorUploadingWidget}, + } fieldsets = ( ('基本信息', { 'fields': ('category', 'name_zh', 'name_en', 'slug', 'model', 'main_image') diff --git a/apps/solutions/admin.py b/apps/solutions/admin.py index ae25807..ce6562d 100644 --- a/apps/solutions/admin.py +++ b/apps/solutions/admin.py @@ -1,4 +1,6 @@ from django.contrib import admin +from django.db import models +from ckeditor_uploader.widgets import CKEditorUploadingWidget from .models import SolutionCategory, Solution @@ -9,6 +11,9 @@ class SolutionCategoryAdmin(admin.ModelAdmin): list_editable = ('sort_order', 'is_active') search_fields = ('name_zh', 'name_en', 'slug') prepopulated_fields = {'slug': ('name_en',)} + formfield_overrides = { + models.TextField: {'widget': CKEditorUploadingWidget}, + } @admin.register(Solution) @@ -18,6 +23,9 @@ class SolutionAdmin(admin.ModelAdmin): list_editable = ('sort_order', 'is_active') search_fields = ('title_zh', 'title_en', 'slug') prepopulated_fields = {'slug': ('title_en',)} + formfield_overrides = { + models.TextField: {'widget': CKEditorUploadingWidget}, + } fieldsets = ( ('基本信息', { 'fields': ('category', 'title_zh', 'title_en', 'slug', 'cover_image') diff --git a/company_website/settings.py b/company_website/settings.py index 0420c98..e39dbf6 100644 --- a/company_website/settings.py +++ b/company_website/settings.py @@ -14,6 +14,8 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'ckeditor', + 'ckeditor_uploader', 'apps.core', 'apps.products', 'apps.solutions', @@ -88,3 +90,25 @@ MEDIA_URL = '/media/' MEDIA_ROOT = BASE_DIR / 'media' DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' + +# CKEditor 富文本编辑器配置 +CKEDITOR_UPLOAD_PATH = 'uploads/' +CKEDITOR_IMAGE_BACKEND = 'pillow' +CKEDITOR_CONFIGS = { + 'default': { + 'toolbar': 'full', + 'height': 400, + 'width': '100%', + 'language': 'zh-cn', + 'extraPlugins': ','.join([ + 'uploadimage', + 'image2', + ]), + }, + 'basic': { + 'toolbar': 'Basic', + 'height': 200, + 'width': '100%', + 'language': 'zh-cn', + }, +} diff --git a/company_website/urls.py b/company_website/urls.py index ed33fde..11dfb3d 100644 --- a/company_website/urls.py +++ b/company_website/urls.py @@ -7,6 +7,7 @@ from django.conf.urls.i18n import i18n_patterns urlpatterns = [ path('admin/', admin.site.urls), path('i18n/', include('django.conf.urls.i18n')), + path('ckeditor/', include('ckeditor_uploader.urls')), ] urlpatterns += i18n_patterns( diff --git a/requirements.txt b/requirements.txt index afed911..ea41ee5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ Django>=5.0,<5.1 Pillow>=10.0.0 +django-ckeditor>=6.7.0