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

src/packages/__VUE/address/demo.vue

@@ -286,7 +286,6 @@ export default createDemo({
       }
     };
     const close1 = (val: CalResult) => {
-      console.log(val);
       text.one = val.data.addressStr;
     };
 

src/packages/__VUE/address/doc.en-US.md

@@ -70,7 +70,6 @@ app.use(Address);
           }
         };
         const close = val => {
-          console.log(val);
           text.value = val.data.addressStr;
         };
 

src/packages/__VUE/address/doc.md

@@ -56,7 +56,7 @@ app.use(Address);
           town:[]
         })
 
-        const text = ref('请选择地址')
+        const text = ref('选择地址')
 
         const showAddress = () => {
           showPopup.value = !showPopup.value;
@@ -279,7 +279,7 @@ app.use(Address);
           }
         ]);
 
-        const text = ref('请选择地址')
+        const text = ref('选择地址')
 
         const showAddressExist = () => {
           showPopupExist.value = true;
@@ -313,7 +313,7 @@ app.use(Address);
   <nut-address
       v-model:visible="showPopupCustomImg"
       type="exist"
-      :existAddress="existAddress"
+      :exist-address="existAddress"
       @close="close"
       :is-show-custom-address="false"
       @selected="selected3"
@@ -374,7 +374,7 @@ app.use(Address);
           }
         ]);
 
-        const text = ref('请选择地址')
+        const text = ref('选择地址')
 
         const showCustomImg = () => {
           showPopupCustomImg.value = true;
@@ -500,7 +500,7 @@ app.use(Address);
           }
         ]);
         const backBtnIcon = ref('left')
-        const text = ref('请选择地址')
+        const text = ref('选择地址')
 
         const showAddressOther = () => {
           showPopupOther.value = true;

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_   |

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_   |

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_   |

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;

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();
         }

src/packages/__VUE/configprovider/doc.taro.md

@@ -60,10 +60,10 @@ app.use(ConfigProvider);
 
 #### 示例
 
-这些变量的默认值被定义在 `page` 节点上：
+这些变量的默认值被定义在 `page` 节点上，如果要转 `H5`，默认值被定义在 `:root` 节点上
 
 ```css
-page {
+page, :root {
     --nut-primary-color: #fa2c19;
     --nut-primary-color-end: #fa6419;
 }
@@ -75,7 +75,7 @@ page {
 
 ```css
 /* 添加这段样式后，Primary Button 会变成绿色 */
-:root {
+page, :root {
   --nut-button-primary-background-color: green;
 }
 ```

src/packages/__VUE/grid/demo.vue

@@ -93,8 +93,8 @@ import { useTranslate } from '@/sites/assets/util/useTranslate';
 import { Dongdong, Home, Search } from '@nutui/icons-vue';
 const initTranslate = () =>
   useTranslate({
-    'zh-CN': {基础用法
-      basic: '基本用法',
+    'zh-CN': {
+      basic: '基础用法',
       text: '文字',
       columnNum: '自定义列数',
       square: '正方形格子',

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;

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;

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;

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;