From 0bff15b120b3e3ff1f1c3d2ce4d9aa8d3ad3917e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 06 十一月 2020 13:49:44 +0800
Subject: [PATCH] 2020-11-06

---
 src/menu/components/chart/antv-pie/chartcompile/index.jsx |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/menu/components/chart/antv-pie/chartcompile/index.jsx b/src/menu/components/chart/antv-pie/chartcompile/index.jsx
index 88c9d4e..da4c13c 100644
--- a/src/menu/components/chart/antv-pie/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-pie/chartcompile/index.jsx
@@ -11,6 +11,7 @@
   static propTpyes = {
     dict: PropTypes.object,
     plot: PropTypes.object,
+    sysRoles: PropTypes.array,
     config: PropTypes.object,
     plotchange: PropTypes.func
   }
@@ -22,12 +23,12 @@
   }
 
   showDrawer = () => {
-    const { config } = this.props
+    const { config, sysRoles } = this.props
 
     this.setState({
       visible: true,
       plot: fromJS(config.plot).toJS(),
-      formlist: getPieChartOptionForm(config.plot, config.columns, config.setting)
+      formlist: getPieChartOptionForm(config.plot, config.columns, sysRoles)
     })
   }
 
@@ -82,7 +83,7 @@
                     message: this.props.dict['form.required.input'] + item.label + '!'
                   }
                 ]
-              })(<Input placeholder="" autoComplete="off" disabled={item.readonly}/>)}
+              })(<Input placeholder="" autoComplete="off" disabled={item.readonly} onPressEnter={this.onSubmit}/>)}
             </Form.Item>
           </Col>
         )
@@ -103,7 +104,7 @@
                     message: this.props.dict['form.required.input'] + item.label + '!'
                   }
                 ]
-              })(<InputNumber min={item.min} max={item.max} precision={item.decimal} />)}
+              })(<InputNumber min={item.min} max={item.max} precision={item.decimal} onPressEnter={this.onSubmit}/>)}
             </Form.Item>
           </Col>
         )

--
Gitblit v1.8.0