mali-applet-ui 1.1.5 → 1.1.7

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

@@ -54,6 +54,7 @@ export default {
       type: Number,
       default: 12
     },
+    simplify: Boolean,
     digits: {
       type: [Number, String],
       default: 2

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-echarts/ml-echarts.vue

@@ -1,6 +1,6 @@
 <template>
-  <view class="ml-echarts" :class="className" :style="{height: height || '400rpx', width: width || '100%'}">
-    <canvas ref="canvasRef" class="ml-echarts-canvas" :type="platformEnv.isZFBMP ? '' : '2d'" :id="canvasId" :canvas-id="canvasId" :width="cvsWidth" :height="cvsHeight" @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd"></canvas>
+  <view class="ml-charts" :class="className" :style="{height: height || '400rpx', width: width || '100%'}">
+    <canvas ref="canvasRef" class="ml-charts-canvas" :type="platformEnv.isZFBMP ? '' : '2d'" :id="canvasId" :canvas-id="canvasId" :width="cvsWidth" :height="cvsHeight" @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd"></canvas>
   </view>
 </template>
 
@@ -251,7 +251,7 @@ export default {
 </script>
 
 <style lang="scss">
-.ml-echarts-canvas {
+.ml-charts-canvas {
   width: 100%;
   height: 100%;
 }

package/lib/components/ml-editor/html-parser.js

@@ -0,0 +1,354 @@
+/*
+ * HTML5 Parser By Sam Blowes
+ *
+ * Designed for HTML5 documents
+ *
+ * Original code by John Resig (ejohn.org)
+ * http://ejohn.org/blog/pure-javascript-html-parser/
+ * Original code by Erik Arvidsson, Mozilla Public License
+ * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
+ *
+ * ----------------------------------------------------------------------------
+ * License
+ * ----------------------------------------------------------------------------
+ *
+ * This code is triple licensed using Apache Software License 2.0,
+ * Mozilla Public License or GNU Public License
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Simple HTML Parser.
+ *
+ * The Initial Developer of the Original Code is Erik Arvidsson.
+ * Portions created by Erik Arvidssson are Copyright (C) 2004. All Rights
+ * Reserved.
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * ----------------------------------------------------------------------------
+ * Usage
+ * ----------------------------------------------------------------------------
+ *
+ * // Use like so:
+ * HTMLParser(htmlString, {
+ *     start: function(tag, attrs, unary) {},
+ *     end: function(tag) {},
+ *     chars: function(text) {},
+ *     comment: function(text) {}
+ * });
+ *
+ * // or to get an XML string:
+ * HTMLtoXML(htmlString);
+ *
+ * // or to get an XML DOM Document
+ * HTMLtoDOM(htmlString);
+ *
+ * // or to inject into an existing document/DOM node
+ * HTMLtoDOM(htmlString, document);
+ * HTMLtoDOM(htmlString, document.body);
+ *
+ */
+
+/* eslint-disable */
+// Regular Expressions for parsing tags and attributes
+var startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/;
+var endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/;
+var attr = /([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g; // Empty Elements - HTML 5
+
+var empty = makeMap('area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr'); // Block Elements - HTML 5
+// fixed by xxx 将 ins 标签从块级名单中移除
+
+var block = makeMap('a,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video'); // Inline Elements - HTML 5
+
+var inline = makeMap('abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'); // Elements that you can, intentionally, leave open
+// (and which close themselves)
+
+var closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'); // Attributes that have their values filled in disabled="disabled"
+
+var fillAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'); // Special Elements (can contain anything)
+
+var special = makeMap('script,style');
+function HTMLParser(html, handler) {
+  var index;
+  var chars;
+  var match;
+  var stack = [];
+  var last = html;
+
+  stack.last = function () {
+    return this[this.length - 1];
+  };
+
+  while (html) {
+    chars = true; // Make sure we're not in a script or style element
+
+    if (!stack.last() || !special[stack.last()]) {
+      // Comment
+      if (html.indexOf('<!--') == 0) {
+        index = html.indexOf('-->');
+
+        if (index >= 0) {
+          if (handler.comment) {
+            handler.comment(html.substring(4, index));
+          }
+
+          html = html.substring(index + 3);
+          chars = false;
+        } // end tag
+
+      } else if (html.indexOf('</') == 0) {
+        match = html.match(endTag);
+
+        if (match) {
+          html = html.substring(match[0].length);
+          match[0].replace(endTag, parseEndTag);
+          chars = false;
+        } // start tag
+
+      } else if (html.indexOf('<') == 0) {
+        match = html.match(startTag);
+
+        if (match) {
+          html = html.substring(match[0].length);
+          match[0].replace(startTag, parseStartTag);
+          chars = false;
+        }
+      }
+
+      if (chars) {
+        index = html.indexOf('<');
+        var text = index < 0 ? html : html.substring(0, index);
+        html = index < 0 ? '' : html.substring(index);
+
+        if (handler.chars) {
+          handler.chars(text);
+        }
+      }
+    } else {
+      html = html.replace(new RegExp('([\\s\\S]*?)<\/' + stack.last() + '[^>]*>'), function (all, text) {
+        text = text.replace(/<!--([\s\S]*?)-->|<!\[CDATA\[([\s\S]*?)]]>/g, '$1$2');
+
+        if (handler.chars) {
+          handler.chars(text);
+        }
+
+        return '';
+      });
+      parseEndTag('', stack.last());
+    }
+
+    if (html == last) {
+      throw 'Parse Error: ' + html;
+    }
+
+    last = html;
+  } // Clean up any remaining tags
+
+
+  parseEndTag();
+
+  function parseStartTag(tag, tagName, rest, unary) {
+    tagName = tagName.toLowerCase();
+
+    if (block[tagName]) {
+      while (stack.last() && inline[stack.last()]) {
+        parseEndTag('', stack.last());
+      }
+    }
+
+    if (closeSelf[tagName] && stack.last() == tagName) {
+      parseEndTag('', tagName);
+    }
+
+    unary = empty[tagName] || !!unary;
+
+    if (!unary) {
+      stack.push(tagName);
+    }
+
+    if (handler.start) {
+      var attrs = [];
+      rest.replace(attr, function (match, name) {
+        var value = arguments[2] ? arguments[2] : arguments[3] ? arguments[3] : arguments[4] ? arguments[4] : fillAttrs[name] ? name : '';
+        attrs.push({
+          name: name,
+          value: value,
+          escaped: value.replace(/(^|[^\\])"/g, '$1\\\"') // "
+
+        });
+      });
+
+      if (handler.start) {
+        handler.start(tagName, attrs, unary);
+      }
+    }
+  }
+
+  function parseEndTag(tag, tagName) {
+    // If no tag name is provided, clean shop
+    if (!tagName) {
+      var pos = 0;
+    } // Find the closest opened tag of the same type
+    else {
+        for (var pos = stack.length - 1; pos >= 0; pos--) {
+          if (stack[pos] == tagName) {
+            break;
+          }
+        }
+      }
+
+    if (pos >= 0) {
+      // Close all the open elements, up the stack
+      for (var i = stack.length - 1; i >= pos; i--) {
+        if (handler.end) {
+          handler.end(stack[i]);
+        }
+      } // Remove the open elements from the stack
+
+
+      stack.length = pos;
+    }
+  }
+}
+
+function makeMap(str) {
+  var obj = {};
+  var items = str.split(',');
+
+  for (var i = 0; i < items.length; i++) {
+    obj[items[i]] = true;
+  }
+
+  return obj;
+}
+
+function removeDOCTYPE(html) {
+  return html.replace(/<\?xml.*\?>\n/, '').replace(/<!doctype.*>\n/, '').replace(/<!DOCTYPE.*>\n/, '');
+}
+
+function parseAttrs(attrs) {
+  return attrs.reduce(function (pre, attr) {
+    var value = attr.value;
+    var name = attr.name;
+
+    if (pre[name]) {
+			pre[name] = pre[name] + " " + value;
+    } else {
+			pre[name] = value;
+    }
+
+    return pre;
+  }, {});
+}
+
+function parseHtml(html) {
+  html = removeDOCTYPE(html);
+  var stacks = [];
+  var results = {
+    node: 'root',
+    children: []
+  };
+  HTMLParser(html, {
+    start: function start(tag, attrs, unary) {
+      var node = {
+        name: tag
+      };
+
+      if (attrs.length !== 0) {
+        node.attrs = parseAttrs(attrs);
+      }
+
+      if (unary) {
+        var parent = stacks[0] || results;
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+
+        parent.children.push(node);
+      } else {
+        stacks.unshift(node);
+      }
+    },
+    end: function end(tag) {
+      var node = stacks.shift();
+      if (node.name !== tag) console.error('invalid state: mismatch end tag');
+
+      if (stacks.length === 0) {
+        results.children.push(node);
+      } else {
+        var parent = stacks[0];
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+
+        parent.children.push(node);
+      }
+    },
+    chars: function chars(text) {
+      var node = {
+        type: 'text',
+        text: text
+      };
+
+      if (stacks.length === 0) {
+        results.children.push(node);
+      } else {
+        var parent = stacks[0];
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+
+        parent.children.push(node);
+      }
+    },
+    comment: function comment(text) {
+      var node = {
+        node: 'comment',
+        text: text
+      };
+      var parent = stacks[0];
+
+      if (!parent.children) {
+        parent.children = [];
+      }
+
+      parent.children.push(node);
+    }
+  });
+  return results.children;
+}
+
+export default parseHtml;

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

@@ -0,0 +1,73 @@
+<template>
+  <view class="ml-editor">
+    <rich-text v-if="isFromReadonly" :nodes="nodes" :selectable="selectable"></rich-text>
+    <rich-text v-else-if="isFormDisabled" :nodes="nodes" :selectable="selectable"></rich-text>
+    <view v-else></view>
+  </view>
+</template>
+
+<script>
+import parseHtml from './html-parser'
+
+export default {
+  name: 'MlEditor',
+  props: {
+    value: String,
+    readonly: Boolean,
+    disabled: Boolean,
+    selectable: {
+      type: Boolean,
+      default: true
+    }
+  },
+  inject: {
+    form: {
+      from: 'mlForm',
+      default: null
+    },
+    formItem: {
+      from: 'mlFormItem',
+      default: null
+    }
+  },
+  data () {
+    return {
+      nodes: []
+    }
+  },
+  computed: {
+    isFromReadonly () {
+      if (this.readonly) {
+        return true
+      }
+      return this.form ? this.form.readonly : false
+    },
+    isFormDisabled () {
+      if (this.disabled) {
+        return true
+      }
+      return this.formItem ? this.formItem.isFormDisabled : false
+    }
+  },
+  watch: {
+    value () {
+      this.load()
+    }
+  },
+  mounted () {
+    this.load()
+  },
+  methods: {
+    load () {
+      this.nodes = this.value ? parseHtml(this.value) : []
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.ml-editor {
+  display: block;
+  word-break: break-word;
+}
+</style>

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-rich-text/ml-rich-text.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import parseHtml from './html-parser'
+import parseHtml from '../ml-editor/html-parser'
 
 export default {
   name: 'MlRichText',

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-switch/ml-switch.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="ml-switch" :class="[isChecked ? 'is--on' : 'is--off', {'is--disabled': disabled,'is--animat': this.hasAnimat}]">
+  <view class="ml-switch" :class="[isChecked ? 'is--on' : 'is--off', {'is--disabled': disabled,'is--animat': hasAnimat}]">
     <view class="ml-switch--button" @tap="clickEvent">
       <view class="ml-switch--label ml-switch--label-on">{{ onShowLabel }}</view>
       <view class="ml-switch--label ml-switch--label-off">{{ offShowLabel }}</view>
@@ -54,10 +54,6 @@ export default {
         this.hasAnimat = true
         this.$emit('input', value)
         this.$emit('change', { value })
-        // 自动更新校验状态
-        if (this.$xeform && this.$xeformiteminfo) {
-          this.$xeform.triggerItemEvent(evnt, this.$xeformiteminfo.itemConfig.field, value)
-        }
         this.activeTimeout = setTimeout(() => {
           this.hasAnimat = false
         }, 400)

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/lib/components/ml-upload/ml-upload.vue

@@ -3,7 +3,7 @@
     <!-- 上传图片 -->
     <view v-if="mediatype === 'image' || platformEnv.isDDMP" class="ml-upload-image-list">
       <view class="ml-upload-image-item" v-for="(item, index) in fileList" :key="index">
-        <image class="ml-upload-image-img" mode="aspectFill" :src="getThumbnailFileUrl(item)" @tap="previewImageEvent(item, index)"></image>
+        <image class="ml-upload-image-img" mode="aspectFill" :src="getThumbnailUrl(item)" @tap="previewImageEvent(item, index)"></image>
         <view v-if="!isFromReadonly" class="ml-upload-image-del-btn" @tap="removeEvent(item)">
           <ml-icon name="close" />
         </view>
@@ -205,7 +205,7 @@ export default {
       default: () => ['album', 'camera']
     },
     getFileUrl: Function,
-    getThumbnailUrl: Function,
+    getThumbnailFileUrl: Function,
     uploadFile: Function,
     removeFile: Function,
     downloadFile: Function
@@ -274,7 +274,7 @@ export default {
   },
   methods: {
     getFileIcon (item) {
-      switch (item[[this.typeField]]) {
+      switch (item[this.typeField]) {
         case 'png':
         case 'jpg':
           return 'file-image'
@@ -345,8 +345,8 @@ export default {
       this.isModelUpdate = true
       this.updateModel()
     },
-    getThumbnailFileUrl (item) {
-      const getThumbnailMethod = this.getThumbnailUrl ? this.getThumbnailUrl : (globalStore.upload ? globalStore.upload.getThumbnailUrl : null)
+    getThumbnailUrl (item) {
+      const getThumbnailMethod = this.getThumbnailFileUrl ? this.getThumbnailFileUrl : (globalStore.upload ? globalStore.upload.getThumbnailFileUrl : null)
       if (getThumbnailMethod) {
         return getThumbnailMethod.call(this.currVM, {
           item,

package/modal/modal.js

@@ -1,29 +1,30 @@
+import XEUtils from 'xe-utils'
+
 const MaliModal = {
-  alert (option = {}) {
+  alert (option) {
+    const opts = XEUtils.isString(option) ? { content: option } : (option || {})
     return new Promise(resolve => {
       uni.showModal({
-        title: option.title || '系统提示',
-        content: option.content || '',
+        title: opts.title || '系统提示',
+        content: opts.content || '',
         showCancel: false,
-        confirmText: option.confirmButtonText || '确认',
+        confirmText: opts.confirmButtonText || '确认',
         success () {
           const type = 'confirm'
-          if (option.callback) {
-            option.callback(type)
-          }
           resolve(type)
         }
       })
     })
   },
-  confirm (option = {}) {
+  confirm (option) {
+    const opts = XEUtils.isString(option) ? { content: option } : (option || {})
     return new Promise(resolve => {
       uni.showModal({
-        title: option.title || '系统提示',
-        content: option.content || '',
+        title: opts.title || '系统提示',
+        content: opts.content || '',
         showCancel: true,
-        confirmText: option.confirmButtonText || '确认',
-        cancelText: option.cancelButtonText || '取消',
+        confirmText: opts.confirmButtonText || '确认',
+        cancelText: opts.cancelButtonText || '取消',
         success (res) {
           let type
           if (res.confirm) {
@@ -31,9 +32,6 @@ const MaliModal = {
           } else if (res.cancel) {
             type = 'cancel'
           }
-          if (option.callback) {
-            option.callback(type)
-          }
           resolve(type)
         }
       })

package/modal/toast.js

@@ -1,8 +1,11 @@
+import XEUtils from 'xe-utils'
+
 const MaliToast = {
-  success (option = {}) {
+  success (option) {
+    const opts = XEUtils.isString(option) ? { content: option } : (option || {})
     return new Promise(resolve => {
       uni.showToast({
-        title: option.content || '操作成功',
+        title: opts.content || '操作成功',
         icon: 'success',
         success () {
           setTimeout(resolve, 2000)
@@ -10,10 +13,11 @@ const MaliToast = {
       })
     })
   },
-  error (option = {}) {
+  error (option) {
+    const opts = XEUtils.isString(option) ? { content: option } : (option || {})
     return new Promise(resolve => {
       uni.showToast({
-        title: option.content || '操作失败',
+        title: opts.content || '操作失败',
         icon: 'error',
         success () {
           setTimeout(resolve, 2000)
@@ -21,14 +25,23 @@ const MaliToast = {
       })
     })
   },
-  hide () {
+  warning (option) {
+    const opts = XEUtils.isString(option) ? { content: option } : (option || {})
     return new Promise(resolve => {
-      uni.hideToast({
+      uni.showToast({
+        title: opts.content || '操作失败',
+        icon: 'error',
         success () {
           setTimeout(resolve, 2000)
         }
       })
     })
+  },
+  hide () {
+    return new Promise(resolve => {
+      uni.hideLoading()
+      setTimeout(resolve, 1500)
+    })
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "vue2 码里云小程序组件库",
   "files": [
     "lib",
@@ -15,6 +15,7 @@
     "theme.scss"
   ],
   "main": "index.js",
+  "typings": "types/index.d.ts",
   "scripts": {
     "lib": "gulp build_components",
     "release": "node script/release.js && npm run lib && npm publish",
@@ -31,7 +32,7 @@
     "run-before": "node script/run-before.js"
   },
   "dependencies": {
-    "xe-utils": "^3.5.7"
+    "xe-utils": "^3.5.10"
   },
   "devDependencies": {
     "@dcloudio/uni-app-plus": "^2.0.1-36420220922003",
@@ -58,7 +59,6 @@
     "regenerator-runtime": "^0.12.1",
     "vue": "^2.6.12",
     "vuex": "^3.2.0",
-    "xe-utils": "3.5.7",
     "@babel/eslint-parser": "^7.12.16",
     "@babel/runtime": "~7.17.9",
     "@dcloudio/types": "^3.0.4",

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/index.d.ts

@@ -2,23 +2,26 @@
 // import Vue from 'vue'
 import { MaliUtils, MlUtilsCore } from './utils'
 import { MaliStorage, MlStorageCore } from './storage'
+import { MaliModal } from './modal'
+import { MaliToast } from './toast'
+import { MaliLoading } from './loading'
 
 export const MaliUI: {
   version: string
   // config(options: ConfigOptions): any
   // install(app: Vue): void
   MaliUtils: MlUtilsCore
-  // MaliToast: typeof MaliToast
-  // MaliModal: typeof MaliModal
-  // MaliLoading: typeof MaliLoading
+  MaliToast: typeof MaliToast
+  MaliModal: typeof MaliModal
+  MaliLoading: typeof MaliLoading
   MaliStorage: MlStorageCore
 }
 
 export {
   MaliUtils,
-  // MaliToast,
-  // MaliModal,
-  // MaliLoading,
+  MaliToast,
+  MaliModal,
+  MaliLoading,
   MaliStorage
 }
 

package/types/loading.d.ts

@@ -0,0 +1,6 @@
+export const MaliLoading: {
+  show(options?: string | {
+    content?: string
+  }): Promise<void>
+  hide(): Promise<void>
+}

package/types/modal.d.ts

@@ -0,0 +1,13 @@
+export const MaliModal: {
+  alert(options: string | {
+    title?: string
+    content?: string
+    confirmButtonText?: string
+  }): Promise<'confirm' | 'cancel'>
+  confirm(options: string | {
+    title?: string
+    content?: string
+    confirmButtonText?: string
+    cancelButtonText?: string
+  }): Promise<'confirm' | 'cancel'>
+}

package/types/toast.d.ts

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

package/types/utils/index.d.ts

@@ -2,6 +2,31 @@ import 'xe-utils'
 import { XEUtilsMethods } from 'xe-utils/ctor'
 
 export interface MlUtilsCore extends XEUtilsMethods {
+  toDateString (date: any, format?: string): string
+  toStringDate (value: any): Date
+
+  checkForUpdate(): void
+  getPlatformEnv(): {
+    isH5: boolean
+    isWXMP: boolean
+    isQWMP: boolean
+    isDDMP: boolean
+    isZFBMP: boolean
+  }
+  getAppId(): string | null
+  getAppVersion(): string
+  getAppDpr(): number
+
+  getFileSuffix(filename: string): string
+  getFileName(filename: string): string
+  saveFileByUrl (url: string, name?: string): any
+
+  toNumMoneyToChinese (money: any): string
+  toAmountString (value: any, fixed?: number): string
+  toWanAmountString (value: any, fixed?: number): string
+  
+  uniq<C = any>(list: any, iterate?: string | number | ((this: C, item: any, index: number, obj: any) => string | number), context?: C): any[];
+
   [key: string]: any
 }
 

package/utils/file.js

@@ -20,18 +20,24 @@ export function getFileName (url) {
  * @param {*} name
  */
 export function saveFileByUrl (url, name) {
-  uni.downloadFile({
-    url,
-    success: (downRes) => {
-      uni.saveFile({
-        tempFilePath: downRes.tempFilePath,
-        success (res) {
-          uni.showModal({
-            title: '保存成功',
-            content: '路径：' + res.savedFilePath
-          })
-        }
-      })
-    }
+  return new PromiseRejectionEvent((resolve, reject) => {
+    uni.downloadFile({
+      url,
+      success: (downRes) => {
+        uni.saveFile({
+          tempFilePath: downRes.tempFilePath,
+          success (res) {
+            uni.showModal({
+              title: '保存成功',
+              content: '路径：' + res.savedFilePath
+            })
+            resolve()
+          }
+        })
+      },
+      fail (e) {
+        reject(e)
+      }
+    })
   })
 }