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

CHANGELOG.md

@@ -1,3 +1,44 @@
+## v3.1.18
+
+`2022-03-25` 此版本依赖 Taro 3.4.x
+
+NutUI 非常感谢您对开源事业做出的贡献！🌷🌷🌷
+本次社区贡献者 @agileago @AsherSun @wuyunkuo @wangrongding
+
+* :zap: feat: [在线主题定制](https://nutui.jd.com/theme/#/base)
+* :zap: feat: 所有组件增加单元测试
+* :zap: feat: picker 与 datePicker 重构 (#1131)  @yangxiaolu1993
+* :zap: feat(list): 新增虚拟列表组件 @szg2008
+* :zap: feat(noticebar): 新增功能(多行展示、关闭按钮可扩展) (#1072) @yangxiaolu1993
+* :zap: feat(address): 功能扩展 (#1083) @yangxiaolu1993
+* :zap: feat(steps): provide click-step event, slot for title and content @szg2008
+* :zap: feat: 日历组件调整 (#1090)  @lkjh3214
+* :zap: feat(input): input部分新增功能 (#1076)  @ailululu
+* :zap: feat(textarea): 组件优化 (#1107)  @Ymm0008
+* :zap: feat(tabbar): add dot props (#1147)  @Drjingfubo
+* :zap: feat: collapse 标题多行展示,无内容不下拉,图标位置配置,textarea 自动撑开，collapse 组件能力 (#1121)  @Ymm0008
+* :zap: feat: range组件，功能完善 (#1129)   @lkjh3214
+* :bug: fix: popover/navbar props and warning (#1044 #1051)  @liqiong-lab
+* :bug: fix(navbar): 文档修复  @richard1015
+* :bug: fix(cell、grid): cdn router warn bug #1070  @richard1015
+* :bug: fix(navbar): 新增顶部固定props及安全区适配 (#1058)  @liqiong-lab
+* :bug: fix(overlay): provide modify style  @szg2008
+* :bug: fix(searchbar): taro-h5环境enter触发无效 (#1088)   @JackieScorpio
+* :bug: fix: 修复tsx下类型错误 (#1097)   @agileago
+* :bug: fix(cell): sub-title icon 并存时样式错乱 #1092   @richard1015
+* :bug: fix(checkbox): 修复checkboxgroup的disabled的属性不是响应式的问题 (#1113)    @AsherSun
+* :bug: fix(checkbox): 修改checkbox文档中的描述错误 (#1112)    @AsherSun
+* :bug: fix: 修复日期选择器modelValue不能双向数据绑定的BUG (#1093)    @wuyunkuo
+* :bug: fix(button): taro h5 width abnormal   @richard1015
+* :bug: fix(form): taro3.4.x submit refresh #1041  @richard1015
+* :bug: fix(uploader): taro h5 3.4.x style cover  @richard1015
+* :bug: fix(form): check rule reference value disconnect #1053 @richard1015
+* :bug: fix: 日历组件字段问题修复 (#1130) @lkjh3214
+* :bug: fix(progress): resolve issue #1138 (#1141) @Drjingfubo
+* :bug: fix(progress): add text-background props,update variables.scss (#1145) @Drjingfubo
+* :bug: fix(countdown): 修复倒计时组件重复更新end-time时的组件更新问题 (#1119) (#1120)  @wangrongding
+* :bug: fix(swiper): 当只有一张图时，高度超出css设置的值(#1109)  @szg2008
+
 ## v3.1.17
 
 `2022-02-25` 此版本依赖 Taro 3.4.x

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui",
-  "version": "3.1.17",
+  "version": "3.1.18",
   "description": "京东风格的轻量级移动端 Vue2、Vue3 组件库（支持小程序开发）",
   "main": "dist/nutui.umd.js",
   "module": "dist/nutui.es.js",

src/packages/styles/variables-jdt.scss

@@ -87,6 +87,7 @@ $cell-padding: 14px 16px !default;
 $cell-line-height: 22px !default;
 $cell-after-right: 0 !default;
 $cell-after-border-bottom: 2px solid rgba(0, 0, 0, 0.1) !default;
+$cell-default-icon-margin: 0 4px 0 0px !default;
 
 // cell-group
 
@@ -203,7 +204,7 @@ $numberkeyboard-key-finish-font-size-color: #fff !default;
 $numberkeyboard-key-finish-background-color: #1989fa !default;
 $numberkeyboard-key-activeFinsh-background-color: #0570db !default;
 
-//countdown
+// countdown
 $countdown-display: flex !default;
 $countdown-color: inherit !default;
 $countdown-font-size: initial !default;

src/packages/styles/variables.scss

@@ -100,7 +100,7 @@ $cell-padding: 13px 16px !default;
 $cell-line-height: 20px !default;
 $cell-after-right: 16px !default;
 $cell-after-border-bottom: 2px solid #f5f6f7 !default;
-$cell-default-icon-margin: 0 4px 0 0px;
+$cell-default-icon-margin: 0 4px 0 0px !default;
 
 // cell-group
 

src/sites/mobile-taro/vue/src/app.config.ts

@@ -1,44 +1,25 @@
 let subpackages = [
   {
     root: 'layout',
-    pages: ['pages/layout/index', 'pages/imagepreview/index', 'pages/sticky/index']
+    pages: ['pages/layout/index', 'pages/divider/index', 'pages/sticky/index', 'pages/grid/index']
   },
   {
     root: 'feedback',
     pages: [
       'pages/swipe/index',
-      'pages/collapse/index',
       'pages/backtop/index',
       'pages/actionsheet/index',
       'pages/dialog/index',
       'pages/toast/index',
       'pages/notify/index',
-      'pages/empty/index',
-      'pages/noticebar/index',
-      'pages/range/index',
-      'pages/popup/index',
       'pages/switch/index',
-      'pages/swiper/index',
       'pages/drag/index',
-      'pages/steps/index',
-      'pages/infiniteloading/index',
-      'pages/progress/index',
-      'pages/circleprogress/index',
-      'pages/searchbar/index',
-      'pages/list/index'
+      'pages/infiniteloading/index'
     ]
   },
   {
     root: 'base',
-    pages: [
-      'pages/cell/index',
-      'pages/icon/index',
-      'pages/price/index',
-      'pages/button/index',
-      'pages/avatar/index',
-      'pages/overlay/index',
-      'pages/divider/index'
-    ]
+    pages: ['pages/cell/index', 'pages/icon/index', 'pages/button/index', 'pages/overlay/index', 'pages/popup/index']
   },
   {
     root: 'nav',
@@ -51,13 +32,13 @@ let subpackages = [
       'pages/menu/index',
       'pages/pagination/index',
       'pages/indicator/index',
-      'pages/grid/index',
       'pages/sidenavbar/index'
     ]
   },
   {
     root: 'dentry',
     pages: [
+      'pages/range/index',
       'pages/inputnumber/index',
       'pages/checkbox/index',
       'pages/input/index',
@@ -70,15 +51,33 @@ let subpackages = [
       'pages/picker/index',
       'pages/datepicker/index',
       'pages/textarea/index',
+      'pages/numberkeyboard/index',
+      'pages/cascader/index',
+      'pages/oldpicker/index',
+      'pages/searchbar/index'
+    ]
+  },
+  {
+    root: 'exhibition',
+    pages: [
+      'pages/avatar/index',
+      'pages/price/index',
+      'pages/imagepreview/index',
+      'pages/collapse/index',
+      'pages/empty/index',
+      'pages/noticebar/index',
+      'pages/steps/index',
+      'pages/progress/index',
+      'pages/circleprogress/index',
+      'pages/list/index',
       'pages/countdown/index',
       'pages/countup/index',
-      'pages/numberkeyboard/index',
       'pages/badge/index',
       'pages/tag/index',
       'pages/popover/index',
       'pages/skeleton/index',
-      'pages/cascader/index',
-      'pages/oldpicker/index'
+      'pages/table/index',
+      'pages/swiper/index'
     ]
   },
   {
@@ -89,8 +88,7 @@ let subpackages = [
       'pages/barrage/index',
       'pages/timeselect/index',
       'pages/sku/index',
-      'pages/card/index',
-      'pages/table/index'
+      'pages/card/index'
     ]
   }
 ];

src/sites/mobile-taro/vue/src/base/pages/popup/index.vue

@@ -0,0 +1,71 @@
+<template>
+  <div class="demo">
+    <h2>基础用法</h2>
+    <nut-cell title="展示弹出层" is-link @click="state.showBasic = true"></nut-cell>
+    <nut-popup pop-class="popclass" :style="{ padding: '30px 50px' }" v-model:visible="state.showBasic" :z-index="100"
+      >正文</nut-popup
+    >
+    <h2>弹出位置</h2>
+    <nut-cell title="顶部弹出" is-link @click="state.showTop = true"></nut-cell>
+    <nut-popup position="top" :style="{ height: '20%' }" v-model:visible="state.showTop"></nut-popup>
+    <nut-cell title="底部弹出" is-link @click="state.showBottom = true"></nut-cell>
+    <nut-popup position="bottom" :style="{ height: '20%' }" v-model:visible="state.showBottom"></nut-popup>
+    <nut-cell title="左侧弹出" is-link @click="state.showLeft = true"></nut-cell>
+    <nut-popup position="left" :style="{ width: '20%', height: '100%' }" v-model:visible="state.showLeft"></nut-popup>
+    <nut-cell title="右侧弹出" is-link @click="state.showRight = true"></nut-cell>
+    <nut-popup position="right" :style="{ width: '20%', height: '100%' }" v-model:visible="state.showRight"></nut-popup>
+    <h2>关闭图标</h2>
+    <nut-cell title="关闭图标" is-link @click="state.showIcon = true"></nut-cell>
+    <nut-popup position="bottom" closeable :style="{ height: '20%' }" v-model:visible="state.showIcon"></nut-popup>
+    <nut-cell title="图标位置" is-link @click="state.showIconPosition = true"></nut-cell>
+    <nut-popup
+      position="bottom"
+      closeable
+      close-icon-position="top-left"
+      :style="{ height: '20%' }"
+      v-model:visible="state.showIconPosition"
+    ></nut-popup>
+    <nut-cell title="自定义图标" is-link @click="state.showCloseIcon = true"></nut-cell>
+    <nut-popup
+      position="bottom"
+      closeable
+      close-icon-position="top-left"
+      close-icon="heart"
+      :style="{ height: '20%' }"
+      v-model:visible="state.showCloseIcon"
+    ></nut-popup>
+    <h2>圆角弹框</h2>
+    <nut-cell title="圆角弹框" is-link @click="state.showRound = true"></nut-cell>
+    <nut-popup
+      position="bottom"
+      closeable
+      round
+      :style="{ height: '30%' }"
+      v-model:visible="state.showRound"
+    ></nut-popup>
+  </div>
+</template>
+
+<script lang="ts">
+import { reactive } from 'vue';
+export default {
+  props: {},
+  setup() {
+    const state = reactive({
+      showBasic: false,
+      showTop: false,
+      showBottom: false,
+      showLeft: false,
+      showRight: false,
+      showIcon: false,
+      showIconPosition: false,
+      showCloseIcon: false,
+      showRound: false,
+      showCombination: false
+    });
+    return { state };
+  }
+};
+</script>
+
+<style lang="scss"></style>

src/sites/mobile-taro/vue/src/dentry/pages/countdown/index.vue

@@ -31,16 +31,9 @@
     <h2>控制开始和暂停的倒计时</h2>
 
     <nut-cell>
-      <nut-countdown
-        :endTime="end"
-        :paused="paused"
-        @on-paused="onpaused"
-        @on-restart="onrestart"
-      />
+      <nut-countdown :endTime="end" :paused="paused" @on-paused="onpaused" @on-restart="onrestart" />
       <div style="position: absolute; right: 10px; top: 9px">
-        <nut-button type="primary" size="small" @click="toggle">{{
-          paused ? 'start' : 'stop'
-        }}</nut-button>
+        <nut-button type="primary" size="small" @click="toggle">{{ paused ? 'start' : 'stop' }}</nut-button>
       </div>
     </nut-cell>
 

src/sites/mobile-taro/vue/src/feedback/pages/popup/index.vue

@@ -1,128 +0,0 @@
-<template>
-  <div class="demo">
-    <h2>基础用法</h2>
-    <nut-cell
-      title="展示弹出层"
-      is-link
-      @click="state.showBasic = true"
-    ></nut-cell>
-    <nut-popup
-      pop-class="popclass"
-      :style="{ padding: '30px 50px' }"
-      v-model:visible="state.showBasic"
-      :z-index="100"
-      >正文</nut-popup
-    >
-    <h2>弹出位置</h2>
-    <nut-cell title="顶部弹出" is-link @click="state.showTop = true"></nut-cell>
-    <nut-popup
-      position="top"
-      :style="{ height: '20%' }"
-      v-model:visible="state.showTop"
-    ></nut-popup>
-    <nut-cell
-      title="底部弹出"
-      is-link
-      @click="state.showBottom = true"
-    ></nut-cell>
-    <nut-popup
-      position="bottom"
-      :style="{ height: '20%' }"
-      v-model:visible="state.showBottom"
-    ></nut-popup>
-    <nut-cell
-      title="左侧弹出"
-      is-link
-      @click="state.showLeft = true"
-    ></nut-cell>
-    <nut-popup
-      position="left"
-      :style="{ width: '20%', height: '100%' }"
-      v-model:visible="state.showLeft"
-    ></nut-popup>
-    <nut-cell
-      title="右侧弹出"
-      is-link
-      @click="state.showRight = true"
-    ></nut-cell>
-    <nut-popup
-      position="right"
-      :style="{ width: '20%', height: '100%' }"
-      v-model:visible="state.showRight"
-    ></nut-popup>
-    <h2>关闭图标</h2>
-    <nut-cell
-      title="关闭图标"
-      is-link
-      @click="state.showIcon = true"
-    ></nut-cell>
-    <nut-popup
-      position="bottom"
-      closeable
-      :style="{ height: '20%' }"
-      v-model:visible="state.showIcon"
-    ></nut-popup>
-    <nut-cell
-      title="图标位置"
-      is-link
-      @click="state.showIconPosition = true"
-    ></nut-cell>
-    <nut-popup
-      position="bottom"
-      closeable
-      close-icon-position="top-left"
-      :style="{ height: '20%' }"
-      v-model:visible="state.showIconPosition"
-    ></nut-popup>
-    <nut-cell
-      title="自定义图标"
-      is-link
-      @click="state.showCloseIcon = true"
-    ></nut-cell>
-    <nut-popup
-      position="bottom"
-      closeable
-      close-icon-position="top-left"
-      close-icon="heart"
-      :style="{ height: '20%' }"
-      v-model:visible="state.showCloseIcon"
-    ></nut-popup>
-    <h2>圆角弹框</h2>
-    <nut-cell
-      title="圆角弹框"
-      is-link
-      @click="state.showRound = true"
-    ></nut-cell>
-    <nut-popup
-      position="bottom"
-      closeable
-      round
-      :style="{ height: '30%' }"
-      v-model:visible="state.showRound"
-    ></nut-popup>
-  </div>
-</template>
-
-<script lang="ts">
-import { reactive } from 'vue';
-export default {
-  props: {},
-  setup() {
-    const state = reactive({
-      showBasic: false,
-      showTop: false,
-      showBottom: false,
-      showLeft: false,
-      showRight: false,
-      showIcon: false,
-      showIconPosition: false,
-      showCloseIcon: false,
-      showRound: false,
-      showCombination: false
-    });
-    return { state };
-  }
-};
-</script>
-
-<style lang="scss"></style>

src/sites/mobile-taro/vue/src/pages/index/index.vue

@@ -15,7 +15,7 @@
       <ol v-for="_nav in nav" :key="_nav">
         <li>{{ _nav.name }}</li>
         <ul>
-          <template v-for="_package in _nav.packages" :key="_package">
+          <template v-for="_package in reorder(_nav.packages)" :key="_package">
             <li v-if="_package.show">
               <a @click="navigateTo(_package.name.toLowerCase(), _nav.enName)">
                 {{ _package.name }}
@@ -55,6 +55,12 @@ export default {
       nav
     });
 
+    const reorder = (packages: any) => {
+      return packages.sort(function (x: any, y: any) {
+        return x['name'].toLowerCase().localeCompare(y['name'].toLowerCase());
+      });
+    };
+
     const navigateTo = (name, enName) => {
       Taro.navigateTo({
         url: `/${enName}/pages/${name}/index`
@@ -63,6 +69,7 @@ export default {
 
     return {
       ...toRefs(state),
+      reorder,
       navigateTo
     };
   }

vite.config.build.disperse.ts

@@ -14,10 +14,8 @@ let input = {};
 
 configPkg.nav.map((item) => {
   item.packages.forEach((element) => {
-    let { name, show, type, exportEmpty } = element;
-    if (show || exportEmpty) {
-      input[name] = `./src/packages/__VUE/${name.toLowerCase()}/index${type === 'methods' ? '.ts' : '.vue'}`;
-    }
+    let { name, type } = element;
+    input[name] = `./src/packages/__VUE/${name.toLowerCase()}/index${type === 'methods' ? '.ts' : '.vue'}`;
   });
 });
 

vite.config.build.taro.vue.disperse.ts

@@ -1,6 +1,7 @@
 import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
 import path from 'path';
+const fs = require('fs-extra');
 import config from './package.json';
 import configPkg from './src/config.json';
 
@@ -14,12 +15,9 @@ let input = {};
 
 configPkg.nav.map((item) => {
   item.packages.forEach((element) => {
-    let { name, show, taro, type, exportEmpty, exportEmptyTaro } = element;
-    if (taro && (show || exportEmpty)) {
-      input[name] = `./src/packages/__VUE/${name.toLowerCase()}/index${
-        exportEmpty && !exportEmptyTaro ? '.vue' : '.taro.vue'
-      }`;
-    }
+    let { name } = element;
+    const filePath = path.join(`./src/packages/__VUE/${name.toLowerCase()}/index.taro.vue`);
+    input[name] = `./src/packages/__VUE/${name.toLowerCase()}/index${fs.existsSync(filePath) ? '.taro' : ''}.vue`;
   });
 });