fmui-base 2.0.28 → 2.0.30

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.29：流程记录样式修改；日期期间选择
 - 2.0.28：选人组件暂无数据修改；表单样式修改
 - 2.0.27：日期计算
 - 2.0.26：表单初始化计算人民币大写

package/lib/form/form.js

@@ -61,6 +61,10 @@ var _FoldablePane = require('saltui/lib/FoldablePane');
 
 var _FoldablePane2 = _interopRequireDefault(_FoldablePane);
 
+var _CalendarField = require('saltui/lib/CalendarField');
+
+var _CalendarField2 = _interopRequireDefault(_CalendarField);
+
 var _AngleRight = require('salt-icon/lib/AngleRight');
 
 var _AngleRight2 = _interopRequireDefault(_AngleRight);
@@ -96,13 +100,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-_Field2.default;
 // import Slot from 'saltui/lib/Slot';
 
 // import SelectFileNo from '../select-fileno/pageHome';
 // import SelectSerialNumber from '../select-serialnumber/pageHome';
 //import 'babel-polyfill';
+
+
 var HBox = _Boxs2.default.HBox,
     VBox = _Boxs2.default.VBox,
     Box = _Boxs2.default.Box;
@@ -867,6 +871,12 @@ var PageHome = function (_React$Component) {
           } else if (dateDisplayFormat == "AmPmDate") {
             dateFormat = "YMDT";
             dateFormatShow = "AmPmDate";
+          } else if (dateDisplayFormat == "DateInterval") {
+            dateFormat = "DateInterval";
+            dateFormatShow = "dayWithSlot";
+          } else if (dateDisplayFormat == "DateTimeInterval") {
+            dateFormat = "DateInterval";
+            dateFormatShow = "dayWithTime";
           } else {
             dateFormat = "YMDHM";
           }
@@ -882,44 +892,57 @@ var PageHome = function (_React$Component) {
           dateFormat = "YMDHM";
         }
         itemParam.dateFormat = dateFormat;
-        if (value && Array.isArray(value)) {
-          if (value.length == 5) {
-            var month = value[1] < 10 ? '0' + value[1] : value[1];
-            var day = value[2] < 10 ? '0' + value[2] : value[2];
-            var min = value[3] < 10 ? '0' + value[3] : value[3];
-            var second = value[4] < 10 ? '0' + value[4] : value[4];
-            value = value[0] + "/" + month + "/" + day + " " + min + ":" + second;
+        itemParam.dateFormatShow = dateFormatShow;
+        if (dateFormat == "DateInterval") {
+          if (value) {
+            var valueArray = value.split(" - ");
+            if (valueArray.length == 2) {
+              var newDate = {};
+              newDate.startDate = new Date(valueArray[0].replace(/-/g, "/")).getTime();
+              newDate.endDate = new Date(valueArray[1].replace(/-/g, "/")).getTime();
+              value = newDate;
+            }
+          }
+        } else {
+          if (value && Array.isArray(value)) {
+            if (value.length == 5) {
+              var month = value[1] < 10 ? '0' + value[1] : value[1];
+              var day = value[2] < 10 ? '0' + value[2] : value[2];
+              var min = value[3] < 10 ? '0' + value[3] : value[3];
+              var second = value[4] < 10 ? '0' + value[4] : value[4];
+              value = value[0] + "/" + month + "/" + day + " " + min + ":" + second;
+              value = new Date(value).getTime();
+            } else if (value.length == 3) {
+              var month = value[1] < 10 ? '0' + value[1] : value[1];
+              var day = value[2] < 10 ? '0' + value[2] : value[2];
+              value = value[0] + "/" + month + "/" + day;
+              value = new Date(value).getTime();
+            } else {
+              value = null;
+            }
+
+            var dateStr = this.dateFormat(value, dateFormat);
+            var mainTblData = data.mainTblData;
+            mainTblData.map(function (item, index) {
+              if (item.key == key) {
+                item.value = dateStr;
+              }
+            });
+          } else if (value && value.length >= 10) {
+            value = value.substring(0, 19);
+            value = new Date(value.replace(/-/g, "/")).getTime();
+          } else if (value && value.length == 4 && dateFormat == "Y") {
             value = new Date(value).getTime();
-          } else if (value.length == 3) {
-            var month = value[1] < 10 ? '0' + value[1] : value[1];
-            var day = value[2] < 10 ? '0' + value[2] : value[2];
-            value = value[0] + "/" + month + "/" + day;
+          } else if (value && value.length == 7 && dateFormat == "YM") {
             value = new Date(value).getTime();
           } else {
-            value = null;
-          }
-
-          var dateStr = this.dateFormat(value, dateFormat);
-          var mainTblData = data.mainTblData;
-          mainTblData.map(function (item, index) {
-            if (item.key == key) {
-              item.value = dateStr;
-            }
-          });
-        } else if (value && value.length >= 10) {
-          value = value.substring(0, 19);
-          value = new Date(value.replace(/-/g, "/")).getTime();
-        } else if (value && value.length == 4 && dateFormat == "Y") {
-          value = new Date(value).getTime();
-        } else if (value && value.length == 7 && dateFormat == "YM") {
-          value = new Date(value).getTime();
-        } else {
-          for (var i = 0; i < mainTblData.length; i++) {
-            if (itemParam.key == mainTblData[i].key) {
-              mainTblData[i].value = "";
+            for (var i = 0; i < mainTblData.length; i++) {
+              if (itemParam.key == mainTblData[i].key) {
+                mainTblData[i].value = "";
+              }
             }
+            value = null;
           }
-          value = null;
         }
 
         if (readOnly == true) {
@@ -2134,12 +2157,20 @@ var PageHome = function (_React$Component) {
       var data = this.props.data;
       var itemParam = this.state.itemParam;
       var dateFormat = itemParam.dateFormat;
-      var dateStr = this.dateFormat(value.value, dateFormat);
-      if (dateFormat == "YMDT") {
-        //年月日，上下午修改数据
-        value.value = new Date(dateStr.replace(/-/g, "/")).getTime();
+      var dateFormatShow = itemParam.dateFormatShow;
+      if (dateFormat == "DateInterval") {
+        if (value.startDate && value.endDate) {
+          var dateStr = this.dateFormat(value, dateFormat, dateFormatShow);
+          data = this.editData(code, dateStr, data);
+        }
+      } else {
+        var dateStr = this.dateFormat(value.value, dateFormat);
+        if (dateFormat == "YMDT") {
+          //年月日，上下午修改数据
+          value.value = new Date(dateStr.replace(/-/g, "/")).getTime();
+        }
+        data = this.editData(code, dateStr, data);
       }
-      data = this.editData(code, dateStr, data);
 
       itemParam.value = value;
       this.setState({
@@ -2147,6 +2178,11 @@ var PageHome = function (_React$Component) {
       });
       this.props.onChange(data, this.state.itemParam);
     }
+  }, {
+    key: 'handleCalendarFieldFill',
+    value: function handleCalendarFieldFill(key) {
+      $("#" + key).find(".t-calendar-field-value:eq(0)").click();
+    }
 
     //时间步进
 
@@ -2178,49 +2214,76 @@ var PageHome = function (_React$Component) {
     key: 'dateFormat',
     value: function dateFormat(date, formatStr, dateFormatShow) {
       if (date) {
-        date = new Date(date);
-        var year = date.getFullYear();
-        var month = this.dealwithDate(date.getMonth() + 1);
-        var dates = this.dealwithDate(date.getDate());
-        if (dateFormatShow) {
-          if (dateFormatShow == "zhDate") {
-            return year + '年' + month + '月' + dates + '日';
-          } else if (dateFormatShow == "AmPmDate") {
+        if (formatStr == "DateInterval") {
+          var startDate = new Date(date.startDate);
+          var endDate = new Date(date.endDate);
+
+          var startYear = startDate.getFullYear();
+          var startMonth = this.dealwithDate(startDate.getMonth() + 1);
+          var startDates = this.dealwithDate(startDate.getDate());
+
+          var endYear = endDate.getFullYear();
+          var endMonth = this.dealwithDate(endDate.getMonth() + 1);
+          var endDates = this.dealwithDate(endDate.getDate());
+
+          if (dateFormatShow == "dayWithSlot") {
+            return startYear + '-' + startMonth + '-' + startDates + ' - ' + endYear + '-' + endMonth + '-' + endDates;
+          } else {
+            var startHour = this.dealwithDate(startDate.getHours());
+            var startMin = this.dealwithDate(startDate.getMinutes());
+            var startSecond = this.dealwithDate(startDate.getSeconds());
+
+            var endHour = this.dealwithDate(endDate.getHours());
+            var endMin = this.dealwithDate(endDate.getMinutes());
+            var endSecond = this.dealwithDate(endDate.getSeconds());
+
+            return startYear + '-' + startMonth + '-' + startDates + " " + startHour + ":" + startMin + ":" + startSecond + ' - ' + endYear + '-' + endMonth + '-' + endDates + " " + endHour + ":" + endMin + ":" + endSecond;
+          }
+        } else {
+          date = new Date(date);
+          var year = date.getFullYear();
+          var month = this.dealwithDate(date.getMonth() + 1);
+          var dates = this.dealwithDate(date.getDate());
+          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') {
+            //年月日
+            return year + '-' + month + '-' + dates;
+          } else if (formatStr == 'YMDHM') {
+            //年月日时分
+            var hour = this.dealwithDate(date.getHours());
+            var min = this.dealwithDate(date.getMinutes());
+            return year + '-' + month + '-' + dates + ' ' + hour + ':' + min;
+          } else if (formatStr == 'Y') {
+            //年
+            return year;
+          } else if (formatStr == 'YM') {
+            //年月
+            return year + '-' + month;
+          } else if (formatStr == 'YMDT') {
+            //年月日，上下午
             var hour = this.dealwithDate(date.getHours());
-            if (hour == "11") {
-              return year + '年' + month + '月' + dates + '日 上午';
+            var min = this.dealwithDate(date.getMinutes());
+            if (hour == "09") {
+              return year + '-' + month + '-' + dates + ' 11:59:59';
+            } else if (hour == "18") {
+              return year + '-' + month + '-' + dates + ' 23:59:59';
             } else {
-              return year + '年' + month + '月' + dates + '日 下午';
+              return year + '-' + month + '-' + dates + ' ' + hour + ':' + min;
             }
-          }
-        }
-        if (formatStr == 'YMD') {
-          //年月日
-          return year + '-' + month + '-' + dates;
-        } else if (formatStr == 'YMDHM') {
-          //年月日时分
-          var hour = this.dealwithDate(date.getHours());
-          var min = this.dealwithDate(date.getMinutes());
-          return year + '-' + month + '-' + dates + ' ' + hour + ':' + min;
-        } else if (formatStr == 'Y') {
-          //年
-          return year;
-        } else if (formatStr == 'YM') {
-          //年月
-          return year + '-' + month;
-        } else if (formatStr == 'YMDT') {
-          //年月日，上下午
-          var hour = this.dealwithDate(date.getHours());
-          var min = this.dealwithDate(date.getMinutes());
-          if (hour == "09") {
-            return year + '-' + month + '-' + dates + ' 11:59:59';
-          } else if (hour == "18") {
-            return year + '-' + month + '-' + dates + ' 23:59:59';
           } else {
-            return year + '-' + month + '-' + dates + ' ' + hour + ':' + min;
+            return '';
           }
-        } else {
-          return '';
         }
       } else {
         return null;
@@ -2659,7 +2722,6 @@ var PageHome = function (_React$Component) {
         className: "dd-ques-title",
         iconPosition: 'left'
       };
-
       var CheckboxFieldProps = {
         // onChange(value) {
         //   var keyNo = t.props.keyNo;
@@ -2897,7 +2959,7 @@ var PageHome = function (_React$Component) {
             { borderTopNone: true },
             _react2.default.createElement(
               'div',
-              { id: t.state.prefixName + "_" + t.state.itemParam.key, className: 't-FBH' },
+              { id: t.state.prefixName + "_" + t.state.itemParam.key, className: t.state.itemParam.dateFormat == "DateInterval" ? "" : "t-FBH" },
               t.state.itemParam.readOnly ? _react2.default.createElement(_TextareaField2.default, {
                 className: 't-W100',
                 required: t.state.itemParam.required,
@@ -2906,6 +2968,25 @@ var PageHome = function (_React$Component) {
                 minRows: 1,
                 placeholder: t.state.itemParam.readOnly ? '' : t.state.itemParam.placeholder,
                 value: t.state.itemParam.value
+              }) : t.state.itemParam.dateFormat == "DateInterval" ? _react2.default.createElement(_CalendarField2.default, {
+                className: 't-W100',
+                label: t.state.itemParam.title,
+                placeholder: '\u8BF7\u9009\u62E9\u65E5\u671F',
+                required: t.state.itemParam.required,
+                multiLine: true,
+                layout: 'h',
+                type: t.state.itemParam.dateFormatShow,
+                singleMode: false,
+                showHalfDay: false,
+                showTopPanel: true,
+                topPanelTitle: 'title',
+                showWeek: false,
+                showDateType: false,
+                value: t.state.itemParam.value,
+                readOnly: t.state.itemParam.readOnly,
+                icon: _react2.default.createElement(_AngleRight2.default, { width: 26, fill: '#BCBCBC', onClick: t.handleCalendarFieldFill.bind(t, t.state.itemParam.key) })
+                // formatter: 'yyyy.MM.dd',
+                , onOk: t.handleChangeDate.bind(t, t.state.itemParam.key)
               }) : _react2.default.createElement(_DatetimeField2.default, {
                 className: 't-W100',
                 label: t.state.itemParam.title,
@@ -2954,7 +3035,7 @@ var PageHome = function (_React$Component) {
                   t.state.itemParam.readOnly ? "" : _react2.default.createElement(
                     Box,
                     { className: 't-FBAC t-field-icon' },
-                    _react2.default.createElement(_AngleRight2.default, { width: 20, fill: '#ccc' }),
+                    _react2.default.createElement(_AngleRight2.default, { width: 26, fill: '#BCBCBC' }),
                     _react2.default.createElement(_Datetime2.default, {
                       locale: 'zh-cn',
                       minuteStep: 15,

package/lib/process_info/FlowChart.js

@@ -111,30 +111,35 @@ var Page = function (_React$Component) {
           this.state.processLogList.map(function (item, i) {
             var nameHtml = "";
             if (item.dealusername != null && item.dealusername != '') {
-              var dealusername = item.dealusername.split('|');
-              var delContent = '（该用户账号已被删除，请联系管理员修改流程）';
-              var delContent1 = '（该用户账号已被删除）';
-              nameHtml = dealusername.map(function (item, index) {
-                var names = item.replace(delContent, '');
-                if (item.indexOf(delContent1) > -1) {
-                  names = "";
-                }
-                return _react2.default.createElement(
+              var dealusername = item.dealusername;
+              var dealuserorg = item.dealuserorg;
+              if (dealuserorg.indexOf("/") >= 0) {
+                dealuserorg = dealuserorg.substring(dealuserorg.lastIndexOf("/") + 1);
+              }
+              // var dealusername=item.dealusername.split('|');
+              //    var delContent='（该用户账号已被删除，请联系管理员修改流程）';
+              //    var delContent1='（该用户账号已被删除）';
+              nameHtml =
+              // dealusername.map((item, index) => {
+              //  var names=item.replace(delContent,'');
+              //  if(item.indexOf(delContent1)>-1){
+              //    names="";
+              //  }
+              _react2.default.createElement(
+                'div',
+                null,
+                _react2.default.createElement(
                   'span',
                   null,
-                  index == 0 ? names : "|" + names,
-                  _react2.default.createElement(
-                    'i',
-                    { className: item.indexOf(delContent) > -1 ? "t-FCred" : 't-DN' },
-                    delContent
-                  ),
-                  _react2.default.createElement(
-                    'i',
-                    { className: item.indexOf(delContent1) > -1 ? "t-FCred" : 't-DN' },
-                    delContent1
-                  )
-                );
-              });
+                  dealusername
+                ),
+                _react2.default.createElement(
+                  'span',
+                  { className: 'recording-org theme-color theme-bgLight10 theme-border' },
+                  dealuserorg
+                )
+              );
+              // }); 
             }
 
             return _react2.default.createElement(
@@ -143,7 +148,7 @@ var Page = function (_React$Component) {
               _react2.default.createElement(
                 Box,
                 { className: 'dd-border-width' },
-                _react2.default.createElement('div', { className: i == this.state.processLogList.length - 1 ? "dd-border-o theme-border" : "dd-border-o" })
+                _react2.default.createElement('div', { className: i == this.state.processLogList.length - 1 ? "dd-border-o theme-border" : "dd-border-o theme-border-disabled" })
               ),
               _react2.default.createElement(
                 'div',
@@ -153,7 +158,7 @@ var Page = function (_React$Component) {
                   { className: 'recording-message theme-color' },
                   _react2.default.createElement(
                     'div',
-                    { className: 't-omit' },
+                    { className: 't-omit', style: { color: '#999999' } },
                     item.createdDate
                   ),
                   _react2.default.createElement(
@@ -166,11 +171,6 @@ var Page = function (_React$Component) {
                         'div',
                         { className: 'recording-name' },
                         nameHtml
-                      ),
-                      _react2.default.createElement(
-                        'div',
-                        { className: 'recording-result' },
-                        dealactionname(item)
                       )
                     ),
                     _react2.default.createElement(
@@ -178,6 +178,16 @@ var Page = function (_React$Component) {
                       { className: 'recording-author' },
                       item.curactivityname
                     )
+                  ),
+                  _react2.default.createElement(
+                    'div',
+                    { className: 'recording-result theme-color' },
+                    dealactionname(item)
+                  ),
+                  _react2.default.createElement(
+                    'div',
+                    { className: 'recording-nextname' },
+                    item.receivenames
                   )
                 )
               )

package/lib/process_info/processInfo.js

@@ -423,7 +423,8 @@ var PageHome = function (_React$Component) {
             formRelaField: "", //流程关联字段
             commentBackAlert: [], //退回批示意见弹出
             showCommentBackAlert: true, //显示退回批示意见弹出
-            endSelect: false
+            endSelect: false,
+            mobileFlowChar: '0' //是否开启流程图  1开启 0禁用
         };
         FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
@@ -746,6 +747,8 @@ var PageHome = function (_React$Component) {
                     var formKey = form.formcode;
                     var formStyleObj = form.formStyle;
 
+                    var mobileFlowChar = content.mobileFlowChar;
+
                     //项目开发模块统一扩展
                     var mobileModuleExt;
                     try {
@@ -1295,7 +1298,8 @@ var PageHome = function (_React$Component) {
                         caIsPrd: caIsPrd,
                         preCaFields: preCaFields,
                         formRelaField: formRelaField,
-                        dealReminderContent: dealReminderContent
+                        dealReminderContent: dealReminderContent,
+                        mobileFlowChar: mobileFlowChar
                     });
                     t.dealWithButtons(content, formKey);
                 }, function (error) {
@@ -6588,7 +6592,7 @@ var PageHome = function (_React$Component) {
                                     )
                                 )
                             ),
-                            _react2.default.createElement(
+                            this.state.mobileFlowChar == '1' ? _react2.default.createElement(
                                 _Tab2.default.Item,
                                 { key: '1', title: '\u6D41\u7A0B\u56FE' },
                                 _react2.default.createElement(
@@ -6626,7 +6630,7 @@ var PageHome = function (_React$Component) {
                                         )
                                     )
                                 )
-                            ),
+                            ) : '',
                             _react2.default.createElement(
                                 _Tab2.default.Item,
                                 { key: '2', title: '\u6D41\u7A0B\u8BB0\u5F55' },

package/package.json

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