fmui-base 2.2.70 → 2.2.71
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/table.js +26 -2
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/table.js
CHANGED
|
@@ -868,12 +868,13 @@ var PageHome = function (_React$Component) {
|
|
|
868
868
|
var isNowSub = false;
|
|
869
869
|
var subTblName = '';
|
|
870
870
|
var itemKey = thisItem.key;
|
|
871
|
+
var uniqueName = thisItem.uniqueName;
|
|
871
872
|
var tableName = thisItem.tableName;
|
|
872
873
|
var thisSubTblNo = thisItem.subTblNo;
|
|
873
874
|
var mustFields = [];
|
|
874
875
|
var hideFields = [];
|
|
875
876
|
var showFields = [];
|
|
876
|
-
|
|
877
|
+
var formItem = data.formItem;
|
|
877
878
|
var defaultmustFields = [];
|
|
878
879
|
var defaulthideFields = [];
|
|
879
880
|
var defaultshowFields = [];
|
|
@@ -946,6 +947,13 @@ var PageHome = function (_React$Component) {
|
|
|
946
947
|
}
|
|
947
948
|
}
|
|
948
949
|
}
|
|
950
|
+
if (!nowValue || nowValue == '') {
|
|
951
|
+
formItem.map(function (item) {
|
|
952
|
+
if (item.uniqueName == uniqueName) {
|
|
953
|
+
nowValue = item.value;
|
|
954
|
+
}
|
|
955
|
+
});
|
|
956
|
+
}
|
|
949
957
|
|
|
950
958
|
if (nowValue && nowValue.indexOf("[") >= 0 && nowValue.indexOf("]") >= 0) {
|
|
951
959
|
var nowValueArray = JSON.parse(nowValue);
|
|
@@ -954,9 +962,25 @@ var PageHome = function (_React$Component) {
|
|
|
954
962
|
} else {
|
|
955
963
|
nowValue = nowValueArray.join(",");
|
|
956
964
|
}
|
|
957
|
-
} else {
|
|
965
|
+
} else if (nowValue == null || typeof nowValue == 'undefined') {
|
|
958
966
|
nowValue = "";
|
|
959
967
|
}
|
|
968
|
+
// 2$#$##$#$3 这种格式的值 直接转换成字符串 不要解析成数组
|
|
969
|
+
else if (nowValue != '' && (nowValue.indexOf("$#$#") >= 0 || nowValue.indexOf("#$#$") >= 0)) {
|
|
970
|
+
if (nowValue.indexOf("#$#$") >= 0) {
|
|
971
|
+
var nowValueList = nowValue.split("#$#$");
|
|
972
|
+
if (nowValueList.length == 1) {
|
|
973
|
+
nowValue = nowValueList[0].replace("$#$#", "");
|
|
974
|
+
} else {
|
|
975
|
+
nowValueList = nowValueList.map(function (item) {
|
|
976
|
+
return item.replace("$#$#", "");
|
|
977
|
+
});
|
|
978
|
+
nowValue = nowValueList.join(",");
|
|
979
|
+
}
|
|
980
|
+
} else if (nowValue.indexOf("$#$#") >= 0) {
|
|
981
|
+
nowValue = nowValue.replace("$#$#", "");
|
|
982
|
+
}
|
|
983
|
+
}
|
|
960
984
|
var relaFieldMap = {};
|
|
961
985
|
if (editType == 'hide' || editType == 'rowhide') {
|
|
962
986
|
relaFieldMap["key"] = "isHidden";
|