fmui-base 2.1.35 → 2.1.37

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志  
+- 2.1.37：子表合计字段表字段带$异常处理
+- 2.1.36：签名图片使用原图去掉宽度高度
 - 2.1.35：统一待办科研跳转特殊处理
 - 2.1.34：表单组件子表字段只读时不做必填校验
 - 2.1.33：表单组件html编辑器移动端图片路径替换成viewImage形式

package/lib/comment_list/List.js

@@ -272,7 +272,7 @@ var PageHome = function (_React$Component) {
           { className: 't-PR5' },
           item.orgShowName
         );
-        var signPicHtml = item.signPic ? _react2.default.createElement('img', { className: 't-H64 t-W64 t-PR5', src: t.state.loadImg + item.signPic }) : "";
+        var signPicHtml = item.signPic ? _react2.default.createElement('img', { className: '  t-PR5', src: t.state.loadImg + item.signPic }) : "";
         var taskNameHtml = _react2.default.createElement(
           'span',
           { className: 't-PR5' },

package/lib/form/subForm.js

@@ -741,6 +741,14 @@ var PageHome = function (_React$Component) {
         );
       });
     }
+  }, {
+    key: 'replaceDollar',
+    value: function replaceDollar(str) {
+      if (str && str.indexOf('$') != -1) {
+        return str.replace(/\$/g, '\\$');
+      }
+      return str;
+    }
   }, {
     key: 'getSubTotal',
     value: function getSubTotal() {
@@ -763,10 +771,10 @@ var PageHome = function (_React$Component) {
               var key = itemPa.itemCode;
               var title = itemPa.itemTitle;
               var subTbl = itemParamList;
-              if ($('.' + uniqueName).length > 0) {
-                $('.' + uniqueName).html('');
-              } else if ($('.hejidiv-' + subTableName).html() == '') {
-                $('.hejidiv-' + subTableName).html('合计：');
+              if ($('.' + t.replaceDollar(uniqueName)).length > 0) {
+                $('.' + t.replaceDollar(uniqueName)).html('');
+              } else if ($('.hejidiv-' + t.replaceDollar(subTableName)).html() == '') {
+                $('.hejidiv-' + t.replaceDollar(subTableName)).html('合计：');
               }
               var subValue = '';
               if (subTbl != null && subTbl.length > 0) {
@@ -791,16 +799,16 @@ var PageHome = function (_React$Component) {
                 subValue = '';
               }
               if (subValue !== '') {
-                if ($('.' + uniqueName).length > 0) {
-                  $('.' + uniqueName).html(title + " " + subValue + ";  ");
+                if ($('.' + t.replaceDollar(uniqueName)).length > 0) {
+                  $('.' + t.replaceDollar(uniqueName)).html(title + " " + subValue + ";  ");
                 } else {
-                  $('.hejidiv-' + subTableName).append('<span class="' + uniqueName + '">' + title + " " + subValue + ";  " + "</span>");
+                  $('.hejidiv-' + t.replaceDollar(subTableName)).append('<span class="' + uniqueName + '">' + title + " " + subValue + ";  " + "</span>");
                 }
               }
-              var le = $('.hejidiv-' + subTableName).find('span').length;
+              var le = $('.hejidiv-' + t.replaceDollar(subTableName)).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-' + t.replaceDollar(subTableName)).find('span')[le - 1].innerText;
+                $('.hejidiv-' + t.replaceDollar(subTableName)).find('span')[le - 1].innerText = tx.replace(';', '');
               }
             }
           }

package/lib/process_list/processList.js

@@ -71,6 +71,13 @@ var HBox = _Boxs2.default.HBox,
     Box = _Boxs2.default.Box;
 
 var searchVal = '';
+var isPageHide = false;
+window.addEventListener('pageshow', function () {
+  console.log("isPageHide===" + isPageHide);
+  if (isPageHide) {
+    window.location.reload();
+  }
+});
 
 var ListItem = function (_React$Component) {
   _inherits(ListItem, _React$Component);
@@ -131,6 +138,7 @@ var ListItem = function (_React$Component) {
             decodeURI(url);
             location.hash = url;
           } else {
+            isPageHide = true;
             var fullUrl = window.location.href;
             fullUrl = fullUrl.replace(/clientType/g, "");
             fullUrl = fullUrl.replace(/thirdMenuType/g, "");

package/package.json

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