Merge branch 'dev' of http://192.168.1.41:3000/outaozhen/cldV2react into dev

src/components/RightContent/index.tsx

@@ -61,7 +61,8 @@ const GlobalHeaderRight: React.FC = () => {
       >
         <QuestionCircleOutlined />
       </span> */}
-      {!isMobile() && <Book />}
+      {/* {!isMobile() && <Book />} */}
+      <Book />
 
       <Notify />
       <Avatar />

src/pages/Statistic/Product/InvoiceTrends/index.jsx

@@ -111,13 +111,15 @@ const InvoiceTrends = () => {
     data: [state.chart, state.chart],
     xField: 'monthName',
     yField: ['price', 'ring'],
-    // appendPadding: [0, 32, 24, 32],
+    appendPadding: [0, 24, 12, 24],
     meta: {
       price: {
         alias: '当月开票金额(元)'
       },
       ring: {
-        alias: '环比增长(%)'
+        alias: '环比增长(%)',
+        formatter: v => `${v}%`,
+        tickInterval: 100
       }
       // month: {
       //   formatter: v => `${v}月`
@@ -132,11 +134,7 @@ const InvoiceTrends = () => {
         }
       },
       ring: {
-        label: {
-          formatter: v => {
-            return `${v}%`
-          }
-        }
+        min: -100
       }
     },
     legend: {
@@ -189,6 +187,7 @@ const InvoiceTrends = () => {
             <OptionSelect onChange={optionChange} type="InvoiceTrends" key="op" multiple={false} />,
             <div className="ml-2" key="pp">
               <Select
+                defaultValue="invoice"
                 options={[
                   { label: '发票', value: 'invoice' },
                   { label: '收款', value: 'receivables' },