Merge branch 'v1.0.0' of https://github.com/wechat-miniprogram/weui-miniprogram into v1.0.0

xysDavid · xysDavid · commit 72e67b1328b4 · 2020-03-29T14:50:21.000+08:00
diff --git a/src/actionsheet/actionsheet.less b/src/actionsheet/actionsheet.less
@@ -1,6 +1,3 @@
-@import "../weui-wxss/src/style/widget/weui-tips/weui-mask.wxss";
-@import "../weui-wxss/src/style/widget/weui-tips/weui-actionsheet.wxss";
-
 .weui-mask.weui-mask_hidden {
   opacity: 0;
   transform: scale3d(1, 1, 0)
diff --git a/src/badge/badge.less b/src/badge/badge.less
@@ -1 +0,0 @@
-@import "../weui-wxss/src/style/widget/weui-tips/weui-badge.wxss";
diff --git a/src/cell/cell.less b/src/cell/cell.less
@@ -1,2 +1,3 @@
-@import "../weui-wxss/src/style/widget/weui-cell/weui-cell.wxss";
-@import "../weui-wxss/src/style/widget/weui-cell/weui-form/weui-vcode.wxss";
+.weui-cell_wxss.weui-cell_wxss:before{
+  display:block;
+}
diff --git a/src/cells/cells.less b/src/cells/cells.less
@@ -0,0 +1,3 @@
+.weui-cells__group_wxss.weui-cells__group_wxss .weui-cells__title {
+  margin-top: 24px;
+}
diff --git a/src/checkbox-group/checkbox-group.ts b/src/checkbox-group/checkbox-group.ts
@@ -1,4 +1,8 @@
 Component({
+    options: {
+        addGlobalClass: true,
+        multipleSlots: true,
+    },
     properties: {
         multi: {
             type: Boolean,
diff --git a/src/checkbox/checkbox.less b/src/checkbox/checkbox.less
@@ -1,2 +1,9 @@
-@import "../weui-wxss/src/style/widget/weui-cell/weui-check.wxss";
+.weui-cell_radio .weui-check+.weui-icon-checked {
+  color: transparent;
+}
 
+.weui-check[checked]+.weui-icon-checked {
+  color: var(--weui-BRAND);
+  -webkit-mask-image: url(data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M8.657%2018.435L3%2012.778l1.414-1.414%204.95%204.95L20.678%205l1.414%201.414-12.02%2012.021a1%201%200%2001-1.415%200z%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E);
+  mask-image: url(data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M8.657%2018.435L3%2012.778l1.414-1.414%204.95%204.95L20.678%205l1.414%201.414-12.02%2012.021a1%201%200%2001-1.415%200z%22%20fill-rule%3D%22evenodd%22%2F%3E%3C%2Fsvg%3E);
+}
diff --git a/src/checkbox/checkbox.wxml b/src/checkbox/checkbox.wxml
@@ -1,15 +1,19 @@
-<mp-cell has-footer="{{!multi}}" has-header="{{multi}}" bindtap="checkedChange" footer-class="{{!multi ? 'weui-check__ft_in-radio' : ''}}" icon-class="{{multi ? 'weui-check__hd_in-checkbox' : ''}}" ext-class="weui-check__label {{outerClass}} {{extClass}} {{!multi ? 'weui-cell_radio' : 'weui-cell_checkbox'}}">
+<mp-cell
+  has-footer="{{!multi}}"
+  has-header="{{multi}}"
+  bindtap="checkedChange"
+  ext-class="weui-check__label {{outerClass}} {{extClass}} {{!multi ? '^weui-cell_radio' : '^weui-cell_checkbox'}}">
 
   <view slot="icon" wx:if="{{multi}}">
-    <checkbox value="{{value}}" checked="{{checked}}" disabled="{{disabled}}" color="{{color}}" class="weui-check"></checkbox>
+    <checkbox value="{{value}}" checked="{{checked}}" disabled="{{disabled}}" color="{{color}}" class="weui-check">
+    </checkbox>
     <!-- 未勾选 -->
-    <icon wx:if="{{!checked}}" size="23" class="weui-icon-checkbox_circle" type="circle"></icon>
-    <icon wx:else size="23" class="weui-icon-checkbox_success" type="success"></icon>
+    <icon class="weui-icon-checked"></icon>
   </view>
   <view>{{label}}</view>
   <view slot="footer" wx:if="{{!multi}}">
     <radio value="{{value}}" checked="{{checked}}" disabled="{{disabled}}" color="{{color}}" class="weui-check"></radio>
     <!-- 已勾选 -->
-    <icon size="16" wx:if="{{checked}}" class="weui-icon-radio" type="success_no_circle"></icon>
+    <icon class="weui-icon-checked"></icon>
   </view>
-</mp-cell>
+</mp-cell>
diff --git a/src/dialog/dialog.less b/src/dialog/dialog.less
@@ -1,6 +1,3 @@
-@import "../weui-wxss/src/style/widget/weui-tips/weui-mask.wxss";
-@import "../weui-wxss/src/style/widget/weui-tips/weui-dialog.wxss";
-
 .weui-dialog.weui-dialog_hidden {
   opacity: 0;
   transform: scale3d(1, 1, 0);
diff --git a/src/form-page/form-page.less b/src/form-page/form-page.less
@@ -1,3 +0,0 @@
-@import "../weui-wxss/src/style/widget/weui-page/weui-form.wxss";
-
-
diff --git a/src/gallery/gallery.less b/src/gallery/gallery.less
@@ -1,2 +1,7 @@
-@import "../weui-wxss/src/style/widget/weui-cell/weui-gallery.wxss";
+.weui-gallery {
+  display: none;
+}
 
+.weui-gallery_show.weui-gallery {
+  display: flex;
+}
diff --git a/src/grids/grids.json b/src/grids/grids.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
diff --git a/src/grids/grids.ts b/src/grids/grids.ts
@@ -0,0 +1,50 @@
+Component({
+    options: {
+        addGlobalClass: true,
+        pureDataPattern: /^_/
+    },
+    properties: {
+        extClass: {
+            type: String,
+            value: ''
+        },
+        grids: {
+            type: Array,
+            value: [],
+            observer() {
+
+            }
+        }
+    },
+    data: {
+        innerGrids: [],
+        _defaultGridProps: {
+            target: 'self',
+            openType: 'navigate',
+            appId: '',
+            path: '',
+            extraData: '',
+            version: 'release',
+            hoverClass: 'navigator-hover',
+            hoverStopPropagation: false,
+            hoverStartTime: 50,
+            hoverStayTime: 600,
+            bindsuccess() {},
+            bindfail() {},
+            bindcomplete() {}
+        }
+    },
+    ready() {
+
+    },
+    lifetimes: {
+        attached() {
+            if (this.data.grids) {
+                this.setData({
+                    innerGrids: this.data.grids.map((grid) => Object.assign({}, this.data._defaultGridProps, grid))
+                })
+                console.log(this.data.innerGrids)
+            }
+        }
+    }
+})
diff --git a/src/grids/grids.wxml b/src/grids/grids.wxml
@@ -0,0 +1,26 @@
+<view class="weui-grids {{extClass}}">
+  <block wx:for="{{innerGrids}}" wx:key="index">
+    <navigator
+      class="weui-grid"
+      target="{{item.target}}"
+      url="{{item.url}}"
+      open-type="{{item.openType}}"
+      app-id="{{item.appId}}"
+      path="{{item.path}}"
+      extra-data="{{item.extraData}}"
+      version="{{item.version}}"
+      hover-class="{{item.hoverClass}}"
+      hover-stop-propagation="{{item.hoverStopPropagation}}"
+      hover-start-time="{{item.hoverStartTime}}"
+      hover-stay-time="{{item.hoverStayTime}}"
+      bindsuccess="{{item.bindsuccess}}"
+      bindfail="{{item.bindfail}}"
+      bindcomplete="{{item.bindcomplete}}"
+    >
+      <view class="weui-grid__icon">
+        <image class="weui-grid__icon_img" src="{{item.imgUrl}}" alt></image>
+      </view>
+      <view class="weui-grid__label">{{item.text}}</view>
+    </navigator>
+  </block>
+</view>
diff --git a/src/grids/grids.wxss b/src/grids/grids.wxss
@@ -0,0 +1,4 @@
+.weui-grid .weui-grid__icon_img {
+  width: 100%;
+  height: 100%;
+}
diff --git a/src/half-screen-dialog/half-screen-dialog.less b/src/half-screen-dialog/half-screen-dialog.less
@@ -1,6 +1,3 @@
-@import "../weui-wxss/src/style/widget/weui-tips/weui-half-screen-dialog.wxss";
-@import "../weui-wxss/src/style/widget/weui-tips/weui-mask.wxss";
-
 .weui-mask, .weui-half-screen-dialog {
   transition: all .3s;
 }
diff --git a/src/index.json b/src/index.json
@@ -16,6 +16,7 @@
     "dialog": "./dialog/dialog",
     "uploader": "./uploader/uploader",
     "gallery": "./gallery/gallery",
+    "grids": "./grids/grids",
     "checkbox": "./checkbox/checkbox",
     "badge": "./badge/badge",
     "searchbar": "./searchbar/searchbar",
diff --git a/src/loading/loading.less b/src/loading/loading.less
@@ -1,7 +1,3 @@
-@import "../weui-wxss/src/style/widget/weui-loading/weui-loading.wxss";
-@import "../weui-wxss/src/style/widget/weui-tips/weui-loadmore.wxss";
-@import "../weui-wxss/src/style/widget/weui-loading/weui-dot-loading.wxss";
-
 .wx_loading_view{
   display: flex;
   justify-content: center;
diff --git a/src/msg/msg.less b/src/msg/msg.less
@@ -1,5 +1,3 @@
-@import "../weui-wxss/src/style/widget/weui-page/weui-msg.wxss";
-
 .weui-msg__icon-img {
   width: 190rpx;
   height: 190rpx;
diff --git a/src/msg/msg.wxml b/src/msg/msg.wxml
@@ -16,6 +16,11 @@
       <slot name="handle"></slot>
     </view>
   </view>
+  <view class="weui-msg__tips-area">
+    <view class="weui-msg__tips">
+      <slot name="tips"></slot>
+    </view>
+  </view>
   <view class="weui-msg__extra-area">
     <view class="weui-footer">
       <slot name="footer"></slot>
diff --git a/src/navigation-bar/navigation-bar.less b/src/navigation-bar/navigation-bar.less
@@ -1 +0,0 @@
-@import "../weui-wxss/src/style/widget/weui-navigation-bar/weui-navigation-bar.wxss";
diff --git a/src/searchbar/searchbar.less b/src/searchbar/searchbar.less
@@ -1 +1,5 @@
-@import "../weui-wxss/src/style/widget/weui-searchbar/weui-searchbar.wxss";
+.weui-search-bar__label text {
+  display: inline-block;
+  font-size: 14px;
+  vertical-align: middle;
+}
diff --git a/src/searchbar/searchbar.wxml b/src/searchbar/searchbar.wxml
@@ -1,21 +1,19 @@
-<view class="weui-search-bar {{extClass}}">
+<view class="weui-search-bar {{focus ? 'weui-search-bar_focusing' : ''}} {{extClass}}">
     <view class="weui-search-bar__form">
         <view class="weui-search-bar__box">
-            <icon class="weui-icon-search_in-box" type="search" size="12"></icon>
+            <icon class="weui-icon-search" type="search" size="12"></icon>
             <input type="text" class="weui-search-bar__input" placeholder="{{placeholder}}" value="{{value}}" focus="{{focus}}" bindblur="inputBlur" bindfocus="inputFocus" bindinput="inputChange" />
-            <view class="weui-icon-clear" wx:if="{{value.length > 0}}" bindtap="clearInput">
-                <icon type="clear" size="12"></icon>
-            </view>
+            <text class="weui-icon-clear" wx:if="{{value.length > 0}}" bindtap="clearInput"></text>
         </view>
         <label class="weui-search-bar__label" hidden="{{searchState}}" bindtap="showInput">
             <icon class="weui-icon-search" type="search" size="12"></icon>
-            <view class="weui-search-bar__text">搜索</view>
+            <text class="weui-search-bar__text">搜索</text>
         </label>
     </view>
     <view wx:if="{{cancel && searchState}}" class="weui-search-bar__cancel-btn" bindtap="hideInput">{{cancelText}}</view>
 </view>
-<mp-cells class="searchbar-result  {{extClass}}" wx:if="{{searchState && result.length > 0}}">
-    <mp-cell bindtap="selectResult" data-index="{{index}}" wx:for="{{result}}" wx:key="index" hover>
+<mp-cells ext-class=" {{'searchbar-result ' + extClass}}" wx:if="{{searchState && result.length > 0}}">
+    <mp-cell bindtap="selectResult" body-class="weui-cell_primary" data-index="{{index}}" wx:for="{{result}}" wx:key="index" hover>
         <view>{{item.text}}</view>
     </mp-cell>
 </mp-cells>
diff --git a/src/slideview/slideview.less b/src/slideview/slideview.less
@@ -1 +0,0 @@
-@import "../weui-wxss/src/style/widget/weui-cell/weui-slideview.wxss";
diff --git a/src/tabbar/tabbar.less b/src/tabbar/tabbar.less
@@ -1 +0,0 @@
-@import "../weui-wxss/src/style/widget/weui-tab/weui-tabbar.wxss";
diff --git a/src/toptips/toptips.less b/src/toptips/toptips.less
@@ -1 +0,0 @@
-@import "../weui-wxss/src/style/widget/weui-tips/weui-toptips.wxss";
diff --git a/src/uploader/uploader.less b/src/uploader/uploader.less
@@ -1,3 +0,0 @@
-@import "../weui-wxss/src/style/widget/weui-cell/weui-uploader.wxss";
-@import "../weui-wxss/src/style/widget/weui-loading/weui-loading.wxss";
-
diff --git a/src/weui-wxss b/src/weui-wxss
@@ -1 +1 @@
-Subproject commit 1e6b1b15e4c5a1a579da4b0430fbd7bdf15849d6
+Subproject commit bf2cd342f9695bab4ce734059cf1ec1886ec500a
diff --git a/tools/demo/example/form/form.wxml b/tools/demo/example/form/form.wxml
@@ -82,14 +82,11 @@
     </mp-form>
 
     <checkbox-group slot="tips" bindchange="bindAgreeChange">
-        <label class="weui-agree" for="weuiAgree">
-            <view class="weui-agree__text">
-                <checkbox class="weui-agree__checkbox" id="weuiAgree" value="agree" checked="{{isAgree}}" />
-                <view class="weui-agree__checkbox-icon">
-                    <icon class="weui-agree__checkbox-icon-check" type="success_no_circle" size="9" wx:if="{{isAgree}}"></icon>
-                </view>
-                阅读并同意<navigator url="" class="weui-agree__link">《相关条款》</navigator>
-            </view>
+        <label class="weui-agree">
+            <checkbox class="weui-agree__checkbox-check" />
+
+            <text class="weui-agree__checkbox"></text>
+            <view class="weui-agree__text">阅读并同意<navigator>《相关条款》</navigator></view>
         </label>
     </checkbox-group>
 
diff --git a/tools/demo/example/form/form.wxss b/tools/demo/example/form/form.wxss
@@ -1,2 +1,6 @@
 /* example/input/input.wxss */
 @import '../common.wxss';
+
+.weui-agree .weui-agree__text {
+  display: inline;
+}
diff --git a/tools/demo/example/searchbar/searchbar.wxss b/tools/demo/example/searchbar/searchbar.wxss
@@ -4,10 +4,7 @@
     margin-top: 0;
     font-size: 14px;
 }
-.searchbar-result .weui-cell__bd{
-  padding: 2px 0 2px 20px;
-  color: #666;
-}
+
 .searchbar-result:before{
     display: none;
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +0,0 @@`
`1`		`-@import "../weui-wxss/src/style/widget/weui-tips/weui-badge.wxss";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.weui-cells__group_wxss.weui-cells__group_wxss .weui-cells__title {`
	`2`	`+ margin-top: 24px;`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-@import "../weui-wxss/src/style/widget/weui-page/weui-form.wxss";`
`2`		`-`
`3`		`-`