fmui-base 2.0.3 → 2.0.4

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.4: 表单组件错误优化；政治面貌全选问题修改
 - 2.0.3: 增加流程图；表单按钮功能扩展
 - 2.0.2: 时间字段增加“xxxx年xx月xx日”中文显示
 - 2.0.1: 流程表单选人组件联动开发 

package/lib/comment_list/List.js

@@ -97,33 +97,35 @@ var PageHome = function (_React$Component) {
     key: 'casigin',
     value: function casigin() {
       var commentList = this.props.list;
-      commentList.map(function (item) {
-        var param = {};
-        param.bizSn = item.id;
-        param.relationId = getLoginUserInfo().mobile;
-        param.msg = item.fullMessage;
-        // setTimeout(function(){
-        //   $("#"+item.id+"_sucess").show();
-        // },1000)
-        _db2.default.FlowApproval.verifySign(param).then(function (content) {
-          var result = content.verifySignRes;
-          if (result == 'success') {
-            $("#commentSign-" + item.id).removeClass('t-PR16');
-            $("#" + item.id + "_sucess").show();
-          }
-        }).catch(function (error) {
-          if (error.errorMsg == "签名值与原文不匹配") {
-            $("#commentSign-" + item.id).removeClass('t-PR16');
-            $("#" + item.id + "_fail").show();
-          }
-          //  else{
-          //   Toast.show({
-          //     type: 'error',
-          //     content: error.errorMsg,
-          //   });
-          //  }
+      if (commentList) {
+        commentList.map(function (item) {
+          var param = {};
+          param.bizSn = item.id;
+          param.relationId = getLoginUserInfo().mobile;
+          param.msg = item.fullMessage;
+          // setTimeout(function(){
+          //   $("#"+item.id+"_sucess").show();
+          // },1000)
+          _db2.default.FlowApproval.verifySign(param).then(function (content) {
+            var result = content.verifySignRes;
+            if (result == 'success') {
+              $("#commentSign-" + item.id).removeClass('t-PR16');
+              $("#" + item.id + "_sucess").show();
+            }
+          }).catch(function (error) {
+            if (error.errorMsg == "签名值与原文不匹配") {
+              $("#commentSign-" + item.id).removeClass('t-PR16');
+              $("#" + item.id + "_fail").show();
+            }
+            //  else{
+            //   Toast.show({
+            //     type: 'error',
+            //     content: error.errorMsg,
+            //   });
+            //  }
+          });
         });
-      });
+      }
     }
 
     //初始化ids

package/lib/form/form.js

@@ -1040,6 +1040,10 @@ var PageHome = function (_React$Component) {
             if (form.popuserMap.chooseScope == 5) {
               itemParam.queryLimit = form.popuserMap.chooseScope;
               itemParam.limitData = getLoginUserInfo().orgId;
+            } else if (form.popuserMap.chooseScope == "4") {
+              //查上级
+              itemParam.queryLimit = "3";
+              itemParam.limitData = form.popuserMap.chooseScopeVal;
             } else if (form.popuserMap.chooseScope == "all") {} else {
               itemParam.queryLimit = 5;
               itemParam.limitData = form.popuserMap.chooseScope;

package/lib/form/table.js

@@ -86,8 +86,8 @@ var PageHome = function (_React$Component) {
 		var defaultValue = props.defaultValue;
 		var status = props.status;
 		var formRelaField = props.formRelaField; //关联字段
-		var linkFields = props.allForm.linkFields; //级联字段
-		var formId = props.data.formId; //表单id
+		var linkFields = props.allForm ? props.allForm.linkFields : ""; //级联字段
+		var formId = props.data ? props.data.formId : ""; //表单id
 
 		//关联字段
 		var formRelaFieldMapsNew = {};
@@ -230,7 +230,9 @@ var PageHome = function (_React$Component) {
 		};
 
 		var module = props.module && props.module != "undefined" ? props.module : "approve";
-		FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
+		try {
+			FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
+		} catch (error) {}
 
 		// DB.form.getRelaFieldsMap({
 		// 	formId: formId,
@@ -302,8 +304,8 @@ var PageHome = function (_React$Component) {
 		value: function change(data, itemParam) {
 			var t = this;
 			var module = t.props.module;
-			var formKey = t.props.allForm.formcode;
-			var formTblId = t.props.allForm.formTblId;
+			var formKey = t.props.allForm ? t.props.allForm.formcode : "";
+			var formTblId = t.props.allForm ? t.props.allForm.formTblId : "";
 			if (itemParam && itemParam.key) {
 				//修改事件的时候
 
@@ -1472,15 +1474,19 @@ var PageHome = function (_React$Component) {
 
 			var t = this;
 			var allForm = this.props.allForm;
-			var tabCodes = allForm.tabCodes;
-			var tabNames = allForm.tabNames;
+			var tabCodes = [];
+			var tabNames = [];
+			if (allForm) {
+				tabCodes = allForm.tabCodes;
+				tabNames = allForm.tabNames;
+			}
 			return _react2.default.createElement(
 				'div',
 				null,
 				_react2.default.createElement(
 					'div',
 					null,
-					tabCodes == null || tabCodes.length < 2 ? this.props.form.map(function (item, i) {
+					tabCodes == null || tabCodes.length < 2 ? this.props.form ? this.props.form.map(function (item, i) {
 						return item.itemType == 'twocolumns' || item.itemType == 'threecolumns' ? item.children.map(function (item2, j) {
 							return _react2.default.createElement(
 								'div',
@@ -1496,7 +1502,7 @@ var PageHome = function (_React$Component) {
 							null,
 							_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, 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, onChange: this.change.bind(this) })
 						);
-					}.bind(this)) : _react2.default.createElement(
+					}.bind(this)) : "" : _react2.default.createElement(
 						'div',
 						null,
 						_react2.default.createElement(
@@ -1536,10 +1542,10 @@ var PageHome = function (_React$Component) {
 						)
 					)
 				),
-				_react2.default.createElement('div', { className: t.props.commentBackList.length > 0 ? "t-H10 t-BCf7" : 't-DN' }),
+				_react2.default.createElement('div', { className: t.props.commentBackList && t.props.commentBackList.length > 0 ? "t-H10 t-BCf7" : 't-DN' }),
 				_react2.default.createElement(
 					'div',
-					{ className: t.props.commentBackList.length > 0 ? '' : 't-DN' },
+					{ className: t.props.commentBackList && t.props.commentBackList.length > 0 ? '' : 't-DN' },
 					_react2.default.createElement(
 						HBox,
 						{ className: 't-field-box' },
@@ -1555,10 +1561,10 @@ var PageHome = function (_React$Component) {
 						)
 					)
 				),
-				_react2.default.createElement('div', { className: t.props.commentDefaultList.length > 0 ? "t-H10 t-BCf7" : 't-DN' }),
+				_react2.default.createElement('div', { className: t.props.commentDefaultList && t.props.commentDefaultList.length > 0 ? "t-H10 t-BCf7" : 't-DN' }),
 				_react2.default.createElement(
 					'div',
-					{ className: t.props.commentDefaultList.length > 0 ? '' : 't-DN' },
+					{ className: t.props.commentDefaultList && t.props.commentDefaultList.length > 0 ? '' : 't-DN' },
 					_react2.default.createElement(
 						HBox,
 						{ className: 'flex-comment t-field-box' },
@@ -1615,10 +1621,10 @@ var PageHome = function (_React$Component) {
 						)
 					)
 				),
-				_react2.default.createElement('div', { className: t.props.commentDefaultList.length == 0 ? "t-H10 t-BCf7" : 't-DN' }),
+				_react2.default.createElement('div', { className: t.props.commentDefaultList && t.props.commentDefaultList.length == 0 ? "t-H10 t-BCf7" : 't-DN' }),
 				_react2.default.createElement(
 					'div',
-					{ className: t.props.commentDefaultList.length == 0 && t.props.commentField == "default" ? '' : 't-DN' },
+					{ className: t.props.commentDefaultList && t.props.commentDefaultList.length == 0 && t.props.commentField == "default" ? '' : 't-DN' },
 					_react2.default.createElement(
 						HBox,
 						{ className: 't-field-box' },

package/lib/process_info/processInfo.js

@@ -424,7 +424,11 @@ var PageHome = function (_React$Component) {
             commentBackAlert: [], //退回批示意见弹出
             showCommentBackAlert: true //显示退回批示意见弹出
         };
-        FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
+        try {
+            FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
+        } catch (error) {
+            alert("流程缺少扩展js，" + error);
+        }
 
         //处理特有参数
         if (typeof FlowCommon.dealwithCommonParam === "function") {

package/lib/selectMember/select.js

@@ -1517,15 +1517,28 @@ var Page = function (_React$Component) {
 
         for (var i = 0; i < politicalOutlookUserList.length; i++) {
           if (politicalOutlookUserList[i].isSameOrg == "1") {
-            if (!politicalOutlookUserList[i].checked) {
-              politicalOutlookUserList[i].checked = true;
-              total++;
-              selectPoliticalOutlookUserNum++;
+            if (navList[index].checkThisOrg) {
+              if (!politicalOutlookUserList[i].checked) {
+                politicalOutlookUserList[i].checked = true;
+                total++;
+                selectPoliticalOutlookUserNum++;
+              }
             } else {
-              politicalOutlookUserList[i].checked = false;
-              total--;
-              selectPoliticalOutlookUserNum--;
+              if (politicalOutlookUserList[i].checked) {
+                politicalOutlookUserList[i].checked = false;
+                total--;
+                selectPoliticalOutlookUserNum--;
+              }
             }
+            // if (!politicalOutlookUserList[i].checked) {
+            //   politicalOutlookUserList[i].checked = true;
+            //   total++;
+            //   selectPoliticalOutlookUserNum++;
+            // }else{
+            //   politicalOutlookUserList[i].checked = false;
+            //   total--;
+            //   selectPoliticalOutlookUserNum--;
+            // }
 
             var flag = true;
             for (var j = 0; j < selectUsers.length; j++) {

package/package.json

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