fmui-base 2.2.97 → 2.2.99

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.99：移动端保存批示意见态度
+- 2.2.98：批示意见态度增加回调方法
 - 2.2.97：表单字段关联选人字段关联子表，没有触发关联时还原原来状态
 - 2.2.96：表单字段关联选人字段关联时可能会出现死循环问题修复
 - 2.2.95：表单字段关联只读字段必填不需要生效

package/lib/form/form.js

@@ -3687,6 +3687,21 @@ var PageHome = function (_React$Component) {
       });
       this.props.newspyj.content = spyj + commonwords;
     }
+
+    // 意见态度点击：先执行默认拼接，再触发 FlowCommon 扩展回调
+
+  }, {
+    key: 'attitudeItemClick',
+    value: function attitudeItemClick(item) {
+      var attitudeValue = item && item.value != null ? item.value : '';
+      this.phraseItemClick(attitudeValue);
+      if (this.props.newspyj) {
+        this.props.newspyj.commentAttitude = (0, _formExtHelper.mapCommentAttitudeSaveValue)(attitudeValue);
+      }
+      if (FlowCommon && typeof FlowCommon.dealwithAttitudeClick === 'function') {
+        FlowCommon.dealwithAttitudeClick(item, this);
+      }
+    }
     //切换修改常用语
 
   }, {
@@ -4423,7 +4438,7 @@ var PageHome = function (_React$Component) {
                     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) },
+                        { className: 'phrase-item', onClick: this.attitudeItemClick.bind(this, item) },
                         item.value
                       );
                     }.bind(this)) : ''

package/lib/form/formExtHelper.js

@@ -9,6 +9,7 @@ exports.clampSubColumnCount = clampSubColumnCount;
 exports.buildDetailItemParam = buildDetailItemParam;
 exports.applyDealwithFormParamExt = applyDealwithFormParamExt;
 exports.resolveSubColumnCountFromConfig = resolveSubColumnCountFromConfig;
+exports.mapCommentAttitudeSaveValue = mapCommentAttitudeSaveValue;
 /**
  * 表单扩展加载：流程 flow_common / 纯表单 form_common
  *
@@ -225,4 +226,19 @@ function resolveSubColumnCountFromConfig(options) {
   }
 
   return 1;
+}
+
+/** 批示意见态度显示值转存库值（与 PC comment_idea_radio 一致） */
+function mapCommentAttitudeSaveValue(displayValue) {
+  var val = displayValue == null ? '' : String(displayValue);
+  if (val === '同意') {
+    return 'yes';
+  }
+  if (val === '不同意') {
+    return 'no';
+  }
+  if (val === '已阅') {
+    return 'read';
+  }
+  return val;
 }

package/lib/form/table.js

@@ -2451,6 +2451,31 @@ var PageHome = function (_React$Component) {
 			this.props.newspyj.content = spyj + commonwords;
 		}
 
+		// 意见态度点击：先执行默认拼接，再触发 FlowCommon 扩展回调
+
+	}, {
+		key: 'attitudeItemClick',
+		value: function attitudeItemClick(item) {
+			var t = this;
+			var attitudeValue = item && item.value != null ? item.value : '';
+			t.phraseItemClick(attitudeValue);
+			if (t.props.newspyj) {
+				t.props.newspyj.commentAttitude = (0, _formExtHelper.mapCommentAttitudeSaveValue)(attitudeValue);
+			}
+			var flowCommonRef = FlowCommon;
+			if (!flowCommonRef) {
+				var formCode = t.state.formCode || t.props.formCode || '';
+				var module = t.state.module || t.props.module;
+				if (formCode || module) {
+					var loaded = (0, _formExtHelper.loadFlowOrFormCommon)({ formCode: formCode, module: module || '' });
+					flowCommonRef = loaded.FlowCommon;
+				}
+			}
+			if (flowCommonRef && typeof flowCommonRef.dealwithAttitudeClick === 'function') {
+				flowCommonRef.dealwithAttitudeClick(item, t);
+			}
+		}
+
 		//切换修改常用语
 
 	}, {
@@ -2729,7 +2754,7 @@ var PageHome = function (_React$Component) {
 										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) },
+												{ className: 'phrase-item', onClick: this.attitudeItemClick.bind(this, item) },
 												item.value
 											);
 										}.bind(this)) : ''

package/lib/process_info/processInfo.js

@@ -82,6 +82,8 @@ var _table = require('../form/table');
 
 var _table2 = _interopRequireDefault(_table);
 
+var _formExtHelper = require('../form/formExtHelper');
+
 var _FlowChart = require('./FlowChart');
 
 var _FlowChart2 = _interopRequireDefault(_FlowChart);
@@ -3637,7 +3639,8 @@ var PageHome = function (_React$Component) {
                         editType: t.state.editType,
                         formData: JSON.stringify(t.state.editFormData),
                         module: t.state.module,
-                        comment: newComment
+                        comment: newComment,
+                        commentAttitude: t.getSelectedCommentAttitude()
                     }).then(function (content) {
                         _Toast2.default.show({
                             type: 'success',
@@ -4022,6 +4025,7 @@ var PageHome = function (_React$Component) {
                     attachId: this.state.commentAttachId,
                     sealId: this.state.commentSealId,
                     commentId: t.state.commentId,
+                    commentAttitude: t.getSelectedCommentAttitude(),
                     hasCommentField: t.state.hasCommentField,
                     dataId: dataId,
                     urgent: urgent,
@@ -4120,6 +4124,7 @@ var PageHome = function (_React$Component) {
                     module: t.state.module,
                     comment: newComment,
                     commentId: this.state.commentId,
+                    commentAttitude: this.getSelectedCommentAttitude(),
                     hasCommentField: t.state.hasCommentField,
                     attachId: this.state.commentAttachId,
                     sealId: this.state.commentSealId,
@@ -4622,7 +4627,7 @@ var PageHome = function (_React$Component) {
                 formData: JSON.stringify(editFormData),
                 formType: "4",
                 editType: editType
-            }, _defineProperty(_param2, 'module', t.state.module), _defineProperty(_param2, 'comment', newComment), _defineProperty(_param2, 'commentType', 'text'), _defineProperty(_param2, 'commentId', t.state.commentId), _defineProperty(_param2, 'attachId', t.state.commentAttachId), _defineProperty(_param2, 'sealId', t.state.commentSealId), _defineProperty(_param2, 'permissionCode', t.state.permissionCode), _defineProperty(_param2, 'hasCommentField', t.state.hasCommentField), _defineProperty(_param2, 'dataId', dataId), _param2);
+            }, _defineProperty(_param2, 'module', t.state.module), _defineProperty(_param2, 'comment', newComment), _defineProperty(_param2, 'commentType', 'text'), _defineProperty(_param2, 'commentId', t.state.commentId), _defineProperty(_param2, 'commentAttitude', t.getSelectedCommentAttitude()), _defineProperty(_param2, 'attachId', t.state.commentAttachId), _defineProperty(_param2, 'sealId', t.state.commentSealId), _defineProperty(_param2, 'permissionCode', t.state.permissionCode), _defineProperty(_param2, 'hasCommentField', t.state.hasCommentField), _defineProperty(_param2, 'dataId', dataId), _param2);
             var commentbizSn = t.guid2();
             if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
                 commentbizSn = param.commentId;
@@ -5019,6 +5024,7 @@ var PageHome = function (_React$Component) {
             param.processInstanceId = t.state.processInstanceId;
             param.permissionCode = t.state.permissionCode;
             param.commentId = t.state.commentId;
+            param.commentAttitude = t.getSelectedCommentAttitude();
             var commentbizSn = t.guid2();
             if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
                 commentbizSn = param.commentId;
@@ -5217,6 +5223,21 @@ var PageHome = function (_React$Component) {
                 return true;
             });
         }
+        //获取当前选中的批示意见态度（yes/no/read，与 PC 一致）
+
+    }, {
+        key: 'getSelectedCommentAttitude',
+        value: function getSelectedCommentAttitude() {
+            var newspyj = this.state.newspyj;
+            if (!newspyj || newspyj.commentAttitude == null || newspyj.commentAttitude === '') {
+                return '';
+            }
+            var val = String(newspyj.commentAttitude);
+            if (val === 'yes' || val === 'no' || val === 'read') {
+                return val;
+            }
+            return (0, _formExtHelper.mapCommentAttitudeSaveValue)(val);
+        }
         //获取批示意见加签随机数
 
     }, {
@@ -5652,6 +5673,7 @@ var PageHome = function (_React$Component) {
                 hasCommentField: t.state.hasCommentField,
                 comment: newComment,
                 commentId: t.state.commentId,
+                commentAttitude: t.getSelectedCommentAttitude(),
                 attachId: t.state.commentAttachId,
                 sealId: t.state.commentSealId,
                 module: t.state.module,
@@ -6286,6 +6308,7 @@ var PageHome = function (_React$Component) {
                 shortMessage: shortMessage,
                 comment: t.state.spyj,
                 commentId: t.state.commentId,
+                commentAttitude: t.getSelectedCommentAttitude(),
                 attachId: t.state.commentAttachId,
                 sealId: t.state.commentSealId
             };

package/lib/tblform/FlowCommentPane.js

@@ -223,7 +223,7 @@ var FlowCommentPane = function (_BaseTable) {
                         {
                           key: item.value,
                           className: 'phrase-item',
-                          onClick: this.phraseItemClick.bind(this, item.value)
+                          onClick: this.attitudeItemClick.bind(this, item)
                         },
                         item.value
                       );

package/package.json

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