fmui-base 2.1.38 → 2.1.40
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/subForm.js +25 -17
- package/lib/process_list/processList.less +2 -3
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/subForm.js
CHANGED
|
@@ -537,10 +537,10 @@ var PageHome = function (_React$Component) {
|
|
|
537
537
|
var key = itemPa.itemCode;
|
|
538
538
|
var title = itemPa.itemTitle;
|
|
539
539
|
var subTbl = itemParamList;
|
|
540
|
-
if ($('.' + uniqueName).length > 0) {
|
|
541
|
-
$('.' + uniqueName).html('');
|
|
542
|
-
} else if ($('.hejidiv-' + subTableName).html() == '') {
|
|
543
|
-
$('.hejidiv-' + subTableName).html('合计：');
|
|
540
|
+
if ($('.' + t.replaceDollar(uniqueName)).length > 0) {
|
|
541
|
+
$('.' + t.replaceDolla(uniqueName)).html('');
|
|
542
|
+
} else if ($('.hejidiv-' + t.replaceDolla(subTableName)).html() == '') {
|
|
543
|
+
$('.hejidiv-' + t.replaceDolla(subTableName)).html('合计：');
|
|
544
544
|
}
|
|
545
545
|
var subValue = '';
|
|
546
546
|
if (subTbl != null && subTbl.length > 0) {
|
|
@@ -565,10 +565,10 @@ var PageHome = function (_React$Component) {
|
|
|
565
565
|
subValue = '';
|
|
566
566
|
}
|
|
567
567
|
if (subValue != '') {
|
|
568
|
-
if ($('.' + uniqueName).length > 0) {
|
|
569
|
-
$('.' + uniqueName).html(title + " " + subValue + "; ");
|
|
568
|
+
if ($('.' + t.replaceDolla(uniqueName)).length > 0) {
|
|
569
|
+
$('.' + t.replaceDolla(uniqueName)).html(title + " " + subValue + "; ");
|
|
570
570
|
} else {
|
|
571
|
-
$('.hejidiv-' + subTableName).append('<span class="' + uniqueName + '">' + title + " " + subValue + "; " + "</span>");
|
|
571
|
+
$('.hejidiv-' + t.replaceDolla(subTableName)).append('<span class="' + uniqueName + '">' + title + " " + subValue + "; " + "</span>");
|
|
572
572
|
}
|
|
573
573
|
}
|
|
574
574
|
}
|
|
@@ -741,6 +741,14 @@ var PageHome = function (_React$Component) {
|
|
|
741
741
|
);
|
|
742
742
|
});
|
|
743
743
|
}
|
|
744
|
+
}, {
|
|
745
|
+
key: 'replaceDollar',
|
|
746
|
+
value: function replaceDollar(str) {
|
|
747
|
+
if (str && str.indexOf('$') != -1) {
|
|
748
|
+
return str.replace(/\$/g, '\\$');
|
|
749
|
+
}
|
|
750
|
+
return str;
|
|
751
|
+
}
|
|
744
752
|
}, {
|
|
745
753
|
key: 'getSubTotal',
|
|
746
754
|
value: function getSubTotal() {
|
|
@@ -763,10 +771,10 @@ var PageHome = function (_React$Component) {
|
|
|
763
771
|
var key = itemPa.itemCode;
|
|
764
772
|
var title = itemPa.itemTitle;
|
|
765
773
|
var subTbl = itemParamList;
|
|
766
|
-
if ($('.' + uniqueName).length > 0) {
|
|
767
|
-
$('.' + uniqueName).html('');
|
|
768
|
-
} else if ($('.hejidiv-' + subTableName).html() == '') {
|
|
769
|
-
$('.hejidiv-' + subTableName).html('合计：');
|
|
774
|
+
if ($('.' + t.replaceDollar(uniqueName)).length > 0) {
|
|
775
|
+
$('.' + t.replaceDollar(uniqueName)).html('');
|
|
776
|
+
} else if ($('.hejidiv-' + t.replaceDollar(subTableName)).html() == '') {
|
|
777
|
+
$('.hejidiv-' + t.replaceDollar(subTableName)).html('合计：');
|
|
770
778
|
}
|
|
771
779
|
var subValue = '';
|
|
772
780
|
if (subTbl != null && subTbl.length > 0) {
|
|
@@ -791,16 +799,16 @@ var PageHome = function (_React$Component) {
|
|
|
791
799
|
subValue = '';
|
|
792
800
|
}
|
|
793
801
|
if (subValue !== '') {
|
|
794
|
-
if ($('.' + uniqueName).length > 0) {
|
|
795
|
-
$('.' + uniqueName).html(title + " " + subValue + "; ");
|
|
802
|
+
if ($('.' + t.replaceDollar(uniqueName)).length > 0) {
|
|
803
|
+
$('.' + t.replaceDollar(uniqueName)).html(title + " " + subValue + "; ");
|
|
796
804
|
} else {
|
|
797
|
-
$('.hejidiv-' + subTableName).append('<span class="' + uniqueName + '">' + title + " " + subValue + "; " + "</span>");
|
|
805
|
+
$('.hejidiv-' + t.replaceDollar(subTableName)).append('<span class="' + uniqueName + '">' + title + " " + subValue + "; " + "</span>");
|
|
798
806
|
}
|
|
799
807
|
}
|
|
800
|
-
var le = $('.hejidiv-' + subTableName).find('span').length;
|
|
808
|
+
var le = $('.hejidiv-' + t.replaceDollar(subTableName)).find('span').length;
|
|
801
809
|
if (le > 0) {
|
|
802
|
-
var tx = $('.hejidiv-' + subTableName).find('span')[le - 1].innerText;
|
|
803
|
-
$('.hejidiv-' + subTableName).find('span')[le - 1].innerText = tx.replace(';', '');
|
|
810
|
+
var tx = $('.hejidiv-' + t.replaceDollar(subTableName)).find('span')[le - 1].innerText;
|
|
811
|
+
$('.hejidiv-' + t.replaceDollar(subTableName)).find('span')[le - 1].innerText = tx.replace(';', '');
|
|
804
812
|
}
|
|
805
813
|
}
|
|
806
814
|
}
|