bulade-ui 1.1.11 → 1.1.13

package/src/bld-action-sheet/index.json

@@ -3,6 +3,6 @@
   "usingComponents":
   {
     "m-button": "../button/index",
-    "m-icon": "../icon/index"
+    "m-icon": "../bld-icon/index"
   }
 }

package/src/bld-action-sheet/index.wxml

@@ -35,7 +35,7 @@
       >
         <view wx:if="{{ item.loading }}" class="m-button__loading"></view>
         <view wx:else class="m-sheet__text">
-          <m-icon 
+          <bld-icon 
             wx:if="{{ item.icon }}" 
             name="{{ item.icon }}" 
             color="{{ item.color }}" 

package/src/bld-cell-group-v2/index.wxss

@@ -1,29 +1,29 @@
-.m-cell-group {
-  position: relative;
-  margin: 0;
-  background: #fff;
-  transition: margin 0.2s ease-in-out;
-}
-.m-cell-group.m-cell-group--card {
-  margin: 32rpx;
-  border-radius: 12rpx;
-  overflow: hidden;
-}
-.m-cell-group .m-cell-group__header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  flex-shrink: 0;
-  position: relative;
-  padding: 0 32rpx;
-  height: 100rpx;
-  font-size: 32rpx;
-  color: var(--color-text-regular, #606266);
-  background-color: #fcfcfc;
-}
-.m-cell-group .m-cell-group__header .m-cell-group__title {
-  flex: 1;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
+.m-cell-group {
+  position: relative;
+  margin: 0;
+  background: #fff;
+  transition: margin 0.2s ease-in-out;
+}
+.m-cell-group.m-cell-group--card {
+  margin: 32rpx;
+  border-radius: 12rpx;
+  overflow: hidden;
+}
+.m-cell-group .m-cell-group__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-shrink: 0;
+  position: relative;
+  padding: 0 32rpx;
+  height: 100rpx;
+  font-size: 32rpx;
+  color: var(--color-text-regular, #606266);
+  background-color: #fcfcfc;
+}
+.m-cell-group .m-cell-group__header .m-cell-group__title {
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}

package/src/bld-cell-v2/index.json

@@ -1,6 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "m-icon": "../icon/index"
+    "m-icon": "../bld-icon/index"
   }
 }

package/src/bld-cell-v2/index.wxss

@@ -1,63 +1,63 @@
-.m-cell {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  padding: 20rpx 32rpx;
-  line-height: 54rpx;
-  font-size: 28rpx;
-}
-.m-cell.m-cell__hairline::after {
-  position: absolute;
-  box-sizing: border-box;
-  content: " ";
-  pointer-events: none;
-  right: 32rpx;
-  bottom: 0;
-  left: 32rpx;
-  border-bottom: 1px solid var(--color-border, #dcdee2);
-  transform: scaleY(0.5);
-}
-.m-cell.m-cell--hover {
-  background-color: #f7f8f9;
-}
-.m-cell .m-cell__icon {
-  width: 38rpx;
-  text-align: center;
-}
-.m-cell .m-cell__header {
-  margin-right: 12rpx;
-  display: flex;
-  align-items: center;
-}
-.m-cell .m-cell__title {
-  display: flex;
-  align-items: center;
-  flex: 1;
-  color: var(--color-text-primary, #303133);
-  vertical-align: middle;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.m-cell .m-cell__desc {
-  display: flex;
-  align-items: center;
-  margin-left: 20rpx;
-  max-width: 400rpx;
-  color: var(--color-text-secondary, #909399);
-  font-size: 28rpx;
-}
-.m-cell .m-cell__desc.is-ellipsis {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.m-cell .m-cell__slot {
-  display: inline-flex;
-  align-items: center;
-}
-.m-cell .m-cell__footer {
-  text-align: right;
-  margin-left: 24rpx;
-}
+.m-cell {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  padding: 20rpx 32rpx;
+  line-height: 54rpx;
+  font-size: 28rpx;
+}
+.m-cell.m-cell__hairline::after {
+  position: absolute;
+  box-sizing: border-box;
+  content: " ";
+  pointer-events: none;
+  right: 32rpx;
+  bottom: 0;
+  left: 32rpx;
+  border-bottom: 1px solid var(--color-border, #dcdee2);
+  transform: scaleY(0.5);
+}
+.m-cell.m-cell--hover {
+  background-color: #f7f8f9;
+}
+.m-cell .m-cell__icon {
+  width: 38rpx;
+  text-align: center;
+}
+.m-cell .m-cell__header {
+  margin-right: 12rpx;
+  display: flex;
+  align-items: center;
+}
+.m-cell .m-cell__title {
+  display: flex;
+  align-items: center;
+  flex: 1;
+  color: var(--color-text-primary, #303133);
+  vertical-align: middle;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.m-cell .m-cell__desc {
+  display: flex;
+  align-items: center;
+  margin-left: 20rpx;
+  max-width: 400rpx;
+  color: var(--color-text-secondary, #909399);
+  font-size: 28rpx;
+}
+.m-cell .m-cell__desc.is-ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.m-cell .m-cell__slot {
+  display: inline-flex;
+  align-items: center;
+}
+.m-cell .m-cell__footer {
+  text-align: right;
+  margin-left: 24rpx;
+}

package/src/bld-checkbox/index.json

@@ -1,6 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "m-icon": "../icon/index"
+    "m-icon": "../bld-icon/index"
   }
 }

package/src/bld-dialog-tip/index.wxss

@@ -63,4 +63,4 @@
   color: #ffffff;
   line-height: 84rpx;
   text-align: center;
-}
+}

package/src/bld-html/index.wxss

@@ -3,4 +3,4 @@
   font-size: var(--font-size-lg);
   letter-spacing: 2rpx;
   text-align: justify;
-}
+}

package/src/bld-icon/index.js

@@ -1,8 +1,42 @@
 Component({
-  externalClasses: ["iclass"],
+  externalClasses: ['iclass'],
+
+  options: {
+    addGlobalClass: true,
+  },
+
   properties: {
     name: {
       type: String,
+      observer(val) {
+        this.setData({
+          isImage: val.indexOf('/') > -1
+        })
+      }
+    },
+    
+    size: {
+      type: Number,
+      optionalTypes: [Number, String],
+      value: 32,
+      observer(val) {
+        this.setData({
+          fsize: parseInt(val)
+        }) 
+      }
     },
+    color: {
+      type: String,
+      value: ''
+    },
+    customStyle: {
+      type: String,
+      value: ''
+    }
   },
-});
+  
+  data: {
+    isImage: false,
+    fsize: 32
+  }
+})

package/src/bld-icon/index.json

@@ -1,3 +1,6 @@
 {
-  "component": true
+  "component": true,
+  "usingComponents": {
+    "bld-cloud-image": "../bld-cloud-image/index"
+  }
 }

package/src/bld-icon/index.scss

@@ -1,217 +1,19 @@
-@font-face {
-  font-family: "bld-iconfont"; /* Project id 4624374 */
-  src: 
-       url('data:font/ttf;charset=utf-8;base64,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') format('truetype');
-}
-
-.bld-iconfont {
-  font-family: "bld-iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-wentifankui:before {
-  content: "\e618";
-}
-
-.icon-xialajiantouxiao:before {
-  content: "\e87e";
-}
-
-.icon-shouqijiantouxiao:before {
-  content: "\e892";
-}
-
-.icon-a-bianzu24beifen2:before {
-  content: "\e60e";
-}
-
-.icon-a-bianzu8beifen3:before {
-  content: "\e603";
-}
-
-.icon-a-bianzu14beifen3:before {
-  content: "\e606";
-}
-
-.icon-a-bianzu23beifen2:before {
-  content: "\e607";
-}
-
-.icon-a-bianzu22beifen2:before {
-  content: "\e609";
-}
-
-.icon-a-bianzu19beifen2:before {
-  content: "\e60a";
-}
-
-.icon-a-bianzu13beifen2:before {
-  content: "\e60c";
-}
-
-.icon-yiliaohangyedeICON-:before {
-  content: "\e636";
-}
-
-.icon-delete:before {
-  content: "\e60b";
-}
-
-.icon-pin-fill:before {
-  content: "\e863";
-}
-
-.icon-pin:before {
-  content: "\e864";
-}
-
-.icon-prize:before {
-  content: "\e613";
-}
-
-.icon-image:before {
-  content: "\e604";
-}
-
-.icon-private:before {
-  content: "\e95a";
-}
-
-.icon-public:before {
-  content: "\e6cf";
-}
-
-.icon-calendar:before {
-  content: "\e605";
-}
-
-.icon-question:before {
-  content: "\e7f8";
-}
-
-.icon-check:before {
-  content: "\e60d";
-}
-
-.icon-close:before {
-  content: "\e649";
-}
-
-.icon-comment:before {
-  content: "\e638";
-}
-
-.icon-group:before {
-  content: "\e608";
-}
-
-.icon-history:before {
-  content: "\e602";
-}
-
-.icon-event:before {
-  content: "\e617";
-}
-
-.icon-maisui-left:before {
-  content: "\e647";
-}
-
-.icon-maisui-right:before {
-  content: "\e648";
-}
-
-.icon-top:before {
-  content: "\e619";
-}
-
-.icon-search:before {
-  content: "\e82e";
-}
-
-.icon-hospital:before {
-  content: "\e615";
-}
-
-.icon-topic:before {
-  content: "\e620";
-}
-
-.icon-chat:before {
-  content: "\e69d";
-}
-
-.icon-navigation:before {
-  content: "\e640";
-}
-
-.icon-share:before {
-  content: "\e634";
-}
-
-.icon-goto-top:before {
-  content: "\e61f";
-}
+@import "..\\assets/font/iconfont.scss";
 
-.icon-like:before {
-  content: "\e677";
+.m-icon {
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	transition: color .2s ease-in-out;
 }
-
-.icon-like-fill:before {
-  content: "\e6ce";
-}
-
-.icon-loading:before {
-  content: "\e676";
+.c-image__wrap{
+	width:100%;
+	height:100%;
 }
-
-.icon-backward:before {
-  content: "\e837";
+.m-icon__image {
+	width: 100%;
+	height: 100%;
+	display: inline-block;
+	vertical-align: sub-text;
+	box-sizing: border-box;
 }
-
-.icon-more:before {
-  content: "\e8c4";
-}
-
-.icon-scan:before {
-  content: "\e600";
-}
-
-.icon-location:before {
-  content: "\e601";
-}
-
-.icon-notice:before {
-  content: "\e64a";
-}
-
-.icon-switch:before {
-  content: "\e664";
-}
-
-.icon-about:before {
-  content: "\e614";
-}
-
-.icon-forward:before {
-  content: "\e622";
-}
-
-.icon-contact:before {
-  content: "\e646";
-}
-
-.icon-settings:before {
-  content: "\e8b7";
-}
-
-.icon-privacy:before {
-  content: "\e6af";
-}
-
-.icon-user:before {
-  content: "\e632";
-}

package/src/bld-icon/index.wxml

@@ -1 +1,35 @@
-<view class="iclass bld-iconfont icon-{{ name }}" />
+<view 
+	class="iclass bld-iconfont icon-{{ name }} m-icon" 
+	style="{{ icon.setIconStyle(isImage, fsize, color) }} {{ customStyle }}"
+>
+   <bld-cloud-image
+     class="c-image__wrap"
+     wx:if="{{ isImage }}"
+     iclass="m-icon__image"
+     src="{{ name }}"
+   />
+</view>
+
+<wxs module="icon">
+  function setIconStyle(isImage, size, color) {
+    var styles = []
+
+    if(size) {
+      if(isImage) {
+        styles.push('width:' + size +'rpx')
+        styles.push('height:' + size +'rpx')
+      }
+      styles.push('font-size:' + size +'rpx')
+    }
+
+    if(color) {
+      styles.push('color:' + color)
+    }
+    return styles.join(";")
+  }
+
+  module.exports = {
+    setIconStyle: setIconStyle
+  }
+</wxs>
+