fmui-base 1.0.36 → 1.0.37

package/README.md

@@ -3,6 +3,7 @@
 ---
 
 ## 更新日志
+- 1.0.37：移动审批退回意见显示;级联字段功能实现;移动端选人组件适配pc新设置
 - 1.0.36：移动审批保存时不校验必填项;关联字段功能实现;移动端子表扩展功能开发
 - 1.0.35：流程支持CA加签验签问题修复
 - 1.0.34：退回流程支持上传附件;流程支持CA加签验签

package/lib/comment_list/List.js

@@ -294,7 +294,7 @@ var PageHome = function (_React$Component) {
         });
         return _react2.default.createElement(
           Box,
-          { style: { marginLeft: "auto" } },
+          { style: { marginLeft: "auto", "text-align": "right" } },
           _returnHtml
         );
       } else {

package/lib/form/form.js

@@ -584,6 +584,7 @@ var PageHome = function (_React$Component) {
           value = null;
         }
         itemParam.selectOptions = selectOptions;
+        itemParam.selectItem = selectOptions;
       } else if (itemType == 'checkbox') {
         //多选
         var selectItem = form.multiItems; //选项
@@ -614,6 +615,7 @@ var PageHome = function (_React$Component) {
           }
         }
         itemParam.selectOptions = selectOptions;
+        itemParam.selectItem = selectOptions;
       } else if (itemType == 'select') {
         //下拉选择
         var selectItem = form.multiItems; //选项
@@ -660,6 +662,7 @@ var PageHome = function (_React$Component) {
             value = null;
           }
           itemParam.selectOptions = selectOptions;
+          itemParam.selectItem = selectOptions;
         }
       } else if (itemType == 'datetime') {
         //时间
@@ -821,8 +824,15 @@ var PageHome = function (_React$Component) {
         var chooseWay = "checkbox";
         var scopeTable = "";
         if (form.popuserMap) {
-          popCode = form.popuserMap.chooseObj;
-          chooseWay = form.popuserMap.chooseWay;
+          if (form.popuserMap.popCode) {
+            //新的选人组件选项
+            popCode = form.popuserMap.popCode;
+            chooseWay = form.popuserMap.chooseWay;
+            itemParam.chooseObj = form.popuserMap.chooseObj;
+          } else {
+            popCode = form.popuserMap.chooseObj;
+            chooseWay = form.popuserMap.chooseWay;
+          }
           scopeTable = form.popuserMap.scopeTable;
         } else {
           popCode = "user";
@@ -983,6 +993,7 @@ var PageHome = function (_React$Component) {
         }
       }
 
+      itemParam = t.dealwithLinkField(itemParam);
       itemParam = t.dealwithRelaField(itemParam);
       if (itemType != 'weboffice') {
         itemParam.value = value;
@@ -1121,6 +1132,43 @@ var PageHome = function (_React$Component) {
       }
     }
 
+    //级联关联字段初始化
+
+  }, {
+    key: 'dealwithLinkField',
+    value: function dealwithLinkField(itemParam) {
+
+      var form = this.props.form;
+      if (form.multiItemsLinkField) {
+        var selectOptions = [];
+        form.multiItemsLinkField.map(function (item) {
+          var option = {};
+          option.value = item.value;
+          option.text = item.name;
+          selectOptions.push(option);
+        });
+        itemParam.selectOptions = selectOptions;
+      }
+      // var linkFieldArray = linkFields[itemParam.fieldId];
+      // if(linkFieldArray && linkFieldArray.length>0){
+      //   var triggerFormFields = "";
+      //   var conditionArrayJSON = [];
+      //   linkFieldArray.map(function(linkFieldArrayItem){
+      //     triggerFormFields+=","+linkFieldArrayItem.formField;
+      //     var option = {};
+      //     option.value = linkFieldArrayItem.value;
+      //     option.formField = linkFieldArrayItem.formField;
+      //     conditionArrayJSON.push(option);
+      //   });
+      //   if(triggerFormFields){
+      //     triggerFormFields = triggerFormFields.substring(1);
+      //   }
+
+
+      // }
+      return itemParam;
+    }
+
     //处理关联字段初始化
 
   }, {
@@ -2464,6 +2512,7 @@ var PageHome = function (_React$Component) {
                   label: t.state.itemParam.title,
                   placeholder: t.state.itemParam.placeholder ? t.state.itemParam.placeholder : '请选择',
                   code: t.state.itemParam.code,
+                  chooseObj: t.state.itemParam.chooseObj,
                   checkType: t.state.itemParam.checkType,
                   fieldDataValue: t.state.itemParam.value,
                   scopeTable: t.state.itemParam.scopeTable,

package/lib/form/subForm.js

@@ -656,7 +656,7 @@ var PageHome = function (_React$Component) {
             'div',
             { className: item.show ? "" : "t-DN" },
             item.form.map(function (item2, j) {
-              return _react2.default.createElement(_form2.default, { keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', module: t.state.module, formKey: item2.formKey, status: t.state.status, form: item2, formStyle: t.props.formStyle, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.props.formRelaFieldMaps, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i) });
+              return _react2.default.createElement(_form2.default, { keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', module: t.state.module, formKey: item2.formKey, status: t.state.status, form: item2, formStyle: t.props.formStyle, data: t.state.itemParam.value[i], fieldControll: t.state.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.props.formRelaFieldMaps, linkFields: t.props.linkFields, onChange: _this2.changeSub.bind(_this2, _this2.state.itemParam, i) });
             })
           )
         );

package/lib/form/table.js

@@ -84,9 +84,12 @@ var PageHome = function (_React$Component) {
 		var _this = _possibleConstructorReturn(this, (PageHome.__proto__ || Object.getPrototypeOf(PageHome)).call(this, props));
 
 		var defaultValue = props.defaultValue;
+		var status = props.status;
 		var formRelaField = props.formRelaField; //关联字段
+		var linkFields = props.allForm.linkFields; //级联字段
 		var formId = props.data.formId; //表单id
 
+		//关联字段
 		var formRelaFieldMapsNew = {};
 		if (formRelaField) {
 			$.ajax({
@@ -156,6 +159,51 @@ var PageHome = function (_React$Component) {
 			});
 		}
 
+		var linkFieldsNew = {};
+		// if(linkFields){
+		// 	linkFieldsNew
+		// 	linkFields.map(function(linkFieldsItem){
+		// 		if(linkFieldsItem.relaField){
+
+		// 			var linkFormField = linkFieldsItem.formField;
+
+		// 			var defaultValue = "";
+		// 			var key = "";
+		// 			var itemType = "";
+		// 			props.form.map(function(propsFormItem){
+		// 				if(propsFormItem.fieldId == linkFormField){
+		// 					defaultValue = propsItem.defaultValue;
+		// 					key = propsFormItem.itemCode;
+		// 					itemType = propsFormItem.itemType;
+		// 				}
+		// 			})
+		// 			if(status == 1 || status == 2 ){
+		// 				var mainTblData = props.data.mainTblData;//主表数据
+		// 				var subTbl = props.data.subTbl;//子表
+		// 				mainTblData.map(function(mainTblDataItem){
+		// 					if(mainTblDataItem.key == key){
+		// 						defaultValue = propsItem.defaultValue;
+		// 					}
+		// 				})
+		// 			}
+		// 			var linkFieldsObj = {};
+		// 			linkFieldsObj.formField = linkFormField;
+		// 			linkFieldsObj.value = defaultValue;
+
+		// 			var linkRelaFieldArray = linkFieldsNew[linkFieldsItem.relaField]; 
+		// 			if(linkRelaFieldArray && linkRelaFieldArray.length>0){
+		// 				linkRelaFieldArray.push(linkFieldsObj);
+		// 				linkFieldsNew[linkFieldsItem.relaField] = linkRelaFieldArray;
+		// 			}else{
+		// 				linkFieldsNew[linkFieldsItem.relaField] = [linkFieldsObj];
+		// 			}
+		// 		}
+		// 	})
+
+
+		// }
+
+
 		// let startUserName = decodeURI(this.props.params.startUserName);//创建人用户
 		// let startUserGroupName = decodeURI(this.props.params.startUserGroupName);//创建人组织
 		//let startUserId = this.props.params.startUserId;
@@ -177,7 +225,8 @@ var PageHome = function (_React$Component) {
 			phraseListNew: [],
 			phraseList: [], //常用语列表
 			spyj: defaultValue,
-			formRelaFieldMaps: formRelaFieldMapsNew
+			formRelaFieldMaps: formRelaFieldMapsNew,
+			linkFields: linkFieldsNew
 		};
 
 		var module = props.module && props.module != "undefined" ? props.module : "approve";
@@ -382,6 +431,7 @@ var PageHome = function (_React$Component) {
 				if (itemParam.itemType) {
 					var fieldId = itemParam.fieldId;
 					var linkFields = data.linkFields;
+					var formItem = data.formItem;
 					if (linkFields && linkFields != null) {
 						for (var i = 0; i < linkFields.length; i++) {
 							var formField = linkFields[i].formField;
@@ -390,12 +440,20 @@ var PageHome = function (_React$Component) {
 								var conditionArrayJSON = [];
 								if (formField.indexOf(fieldId) != -1) {
 									for (var j = 0; j < ffid.length; j++) {
-										for (var k = 0; k < mainTblData.length; k++) {
-											if (ffid[j] == mainTblData[k].fieldId) {
-												var option = {};
-												option.value = mainTblData[k].value;
-												option.formField = mainTblData[k].fieldId;
-												conditionArrayJSON.push(option);
+										var linkFormKey = "";
+										for (var f = 0; f < formItem.length; f++) {
+											if (ffid[j] == formItem[f].fieldId) {
+												linkFormKey = formItem[f].itemCode;
+											}
+										}
+										if (linkFormKey) {
+											for (var k = 0; k < mainTblData.length; k++) {
+												if (linkFormKey == mainTblData[k].key) {
+													var option = {};
+													option.value = mainTblData[k].value;
+													option.formField = ffid[j];
+													conditionArrayJSON.push(option);
+												}
 											}
 										}
 									}
@@ -411,48 +469,68 @@ var PageHome = function (_React$Component) {
 											var content = content['map'];
 											for (var key in content) {
 												var contentValue = content[key];
-												var textValue = '';
-												var selectOptions = [];
-												for (var c = 0; c < contentValue.length; c++) {
-													textValue = textValue + "," + contentValue[c];
-													var option = {};
-													option.value = contentValue[c];
-													option.text = contentValue[c];
-													selectOptions.push(option);
-												}
-												var resultMap = {};
-												resultMap.key = 'selectOptions';
-												resultMap.value = selectOptions;
-												var valueMap = {};
-												valueMap.key = 'value';
-												valueMap.value = textValue.substring(1);
-												for (var m = 0; m < mainTblData.length; m++) {
-													if (key == mainTblData[m].fieldId) {
-														if (",text,textarea,datetime,datetimeStep,".indexOf("," + mainTblData[m].itemType + ",") != -1) {
-															t.refs[mainTblData[m].uniqueName].reloadItemParam([valueMap]);
-															mainTblData[m].value = textValue.substring(1);
-														}
 
-														if (",radio,checkbox,select,".indexOf("," + mainTblData[m].itemType + ",") != -1) {
-															var valueMap1 = {};
-															valueMap1.key = 'value';
-															valueMap1.value = "";
-															mainTblData[m].value = "";
-															var tva = textValue.substring(1);
-															if (containUniqueFlag == true) {
-																valueMap1.value = tva;
-																mainTblData[m].value = tva;
-															} else {
-																var formItem = data.formItem;
-																for (var f = 0; f < formItem.length; f++) {
-																	if (formItem[f].uniqueName == mainTblData[m].uniqueName && formItem[f].value == tva) {
-																		valueMap1.value = tva;
-																		mainTblData[m].value = tva;
-																		break;
+												var linkFormKey = "";
+												var linkFormType = "";
+												for (var f = 0; f < formItem.length; f++) {
+													if (key == formItem[f].fieldId) {
+														linkFormKey = formItem[f].itemCode;
+														linkFormType = formItem[f].itemType;
+													}
+												}
+												if (linkFormKey) {
+													for (var m = 0; m < mainTblData.length; m++) {
+														if (linkFormKey == mainTblData[m].key) {
+															var relateItemParam = t.refs[mainTblName + "_" + mainTblData[m].key].getItemParam();
+															if (",text,textarea,datetime,datetimeStep,".indexOf("," + linkFormType + ",") != -1) {
+																var textValue = '';
+																var valueMap = {};
+																valueMap.key = 'value';
+																for (var c = 0; c < contentValue.length; c++) {
+																	textValue = textValue + "," + contentValue[c];
+																}
+																valueMap.value = textValue.substring(1);
+
+																t.refs[mainTblName + "_" + mainTblData[m].key].reloadItemParam([valueMap]);
+																mainTblData[m].value = textValue.substring(1);
+															} else if (",radio,checkbox,select,".indexOf("," + linkFormType + ",") != -1) {
+																var textValue = '';
+																var resultMap = {};
+																resultMap.key = 'selectOptions';
+
+																var selectOptions = [];
+																for (var c = 0; c < contentValue.length; c++) {
+																	textValue = textValue + "," + contentValue[c];
+																	var option = {};
+																	relateItemParam.selectItem.map(function (selectItemObj) {
+																		if (selectItemObj.value == contentValue[c]) {
+																			option.value = contentValue[c];
+																			option.text = selectItemObj.text;
+																			selectOptions.push(option);
+																		}
+																	});
+																}
+																resultMap.value = selectOptions;
+
+																var valueMap1 = {};
+																valueMap1.key = 'value';
+																valueMap1.value = "";
+																mainTblData[m].value = "";
+																var tva = textValue.substring(1);
+																if (containUniqueFlag == true) {
+																	valueMap1.value = tva;
+																	mainTblData[m].value = tva;
+																} else {
+																	for (var f = 0; f < formItem.length; f++) {
+																		if (formItem[f].itemCode == mainTblData[m].key && formItem[f].value == tva) {
+																			valueMap1.value = tva;
+																			mainTblData[m].value = tva;
+																			break;
+																		}
 																	}
 																}
+																t.refs[mainTblName + "_" + mainTblData[m].key].reloadItemParam([resultMap, valueMap1]);
 															}
-															t.refs[mainTblData[m].uniqueName].reloadItemParam([resultMap, valueMap1]);
 														}
 													}
 												}
@@ -1222,16 +1300,16 @@ var PageHome = function (_React$Component) {
 							return _react2.default.createElement(
 								'div',
 								null,
-								_react2.default.createElement(_form2.default, { keyNo: j, ref: item.uniqueName, 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: item2, 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, onChange: this.change.bind(this) })
+								_react2.default.createElement(_form2.default, { keyNo: j, ref: item.uniqueName, 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: item2, 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)) : item.itemType == 'detail' ? _react2.default.createElement(
 							'div',
 							null,
-							_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, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, 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, 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) })
 						) : _react2.default.createElement(
 							'div',
 							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, 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, 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, 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(
 						'div',

package/lib/process_info/processInfo.js

@@ -86,6 +86,10 @@ var _select = require('../selectMember/select');
 
 var _select2 = _interopRequireDefault(_select);
 
+var _List = require('../comment_list/List');
+
+var _List2 = _interopRequireDefault(_List);
+
 var _upload = require('../upload/upload');
 
 var _upload2 = _interopRequireDefault(_upload);
@@ -398,7 +402,9 @@ var PageHome = function (_React$Component) {
             spyj: newComment,
             caIsPrd: "", //CA的种类，1是系统，0是扩展
             preCaFields: "", //上一个办理节点ca验签字段
-            formRelaField: "" //流程关联字段
+            formRelaField: "", //流程关联字段
+            commentBackAlert: [], //退回批示意见弹出
+            showCommentBackAlert: true //显示退回批示意见弹出
         };
         FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
@@ -986,6 +992,29 @@ var PageHome = function (_React$Component) {
                     //上一个办理节点ca验签字段
                     var preCaFields = content.preCaFields;
 
+                    var commentBackAlert = [];
+                    if (content.details) {
+                        var commentBackDetails = content.details;
+                        commentBackDetails.type = "text";
+                        commentBackDetails.inscriptionShow = "userName,date";
+                        commentBackDetails.userName = commentBackDetails.dealName;
+                        commentBackDetails.time = commentBackDetails.dealTime;
+                        commentBackDetails.fullMessage = commentBackDetails.operationDetails;
+                        commentBackAlert.push(commentBackDetails);
+                    }
+                    //退回意见弹框
+                    // var commentBackAlert = [{
+                    //     "type":"text",
+                    //     "inscriptionShow":"userName,date",
+                    //     "userName" : "赵玉海",
+                    //     "time" : "2023-05-10 11:13:10",
+                    //     "fullMessage" : "测试一下退回",
+                    //     "showType" : "1",
+                    //     "attachId" : "4028818f8803a0ab018803a5dd570058",
+                    //     "taskId" : "1357595",
+                    //     "attachStr" : "{\"id\":\"4028818f8803a0ab018803a5dd570058\",\"dingSpaceId\":\"null\",\"url\":\"/attachment/download?fid=4028818f8803a0ab018803a5dd570058&chksum=64809a58e7ebee3b8b4b4fbcbc1e4dd4.2c93ab0a83bbec6b0183c109bc6a51dd\",\"name\":\"数据安全中心.png\",\"checksum\":\"64809a58e7ebee3b8b4b4fbcbc1e4dd4.2c93ab0a83bbec6b0183c109bc6a51dd\",\"fileExt\":\".png\",\"fileName\":\"e9190147e4b74a05a86d9155afbb61ad.png\",\"relativePath\":\"approve/202305\",\"secretLevel\":\"0\",\"size\":\"28962\"}"
+                    //   }];
+
                     for (var i = 0; i < commentList.length; i++) {
                         var commentItem = commentList[i];
                         if (commentItem.type == 'text4' && commentItem.fullMessage.trim() == '') {
@@ -1133,6 +1162,7 @@ var PageHome = function (_React$Component) {
                         handleUserDingId: handleUserDingId,
                         commentDefaultList: commentDefaultList,
                         commentBackList: commentBackList,
+                        commentBackAlert: commentBackAlert,
                         commentFieldList: commentFieldList,
                         defaultValue: defaultValue,
                         commentId: commentId,
@@ -6070,9 +6100,26 @@ var PageHome = function (_React$Component) {
                 }
             });
         }
+
+        //获取退回意见弹出层
+
+    }, {
+        key: 'getCommentBackAlertContent',
+        value: function getCommentBackAlertContent() {
+            _Dialog2.default.alert({
+                title: '测试',
+
+                content: '我是 Dialog.alert 的调用',
+                onConfirm: function onConfirm() {
+                    console.log('alert confirm');
+                }
+            });
+        }
     }, {
         key: 'render',
         value: function render() {
+            var _this3 = this;
+
             var isReadOnly = false;
             var t = this;
             return _react2.default.createElement(
@@ -6107,6 +6154,22 @@ var PageHome = function (_React$Component) {
                 _react2.default.createElement(
                     'div',
                     { className: this.state.errorMsg == '任务不存在' || this.state.errorMsg == '' ? "t-DN" : 'page-add' },
+                    this.state.commentBackAlert.length > 0 ? _react2.default.createElement(
+                        _Dialog2.default,
+                        {
+                            key: 'd-alert',
+                            title: '\u9000\u56DE\u539F\u56E0',
+                            show: this.state.showCommentBackAlert,
+                            onConfirm: function onConfirm() {
+                                _this3.setState({ showCommentBackAlert: false });
+                            }
+                        },
+                        _react2.default.createElement(
+                            'div',
+                            { style: { "text-align": "left" } },
+                            _react2.default.createElement(_List2.default, { list: t.state.commentBackAlert })
+                        )
+                    ) : "",
                     _react2.default.createElement(
                         'div',
                         { className: this.state.pageStatus == '0' ? '' : 't-DN' },

package/lib/selectMember/select.js

@@ -287,7 +287,13 @@ var Page = function (_React$Component) {
   }, {
     key: 'getRealCode',
     value: function getRealCode() {
-      var code = this.props.code;
+      var chooseObj = this.props.chooseObj;
+      var code = "";
+      if (chooseObj) {
+        code = this.props.chooseObj;
+      } else {
+        code = this.props.code;
+      }
       var showSecret = this.props.showSecret;
       if (showSecret) {
         //开启定密  只能选择用户
@@ -302,6 +308,9 @@ var Page = function (_React$Component) {
       } else if (code.indexOf(",dep,") >= 0) {
         code = code.replace(",dep,", ",org,");
       }
+      // if(code.indexOf(",userNotOrg,org,")>=0){
+      //   code = code.replace(",userNotOrg,org,", ",userAndOrg,");
+      // }
       if (code != "" && code != null && code != undefined) {
         code = code.substring(1, code.length - 1);
       }
@@ -310,8 +319,14 @@ var Page = function (_React$Component) {
   }, {
     key: 'getOrgType',
     value: function getOrgType() {
-      var code = this.props.code;
       var orgType = "";
+      var chooseObj = this.props.chooseObj;
+      var code = "";
+      if (chooseObj) {
+        code = this.props.chooseObj;
+      } else {
+        code = this.props.code;
+      }
       if (code.indexOf("inst") >= 0 && code.indexOf("dep") >= 0) {
         orgType = "";
       } else if (code.indexOf("inst") >= 0) {
@@ -319,6 +334,7 @@ var Page = function (_React$Component) {
       } else if (code.indexOf("dep") >= 0) {
         orgType = "3";
       }
+
       return orgType;
     }
 
@@ -327,45 +343,79 @@ var Page = function (_React$Component) {
   }, {
     key: 'getChooseType',
     value: function getChooseType() {
+      var chooseObj = this.props.chooseObj;
       var chooseType = this.props.chooseType;
       var code = this.getRealCode();
       if (code == null || code == undefined) {
         code = "";
       }
+
       if (chooseType == null || chooseType == undefined || chooseType == "") {
         chooseType = "";
-        if (code.indexOf("user") >= 0 && code.indexOf("org") >= 0) {
-          chooseType = "userAndOrg";
-        } else if (code.indexOf("user") >= 0 && code.indexOf("org") < 0) {
-          chooseType = "userNotOrg";
-        } else if (code.indexOf("user") < 0 && code.indexOf("org") >= 0) {
-          chooseType = "org";
-        } else {
-          chooseType = "";
-        }
-        if (code.indexOf("group") >= 0) {
-          if (chooseType == "") {
-            chooseType += "group";
+
+        if (chooseObj) {
+          // code = this.props.chooseObj;
+          if (code.indexOf("userNotOrg") >= 0 && code.indexOf("org") >= 0) {
+            chooseType = "userAndOrg";
+          } else if (code.indexOf("userNotOrg") >= 0 && code.indexOf("org") < 0) {
+            chooseType = "userNotOrg";
+          } else if (code.indexOf("userNotOrg") < 0 && code.indexOf("org") >= 0) {
+            chooseType = "org";
           } else {
+            chooseType = "";
+          }
+
+          if (code.indexOf("userAndGroup") >= 0) {
+            chooseType += ",userAndGroup";
+          } else if (code.indexOf("userNotGroup") >= 0) {
+            chooseType += ",userNotGroup";
+          } else if (code.indexOf("group") >= 0) {
             chooseType += ",group";
           }
-        }
-        if (code.indexOf("personGroup") >= 0) {
-          if (chooseType == "") {
-            chooseType += "personGroup";
-            if (this.state.personalGroupUserList.length > 0) {
-              chooseType += ",userNotPersonGroup";
-            }
-          } else {
+          if (code.indexOf("userAndPersonGroup") >= 0) {
+            chooseType += ",userAndPersonGroup";
+          } else if (code.indexOf("userNotPersonGroup") >= 0) {
+            chooseType += ",userNotPersonGroup";
+          } else if (code.indexOf("personGroup") >= 0) {
             chooseType += ",personGroup";
-            if (this.state.personalGroupUserList.length > 0) {
-              chooseType += ",userNotPersonGroup";
-            }
           }
         } else {
-          chooseType += "";
+          // code = this.props.code;
+          if (code.indexOf("user") >= 0 && code.indexOf("org") >= 0) {
+            chooseType = "userAndOrg";
+          } else if (code.indexOf("user") >= 0 && code.indexOf("org") < 0) {
+            chooseType = "userNotOrg";
+          } else if (code.indexOf("user") < 0 && code.indexOf("org") >= 0) {
+            chooseType = "org";
+          } else {
+            chooseType = "";
+          }
+
+          if (code.indexOf("group") >= 0) {
+            if (chooseType == "") {
+              chooseType += "group";
+            } else {
+              chooseType += ",group";
+            }
+          }
+          if (code.indexOf("personGroup") >= 0) {
+            if (chooseType == "") {
+              chooseType += "personGroup";
+              if (this.state.personalGroupUserList.length > 0) {
+                chooseType += ",userNotPersonGroup";
+              }
+            } else {
+              chooseType += ",personGroup";
+              if (this.state.personalGroupUserList.length > 0) {
+                chooseType += ",userNotPersonGroup";
+              }
+            }
+          } else {
+            chooseType += "";
+          }
         }
       }
+
       return chooseType;
     }
 
@@ -2160,7 +2210,7 @@ var Page = function (_React$Component) {
       if (canUse == "1") {
         if (checked) {
           if (checkType == "radio") {
-            if (selectData.length == 0) {
+            if (selectData.length == 0 && total == 0) {
               total++;
             }
             selectNum = 1;
@@ -2291,12 +2341,15 @@ var Page = function (_React$Component) {
       var checkType = this.props.checkType;
       var chooseType = this.getChooseType();
       var scopeList = this.state.scopeList;
+      var selectedList = t.state.selectedList;
+      if (checkType == "radio") {
+        t.clearSelectedList(selectedList);
+      }
       if ("common" == type) {
         var commonUsedData = t.state.commonUsedData;
         var common = commonUsedData[index];
         var total = t.state.total;
         var selectCommonNum = t.state.selectCommonNum;
-        var selectedList = t.state.selectedList;
         if (common.checked == true) {
           commonUsedData[index].checked = false;
         } else {
@@ -2352,7 +2405,6 @@ var Page = function (_React$Component) {
         userList[index].checked = !userList[index].checked;
         var total = t.state.total;
         var selectUserNum = t.state.selectUserNum; //当前组织下选中的用户数量
-        var selectedList = t.state.selectedList;
         var selectUsers = selectedList.selectUsers;
         if (selectUsers == null || selectUsers == undefined) {
           selectUsers = [];
@@ -2382,7 +2434,6 @@ var Page = function (_React$Component) {
         orgList[index].checked = !orgList[index].checked;
         var total = t.state.total;
         var selectOrgNum = t.state.selectOrgNum; //当前组织下选中的用户数量
-        var selectedList = t.state.selectedList;
         var selectOrgs = selectedList.selectOrgs;
         if (selectOrgs == null || selectOrgs == undefined) {
           selectOrgs = [];
@@ -2420,7 +2471,6 @@ var Page = function (_React$Component) {
         orgUserList[index].checked = !orgUserList[index].checked;
         var total = t.state.total;
         var selectOrgUserNum = t.state.selectOrgUserNum; //当前组织下选中的用户数量
-        var selectedList = t.state.selectedList;
         var selectUsers = selectedList.selectUsers;
         if (selectUsers == null || selectUsers == undefined) {
           selectUsers = [];
@@ -2459,7 +2509,6 @@ var Page = function (_React$Component) {
         roleList[index].checked = !roleList[index].checked;
         var total = t.state.total;
         var selectRoleNum = t.state.selectRoleNum; //当前组织下选中的用户数量
-        var selectedList = t.state.selectedList;
         var selectRoles = selectedList.selectRoles;
         if (selectRoles == null || selectRoles == undefined) {
           selectRoles = [];
@@ -2489,7 +2538,6 @@ var Page = function (_React$Component) {
         stationList[index].checked = !stationList[index].checked;
         var total = t.state.total;
         var selectStaNum = t.state.selectStaNum; //当前组织下选中的用户数量
-        var selectedList = t.state.selectedList;
         var selectStations = selectedList.selectStations;
         if (selectStations == null || selectStations == undefined) {
           selectStations = [];
@@ -2520,7 +2568,6 @@ var Page = function (_React$Component) {
         groupList[index].checked = !groupList[index].checked;
         var total = t.state.total;
         var selectGroupNum = t.state.selectGroupNum; //当前组织下选中的用户数量
-        var selectedList = t.state.selectedList;
         var selectGroups = selectedList.selectGroups;
         if (selectGroups == null || selectGroups == undefined) {
           selectGroups = [];
@@ -2557,7 +2604,6 @@ var Page = function (_React$Component) {
         groupUserList[index].checked = !groupUserList[index].checked;
         var total = t.state.total;
         var selectGroupUserNum = t.state.selectGroupUserNum; //当前组织下选中的用户数量
-        var selectedList = t.state.selectedList;
         var selectUsers = selectedList.selectUsers;
         if (selectUsers == null || selectUsers == undefined) {
           selectUsers = [];
@@ -2596,7 +2642,6 @@ var Page = function (_React$Component) {
         personalGroupList[index].checked = !personalGroupList[index].checked;
         var total = t.state.total;
         var selectPersonalGroupNum = t.state.selectPersonalGroupNum;
-        var selectedList = t.state.selectedList;
         var selectPersonalGroups = selectedList.selectPersonalGroups;
         if (selectPersonalGroups == null || selectPersonalGroups == undefined) {
           selectPersonalGroups = [];
@@ -2633,7 +2678,6 @@ var Page = function (_React$Component) {
         personalGroupUserList[index].checked = !personalGroupUserList[index].checked;
         var total = t.state.total;
         var selectPersonalGroupUserNum = t.state.selectPersonalGroupUserNum; //当前组织下选中的用户数量
-        var selectedList = t.state.selectedList;
         var selectUsers = selectedList.selectUsers;
         if (selectUsers == null || selectUsers == undefined) {
           selectUsers = [];
@@ -2670,6 +2714,19 @@ var Page = function (_React$Component) {
       }
     }
 
+    //清空已选
+
+  }, {
+    key: 'clearSelectedList',
+    value: function clearSelectedList(selectedList) {
+      selectedList.selectGroups = [];
+      selectedList.selectOrgs = [];
+      selectedList.selectPersonalGroups = [];
+      selectedList.selectRoles = [];
+      selectedList.selectStations = [];
+      selectedList.selectUsers = [];
+    }
+
     //查看已选或返回选择页面
 
   }, {
@@ -3397,7 +3454,12 @@ var Page = function (_React$Component) {
     value: function getSelectData() {
       var code = this.getRealCode().split(",");
       var type = code[0];
-      if (type == "user") {
+      var realUserCode = "user";
+      var chooseObj = this.props.chooseObj;
+      if (chooseObj) {
+        realUserCode = "userNotOrg";
+      }
+      if (type == realUserCode) {
         type = "org";
       }
       var t = this;
@@ -3745,7 +3807,12 @@ var Page = function (_React$Component) {
     value: function getSelectMyOrgData() {
       var code = this.getRealCode().split(",");
       var type = code[0];
-      if (type == "user") {
+      var realUserCode = "user";
+      var chooseObj = this.props.chooseObj;
+      if (chooseObj) {
+        realUserCode = "userNotOrg";
+      }
+      if (type == realUserCode) {
         type = "org";
       }
       var t = this;
@@ -4922,30 +4989,37 @@ var Page = function (_React$Component) {
           selectGroups = selectedList.selectGroups,
           selectPersonalGroups = selectedList.selectPersonalGroups;
       var isRadio = t.props.checkType == 'radio' ? true : false;
-      var propsCode = this.getRealCode();
-      if (propsCode == undefined || propsCode == null) {
-        propsCode = "user";
-      }
-      var selectCode = propsCode.split(",");
-      var userIndex = -1,
-          orgIndex = -1;
-      for (var i = 0; i < selectCode.length; i++) {
-        if (selectCode[i] == "user") {
-          userIndex = i;
-        } else if (selectCode[i] == "org") {
-          orgIndex = i;
+
+      var chooseObj = this.props.chooseObj;
+      var getOrgType = this.getOrgType();
+      if (chooseObj) {
+        selectCode = t.props.code.split(",");
+      } else {
+        var propsCode = this.getRealCode();
+        if (propsCode == undefined || propsCode == null) {
+          propsCode = "user";
+        }
+        var selectCode = propsCode.split(",");
+        var userIndex = -1,
+            orgIndex = -1;
+        for (var i = 0; i < selectCode.length; i++) {
+          if (selectCode[i] == "user") {
+            userIndex = i;
+          } else if (selectCode[i] == "org") {
+            orgIndex = i;
+          }
+        }
+        if (userIndex >= 0 && orgIndex >= 0) {
+          //存在user,org
+          selectCode.splice(userIndex, 1);
+        } else if (userIndex >= 0 && orgIndex < 0) {
+          //存在user,不存在org
+          selectCode[userIndex] = "org";
         }
       }
-      if (userIndex >= 0 && orgIndex >= 0) {
-        //存在user,org
-        selectCode.splice(userIndex, 1);
-      } else if (userIndex >= 0 && orgIndex < 0) {
-        //存在user,不存在org
-        selectCode[userIndex] = "org";
-      }
       var chooseType = this.getChooseType();
       var orgTitle = "组织";
-      if (chooseType.indexOf("userNotOrg") >= 0) {
+      if (chooseType.indexOf("userNotOrg") >= 0 && chooseType.indexOf("org") < 0) {
         orgTitle = "用户";
       }
       var navList = this.state.navUserList;
@@ -5581,12 +5655,12 @@ var Page = function (_React$Component) {
                           { className: 't-PL16 t-PR10', onClick: function onClick() {
                               t.checkItemMember(index, "org");
                             } },
-                          _react2.default.createElement(
+                          getOrgType == "" || getOrgType == "2" && (org.orgType == '2' || org.orgType == '1') || getOrgType == "3" && org.orgType == '3' ? _react2.default.createElement(
                             'div',
                             {
-                              className: org.canUse == '0' ? 't-checkbox-field-icon-list disabled' : org.checked ? 't-checkbox-field-icon-list checked' : 'un-checked t-checkbox-field-icon-list' },
+                              className: org.canUse == '0' ? 't-checkbox-field-icon-list disabled' : org.checked ? 't-checkbox-field-icon-list checked' + (isRadio ? ' t-list-cricle' : '') : 'un-checked t-checkbox-field-icon-list' + (isRadio ? ' t-list-cricle' : '') },
                             _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
-                          )
+                          ) : ""
                         ),
                         _react2.default.createElement(
                           Box,
@@ -5758,7 +5832,7 @@ var Page = function (_React$Component) {
                           null,
                           _react2.default.createElement(
                             'div',
-                            { className: role.checked ? 't-checkbox-field-icon-list checked' : 'un-checked t-checkbox-field-icon-list' },
+                            { className: role.checked ? 't-checkbox-field-icon-list checked' + (isRadio ? ' t-list-cricle' : '') : 'un-checked t-checkbox-field-icon-list' + (isRadio ? ' t-list-cricle' : '') },
                             _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
                           )
                         ),
@@ -5932,7 +6006,7 @@ var Page = function (_React$Component) {
                           } },
                         _react2.default.createElement(
                           'div',
-                          { className: station.canUse == '0' ? 't-checkbox-field-icon-list disabled' : station.checked ? 't-checkbox-field-icon-list checked' : 'un-checked t-checkbox-field-icon-list' },
+                          { className: station.canUse == '0' ? 't-checkbox-field-icon-list disabled' : station.checked ? 't-checkbox-field-icon-list checked' + (isRadio ? ' t-list-cricle' : '') : 'un-checked t-checkbox-field-icon-list' + (isRadio ? ' t-list-cricle' : '') },
                           _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
                         )
                       ),
@@ -6089,7 +6163,7 @@ var Page = function (_React$Component) {
                             } },
                           _react2.default.createElement(
                             'div',
-                            { className: group.canUse == '0' ? 't-checkbox-field-icon-list disabled' : group.checked ? 't-checkbox-field-icon-list checked' : 'un-checked t-checkbox-field-icon-list' },
+                            { className: group.canUse == '0' ? 't-checkbox-field-icon-list disabled' : group.checked ? 't-checkbox-field-icon-list checked' + (isRadio ? ' t-list-cricle' : '') : 'un-checked t-checkbox-field-icon-list' + (isRadio ? ' t-list-cricle' : '') },
                             _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
                           )
                         ) : "",
@@ -6151,7 +6225,7 @@ var Page = function (_React$Component) {
                         { className: 't-PL16 t-PR10' },
                         _react2.default.createElement(
                           'div',
-                          { className: user.canUse == '0' ? 't-checkbox-field-icon-list disabled' : user.checked ? 't-checkbox-field-icon-list checked' : 'un-checked t-checkbox-field-icon-list' },
+                          { className: user.canUse == '0' ? 't-checkbox-field-icon-list disabled' : user.checked ? 't-checkbox-field-icon-list checked' + (isRadio ? ' t-list-cricle' : '') : 'un-checked t-checkbox-field-icon-list' + (isRadio ? ' t-list-cricle' : '') },
                           _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
                         )
                       ),
@@ -6306,7 +6380,7 @@ var Page = function (_React$Component) {
                             } },
                           _react2.default.createElement(
                             'div',
-                            { className: personGroup.canUse == '0' ? 't-checkbox-field-icon-list disabled' : personGroup.checked ? 't-checkbox-field-icon-list checked' : 'un-checked t-checkbox-field-icon-list' },
+                            { className: personGroup.canUse == '0' ? 't-checkbox-field-icon-list disabled' : personGroup.checked ? 't-checkbox-field-icon-list checked' + (isRadio ? ' t-list-cricle' : '') : 'un-checked t-checkbox-field-icon-list' + (isRadio ? ' t-list-cricle' : '') },
                             _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
                           )
                         ) : "",
@@ -6368,7 +6442,7 @@ var Page = function (_React$Component) {
                         { className: 't-PL16 t-PR10' },
                         _react2.default.createElement(
                           'div',
-                          { className: user.canUse == '0' ? 't-checkbox-field-icon-list disabled' : user.checked ? 't-checkbox-field-icon-list checked' : 'un-checked t-checkbox-field-icon-list' },
+                          { className: user.canUse == '0' ? 't-checkbox-field-icon-list disabled' : user.checked ? 't-checkbox-field-icon-list checked' + (isRadio ? ' t-list-cricle' : '') : 'un-checked t-checkbox-field-icon-list' + (isRadio ? ' t-list-cricle' : '') },
                           _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
                         )
                       ),
@@ -6510,7 +6584,7 @@ var Page = function (_React$Component) {
                           null,
                           _react2.default.createElement(
                             'div',
-                            { className: user.checked ? 't-checkbox-field-icon-list checked' : 'un-checked t-checkbox-field-icon-list' },
+                            { className: user.checked ? 't-checkbox-field-icon-list checked' + (isRadio ? ' t-list-cricle' : '') : 'un-checked t-checkbox-field-icon-list' + (isRadio ? ' t-list-cricle' : '') },
                             _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
                           )
                         ),
@@ -6949,7 +7023,12 @@ var Page = function (_React$Component) {
                 //this.getSelectData();
                 var code = _this5.getRealCode().split(",");
                 var type = code[0];
-                if (type == "user" || type == "org") {
+                var realUserCode = "user";
+                var chooseObj = _this5.props.chooseObj;
+                if (chooseObj) {
+                  realUserCode = "userNotOrg";
+                }
+                if (type == realUserCode || type == "org") {
                   //获取当前用户信息
                   _this5.getSelectMyOrgData();
                 } else {

package/package.json

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