瀏覽代碼

fix: 10.10 commit

lanjianrong 2 年之前
父節點
當前提交
c4d8d57b50

+ 1 - 2
src/pages/Contract/Content/Summary/components/Content/index.tsx

@@ -1,11 +1,10 @@
 import React, { memo } from 'react'
 import './index.scss'
 import { Pie, G2, DualAxes } from '@ant-design/charts'
-import { PieConfig } from '@ant-design/charts/es/pie'
+import { PieConfig, DualAxesConfig } from '@ant-design/charts'
 import './index.scss'
 import { formatMoney } from '@/utils/util'
 import { Tooltip } from 'antd'
-import { DualAxesConfig } from '@ant-design/charts/es/dualAxes'
 import BigNumber from 'bignumber.js'
 import { ContractType } from '@/store/mobx/contract'
 G2.registerTheme('custom-pie', {

+ 1 - 1
src/pages/Management/Setting/components/Modal.tsx

@@ -87,7 +87,7 @@ const UserModal: React.FC<iUserModal> = ({ visible, loading, onCreate, onCancel,
               placeholder="请选择"
               size="small"
               optionFilterProp="children"
-              filterOption={(input, option) => option?.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
+              filterOption={(input, option) => option && option?.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
               {
                 userStore.groupList?.map(item => <Option value={item.key} key={item.key}>{item.value}</Option>)
               }

+ 1 - 7
src/pages/Management/Tender/List/components/ModalForm.tsx

@@ -111,13 +111,7 @@ const ModalForm: React.FC<iModalFormProps> = ({
       <Form form={form} layout="vertical">
         <Form.Item name={type === 'tender' ? 'folderId' : 'id'} hidden ><Input /></Form.Item>
         {
-          showNameInput ? <Form.Item name="name" label={modalObj[type].nameTitle} rules={[ { required: true, message: '请输入文件夹名称!' }, {
-            validator: async (_, names) => {
-              if (names && names.length > 30) {
-                return Promise.reject(new Error('名称超过30个字,请缩减名称。'))
-              }
-            }
-          } ]}>
+          showNameInput ? <Form.Item name="name" label={modalObj[type].nameTitle} rules={[ { required: true, message: '请输入文件夹名称!' } ]}>
             <Input allowClear size="small" autoComplete="off" />
           </Form.Item> : null
         }