itizawa 6 лет назад
Родитель
Сommit
35acbbf305

+ 25 - 5
src/client/js/components/Admin/MarkdownSetting/PresentationForm.jsx

@@ -11,7 +11,8 @@ import MarkDownSettingContainer from '../../../services/MarkDownSettingContainer
 class PresentationForm extends React.Component {
 class PresentationForm extends React.Component {
 
 
   render() {
   render() {
-    const { t } = this.props;
+    const { t, markDownSettingContainer } = this.props;
+    const { pageBreakOption, customRegularExpression } = markDownSettingContainer.state;
 
 
     return (
     return (
       <fieldset className="form-group row my-2">
       <fieldset className="form-group row my-2">
@@ -21,7 +22,12 @@ class PresentationForm extends React.Component {
         </label>
         </label>
 
 
         <div className="col-xs-3 radio radio-primary">
         <div className="col-xs-3 radio radio-primary">
-          <input type="radio" id="pageBreakOption1" name="pageBreakOption" value="1" checked={this.state.pageBreakOption === 1} onChange={this.handleInputChange} />
+          <input
+            type="radio"
+            id="pageBreakOption1"
+            checked={pageBreakOption === 1}
+            // onChange={this.handleInputChange}
+          />
           <label htmlFor="pageBreakOption1">
           <label htmlFor="pageBreakOption1">
             <p className="font-weight-bold">{ t('markdown_setting.Preset one separator') }</p>
             <p className="font-weight-bold">{ t('markdown_setting.Preset one separator') }</p>
             <p className="mt-3">
             <p className="mt-3">
@@ -32,7 +38,12 @@ class PresentationForm extends React.Component {
         </div>
         </div>
 
 
         <div className="col-xs-3 radio radio-primary mt-3">
         <div className="col-xs-3 radio radio-primary mt-3">
-          <input type="radio" id="pageBreakOption2" name="pageBreakOption" value="2" checked={this.state.pageBreakOption === 2} onChange={this.handleInputChange} />
+          <input
+            type="radio"
+            id="pageBreakOption2"
+            checked={pageBreakOption === 2}
+            // onChange={this.handleInputChange}
+          />
           <label htmlFor="pageBreakOption2">
           <label htmlFor="pageBreakOption2">
             <p className="font-weight-bold">{ t('markdown_setting.Preset two separator') }</p>
             <p className="font-weight-bold">{ t('markdown_setting.Preset two separator') }</p>
             <p className="mt-3">
             <p className="mt-3">
@@ -43,13 +54,22 @@ class PresentationForm extends React.Component {
         </div>
         </div>
 
 
         <div className="col-xs-3 radio radio-primary mt-3">
         <div className="col-xs-3 radio radio-primary mt-3">
-          <input type="radio" id="pageBreakOption3" name="pageBreakOption" value="3" checked={this.state.pageBreakOption === 3} onChange={this.handleInputChange} />
+          <input
+            type="radio"
+            id="pageBreakOption3"
+            checked={pageBreakOption === 3}
+            // onChange={this.handleInputChange}
+          />
           <label htmlFor="pageBreakOption3">
           <label htmlFor="pageBreakOption3">
             <p className="font-weight-bold">{ t('markdown_setting.Custom separator') }</p>
             <p className="font-weight-bold">{ t('markdown_setting.Custom separator') }</p>
             <p className="mt-3">
             <p className="mt-3">
               { t('markdown_setting.Custom separator desc') }
               { t('markdown_setting.Custom separator desc') }
               <div>
               <div>
-                <input className="form-control" name="customRegularExpression" value={this.state.customRegularExpression} onChange={this.handleInputChange} />
+                <input
+                  className="form-control"
+                  value={customRegularExpression}
+                  onChange={this.handleInputChange}
+                />
               </div>
               </div>
             </p>
             </p>
           </label>
           </label>

+ 2 - 0
src/client/js/services/MarkDownSettingContainer.js

@@ -12,6 +12,8 @@ export default class MarkDownSettingContainer extends Container {
     this.appContainer = appContainer;
     this.appContainer = appContainer;
 
 
     this.state = {
     this.state = {
+      pageBreakOption: appContainer.config.pageBreakOption,
+      customRegularExpression: appContainer.config.customRegularExpression || '',
       isEnabledXss: (appContainer.config.xssOption != null),
       isEnabledXss: (appContainer.config.xssOption != null),
       xssOption: appContainer.config.xssOption,
       xssOption: appContainer.config.xssOption,
       tagWhiteList: appContainer.config.tagWhiteList || '',
       tagWhiteList: appContainer.config.tagWhiteList || '',