Просмотр исходного кода

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

outaozhen 4 лет назад
Родитель
Сommit
11d5313381
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      package.json
  2. 1 1
      src/pages/Statistic/Product/InvoiceTrends/index.jsx

+ 1 - 1
package.json

@@ -23,7 +23,7 @@
     "precommit": "lint-staged",
     "prettier": "prettier -c --write \"src/**/*\"",
     "start": "umi dev",
-    "start:dev": "cross-env REACT_APP_ENV=dev MOCK=none umi dev",
+    "start:dev": "cross-env PORT=8080 REACT_APP_ENV=dev MOCK=none umi dev",
     "start:no-mock": "cross-env MOCK=none umi dev",
     "start:no-ui": "cross-env UMI_UI=none umi dev",
     "start:pre": "cross-env REACT_APP_ENV=pre umi dev",

+ 1 - 1
src/pages/Statistic/Product/InvoiceTrends/index.jsx

@@ -56,6 +56,7 @@ const InvoiceTrends = () => {
       <BasicTable
         // manualRequest
         search={false}
+        params={state.params}
         columns={columns}
         actionRef={tRef}
         rowkey="id"
@@ -84,7 +85,6 @@ const InvoiceTrends = () => {
             />
           ]
         }}
-        params={state.params}
         pagination={false}
         bordered
         request={async (params, sort, filter) => {