mcrm-mobile 1.1.1 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. package/es/common-utils/index.js +17 -5
  2. package/es/data/MenuIcon.json +1 -1
  3. package/es/directive/index.js +7 -10
  4. package/es/index.css +2 -5
  5. package/es/index.js +1 -1
  6. package/es/menu/index.js +4 -5
  7. package/es/menu-jump/index.js +190 -129
  8. package/es/style/base.css +2 -5
  9. package/es/style/css/iconfont.css +8 -0
  10. package/es/style/fonts/iconfont.ttf +0 -0
  11. package/es/style/fonts/iconfont.woff +0 -0
  12. package/es/style/fonts/iconfont.woff2 +0 -0
  13. package/es/style/theme.less +1 -1
  14. package/es/tabs/index.css +2 -5
  15. package/es/tabs/index.less +1 -5
  16. package/lib/common-utils/index.js +17 -5
  17. package/lib/data/MenuIcon.json +1 -1
  18. package/lib/directive/index.js +7 -10
  19. package/lib/index.css +2 -5
  20. package/lib/index.js +1 -1
  21. package/lib/mcrm-mobile.js +269 -200
  22. package/lib/mcrm-mobile.min.js +5 -5
  23. package/lib/menu/index.js +5 -6
  24. package/lib/menu-jump/index.js +189 -129
  25. package/lib/style/base.css +2 -5
  26. package/lib/style/css/iconfont.css +8 -0
  27. package/lib/style/fonts/iconfont.ttf +0 -0
  28. package/lib/style/fonts/iconfont.woff +0 -0
  29. package/lib/style/fonts/iconfont.woff2 +0 -0
  30. package/lib/style/theme.less +1 -1
  31. package/lib/tabs/index.css +2 -5
  32. package/lib/tabs/index.less +1 -5
  33. package/package.json +1 -1
  34. package/types/common.d.ts +2 -0
  35. package/types/menu-jump.d.ts +1 -0
  36. package/vetur/attributes.json +133 -133
  37. package/vetur/tags.json +35 -35
  38. package/vetur/web-types.json +344 -344
package/es/common-utils/index.js CHANGED
@@ -87,6 +87,7 @@ CommonUtils.formattingTime = function (date, format) {
87
87
  var hour = date.getHours();
88
88
  var min = date.getMinutes();
89
89
  var seconds = date.getSeconds();
90
+ var milliseconds = date.getMilliseconds();
90
91
  var monthS = CommonUtils.zeroPadding(function (val) {
91
92
  return val < 10;
92
93
  }, month);
@@ -102,7 +103,10 @@ CommonUtils.formattingTime = function (date, format) {
102
103
  var secondsS = CommonUtils.zeroPadding(function (val) {
103
104
  return val < 10;
104
105
  }, seconds);
105
- var desc = format.replace("yyyy", year).replace("MM", monthS).replace("dd", dayS).replace("hh", hourS).replace("mm", minS).replace("ss", secondsS);
106
+ var millisecondsS = CommonUtils.zeroPadding(function (val) {
107
+ return val < 10;
108
+ }, milliseconds);
109
+ var desc = format.replace("yyyy", year).replace("MM", monthS).replace("dd", dayS).replace("hh", hourS).replace("mm", minS).replace("ss", secondsS).replace("SSS", millisecondsS);
106
110
  return {
107
111
  date: date,
108
112
  desc: desc,
@@ -111,7 +115,8 @@ CommonUtils.formattingTime = function (date, format) {
111
115
  day: day,
112
116
  hour: hour,
113
117
  min: min,
114
- seconds: seconds
118
+ seconds: seconds,
119
+ milliseconds: milliseconds
115
120
  };
116
121
  };
117
122
 
@@ -133,9 +138,16 @@ CommonUtils.getMonthBefore = function (monthBefore, currDate) {
133
138
  month = currMonth - monthBefore;
134
139
  year = currYear;
135
140
 
136
- if (month <= 0) {
137
- month += 12;
138
- year--;
141
+ if (monthBefore > 0) {
142
+ if (month <= 0) {
143
+ month += 12;
144
+ year--;
145
+ }
146
+ } else {
147
+ if (month > 12) {
148
+ month -= 12;
149
+ year++;
150
+ }
139
151
  }
140
152
 
141
153
  day = CommonUtils.getNumForMonth(year, month);