diff --git a/spug_web/src/components/ACEditor.js b/spug_web/src/components/ACEditor.js
index 4a3da2d..40ec4d5 100644
--- a/spug_web/src/components/ACEditor.js
+++ b/spug_web/src/components/ACEditor.js
@@ -6,17 +6,21 @@
import React from 'react';
import Editor from 'react-ace';
import 'ace-builds/src-noconflict/mode-sh';
+import 'ace-builds/src-noconflict/mode-text';
+import 'ace-builds/src-noconflict/mode-json';
+import 'ace-builds/src-noconflict/mode-space';
import 'ace-builds/src-noconflict/mode-python';
import 'ace-builds/src-noconflict/theme-tomorrow';
export default function (props) {
+ const style = {fontFamily: 'source-code-pro, Menlo, Monaco, Consolas, PingFang SC, Microsoft YaHei', ...props.style}
return (
)
}
diff --git a/spug_web/src/index.css b/spug_web/src/index.css
index 1847b84..55b385e 100644
--- a/spug_web/src/index.css
+++ b/spug_web/src/index.css
@@ -2,7 +2,7 @@
body {
margin: 0;
- font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;
+ font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, Microsoft YaHei, PingFang SC, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
overflow: hidden;
@@ -18,7 +18,12 @@ div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb {
}
code {
- font-family: source-code-pro, Menlo, Monaco, Consolas, Courier New, monospace, PingFang SC, Microsoft YaHei;
+ font-family: source-code-pro, Menlo, Monaco, Consolas, Courier New, monospace, Microsoft YaHei, PingFang SC;
+}
+
+.ant-form-item-extra {
+ font-size: 13px;
+ padding-top: 6px;
}
/* Common CSS style */
diff --git a/spug_web/src/pages/config/setting/JSONView.js b/spug_web/src/pages/config/setting/JSONView.js
index ea1f0ea..7ef909e 100644
--- a/spug_web/src/pages/config/setting/JSONView.js
+++ b/spug_web/src/pages/config/setting/JSONView.js
@@ -7,10 +7,7 @@ import React from 'react';
import { observer } from 'mobx-react';
import { SaveOutlined, EditOutlined } from '@ant-design/icons';
import { Button, message } from 'antd';
-import Editor from 'react-ace';
-import 'ace-builds/src-noconflict/mode-json';
-import 'ace-builds/src-noconflict/theme-tomorrow';
-import { AuthButton } from 'components';
+import { AuthButton, ACEditor } from 'components';
import { http } from 'libs';
import store from './store';
@@ -57,14 +54,13 @@ class JSONView extends React.Component {
const {body, readOnly, loading} = this.state;
return (
}>
+ extra={将删除截止日期之前的所有发布申请记录。
}>
)}
{mode === 'count' && (
-
+
setValue(e.target.value)} placeholder="请输入保留个数"/>
)}
{mode === 'deploy' && (
-
+