fmui-base 2.3.64 → 2.3.66

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.66：字段名带$报错转义
+- 2.3.65：发起按钮选择了邮件转发，则我的流程点开后显示邮件转发按钮
 - 2.3.64：关联值增加用户出生日期
 - 2.3.63：单选多选可输入选项支持设置提示文字,文字过长时换行显示
 - 2.3.62：单选多选可输入选项支持设置提示文字

package/lib/form/subForm.js

@@ -932,9 +932,9 @@ var PageHome = function (_React$Component) {
             var title = itemPa.itemTitle;
             var subTbl = itemParamList;
             if ($('.' + t.replaceDollar(uniqueName)).length > 0) {
-              $('.' + t.replaceDolla(uniqueName)).html('');
-            } else if ($('.hejidiv-' + t.replaceDolla(subTableName)).html() == '') {
-              $('.hejidiv-' + t.replaceDolla(subTableName)).html('合计：');
+              $('.' + t.replaceDollar(uniqueName)).html('');
+            } else if ($('.hejidiv-' + t.replaceDollar(subTableName)).html() == '') {
+              $('.hejidiv-' + t.replaceDollar(subTableName)).html('合计：');
             }
             var subValue = '';
             if (subTbl != null && subTbl.length > 0) {
@@ -959,10 +959,10 @@ var PageHome = function (_React$Component) {
               subValue = '';
             }
             if (subValue != '') {
-              if ($('.' + t.replaceDolla(uniqueName)).length > 0) {
-                $('.' + t.replaceDolla(uniqueName)).html(title + " " + subValue + ";  ");
+              if ($('.' + t.replaceDollar(uniqueName)).length > 0) {
+                $('.' + t.replaceDollar(uniqueName)).html(title + " " + subValue + ";  ");
               } else {
-                $('.hejidiv-' + t.replaceDolla(subTableName)).append('<span class="' + uniqueName + '">' + title + " " + subValue + ";  " + "</span>");
+                $('.hejidiv-' + t.replaceDollar(subTableName)).append('<span class="' + uniqueName + '">' + title + " " + subValue + ";  " + "</span>");
               }
             }
           }

package/lib/form/table.js

@@ -785,17 +785,19 @@ var PageHome = function (_React$Component) {
 					}
 				}
 
-				//子表合计
+				//子表合计（uniqueName/表名常含 $，jQuery 选择器需转义）
 				if (itemParam.itemType == 'text' && itemParam.dataAttr && itemParam.dataAttr.isSum == '1') {
 					var subTableName = itemParam.tableName;
 					var key = itemParam.key;
 					var title = itemParam.title;
 					var subTbl = data.subTbl;
 					var uniqueName = subTableName + "_" + key;
-					if ($('.' + uniqueName).length > 0) {
-						$('.' + uniqueName).html('');
-					} else if ($('.hejidiv-' + subTableName).html() == '') {
-						$('.hejidiv-' + subTableName).html('合计：');
+					var uniqueNameSel = this.replaceDollar(uniqueName);
+					var subTableNameSel = this.replaceDollar(subTableName);
+					if ($('.' + uniqueNameSel).length > 0) {
+						$('.' + uniqueNameSel).html('');
+					} else if ($('.hejidiv-' + subTableNameSel).html() == '') {
+						$('.hejidiv-' + subTableNameSel).html('合计：');
 					}
 					var subValue = '';
 					if (subTbl != null && subTbl.length > 0) {
@@ -823,16 +825,16 @@ var PageHome = function (_React$Component) {
 						subValue = '';
 					}
 					if (subValue !== '') {
-						if ($('.' + uniqueName).length > 0) {
-							$('.' + uniqueName).html(title + " " + subValue + ";  ");
+						if ($('.' + uniqueNameSel).length > 0) {
+							$('.' + uniqueNameSel).html(title + " " + subValue + ";  ");
 						} else {
-							$('.hejidiv-' + subTableName).append('<span class="' + uniqueName + '">' + title + " " + subValue + ";  " + "</span>");
+							$('.hejidiv-' + subTableNameSel).append('<span class="' + uniqueName + '">' + title + " " + subValue + ";  " + "</span>");
 						}
 					}
-					var le = $('.hejidiv-' + subTableName).find('span').length;
+					var le = $('.hejidiv-' + subTableNameSel).find('span').length;
 					if (le > 0) {
-						var tx = $('.hejidiv-' + subTableName).find('span')[le - 1].innerText;
-						$('.hejidiv-' + subTableName).find('span')[le - 1].innerText = tx.replace(';', '');
+						var tx = $('.hejidiv-' + subTableNameSel).find('span')[le - 1].innerText;
+						$('.hejidiv-' + subTableNameSel).find('span')[le - 1].innerText = tx.replace(';', '');
 					}
 				}
 

package/lib/process_info/processInfo.js

@@ -1993,6 +1993,10 @@ var PageHome = function (_React$Component) {
                         //传阅
                         buttonList.push({ name: t.state.finalButtons.get("HELP_CIRCULATE"), type: 'secondary', display: 'inline', no: 4 });
                     }
+                    // 与 PC 一致：发起人节点配置了 MAILSEND 时显示邮件转发
+                    if (startButtons.indexOf('MAILSEND') >= 0) {
+                        buttonList.push({ name: t.state.finalButtons.get("MAILSEND") || '邮件转发', type: 'secondary', display: 'inline', no: 18 });
+                    }
                 }
                 for (var d = 0; d < extensionButtonList.length; d++) {
                     buttonList.push(extensionButtonList[d]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.3.64",
+  "version": "2.3.66",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",