mali-applet-ui 1.1.6 → 1.1.7

package/lib/components/ml-amount-text/ml-amount-text.vue

@@ -101,6 +101,9 @@ export default {
   &.ss-pink {
     color: $ml-pink-color;
   }
+  &.ss-red {
+    color: $ml-red-color;
+  }
   &.ss-orange {
     color: $ml-orange-color;
   }

package/lib/components/ml-button/ml-button.vue

@@ -133,6 +133,9 @@ export default {
     &.ss-pink {
       color: $ml-pink-color;
     }
+    &.ss-red {
+      color: $ml-red-color;
+    }
     &.ss-orange {
       color: $ml-orange-color;
     }
@@ -215,6 +218,11 @@ export default {
       background: $ml-pink-color;
       border-color: $ml-pink-color;
     }
+    &.ss-red {
+      color: #ffffff;
+      background: $ml-red-color;
+      border-color: $ml-red-color;
+    }
     &.ss-orange {
       color: #ffffff;
       background: $ml-orange-color;

package/lib/components/ml-calendar/ml-calendar.vue

@@ -302,6 +302,9 @@ export default {
             &.ss-pink {
               background-color: $ml-pink-color;
             }
+            &.ss-red {
+              background-color: $ml-red-color;
+            }
             &.ss-orange {
               background-color: $ml-orange-color;
             }

package/lib/components/ml-chunk-group/ml-chunk-group.vue

@@ -158,6 +158,12 @@ export default {
       background: $ml-pink-color;
     }
   }
+  &.ss-red {
+    .ml-chunk-group-content {
+      color: #ffffff;
+      background: $ml-red-color;
+    }
+  }
   &.ss-orange {
     .ml-chunk-group-content {
       color: #ffffff;

package/lib/components/ml-dict-type/ml-dict-type.vue

@@ -117,6 +117,10 @@ export default {
       color: $ml-pink-color;
       border: 1px solid $ml-pink-color;
     }
+    &.ss-red {
+      color: $ml-red-color;
+      border: 1px solid $ml-red-color;
+    }
     &.ss-orange {
       color: $ml-orange-color;
       border: 1px solid $ml-orange-color;
@@ -201,6 +205,9 @@ export default {
     &.ss-pink {
       color: $ml-pink-color;
     }
+    &.ss-red {
+      color: $ml-red-color;
+    }
     &.ss-orange {
       color: $ml-orange-color;
     }

package/lib/components/ml-header-filter-form/ml-header-filter-form.vue

@@ -50,12 +50,6 @@ export default {
     showPulldown: Boolean,
     placeholder: String
   },
-  inject: {
-    layout: {
-      from: '$pageLayout',
-      default: null
-    }
-  },
   data () {
     return {
       searchName: '',

package/lib/components/ml-hint/ml-hint.vue

@@ -72,6 +72,9 @@ export default {
   &.ss-pink {
     background: $ml-pink-color;
   }
+  &.ss-red {
+    background: $ml-red-color;
+  }
   &.ss-orange {
     background: $ml-orange-color;
   }

package/lib/components/ml-icon/ml-icon.vue

@@ -96,6 +96,9 @@ export default {
   &.ss-pink {
     color: $ml-pink-color;
   }
+  &.ss-red {
+    color: $ml-red-color;
+  }
   &.ss-orange {
     color: $ml-orange-color;
   }

package/lib/components/ml-list-item-title/ml-list-item-title.vue

@@ -1,11 +1,15 @@
 <template>
   <view class="ml-list-item-title" @tap="tapEvent">
     <view class="ml-list-item-title-left">
-      <text v-if="showSeq" class="ml-list-item-title-seq">{{ itemIndex + 1 }}</text>
-      <text v-if="icon" class="ml-list-item-title-icon">
+      <view v-if="showSeq" class="ml-list-item-title-seq">{{ itemIndex + 1 }}</view>
+      <view v-if="icon" class="ml-list-item-title-icon">
         <ml-icon :name="icon" status="primary" />
-      </text>
-      <text class="ml-list-item-title-content">{{ currTitle }}</text>
+      </view>
+      <view class="ml-list-item-title-content">
+        <slot>
+          <view>{{ currTitle }}</view>
+        </slot>
+      </view>
     </view>
     <view class="ml-list-item-title-right">
       <slot name="extra"></slot>

package/lib/components/ml-list-menu-item/ml-list-menu-item.vue

@@ -249,6 +249,9 @@ export default {
       &.s-pink {
         background-color: $ml-pink-color;
       }
+      &.s-red {
+        background-color: $ml-red-color;
+      }
       &.s-orange {
         background-color: $ml-orange-color;
       }

package/lib/components/ml-row/ml-row.vue

@@ -66,6 +66,9 @@ export default {
   &.ss-pink {
     color: $ml-pink-color;
   }
+  &.ss-red {
+    color: $ml-red-color;
+  }
   &.ss-orange {
     color: $ml-orange-color;
   }

package/lib/components/ml-status-tag/ml-status-tag.vue

@@ -74,6 +74,10 @@ export default {
     color: $ml-pink-color;
     background: #ffeaec;
   }
+  &.ss-red {
+    color: $ml-red-color;
+    background: #ffeaec;
+  }
   &.ss-orange {
     color: $ml-orange-color;
     background: #ffedd6;

package/lib/components/ml-tab-container-navs/ml-tab-container-navs.vue

@@ -168,6 +168,9 @@ export default {
     &.s-pink {
       background-color: $ml-pink-color;
     }
+    &.s-red {
+      background-color: $ml-red-color;
+    }
     &.s-orange {
       background-color: $ml-orange-color;
     }

package/lib/components/ml-tabs/ml-tabs.vue

@@ -152,6 +152,9 @@ export default {
     &.s-pink {
       background-color: $ml-pink-color;
     }
+    &.s-red {
+      background-color: $ml-red-color;
+    }
     &.s-orange {
       background-color: $ml-orange-color;
     }

package/lib/components/ml-text/ml-text.vue

@@ -102,6 +102,9 @@ export default {
   &.ss-pink {
     color: $ml-pink-color;
   }
+  &.ss-red {
+    color: $ml-red-color;
+  }
   &.ss-orange {
     color: $ml-orange-color;
   }

package/lib/components/ml-tree-box/ml-tree-box.vue

@@ -45,7 +45,7 @@
                 :info="getPrefixIcon(item)"
               />
               <view class="ml-tree-node__title" :class="{ 'hasExplain': item[useProps.explain] }" @tap.stop="handleIntoChildren(item)">
-                <view class="nowrap">{{ item[useProps.label] || '' }}</view>
+                <view class="nowrap">{{ item[useProps.label] || '' }}<ml-text v-if="item.notEnabled" :status="item.notEnabledStatus || 'orange'">（未启用）</ml-text></view>
                 <view class="ml-tree-node__explain" v-if="item[useProps.explain]">{{ item[useProps.explain] }}</view>
               </view>
               <view class="ml-tree-node__extra">

package/modal/toast.js

@@ -25,6 +25,18 @@ const MaliToast = {
       })
     })
   },
+  warning (option) {
+    const opts = XEUtils.isString(option) ? { content: option } : (option || {})
+    return new Promise(resolve => {
+      uni.showToast({
+        title: opts.content || '操作失败',
+        icon: 'error',
+        success () {
+          setTimeout(resolve, 2000)
+        }
+      })
+    })
+  },
   hide () {
     return new Promise(resolve => {
       uni.hideLoading()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "vue2 码里云小程序组件库",
   "files": [
     "lib",

package/style/variable.scss

@@ -27,6 +27,7 @@ $ml-gray-color: #F0F2F5 !default;
 $ml-blue-color: #246BFD !default;
 $ml-green-color: #00D35C !default;
 $ml-pink-color: #FF5064 !default;
+$ml-red-color: #FF5064 !default;
 $ml-orange-color: #FF9C00 !default;
 $ml-purple-color: #9747FF !default;
 $ml-dark-blue-color: #5e7092 !default;

package/types/toast.d.ts

@@ -1,9 +1,10 @@
+export interface MlToastOptions {
+  content?: string
+}
+
 export const MaliToast: {
-  success(options?: string | {
-    content?: string
-  }): Promise<void>
-  error(options?: string | {
-    content?: string
-  }): Promise<void>
+  success(options?: string | MlToastOptions): Promise<void>
+  error(options?: string | MlToastOptions): Promise<void>
+  warning(options?: string | MlToastOptions): Promise<void>
   hide(): Promise<void>
 }