Merge branch 'v4' of https://github.com/jdf2e/nutui into v4

penjj · Jan 7, 2023 · 18db8df · 18db8df
2 parents 8473f1e + 30f4fdb
commit 18db8df
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 18 deletions.
diff --git a/src/packages/__VUE/calendar/doc.en-US.md b/src/packages/__VUE/calendar/doc.en-US.md
@@ -657,8 +657,6 @@ The component provides the following CSS variables, which can be used to customi
 | --nut-calendar-text-font| _var(--nut-font-size-1)_   |
 | --nut-calendar-day-font| _16px_   |
 | --nut-calendar-day-active-border-radius| _0px_   |
-| --nut-calendar-day-width| _14.28%_   |
-| --nut-calendar-day-height| _64px_   |
 | --nut-calendar-day-font-weight| _500_   |
 | --nut-calendar-day67-font-color| _var(--nut-primary-color)_   |
 | --nut-calendar-month-title-font-size| _inherit_   |

diff --git a/src/packages/__VUE/calendar/doc.md b/src/packages/__VUE/calendar/doc.md
@@ -667,8 +667,6 @@ export default {
 | --nut-calendar-text-font| _var(--nut-font-size-1)_   |
 | --nut-calendar-day-font| _16px_   |
 | --nut-calendar-day-active-border-radius| _0px_   |
-| --nut-calendar-day-width| _14.28%_   |
-| --nut-calendar-day-height| _64px_   |
 | --nut-calendar-day-font-weight| _500_   |
 | --nut-calendar-day67-font-color| _var(--nut-primary-color)_   |
 | --nut-calendar-month-title-font-size| _inherit_   |
diff --git a/src/packages/__VUE/calendar/doc.taro.md b/src/packages/__VUE/calendar/doc.taro.md
@@ -661,8 +661,6 @@ export default {
 | --nut-calendar-text-font| _var(--nut-font-size-1)_   |
 | --nut-calendar-day-font| _16px_   |
 | --nut-calendar-day-active-border-radius| _0px_   |
-| --nut-calendar-day-width| _14.28%_   |
-| --nut-calendar-day-height| _64px_   |
 | --nut-calendar-day-font-weight| _500_   |
 | --nut-calendar-day67-font-color| _var(--nut-primary-color)_   |
 | --nut-calendar-month-title-font-size| _inherit_   |

diff --git a/src/packages/__VUE/calendar/index.scss b/src/packages/__VUE/calendar/index.scss
@@ -145,8 +145,8 @@
         }
         .nut-calendar__day {
           float: left;
-          width: $calendar-day-width;
-          height: $calendar-day-height;
+          width: 14.28%;
+          height: 64px;
           font-weight: $calendar-day-font-weight;
           display: flex;
           align-items: center;

diff --git a/src/packages/__VUE/calendaritem/index.taro.vue b/src/packages/__VUE/calendaritem/index.taro.vue
@@ -766,9 +766,12 @@ export default create({
           let toFixed = 3;
           if (TARO_ENV === Taro.ENV_TYPE.WEB) {
             toFixed = 5;
+            let fontSize = document.documentElement.style.fontSize;
+            scale = Number((Number.parseInt(fontSize) / 40).toFixed(toFixed));
+          } else {
+            let screenWidth = res.screenWidth;
+            scale = Number((screenWidth / 750).toFixed(toFixed));
           }
-          let fontSize = document.documentElement.style.fontSize;
-          scale = Number((Number.parseInt(fontSize) / 40).toFixed(toFixed));
           scalePx.value = scale;
           initData();
         }

diff --git a/src/packages/styles/variables-jdb.scss b/src/packages/styles/variables-jdb.scss
@@ -383,8 +383,6 @@ $calendar-sub-title-font: $font-size-2 !default;
 $calendar-text-font: $font-size-1 !default;
 $calendar-day-font: 16px !default;
 $calendar-day-active-border-radius: 0px !default;
-$calendar-day-width: 14.28% !default;
-$calendar-day-height: 64px !default;
 $calendar-day-font-weight: 500 !default;
 $calendar-day67-font-color: $primary-color !default;
 $calendar-month-title-font-size: inherit !default;

diff --git a/src/packages/styles/variables-jddkh.scss b/src/packages/styles/variables-jddkh.scss
@@ -314,8 +314,6 @@ $calendar-sub-title-font: $font-size-2 !default;
 $calendar-text-font: $font-size-1 !default;
 $calendar-day-font: 16px !default;
 $calendar-day-active-border-radius: 0px !default;
-$calendar-day-width: 14.28% !default;
-$calendar-day-height: 54px !default;
 $calendar-day-font-weight: 500 !default;
 $calendar-day67-font-color: $primary-color !default;
 $calendar-month-title-font-size: $font-size-2 !default;

diff --git a/src/packages/styles/variables-jdt.scss b/src/packages/styles/variables-jdt.scss
@@ -320,8 +320,6 @@ $calendar-sub-title-font: var(--nut-calendar-sub-title-font, $font-size-2) !defa
 $calendar-text-font: var(--nut-calendar-text-font, $font-size-1) !default;
 $calendar-day-font: var(--nut-calendar-day-font, 16px) !default;
 $calendar-day-active-border-radius: var(--nut-calendar-day-active-border-radius, 4px) !default;
-$calendar-day-width: var(--nut-calendar-day-width, 14.28%) !default;
-$calendar-day-height: var(--nut-calendar-day-height, 64px) !default;
 $calendar-day-font-weight: var(--nut-calendar-day-font-weight, normal) !default;
 $calendar-day67-font-color: var(--nut-calendar-day67-font-color, $primary-color) !default;
 $calendar-month-title-font-size: var(--nut-calendar-month-title-font-size, inherit) !default;

diff --git a/src/packages/styles/variables.scss b/src/packages/styles/variables.scss
@@ -343,8 +343,6 @@ $calendar-sub-title-font: var(--nut-calendar-sub-title-font, $font-size-2) !defa
 $calendar-text-font: var(--nut-calendar-text-font, $font-size-1) !default;
 $calendar-day-font: var(--nut-calendar-day-font, 16px) !default;
 $calendar-day-active-border-radius: var(--nut-calendar-day-active-border-radius, 0px) !default;
-$calendar-day-width: var(--nut-calendar-day-width, 14.28%) !default;
-$calendar-day-height: var(--nut-calendar-day-height, 64px) !default;
 $calendar-day-font-weight: var(--nut-calendar-day-font-weight, 500) !default;
 $calendar-day67-font-color: var(--nut-calendar-day67-font-color, $primary-color) !default;
 $calendar-month-title-font-size: var(--nut-calendar-month-title-font-size, inherit) !default;