fmui-base 2.3.15 → 2.3.16

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.16：选人组件：常用类型增加用户全选功能
 - 2.3.15：时分字段保存丢失值，子表删除时页面空白
 - 2.3.14：表单切换组织增加开关
 - 2.3.13：子表字段带$时计算不生效，表单切换组织时，表单赋值的宏值实时更新

package/lib/form/form.js

@@ -690,8 +690,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);
         }*/
         //宏值签名图片
         // if(itemParam.dataAttr && itemParam.dataAttr.dataSrc=='2' && !readOnly && !itemParam.bizCodeRuleId){
@@ -945,11 +945,11 @@ var PageHome = function (_React$Component) {
                   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};
-                    }
+                  /*}else{
+                    var defaultValue=form.defaultValue;
+                    if(defaultValue == item.value){
+                      value = {value:value,text:item.name};
+                    }
                   }*/
                   selectOptions.push(option);
                 }
@@ -2383,21 +2383,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 (this.checkEmoji(newValue)) {
           _Toast2.default.show({
@@ -3422,12 +3422,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);

package/lib/form/subForm.js

@@ -335,28 +335,28 @@ var PageHome = function (_React$Component) {
       var data = this.props.data;
       var subTblList = data.subTbl; //子表
       var relatedTbl = data.relatedTbl; //关联表
-      /* var calculateExpList = data.calculateExpList;//计算公式列表 
-       var calculateExpList1 = value.calculateExpList;//计算公式列表
-       if(calculateExpList1){
-       	for(var key in calculateExpList1){
-       		  var calculateExpValue;
-                 if(calculateExpList){
-                   calculateExpValue = calculateExpList[key];
-                   if(!calculateExpValue){
-                     calculateExpValue = [];
-                   }
-                 }else{
-                   calculateExpList = {};
-                   calculateExpValue = [];
-                 }
-                 for(var j=0;j<calculateExpList1[key].length;j++){
-               	  calculateExpValue.push(calculateExpList1[key][j]);
-                 }
-                 calculateExpList[key] = calculateExpValue;
-       		  
-       	}
-       	
-       	data.calculateExpList = calculateExpList;
+      /* var calculateExpList = data.calculateExpList;//计算公式列表 
+       var calculateExpList1 = value.calculateExpList;//计算公式列表
+       if(calculateExpList1){
+       	for(var key in calculateExpList1){
+       		  var calculateExpValue;
+                 if(calculateExpList){
+                   calculateExpValue = calculateExpList[key];
+                   if(!calculateExpValue){
+                     calculateExpValue = [];
+                   }
+                 }else{
+                   calculateExpList = {};
+                   calculateExpValue = [];
+                 }
+                 for(var j=0;j<calculateExpList1[key].length;j++){
+               	  calculateExpValue.push(calculateExpList1[key][j]);
+                 }
+                 calculateExpList[key] = calculateExpValue;
+       		  
+       	}
+       	
+       	data.calculateExpList = calculateExpList;
        }*/
 
       this.dealwithSubData(subTblList, subTblNo, value, relatedTbl);