Skip to content

J
jinfa-platform
Commit abcc5335 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

feat: 修改营销活动数量校验

parent e91d76ac
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 46 deletions
src/pages/transaction/marketingAbility/components/couponsListLayout/components/productLayout/index.tsx
View file @ abcc5335
......@@ -87,7 +87,7 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
label={remind.label[1]}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*(\.\d{1,2})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;;
if (!value) {
return Promise.reject(new Error(remind.message[4]));
}
......@@ -166,7 +166,7 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
initialValue={1}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*$/;
const pattern = /^[1-9]\d*$/;
if (!value) {
return Promise.reject(new Error(remind.message[5]));
}
......
src/pages/transaction/marketingAbility/components/listModalLayout/components/productLayout/index.tsx
View file @ abcc5335
......@@ -108,7 +108,7 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
name={`swapPrice_${index}_${_index}`}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;;
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.qingshuruhuangoudanjia'})}`));
}
......@@ -150,7 +150,7 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
initialValue={1}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*$/;
const pattern = /^[1-9]\d*$/;
if (!value) {
return Promise.reject(new Error(remind.message[5]));
}
......
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_1.tsx
View file @ abcc5335
......@@ -76,7 +76,7 @@ const columns_1 = ({
name={`activityPrice_${_index}`}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,4})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,4})?$)|(^\d\.\d{1,4}$)/;
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.qingshuruhuodongjiage' })}`));
}
......@@ -111,7 +111,7 @@ const columns_1 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const restrictTotalNum = getFieldValue(`restrictTotalNum_${_index}`);
if (!pattern.test(value) || !(Number(value) < Number(restrictTotalNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiexiaoyuhuodongxiangouzongshuliang' })}`));
......@@ -144,7 +144,7 @@ const columns_1 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const restrictNum = getFieldValue(`restrictNum_${_index}`);
if (!pattern.test(value) || !(Number(value) > Number(restrictNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiedayugerenxiangoushuliang' })}`));
......
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_2.tsx
View file @ abcc5335
......@@ -84,7 +84,7 @@ const columns_2 = ({
name={`plummetPrice_${_index}`}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,4})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,4})?$)|(^\d\.\d{1,4}$)/;;
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.qingshuruhuodongjiage'})}`));
}
......@@ -125,7 +125,7 @@ const columns_2 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;;
const restrictTotalNum = getFieldValue(`restrictTotalNum_${_index}`);
if (!pattern.test(value) || !(Number(value) < Number(restrictTotalNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiexiaoyuhuodongxiangouzongshuliang'})}`));
......@@ -158,7 +158,7 @@ const columns_2 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;;
const restrictNum = getFieldValue(`restrictNum_${_index}`);
if (!pattern.test(value) || !(Number(value) > Number(restrictNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiedayugerenxiangoushuliang'})}`));
......
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_3.tsx
View file @ abcc5335
......@@ -84,7 +84,7 @@ const columns_3 = ({
},
() => ({
validator: (_rule, value) => {
const pattern = /^(\d|[1-9]\d|99.999)(\.\d{1,3})?$/;
const pattern = /^(?!0+(?:\.0+)?$)\d?\d(?:\.\d{1,1}?)?$/;
if (!pattern.test(value)) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.zhekoubixudayu0qiexiaoyu100zuiduobaoliu3weixiaoshu'})}`));
}
......@@ -123,7 +123,7 @@ const columns_3 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const restrictTotalNum = getFieldValue(`restrictTotalNum_${_index}`);
if (!pattern.test(value) || !(Number(value) < Number(restrictTotalNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiexiaoyuhuodongxiangouzongshuliang'})}`));
......@@ -156,7 +156,7 @@ const columns_3 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const restrictNum = getFieldValue(`restrictNum_${_index}`);
if (!pattern.test(value) || !(Number(value) > Number(restrictNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiedayugerenxiangoushuliang'})}`));
......
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_4.tsx
View file @ abcc5335
......@@ -81,7 +81,7 @@ const columns_4 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const restrictTotalNum = getFieldValue(`restrictTotalNum_${_index}`);
if (!pattern.test(value) || !(Number(value) < Number(restrictTotalNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiexiaoyuhuodongxiangouzongshuliang'})}`));
......@@ -114,7 +114,7 @@ const columns_4 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const restrictNum = getFieldValue(`restrictNum_${_index}`);
if (!pattern.test(value) || !(Number(value) > Number(restrictNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiedayugerenxiangoushuliang'})}`));
......
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_5.tsx
View file @ abcc5335
......@@ -73,7 +73,7 @@ const columns_5 = ({
name={`activityPrice_${_index}`}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.qingshurutuangoujiage'})}`));
}
......@@ -108,7 +108,7 @@ const columns_5 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const restrictTotalNum = getFieldValue(`restrictTotalNum_${_index}`);
if (!pattern.test(value) || !(Number(value) < Number(restrictTotalNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiexiaoyuhuodongxiangouzongshuliang'})}`));
......@@ -141,7 +141,7 @@ const columns_5 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const restrictNum = getFieldValue(`restrictNum_${_index}`);
if (!pattern.test(value) || !(Number(value) > Number(restrictNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiedayugerenxiangoushuliang'})}`));
......
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_6.tsx
View file @ abcc5335
......@@ -75,7 +75,7 @@ const columns_6 = ({
name={`plummetPrice_${_index}`}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,4})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,4})?$)|(^\d\.\d{1,4}$)/;
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.qingshuruqishijiage'})}`));
}
......@@ -112,7 +112,7 @@ const columns_6 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,4})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,4})?$)|(^\d\.\d{1,4}$)/;
const plummetPrice = getFieldValue(`plummetPrice_${_index}`);
if (!pattern.test(value)) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.zuiduobaoliu4weixiaoshu'})}`));
......@@ -149,7 +149,7 @@ const columns_6 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /^(\-)?\d+(\.\d{1,4})?$/;
const restrictTotalNum = getFieldValue(`restrictTotalNum_${_index}`);
if (!pattern.test(value) || !(Number(value) < Number(restrictTotalNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiexiaoyuhuodongxiangouzongshuliang'})}`));
......@@ -182,7 +182,7 @@ const columns_6 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /^(\-)?\d+(\.\d{1,4})?$/;
const restrictNum = getFieldValue(`restrictNum_${_index}`);
if (!pattern.test(value) || !(Number(value) > Number(restrictNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiedayugerenxiangoushuliang'})}`));
......
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_7.tsx
View file @ abcc5335
......@@ -80,7 +80,7 @@ const columns_7 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,4})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,4})?$)|(^\d\.\d{1,4}$)/;
if (!pattern.test(value)) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.zuiduobaoliu4weixiaoshu'})}`));
}
......@@ -116,7 +116,7 @@ const columns_7 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const restrictTotalNum = getFieldValue(`restrictTotalNum_${_index}`);
if (!pattern.test(value) || !(Number(value) < Number(restrictTotalNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiexiaoyuhuodongxiangouzongshuliang'})}`));
......@@ -149,7 +149,7 @@ const columns_7 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const restrictNum = getFieldValue(`restrictNum_${_index}`);
if (!pattern.test(value) || !(Number(value) > Number(restrictNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiedayugerenxiangoushuliang'})}`));
......
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_8.tsx
View file @ abcc5335
......@@ -77,7 +77,7 @@ const columns_8 = ({
},
({ }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,4})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,4})?$)|(^\d\.\d{1,4}$)/;;
if (!pattern.test(value) || (Number(value) >= Number(_record.price))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiexiaoyushangpinjiage'})}`));
}
......@@ -109,7 +109,7 @@ const columns_8 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,4})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,4})?$)|(^\d\.\d{1,4}$)/;
const preSelPrice = getFieldValue(`preSelPrice_${_index}`);
if (!pattern.test(value) || !(Number(value) < Number(preSelPrice))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiexiaoyuyushoujiage'})}`));
......@@ -142,7 +142,7 @@ const columns_8 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,4})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,4})?$)|(^\d\.\d{1,4}$)/;
const preSelPrice = getFieldValue(`preSelPrice_${_index}`);
if (!pattern.test(value) || !(Number(value) < Number(preSelPrice))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiexiaoyuyushoujiage'})}`));
......@@ -176,7 +176,7 @@ const columns_8 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const restrictTotalNum = getFieldValue(`restrictTotalNum_${_index}`);
if (!pattern.test(value) || !(Number(value) < Number(restrictTotalNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiexiaoyuhuodongxiangouzongshuliang'})}`));
......@@ -209,7 +209,7 @@ const columns_8 = ({
},
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,3})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const restrictNum = getFieldValue(`restrictNum_${_index}`);
if (!pattern.test(value) || !(Number(value) > Number(restrictNum))) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0qiedayugerenxiangoushuliang'})}`));
......
src/pages/transaction/marketingAbility/selfManagement/readySubmitExamine/components/rulesLayout/index.tsx
View file @ abcc5335
......@@ -72,6 +72,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
const handleActivityDefinedBO = (e) => {
const { value } = e.target
setLadderType(Number(value));
form.resetFields([['activityDefined', 'ladderList']]);
getRule()
}
......@@ -248,7 +249,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
rules={[
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,2})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
const randomEndPrice = getFieldValue('activityDefined')['randomEndPrice'];
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseMinimumAmountRandom' })}`));
......@@ -271,7 +272,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
rules={[
({ getFieldValue }) => ({
validator: (_rule, value) => {
const pattern = /^(\-)?\d+(\.\d{1,2})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
const randomStartPrice = getFieldValue('activityDefined')['randomStartPrice'];
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseLargestAmountRandom' })}`));
......@@ -350,8 +351,8 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
fieldKey={[fieldKey, `${int === ACTIVITY_TYPE_7 ? 'num' : 'key'}`]}
rules={[{
required: true, validator: (_rule, value) => {
const pattern1 = /^-?[1-9]\d*$/;
const pattern2 = /^-?[1-9]\d*(\.\d{1,2})?$/;
const pattern1 = /(^[1-9](\d+)?(\.\d{1,3})?$)|(^\d\.\d{1,3}$)/;
const pattern2 = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
if (!value && int === ACTIVITY_TYPE_4) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseEnterTheNumberOf' })}`));
}
......@@ -365,7 +366,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.mustBeGreaterThanZero' })}`));
}
if (!pattern2.test(value) && int === ACTIVITY_TYPE_5) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'undefined' })}`));
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0zuiduobaoliu2weixiaoshu' })}`));
}
return Promise.resolve();
}
......@@ -381,21 +382,21 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
fieldKey={[fieldKey, `${int === ACTIVITY_TYPE_7 ? 'discount' : 'value'}`]}
rules={[{
required: true, validator: (_rule, value) => {
const pattern1 = /^-?[1-9]\d*(\.\d{1,1})?$/;
const pattern2 = /^-?[1-9]\d*(\.\d{1,2})?$/;
const pattern3 = /^(\d|[1-9]\d|99.999)(\.\d{1,1})?$/;
const pattern4 = /^(\d|[1-9]\d|99.999)(\.\d{1,2})?$/;
const pattern1 = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
const pattern2 = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
const pattern3 = /^(?!0+(?:\.0+)?$)\d?\d(?:\.\d{1,1}?)?$/;
const pattern4 = /^(?!0+(?:\.0+)?$)\d?\d(?:\.\d{1,1}?)?$/;
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseEnterThe' })}`));
}
if (!pattern1.test(value) && (int === ACTIVITY_TYPE_4 || int === ACTIVITY_TYPE_7)) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'undefined' })}`));
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.mustBeGreaterThanZero' })}`));
}
if (!pattern3.test(value) && (int === ACTIVITY_TYPE_4 || int === ACTIVITY_TYPE_7) && type === 2) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'undefined' })}`));
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.mustBeGreaterThanZero' })}`));
}
if (!pattern2.test(value) && int === ACTIVITY_TYPE_5) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'undefined' })}`));
return Promise.reject(new Error(`${intl.formatMessage({ id: 'marketingAbility.bixudayu0zuiduobaoliu2weixiaoshu' })}`));
}
if (!pattern4.test(value) && int === ACTIVITY_TYPE_5 && type === 2) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.greaterDecimalPlaces' })}`));
......@@ -427,7 +428,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
name={['activityDefined', 'num']}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*$/;
const pattern = /^[1-9]\d*$/;
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseEnterTheNumber' })}`));
}
......@@ -444,7 +445,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
name={['activityDefined', 'price']}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*(\.\d{1,2})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseEnterTheAmount' })}`));
}
......@@ -521,7 +522,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
initialValue={1}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*$/;
const pattern = /^[1-9]\d*$/;
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseNumberRestrictions' })}`));
}
......@@ -786,7 +787,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
name={['activityDefined', 'orderPrice']}
rules={[{
required: true, validator: (_rule, value) => {
const pattern = /^-?[1-9]\d*(\.\d{1,2})?$/;
const pattern = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/;
if (!value) {
return Promise.reject(new Error(`${intl.formatMessage({ id: 'selfManagement.pleaseEnterTheOrderAmount' })}`));
}
......
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