fix: update set week logic

chore: update set week logic Merge pull request #276 from iamkun/feature/iamkun
iamkun · Jul 11, 2018 · 60b6325 · 60b6325
2 parents f483c66 + 27103f5
commit 60b6325
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 17 deletions.
diff --git a/docs/en/API-reference.md b/docs/en/API-reference.md
@@ -173,6 +173,19 @@ dayjs().set('month', 3); // April
 dayjs().set('second', 30);
 ```
 
+#### List of all available units
+
+| Unit          | Shorthand | Description                              |
+| ------------- | --------- | ---------------------------------------- |
+| `date`        |           | Date of Month                            |
+| `day`         | `d`       | Day of Week (Sunday as 0, Saturday as 6) |
+| `month`       | `M`       | Month                                    |
+| `year`        | `y`       | Year                                     |
+| `hour`        | `h`       | Hour                                     |
+| `minute`      | `m`       | Minute                                   |
+| `second`      | `s`       | Second                                   |
+| `millisecond` | `ms`      | Millisecond                              |
+
 ## Manipulating
 
 `Dayjs` objects can be manipulated in many ways.

diff --git a/docs/ja/API-reference.md b/docs/ja/API-reference.md
@@ -209,6 +209,19 @@ dayjs().set('month', 3); // 4月
 dayjs().set('second', 30);
 ```
 
+#### List of all available units
+
+| Unit          | Shorthand | Description                              |
+| ------------- | --------- | ---------------------------------------- |
+| `date`        |           | Date of Month                            |
+| `day`         | `d`       | Day of Week (Sunday as 0, Saturday as 6) |
+| `month`       | `M`       | Month                                    |
+| `year`        | `y`       | Year                                     |
+| `hour`        | `h`       | Hour                                     |
+| `minute`      | `m`       | Minute                                   |
+| `second`      | `s`       | Second                                   |
+| `millisecond` | `ms`      | Millisecond                              |
+
 ---
 
 ### Manipulate

diff --git a/docs/ko/API-reference.md b/docs/ko/API-reference.md
@@ -173,6 +173,19 @@ dayjs().set('month', 3); // April
 dayjs().set('second', 30);
 ```
 
+#### List of all available units
+
+| Unit          | Shorthand | Description                              |
+| ------------- | --------- | ---------------------------------------- |
+| `date`        |           | Date of Month                            |
+| `day`         | `d`       | Day of Week (Sunday as 0, Saturday as 6) |
+| `month`       | `M`       | Month                                    |
+| `year`        | `y`       | Year                                     |
+| `hour`        | `h`       | Hour                                     |
+| `minute`      | `m`       | Minute                                   |
+| `second`      | `s`       | Second                                   |
+| `millisecond` | `ms`      | Millisecond                              |
+
 ## Manipulating
 
 `Dayjs` 오브젝트는 여러 방법으로 처리할 수 있습니다.

diff --git a/docs/pt-br/API-reference.md b/docs/pt-br/API-reference.md
@@ -192,6 +192,19 @@ dayjs().set('month', 3); // April
 dayjs().set('second', 30);
 ```
 
+#### List of all available units
+
+| Unit          | Shorthand | Description                              |
+| ------------- | --------- | ---------------------------------------- |
+| `date`        |           | Date of Month                            |
+| `day`         | `d`       | Day of Week (Sunday as 0, Saturday as 6) |
+| `month`       | `M`       | Month                                    |
+| `year`        | `y`       | Year                                     |
+| `hour`        | `h`       | Hour                                     |
+| `minute`      | `m`       | Minute                                   |
+| `second`      | `s`       | Second                                   |
+| `millisecond` | `ms`      | Millisecond                              |
+
 ---
 
 ### Manipulação

diff --git a/docs/zh-cn/API-reference.md b/docs/zh-cn/API-reference.md
@@ -158,6 +158,20 @@ dayjs().set('date', 1);
 dayjs().set('month', 3); // 四月
 dayjs().set('second', 30);
 ```
+
+#### 可用单位
+
+| 单位          | 缩写 | 描述                        |
+| ------------- | ---- | --------------------------- |
+| `date`        |      | 日期                        |
+| `day`         | `d`  | 星期几 (星期天 0, 星期六 6) |
+| `month`       | `M`  | 月                          |
+| `year`        | `y`  | 年                          |
+| `hour`        | `h`  | 时                          |
+| `minute`      | `m`  | 分                          |
+| `second`      | `s`  | 秒                          |
+| `millisecond` | `ms` | 毫秒                        |
+
 ---
 ### 操作
 您可以对 `Dayjs` 对象如下增加减少之类的操作：

diff --git a/src/index.js b/src/index.js
@@ -196,7 +196,7 @@ class Dayjs {
     const unit = Utils.prettyUnit(units)
     switch (unit) {
       case C.D:
-        Utils.setDay(this.$d, int)
+        this.$d.setDate(this.$D + (int - this.$W))
         break
       case C.DATE:
         this.$d.setDate(int)

diff --git a/src/utils.js b/src/utils.js
@@ -40,17 +40,7 @@ const prettyUnit = (u) => {
 
 const isUndefined = s => s === undefined
 
-const setDay = (date, day) => {
-  const currentDay = date.getDay()
-  const distance = day - currentDay
-
-  date.setDate(date.getDate() + distance)
-
-  return date
-}
-
 export default {
-  setDay,
   padStart,
   padZoneStr,
   monthDiff,

diff --git a/test/utils.test.js b/test/utils.test.js
@@ -26,9 +26,3 @@ it('PadStart', () => {
   expect(padStart(1, 2, '0')).toBe('01')
   expect(padStart(0, 2, '0')).toBe('00')
 })
-
-it('SetDate', () => {
-  const day = Math.floor((Math.random() * 7) % 6)
-
-  expect(Utils.setDay((new Date()), day).getDay()).toBe(day)
-})