fmui-base 2.0.29 → 2.0.31

package/README.md

@@ -3,6 +3,9 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.31：日期区间选择问题修改
+- 2.0.30：【流程中心】支持移动端隐藏流程图;流程记录样式修改
+- 2.0.29：流程记录样式修改；日期期间选择
 - 2.0.28：选人组件暂无数据修改；表单样式修改
 - 2.0.27：日期计算
 - 2.0.26：表单初始化计算人民币大写

package/lib/form/form.js

@@ -2180,8 +2180,12 @@ var PageHome = function (_React$Component) {
     }
   }, {
     key: 'handleCalendarFieldFill',
-    value: function handleCalendarFieldFill(key) {
-      $("#" + key).find(".t-calendar-field-value:eq(0)").click();
+    value: function handleCalendarFieldFill(key, value) {
+      if (value && value.startDate) {
+        $("#" + key).find(".t-calendar-field-value:eq(0)").click();
+      } else {
+        $("#" + key).find(".t-calendar-field-placeholder:eq(0)").click();
+      }
     }
 
     //时间步进
@@ -2971,7 +2975,7 @@ var PageHome = function (_React$Component) {
               }) : t.state.itemParam.dateFormat == "DateInterval" ? _react2.default.createElement(_CalendarField2.default, {
                 className: 't-W100',
                 label: t.state.itemParam.title,
-                placeholder: '\u8BF7\u9009\u62E9\u65E5\u671F',
+                placeholder: t.state.itemParam.dateFormatShow == "dayWithSlot" ? ['开始日期', '结束日期'] : ['开始时间', '结束时间'],
                 required: t.state.itemParam.required,
                 multiLine: true,
                 layout: 'h',
@@ -2984,7 +2988,7 @@ var PageHome = function (_React$Component) {
                 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) })
+                icon: _react2.default.createElement(_AngleRight2.default, { width: 26, fill: '#BCBCBC', onClick: t.handleCalendarFieldFill.bind(t, t.state.prefixName + "_" + t.state.itemParam.key, t.state.itemParam.value) })
                 // formatter: 'yyyy.MM.dd',
                 , onOk: t.handleChangeDate.bind(t, t.state.itemParam.key)
               }) : _react2.default.createElement(_DatetimeField2.default, {

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(

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.29",
+  "version": "2.0.31",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",