fmui-base 2.1.0-beta.5 → 2.1.0-beta.7

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish --tag beta
 
 ## 更新日志
+- 2.1.0-beta.7：移动端关联表功能
+- 2.1.0-beta.6：按钮修改和选人组件兼职组织修复
 - 2.1.0-beta.5：选人组件修改
 - 2.1.0-beta.4：表单html组件样式修改;上传组件修改;上传进度条增加
 - 2.1.0-beta.3：各种样式修复

package/lib/form/form.js

@@ -57,10 +57,6 @@ var _Field = require('saltui/lib/Field');
 
 var _Field2 = _interopRequireDefault(_Field);
 
-var _FoldablePane = require('saltui/lib/FoldablePane');
-
-var _FoldablePane2 = _interopRequireDefault(_FoldablePane);
-
 var _AngleRight = require('salt-icon/lib/AngleRight');
 
 var _AngleRight2 = _interopRequireDefault(_AngleRight);
@@ -98,6 +94,7 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
 _Field2.default;
+// import FoldablePane from 'saltui/lib/FoldablePane';
 // import Slot from 'saltui/lib/Slot';
 
 // import SelectFileNo from '../select-fileno/pageHome';
@@ -264,6 +261,8 @@ var PageHome = function (_React$Component) {
       }
       var status = this.props.status; //判断是否能选择,0新增，1修改,2查看
       var formKey = this.props.formKey; //表单code
+      var allForm = this.props.allForm; //表单属性
+      var formTblId = allForm.formTblId; //表单的表id
       var data = this.props.data; //数据
       var dataType = this.props.dataType; //数据类型，main:主表，sub：子表，
       var module = this.props.module;
@@ -290,6 +289,10 @@ var PageHome = function (_React$Component) {
       itemParam.key = key;
       var itemType = form.itemType; //类型
       itemParam.itemType = itemType;
+      var fieldTblId = form.tblId;
+      var fieldTblName = form.tblName;
+      itemParam.tblId = fieldTblId;
+      itemParam.tblName = fieldTblName;
 
       var required = false;
       if (itemType != "comment") {
@@ -306,6 +309,7 @@ var PageHome = function (_React$Component) {
       itemParam.isHidden = form.isHidden ? form.isHidden : false; //默认不隐藏
 
       var mainTblData = data.mainTblData; //主表数据
+      var relatedTbl = data.relatedTbl; //关联表数据
       var subTbl = data.subTbl; //子表
       var readOnly = false;
       var value = '';
@@ -349,23 +353,72 @@ var PageHome = function (_React$Component) {
           //新增 
           value = form.defaultValue;
 
-          var hasField = false;
-          mainTblData.map(function (item) {
-            if (item.key == key) {
-              hasField = true;
+          if (formTblId.indexOf(fieldTblId) > 0) {
+            var hasTable = false;
+            var hasField = false;
+            relatedTbl.map(function (item) {
+              if (item.relatedMainTblName == fieldTblName) {
+                hasTable = true;
+                item.relatedMainTblData.map(function (item2) {
+                  if (item2.key == key) {
+                    hasField = true;
+                  }
+                });
+              }
+            });
+
+            if (!hasField) {
+              //字段不存在
+
+              tableData.key = key;
+              tableData.value = form.defaultValue;
+              tableData.required = required;
+              tableData.label = title;
+              tableData.inputFormat = form.inputFormat;
+              tableData.decimalPlace = form.decimalPlace;
+              tableData.fieldId = form.fieldId;
+              tableData.uniqueName = uniqueName;
+              tableData.itemType = form.itemType;
+
+              if (!hasTable) {
+                //表不存在
+                var relatedTblData = {};
+                relatedTblData.relaDataId = null;
+                relatedTblData.relatedMainTblName = fieldTblName;
+                relatedTblData.relatedSubTblData = [];
+
+                var relatedMainTblData = [];
+                relatedMainTblData.push(tableData);
+                relatedTblData.relatedMainTblData = relatedMainTblData;
+                relatedTbl.push(relatedTblData);
+              } else {
+                relatedTbl.map(function (item) {
+                  if (item.relatedMainTblName == fieldTblName) {
+                    var relatedMainTblData = item.relatedMainTblData;
+                    relatedMainTblData.push(tableData);
+                  }
+                });
+              }
+            }
+          } else {
+            var hasField = false;
+            mainTblData.map(function (item) {
+              if (item.key == key) {
+                hasField = true;
+              }
+            });
+            if (!hasField) {
+              tableData.key = key;
+              tableData.value = form.defaultValue;
+              tableData.required = required;
+              tableData.label = title;
+              tableData.inputFormat = form.inputFormat;
+              tableData.decimalPlace = form.decimalPlace;
+              tableData.fieldId = form.fieldId;
+              tableData.uniqueName = uniqueName;
+              tableData.itemType = form.itemType;
+              mainTblData.push(tableData);
             }
-          });
-          if (!hasField) {
-            tableData.key = key;
-            tableData.value = form.defaultValue;
-            tableData.required = required;
-            tableData.label = title;
-            tableData.inputFormat = form.inputFormat;
-            tableData.decimalPlace = form.decimalPlace;
-            tableData.fieldId = form.fieldId;
-            tableData.uniqueName = uniqueName;
-            tableData.itemType = form.itemType;
-            mainTblData.push(tableData);
           }
         } else if (status == '1') {
           //编辑
@@ -373,7 +426,7 @@ var PageHome = function (_React$Component) {
           if (!dataId) {
             if (dataType == "sub") {
               if (this.checkIsHasSub(mainTblData, key)) {
-                value = this.dealwithData(itemParam, mainTblData);
+                value = this.dealwithData(itemParam, mainTblData, relatedTbl);
               } else {
                 value = form.value;
                 tableData.key = key;
@@ -385,7 +438,16 @@ var PageHome = function (_React$Component) {
                 tableData.fieldId = form.fieldId;
                 tableData.uniqueName = uniqueName;
                 tableData.itemType = form.itemType;
-                mainTblData.push(tableData);
+                if (formTblId.indexOf(fieldTblId) > 0) {
+                  relatedTbl.map(function (item) {
+                    if (item.relatedMainTblName == fieldTblName) {
+                      var relatedMainTblData = item.relatedMainTblData;
+                      relatedMainTblData.push(tableData);
+                    }
+                  });
+                } else {
+                  mainTblData.push(tableData);
+                }
               }
             } else {
               value = form.value;
@@ -398,10 +460,19 @@ var PageHome = function (_React$Component) {
               tableData.fieldId = form.fieldId;
               tableData.uniqueName = uniqueName;
               tableData.itemType = form.itemType;
-              mainTblData.push(tableData);
+              if (formTblId.indexOf(fieldTblId) > 0) {
+                relatedTbl.map(function (item) {
+                  if (item.relatedMainTblName == fieldTblName) {
+                    var relatedMainTblData = item.relatedMainTblData;
+                    relatedMainTblData.push(tableData);
+                  }
+                });
+              } else {
+                mainTblData.push(tableData);
+              }
             }
           } else {
-            value = this.dealwithData(itemParam, mainTblData); //初始化值
+            value = this.dealwithData(itemParam, mainTblData, relatedTbl); //初始化值
           }
         } else {
           //显示
@@ -414,7 +485,7 @@ var PageHome = function (_React$Component) {
           tableData.fieldId = form.fieldId;
           tableData.uniqueName = uniqueName;
           tableData.itemType = form.itemType;
-          value = this.dealwithData(itemParam, mainTblData); //初始化值
+          value = this.dealwithData(itemParam, mainTblData, relatedTbl); //初始化值
         }
       }
 
@@ -1538,38 +1609,82 @@ var PageHome = function (_React$Component) {
 
   }, {
     key: 'dealwithData',
-    value: function dealwithData(itemParam, mainTblData) {
+    value: function dealwithData(itemParam, mainTblData, relatedTbl) {
       var itemCode = itemParam.key;
       var itemType = itemParam.itemType;
       var value = '';
-      if (mainTblData.length > 0) {
-        for (var i = 0; i < mainTblData.length; i++) {
-          var item = mainTblData[i];
-          if (item.key == itemCode) {
-            mainTblData[i].required = itemParam.required;
-            mainTblData[i].label = itemParam.title;
-            mainTblData[i].inputFormat = itemParam.inputFormat;
-            mainTblData[i].decimalPlace = itemParam.decimalPlace;
-            // if(item.showValue){
-            //   value = item.showValue;
-            //   item.showValue = null;
-            // }else{
-            if (item.value || item.value == 0) {
-              value = item.value;
-            }
 
-            //}
-            if (itemType == 'text' || itemType == 'textarea') {
-              if (value) {
-                mainTblData[i].value = value + '';
+      var formTblId = this.props.allForm.formTblId;
+      var fieldTblId = itemParam.tblId;
+      var fieldTblName = itemParam.tblName;
+      if (formTblId.indexOf(fieldTblId) > 0) {
+        if (relatedTbl.length > 0) {
+          for (var i = 0; i < relatedTbl.length; i++) {
+            var item = relatedTbl[i];
+            if (item.relatedMainTblName == fieldTblName) {
+              var relatedMainTblData = item.relatedMainTblData;
+              if (relatedMainTblData) {
+                for (var j = 0; j < relatedMainTblData.length; j++) {
+                  var relatedItem = relatedMainTblData[j];
+                  if (relatedItem.key == itemCode) {
+                    relatedItem.required = itemParam.required;
+                    relatedItem.label = itemParam.title;
+                    relatedItem.inputFormat = itemParam.inputFormat;
+                    relatedItem.decimalPlace = itemParam.decimalPlace;
+                    // if(item.showValue){
+                    //   value = item.showValue;
+                    //   item.showValue = null;
+                    // }else{
+                    if (relatedItem.value || relatedItem.value == 0) {
+                      value = relatedItem.value;
+                    }
+
+                    //}
+                    if (itemType == 'text' || itemType == 'textarea') {
+                      if (value) {
+                        relatedItem.value = value + '';
+                      }
+                    }
+                    break;
+                  }
+                }
               }
             }
-            break;
-          }
-        };
-        return value;
+          };
+          return value;
+        } else {
+          return value;
+        }
       } else {
-        return value;
+        if (mainTblData.length > 0) {
+          for (var i = 0; i < mainTblData.length; i++) {
+            var item = mainTblData[i];
+            if (item.key == itemCode) {
+              mainTblData[i].required = itemParam.required;
+              mainTblData[i].label = itemParam.title;
+              mainTblData[i].inputFormat = itemParam.inputFormat;
+              mainTblData[i].decimalPlace = itemParam.decimalPlace;
+              // if(item.showValue){
+              //   value = item.showValue;
+              //   item.showValue = null;
+              // }else{
+              if (item.value || item.value == 0) {
+                value = item.value;
+              }
+
+              //}
+              if (itemType == 'text' || itemType == 'textarea') {
+                if (value) {
+                  mainTblData[i].value = value + '';
+                }
+              }
+              break;
+            }
+          };
+          return value;
+        } else {
+          return value;
+        }
       }
     }
 
@@ -1616,6 +1731,11 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'editData',
     value: function editData(itemCode, value, data) {
+      var itemParam = this.state.itemParam;
+      var allForm = this.props.allForm;
+      var formTblId = this.props.allForm.formTblId;
+      var fieldTblId = itemParam.tblId;
+      var fieldTblName = itemParam.tblName;
       //处理操作返回数据
       if (typeof FlowCommon.dealwithReturnData === "function") {
         FlowCommon.dealwithReturnData(itemCode, value, function (itemCode1, value1) {
@@ -1634,12 +1754,27 @@ var PageHome = function (_React$Component) {
           });
         }
       } else {
-        var mainTblData = data.mainTblData;
-        mainTblData.map(function (item, index) {
-          if (item.key == itemCode) {
-            item.value = value;
+        if (formTblId.indexOf(fieldTblId) > 0) {
+          var relatedTbl = data.relatedTbl;
+          for (var i = 0; i < relatedTbl.length; i++) {
+            var item = relatedTbl[i];
+            if (item.relatedMainTblName == fieldTblName) {
+              var relatedMainTblData = item.relatedMainTblData;
+              for (var j = 0; j < relatedMainTblData.length; j++) {
+                if (relatedMainTblData[j].key == itemCode) {
+                  relatedMainTblData[j].value = value;
+                }
+              }
+            }
           }
-        });
+        } else {
+          var mainTblData = data.mainTblData;
+          mainTblData.map(function (item, index) {
+            if (item.key == itemCode) {
+              item.value = value;
+            }
+          });
+        }
       }
 
       return data;

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', subTblName: t.state.itemParam.key, 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) });
+              return _react2.default.createElement(_form2.default, { keyNo: i, ref: item2.uniqueName + '_' + i, dataType: 'sub', subTblName: t.state.itemParam.key, module: t.state.module, formKey: item2.formKey, status: t.state.status, form: item2, allForm: t.props.allForm, 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

@@ -303,8 +303,10 @@ var PageHome = function (_React$Component) {
 			var t = this;
 			var module = t.props.module;
 			var formKey = t.props.allForm.formcode;
+			var formTblId = t.props.allForm.formTblId;
 			if (itemParam && itemParam.key) {
 				//修改事件的时候
+
 				var mainTblData = data.mainTblData;
 				var mainTblName = data.mainTblName;
 				var subTbl = data.subTbl;
@@ -430,6 +432,7 @@ var PageHome = function (_React$Component) {
 				}
 
 				if (itemParam.itemType) {
+
 					var fieldId = itemParam.fieldId;
 					var linkFields = data.linkFields;
 					var formItem = data.formItem;
@@ -1480,16 +1483,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, linkFields: t.state.linkFields, 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, allForm: t.props.allForm, 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, linkFields: t.state.linkFields, 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, allForm: t.props.allForm, 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, linkFields: t.state.linkFields, 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, allForm: t.props.allForm, 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

@@ -2948,6 +2948,22 @@ var PageHome = function (_React$Component) {
             var mainTableId = data.dataId;
             allEditIdsArray.push(mainTableId);
 
+            //关联表
+            var relatedTbl = data.relatedTbl;
+            for (var i = 0; i < relatedTbl.length; i++) {
+                var relatedTblItem = relatedTbl[i];
+                if (relatedTblItem) {
+                    var relatedMainTblData = relatedTblItem.relatedMainTblData;
+                    if (relatedMainTblData) {
+                        for (var j = 0; j < relatedMainTblData.length; j++) {
+                            if (relatedMainTblData[j].key == "id") {
+                                allEditIdsArray.push(relatedMainTblData[j].value);
+                            }
+                        }
+                    }
+                }
+            }
+
             //子表id
             var subTbl = data.subTbl;
             for (var i = 0; i < subTbl.length; i++) {
@@ -6439,7 +6455,7 @@ var PageHome = function (_React$Component) {
                                 item.name
                             ) : _react2.default.createElement(
                                 _Button2.default,
-                                { type: item.type, code: item.buttonCode, display: item.display, onClick: t.handleSubmit.bind(t, item.no) },
+                                { type: item.type, className: item.name == '保存草稿' ? 'button_save' : '', code: item.buttonCode, display: item.display, onClick: t.handleSubmit.bind(t, item.no) },
                                 item.name
                             );
                         }.bind(this))

package/lib/selectMember/select.js

@@ -3290,7 +3290,14 @@ var Page = function (_React$Component) {
         });
       } else if ("orgUser" == type) {
         var orgUserList = t.state.orgUserList;
-        orgUserList[index].checked = !orgUserList[index].checked;
+        // orgUserList[index].checked = !orgUserList[index].checked;
+
+        var checkUserId = orgUserList[index].id;
+        orgUserList.map(function (orgUserListItem) {
+          if (orgUserListItem.id == checkUserId) {
+            orgUserListItem.checked = !orgUserListItem.checked;
+          }
+        });
         var total = t.state.total;
         var selectOrgUserNum = t.state.selectOrgUserNum; //当前组织下选中的用户数量
         var selectUsers = selectedList.selectUsers;

package/package.json

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