From 2ae980243b7ad705dea575eadcfc4cf4e24073bd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 17 五月 2022 22:57:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/stylecontroller/index.jsx | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx
index a6143e6..4c50043 100644
--- a/src/menu/stylecontroller/index.jsx
+++ b/src/menu/stylecontroller/index.jsx
@@ -149,7 +149,13 @@
changeFontSize = (val) => {
let value = parseInt(val)
- if (isNaN(value) || value < 12 || value > 100) return
+ if (isNaN(value)) return
+
+ if (value < 12) {
+ value = 12
+ } else if (value > 300) {
+ value = 300
+ }
this.updateStyle({fontSize: `${value}px`})
}
@@ -430,7 +436,7 @@
{options.includes('font') ? <Panel header="瀛椾綋" key="font">
<Col span={12}>
<Form.Item colon={false} label={<FontSizeOutlined title="瀛椾綋澶у皬"/>}>
- <InputNumber defaultValue={card.fontSize || 14} min={12} max={100} precision={0} onChange={this.changeFontSize} />
+ <InputNumber defaultValue={card.fontSize || 14} min={12} max={300} precision={0} onChange={this.changeFontSize} />
</Form.Item>
</Col>
<Col span={12}>
@@ -512,6 +518,41 @@
</Form.Item>
</Col>
</Panel> : null}
+ {options.includes('font1') ? <Panel header="瀛椾綋" key="font1">
+ <Col span={12}>
+ <Form.Item colon={false} label={<FontSizeOutlined title="瀛椾綋澶у皬"/>}>
+ <InputNumber defaultValue={card.fontSize || 14} min={12} max={300} precision={0} onChange={this.changeFontSize} />
+ </Form.Item>
+ </Col>
+ <Col span={12}>
+ <Form.Item colon={false} label={<BoldOutlined title="瀛椾綋绮楃粏"/>}>
+ <Select defaultValue={card.fontWeight || 'normal'} onChange={this.boldChange}>
+ <Option value="normal">normal</Option>
+ <Option value="bold">bold</Option>
+ <Option value="bolder">bolder</Option>
+ <Option value="lighter">lighter</Option>
+ <Option value="100">100</Option>
+ <Option value="200">200</Option>
+ <Option value="300">300</Option>
+ <Option value="400">400</Option>
+ <Option value="500">500</Option>
+ <Option value="600">600</Option>
+ <Option value="700">700</Option>
+ <Option value="800">800</Option>
+ <Option value="900">900</Option>
+ </Select>
+ </Form.Item>
+ </Col>
+ <Col span={24}>
+ <Form.Item
+ colon={false}
+ label={<FontColorsOutlined title="瀛椾綋棰滆壊"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
+ >
+ <ColorSketch value={card.color || 'rgba(0, 0, 0, 0.85)'} onChange={this.changeFontColor} />
+ </Form.Item>
+ </Col>
+ </Panel> : null}
{options.includes('background') || options.includes('backgroundColor') ? <Panel header="鑳屾櫙" key="background">
<Col span={24}>
<Form.Item
--
Gitblit v1.8.0