From d1af859f5d564198d154ad0954b05405572ad0b9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 十二月 2020 15:58:57 +0800
Subject: [PATCH] 2020-12-31
---
src/tabviews/zshare/mutilform/index.jsx | 4 ++--
src/templates/zshare/modalform/index.jsx | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 38a1c17..fe4286e 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -123,6 +123,7 @@
_fieldlen = item.fieldlength || 512
} else if (item.type === 'number') {
_fieldlen = item.decimal ? item.decimal : 0
+ item.initval = item.initval || 0
}
datatype[item.field] = item.type
@@ -803,7 +804,6 @@
</Col>
)
} else if (item.type === 'number') { // 鏁板瓧
- let _initval = item.initval
let precision = (item.decimal || item.decimal === 0) ? item.decimal : null
fields.push(
@@ -815,7 +815,7 @@
</Tooltip> : item.label
}>
{getFieldDecorator(item.field, {
- initialValue: _initval,
+ initialValue: item.initval,
rules: [
{
required: true,
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 40d2475..31e444f 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -691,8 +691,9 @@
}
} else if (values.type === 'funcvar') { // 鍑芥暟鍙橀噺涓哄彧璇诲厓绱�
values.readonly = 'true'
- } else if (values.type === 'number' && (values.min || values.min === 0) && (values.max || values.max === 0)) { // 鏁板�煎瀷楠岃瘉鏈�灏忔渶澶у��
- if (values.min > values.max) {
+ } else if (values.type === 'number') { // 鏁板�煎瀷楠岃瘉鏈�灏忔渶澶у��
+ values.required = 'true'
+ if ((values.min || values.min === 0) && (values.max || values.max === 0) && values.min > values.max) {
notification.warning({
top: 92,
message: '鏈�灏忓�间笉鍙ぇ浜庢渶澶у�硷紒',
--
Gitblit v1.8.0