fmui-base 2.3.65 → 2.3.66
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/subForm.js +6 -6
- package/lib/form/table.js +13 -11
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/subForm.js
CHANGED
|
@@ -932,9 +932,9 @@ var PageHome = function (_React$Component) {
|
|
|
932
932
|
var title = itemPa.itemTitle;
|
|
933
933
|
var subTbl = itemParamList;
|
|
934
934
|
if ($('.' + t.replaceDollar(uniqueName)).length > 0) {
|
|
935
|
-
$('.' + t.
|
|
936
|
-
} else if ($('.hejidiv-' + t.
|
|
937
|
-
$('.hejidiv-' + t.
|
|
935
|
+
$('.' + t.replaceDollar(uniqueName)).html('');
|
|
936
|
+
} else if ($('.hejidiv-' + t.replaceDollar(subTableName)).html() == '') {
|
|
937
|
+
$('.hejidiv-' + t.replaceDollar(subTableName)).html('合计:');
|
|
938
938
|
}
|
|
939
939
|
var subValue = '';
|
|
940
940
|
if (subTbl != null && subTbl.length > 0) {
|
|
@@ -959,10 +959,10 @@ var PageHome = function (_React$Component) {
|
|
|
959
959
|
subValue = '';
|
|
960
960
|
}
|
|
961
961
|
if (subValue != '') {
|
|
962
|
-
if ($('.' + t.
|
|
963
|
-
$('.' + t.
|
|
962
|
+
if ($('.' + t.replaceDollar(uniqueName)).length > 0) {
|
|
963
|
+
$('.' + t.replaceDollar(uniqueName)).html(title + " " + subValue + "; ");
|
|
964
964
|
} else {
|
|
965
|
-
$('.hejidiv-' + t.
|
|
965
|
+
$('.hejidiv-' + t.replaceDollar(subTableName)).append('<span class="' + uniqueName + '">' + title + " " + subValue + "; " + "</span>");
|
|
966
966
|
}
|
|
967
967
|
}
|
|
968
968
|
}
|
package/lib/form/table.js
CHANGED
|
@@ -785,17 +785,19 @@ var PageHome = function (_React$Component) {
|
|
|
785
785
|
}
|
|
786
786
|
}
|
|
787
787
|
|
|
788
|
-
|
|
788
|
+
//子表合计(uniqueName/表名常含 $,jQuery 选择器需转义)
|
|
789
789
|
if (itemParam.itemType == 'text' && itemParam.dataAttr && itemParam.dataAttr.isSum == '1') {
|
|
790
790
|
var subTableName = itemParam.tableName;
|
|
791
791
|
var key = itemParam.key;
|
|
792
792
|
var title = itemParam.title;
|
|
793
793
|
var subTbl = data.subTbl;
|
|
794
794
|
var uniqueName = subTableName + "_" + key;
|
|
795
|
-
|
|
796
|
-
|
|
797
|
-
|
|
798
|
-
$('.
|
|
795
|
+
var uniqueNameSel = this.replaceDollar(uniqueName);
|
|
796
|
+
var subTableNameSel = this.replaceDollar(subTableName);
|
|
797
|
+
if ($('.' + uniqueNameSel).length > 0) {
|
|
798
|
+
$('.' + uniqueNameSel).html('');
|
|
799
|
+
} else if ($('.hejidiv-' + subTableNameSel).html() == '') {
|
|
800
|
+
$('.hejidiv-' + subTableNameSel).html('合计:');
|
|
799
801
|
}
|
|
800
802
|
var subValue = '';
|
|
801
803
|
if (subTbl != null && subTbl.length > 0) {
|
|
@@ -823,16 +825,16 @@ var PageHome = function (_React$Component) {
|
|
|
823
825
|
subValue = '';
|
|
824
826
|
}
|
|
825
827
|
if (subValue !== '') {
|
|
826
|
-
if ($('.' +
|
|
827
|
-
$('.' +
|
|
828
|
+
if ($('.' + uniqueNameSel).length > 0) {
|
|
829
|
+
$('.' + uniqueNameSel).html(title + " " + subValue + "; ");
|
|
828
830
|
} else {
|
|
829
|
-
$('.hejidiv-' +
|
|
831
|
+
$('.hejidiv-' + subTableNameSel).append('<span class="' + uniqueName + '">' + title + " " + subValue + "; " + "</span>");
|
|
830
832
|
}
|
|
831
833
|
}
|
|
832
|
-
var le = $('.hejidiv-' +
|
|
834
|
+
var le = $('.hejidiv-' + subTableNameSel).find('span').length;
|
|
833
835
|
if (le > 0) {
|
|
834
|
-
var tx = $('.hejidiv-' +
|
|
835
|
-
$('.hejidiv-' +
|
|
836
|
+
var tx = $('.hejidiv-' + subTableNameSel).find('span')[le - 1].innerText;
|
|
837
|
+
$('.hejidiv-' + subTableNameSel).find('span')[le - 1].innerText = tx.replace(';', '');
|
|
836
838
|
}
|
|
837
839
|
}
|
|
838
840
|
|