fmui-base 2.0.21 → 2.0.22

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.22: 移动端组件公共样式；流程详情修改；半天日期ios问题修改
 - 2.0.21: 移动端组件公共样式
 - 2.0.20: 移动端组件公共样式
 - 2.0.19: 移动端组件公共样式

package/lib/form/form.js

@@ -863,6 +863,7 @@ var PageHome = function (_React$Component) {
             dateFormatShow = "zhDate";
           } else if (dateDisplayFormat == "AmPmDate") {
             dateFormat = "YMDT";
+            dateFormatShow = "AmPmDate";
           } else {
             dateFormat = "YMDHM";
           }
@@ -2108,7 +2109,7 @@ var PageHome = function (_React$Component) {
       var dateStr = this.dateFormat(value.value, dateFormat);
       if (dateFormat == "YMDT") {
         //年月日，上下午修改数据
-        value.value = new Date(dateStr).getTime();
+        value.value = new Date(dateStr.replace(/-/g, "/")).getTime();
       }
       data = this.editData(code, dateStr, data);
 
@@ -2156,6 +2157,13 @@ var PageHome = function (_React$Component) {
         if (dateFormatShow) {
           if (dateFormatShow == "zhDate") {
             return year + '年' + month + '月' + dates + '日';
+          } else if (dateFormatShow == "AmPmDate") {
+            var hour = this.dealwithDate(date.getHours());
+            if (hour == "11") {
+              return year + '年' + month + '月' + dates + '日 上午';
+            } else {
+              return year + '年' + month + '月' + dates + '日 下午';
+            }
           }
         }
         if (formatStr == 'YMD') {

package/lib/process_info/FlowChart.js

@@ -110,11 +110,11 @@ var Page = function (_React$Component) {
           _react2.default.createElement('div', { className: 'dd-process-dec' }),
           this.state.processLogList.map(function (item, i) {
             var nameHtml = "";
-            if (item.receivenames != null && item.receivenames != '') {
-              var receivenames = item.receivenames.split('|');
+            if (item.dealusername != null && item.dealusername != '') {
+              var dealusername = item.dealusername.split('|');
               var delContent = '（该用户账号已被删除，请联系管理员修改流程）';
               var delContent1 = '（该用户账号已被删除）';
-              nameHtml = receivenames.map(function (item, index) {
+              nameHtml = dealusername.map(function (item, index) {
                 var names = item.replace(delContent, '');
                 if (item.indexOf(delContent1) > -1) {
                   names = "";

package/lib/process_info/processInfo.js

@@ -1477,26 +1477,28 @@ var PageHome = function (_React$Component) {
                     buttonList.push(extensionButtonList[d]);
                 }
             } else if (listType == "5") {
-                for (var d = 0; d < extensionButtonList.length; d++) {
-                    buttonArray.push(extensionButtonList[d].name);
-                }
-                for (var b = 0; b < buttonArray.length; b++) {
-                    var buttonCode = buttonArray[b];
-                    if (dataId == '' || isStart == true || isDraft == '1') {
-                        if (buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT') {
-                            buttonArrayNew.push(buttonCode);
-                        }
-                    }
-                }
+                //  for(var d=0; d<extensionButtonList.length;d++){
+                //      buttonArray.push(extensionButtonList[d].name);
+                //  }
+                //  for(var b=0;b<buttonArray.length;b++){
+                //      var buttonCode = buttonArray[b];
+                //      if(dataId == '' || isStart== true || isDraft == '1'){
+                //         if(buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT'){
+                //             buttonArrayNew.push(buttonCode);
+                //         }
+                //     }
+                //  }
 
-                for (var c = 0; c < buttonArrayNew.length; c++) {
-                    var buttonCode = buttonArrayNew[c];
-                    if (buttonCode == 'BASE_SUMBIT') {
-                        buttonList.push({ name: t.state.finalButtons.get("BASE_SUMBIT"), type: 'primary', display: 'inline', no: 1 });
-                    } else if (buttonCode == 'PAGE_SAVE') {
-                        buttonList.push({ name: t.state.finalButtons.get("PAGE_SAVE"), type: 'secondary', display: 'inline', no: 13 });
-                    }
-                }
+                //        for(var c=0; c<buttonArrayNew.length; c++){
+                //            var buttonCode = buttonArrayNew[c];
+                //            if(buttonCode=='BASE_SUMBIT'){
+                //                buttonList.push({name:t.state.finalButtons.get("BASE_SUMBIT"),type:'primary',display:'inline',no:1});
+                //            }else if(buttonCode=='PAGE_SAVE'){
+                //                buttonList.push({name:t.state.finalButtons.get("PAGE_SAVE"),type:'secondary',display:'inline',no:13});
+                //            }
+                //        }
+                buttonList.push({ name: t.state.finalButtons.get("PAGE_SAVE"), type: 'secondary', display: 'inline', no: 13 });
+                buttonList.push({ name: t.state.finalButtons.get("BASE_SUMBIT"), type: 'primary', display: 'inline', no: 1 });
             }
             // buttonList.push({name:"邮件转发",type:'secondary',display:'banner',no:18});
             if (listType != '0') {

package/package.json

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