fmui-base 2.1.91 → 2.1.93

package/lib/msg_list/msgList.less

@@ -0,0 +1,9 @@
+.searchActive .t-search-bar-holder {
+    left: 0;
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+}
+
+.t-mask {
+    display: none !important;
+}

package/lib/process_info/processInfo.js

@@ -106,6 +106,8 @@ var _SelectField = require('saltui/lib/SelectField');
 
 var _SelectField2 = _interopRequireDefault(_SelectField);
 
+require('./processInfo.less');
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -7395,7 +7397,7 @@ var PageHome = function (_React$Component) {
             var bottomStyle = { paddingBottom: this.state.bottom + 'px' };
             return _react2.default.createElement(
                 'div',
-                { style: bottomStyle, className: 'approval-details' },
+                { className: 'approval-details' },
                 _react2.default.createElement(
                     'div',
                     { className: this.state.errorMsg == '任务不存在' ? "dd-state-page" : 't-DN' },

package/lib/process_info/processInfo.less

@@ -0,0 +1,4 @@
+.approval-details{
+     padding-bottom: calc(62px + constant(safe-area-inset-bottom)) !important; /* 兼容旧版 iOS */
+     padding-bottom: calc(62px + env(safe-area-inset-bottom)) !important; /* 兼容新版 iOS */
+}

package/lib/process_list/processList.js

@@ -189,9 +189,26 @@ var ListItem = function (_React$Component) {
     value: function render() {
       var data = this.props;
       var checkIsNotComplete = true;
+      var urgencyTag = false;
+      var tagClass = '';
       if (data.type == 0) {
         //待办
         checkIsNotComplete = true;
+        if (data.urgency == '90') {
+          urgencyTag = true;
+          tagClass = 'label label-danger';
+        } else if (data.urgency == '80') {
+          urgencyTag = true;
+          tagClass = 'label label-danger';
+        } else if (data.urgency == '70') {
+          urgencyTag = true;
+          tagClass = 'label label-warn';
+        } else if (data.urgency == '60') {
+          urgencyTag = true;
+          tagClass = 'label label-primary';
+        } else {
+          urgencyTag = false;
+        }
       } else if (data.type == 1) {
         //待阅
         if (data.status == 2) {
@@ -382,8 +399,8 @@ var ListItem = function (_React$Component) {
               { className: 'approveItem-title' },
               _react2.default.createElement(
                 Box,
-                { className: this.props.urgency == '1' && this.props.type == 0 ? 'label label-danger' : 't-DN' },
-                '\u52A0\u6025'
+                { className: urgencyTag ? tagClass : 't-DN' },
+                this.props.urgencyName
               ),
               _react2.default.createElement(
                 Box,
@@ -458,7 +475,8 @@ var PageHome = function (_React$Component2) {
     //获取内容显示区域高度
     var hasBottomTabHidden = document.getElementById("hasBottomTab") ? document.getElementById("hasBottomTab").value : "0";
     var hasBottomTab = props.hasBottomTab ? props.hasBottomTab : hasBottomTabHidden;
-    var winHeight = getScrollHigh(1, 1, hasBottomTab);
+    var winHeight = getScrollHigh(1, 1, hasBottomTab, 1); // 50为标题栏高度
+
 
     var constIndex = document.getElementById("activeTabIndex").value; //常量
     var activeIndex = props.activeIndex ? props.activeIndex : 0;

package/package.json

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