Merge branch 'master' of http://192.168.1.41:3000/outaozhen/cldV2react

package.json

@@ -49,7 +49,7 @@
     "@ant-design/icons": "^4.0.0",
     "@ant-design/pro-descriptions": "^1.0.19",
     "@ant-design/pro-form": "^1.3.0",
-    "@ant-design/pro-layout": "^6.5.15",
+    "@ant-design/pro-layout": "6.19.3",
     "@ant-design/pro-table": "^2.9.16",
     "@icon-park/react": "^1.3.3",
     "@umijs/route-utils": "^1.0.33",
@@ -86,7 +86,7 @@
     "@umijs/plugin-esbuild": "^1.0.1",
     "@umijs/plugin-sass": "^1.1.1",
     "@umijs/preset-ant-design-pro": "^1.2.0",
-    "@umijs/preset-react": "^1.4.8",
+    "@umijs/preset-react": "1.8.12",
     "@umijs/yorkie": "^2.0.3",
     "agent-base": "^6.0.2",
     "carlo": "^0.9.46",
@@ -110,7 +110,7 @@
     "stylelint": "^13.9.0",
     "typescript": "^4.0.3",
     "windicss": "3.0.12",
-    "windicss-webpack-plugin": "^0.6.1"
+    "windicss-webpack-plugin": "1.0.0"
   },
   "engines": {
     "node": ">=10.0.0"

src/pages/Customer/Company/index.jsx

@@ -182,7 +182,7 @@ const Company = props => {
       valueType: 'select',
       fieldProps: {
         mode: 'multiple',
-        options: tag.teamOptions,
+        options: tag.personOptions,
         showArrow: true
       },
       // valueEnum: tag.personTagMap,
@@ -433,8 +433,10 @@ const Company = props => {
       actionRef={tRef}
       params={state.params}
       request={async (params, sort, filter) => {
-        const { code = -1, data: { customer = [], total = 0 } = { customer: [], total: 0 } } =
-          await queryCompany({ ...params, ...sort, ...filter })
+        const {
+          code = -1,
+          data: { customer = [], total = 0 } = { customer: [], total: 0 }
+        } = await queryCompany({ ...params, ...sort, ...filter })
         setState({ ...state, orderIds: customer.map(item => item.id) })
         return {
           data: customer,