Commit 64c7300a authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:取消图片尺寸

parent 158b6bbd
import React, { useState, useRef, useEffect, createContext } from 'react' import React, { useState, useRef, useEffect, createContext } from 'react'
import { history } from 'umi'; import { history } from 'umi';
import { Button, Card, Tabs, message } from 'antd' import { Button, Card, Tabs, message, Badge } from 'antd'
import { PageHeaderWrapper } from '@ant-design/pro-layout' import { PageHeaderWrapper } from '@ant-design/pro-layout'
import { import {
SaveOutlined, SaveOutlined,
...@@ -106,8 +106,6 @@ const AddProducts: React.FC<{}> = (props) => { ...@@ -106,8 +106,6 @@ const AddProducts: React.FC<{}> = (props) => {
} }
}, [selectCategoryId]) }, [selectCategoryId])
// useEffect(() => { // useEffect(() => {
// renderTemplate(currentTemplateName) // renderTemplate(currentTemplateName)
// }, [currentTemplateName]) // }, [currentTemplateName])
...@@ -371,7 +369,49 @@ const AddProducts: React.FC<{}> = (props) => { ...@@ -371,7 +369,49 @@ const AddProducts: React.FC<{}> = (props) => {
onRef={(refs) => setFormRefs([...formRefs, refs])} onRef={(refs) => setFormRefs([...formRefs, refs])}
/> />
</TabPane> </TabPane>
{/* 带校验 Badge */}
{/* <TabPane tab={<Badge count={1} offset={[12, 0]}>基本信息</Badge>} key="1">
<BasicInfoForm
onRef={(refs) => setFormRefs([...formRefs, refs])}
onChangeAttributeList={(_lists: any) => setAttributeList(_lists)} />
</TabPane>
<TabPane tab={<Badge count={1} offset={[12, 0]}>选择货品</Badge>} key="2">
<SelectGoodsForm />
</TabPane>
<TabPane tab={<Badge count={1} offset={[12, 0]}>商品属性</Badge>} key="3">
<ProductAttributeForm
onRef={(refs) => setFormRefs([...formRefs, refs])}
attributesData={attributeList}
/>
</TabPane>
<TabPane tab={<Badge count={1} offset={[12, 0]}>价格设置</Badge>} key="4">
<PriceAttributeForm
onRef={(refs) => setFormRefs([...formRefs, refs])}
/>
</TabPane>
<TabPane tab={<Badge count={1} offset={[12, 0]}>商品图片</Badge>} key="5">
<ProductImageForm />
</TabPane>
<TabPane tab={<Badge count={1} offset={[12, 0]}>商品描述</Badge>} key="6">
{
renderTemplate()
}
</TabPane>
<TabPane tab={<Badge count={1} offset={[12, 0]}>物流信息</Badge>} key="7">
<LogisticsForm
onRef={(refs) => setFormRefs([...formRefs, refs])}
/>
</TabPane>
<TabPane tab={<Badge count={1} offset={[12, 0]}>其他</Badge>} key="8">
<OtherForm
onRef={(refs) => setFormRefs([...formRefs, refs])}
/>
</TabPane> */}
</Tabs> </Tabs>
</Card> </Card>
</PageHeaderWrapper>) </PageHeaderWrapper>)
} }
......
...@@ -6,7 +6,6 @@ import { ...@@ -6,7 +6,6 @@ import {
PlusOutlined, PlusOutlined,
MinusOutlined, MinusOutlined,
} from '@ant-design/icons' } from '@ant-design/icons'
import styles from './index.less'
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import { import {
GetProductCustomerGetCustomerCategoryTreeResponse, GetProductCustomerGetCustomerCategoryTreeResponse,
...@@ -208,6 +207,7 @@ const BasicInfoForm: React.FC<Iprops> = (props) => { ...@@ -208,6 +207,7 @@ const BasicInfoForm: React.FC<Iprops> = (props) => {
]} ]}
> >
<Cascader <Cascader
allowClear={false}
disabled={!isUpdateAttribute} disabled={!isUpdateAttribute}
options={customerCategoryTree} options={customerCategoryTree}
fieldNames={{ label: 'title', value: 'id', children: 'children' }} fieldNames={{ label: 'title', value: 'id', children: 'children' }}
......
...@@ -129,30 +129,31 @@ const ProductImageForm: React.FC<{}> = (props) => { ...@@ -129,30 +129,31 @@ const ProductImageForm: React.FC<{}> = (props) => {
if (!isLimit) { if (!isLimit) {
message.error('上传图片不超过600K!'); message.error('上传图片不超过600K!');
} }
return isJpgOrPng && isLimit && isSize(file, 800, 800); return isJpgOrPng && isLimit
} }
//检测尺寸
const isSize = (file, w, h) => { // 检测尺寸
return new Promise((resolve, reject) => { // const isSize = (file, w, h) => {
let width = w; // return new Promise((resolve, reject) => {
let height = h; // let width = w;
let _URL = window.URL || window.webkitURL; // let height = h;
let img = new Image(); // let _URL = window.URL || window.webkitURL;
img.onload = function() { // let img = new Image();
let valid = img.width <= width && img.height <= height; // img.onload = function() {
valid ? resolve() : reject(); // let valid = img.width <= width && img.height <= height;
}; // valid ? resolve() : reject();
img.src = _URL.createObjectURL(file); // };
}).then( // img.src = _URL.createObjectURL(file);
() => { // }).then(
return file; // () => {
}, // return file;
() => { // },
message.error(file.name + "图片尺寸不符合要求,请修改后重新上传!"); // () => {
return Promise.reject(); // message.error(file.name + "图片尺寸不符合要求,请修改后重新上传!");
} // return Promise.reject();
); // }
}; // );
// };
const handlePreview = async file => { const handlePreview = async file => {
if (!file.url && !file.preview) { if (!file.url && !file.preview) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment