fmui-base 2.1.18 → 2.1.20

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志  
+- 2.1.20：选人组件兼容老数据，关联字段编辑时必填不校验
+- 2.1.19：选人组件回显去除接口token
 - 2.1.18：统一流程预算跳转
 - 2.1.17：统一流程纪检党建跳转
 - 2.1.16：表单样式调整，选人组件去除接口token

package/lib/form/form.js

@@ -1122,6 +1122,21 @@ var PageHome = function (_React$Component) {
             }
           } else {
             popCode = form.popuserMap.chooseObj;
+            //兼容老数据
+            if (popCode.indexOf("user") > -1 || popCode.indexOf("org") > -1) {
+              popCode = "org";
+              if (popCode.indexOf("org") == -1) {
+                itemParam.chooseObj = "userNotOrg";
+              } else {
+                itemParam.chooseObj = "userAndOrg";
+              }
+              if (popCode.indexOf("group") > -1) {
+                popCode = "org,group";
+              }
+            } else if (popCode.indexOf("group") > -1) {
+              popCode = "group";
+              itemParam.chooseObj = "group";
+            }
             chooseWay = form.popuserMap.chooseWay;
           }
           if (form.popuserMap.chooseScope) {

package/lib/form/table.js

@@ -861,6 +861,8 @@ var PageHome = function (_React$Component) {
 							var mainTblData = data.mainTblData;
 							var subTbl = data.subTbl;
 
+							var mainTblName = data.mainTblName;
+
 							mainTblData.map(function (item) {
 								if (item.key == itemKey) {
 									nowValue = item.value;
@@ -891,6 +893,7 @@ var PageHome = function (_React$Component) {
 									relaFieldMap["value"] = true;
 									triggerFieldValBoolean = true;
 									mustFlag = true;
+									editFlag = true;
 								} else if (!mustFlag) {
 									relaFieldMap["value"] = false;
 									triggerFieldValBoolean = false;
@@ -899,7 +902,7 @@ var PageHome = function (_React$Component) {
 								}
 								var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldTblName.split(",");
 								mainTblData.map(function (item) {
-									if (item.uniqueName == relaFieldNameArray[index]) {
+									if (mainTblName + "_" + item.key == relaFieldNameArray[index]) {
 										item.required = triggerFieldValBoolean;
 									}
 								});

package/lib/process_info/processInfo.js

@@ -1403,6 +1403,7 @@ var PageHome = function (_React$Component) {
                                     errorMsg: error
                                 });
                             } else {
+                                // alert(JSON.stringify(error));
                                 // window.ReactNativeWebView.postMessage('final');
                                 backPage();
                             }
@@ -1625,6 +1626,8 @@ var PageHome = function (_React$Component) {
     }, {
         key: 'checkSubmit',
         value: function checkSubmit(saveTable) {
+            debugger;
+            console.log("检查表单提交===");
             var mainTblData = saveTable.mainTblData;
             for (var i = 0; i < mainTblData.length; i++) {
                 if (mainTblData[i].required) {

package/lib/selectMember/select.js

@@ -151,11 +151,14 @@ var Page = function (_React$Component) {
       // var nameObj = {};
       $.ajax({
         type: 'GET',
-        url: getLoginUserInfo().context + "/api/m/cmp/popuser/mobile/getSceneInfo?token=" + getLoginUserInfo().token,
+        url: getLoginUserInfo().context + "/api/m/cmp/popuser/mobile/getSceneInfo",
         data: {
           popCode: popCode,
           chooseObj: popObj
         },
+        headers: {
+          'Authorization': 'Bearer ' + getLoginUserInfo().token
+        },
         dataType: "json",
         async: false,
         success: function success(data) {
@@ -608,6 +611,7 @@ var Page = function (_React$Component) {
       console.log("获取chooseType值");
       var chooseObj = this.state.chooseObj;
       var chooseType = this.props.chooseType;
+
       var code = this.getRealCode();
       if (code == null || code == undefined) {
         code = "";
@@ -727,7 +731,7 @@ var Page = function (_React$Component) {
         var fieldTable = this.props.fieldTable;
         var fieldData = this.props.fieldData;
         var token = this.state.token;
-        var url = t.state.context + "/api/m/cmp/popuser/mobile/getOfficePopuser?token=" + token + "&scopeTable=" + scopeTable + "&fieldTable=" + fieldTable + "&fieldData=" + fieldData + "&fieldDataValue=" + fieldDataValue;
+        var url = t.state.context + "/api/m/cmp/popuser/mobile/getOfficePopuser?" + "scopeTable=" + scopeTable + "&fieldTable=" + fieldTable + "&fieldData=" + fieldData + "&fieldDataValue=" + fieldDataValue;
         //是否回显已删除的数据
         var includeDel = this.props.includeDel;
         if (includeDel != null && includeDel != undefined) {

package/package.json

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