tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #17630 from abpframework/auto-merge/rel-7-4/2185 

Merge branch dev with rel-7.4
pull/17635/head
maliming 3 years ago
committed by GitHub
parent
ad056b4b4e 152665d420
commit
ecdf450b20
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 90 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/AbpAspNetCoreComponentsServerModule.cs
  2. 44
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js
  3. 37
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js
  4. 19
      modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/Default.cshtml
  5. 6
      modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/_ViewImports.cshtml

10
framework/src/Volo.Abp.AspNetCore.Components.Server/Volo/Abp/AspNetCore/Components/Server/AbpAspNetCoreComponentsServerModule.cs
View File

@ -1,6 +1,8 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting.StaticWebAssets;
using Microsoft.AspNetCore.Http.Connections;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.FileProviders;
@ -48,11 +50,15 @@ public class AbpAspNetCoreComponentsServerModule : AbpModule
options.IgnoredUrls.AddIfNotContains("/_blazor");
});
var preConfigureActions = context.Services.GetPreConfigureActions<HttpConnectionDispatcherOptions>();
Configure<AbpEndpointRouterOptions>(options =>
{
options.EndpointConfigureActions.Add(endpointContext =>
{
endpointContext.Endpoints.MapBlazorHub();
endpointContext.Endpoints.MapBlazorHub(httpConnectionDispatcherOptions =>
{
preConfigureActions.Configure(httpConnectionDispatcherOptions);
});
endpointContext.Endpoints.MapFallbackToPage("/_Host");
});
});

44
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js
View File

@ -92,12 +92,15 @@ $(function () {
initEditor();
var editor;
var addWidgetButton;
function initEditor() {
var $editorContainer = $("#ContentEditor");
var inputName = $editorContainer.data('input-id');
var $editorInput = $('#' + inputName);
var initialValue = $editorInput.val();
addWidgetButton = createAddWidgetButton();
editor = new toastui.Editor({
el: $editorContainer[0],
usageStatistics: false,
@ -117,7 +120,7 @@ $(function () {
['code', 'codeblock'],
// Using Option: Customize the last button
[{
el: createAddWidgetButton(),
el: addWidgetButton,
command: 'bold',
tooltip: 'Add Widget'
}]
@ -171,27 +174,48 @@ $(function () {
editor.insertText(txt);
});
var $previewArea;
$('.tab-item').on('click', function () {
if ($(this).attr("aria-label") == 'Preview' && editor.isMarkdownMode()) {
if(!$previewArea){
$previewArea = $("#ContentEditor .toastui-editor-md-preview");
$previewArea.replaceWith("<iframe id='previewArea' style='height: 100%; width: 100%; border: 0px; display: inline;'></iframe>");
}
$previewArea.attr("srcdoc", '');
let content = editor.getMarkdown();
addWidgetButton.disabled = true;
localStorage.setItem('content', content);
$.post("/CmsKitCommonWidgets/ContentPreview", { content: content }, function (result) {
var style = styleEditor.getValue();
var script = scriptEditor.getValue();
let style = styleEditor.getValue();
$('#editor-preview-style').remove();
$('head').append('<style id="editor-preview-style">' + style + '</style>');
editor.setHTML(result);
var parser = new DOMParser();
var doc = parser.parseFromString(result, 'text/html');
var head = doc.querySelector('head');
var styleElement = doc.createElement('style');
styleElement.type = 'text/css';
styleElement.innerHTML = style;
head.append(styleElement);
var body = doc.querySelector('body');
var scriptElement = doc.createElement('script');
scriptElement.type = 'text/javascript';
scriptElement.innerHTML = script;
body.append(scriptElement);
result = new XMLSerializer().serializeToString(doc);
var highllightedText = $('#ContentEditor').find('.toastui-editor-md-preview-highlight');
highllightedText.removeClass('toastui-editor-md-preview-highlight');
$previewArea = $("#previewArea");
$previewArea.attr("srcdoc", result);
});
}
else if ($(this).attr("aria-label") == 'Write'){
addWidgetButton.disabled = false;
var retrievedObject = localStorage.getItem('content');
editor.setMarkdown(retrievedObject);
}

37
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js
View File

@ -62,12 +62,15 @@ $(function () {
initEditor();
var editor;
var addWidgetButton;
function initEditor() {
var $editorContainer = $("#ContentEditor");
var inputName = $editorContainer.data('input-id');
var $editorInput = $('#' + inputName);
var initialValue = $editorInput.val();
addWidgetButton = createAddWidgetButton();
editor = new toastui.Editor({
el: $editorContainer[0],
usageStatistics: false,
@ -87,7 +90,7 @@ $(function () {
['code', 'codeblock'],
// Using Option: Customize the last button
[{
el: createAddWidgetButton(),
el: addWidgetButton,
command: 'bold',
tooltip: 'Add Widget'
}]
@ -141,24 +144,44 @@ $(function () {
editor.insertText(txt);
});
var $previewArea;
$('.tab-item').on('click', function () {
if ($(this).attr("aria-label") == 'Preview' && editor.isMarkdownMode()) {
if(!$previewArea){
$previewArea = $("#ContentEditor .toastui-editor-md-preview");
$previewArea.replaceWith("<iframe id='previewArea' style='height: 100%; width: 100%; border: 0px; display: inline;'></iframe>");
}
$previewArea.attr("srcdoc", '');
addWidgetButton.disabled = true;
let content = editor.getMarkdown();
localStorage.setItem('content', content);
$.post("/CmsKitCommonWidgets/ContentPreview", { content: content }, function (result) {
let style = styleEditor.getValue();
var style = styleEditor.getValue();
var script = scriptEditor.getValue();
$('#editor-preview-style').remove();
var parser = new DOMParser();
var doc = parser.parseFromString(result, 'text/html');
$('head').append('<style id="editor-preview-style">' + style + '</style>');
var head = doc.querySelector('head');
var styleElement = doc.createElement('style');
styleElement.type = 'text/css';
styleElement.innerHTML = style;
head.append(styleElement);
editor.setHTML(result);
var body = doc.querySelector('body');
var scriptElement = doc.createElement('script');
scriptElement.type = 'text/javascript';
scriptElement.innerHTML = script;
body.append(scriptElement);
var highllightedText = $('#ContentEditor').find('.toastui-editor-md-preview-highlight');
highllightedText.removeClass('toastui-editor-md-preview-highlight');
result = new XMLSerializer().serializeToString(doc);
$previewArea = $("#previewArea");
$previewArea.attr("srcdoc", result);
});
}
else if ($(this).attr("aria-label") == 'Write') {

19
modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/ContentPreview/Default.cshtml
View File

@ -1,10 +1,15 @@
@using Volo.CmsKit.Contents
@using Volo.CmsKit.Web.Pages.CmsKit.Components.Contents
@using Volo.CmsKit.Web.Pages.CmsKit.Components.Contents
@using Volo.Abp.AspNetCore.Mvc.UI.Theming
@model DefaultContentDto
@model Volo.CmsKit.Contents.DefaultContentDto
<div class="content">
@inject IThemeManager ThemeManager
@{
Layout = ThemeManager.CurrentTheme.GetEmptyLayout();
}
@await Component.InvokeAsync(typeof(ContentFragmentViewComponent), Model)
</div>
<abp-card>
<abp-card-body>
@await Component.InvokeAsync(typeof(ContentFragmentViewComponent), Model)
</abp-card-body>
</abp-card>

6
modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/_ViewImports.cshtml
View File

@ -0,0 +1,6 @@
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling
@addTagHelper *, Volo.CmsKit.Common.Web
@addTagHelper *, Volo.CmsKit.Public.Web
Write Preview
Loading…
Cancel
Save