fmui-base 2.0.92 → 2.0.93

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志  
+- 2.0.93：流程组件支持作废，表单组件关联字段支持绑定子表字段bug修复
 - 2.0.92：流程组件支持作废功能
 - 2.0.91：表单组件关联字段支持绑定子表字段，子表change事件回调时增加子表的index
 - 2.0.90：表单组件子表处理

package/lib/form/form.js

@@ -1685,6 +1685,8 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'reloadItemParam',
     value: function reloadItemParam(itemNew) {
+      var dataType = this.state.dataType;
+
       if (itemNew != null && itemNew != undefined && Array.isArray(itemNew)) {
         var itemParam = this.state.itemParam;
         var selectText = ''; //多选值修改的显示文本
@@ -1741,7 +1743,9 @@ var PageHome = function (_React$Component) {
               selectedText: selectText
             });
           }
-
+          // if(dataType=='sub'){
+          //   this.props.reloadItemParam(itemNew,this.state.itemParam);
+          // } 
           if (itemParam.itemType == 'popuser') {
             this.refs['selectMember_' + itemParam.key].initSelectData();
           }

package/lib/form/table.js

@@ -850,6 +850,7 @@ var PageHome = function (_React$Component) {
 						relaFieldTblNameArray.map(function (relaFieldTblNameArrayItem, index) {
 							var nowValue = "";
 							var mainTblData = data.mainTblData;
+							var subTbl = data.subTbl;
 
 							mainTblData.map(function (item) {
 								if (item.key == itemKey) {
@@ -887,12 +888,23 @@ var PageHome = function (_React$Component) {
 								} else {
 									relaFieldMap["value"] = true;
 								}
-								var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldName.split(",");
+								var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldTblName.split(",");
 								mainTblData.map(function (item) {
-									if (item.key == relaFieldNameArray[index]) {
+									if (item.uniqueName == relaFieldNameArray[index]) {
 										item.required = triggerFieldValBoolean;
 									}
 								});
+								for (var i = 0; i < subTbl.length; i++) {
+									var subTblData = subTbl[i].subTblData;
+									for (var a = 0; a < subTblData.length; a++) {
+										var subTblDataItem = subTblData[a];
+										for (var b = 0; b < subTblDataItem.length; b++) {
+											if (subTblDataItem[b].uniqueName == relaFieldNameArray[index]) {
+												subTbl[i].subTblData[a][b].required = triggerFieldValBoolean;
+											}
+										}
+									}
+								}
 							} else if (editType == 'edit') {
 								relaFieldMap["key"] = "readOnly";
 								if (triggerFieldVal == nowValue) {
@@ -918,7 +930,7 @@ var PageHome = function (_React$Component) {
 														if (relaFieldTblNameArrayItem == subTblDataItem[a].uniqueName) {
 															isSubField = true;
 															var subTblNameItem = "sub_" + subTblName;
-															var subItem = relaFieldTblNameArrayItem + '_' + a;
+															var subItem = relaFieldTblNameArrayItem + '_' + b;
 															t.refs[subTblNameItem].refs[subItem].reloadItemParam([relaFieldMap]);
 														}
 													}

package/lib/process_info/processInfo.js

@@ -2769,7 +2769,7 @@ var PageHome = function (_React$Component) {
                             selectOptions.push(option);
                         });
 
-                        var processDataList = [{ value: '1', name: '保留', disable: false, checked: true, text: '保留' }, { value: '2', name: '清除', disable: false, checked: false, text: '清除' }];
+                        var processDataList = [{ value: '1', name: '保留', disable: false, checked: true, text: '保留' }, { value: '2', name: '清除', disable: false, checked: false, text: '清除(已办人的已办记录)' }];
                         t.setState({
                             allActivity: selectOptions, //所有环节名称
                             designActivity: selectOptions[0].value, //选择的提醒环节id

package/package.json

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