fmui-base 1.0.6 → 1.0.7

package/lib/form/form.js

@@ -537,7 +537,23 @@ var PageHome = function (_React$Component) {
         }
 
         itemParam.dateFormat = dateFormat;
-        if (value && value.length >= 10) {
+        if (value && Array.isArray(value)) {
+          if (value.length == 5) {
+            var month = value[1] < 10 ? '0' + value[1] : value[1];
+            var day = value[2] < 10 ? '0' + value[2] : value[2];
+            var min = value[3] < 10 ? '0' + value[3] : value[3];
+            var second = value[4] < 10 ? '0' + value[4] : value[4];
+            value = value[0] + "/" + month + "/" + day + " " + min + ":" + second;
+            value = new Date(value).getTime();
+          } else if (value.length == 3) {
+            var month = value[1] < 10 ? '0' + value[1] : value[1];
+            var day = value[2] < 10 ? '0' + value[2] : value[2];
+            value = value[0] + "/" + month + "/" + day;
+            value = new Date(value).getTime();
+          } else {
+            value = null;
+          }
+        } else if (value && value.length >= 10) {
           value = value.substring(0, 19);
           value = new Date(value.replace(/-/g, "/")).getTime();
         } else {

package/lib/process_list/processList.js

@@ -402,7 +402,7 @@ var PageHome = function (_React$Component2) {
     var activeIndex = props.activeIndex ? props.activeIndex : 0;
     var module = props.module ? props.module : "approve";
     var type = props.type ? props.type : "self"; //self：本应用，all:全模块
-    var tabCodes = props.tabCodes ? props.tabCodes : "undo,unread,done,read,myself"; //self：本应用，all:全模块
+    var tabCodes = props.tabCodes ? props.tabCodes : "undo,unread,done,read,myself"; //标签页
     var searchVal = props.search;
     if (constIndex == '') {
       if (!activeIndex) {
@@ -424,11 +424,11 @@ var PageHome = function (_React$Component2) {
       readListUrl = _variables2.default.URLS.transaction.read + "&module=" + module;
       myselfListUrl = _variables2.default.URLS.transaction.myself + "&module=" + module;
     } else {
-      undoListUrl = _variables2.default.URLS.transaction.undo;
-      unreadListUrl = _variables2.default.URLS.transaction.unread;
-      doneListUrl = _variables2.default.URLS.transaction.done;
-      readListUrl = _variables2.default.URLS.transaction.read;
-      myselfListUrl = _variables2.default.URLS.transaction.myself;
+      undoListUrl = _variables2.default.URLS.transaction.undo + "&unified=1&sourceType=unitedapprove";
+      unreadListUrl = _variables2.default.URLS.transaction.unread + "&unified=1&sourceType=unitedapprove";
+      doneListUrl = _variables2.default.URLS.transaction.done + "&unified=1&sourceType=unitedapprove";
+      readListUrl = _variables2.default.URLS.transaction.read + "&unified=1&sourceType=unitedapprove";
+      myselfListUrl = _variables2.default.URLS.transaction.myself + "&unified=1&sourceType=unitedapprove";
     }
     _this2.state = {
       tabCodes: tabCodes,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "title": "fmui-base",
   "description": "subForm文件中单词错误",
   "main": "lib/index.js",