fmui-base 2.1.24 → 2.1.26

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志  
+- 2.1.26：子表必填字段没校验
+- 2.1.25：上传组件参数加密
 - 2.1.24：表单字段下拉多选字段有默认值时报错
 - 2.1.23：上传组件参数加密
 - 2.1.22：上传组件去token

package/lib/form/subForm.js

@@ -136,6 +136,7 @@ var PageHome = function (_React$Component) {
   }, {
     key: 'loadComponet',
     value: function loadComponet() {
+      console.log("sub===loadComponet===");
       var t = this;
       var module = this.props.module;
       var formKey = this.props.formKey; //表单code
@@ -224,6 +225,18 @@ var PageHome = function (_React$Component) {
       console.log("===dealwithSubForm===");
       var subFormList = [];
       var itemCode = itemParam.key;
+      var fieldControll = itemParam.fieldControll;
+      var mustFields = "";
+      if (fieldControll) {
+        mustFields = fieldControll.mustFields;
+        if (mustFields && mustFields != "") {
+          for (var i = 0; i < subForm.length; i++) {
+            if (mustFields.split(",").indexOf(subForm[i].uniqueName) != -1) {
+              subForm[i].valid = "true";
+            }
+          }
+        }
+      }
       var value = [];
       if (relatedTbl && relatedTbl.length > 0) {
         for (var i = 0; i < relatedTbl.length; i++) {

package/lib/process_list/processList.js

@@ -142,7 +142,9 @@ var ListItem = function (_React$Component) {
               fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetcost/").split('?_')[0].split('/approval/all')[0];
             } else if (module == 'bud_project') {
               fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetproject/").split('?_')[0].split('/approval/all')[0];
-            } else if (module.indexOf("hoa_") != '-1' || module.indexOf("jj_") != '-1' || module.indexOf("dj_") != '-1') {
+            } else if (module.indexOf("dj_") != '-1' || module.indexOf("jj_") != '-1') {
+              fullUrl = fullUrl.split('?_')[0].split('/approval/all')[0];
+            } else if (module.indexOf("hoa_") != '-1') {
               var category = module.split("_")[0];
               mobilePath = module.substring(module.indexOf("_") + 1);
               fullUrl = fullUrl.replace("/" + projectPath + "/", "/" + category + "/" + mobilePath + "/").split('?_')[0].split('/approval/all')[0];

package/lib/upload/upload.js

@@ -188,7 +188,7 @@ var PageHome = function (_React$Component) {
 
 
         var dir = props.dir;
-        var businessExt = props.extensions;
+        var businessExt = props.extensions ? props.extensions : "";
         var context = document.getElementById("context").value;
         var token = getLoginUserInfo().token;
         _this.state = {

package/package.json

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