字体图表更新/报表自定义过滤字段弹出框样式调整

src/components/chartDesigner/sections/style/bar.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { connect } from 'dva'
-import { Collapse, Input, Form, Checkbox, Select, Radio } from 'antd'
+import { Collapse, Form, Checkbox, Select, Radio } from 'antd'
 import ColorPicker from '../../../common/colorPicker/index'
 import './bar.less'
 
@@ -32,7 +32,7 @@ class BarStyle extends React.Component {
     }
 
     render() {
-        const { formItemLayout, backgroundColor, markTextColor, colors } = this.state;
+        const { formItemLayout, backgroundColor, colors } = this.state;
         const { chartDesigner, dispatch } = this.props;
         const { styleConfig } = chartDesigner;
         const bar = styleConfig.bar || {};

src/components/chartDesigner/sections/style/index.jsx

@@ -1,12 +1,12 @@
 // import TableStyle from './table'
-import BarStyle from './bar'
+// import BarStyle from './bar'
 
 export default ({ viewType }) => {
     let styleForm = <div>无可用样式配置</div>;
-    const formItemLayout = {
-        labelCol: { span: 8 },
-        wrapperCol: { span: 16 },
-    };
+    // const formItemLayout = {
+    //     labelCol: { span: 8 },
+    //     wrapperCol: { span: 16 },
+    // };
 
     if(viewType === 'dataView') {
         // styleForm = <TableStyle formItemLayout={formItemLayout}/>

src/components/common/colorPicker/index.jsx

@@ -8,7 +8,7 @@ import './index.less'
 class InputColorPicker extends React.Component {
     render() {
         const { placeholder, value, onChange } = this.props;
-        let defaultColorHex, defaultAlpha, colorHex, alpha;
+        let colorHex, alpha;
 
         if((value + '').match(/^#/)) {
             if(value.length > 3) {
@@ -17,7 +17,6 @@ class InputColorPicker extends React.Component {
             alpha = 100;
         }else if(!!(value + '').match(/^rgb[a]{0,1}\(/i)) {
             let arr = value.split(/[(,)]/),
-                len = arr.length,
                 colorRGB = 'RGB(' + (Number((arr[1] || '').trim()) || 0) + ',' + (Number((arr[2] || '').trim()) || 0) + ',' + (Number((arr[3] || '').trim()) || 0) + ',' + (Number((arr[4] || '').trim()) || 1) * 100 + ')'
             colorHex = RGBToHex(colorRGB);
             alpha = (Number((arr[4] || '').trim()) || 1) * 100;
@@ -31,7 +30,7 @@ class InputColorPicker extends React.Component {
                 color={colorHex}
                 alpha={alpha}
                 onChange={(colors) => {
-                    const { alpha, color: colorHex, open } = colors;
+                    const { alpha, color: colorHex } = colors;
                     let color = colorHex;
                     if(alpha !== 100) {
                         color = HexToRGB(colorHex, alpha)

src/components/common/cusIcon/index.jsx

@@ -2,6 +2,6 @@ import { Icon } from 'antd'
 import scriptUrl from '../../../../static/iconfont/iconfont.js'
  
 export default Icon.createFromIconfontCN({
-    scriptUrl: '//at.alicdn.com/t/font_755957_y4aj6wyohhm.js'
-    // scriptUrl
+    // scriptUrl: '//at.alicdn.com/t/font_755957_y4aj6wyohhm.js'
+    scriptUrl
 });

src/components/dashboard/layout.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { connect } from 'dva'
-import { Layout, Spin, Icon } from 'antd'
+import { Layout } from 'antd'
 import DashboardMenu from './menu'
 import DashboardList from './list'
 import Loading from '../common/loading/index'

src/components/dashboard/menu.jsx

@@ -276,7 +276,7 @@ class DashboardMenu extends React.Component {
         const { dashboard, dispatch, hideHeader, editable, model, onSearch: propsOnSearch, onMenuDelete, silentFetch } = this.props;
         const { visibleDeleteBox, selectedMenu } = this.state;
         const { menuTree } = dashboard;
-        const { menuLoading, menuFilterLabel, menuExpandedKeys, menuSelectedKeys, menuAutoExpandParent } = model;
+        const { menuFilterLabel, menuExpandedKeys, menuSelectedKeys, menuAutoExpandParent } = model;
         const reg = new RegExp('([+ \\- & | ! ( ) { } \\[ \\] ^ \" ~ * ? : ( ) \/])', 'g'); // 需要转义的字符
         const regLabel = menuFilterLabel.replace(new RegExp('(\\\\)', 'g'), '\\$1').replace(reg, '\\$1'); // 添加转义符号
 

src/components/dashboardDesigner/cusFilterBox.jsx

@@ -225,7 +225,7 @@ class CusFilterBox extends React.Component {
 
         return <Modal
             className='cusfilter-box'
-            width={380}
+            width={480}
             height='80%'
             title='自定义过滤条件'
             visible={visibleBox}

src/components/dashboardDesigner/cusFilterBox.less

@@ -1,7 +1,6 @@
 .cusfilter-box {
     top: 50px;
     .ant-modal-body {
-        padding: 10px;
         max-height: 60vh;
         overflow-y: auto;
         .config-form {