fmui-base 2.2.20 → 2.2.22

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.22：深圳CA密码验证
+- 2.2.21：表单组件支持批示意见开启态度
 - 2.2.20：流程列表组件支持流程分类category参数
 - 2.2.19：上传组件添加图片点击放大事件
 - 2.2.18：修改关联流程暂无数据样式

package/lib/form/form.js

@@ -153,6 +153,7 @@ var PageHome = function (_React$Component) {
     _this.state = {
       module: module,
       fold: true,
+      atfold: true,
       status: status,
       fieldControll: props.fieldControll,
       commentField: props.commentField,
@@ -174,6 +175,7 @@ var PageHome = function (_React$Component) {
       loaded: false,
       commentList: [],
       phraseListNew: [],
+      attitudeList: [], //态度列表
       savePhraseList: [{
         value: "1",
         checked: false,
@@ -2971,6 +2973,7 @@ var PageHome = function (_React$Component) {
       // t.refs.slotCommonwords.show();
       // } else {
       if (this.state.fold) {
+        t.setState({ atfold: true });
         //获取常用语列表
         _db2.default.FlowModuleAPI.getPersonalPhrase({}).then(function (content) {
           if (content.length > 0) {
@@ -3002,6 +3005,42 @@ var PageHome = function (_React$Component) {
 
     }
 
+    //选择态度
+
+  }, {
+    key: 'selectAttitude',
+    value: function selectAttitude() {
+      var t = this;
+      t.setState({ atfold: !this.state.atfold });
+      // let phraseListNow = t.state.phraseList;
+      // if (phraseListNow.length > 0) {
+      // t.refs.slotCommonwords.show();
+      // } else {
+      if (this.state.atfold) {
+        t.setState({ fold: true });
+        var commentAttitude = this.props.commentAttitude;
+        var attitudeList = [];
+
+        if (commentAttitude == '1') {
+          attitudeList.push({ text: '同意', value: '同意' });
+          attitudeList.push({ text: '不同意', value: '不同意' });
+        } else if (commentAttitude == '2') {
+          attitudeList.push({ text: '已阅', value: '已阅' });
+          attitudeList.push({ text: '同意', value: '同意' });
+          attitudeList.push({ text: '不同意', value: '不同意' });
+        }
+
+        t.setState({
+          // phraseList: phraseList2,
+          attitudeList: attitudeList
+        }, function () {
+          //  t.refs.slotCommonwords.show();
+        });
+      }
+      // }
+
+    }
+
     //常用语设置跳转
 
   }, {
@@ -3587,6 +3626,13 @@ var PageHome = function (_React$Component) {
                       { onClick: this.selectCommonwords.bind(this) },
                       '\u5E38\u7528\u8BED'
                     ),
+                    ' ',
+                    _react2.default.createElement(
+                      'div',
+                      { className: t.props.commentAttitude == '1' || t.props.commentAttitude == '2' ? "" : "t-DN", onClick: this.selectAttitude.bind(this) },
+                      '\u6001\u5EA6'
+                    ),
+                    ' ',
                     _react2.default.createElement(
                       'div',
                       { onClick: this.skipToCommonwordsSet.bind(this) },
@@ -3637,6 +3683,21 @@ var PageHome = function (_React$Component) {
                       );
                     }.bind(this)) : ''
                   )
+                ),
+                _react2.default.createElement(
+                  _FoldablePane2.default,
+                  { foldHeight: 0, isFold: this.state.atfold },
+                  _react2.default.createElement(
+                    'div',
+                    { className: 'phrase-list' },
+                    this.state.attitudeList.length > 0 ? this.state.attitudeList.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

@@ -229,8 +229,10 @@ var PageHome = function (_React$Component) {
 			}],
 			savePhrase: [],
 			fold: true,
+			atfold: true,
 			phraseListNew: [],
 			phraseList: [], //常用语列表
+			attitudeList: [], //态度列表
 			spyj: defaultValue,
 			formRelaFieldMaps: formRelaFieldMapsNew,
 			linkFields: linkFieldsNew,
@@ -1661,6 +1663,7 @@ var PageHome = function (_React$Component) {
 			// t.refs.slotCommonwords.show();
 			// } else {
 			if (this.state.fold) {
+				t.setState({ atfold: true });
 				//获取常用语列表
 				_db2.default.FlowModuleAPI.getPersonalPhrase({}).then(function (content) {
 					if (content.length > 0) {
@@ -1692,6 +1695,42 @@ var PageHome = function (_React$Component) {
 
 		}
 
+		//选择态度
+
+	}, {
+		key: 'selectAttitude',
+		value: function selectAttitude() {
+			var t = this;
+			t.setState({ atfold: !this.state.atfold });
+			// let phraseListNow = t.state.phraseList;
+			// if (phraseListNow.length > 0) {
+			// t.refs.slotCommonwords.show();
+			// } else {
+			if (this.state.atfold) {
+				t.setState({ fold: true });
+				var commentAttitude = this.props.commentAttitude;
+				var attitudeList = [];
+
+				if (commentAttitude == '1') {
+					attitudeList.push({ text: '同意', value: '同意' });
+					attitudeList.push({ text: '不同意', value: '不同意' });
+				} else if (commentAttitude == '2') {
+					attitudeList.push({ text: '已阅', value: '已阅' });
+					attitudeList.push({ text: '同意', value: '同意' });
+					attitudeList.push({ text: '不同意', value: '不同意' });
+				}
+
+				t.setState({
+					// phraseList: phraseList2,
+					attitudeList: attitudeList
+				}, function () {
+					//  t.refs.slotCommonwords.show();
+				});
+			}
+			// }
+
+		}
+
 		//常用语设置跳转
 
 	}, {
@@ -1764,16 +1803,16 @@ var PageHome = function (_React$Component) {
 							return _react2.default.createElement(
 								'div',
 								{ className: "form_" + item2.uniqueName },
-								_react2.default.createElement(_form2.default, { keyNo: j, ref: item2.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, 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, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
+								_react2.default.createElement(_form2.default, { keyNo: j, ref: item2.uniqueName, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, 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, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
 							);
 						}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
 							'div',
 							{ className: "subform_" + item.itemCode },
-							_react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, 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, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, 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, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, 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, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this) })
 						) : _react2.default.createElement(
 							'div',
 							{ className: "form_" + item.uniqueName },
-							_react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, 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, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
+							_react2.default.createElement(_form2.default, { ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, 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, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, onChange: this.change.bind(this), reloadItemParam: this.reloadItemParam.bind(this) })
 						);
 					}.bind(this)) : "" : _react2.default.createElement(
 						'div',
@@ -1800,16 +1839,16 @@ var PageHome = function (_React$Component) {
 									return _react2.default.createElement(
 										'div',
 										{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-										_react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, 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), reloadItemParam: this.reloadItemParam.bind(this) })
+										_react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, keyNo: j, ref: item.uniqueName, operate: t.props.operate, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, 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), reloadItemParam: this.reloadItemParam.bind(this) })
 									);
 								}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
 									'div',
 									{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-									_react2.default.createElement(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, 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(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, 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, { className: "form_" + item.uniqueName, ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, 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), reloadItemParam: this.reloadItemParam.bind(this) })
+									_react2.default.createElement(_form2.default, { className: "form_" + item.uniqueName, ref: item.uniqueName, keyNo: i, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, 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), reloadItemParam: this.reloadItemParam.bind(this) })
 								);
 							}.bind(this))
 						)
@@ -1865,6 +1904,13 @@ var PageHome = function (_React$Component) {
 										{ onClick: this.selectCommonwords.bind(this) },
 										'\u5E38\u7528\u8BED'
 									),
+									' ',
+									_react2.default.createElement(
+										'div',
+										{ className: t.props.commentAttitude == '1' || t.props.commentAttitude == '2' ? "" : "t-DN", onClick: this.selectAttitude.bind(this) },
+										'\u6001\u5EA6'
+									),
+									' ',
 									_react2.default.createElement(
 										'div',
 										{ onClick: this.skipToCommonwordsSet.bind(this) },
@@ -1917,6 +1963,21 @@ var PageHome = function (_React$Component) {
 											);
 										}.bind(this)) : ''
 									)
+								),
+								_react2.default.createElement(
+									_FoldablePane2.default,
+									{ foldHeight: 0, isFold: this.state.atfold },
+									_react2.default.createElement(
+										'div',
+										{ className: 'phrase-list' },
+										this.state.attitudeList.length > 0 ? this.state.attitudeList.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/process_info/processInfo.js

@@ -367,6 +367,7 @@ var PageHome = function (_React$Component) {
             defaultValue: "",
             commentId: "",
             commentField: "", //批示意见字段
+            commentAttitude: "0", //批示意见态度
             hasCommentField: '0', //是否有审批意见
             commentIsNull: '0', //审批意见是否可为空，0是，1否
             commentIsNotNull: '0', //审批意见是否可为空，0是，1否
@@ -989,13 +990,18 @@ var PageHome = function (_React$Component) {
                     if (!commentField) {
                         commentField = "";
                     }
+                    var commentAttitude = content['commentAttitude'];
+                    if (!commentAttitude) {
+                        commentAttitude = "0";
+                    }
                     t.setState({
                         shortMessageList: shortMessageList,
                         readShortMessageList: readShortMessageList,
                         sysSMSsetting: sysSMSsetting,
                         sysImType: '0',
                         evoRemind: evoRemind,
-                        commentField: commentField
+                        commentField: commentField,
+                        commentAttitude: commentAttitude
                     });
                     if (t.state.listType == '4') {
                         var details = content['details'];
@@ -7410,8 +7416,9 @@ var PageHome = function (_React$Component) {
                 console.log('oauthWindowURL', oauthWindowURL);
                 if (oauthWindowURL && oauthWindowURL != null && oauthWindowURL != 'null' && typeof oauthWindowURL != 'undefined' && oauthWindowURL != '') {
                     localStorage.setItem('oauthWindowURL', oauthWindowURL);
-                    console.log(getLoginUserInfo().contextPageUrl + '/mobile/shenzhengCA.html');
-                    window.open(getLoginUserInfo().contextPageUrl + '/mobile/shenzhengCA.html');
+                    // console.log(getLoginUserInfo().contextPageUrl+'/mobile/shenzhengCA.html');
+                    // window.open(getLoginUserInfo().contextPageUrl+'/mobile/shenzhengCA.html');
+                    location.href = getLoginUserInfo().contextPageUrl + '/mobile/shenzhengCA.html';
                 }
             }, 100);
         }
@@ -7502,7 +7509,7 @@ var PageHome = function (_React$Component) {
                                         _react2.default.createElement(
                                             _Group2.default.List,
                                             null,
-                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, onChange: this.change.bind(this) })
+                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, commentAttitude: t.state.commentAttitude, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, onChange: this.change.bind(this) })
                                         )
                                     )
                                 )

package/package.json

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