Merge pull request #143 from Tencent/develop

### v2.3.0 (2020-03-04) #### Features * feat: 兼容小程序的navigator标签 * feat: input的placeholder更改颜色 * feat: 更改cell的点击态背景颜色 * feat: 适配小程序的darkmode #### Bugfixes * fix: msg的title没有适配黑暗模式 * fix: input placeholder的样式 * fix: fix default 按钮的点击态 * fix: form表单的验证码样式 * fix: darkmode右滑组件、修复图片预览组件刘海屏安全间距问题 * fix: 搜索框的文本没有适配黑暗模式
Tencent · Mar 4, 2020 · 221cf58 · 221cf58
2 parents 8bed510 + 99ec703
commit 221cf58
Show file tree

Hide file tree

Showing 547 changed files with 8,266 additions and 5,500 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,28 @@
-#### v 2.0.1 (2019-10-23)
+### v2.3.0 (2020-03-04)
+
+#### Features
+* feat: 兼容小程序的navigator标签
+* feat: input的placeholder更改颜色
+* feat: 更改cell的点击态背景颜色
+* feat: 适配小程序的darkmode
+
+#### Bugfixes
+* fix: msg的title没有适配黑暗模式
+* fix: input placeholder的样式
+* fix: fix default 按钮的点击态
+* fix: form表单的验证码样式
+* fix: darkmode右滑组件、修复图片预览组件刘海屏安全间距问题
+* fix: 搜索框的文本没有适配黑暗模式
+
+
+#### v2.0.1 (2019-10-23)
 - 【增强】 增加组件 form 表单页 
 - 【增强】 增加组件 actionsheet 模拟原生actionsheet 
 - 【优化】 优化 slideview 右滑操作UI 
 - 【修复】 修复在[weui-miniprogram](https://github.com/wechat-miniprogram/weui-miniprogram) v0.2下的一些兼容问题 
 
-#### v 2.0.0 (2019-08-01)
+
+#### v2.0.0 (2019-08-01)
 
 - 【同步weui】 颜色规范、字体大小规范、间距规范对齐微信7.0新视觉风格
 - 【同步weui】 更新weui-cell、weui-uploader、weui-article、weui-footer、weui-msg、weui-panel、weui-search-bar等组件的UI
@@ -17,22 +35,26 @@
 - 【增强】 增加组件 tabbar 模拟原生底部tab
 - 【优化】 废弃组件 navbar
 
-#### v 1.1.1 (2017-01-18)
+
+#### v1.1.1 (2017-01-18)
 
 - 【同步weui】 增加扩展类.weui-loading_transparent
 - 【同步weui】 更新普通警告图标颜色
 - 【修复】 fix navbar的activeIndex #20
 
-#### v 1.1.0 (2016-12-06)
+
+#### v1.1.0 (2016-12-06)
 
 - 【优化】 跟随weui的版本号
 - 【优化】 loading的base64
 - 【增强】 增加组件 badge 徽章
 
+
 #### v0.1.1 (2016-11-10)
 
 - 【修复】 navbar的样式按小程序的规范来重新编写
 
+
 #### v0.1.0 (2016-11-10)
 
 初始发布

diff --git a/dist/app.js b/dist/app.js
@@ -1,14 +1,26 @@
+require('./libs/Mixins.js');
+
+const themeListeners = [];
+
 App({
-    onLaunch: function () {
-        console.log('App Launch')
+    globalData: {
+        theme: 'light', // dark
     },
-    onShow: function () {
-        console.log('App Show')
+    themeChanged(theme) {
+        this.globalData.theme = theme;
+        themeListeners.forEach((listener) => {
+            listener(theme);
+        });
     },
-    onHide: function () {
-        console.log('App Hide')
+    watchThemeChange(listener) {
+        if (themeListeners.indexOf(listener) < 0) {
+            themeListeners.push(listener);
+        }
+    },
+    unWatchThemeChange(listener) {
+        const index = themeListeners.indexOf(listener);
+        if (index > -1) {
+            themeListeners.splice(index, 1);
+        }
     },
-    globalData: {
-        hasLogin: false
-    }
 });
diff --git a/dist/app.json b/dist/app.json
@@ -3,10 +3,18 @@
     "example/index",
 
     "example/button/button",
-    "example/list/list",
-    "example/slideview/slideview",
     "example/input/input",
     "example/form/form",
+    "example/form/form_page",
+    "example/form/form_input_status",
+    "example/form/form_vcode",
+    "example/form/form_checkbox",
+    "example/form/form_radio",
+    "example/form/form_switch",
+    "example/form/form_select",
+    "example/form/form_textarea",
+    "example/list/list",
+    "example/slideview/slideview",
     "example/slider/slider",
     "example/uploader/uploader",
 
@@ -30,9 +38,10 @@
     "example/msg/msg_text",
     "example/msg/msg_text_primary",
     "example/msg/msg_success",
-    "example/msg/msg_fail",
+    "example/msg/msg_warn",
     "example/picker/picker",
     "example/toast/toast",
+    "example/top-tips/top-tips",
 
     "example/navigation-bar/navigation-bar",
     "example/tabbar/tabbar",

diff --git a/dist/app.wxss b/dist/app.wxss
diff --git a/dist/example/actionsheet/actionsheet.js b/dist/example/actionsheet/actionsheet.js
@@ -1,25 +1,23 @@
 Page({
-    open: function(){
-        wx.showActionSheet({
-            itemList: ['A', 'B', 'C'],
-            success: function(res) {
-                if (!res.cancel) {
-                    console.log(res.tapIndex)
-                }
-            }
-        });
-    },
+    mixins: [require('../../mixin/themeChanged')],
     data: {
-        showDialog: false
+        showIOSDialog: false,
+        showAndroidDialog: false,
     },
-    openDialog: function () {
+    close: function() {
         this.setData({
-            istrue: true
-        })
+            showIOSDialog: false,
+            showAndroidDialog: false
+        });
     },
-    closeDialog: function () {
+    openIOS: function () {
         this.setData({
-            istrue: false
-        })
+            showIOSDialog: true
+        });
+    },
+    openAndroid: function () {
+        this.setData({
+            showAndroidDialog: true
+        });
     }
 });
diff --git a/dist/example/actionsheet/actionsheet.wxml b/dist/example/actionsheet/actionsheet.wxml
@@ -1,28 +1,38 @@
-<view class="page">
+<view class="page" data-weui-theme="{{theme}}">
     <view class="page__hd">
         <view class="page__title">ActionSheet</view>
         <view class="page__desc">弹出式菜单</view>
     </view>
     <view class="page__bd">
         <view class="weui-btn-area">
-            <button class="weui-btn" type="default" bindtap="open">原生 ActionSheet</button>
-            <button class="weui-btn" type="default" bindtap="openDialog">模拟 ActionSheet</button>
+            <a class="weui-btn weui-btn_default" bindtap="openIOS">iOS ActionSheet</a>
+            <a class="weui-btn weui-btn_default" bindtap="openAndroid">Android ActionSheet</a>
         </view>
     </view>
-    <view class="weui-demo-dialog {{istrue ? 'weui-demo-dialog_show' : ''}}">
-      <view class="weui-mask" bindtap="closeDialog"></view>
-      <view class="weui-actionsheet {{istrue ? 'weui-actionsheet_toggle' : ''}}" catchtap="stopEvent">
-          <view class="weui-actionsheet__title">
-              <view class="weui-actionsheet__title-text">这是一个标题，可以为一行或者两行。</view>
-          </view>
-          <view class="weui-actionsheet__menu">
-              <view class="weui-actionsheet__cell">示例菜单</view>
-              <view class="weui-actionsheet__cell">示例菜单</view>
-              <view class="weui-actionsheet__cell weui-actionsheet__cell_warn">负向菜单</view>
-          </view>
-          <view class="weui-actionsheet__action">
-              <view class="weui-actionsheet__cell" bindtap="closeDialog">取消</view>
-          </view>
-      </view>
+    <view wx:if="{{showIOSDialog}}" class="fadeIn" bindtap="close">
+        <view class="weui-mask"></view>
+        <view class="weui-actionsheet weui-actionsheet_toggle">
+            <view class="weui-actionsheet__title">
+                <view class="weui-actionsheet__title-text">这是一个标题，可以为一行或者两行。</view>
+            </view>
+            <view class="weui-actionsheet__menu">
+                <view class="weui-actionsheet__cell">示例菜单</view>
+                <view class="weui-actionsheet__cell">示例菜单</view>
+                <view class="weui-actionsheet__cell weui-actionsheet__cell_warn">负向菜单</view>
+            </view>
+            <view class="weui-actionsheet__action">
+                <view class="weui-actionsheet__cell">取消</view>
+            </view>
+        </view>
+    </view>
+    <view wx:if="{{showAndroidDialog}}" class="weui-skin_android fadeIn" bindtap="close">
+        <view class="weui-mask"></view>
+        <view class="weui-actionsheet">
+            <view class="weui-actionsheet__menu">
+                <view class="weui-actionsheet__cell">示例菜单</view>
+                <view class="weui-actionsheet__cell">示例菜单</view>
+                <view class="weui-actionsheet__cell">示例菜单</view>
+            </view>
+        </view>
     </view>
 </view>
diff --git a/dist/example/actionsheet/actionsheet.wxss b/dist/example/actionsheet/actionsheet.wxss
@@ -1,9 +1,6 @@
-.weui-demo-dialog{
-  visibility:hidden;
-  opacity:0;
-  transition:all .3s;
-}
-.weui-demo-dialog_show{
-  visibility:visible;
-  opacity:1;
-}
+/*!
+ * WeUI v2.3.0 (https://github.com/weui/weui-wxss)
+ * Copyright 2020 Tencent, Inc.
+ * Licensed under the MIT license
+ */
+.page{background-color:var(--weui-BG-2)}
diff --git a/dist/example/article/article.js b/dist/example/article/article.js
@@ -1 +1,3 @@
-Page({});
+Page({
+    mixins: [require('../../mixin/themeChanged')],
+});
diff --git a/dist/example/article/article.wxml b/dist/example/article/article.wxml
@@ -1,4 +1,4 @@
-<view class="page">
+<view class="page" data-weui-theme="{{theme}}">
     <view class="page__hd">
         <view class="page__title">Article</view>
         <view class="page__desc">文章</view>

diff --git a/dist/example/article/article.wxss b/dist/example/article/article.wxss
@@ -1,6 +1,6 @@
-page{
-    background-color: #FFFFFF;
-}
-image{
-    margin: 4px 0;
-}
+/*!
+ * WeUI v2.3.0 (https://github.com/weui/weui-wxss)
+ * Copyright 2020 Tencent, Inc.
+ * Licensed under the MIT license
+ */
+.page{background-color:var(--weui-BG-2)}image{margin:4px 0}
diff --git a/dist/example/badge/badge.js b/dist/example/badge/badge.js
@@ -1 +1,3 @@
-Page({});
+Page({
+    mixins: [require('../../mixin/themeChanged')],
+});
diff --git a/dist/example/badge/badge.wxml b/dist/example/badge/badge.wxml
@@ -1,54 +1,52 @@
-<view class="page">
-    <view class="page__hd">
-        <view class="page__title">Badge</view>
-        <view class="page__desc">徽章</view>
-    </view>
-
-    <view class="page__bd">
-        <view class="weui-cells__title">新消息提示跟摘要信息后，统一在列表右侧</view>
-        <view class="weui-cells weui-cells_after-title">
-            <view class="weui-cell weui-cell_access">
-                <view class="weui-cell__bd">单行列表</view>
-                <view class="weui-cell__ft weui-cell__ft_in-access" style="font-size: 0">
-                    <view style="display: inline-block;vertical-align:middle; font-size: 17px;">详细信息</view>
-                    <view class="weui-badge weui-badge_dot" style="margin-left: 5px;margin-right: 5px;"></view>
-                </view>
-            </view>
-        </view>
-
-        <view class="weui-cells__title">未读数红点跟在主题信息后，统一在列表左侧</view>
-        <view class="weui-cells weui-cells_after-title">
-            <view class="weui-cell">
-                <view class="weui-cell__hd" style="position: relative;margin-right: 10px;">
-                    <image src="../images/pic_160.png" style="width: 50px; height: 50px; display: block"/>
-                    <view class="weui-badge" style="position: absolute;top: -.4em;right: -.4em;">8</view>
-                </view>
-                <view class="weui-cell__bd">
-                    <view>联系人名称</view>
-                    <view style="font-size: 13px;color: #888888;">摘要信息</view>
-                </view>
-            </view>
-            <view class="weui-cell weui-cell_access">
-                <view class="weui-cell__bd">
-                    <view style="display: inline-block; vertical-align: middle">单行列表</view>
-                    <view class="weui-badge" style="margin-left: 5px;">8</view>
-                </view>
-                <view class="weui-cell__ft weui-cell__ft_in-access"></view>
-            </view>
-            <view class="weui-cell weui-cell_access">
-                <view class="weui-cell__bd">
-                    <view style="display: inline-block; vertical-align: middle">单行列表</view>
-                    <view class="weui-badge" style="margin-left: 5px;">8</view>
-                </view>
-                <view class="weui-cell__ft weui-cell__ft_in-access">详细信息</view>
-            </view>
-            <view class="weui-cell weui-cell_access">
-                <view class="weui-cell__bd">
-                    <view style="display: inline-block; vertical-align: middle">单行列表</view>
-                    <view class="weui-badge" style="margin-left: 5px;">New</view>
-                </view>
-                <view class="weui-cell__ft weui-cell__ft_in-access"></view>
-            </view>
-        </view>
-    </view>
-</view>
+<view class="page" data-weui-theme="{{theme}}">
+	<view class="page__hd">
+		<view class="page__title">Badge</view>
+		<view class="page__desc">徽章</view>
+	</view>
+	<view class="page__bd">
+		<view class="weui-cells__title">新消息提示跟摘要信息后，统一在列表右侧</view>
+		<view class="weui-cells">
+			<view class="weui-cell weui-cell_active weui-cell_access">
+				<view class="weui-cell__bd">单行列表</view>
+				<view class="weui-cell__ft" style="font-size: 0;">
+					<text style="vertical-align: middle; font-size: 17px;">详细信息</text>
+					<text class="weui-badge weui-badge_dot" style="margin-left: 5px; margin-right: 5px;"></text>
+				</view>
+			</view>
+		</view>
+		<view class="weui-cells__title">未读数红点跟在主题信息后，统一在列表左侧</view>
+		<view class="weui-cells">
+			<view class="weui-cell weui-cell_active">
+				<view class="weui-cell__hd" style="position: relative; margin-right: 10px;">
+					<image src="../images/pic_160.png" style="width: 50px; display: block;"></image>
+					<text class="weui-badge" style="position: absolute; top: -0.4em; right: -0.4em;">8</text>
+				</view>
+				<view class="weui-cell__bd">
+					<view>联系人名称</view>
+					<view style="font-size: 13px; color: #888;">摘要信息</view>
+				</view>
+			</view>
+			<view class="weui-cell weui-cell_active weui-cell_access">
+				<view class="weui-cell__bd">
+					<text style="vertical-align: middle;">单行列表</text>
+					<text class="weui-badge" style="margin-left: 5px;">8</text>
+				</view>
+				<view class="weui-cell__ft"></view>
+			</view>
+			<view class="weui-cell weui-cell_active weui-cell_access">
+				<view class="weui-cell__bd">
+					<text style="vertical-align: middle;">单行列表</text>
+					<text class="weui-badge" style="margin-left: 5px;">8</text>
+				</view>
+				<view class="weui-cell__ft">详细信息</view>
+			</view>
+			<view class="weui-cell weui-cell_active weui-cell_access">
+				<view class="weui-cell__bd">
+					<text style="vertical-align: middle;">单行列表</text>
+					<text class="weui-badge" style="margin-left: 5px;">New</text>
+				</view>
+				<view class="weui-cell__ft"></view>
+			</view>
+		</view>
+	</view>
+</view>