diff --git a/src/components/Charts/Pie/index.js b/src/components/Charts/Pie/index.js
index a03017231d8519ba9480969a7c9314e385029fe4..b63973175055a64cab757efcf578bb475b63b670 100644
--- a/src/components/Charts/Pie/index.js
+++ b/src/components/Charts/Pie/index.js
@@ -138,11 +138,11 @@ export default class Pie extends Component {
       [styles.legendBlock]: legendBlock,
     });
 
-    const { data: d, selected: s, tooltip: t } = this.props;
+    const { data: propsData, selected: propsSelected, tooltip: propsTooltip } = this.props;
 
-    let data = d || [];
-    let selected = s || true;
-    let tooltip = t || true;
+    let data = propsData || [];
+    let selected = propsSelected || true;
+    let tooltip = propsTooltip || true;
 
     const defaultColors = colors;
     // let data = this.props.data || [];
diff --git a/src/routes/Forms/AdvancedForm.js b/src/routes/Forms/AdvancedForm.js
index 63faa6446ca18cbd86b2703ddb58fa3bf3002d9a..6ab2bfb9a29c15f183b4ff2e7d7c899a592bcb2c 100644
--- a/src/routes/Forms/AdvancedForm.js
+++ b/src/routes/Forms/AdvancedForm.js
@@ -73,14 +73,14 @@ class AdvancedForm extends PureComponent {
   resizeFooterToolbar = () => {
     const sider = document.querySelectorAll('.ant-layout-sider')[0];
     const width = `calc(100% - ${sider.style.width})`;
-    const { width: w } = this.state;
-    if (w !== width) {
+    const { width: stateWidth } = this.state;
+    if (stateWidth !== width) {
       this.setState({ width });
     }
   };
 
   render() {
-    const { width: w } = this.state;
+    const { width: stateWidth } = this.state;
     const { form, dispatch, submitting } = this.props;
     const { getFieldDecorator, validateFieldsAndScroll, getFieldsError } = form;
     const validate = () => {
@@ -289,7 +289,7 @@ class AdvancedForm extends PureComponent {
             initialValue: tableData,
           })(<TableForm />)}
         </Card>
-        <FooterToolbar style={{ width: w }}>
+        <FooterToolbar style={{ width: stateWidth }}>
           {getErrorInfo()}
           <Button type="primary" onClick={validate} loading={submitting}>
             提交