From e2afee71874538e31ed57032e3ad1bba1188ab4b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 20 十月 2022 15:31:41 +0800
Subject: [PATCH] 2022-10-20

---
 src/menu/stylecombcontroller/index.jsx |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/menu/stylecombcontroller/index.jsx b/src/menu/stylecombcontroller/index.jsx
index 4e06d4f..e47bdd3 100644
--- a/src/menu/stylecombcontroller/index.jsx
+++ b/src/menu/stylecombcontroller/index.jsx
@@ -44,6 +44,7 @@
 
   state = {
     style: {},
+    type: '',
     borposition: 'outer'
   }
 
@@ -65,11 +66,12 @@
     MKEmitter.removeListener('switchMultiStyle', this.switchMultiStyle)
   }
 
-  switchMultiStyle = (type) => {
-    if (type === 'open') {
+  switchMultiStyle = (swit, type) => {
+    if (swit === 'open') {
       this.setState({
         visible: true,
         style: {},
+        type: type,
         borposition: 'outer'
       })
     } else {
@@ -269,7 +271,7 @@
         <div className="menu-combine-style-controller">
           <Form {...formItemLayout}>
             <Collapse expandIconPosition="right" destroyInactivePanel={true} defaultActiveKey="margin">
-              <Panel header="瀛椾綋" key="font">
+              {this.state.type === 'cardcell' ? <Panel header="瀛椾綋" key="font">
                 <Col span={12}>
                   <Form.Item colon={false} label={<FontSizeOutlined title="瀛椾綋澶у皬"/>}>
                     <InputNumber defaultValue={''} min={12} max={100} precision={0} onChange={this.changeFontSize} />
@@ -353,7 +355,7 @@
                     </Radio.Group>
                   </Form.Item>
                 </Col>
-              </Panel>
+              </Panel> : null}
               <Panel header="鑳屾櫙" key="background">
                 <Col span={24}>
                   <Form.Item

--
Gitblit v1.8.0