fmui-base 2.3.42 → 2.3.43
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -0
- package/lib/form/form.js +1 -1
- package/lib/form/table.js +3 -6
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/form.js
CHANGED
|
@@ -2068,7 +2068,7 @@ var PageHome = function (_React$Component) {
|
|
|
2068
2068
|
if (!skipEditMust && matched && defaultshowFields.indexOf(itemParam.uniqueName) != -1) {
|
|
2069
2069
|
itemParam.readOnly = false;
|
|
2070
2070
|
editFlag = true;
|
|
2071
|
-
} else if (!skipEditMust && !editFlag && defaultshowFields.indexOf(itemParam.uniqueName) != -1 && nowValue != '') {
|
|
2071
|
+
} else if (!skipEditMust && !editFlag && defaultshowFields.indexOf(itemParam.uniqueName) != -1 && nowValue != '' && nowValue != ' ') {
|
|
2072
2072
|
itemParam.readOnly = true;
|
|
2073
2073
|
} else if (!editFlag && defaultshowFields.indexOf(itemParam.uniqueName) != -1) {
|
|
2074
2074
|
itemParam.readOnly = baseline.readOnly;
|
package/lib/form/table.js
CHANGED
|
@@ -1304,7 +1304,7 @@ var PageHome = function (_React$Component) {
|
|
|
1304
1304
|
if (!skipEditMust && matched && defaultshowFields.indexOf(targetUniqueName) != -1) {
|
|
1305
1305
|
readOnly = false;
|
|
1306
1306
|
editFlag = true;
|
|
1307
|
-
} else if (!skipEditMust && !editFlag && defaultshowFields.indexOf(targetUniqueName) != -1 && nowValue != '') {
|
|
1307
|
+
} else if (!skipEditMust && !editFlag && defaultshowFields.indexOf(targetUniqueName) != -1 && nowValue != '' && nowValue != ' ') {
|
|
1308
1308
|
readOnly = true;
|
|
1309
1309
|
} else if (!editFlag && defaultshowFields.indexOf(targetUniqueName) != -1) {
|
|
1310
1310
|
readOnly = baseline.readOnly;
|
|
@@ -1463,9 +1463,6 @@ var PageHome = function (_React$Component) {
|
|
|
1463
1463
|
var formRelaFieldMapsObjItem = formRelaFieldMapsObj[formIndex];
|
|
1464
1464
|
mustFlag = false;
|
|
1465
1465
|
var triggerFieldVal = formRelaFieldMapsObjItem.triggerFieldVal;
|
|
1466
|
-
if (triggerFieldVal == " ") {
|
|
1467
|
-
triggerFieldVal = "";
|
|
1468
|
-
}
|
|
1469
1466
|
var relaFieldTblName = formRelaFieldMapsObjItem.relaFieldTblName;
|
|
1470
1467
|
var editType = formRelaFieldMapsObjItem.editType;
|
|
1471
1468
|
if (relaFieldTblName) {
|
|
@@ -1584,7 +1581,7 @@ var PageHome = function (_React$Component) {
|
|
|
1584
1581
|
} else if (editType == 'must') {
|
|
1585
1582
|
relaFieldMap["key"] = "required";
|
|
1586
1583
|
var triggerFieldValBoolean = mustFlag;
|
|
1587
|
-
if (
|
|
1584
|
+
if ((0, _formExtHelper.isRelaRuleMatched)({ triggerFieldVal: triggerFieldVal }, nowValue)) {
|
|
1588
1585
|
relaFieldMap["value"] = true;
|
|
1589
1586
|
triggerFieldValBoolean = true;
|
|
1590
1587
|
mustFlag = true;
|
|
@@ -1631,7 +1628,7 @@ var PageHome = function (_React$Component) {
|
|
|
1631
1628
|
}
|
|
1632
1629
|
} else if (editType == 'edit') {
|
|
1633
1630
|
relaFieldMap["key"] = "readOnly";
|
|
1634
|
-
if ((
|
|
1631
|
+
if ((0, _formExtHelper.isRelaRuleMatched)({ triggerFieldVal: triggerFieldVal }, nowValue) && defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1) {
|
|
1635
1632
|
relaFieldMap["value"] = false;
|
|
1636
1633
|
editFlag = true;
|
|
1637
1634
|
} else if (!editFlag && defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1) {
|