fmui-base 1.0.38 → 1.0.40

package/README.md

@@ -3,6 +3,8 @@
 ---
 
 ## 更新日志
+- 1.0.40：修复审批验签重复问题;
+- 1.0.39：移动审批扩展;选人组件问题修复
 - 1.0.38：移动审批自动通过;选人组件增加政治面貌和职务
 - 1.0.37：移动审批退回意见显示;级联字段功能实现;移动端选人组件适配pc新设置
 - 1.0.36：移动审批保存时不校验必填项;关联字段功能实现;移动端子表扩展功能开发

package/lib/comment_list/List.js

@@ -108,10 +108,12 @@ var PageHome = function (_React$Component) {
         _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{
@@ -268,33 +270,33 @@ var PageHome = function (_React$Component) {
           { className: 't-PR5' },
           item.orgShowName
         );
-        var signPicHtml = _react2.default.createElement('img', { className: 't-H64 t-W64 t-PR5', src: t.state.loadImg + item.signPic });
+        var signPicHtml = item.signPic ? _react2.default.createElement('img', { className: 't-H64 t-W64 t-PR5', src: t.state.loadImg + item.signPic }) : "";
         var taskNameHtml = _react2.default.createElement(
           'span',
           { className: 't-PR5' },
           item.taskName
         );
         var inscriptionShowArray = item.inscriptionShow.split(",");
-        var _returnHtml = inscriptionShowArray.map(function (item) {
-          if (item) {
-            if (item == "userName") {
+        var _returnHtml = inscriptionShowArray.map(function (inscriptionItem) {
+          if (inscriptionItem) {
+            if (inscriptionItem == "userName" && (item.inscriptionShow.indexOf("signImg") < 0 || item.inscriptionShow.indexOf("signImg") >= 0 && (typeof item.signPic == 'undefined' || item.signPic == null || item.signPic == ""))) {
               return userNameHtml;
-            } else if (item == "date") {
+            } else if (inscriptionItem == "date") {
               return dateHtml;
-            } else if (item == "time") {
+            } else if (inscriptionItem == "time") {
               return timeHtml;
-            } else if (item == "org") {
+            } else if (inscriptionItem == "org") {
               return orgNameHtml;
-            } else if (item == "signImg") {
+            } else if (inscriptionItem == "signImg") {
               return signPicHtml;
-            } else if (item == "taskName") {
+            } else if (inscriptionItem == "taskName") {
               return taskNameHtml;
             }
           }
         });
         return _react2.default.createElement(
           Box,
-          { style: { marginLeft: "auto", "text-align": "right" } },
+          { style: { marginLeft: "auto", "text-align": "right", width: '100%' } },
           _returnHtml
         );
       } else {
@@ -312,13 +314,13 @@ var PageHome = function (_React$Component) {
           return _react2.default.createElement(
             VBox,
             { className: 't-PB10 t-LH1_5 t-field t-FS14 t-PL10' },
-            item.type.indexOf('image') < 0 ? _react2.default.createElement(Box, { className: 't-FS16', dangerouslySetInnerHTML: { __html: item.fullMessage == null ? "" : item.fullMessage.replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/ /g, '&nbsp;') } }) : item.fullMessage == '' ? _react2.default.createElement(
+            item.type.indexOf('image') < 0 ? _react2.default.createElement(Box, { className: 't-FS16 t-PR16', dangerouslySetInnerHTML: { __html: item.fullMessage == null ? "" : item.fullMessage.replace(/\r\n/g, '<br/>').replace(/\n/g, '<br/>').replace(/ /g, '&nbsp;') } }) : item.fullMessage == '' ? _react2.default.createElement(
               Box,
               null,
               '\'\''
             ) : _react2.default.createElement(
               HBox,
-              null,
+              { className: 't-PR16' },
               _react2.default.createElement('img', { width: '100%', height: '128', src: t.state.loadImg + item.fullMessage })
             ),
             _react2.default.createElement(
@@ -361,7 +363,14 @@ var PageHome = function (_React$Component) {
                 );
               }) : ""
             ),
-            item.inscriptionShow ? t.getCommentSign(item) : ""
+            _react2.default.createElement(
+              Box,
+              { vAlign: 'start', hAlign: 'end', id: 'commentSign-' + item.id, className: 't-FBH t-PR16' },
+              ' ',
+              item.inscriptionShow ? t.getCommentSign(item) : "",
+              _react2.default.createElement('i', { id: item.id + "_sucess", className: 'iconfont icon-checked t-PT10 t-PL3', style: { color: 'green', display: 'none' } }),
+              _react2.default.createElement('i', { id: item.id + "_fail", className: 'iconfont icon-close t-PT10 t-PL3', style: { color: 'red', display: 'none' } })
+            )
           );
         }) : ''
       );

package/lib/comment_list/List.less

@@ -1,3 +1,6 @@
 .t-PR5 {
   padding-right: 5px;
 }
+.t-FBH.flex-comment.t-field-box{
+  padding-right:0px;
+}

package/lib/form/form.js

@@ -526,8 +526,8 @@ var PageHome = function (_React$Component) {
         itemParam.decimalPlace = form.decimalPlace; //小数位数
         itemParam.dataAttr = form['dataAttr'];
         itemParam.maxlength = form['length'];
-        /*if(itemParam.dataAttr){
-          alert("265====="+itemParam.dataAttr.textLineFeed);
+        /*if(itemParam.dataAttr){
+          alert("265====="+itemParam.dataAttr.textLineFeed);
         }*/
         var calculateExpList = data.calculateExpList; //计算公式列表
         var calculateExp = form.calculateExp; //计算公式
@@ -554,6 +554,16 @@ var PageHome = function (_React$Component) {
           }
           data.calculateExpList = calculateExpList;
         }
+
+        //todo 百分位千分位
+        // if(itemParam.dataAttr){
+        //   var type = itemParam.dataAttr.dataSrc;
+        //   if(type == "1"){
+        //     value = parseFloat(value)*100+"%";
+        //   }else if(type == "2"){
+        //     value = this.toThousands(parseFloat(value));
+        //   }
+        // }
       } else if (itemType == 'textarea') {
         //多行
         itemParam.maxlength = form['length'];
@@ -568,15 +578,17 @@ var PageHome = function (_React$Component) {
         if (selectItem) {
           if (selectItem.length > 0) {
             selectItem.map(function (item) {
-              var option = {};
-              option.value = item.value;
-              option.text = item.name;
-              // if(status != '0'){
-              if (value == item.value) {
-                value = { value: value, text: item.name };
+              if (typeof item.state == 'undefined' || item.state == "1" || item.state == "0" && readOnly == true) {
+                var option = {};
+                option.value = item.value;
+                option.text = item.name;
+                // if(status != '0'){
+                if (value == item.value) {
+                  value = { value: value, text: item.name };
+                }
+                // }
+                selectOptions.push(option);
               }
-              // }
-              selectOptions.push(option);
             });
           }
         }
@@ -593,24 +605,30 @@ var PageHome = function (_React$Component) {
           var valueArray = [];
           //if(status != '0'){
           if (value != 0 && value) {
-            valueArray = value.split(",");
+            if (value.indexOf("[") >= 0) {
+              valueArray = JSON.parse(value);
+            } else {
+              valueArray = value.split(",");
+            }
           }
           // }
           if (selectItem.length > 0) {
             selectItem.map(function (item) {
-              var option = {};
-              option.value = item.value;
-              option.text = item.name;
-              option.disable = false;
-              option.checked = false;
-              if (valueArray.length > 0) {
-                for (var i = 0; i < valueArray.length; i++) {
-                  if (valueArray[i] == item.value) {
-                    option.checked = true;
+              if (typeof item.state == 'undefined' || item.state == "1" || item.state == "0" && readOnly == true) {
+                var option = {};
+                option.value = item.value;
+                option.text = item.name;
+                option.disable = false;
+                option.checked = false;
+                if (valueArray.length > 0) {
+                  for (var i = 0; i < valueArray.length; i++) {
+                    if (valueArray[i] == item.value) {
+                      option.checked = true;
+                    }
                   }
                 }
+                selectOptions.push(option);
               }
-              selectOptions.push(option);
             });
           }
         }
@@ -619,42 +637,96 @@ var PageHome = function (_React$Component) {
       } else if (itemType == 'select') {
         //下拉选择
         var selectItem = form.multiItems; //选项
-
+        isVerifySingValue = value;
 
         if (form.dataAttr && form.dataAttr.selectClass && form.dataAttr.selectClass == "2") {
           //当多选时只显示
-          itemParam.itemType = "text";
-          itemParam.readOnly = true;
+          itemParam.itemType = "checkbox";
+          itemParam.realType = "select";
+          // itemParam.readOnly=true;
+          var selectOptions = [];
           if (value) {
+
             var valueArray = JSON.parse(value);
-            var showValue = "";
+            selectItem.map(function (selectI) {
+              valueArray.map(function (item) {
+                if (typeof selectI.state == 'undefined' || selectI.state == "1" || selectI.state == "0" && readOnly == true) {
+                  if (selectI.value == item) {
+                    var option = {};
+                    option.value = selectI.value;
+                    option.text = selectI.name;
+                    option.disable = false;
+                    option.checked = true;
+                    selectOptions.push(option);
+                  } else {
+                    var option = {};
+                    option.value = selectI.value;
+                    option.text = selectI.name;
+                    option.disable = false;
+                    option.checked = false;
+                    selectOptions.push(option);
+                  }
+                }
+              });
+              // showValue+=","+item;
+            });
+
+            // var showValue = "";
             valueArray.map(function (item) {
-              showValue += "," + item;
+              var hasValue = false;
+              selectItem.map(function (selectI) {
+                if (selectI.value == item && (typeof selectI.state == 'undefined' || selectI.state == "1" || selectI.state == "0" && readOnly == true)) {
+                  hasValue = true;
+                }
+              });
+              if (!hasValue) {
+                var option = {};
+                option.value = item;
+                option.text = item;
+                option.disable = false;
+                option.checked = true;
+                selectOptions.push(option);
+              }
+              // showValue+=","+item;
+            });
+            // if(showValue){
+            //   value = showValue.substring(1);
+            // }
+          } else {
+            selectItem.map(function (selectI) {
+              if (typeof selectI.state == 'undefined' || selectI.state == "1" || selectI.state == "0" && readOnly == true) {
+                var option = {};
+                option.value = selectI.value;
+                option.text = selectI.name;
+                option.disable = false;
+                option.checked = false;
+                selectOptions.push(option);
+              }
             });
-            if (showValue) {
-              value = showValue.substring(1);
-            }
-            isVerifySingValue = value;
           }
+          itemParam.selectOptions = selectOptions;
+          itemParam.selectItem = selectOptions;
         } else {
           var selectOptions = [];
           if (selectItem) {
             if (selectItem.length > 0) {
               selectItem.map(function (item) {
-                var option = {};
-                option.value = item.value;
-                option.text = item.name;
-                // if(status != '0'){ //非新增
-                if (value == item.value) {
-                  value = { value: value, text: item.name };
-                }
-                /*}else{
-                  var defaultValue=form.defaultValue;
-                  if(defaultValue == item.value){
-                    value = {value:value,text:item.name};
+                if (typeof item.state == 'undefined' || item.state == "1" || item.state == "0" && readOnly == true) {
+                  var option = {};
+                  option.value = item.value;
+                  option.text = item.name;
+                  // if(status != '0'){ //非新增
+                  if (value == item.value) {
+                    value = { value: value, text: item.name };
                   }
-                }*/
-                selectOptions.push(option);
+                  /*}else{
+                    var defaultValue=form.defaultValue;
+                    if(defaultValue == item.value){
+                      value = {value:value,text:item.name};
+                    }
+                  }*/
+                  selectOptions.push(option);
+                }
               });
             }
           }
@@ -1522,21 +1594,21 @@ var PageHome = function (_React$Component) {
       var length = item.maxlength;
       var patrn = /^-?\d+(\.\d+)?$/;
       if (newValue !== '' && newValue != '-') {
-        /* var validAttr=item['validAttr'];
-          if(validAttr!=null && validAttr.length>0){
-            for(var va=0;va<validAttr.length;va++){
-              var regular=validAttr[va]['regular'];
-              var tips=validAttr[va]['tips'];
-              var reg=new RegExp(regular.slice(1,-1),"g"); 
-              if(!reg.test(newValue)){
-                Toast.show({
-                        type: 'error',
-                        content:item.title+':'+tips
-                      });
-                      return false;
-              }
-              
-            }
+        /* var validAttr=item['validAttr'];
+          if(validAttr!=null && validAttr.length>0){
+            for(var va=0;va<validAttr.length;va++){
+              var regular=validAttr[va]['regular'];
+              var tips=validAttr[va]['tips'];
+              var reg=new RegExp(regular.slice(1,-1),"g"); 
+              if(!reg.test(newValue)){
+                Toast.show({
+                        type: 'error',
+                        content:item.title+':'+tips
+                      });
+                      return false;
+              }
+              
+            }
           }*/
         if (typeof length != "undefined" && length != null && length != "" && inputFormat == "char") {
           if (newValue.length > length) {
@@ -1587,6 +1659,62 @@ var PageHome = function (_React$Component) {
 
       this.props.onChange(data, itemParam);
     }
+  }, {
+    key: 'handleTextFocus',
+    value: function handleTextFocus(item, newValue) {
+      if (newValue !== '' && newValue != '-') {
+        var type = item.dataAttr.dataSrc;
+        if (type == "1") {
+          if (newValue.indexOf("%") >= 0) {
+            newValue = parseFloat(newValue) / 100;
+          }
+        } else if (type == "2") {
+          if (newValue.indexOf(",") >= 0) {
+            newValue = newValue.replace(/,/g, "");
+          }
+        }
+      }
+      var itemParam = this.state.itemParam;
+      itemParam.value = newValue;
+      this.setState({
+        itemParam: itemParam
+      });
+    }
+  }, {
+    key: 'handleTextBlur',
+    value: function handleTextBlur(item, newValue) {
+      if (newValue !== '' && newValue != '-') {
+        var type = item.dataAttr.dataSrc;
+        if (type == "1") {
+          newValue = parseFloat(newValue) * 100 + "%";
+        } else if (type == "2") {
+          newValue = this.toThousands(parseFloat(newValue));
+        }
+      }
+      var itemParam = this.state.itemParam;
+      itemParam.value = newValue;
+      this.setState({
+        itemParam: itemParam
+      });
+    }
+
+    //千分位
+
+  }, {
+    key: 'toThousands',
+    value: function toThousands(num) {
+      var result = '',
+          counter = 0;
+      num = (num || 0).toString();
+      for (var i = num.length - 1; i >= 0; i--) {
+        counter++;
+        result = num.charAt(i) + result;
+        if (!(counter % 3) && i != 0) {
+          result = ',' + result;
+        }
+      }
+      return result;
+    }
 
     //多行文本
 
@@ -1619,14 +1747,24 @@ var PageHome = function (_React$Component) {
 
   }, {
     key: 'checkboxChange',
-    value: function checkboxChange(code, value) {
+    value: function checkboxChange(code, realType, value) {
       var data = this.props.data;
       var valueStr = '';
-      for (var i = 0; i < value.length; i++) {
-        valueStr += value[i].value + ",";
-      }
-      if (valueStr != '') {
-        valueStr = valueStr.substring(0, valueStr.length - 1);
+      var valueArray = [];
+      if (realType == "select") {
+        for (var i = 0; i < value.length; i++) {
+          valueArray.push(value[i].value);
+        }
+        if (valueArray.length) {
+          valueStr = JSON.stringify(valueArray);
+        }
+      } else {
+        for (var i = 0; i < value.length; i++) {
+          valueStr += value[i].value + ",";
+        }
+        if (valueStr != '') {
+          valueStr = valueStr.substring(0, valueStr.length - 1);
+        }
       }
 
       data = this.editData(code, valueStr, data);
@@ -1893,12 +2031,12 @@ var PageHome = function (_React$Component) {
         });
         return false;
       }
-      /*  if(newValue=''){
-        Toast.show({
-                      type: 'error',
-                      content: '意见不能为空！',
-                  });
-                  return false;
+      /*  if(newValue=''){
+        Toast.show({
+                      type: 'error',
+                      content: '意见不能为空！',
+                  });
+                  return false;
       }*/
       if (newValue.length > 2000) {
         newValue = newValue.substring(0, 2000);
@@ -2258,6 +2396,8 @@ var PageHome = function (_React$Component) {
                 onChange: function onChange(value) {
                   t.handleTextChange(t.state.itemParam, value);
                 }
+                // onFocus={(value) => { t.handleTextFocus(t.state.itemParam, value); }}
+                // onBlur={(value) => { t.handleTextBlur(t.state.itemParam, value); }}
               }),
               t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
             )
@@ -2375,7 +2515,7 @@ var PageHome = function (_React$Component) {
                   iconPosition: 'right',
                   label: t.state.itemParam.title,
                   ref: "checkbox_" + t.state.itemParam.tableName + "_" + t.state.itemParam.key,
-                  onChange: t.checkboxChange.bind(t, t.state.itemParam.key) }))
+                  onChange: t.checkboxChange.bind(t, t.state.itemParam.key, t.state.itemParam.realType) }))
               ),
               t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
             )
@@ -2616,7 +2756,7 @@ var PageHome = function (_React$Component) {
             { borderTopNone: true },
             _react2.default.createElement(
               HBox,
-              { className: 't-field-box' },
+              { className: 'flex-comment t-field-box' },
               _react2.default.createElement(
                 'div',
                 { className: 't-field-layout-h-label t-FS16 t-FBJ' },

package/lib/form/table.js

@@ -1370,7 +1370,7 @@ var PageHome = function (_React$Component) {
 					{ className: t.props.commentDefaultList.length > 0 ? '' : 't-DN' },
 					_react2.default.createElement(
 						HBox,
-						{ className: 't-field-box' },
+						{ className: 'flex-comment t-field-box' },
 						_react2.default.createElement(
 							'div',
 							{ className: 't-field-layout-h-label t-FS16 t-FBJ' },

package/lib/process_info/processInfo.js

@@ -1664,18 +1664,39 @@ var PageHome = function (_React$Component) {
                 //表单提交前
                 if (typeof FlowCommon.saveBefore === "function") {
                     FlowCommon.saveBefore(0, t.state, function (param) {
-                        //项目开发扩展
-                        var mobileExt;
+                        //项目开发模块统一扩展
+                        var mobileModuleExt;
                         try {
-                            if (t.state.formKey) {
-                                mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
+                            if (t.state.module) {
+                                mobileModuleExt = typeof eval(t.state.module + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_mobileExt") : null;
                             }
                         } catch (e) {
                             // alert("exception: "+e.message);
                         }
-                        if (typeof mobileExt !== 'undefined' && typeof mobileExt["submitBefore"] === "function") {
-                            mobileExt["submitBefore"](t.state, function () {
-                                t.handleSubmitFunc(operate);
+
+                        if (typeof mobileModuleExt !== 'undefined' && typeof mobileModuleExt["submitBefore"] === "function") {
+                            mobileModuleExt["submitBefore"](t.state, function () {
+                                //项目开发扩展
+                                var mobileExt;
+                                try {
+                                    if (t.state.formKey) {
+                                        mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
+                                    }
+                                } catch (e) {
+                                    // alert("exception: "+e.message);
+                                }
+                                if (typeof mobileExt !== 'undefined' && typeof mobileExt["submitBefore"] === "function") {
+                                    mobileExt["submitBefore"](t.state, function () {
+                                        t.handleSubmitFunc(operate);
+                                    }, function (error) {
+                                        _Toast2.default.show({
+                                            type: 'error',
+                                            content: error
+                                        });
+                                    });
+                                } else {
+                                    t.handleSubmitFunc(operate);
+                                }
                             }, function (error) {
                                 _Toast2.default.show({
                                     type: 'error',
@@ -1683,7 +1704,27 @@ var PageHome = function (_React$Component) {
                                 });
                             });
                         } else {
-                            t.handleSubmitFunc(operate);
+                            //项目开发扩展
+                            var mobileExt;
+                            try {
+                                if (t.state.formKey) {
+                                    mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
+                                }
+                            } catch (e) {
+                                // alert("exception: "+e.message);
+                            }
+                            if (typeof mobileExt !== 'undefined' && typeof mobileExt["submitBefore"] === "function") {
+                                mobileExt["submitBefore"](t.state, function () {
+                                    t.handleSubmitFunc(operate);
+                                }, function (error) {
+                                    _Toast2.default.show({
+                                        type: 'error',
+                                        content: error
+                                    });
+                                });
+                            } else {
+                                t.handleSubmitFunc(operate);
+                            }
                         }
                     }, function (error) {
                         _Toast2.default.show({
@@ -1692,18 +1733,39 @@ var PageHome = function (_React$Component) {
                         });
                     });
                 } else {
-                    //项目开发扩展
-                    var mobileExt;
+                    //项目开发模块统一扩展
+                    var mobileModuleExt;
                     try {
-                        if (t.state.formKey) {
-                            mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
+                        if (t.state.module) {
+                            mobileModuleExt = typeof eval(t.state.module + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_mobileExt") : null;
                         }
                     } catch (e) {
                         // alert("exception: "+e.message);
                     }
-                    if (typeof mobileExt !== 'undefined' && typeof mobileExt["submitBefore"] === "function") {
-                        mobileExt["submitBefore"](t.state, function () {
-                            t.handleSubmitFunc(operate);
+
+                    if (typeof mobileModuleExt !== 'undefined' && typeof mobileModuleExt["submitBefore"] === "function") {
+                        mobileModuleExt["submitBefore"](t.state, function () {
+                            //项目开发扩展
+                            var mobileExt;
+                            try {
+                                if (t.state.formKey) {
+                                    mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
+                                }
+                            } catch (e) {
+                                // alert("exception: "+e.message);
+                            }
+                            if (typeof mobileExt !== 'undefined' && typeof mobileExt["submitBefore"] === "function") {
+                                mobileExt["submitBefore"](t.state, function () {
+                                    t.handleSubmitFunc(operate);
+                                }, function (error) {
+                                    _Toast2.default.show({
+                                        type: 'error',
+                                        content: error
+                                    });
+                                });
+                            } else {
+                                t.handleSubmitFunc(operate);
+                            }
                         }, function (error) {
                             _Toast2.default.show({
                                 type: 'error',
@@ -1711,31 +1773,31 @@ var PageHome = function (_React$Component) {
                             });
                         });
                     } else {
-                        t.handleSubmitFunc(operate);
+                        //项目开发扩展
+                        var mobileExt;
+                        try {
+                            if (t.state.formKey) {
+                                mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
+                            }
+                        } catch (e) {
+                            // alert("exception: "+e.message);
+                        }
+                        if (typeof mobileExt !== 'undefined' && typeof mobileExt["submitBefore"] === "function") {
+                            mobileExt["submitBefore"](t.state, function () {
+                                t.handleSubmitFunc(operate);
+                            }, function (error) {
+                                _Toast2.default.show({
+                                    type: 'error',
+                                    content: error
+                                });
+                            });
+                        } else {
+                            t.handleSubmitFunc(operate);
+                        }
                     }
                 }
             } else {
-                //项目开发扩展
-                var mobileExt;
-                try {
-                    if (t.state.formKey) {
-                        mobileExt = typeof eval(t.state.module + "_" + t.state.formKey + "_mobileExt") !== 'undefined' ? eval(t.state.module + "_" + t.state.formKey + "_mobileExt") : null;
-                    }
-                } catch (e) {
-                    // alert("exception: "+e.message);
-                }
-                if (typeof mobileExt !== 'undefined' && typeof mobileExt["submitBefore"] === "function") {
-                    mobileExt["submitBefore"](t.state, function () {
-                        t.handleSubmitFunc(operate);
-                    }, function (error) {
-                        _Toast2.default.show({
-                            type: 'error',
-                            content: error
-                        });
-                    });
-                } else {
-                    t.handleSubmitFunc(operate);
-                }
+                t.handleSubmitFunc(operate);
             }
         }
     }, {
@@ -2067,12 +2129,18 @@ var PageHome = function (_React$Component) {
                                         }
                                         if (commonUsedData.length > 0) {
                                             popCode = "common,org,group";
+                                            popCode = "common,org,group,duty,politicalOutlook";
+                                            chooseType = "userNotOrg,userNotGroup,userNotDuty,userNotPoliticalOutlook";
                                         } else {
                                             popCode = "org,group";
+                                            popCode = "org,group,duty,politicalOutlook";
+                                            chooseType = "userNotOrg,userNotGroup,userNotDuty,userNotPoliticalOutlook";
                                         }
                                     } else {
                                         chooseType = "userNotOrg";
                                         popCode = "org";
+                                        popCode = "org,group,duty,politicalOutlook";
+                                        chooseType = "userNotOrg,userNotGroup,userNotDuty,userNotPoliticalOutlook";
                                     }
                                 }
 
@@ -6242,7 +6310,7 @@ var PageHome = function (_React$Component) {
                         this.state.buttonList.map(function (item, i) {
                             return _react2.default.createElement(
                                 _Button2.default,
-                                { type: item.type, display: item.display, onClick: t.handleSubmit.bind(t, item.no) },
+                                { type: item.type, code: item.buttonCode, display: item.display, onClick: t.handleSubmit.bind(t, item.no) },
                                 item.name
                             );
                         }.bind(this))

package/package.json

@@ -1,72 +1,72 @@
-{
-  "name": "fmui-base",
-  "version": "1.0.38",
-  "title": "fmui-base",
-  "description": "fmui移动端组件",
-  "main": "lib/index.js",
-  "files": [
-    "dist",
-    "lib"
-  ],
-  "scripts": {
-    "test": "jest",
-    "coverage": "jest && codecov",
-    "build": "webpack --config webpack.config",
-    "start": "npm run build && webpack-dev-server --inline ",
-    "docs-start": "webpack-dev-server --config ./scripts/docs.config --inline",
-    "clean": "rd /s/q lib && mkdir lib",
-    "lib": " npm run build && babel src --out-dir lib --ignore \"**/*.test.js\"",
-    "docs": "webpack --config ./scripts/docs.config",
-    "docs-build": "webpack --config ./scripts/build.config"
-  },
-  "author": "zhaoyh",
-  "license": "MIT",
-  "devDependencies": {
-    "babel-cli": "^6.24.0",
-    "babel-core": "^6.18.2",
-    "babel-jest": "^17.0.2",
-    "babel-loader": "^6.2.8",
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-preset-react": "^6.16.0",
-    "babel-preset-stage-2": "^6.18.0",
-    "codecov": "^2.1.0",
-    "css-loader": "^0.26.1",
-    "enzyme": "^2.7.1",
-    "enzyme-to-json": "^1.5.0",
-    "eslint": "^3.13.1",
-    "eslint-plugin-babel": "^4.0.0",
-    "eslint-plugin-jsx-a11y": "^3.0.2",
-    "eslint-plugin-react": "^6.9.0",
-    "file-loader": "^0.9.0",
-    "github-markdown-css": "^2.5.0",
-    "jest": "^19.0.2",
-    "json-loader": "^0.5.4",
-    "less": "^3.9.0",
-    "less-loader": "^4.1.0",
-    "marked": "^0.3.6",
-    "prismjs": "^1.6.0",
-    "raw-loader": "^0.5.1",
-    "react": "^15.4.1",
-    "react-addons-perf": "^15.4.1",
-    "react-addons-test-utils": "^15.4.2",
-    "react-css-modules": "^4.1.0",
-    "react-dom": "^15.4.1",
-    "style-loader": "^0.13.1",
-    "url-loader": "^0.5.7",
-    "webpack": "^2.2.1",
-    "webpack-dev-middleware": "^1.10.1",
-    "webpack-dev-server": "^2.4.1",
-    "webpack-hot-middleware": "^2.17.1",
-    "webpack-validator": "^2.3.0"
-  },
-  "jest": {
-    "rootDir": "src",
-    "coverageDirectory": "./coverage/",
-    "collectCoverage": true
-  },
-  "dependencies": {
-    "copy-webpack-plugin": "^3.0.1",
-    "saltui": "^4.13.1"
-  }
-}
+{
+  "name": "fmui-base",
+  "version": "1.0.40",
+  "title": "fmui-base",
+  "description": "fmui移动端组件",
+  "main": "lib/index.js",
+  "files": [
+    "dist",
+    "lib"
+  ],
+  "scripts": {
+    "test": "jest",
+    "coverage": "jest && codecov",
+    "build": "webpack --config webpack.config",
+    "start": "npm run build && webpack-dev-server --inline ",
+    "docs-start": "webpack-dev-server --config ./scripts/docs.config --inline",
+    "clean": "rd /s/q lib && mkdir lib",
+    "lib": " npm run build && babel src --out-dir lib --ignore \"**/*.test.js\"",
+    "docs": "webpack --config ./scripts/docs.config",
+    "docs-build": "webpack --config ./scripts/build.config"
+  },
+  "author": "zhaoyh",
+  "license": "MIT",
+  "devDependencies": {
+    "babel-cli": "^6.24.0",
+    "babel-core": "^6.18.2",
+    "babel-jest": "^17.0.2",
+    "babel-loader": "^6.2.8",
+    "babel-plugin-transform-decorators-legacy": "^1.3.4",
+    "babel-preset-es2015": "^6.18.0",
+    "babel-preset-react": "^6.16.0",
+    "babel-preset-stage-2": "^6.18.0",
+    "codecov": "^2.1.0",
+    "css-loader": "^0.26.1",
+    "enzyme": "^2.7.1",
+    "enzyme-to-json": "^1.5.0",
+    "eslint": "^3.13.1",
+    "eslint-plugin-babel": "^4.0.0",
+    "eslint-plugin-jsx-a11y": "^3.0.2",
+    "eslint-plugin-react": "^6.9.0",
+    "file-loader": "^0.9.0",
+    "github-markdown-css": "^2.5.0",
+    "jest": "^19.0.2",
+    "json-loader": "^0.5.4",
+    "less": "^3.9.0",
+    "less-loader": "^4.1.0",
+    "marked": "^0.3.6",
+    "prismjs": "^1.6.0",
+    "raw-loader": "^0.5.1",
+    "react": "^15.4.1",
+    "react-addons-perf": "^15.4.1",
+    "react-addons-test-utils": "^15.4.2",
+    "react-css-modules": "^4.1.0",
+    "react-dom": "^15.4.1",
+    "style-loader": "^0.13.1",
+    "url-loader": "^0.5.7",
+    "webpack": "^2.2.1",
+    "webpack-dev-middleware": "^1.10.1",
+    "webpack-dev-server": "^2.4.1",
+    "webpack-hot-middleware": "^2.17.1",
+    "webpack-validator": "^2.3.0"
+  },
+  "jest": {
+    "rootDir": "src",
+    "coverageDirectory": "./coverage/",
+    "collectCoverage": true
+  },
+  "dependencies": {
+    "copy-webpack-plugin": "^3.0.1",
+    "saltui": "^4.13.1"
+  }
+}