fix(antd): improve week type moment parse regex (#254)

alibaba · Aug 13, 2019 · 88654b8 · 88654b8
1 parent b19abe2
commit 88654b8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/docs/Examples/antd/International.md b/docs/Examples/antd/International.md
@@ -56,6 +56,13 @@ ReactDOM.render(
           name="daterange"
         />
         <Field type="year" title="年份" name="year" />
+        <Field type="week" title="周" name="week" />
+        <Field
+          type="week"
+          title="周(自定义显示格式)"
+          name="week1"
+          style={{ format: 'gggg年 第w周' }}
+        />
         <Field type="time" title="时间" name="time" />
         <Field
           type="upload"

diff --git a/docs/Examples/antd/Sample.md b/docs/Examples/antd/Sample.md
@@ -90,6 +90,12 @@ ReactDOM.render(
       />
       <Field type="year" title="年份" name="year" />
       <Field type="week" title="周" name="week" />
+      <Field
+        type="week"
+        title="周(自定义显示格式)"
+        name="week1"
+        style={{ format: 'gggg年 第w周' }}
+      />
       <Field type="time" title="时间" name="time" />
       <Field
         type="upload"

diff --git a/packages/antd/src/fields/date.tsx b/packages/antd/src/fields/date.tsx
@@ -118,8 +118,8 @@ registerFormField(
       mapStyledProps,
       props => {
         if (isStr(props.value) && props.value) {
-          const parsed = props.value.match(/(\d+)\s*-\s*(\d+)/) || ['', '', '']
-          props.value = moment(parsed[1], 'YYYY').add(parsed[2], 'weeks')
+          const parsed = props.value.match(/\D*(\d+)\D*(\d+)\D*/) || ['', '', '']
+          props.value = moment(parsed[1], 'YYYY').add(parsed[2] - 1, 'weeks')
         }
         return props
       }