mali-applet-ui 1.1.74 → 1.1.76

package/lib/components/ml-date-quick-range-picker/ml-date-quick-range-picker.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="ml-date-quick-range-picker" :class="className">
     <view class="ml-date-quick-range-picker-left">
-      <ml-select-picker v-model="selectType" :options="typeList" :border="border" @change="changeTypeEvent"></ml-select-picker>
+      <ml-select v-model="selectType" :options="typeList" :border="border" @change="changeTypeEvent"></ml-select>
     </view>
     <view class="ml-date-quick-range-picker-right">
       <ml-date-picker v-model="selectVal" v-if="selectType === 1" :border="border" :minDate="minDate" :maxDate="maxDate" :clearable="clearable" @change="changeDateEvent"></ml-date-picker>

package/lib/components/ml-form-item/ml-form-item.vue

@@ -20,7 +20,8 @@
           <ml-input v-if="matchComponent('MlInput')" :value="itemValue" @change="modelEvent"></ml-input>
           <ml-number-input v-else-if="matchComponent('MlNumberInput')" :value="itemValue" @change="modelEvent"></ml-number-input>
           <ml-date-picker v-else-if="matchComponent('MlDatePicker')" :value="itemValue" @change="modelEvent"></ml-date-picker>
-          <ml-select-picker v-else-if="matchComponent('MlSelectPicker')" :value="itemValue" :options="renderOpts.options" @change="modelEvent"></ml-select-picker>
+          <ml-select v-else-if="matchComponent('MlSelect')" :value="itemValue" :options="renderOpts.options" @change="modelEvent"></ml-select>
+          <ml-select v-else-if="matchComponent('MlSelectPicker')" :value="itemValue" :options="renderOpts.options" @change="modelEvent"></ml-select>
           <ml-textarea v-else-if="matchComponent('MlTextarea')" :value="itemValue" :rows="renderOpts.rows || 3" :showVoice="renderOpts.showVoice || true" @change="modelEvent"></ml-textarea>
           <ml-upload v-else-if="matchComponent('MlUpload')" :value="itemValue" :mediatype="renderOpts.mediatype || 'image'" @change="modelEvent"></ml-upload>
           <ml-amount-input v-else-if="matchComponent('MlAmountInput')" :value="itemValue" :showTip="itemVertical" @change="modelEvent"></ml-amount-input>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "1.1.74",
+  "version": "1.1.76",
   "description": "码里UI-小程序组件库(vue2)",
   "files": [
     "lib",

package/webview/index.js

@@ -1,4 +1,5 @@
 import XEUtils from 'xe-utils'
+import MaliLoading from '../modal/loading'
 import globalStore from '../config/store'
 
 export function defineH5Transfer (vueOpts = {}) {
@@ -20,9 +21,19 @@ export function defineH5Transfer (vueOpts = {}) {
         if (vueOpts.onLoad) {
           vueOpts.onLoad.call(this, data)
         }
-        if (_url && ['navigateTo', 'redirectTo'].includes(_fnName)) {
-          uni.redirectTo({ url: decodeURIComponent(_url) })
-        }
+        MaliLoading.show()
+        setTimeout(() => {
+          if (_url && ['navigateTo', 'redirectTo'].includes(_fnName)) {
+            uni.redirectTo({
+              url: decodeURIComponent(_url),
+              complete () {
+                MaliLoading.hide()
+              }
+            })
+          } else {
+            MaliLoading.hide()
+          }
+        }, 300)
       }
     }
   }