fmui-base 2.1.0-beta.7 → 2.1.0-beta.8

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish --tag beta
 
 ## 更新日志
+- 2.1.0-beta.8：周补丁功能合并
 - 2.1.0-beta.7：移动端关联表功能
 - 2.1.0-beta.6：按钮修改和选人组件兼职组织修复
 - 2.1.0-beta.5：选人组件修改

package/lib/form/form.js

@@ -57,6 +57,10 @@ var _Field = require('saltui/lib/Field');
 
 var _Field2 = _interopRequireDefault(_Field);
 
+var _FoldablePane = require('saltui/lib/FoldablePane');
+
+var _FoldablePane2 = _interopRequireDefault(_FoldablePane);
+
 var _AngleRight = require('salt-icon/lib/AngleRight');
 
 var _AngleRight2 = _interopRequireDefault(_AngleRight);
@@ -94,7 +98,6 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 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 FoldablePane from 'saltui/lib/FoldablePane';
 // import Slot from 'saltui/lib/Slot';
 
 // import SelectFileNo from '../select-fileno/pageHome';
@@ -847,6 +850,10 @@ var PageHome = function (_React$Component) {
           var dateDisplayFormat = form.dataAttr.dateDisplayFormat;
           if (dateDisplayFormat == "STime" || dateFormat == "YMDHM") {
             dateFormat = "YMDHM";
+          } else if (dateDisplayFormat == "YearMon") {
+            dateFormat = "YM";
+          } else if (dateDisplayFormat == "Year") {
+            dateFormat = "Y";
           } else {
             if (dateDisplayFormat == "ODate") {
               dateFormat = "YMD";
@@ -895,6 +902,10 @@ var PageHome = function (_React$Component) {
         } 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) {
@@ -941,25 +952,30 @@ var PageHome = function (_React$Component) {
         }
       } else if (itemType == 'upload' || itemType == 'image') {
         //附件图片
-        var uploadFileNumLimit = form.uploadFileNumLimit; //上传个数限制
-        var uploadFileLimit = form.uploadFileLimit; //上传类型限制
-        if (value) {
-          value = value.replace(/\|/g, ",");
-          itemParam.initIds = value;
-          value = [];
-        } else {
-          value = [];
-        }
-        if (uploadFileNumLimit) {
-          itemParam.uploadFileNumLimit = uploadFileNumLimit;
-        } else {
-          itemParam.uploadFileNumLimit = -1;
-        }
+        var formDataAttr = form.dataAttr;
+        if (formDataAttr) {
+          var uploadFileNumLimit = formDataAttr.uploadFileNumLimit; //上传个数限制
+          var uploadFileLimit = formDataAttr.uploadFileLimit; //上传类型限制
+          var canDownload = formDataAttr.canDownload; //是否下载
+          if (value) {
+            value = value.replace(/\|/g, ",");
+            itemParam.initIds = value;
+            value = [];
+          } else {
+            value = [];
+          }
+          if (uploadFileNumLimit) {
+            itemParam.uploadFileNumLimit = uploadFileNumLimit;
+          } else {
+            itemParam.uploadFileNumLimit = -1;
+          }
 
-        if (uploadFileLimit) {
-          itemParam.uploadFileLimit = uploadFileLimit;
-        } else {
-          itemParam.uploadFileLimit = "";
+          if (uploadFileLimit) {
+            itemParam.uploadFileLimit = uploadFileLimit;
+          } else {
+            itemParam.uploadFileLimit = "";
+          }
+          itemParam.canDownload = canDownload;
         }
       } else if (itemType == 'poppage') {
         //弹出选择
@@ -2096,6 +2112,12 @@ var PageHome = function (_React$Component) {
           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 {
           return '';
         }
@@ -2919,6 +2941,7 @@ var PageHome = function (_React$Component) {
                   ref: "upload_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key,
                   canAdd: t.state.itemParam.readOnly == true ? false : true,
                   canDel: t.state.itemParam.readOnly == true ? false : true,
+                  canDownload: this.state.itemParam.canDownload == "1" ? true : false,
                   initList: t.state.itemParam.value,
                   initIds: t.state.itemParam.initIds,
                   dir: t.state.module,
@@ -2993,12 +3016,36 @@ var PageHome = function (_React$Component) {
                 _react2.default.createElement(
                   'div',
                   { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-PL10' : 't-DN' },
-                  _react2.default.createElement(_TextareaField2.default, {
-                    readOnly: false,
-                    minRows: 3, maxRows: 5,
-                    placeholder: '请输入批示意见',
-                    value: t.state.spyj,
-                    onChange: this.changeSpyj3.bind(this) })
+                  _react2.default.createElement(
+                    'div',
+                    { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-FCddblue t-P6 t-FS16 commonwords' : 't-DN', onClick: this.selectCommonwords.bind(this) },
+                    '\u5E38\u7528\u8BED'
+                  ),
+                  _react2.default.createElement(
+                    'div',
+                    { id: t.state.prefixName + "_" + t.state.itemParam.key },
+                    _react2.default.createElement(_TextareaField2.default, {
+                      readOnly: false,
+                      minRows: 3, maxRows: 5,
+                      placeholder: '请输入批示意见',
+                      value: t.state.spyj,
+                      onChange: this.changeSpyj3.bind(this) })
+                  )
+                ),
+                _react2.default.createElement(
+                  _FoldablePane2.default,
+                  { foldHeight: 0, isFold: this.state.fold },
+                  _react2.default.createElement(
+                    'div',
+                    { className: 'phrase-list' },
+                    this.state.phraseListNew.length > 0 ? this.state.phraseListNew.map(function (item, i) {
+                      return _react2.default.createElement(
+                        'div',
+                        { className: 'phrase-item', onClick: this.phraseItemClick.bind(this, item.value) },
+                        item.value
+                      );
+                    }.bind(this)) : ''
+                  )
                 )
               )
             )

package/lib/form/table.js

@@ -1468,6 +1468,8 @@ var PageHome = function (_React$Component) {
 	}, {
 		key: 'render',
 		value: function render() {
+			var _this2 = this;
+
 			var t = this;
 			var allForm = this.props.allForm;
 			var tabCodes = allForm.tabCodes;
@@ -1498,11 +1500,17 @@ var PageHome = function (_React$Component) {
 						'div',
 						null,
 						_react2.default.createElement(
-							_Tab2.default,
-							{ activeKey: tabCodes[0], className: 'dd-tab-br-none', onChange: this.onChangeTab.bind(this), onTabClick: this.changeTab.bind(this) },
-							tabCodes.map(function (item1, k) {
-								return _react2.default.createElement(_Tab2.default.Item, { key: item1, title: tabNames[k] });
-							}.bind(this))
+							'ul',
+							{ className: 'tab-page-tree' },
+							tabCodes.map(function (item, index) {
+								return _react2.default.createElement(
+									'li',
+									{ className: t.state.active == item ? "tab-page-tree-item active" : "tab-page-tree-item", onClick: function onClick() {
+											_this2.changeTab(item);
+										}, key: item },
+									tabNames[index]
+								);
+							})
 						),
 						_react2.default.createElement('div', { className: 't-H10 t-BCf7' }),
 						_react2.default.createElement(
@@ -1513,16 +1521,16 @@ var PageHome = function (_React$Component) {
 									return _react2.default.createElement(
 										'div',
 										{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-										_react2.default.createElement(_form2.default, { keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, newspyj: t.props.newspyj, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
+										_react2.default.createElement(_form2.default, { keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, newspyj: t.props.newspyj, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item2, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
 									);
 								}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
 									'div',
 									{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-									_react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
+									_react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
 								) : _react2.default.createElement(
 									'div',
 									{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-									_react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
+									_react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
 								);
 							}.bind(this))
 						)

package/lib/process_info/processInfo.js

@@ -54,6 +54,10 @@ var _Boxs = require('saltui/lib/Boxs');
 
 var _Boxs2 = _interopRequireDefault(_Boxs);
 
+var _h5Imageviewer = require('h5-imageviewer');
+
+var viewer = _interopRequireWildcard(_h5Imageviewer);
+
 var _ActionSheet = require('saltui/lib/ActionSheet');
 
 var _ActionSheet2 = _interopRequireDefault(_ActionSheet);
@@ -98,6 +102,8 @@ var _upload = require('../upload/upload');
 
 var _upload2 = _interopRequireDefault(_upload);
 
+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 }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -119,6 +125,7 @@ var extFile = "";
 var ActionSheetButton = void 0;
 var iconIndex = 0;
 var searchVal = '';
+// const viewer = null;
 
 var evoRemind = '0';
 var sysSMSsetting = '0';
@@ -159,9 +166,15 @@ var PageHome = function (_React$Component) {
 
         /* $(".loading-containter").hide();*/
 
-        //消息提醒
         var _this = _possibleConstructorReturn(this, (PageHome.__proto__ || Object.getPrototypeOf(PageHome)).call(this, props));
 
+        var bottom = 52;
+        var isIPhoneXR = /iphone/gi.test(window.navigator.userAgent) && window.screen.height >= 812;
+        if (isIPhoneXR) {
+            bottom = 52 + 46;
+        }
+
+        //消息提醒
         _thirdMenuType = getLoginUserInfo().thirdMenuType;
         var loginUserId = getLoginUserInfo().userId;
         var fxUserId = props.userId;
@@ -292,6 +305,7 @@ var PageHome = function (_React$Component) {
         });
 
         var param = {
+            bottom: bottom,
             editType: editType,
             isDraft: isDraft,
             listType: listType,
@@ -577,16 +591,33 @@ var PageHome = function (_React$Component) {
                 "overflow": "auto",
                 "height": ""
             });
+            if (viewer) {
+                viewer.hideViewer();
+            }
+
             _Dialog2.default.hide();
             _Popup2.default.hide();
             if (ActionSheetButton) {
                 ActionSheetButton.close();
             }
         }
+    }, {
+        key: 'imageView',
+        value: function imageView(src) {
+            viewer.showViewer({
+                src: src
+            });
+        }
     }, {
         key: 'componentDidMount',
         value: function componentDidMount() {
             var t = this;
+            document.addEventListener('click', function (e) {
+                if (e.target.tagName === 'IMG') {
+                    t.imageView(e.target.src);
+                }
+            });
+
             var taskId = this.state.taskId;
             var processInstanceId = this.state.processInstanceId;
             var listType = this.state.listType;
@@ -1014,7 +1045,10 @@ var PageHome = function (_React$Component) {
                     //关联字段
                     var formRelaField = content.formRelaField;
                     var commentFieldList = [];
-                    var defaultValue = content.defaultValue;
+                    var defaultValue = "";
+                    if (content.defaultValue || content.defaultValue === 0) {
+                        defaultValue = content.defaultValue;
+                    }
                     var commentId = content.commentId;
                     //alert(defaultValue);
                     var commentDefaultList = [];
@@ -2132,6 +2166,7 @@ var PageHome = function (_React$Component) {
                                 var personValues = []; //备选的人
                                 var participantMode = item.participantMode; //判断选人是单选还是多选
                                 var commonUsedData = []; //自定义选人的范围,常用
+                                var commonTreeData = [];
                                 var popCode = "";
                                 var chooseType = "";
                                 var type3ParNum = 0;
@@ -2179,6 +2214,11 @@ var PageHome = function (_React$Component) {
                                     }
                                     var commonUsedId = ''; //常用选择范围
                                     var participantList = item.participantList;
+                                    var participantListNew = item.participantListNew;
+                                    if (participantListNew != null && participantListNew != "" && participantListNew.length > 0) {
+                                        commonTreeData = participantListNew;
+                                    }
+
                                     participants = '';
                                     if (participantList != null && participantList != "" && participantList.length > 0) {
                                         for (var i = 0; i < participantList.length; i++) {
@@ -2231,6 +2271,10 @@ var PageHome = function (_React$Component) {
                                     chooseType = "userNotOrg,userNotGroup";
                                     var commonUsedId = ''; //常用选择范围
                                     var participantList = item.participantList;
+                                    var participantListNew = item.participantListNew;
+                                    if (participantListNew != null && participantListNew != "" && participantListNew.length > 0) {
+                                        commonTreeData = participantListNew;
+                                    }
                                     if (participantList != null && participantList != "" && participantList.length > 0) {
                                         for (var i = 0; i < participantList.length; i++) {
                                             if (participantList[i].type != "user") {
@@ -2277,6 +2321,7 @@ var PageHome = function (_React$Component) {
                                 checkedItem.code = popCode;
                                 checkedItem.chooseType = chooseType;
                                 checkedItem.commonUsedData = commonUsedData;
+                                checkedItem.commonTreeData = commonTreeData;
                                 checkedItem.participantMode = participantMode; //选人单选还是多选，1多选，0单选
                                 checkedItem.personValue = personValue;
                                 checkedItem.selectUserReadOnly = selectUserReadOnly;
@@ -6328,9 +6373,10 @@ var PageHome = function (_React$Component) {
 
             var isReadOnly = false;
             var t = this;
+            var bottomStyle = { paddingBottom: this.state.bottom + 'px' };
             return _react2.default.createElement(
                 'div',
-                { className: 'approval-details' },
+                { style: bottomStyle, className: 'approval-details' },
                 _react2.default.createElement(
                     'div',
                     { className: this.state.errorMsg == '任务不存在' ? "dd-state-page" : 't-DN' },
@@ -6610,6 +6656,7 @@ var PageHome = function (_React$Component) {
                                     isDelete: true,
                                     defaultValue: item.personValue,
                                     commonUsedData: item.commonUsedData,
+                                    commonTreeData: item.commonTreeData,
                                     onChange: this.getChoosePerson.bind(this, i),
                                     queryLimit: item.participants == '' ? '' : '5',
                                     limitData: item.participants == '' ? '' : item.participants