0.1.2 调整

Author: cunjinli

package.json

@@ -1,6 +1,6 @@
 {
   "name": "weui-miniprogram",
-  "version": "0.0.1",
+  "version": "0.1.2",
   "description": "",
   "main": "miniprogram_dist/index.js",
   "scripts": {

src/badge/badge.ts

@@ -7,9 +7,9 @@ Component({
             type: String,
             value: ''
         },
-        dot: {
-            type: Boolean,
-            value: false,
+        content: {
+            type: String,
+            value: ''
         }
     }
 })

src/badge/badge.wxml

@@ -1 +1 @@
-<view class="weui-badge {{extClass}} {{dot ? 'weui-badge_dot' : ''}}"><slot></slot></view>
+<view class="weui-badge {{extClass}} {{!content ? 'weui-badge_dot' : ''}}">{{content}}</view>

src/cell/cell.ts

@@ -16,11 +16,11 @@ Component({
             type: String,
             value: ''
         },
-        icon: {
+        iconClass: {
             type: String,
-            value: '',
+            value: ''
         },
-        iconClass: {
+        icon: {
             type: String,
             value: '',
         },
@@ -32,10 +32,6 @@ Component({
             type: String,
             value: '',
         },
-        valueClass: {
-            type: String,
-            value: ''
-        },
         showError: {
             type: Boolean,
             value: false
@@ -48,11 +44,11 @@ Component({
             type: String,
             value: ''
         },
-        foot: {
+        footerClass: {
             type: String,
             value: ''
         },
-        footClass: {
+        footer: {
             type: String,
             value: ''
         },

src/cell/cell.wxml

@@ -1,6 +1,6 @@
 <block wx:if="{{link}}">
     <view bindtap="navigateTo" class="weui-cell weui-cell_access {{extClass}} {{outerClass}}{{inForm ? ' weui-cell-inform' : ''}}{{inline ? '' : ' .weui-cell_label-block'}}" hover-class="{{hover ? 'weui-cell_active' : ''}}">
-        <view class="weui-cell__hd">
+        <view class="weui-cell__hd {{iconClass}}">
             <block wx:if="{{icon}}">
                 <image src="{{icon}}" class="weui-cell__icon" mode="aspectFit"></image>
             </block>
@@ -26,10 +26,10 @@
                 <slot></slot>
             </block>
         </view>
-        <view class="weui-cell__ft weui-cell__ft_in-access">
-            <block wx:if="{{foot}}">{{foot}}</block>
+        <view class="weui-cell__ft weui-cell__ft_in-access {{footerClass}}">
+            <block wx:if="{{footer}}">{{footer}}</block>
             <block wx:else>
-                <slot name="foot"></slot>
+                <slot name="footer"></slot>
             </block>
         </view>
     </view>
@@ -56,16 +56,16 @@
                 </block>
             </block>
         </view>
-        <view class="weui-cell__bd {{valueClass}}">
+        <view class="weui-cell__bd">
             <block wx:if="{{value}}">{{value}}</block>
             <block wx:else>
                 <slot></slot>
             </block>
         </view>
-        <view class="weui-cell__ft {{footClass}}">
-            <block wx:if="{{foot}}">{{foot}}</block>
+        <view class="weui-cell__ft {{footerClass}}">
+            <block wx:if="{{footer}}">{{footer}}</block>
             <block wx:else>
-                <slot name="foot"></slot>
+                <slot name="footer"></slot>
             </block>
             <icon wx:if="{{showError && error}}" type="warn" size="23" color="#E64340"></icon>
         </view>

src/cells/cells.ts

@@ -12,7 +12,7 @@ Component({
           type: String,
           value: ''
         },
-        foot: {
+        footer: {
           type: String,
           value: ''
         }

src/cells/cells.wxml

@@ -3,6 +3,6 @@
     <view class="weui-cells weui-cells_after-title {{checkboxCount > 0 && checkboxIsMulti ? 'weui-cells_checkbox' : ''}}">
         <slot></slot>
     </view>
-    <view v-if="{{foot}}" class="weui-cells__tips">{{foot}}</view>
-    <template v-else><slot name="foot"></slot></template>
+    <view v-if="{{footer}}" class="weui-cells__tips">{{footer}}</view>
+    <template v-else><slot name="footer"></slot></template>
 </view>

src/checkbox-group/checkbox-group.ts

@@ -8,6 +8,10 @@ Component({
         extClass: {
             type: String,
             value: '',
+        },
+        prop: {
+            type: String,
+            value: ''
         }
     },
     data: {

src/checkbox/checkbox.json

@@ -1,6 +1,7 @@
 {
     "component": true,
     "usingComponents": {
-        "mp-cell": "../cell/cell"
+        "mp-cell": "../cell/cell",
+        "mp-checkbox-group": "../checkbox-group/checkbox-group"
     }
 }

src/checkbox/checkbox.ts

@@ -16,14 +16,14 @@ Component<any>({
             type: String,
             value: '',
         },
-        disabled: {
-            type: Boolean,
-            value: false,
-        },
-        color: {
-            type: String,
-            value: '#09BB07',
-        },
+        // disabled: {
+        //     type: Boolean,
+        //     value: false,
+        // },
+        // color: {
+        //     type: String,
+        //     value: '#09BB07',
+        // },
         label: {
             type: String,
             value: 'label',
@@ -64,15 +64,20 @@ Component<any>({
                 this.setData({
                     checked
                 })
-                this.data.group.checkedChange(checked, this)
+                if (this.data.group) {
+                    this.data.group.checkedChange(checked, this)
+                }
             } else {
                 const checked = this.data.checked
                 if (checked) return
                 this.setData({
                     checked: true
                 })
-                this.data.group.checkedChange(checked, this)
+                if (this.data.group) {
+                    this.data.group.checkedChange(checked, this)
+                }
             }
+            this.triggerEvent('change', {value: this.data.value, checked: this.data.checked})
         }
     }
 })