Merge pull request #1160 from thomasyxy/next

修复日历组件marks参数失效

Author: Chen-jj

packages/taro-ui/src/components/calendar/common/helper.ts

@@ -12,6 +12,11 @@ function getFullItem(
   selectedDate: Calendar.SelectedDate,
   isShowStatus?: boolean
 ): any {
+  if (options.marks.find(x => x.value === item.value)) {
+    (item.marks as Array<Calendar.Mark>) = [{
+      value: item.value as string
+    }]
+  }
   if (!isShowStatus) return item
 
   const bindedPlugins = plugins.map(fn =>

packages/taro-ui/src/components/calendar/ui/date-list/index.tsx

@@ -66,7 +66,7 @@ export default class AtCalendarList extends React.Component<Props> {
                 <View className='extra-marks'>
                   {item.marks.map((mark, key) => (
                     <Text key={key} className='mark'>
-                      {mark}
+                      {mark.value}
                     </Text>
                   ))}
                 </View>