fmui-base 2.2.76 → 2.2.78

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.78: 数据表计算值不生效
+- 2.2.77: 关联必填时，只读字段不需要必填
 - 2.2.76: 批示意见落款盖章样式调整
 - 2.2.75: 批示意见落款盖章适配移动端
 - 2.2.74: 统一待办移动端跳转

package/lib/form/form.js

@@ -2327,11 +2327,14 @@ var PageHome = function (_React$Component) {
         }
       }
 
+      // this.setState({
+      //   itemParam: itemParam
+      // });
       this.setState({
         itemParam: itemParam
+      }, function () {
+        this.props.onChange(data, itemParam);
       });
-
-      this.props.onChange(data, itemParam);
     }
   }, {
     key: 'handleTextFocus',
@@ -2583,10 +2586,15 @@ var PageHome = function (_React$Component) {
         data = this.editData(code, selectValue, data);
         var itemParam = this.state.itemParam;
         itemParam.value = value;
+        // this.setState({
+        //   itemParam: itemParam
+        // });
+        // this.props.onChange(data,itemParam);
         this.setState({
           itemParam: itemParam
+        }, function () {
+          this.props.onChange(data, itemParam);
         });
-        this.props.onChange(data, itemParam);
       }
     }
 
@@ -2601,10 +2609,15 @@ var PageHome = function (_React$Component) {
         data = this.editData(code, selectValue, data);
         var itemParam = this.state.itemParam;
         itemParam.value = value;
+        // this.setState({
+        //   itemParam: itemParam
+        // });
+        // this.props.onChange(data,itemParam);
         this.setState({
           itemParam: itemParam
+        }, function () {
+          this.props.onChange(data, itemParam);
         });
-        this.props.onChange(data, itemParam);
       }
     }
   }, {
@@ -3018,10 +3031,15 @@ var PageHome = function (_React$Component) {
       data = this.editData(code, newValue, data);
       var itemParam = this.state.itemParam;
       itemParam.value = newValue;
+      // this.setState({
+      //   itemParam: itemParam
+      // });
+      // this.props.onChange(data,itemParam);
       this.setState({
         itemParam: itemParam
+      }, function () {
+        this.props.onChange(data, itemParam);
       });
-      this.props.onChange(data, itemParam);
       // var json = [
       //   {"scopeValue":'113',"scopeType":"user","scopeName":"葛萌"}
       // ];
@@ -3046,10 +3064,15 @@ var PageHome = function (_React$Component) {
           data = _this2.editData(code, newValue, data);
           var itemParam = _this2.state.itemParam;
           itemParam.value = newValue;
+          // this.setState({
+          //   itemParam: itemParam
+          // });
+          // this.props.onChange(data,itemParam);
           _this2.setState({
             itemParam: itemParam
+          }, function () {
+            this.props.onChange(data, itemParam);
           });
-          _this2.props.onChange(data, itemParam);
         }).catch(function (error) {
           _Toast2.default.show({
             type: 'error',
@@ -3071,10 +3094,15 @@ var PageHome = function (_React$Component) {
       var realValue = newValue ? '1' : '0';
       data = this.editData(code, realValue, data);
 
+      // this.setState({
+      //   itemParam: itemParam
+      // });
+      // this.props.onChange(data,itemParam);
       this.setState({
         itemParam: itemParam
+      }, function () {
+        this.props.onChange(data, itemParam);
       });
-      this.props.onChange(data, itemParam);
     }
 
     //定位方法

package/lib/form/table.js

@@ -338,7 +338,13 @@ var PageHome = function (_React$Component) {
 
 				var mainTblData = data.mainTblData;
 				var mainTblName = data.mainTblName;
+				var formItem = data.formItem;
 				var subTbl = data.subTbl;
+				for (var i = 0; i < formItem.length; i++) {
+					if (formItem[i].uniqueName == itemParam.uniqueName) {
+						formItem[i].value = itemParam.value;
+					}
+				}
 				// var subTblNo = data.subTblNo; 
 				//处理特有参数
 				if (typeof FlowCommon.dealwithFormItemChange === "function") {
@@ -1051,6 +1057,9 @@ var PageHome = function (_React$Component) {
 								if (hideFlag) {
 									relaFieldMap["value"] = false;
 								}
+								if (defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1 || defaulthideFields.indexOf(relaFieldTblNameArrayItem) != -1) {
+									relaFieldMap["value"] = false;
+								}
 								var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldTblName.split(",");
 								for (var i = 0; i < mainTblData.length; i++) {
 									var item = mainTblData[i];

package/package.json

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