fmui-base 1.0.7 → 1.0.9

package/lib/form/form.js

@@ -126,7 +126,7 @@ var PageHome = function (_React$Component) {
     /* alert(commentField);*/
     var context = document.getElementById("context").value;
     //alert(props.defaultValue);
-    var module = props.module;
+    var module = props.module && props.module != "undefined" ? props.module : "approve";
     FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
     _this.state = {
       module: module,

package/lib/form/subForm.js

@@ -49,12 +49,12 @@ var PageHome = function (_React$Component) {
     var status = props.status;
     var context = document.getElementById("context").value;
 
-    var module = props.module;
+    var module = props.module && props.module != "undefined" ? props.module : "approve";
     FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
     // var itemParam = 
     _this.state = {
-      module: props.module,
+      module: module,
       status: status,
       fieldControll: props.fieldControll,
       urlPrev: context + '/dingisv/api/common/viewImage?fid=',

package/lib/form/table.js

@@ -107,7 +107,7 @@ var PageHome = function (_React$Component) {
 			spyj: defaultValue
 		};
 
-		var module = props.module;
+		var module = props.module && props.module != "undefined" ? props.module : "approve";
 		FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
 		return _this;

package/lib/form_info/formInfo.js

@@ -202,7 +202,7 @@ var PageHome = function (_React$Component) {
         var keyNum = _this.GenNonDuplicateID(8);
 
         // let category = this.props.params.category;//模块
-        var module = props.module; //分类
+        var module = props.module && props.module != "undefined" ? props.module : "approve"; //分类
         searchVal = props.search;
         if (!module) {
             module = "approve";

package/lib/process_batch/processBatch.js

@@ -92,7 +92,7 @@ var PageHome = function (_React$Component) {
 
         var defaultComment = '';
         var category = props.category; //分类
-        var module = props.module; //模块
+        var module = props.module && props.module != "undefined" ? props.module : "approve"; //模块
         if (!module) {
             module = "approve";
         }

package/lib/process_info/RelationProcess.js

@@ -72,9 +72,9 @@ var Page = function (_React$Component) {
     key: 'clickDetail',
     value: function clickDetail(item) {
       var processInstanceId = item.processInstanceId;
-      var formKey = item.formKey;
+      var formId = item.formId;
       var module = item.module;
-      var url = "process/processDetails/-99/" + formKey + "/-99/-99/0/" + processInstanceId + "/" + module;
+      var url = "process/processDetails/-99/" + formId + "/-99/-99/0/" + processInstanceId + "/" + module;
       decodeURI(url);
       location.hash = url;
       //location.reload();

package/lib/process_info/processInfo.js

@@ -240,7 +240,7 @@ var PageHome = function (_React$Component) {
         var keyNum = _this.GenNonDuplicateID(8);
 
         // let category = this.props.params.category;//模块
-        var module = props.module; //分类
+        var module = props.module && props.module != "undefined" ? props.module : "approve";; //分类
         searchVal = props.search;
         if (!module) {
             module = "approve";

package/lib/process_list/processList.js

@@ -131,9 +131,9 @@ var ListItem = function (_React$Component) {
             if (module.indexOf("_") > 0) {
               var category = module.split("_")[0];
               mobilePath = module.substring(module.indexOf("_") + 1);
-              fullUrl = fullUrl.replace(/approve/g, mobilePath).replace("/modules/", "/" + category + "/").split('?_')[0].split('/approval/all')[0];
+              fullUrl = fullUrl.replace(/mobileoffice/g, mobilePath).replace("/modules/", "/" + category + "/").split('?_')[0].split('/approval/all')[0];
             } else {
-              fullUrl = fullUrl.replace(/approve/g, mobilePath).split('?_')[0].split('/approval/all')[0];
+              fullUrl = fullUrl.replace(/mobileoffice/g, mobilePath).split('?_')[0].split('/approval/all')[0];
             }
             //alert(fullUrl);
             var _url = "process/processDetails/" + taskId + "/" + param_formKey + "/" + param_businessKey + "/" + param_list_type + "/0/" + processInstanceId + "/" + module + "/" + loginUserId;

package/lib/selectMember/select.js

@@ -6856,7 +6856,7 @@ var Page = function (_React$Component) {
           {animationType:'slide-left'}
         ); */
         this.instance = {
-          popupSelect: _Popup2.default.show(this.getContent(), { animationType: 'slide-left' }),
+          popupSelect: _Popup2.default.show(this.getContent(), { animationType: 'slide-left', className: "select-member-div-top" }),
           update: function update(content, isCheckItem) {
             this.popupSelect.update(content);
             if (isCheckItem) {
@@ -6865,7 +6865,7 @@ var Page = function (_React$Component) {
             $('#anchor').scrollTop(0);
           }
         };
-        $(".select-member-div-class").parents(".t-popup").css({ "left": "0", "background": "#f7f7f7" });
+        // $(".select-member-div-class").parents(".t-popup").css({ "left": "0", "background": "#f7f7f7" });
         var curOrgUserUrl = t.getFetchUrl("curOrgUser", '', '', false, false);
         //获取当前组织所有用户
         fetch(curOrgUserUrl, {

package/lib/selectMember/select.less

@@ -22,4 +22,8 @@
 }
 .t-checkbox-field-icon-list {
     background: #38adff;
+}
+.select-member-div-top{
+  left: 0;
+  background: #f7f7f7;
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "fmui-base",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "title": "fmui-base",
-  "description": "subForm文件中单词错误",
+  "description": "流程组件修改",
   "main": "lib/index.js",
   "files": [
     "dist",