Commit 24a84653022823600a05cd560bcaace01db94a54
Merge branch 'fix/attribute-distribution' into 'main_dev'
fix: 修物模型下发输入值负数问题 See merge request yunteng/thingskit-front!800
Showing
1 changed file
with
8 additions
and
4 deletions
@@ -135,10 +135,14 @@ const formSchemasConfig = (schemas, actionType): FormSchema[] => { | @@ -135,10 +135,14 @@ const formSchemasConfig = (schemas, actionType): FormSchema[] => { | ||
135 | field: identifier, | 135 | field: identifier, |
136 | label: functionName, | 136 | label: functionName, |
137 | component: 'InputNumber', | 137 | component: 'InputNumber', |
138 | - rules: [{ required: true, message: '请输入值' }], | 138 | + rules: [{ required: true, message: '请输入正数' }], |
139 | componentProps: { | 139 | componentProps: { |
140 | - formatter: (e) => `${e}`.replace(/^-$/, '').replace(/^(-)*(\d+)\.(\d\d).*$/, '$1$2.$3'), | ||
141 | - placeholder: `请输入值`, | 140 | + min: 0, |
141 | + formatter: (e) => { | ||
142 | + const value = `${e}`.replace('-', '').replace(/^(-)*(\d+)\.(\d\d).*$/, '$1$2.$3'); | ||
143 | + return value; | ||
144 | + }, | ||
145 | + placeholder: `请输入正数`, | ||
142 | }, | 146 | }, |
143 | }, | 147 | }, |
144 | ]; | 148 | ]; |
@@ -165,7 +169,7 @@ const formSchemasConfig = (schemas, actionType): FormSchema[] => { | @@ -165,7 +169,7 @@ const formSchemasConfig = (schemas, actionType): FormSchema[] => { | ||
165 | component: 'InputNumber', | 169 | component: 'InputNumber', |
166 | rules: [{ required: true, message: '请输入值' }], | 170 | rules: [{ required: true, message: '请输入值' }], |
167 | componentProps: { | 171 | componentProps: { |
168 | - placeholder: `请输入值`, | 172 | + placeholder: `请输入数字`, |
169 | formatter: (e) => | 173 | formatter: (e) => |
170 | `${e}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(/^(-)*(\d+)\.(\d\d).*$/, '$1$2.$3'), | 174 | `${e}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(/^(-)*(\d+)\.(\d\d).*$/, '$1$2.$3'), |
171 | }, | 175 | }, |