Merge branch 'dev'

Reskings · Jul 25, 2022 · a244dc2 · a244dc2
2 parents 1a8377e + 860cc73
commit a244dc2
Show file tree

Hide file tree

Showing 24 changed files with 392 additions and 380 deletions.
diff --git a/README.md b/README.md
@@ -218,6 +218,7 @@ export default {
 |uni-row|[布局-行](https://ext.dcloud.net.cn/plugin?name=uni-row)|
 |uni-scss|[辅助样式](https://ext.dcloud.net.cn/plugin?name=uni-scss)|
 |uni-search-bar|[搜索栏](https://ext.dcloud.net.cn/plugin?name=uni-search-bar)|
+|uni-section|[标题栏](https://ext.dcloud.net.cn/plugin?name=uni-section)|
 |uni-segmented-control|[分段器](https://ext.dcloud.net.cn/plugin?name=uni-segmented-control)|
 |uni-steps|[步骤条](https://ext.dcloud.net.cn/plugin?name=uni-steps)|
 |uni-swipe-action|[滑动操作](https://ext.dcloud.net.cn/plugin?name=uni-swipe-action)|

diff --git a/components/uni-section/uni-section.vue b/components/uni-section/uni-section.vue
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -7,6 +7,19 @@
 - 主版本号：含有破坏性更新和新特性，不在发布周期内。
 
 <!-- 更新占位 -->
+<log title="1.4.20" date="2022-07-25">
+	<log-item title="uni-forms 组件更新">
+		<log-item-text tag-type="fix">
+			 model 需要校验的值没有声明对应字段时，导致第一次不触发校验的bug
+		</log-item-text>
+	</log-item>
+	<log-item title="uni-section 组件更新">
+		<log-item-text tag-type="perf">
+			 初始化
+		</log-item-text>
+	</log-item>
+</log>
+
 <log title="1.4.19" date="2022-07-07">
 	<log-item title="uni-data-picker 组件更新">
 		<log-item-text tag-type="perf">

diff --git a/docs/components/section.md b/docs/components/section.md
@@ -7,7 +7,7 @@ url : pages/vue/section/section
 代码块： `uSection`
 :::
 
-标题栏，用于显示标题。
+标题栏组件，主要用于文章、列表详情等标题展示。
 
 ### 安装方式
 
@@ -20,17 +20,42 @@ url : pages/vue/section/section
 在 ``template`` 中使用组件
 
 ```html
-<uni-section title="只有主标题"></uni-section>
-<uni-section title="竖线装饰" sub-title="副标题" type="line"></uni-section>
-<uni-section title="圆形装饰" sub-title="副标题" type="circle"></uni-section>
+<uni-section class="mb-10" title="基础用法" sub-title="副标题"></uni-section>
+
+<uni-section class="mb-10" title="竖线装饰" sub-title="副标题" type="line"></uni-section>
+
+<uni-section class="mb-10" title="装饰器插槽" sub-title="副标题">
+  <template v-slot:decoration>
+    <view class="decoration"></view>
+  </template>
+</uni-section>
+
+<uni-section class="mb-10" title="默认插槽" sub-title="副标题">默认插槽内容</uni-section>
+
+<uni-section class="mb-10" title="主标题">
+  <template v-slot:right>
+    right slot
+  </template>
+</uni-section>
 ```
 
 ## API
 
 ### Section Props
 
-|属性名		|类型	|默认值	|说明												|
-|:-:		|:-:	|:-:	|:-:												|
-|type		|String	|-		|标题装饰类型 ，可选值：line（竖线）、circle（圆形）|
-|title		|String	|-		|主标题												|
-|sub-title	|String	|-		|副标题												|
+|属性名|类型|默认值|说明|
+|:-:|:-:|:-:|:-:|
+|type|String|-|装饰类型，可选值：line（竖线）、circle（圆形）、square（方形）|
+|title|String|-|主标题|
+|titleFontSize|String| 14px |主标题字体大小|
+|titleColor|String| #333 |主标题字体颜色|
+|subTitle|String|-|副标题|
+|subTitleFontSize|String| 12px |副标题字体大小|
+|subTitleColor|String| #999 |副标题字体颜色|
+|padding|Boolean/String| false |默认插槽容器的 padding 值，传入类型为 Boolean 时，设置为 10px 或 0|
+
+### Section Events
+
+|事件名|事件说明|返回参数|
+|:-:|:-:|:-:|
+|@click	|点击 Section 触发事件| -|
diff --git a/manifest.json b/manifest.json
@@ -10,6 +10,12 @@
         "nvueCompiler" : "uni-app",
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
+				"splashscreen" : {
+				    "alwaysShowBeforeRender" : true,
+				    "waiting" : true,
+				    "autoclose" : true,
+				    "delay" : 0
+				},
         "modules" : {},
         "distribute" : {
             "android" : {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "55",
 	"name": "@dcloudio/uni-ui",
-	"version": "1.4.19",
+	"version": "1.4.20",
 	"description": "",
 	"author": "dcloud",
 	"license": "Apache-2.0",

diff --git a/packages/README.md b/packages/README.md
@@ -218,6 +218,7 @@ export default {
 |uni-row|[布局-行](https://ext.dcloud.net.cn/plugin?name=uni-row)|
 |uni-scss|[辅助样式](https://ext.dcloud.net.cn/plugin?name=uni-scss)|
 |uni-search-bar|[搜索栏](https://ext.dcloud.net.cn/plugin?name=uni-search-bar)|
+|uni-section|[标题栏](https://ext.dcloud.net.cn/plugin?name=uni-section)|
 |uni-segmented-control|[分段器](https://ext.dcloud.net.cn/plugin?name=uni-segmented-control)|
 |uni-steps|[步骤条](https://ext.dcloud.net.cn/plugin?name=uni-steps)|
 |uni-swipe-action|[滑动操作](https://ext.dcloud.net.cn/plugin?name=uni-swipe-action)|

diff --git a/packages/package.json b/packages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-ui",
-  "version": "1.4.19",
+  "version": "1.4.20",
   "description": "",
   "author": "",
   "license": "Apache-2.0",

diff --git a/pages.json b/pages.json
@@ -227,7 +227,7 @@
 		{
 			"path": "pages/vue/section/section",
 			"style": {
-				"navigationBarTitleText": "Section 章节标题"
+				"navigationBarTitleText": "Section 标题栏"
 			}
 		}, {
 			"path": "pages/vue/transition/transition",

diff --git a/pages/index/index.vue b/pages/index/index.vue
@@ -36,11 +36,11 @@
 				<uni-list>
 					<uni-list-item show-arrow :thumb="'/static/icons/'+view.url+'.png'" v-for="(view, index) in forms"
 						:key="index" :title="view.name" link :to='`/pages/${platform}/${view.url}/${view.url}`' />
-				</uni-list>
-				<uni-section title="DataCom组件" color="#007aff" type="line"></uni-section>
-				<uni-list>
-					<uni-list-item show-arrow :thumb="'/static/icons/'+view.url+'.png'" v-for="(view, index) in dataComs"
-						:key="index" :title="view.name" link :to='`/pages/${platform}/${view.url}/${view.url}`' />
+				</uni-list>
+				<uni-section title="DataCom组件" color="#007aff" type="line"></uni-section>
+				<uni-list>
+					<uni-list-item show-arrow :thumb="'/static/icons/'+view.url+'.png'" v-for="(view, index) in dataComs"
+						:key="index" :title="view.name" link :to='`/pages/${platform}/${view.url}/${view.url}`' />
 				</uni-list>
 				<uni-section title="功能组件" color="#007aff" type="line"></uni-section>
 				<uni-list>
@@ -100,8 +100,11 @@
 					{
 						name: 'Layout 布局',
 						url: 'row'
+					},
+          {
+						name: 'Section 标题栏',
+						url: 'section'
 					}
-
 				],
 				views: [{
 						name: 'Badge 数字角标',
@@ -241,10 +244,10 @@
 					{
 						name: 'Dateformat 日期格式化',
 						url: 'dateformat'
-					},
-					{
-						name: 'Tooltip 文字提示',
-						url: 'tooltip'
+					},
+					{
+						name: 'Tooltip 文字提示',
+						url: 'tooltip'
 					}
 				],
 				navigations: [{
@@ -330,4 +333,4 @@
 		margin-top: 170px;
 		overflow: hidden;
 	}
-</style>
+</style>
diff --git a/pages/vue/card/card.nvue b/pages/vue/card/card.nvue
@@ -3,30 +3,30 @@
 		<uni-card :is-shadow="false" is-full>
 			<text class="uni-h6">卡片组件通用来显示完整独立的一段信息，同时让用户理解他的作用。例如一篇文章的预览图、作者信息、时间等，卡片通常是更复杂和更详细信息的入口点。</text>
 		</uni-card>
-		<uni-section overflow title="基础卡片" type="line">
+		<uni-section title="基础卡片" type="line">
 			<uni-card :is-shadow="false">
 				<text class="uni-body">这是一个基础卡片示例，内容较少，此示例展示了一个没有任何属性不带阴影的卡片。</text>
 			</uni-card>
 		</uni-section>
-		<uni-section overflow title="卡片标题+额外信息" type="line">
+		<uni-section title="卡片标题+额外信息" type="line">
 			<uni-card title="基础卡片" extra="额外信息">
 				<text class="uni-body">这是一个基础卡片示例，此示例展示了一个标题加标题额外信息的标准卡片。</text>
 			</uni-card>
 		</uni-section>
 
-		<uni-section overflow title="双标题卡片" type="line">
+		<uni-section title="双标题卡片" type="line">
 			<uni-card title="基础卡片" sub-title="副标题" extra="额外信息" :thumbnail="avatar" @click="onClick">
 				<text class="uni-body">这是一个带头像和双标题的基础卡片，此示例展示了一个完整的卡片。</text>
 			</uni-card>
 		</uni-section>
 
-		<uni-section overflow title="通栏卡片" type="line">
+		<uni-section title="通栏卡片" type="line">
 			<uni-card title="基础卡片" :isFull="true" sub-title="副标题" extra="额外信息" :thumbnail="avatar">
 				<text class="uni-body">这是一个通栏卡片 ，通栏没有外边距，左右会贴合父元素。</text>
 			</uni-card>
 		</uni-section>
 
-		<uni-section overflow title="卡片封面图+操作栏" type="line">
+		<uni-section title="卡片封面图+操作栏" type="line">
 			<uni-card :cover="cover" @click="onClick">
 				<!-- <image slot='cover' style="width: 100%;" :src="cover"></image> -->
 				<text class="uni-body">这是一个带封面和操作栏的卡片示例，此示例展示了封面插槽和操作栏插槽的用法。</text>
@@ -47,7 +47,7 @@
 			</uni-card>
 		</uni-section>
 
-		<uni-section overflow title="自定义卡片内容" type="line">
+		<uni-section title="自定义卡片内容" type="line">
 			<uni-card title="基础卡片" sub-title="副标题" extra="额外信息" padding="10px 0" :thumbnail="avatar">
 				<template v-slot:title>
 					<uni-list>
@@ -74,7 +74,7 @@
 			</uni-card>
 		</uni-section>
 
-		<uni-section overflow title="卡片+列表" type="line">
+		<uni-section title="卡片+列表" type="line">
 			<uni-card padding="0" spacing="0">
 				<template v-slot:cover>
 					<view class="custom-cover">
@@ -193,4 +193,4 @@
 	.no-border {
 		border-width: 0;
 	}
-</style>
+</style>