Procházet zdrojové kódy

fix: 修复打包报错信息

lanjianrong před 5 roky
rodič
revize
625276973b

+ 2 - 1
.eslintignore

@@ -5,4 +5,5 @@
 public
 dist
 .umi
-mock
+mock
+windi.config.ts

+ 2 - 9
config/config.js

@@ -3,7 +3,7 @@ import { defineConfig } from 'umi'
 import defaultSettings from './defaultSettings'
 import proxy from './proxy'
 import routes from './routes'
-import WebpackWindiCSSPlugin from 'windicss-webpack-plugin/dist/index'
+import windicss from 'windicss-webpack-plugin/dist/index'
 const { REACT_APP_ENV } = process.env
 export default defineConfig({
   hash: true,
@@ -47,13 +47,6 @@ export default defineConfig({
     '@babel/plugin-proposal-optional-chaining'
   ],
   chainWebpack(config) {
-    config.plugin('clearn').use(WebpackWindiCSSPlugin, [
-      {
-        scan: {
-          dirs: ['./'],
-          exclude: ['node_modules', '.git', 'dist', 'mock', '.umi']
-        }
-      }
-    ])
+    config.plugin('windicss').use(windicss)
   }
 })

+ 1 - 1
package.json

@@ -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": "^0.6.1"
   },
   "engines": {
     "node": ">=10.0.0"

+ 51 - 51
src/components/EditableForm/src/editableForm.jsx

@@ -1,51 +1,51 @@
-import { Row } from 'antd'
-import React from 'react'
-import EditableFormItem from './editableFormItem'
-
-const EditableForm = ({ dataSource, columns, type, tartgetUrl }) => {
-  // console.log(store)
-  const newColumns = columns.map(item => {
-    const newItem = { ...item }
-
-    // 控制col span
-    if (!item.span) {
-      newItem.span = 24
-    }
-
-    // 默认编辑
-    if (!item.editable) {
-      newItem.editable = true
-    }
-
-    // 默认组件
-    if (!item.editCellType) {
-      newItem.editCellType = 'input'
-    }
-
-    return newItem
-  })
-  return (
-    <Row>
-      {newColumns.map(column => {
-        return (
-          <EditableFormItem
-            type={type}
-            key={column.dataIndex}
-            label={column.label}
-            dataSource={dataSource}
-            dataIndex={column.dataIndex}
-            // record={dataSource[column.dataIndex]}
-            span={column.span}
-            // dataId={dataSource.id}
-            editable={column.editable}
-            editCellType={column.editCellType}
-            customCell={column.customCell}
-            requestUrl={tartgetUrl}
-          />
-        )
-      })}
-    </Row>
-  )
-}
-
-export default EditableForm
+import React from 'react'
+import { Row } from 'antd'
+import EditableFormItem from './editableFormItem'
+
+const EditableForm = ({ dataSource, columns, type, tartgetUrl }) => {
+  // console.log(store)
+  const newColumns = columns.map(item => {
+    const newItem = { ...item }
+
+    // 控制col span
+    if (!item.span) {
+      newItem.span = 24
+    }
+
+    // 默认编辑
+    if (!item.editable) {
+      newItem.editable = true
+    }
+
+    // 默认组件
+    if (!item.editCellType) {
+      newItem.editCellType = 'input'
+    }
+
+    return newItem
+  })
+  return (
+    <Row>
+      {newColumns.map(column => {
+        return (
+          <EditableFormItem
+            type={type}
+            key={column.dataIndex}
+            label={column.label}
+            dataSource={dataSource}
+            dataIndex={column.dataIndex}
+            // record={dataSource[column.dataIndex]}
+            span={column.span}
+            // dataId={dataSource.id}
+            editable={column.editable}
+            editCellType={column.editCellType}
+            customCell={column.customCell}
+            requestUrl={tartgetUrl}
+          />
+        )
+      })}
+    </Row>
+  )
+}
+
+export default EditableForm

+ 1 - 1
src/pages/Customer/Company/components/CompanyDetail/CompanyForm.jsx

@@ -69,7 +69,7 @@ const CompanyForm = props => {
         <Col span={8}>
           <h2 className="text-gray-500">公司</h2>
         </Col>
-        <Col span={16} className="zh-text-right zh-gray">
+        <Col span={16} className="text-right zh-gray">
           {customer.staffName} 创建于 {customer.createTime}
         </Col>
         <Col span={22}>

+ 5 - 5
src/pages/Customer/Company/components/CompanyDetail/index.jsx

@@ -2,14 +2,14 @@ import React, { useState, useEffect } from 'react'
 import { Row, Col, Spin, Tooltip } from 'antd'
 import consts from '@/consts'
 import { apiCompanyDetail } from '@/services/company'
-import CompanyForm from '@/pages/customer/Company/components/CompanyDetail/CompanyForm'
-import CompanyLowerList from '@/pages/customer/Company/components/CompanyDetail/CompanyLowerList'
-import CompanyTabList from '@/pages/customer/Company/components/CompanyDetail/CompanyTabList'
+import CompanyForm from './CompanyForm'
+import CompanyLowerList from './CompanyLowerList'
+import CompanyTabList from './CompanyTabList'
 import { connect } from 'dva'
 import { IconPark } from '@/components/SvgIcon'
 import { FlipOverEnum, useFlipOver } from '@/hooks/web/useFlipOver'
 
-const Index = props => {
+const CompanyDetail = props => {
   const {
     dispatch,
     shouldUpdate,
@@ -113,4 +113,4 @@ export default connect(({ refresh, single, staff }) => ({
   visible: single.drawer.visible,
   departments: staff.departments,
   departmentsMap: staff.departmentsMap
-}))(Index)
+}))(CompanyDetail)

+ 3 - 3
src/pages/Customer/Contact/components/ContactDetail/index.jsx

@@ -1,8 +1,8 @@
 import { Row, Col, Spin, Tooltip } from 'antd'
 import React, { useState, useEffect } from 'react'
-import ContanctForm from '@/pages/customer/Contact/components/ContactDetail/ContanctForm.jsx'
-import ContanctTabList from '@/pages/customer/Contact/components/ContactDetail/ContanctTabList.jsx'
-import ContanctLowerList from '@/pages/customer/Contact/components/ContactDetail/ContanctLowerList.jsx'
+import ContanctForm from './ContanctForm.jsx'
+import ContanctTabList from './ContanctTabList.jsx'
+import ContanctLowerList from './ContanctLowerList.jsx'
 import { apiContactDetail } from '@/services/contact'
 import consts from '@/consts'
 import { connect } from 'dva'

+ 1 - 1
src/pages/Customer/Contact/index.jsx

@@ -2,7 +2,7 @@ import ContactDetail from '@/pages/customer/Contact/components/ContactDetail'
 import CompanyDetail from '@/pages/customer/Company/components/CompanyDetail'
 import Addcontact from '@/pages/customer/Contact/components/AddContact'
 import ProTable from '@ant-design/pro-table'
-import { Button, Card, message, Tag, Tooltip } from 'antd'
+import { Button, message, Tooltip } from 'antd'
 import { connect } from 'dva'
 import React, { useEffect, useState, useRef, useMemo } from 'react'
 import consts from '@/consts'

+ 3 - 0
windi.config.ts

@@ -5,6 +5,9 @@ import colors from 'windicss/colors'
 import proSettings from './config/defaultSettings'
 
 export default defineConfig({
+  extract: {
+    exclude: ['node_modules', '.git', 'dist', 'mock', '.umi']
+  },
   darkMode: 'class',
   plugins: [lineClamp, createEnterPlugin()],
   theme: {