From 2d32fa3fdc20fad4f70156f4c72897090b0a5c52 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 15 一月 2023 12:10:34 +0800
Subject: [PATCH] 2023-01-15
---
src/menu/stylecontroller/index.jsx | 20 +++++++++++++++++---
src/views/appmanage/submutilform/index.jsx | 2 +-
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx
index 80cde31..053ee15 100644
--- a/src/menu/stylecontroller/index.jsx
+++ b/src/menu/stylecontroller/index.jsx
@@ -98,13 +98,27 @@
}
this.callback = callback
+ let card = fromJS(style).toJS()
+ let borposition = 'outer'
+
+ if (!card.borderWidth) {
+ if (card.borderLeftWidth) {
+ borposition = 'left'
+ } else if (card.borderRightWidth) {
+ borposition = 'right'
+ } else if (card.borderTopWidth) {
+ borposition = 'top'
+ } else if (card.borderBottomWidth) {
+ borposition = 'bottom'
+ }
+ }
this.setState({
visible: true,
fonts: fonts,
- card: fromJS(style).toJS(),
+ card: card,
options: options,
- borposition: 'outer',
+ borposition: borposition,
backgroundImage
})
window.GLOB.styling = true
@@ -674,7 +688,7 @@
label={<BorderOutlined title="杈规浣嶇疆"/>}
labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
>
- <Radio.Group className="border-position" defaultValue={'outer'} onChange={(e) => this.setState({borposition: e.target.value})}>
+ <Radio.Group className="border-position" defaultValue={borposition} onChange={(e) => this.setState({borposition: e.target.value})}>
<Radio value="outer"><BorderOuterOutlined title="澶栬竟妗�"/></Radio>
<Radio value="left"><BorderLeftOutlined title="宸﹁竟妗�"/></Radio>
<Radio value="right"><BorderRightOutlined title="鍙宠竟妗�"/></Radio>
diff --git a/src/views/appmanage/submutilform/index.jsx b/src/views/appmanage/submutilform/index.jsx
index 9c4cb9c..c9b5b5b 100644
--- a/src/views/appmanage/submutilform/index.jsx
+++ b/src/views/appmanage/submutilform/index.jsx
@@ -296,7 +296,7 @@
<Form.Item label={
<Tooltip placement="topLeft" title="鍦ㄤ娇鐢ㄦ槑绉戜簯APP鏃讹紝鐘舵�佹爮鐨勫瓧浣撻鑹层��">
<QuestionCircleOutlined className="mk-form-tip" />
- 鐘舵�佹爮
+ 鐘舵�佹爮鏂囧瓧
</Tooltip>
}>
{getFieldDecorator('statusBarColor', {
--
Gitblit v1.8.0