fix: 修改报错

Author: hy

packages/core/src/ButtonGroup/index.tsx

@@ -80,7 +80,7 @@ export default class ButtonGroup extends Component<ButtonGroupProps> {
             childStyle.borderWidth = 0;
           }
           if (bordered && !gutter) {
-            if ((idx > 0 && idx < (children as ButtonProps[]).length - 1) || idx === 0) {
+            if (((idx > 0 && idx < (children as ButtonProps[]).length - 1)) || idx === 0) {
               childStyle.borderRightWidth = StyleSheet.hairlineWidth;
             }
             if (idx > 0 && idx < (children as ButtonProps[]).length) {

packages/core/src/Calendar/index.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { View, Text, ViewProps, TextProps, StyleSheet, TouchableOpacity, Dimensions, Platform } from 'react-native';
+import { View, Text, ViewProps, StyleSheet, TouchableOpacity, Dimensions, Platform } from 'react-native';
 import Icon from '../Icon';
 import Ellipsis from '../Ellipsis';
 import { getMonths, getWeeksArray, daysArrProps, getType, getNameLen } from './utils';
@@ -211,9 +211,9 @@ const Calendar = (props: CalendarProps) => {
     setCurrentMonth(toMonth);
     setCurrentDays(toDays);
   };
-  const goCurrentDay = (day: number) => {
-    setCurrentDays(day);
-  };
+  // const goCurrentDay = (day: number) => {
+  //   setCurrentDays(day);
+  // };
 
   return (
     <View style={{ flex: 1, position: 'relative' }}>

packages/core/src/Calendar/lunarHolidays.ts

@@ -85,7 +85,7 @@ export function getLunarCalendar(year: number, month: number, day: number, type?
     let getHoliday: CalendarProps = { lunarHolidays: '', colorType: '', lunarMonth: lunarMonth, lunar: lunar };
     return getHoliday;
   }
-  return lunar;
+  // return lunar;
 }
 
 export interface lunarProps {
@@ -120,21 +120,21 @@ export function Lunar(year: number, month: number, day: number): lunarProps {
   isLeap = false;
   for (i = 1; i < 13 && offset > 0; i++) {
     // 闰月
-    if (leap > 0 && i == leap + 1 && isLeap == false) {
+    if (leap > 0 && i === leap + 1 && isLeap === false) {
       --i;
       isLeap = true;
       temp = leapDays(years);
     } else {
       temp = monthDays(years, i);
     }
     // 解除闰月
-    if (isLeap == true && i == leap + 1) {
+    if (isLeap === true && i === leap + 1) {
       isLeap = false;
     }
     offset -= temp;
   }
 
-  if (offset == 0 && leap > 0 && i == leap + 1) {
+  if (offset === 0 && leap > 0 && i === leap + 1) {
     if (isLeap) {
       isLeap = false;
     } else {
@@ -173,7 +173,7 @@ export function lYearDays(year: number) {
  */
 export function leapDays(year: number) {
   if (leapMonth(year)) {
-    return (lunarInfo[year - 1899] & 0xf) == 0xf ? 30 : 29;
+    return (lunarInfo[year - 1899] & 0xf) === 0xf ? 30 : 29;
   } else {
     return 0;
   }
@@ -184,14 +184,14 @@ export function leapDays(year: number) {
  */
 export function leapMonth(year: number) {
   let lm = lunarInfo[year - 1900] & 0xf;
-  return lm == 0xf ? 0 : lm;
+  return lm === 0xf ? 0 : lm;
 }
 
 /**
  *返回农历y年m月的总天数
  */
 export function monthDays(year: number, month: number) {
-  return lunarInfo[year - 1900] & (0x10000 >> month) ? 30 : 29;
+  return (lunarInfo[year - 1900] & (0x10000 >> month)) ? 30 : 29;
 }
 
 /**

packages/core/src/Calendar/show.tsx

@@ -1,13 +1,13 @@
-import React, { useEffect, useState } from 'react';
-import { View, Text, ViewProps, TextProps, StyleSheet, TouchableOpacity } from 'react-native';
-import Icon from '../Icon';
+import React from 'react';
+import { View, Text, ViewProps, StyleSheet } from 'react-native';
+// import Icon from '../Icon';
 
 export interface ShowProps extends ViewProps {
   iconColor?: string;
   lunar?: string;
 }
 const Show = (props: ShowProps) => {
-  const { iconColor = '#329BCB', lunar = '' } = props;
+  const { lunar = '' } = props;
   return (
     <View style={styles.show}>
       <Text style={{ fontSize: 18, fontWeight: 'bold' }}>{lunar}</Text>

packages/core/src/Calendar/utils.ts

@@ -30,7 +30,7 @@ export function getMonths(year: number, month: number, day: number) {
  * 判断年闰年
  */
 export function isLeapYear(year: number) {
-  return year % 400 === 0 || (year % 100 !== 0 && year % 4 === 0);
+  return (year % 400 === 0 || (year % 100 !== 0 && year % 4 === 0));
 }
 
 /**