fmui-base 2.2.31 → 2.2.33
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 +2 -0
- package/lib/form/form.js +4 -2
- package/lib/process_info/processInfo.js +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/form.js
CHANGED
|
@@ -940,6 +940,8 @@ var PageHome = function (_React$Component) {
|
|
|
940
940
|
dateFormat = "Y";
|
|
941
941
|
} else if (dateDisplayFormat == "ODate") {
|
|
942
942
|
dateFormat = "YMD";
|
|
943
|
+
} else if (dateDisplayFormat == "HourMin") {
|
|
944
|
+
dateFormat = "HM";
|
|
943
945
|
} else if (dateDisplayFormat == "zhDate") {
|
|
944
946
|
dateFormat = "YMD";
|
|
945
947
|
dateFormatShow = "zhDate";
|
|
@@ -1705,7 +1707,7 @@ var PageHome = function (_React$Component) {
|
|
|
1705
1707
|
if (item.triggerTblName == mainTblName) {
|
|
1706
1708
|
mainTblData.map(function (mainTblDataItem) {
|
|
1707
1709
|
if (item.triggerFieldName == mainTblDataItem.key) {
|
|
1708
|
-
var nowValue = mainTblDataItem.value;
|
|
1710
|
+
var nowValue = mainTblDataItem.value ? mainTblDataItem.value : "";
|
|
1709
1711
|
if (nowValue && nowValue.indexOf("[") >= 0 && nowValue.indexOf("]") >= 0) {
|
|
1710
1712
|
var nowValueArray = JSON.parse(nowValue);
|
|
1711
1713
|
if (nowValueArray.length == 1) {
|
|
@@ -1765,7 +1767,7 @@ var PageHome = function (_React$Component) {
|
|
|
1765
1767
|
subTblData.map(function (mainTblDataItem) {
|
|
1766
1768
|
if (item.triggerFieldName == mainTblDataItem.itemCode) {
|
|
1767
1769
|
// if(item.triggerFieldVal == mainTblDataItem.value){
|
|
1768
|
-
var nowValue = mainTblDataItem.value;
|
|
1770
|
+
var nowValue = mainTblDataItem.value ? mainTblDataItem.value : "";
|
|
1769
1771
|
if (nowValue && nowValue.indexOf("[") >= 0 && nowValue.indexOf("]") >= 0) {
|
|
1770
1772
|
var nowValueArray = JSON.parse(nowValue);
|
|
1771
1773
|
if (nowValueArray.length == 1) {
|
|
@@ -8406,7 +8406,7 @@ var PageHome = function (_React$Component) {
|
|
|
8406
8406
|
'span',
|
|
8407
8407
|
{ className: 'theme-color' },
|
|
8408
8408
|
_react2.default.createElement('i', { className: 'iconfont icon-back t-rotate-180 t-FS14 t-FR' }),
|
|
8409
|
-
'\
|
|
8409
|
+
'\u7ED3\u675F'
|
|
8410
8410
|
)
|
|
8411
8411
|
),
|
|
8412
8412
|
_react2.default.createElement(_TextareaField2.default, {
|