mali-applet-ui 1.0.87 → 1.0.89

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

@@ -2,7 +2,7 @@
   <view v-if="isFromReadonly" class="ml-date-picker is-readonly">
     <view class="ml-date-picker-readonly-content">{{ value }}</view>
   </view>
-  <uni-datetime-picker v-else :class="className" v-model="selectVal" type="date" :start="minDate" :end="maxDate" :placeholder="placeholder" @change="changeEvent" :clearIcon="clearable" :border="border"/>
+  <ml-fix-uni-datetime-picker v-else :class="className" v-model="selectVal" type="date" :start="minDate" :end="maxDate" :placeholder="placeholder" @change="changeEvent" :clearIcon="clearable" :border="border"/>
 </template>
 
 <script>

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

@@ -5,7 +5,7 @@
     </view>
     <view class="ml-date-quick-range-picker-right">
       <ml-date-picker v-model="selectVal" v-if="selectType === 1" :border="border" :clearable="clearable"></ml-date-picker>
-      <uni-datetime-picker v-else v-model="selectDates" type="daterange" :start="minDate" :end="maxDate" @change="changeEvent" :border="border" :clear-icon="clearable"/>
+      <ml-fix-uni-datetime-picker v-else v-model="selectDates" type="daterange" :start="minDate" :end="maxDate" @change="changeEvent" :border="border" :clear-icon="clearable"/>
     </view>
   </view>
 </template>

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

@@ -1,5 +1,5 @@
 <template>
-  <uni-datetime-picker :class="className" v-model="selectDates" type="daterange" :start="minDate" :end="maxDate" @change="changeEvent" :border="border" :clear-icon="clearable"/>
+  <ml-fix-uni-datetime-picker :class="className" v-model="selectDates" type="daterange" :start="minDate" :end="maxDate" @change="changeEvent" :border="border" :clear-icon="clearable"/>
 </template>
 
 <script>

package/lib/components/ml-datetime-picker/ml-datetime-picker.vue

@@ -1,5 +1,5 @@
 <template>
-  <uni-datetime-picker :class="className" :value="selectVal" type="datetime" :start="minDate" :end="maxDate" :hide-second="hideSecond" @change="changeEvent" :border="border" :clear-icon="clearable" />
+  <ml-fix-uni-datetime-picker :class="className" :value="selectVal" type="datetime" :start="minDate" :end="maxDate" :hide-second="hideSecond" @change="changeEvent" :border="border" :clear-icon="clearable" />
 </template>
 
 <script>

package/lib/components/ml-datetime-range-picker/ml-datetime-range-picker.vue

@@ -1,10 +1,10 @@
 <template>
-  <uni-datetime-picker :class="className" v-model="selectDates" type="datetimerange" :start="minDate" :end="maxDate" @change="changeEvent" :border="border" :clear-icon="clearable" />
+  <ml-fix-uni-datetime-picker :class="className" v-model="selectDates" type="datetimerange" :start="minDate" :end="maxDate" @change="changeEvent" :border="border" :clear-icon="clearable" />
 </template>
 
 <script>
 export default {
-  name: 'MlDatetimeRangePicker',
+  name: 'MlFixUniDatetimePicker',
   options: {
     virtualHost: true
   },

package/lib/components/ml-fix-uni-datetime-picker/calendar-item.vue

@@ -0,0 +1,186 @@
+<template>
+  <view class="uni-calendar-item__weeks-box" :class="{
+    'uni-calendar-item--disable':weeks.disable,
+    'uni-calendar-item--before-checked-x':weeks.beforeMultiple,
+    'uni-calendar-item--multiple': weeks.multiple,
+    'uni-calendar-item--after-checked-x':weeks.afterMultiple,
+    }" @click="choiceDate(weeks)" @mouseenter="handleMousemove(weeks)">
+    <view class="uni-calendar-item__weeks-box-item" :class="{
+        'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && (calendar.userChecked || !checkHover),
+        'uni-calendar-item--checked-range-text': checkHover,
+        'uni-calendar-item--before-checked':weeks.beforeMultiple,
+        'uni-calendar-item--multiple': weeks.multiple,
+        'uni-calendar-item--after-checked':weeks.afterMultiple,
+        'uni-calendar-item--disable':weeks.disable,
+        }">
+      <text v-if="selected&&weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+      <text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text>
+    </view>
+    <view :class="{'uni-calendar-item--isDay': weeks.isDay}"></view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    weeks: {
+      type: Object,
+      default () {
+        return {}
+      }
+    },
+    calendar: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    },
+    selected: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    lunar: {
+      type: Boolean,
+      default: false
+    },
+    checkHover: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    choiceDate (weeks) {
+      this.$emit('change', weeks)
+    },
+    handleMousemove (weeks) {
+      this.$emit('handleMouse', weeks)
+    }
+  }
+}
+</script>
+
+<style lang="scss" >
+  $uni-primary: #007aff !default;
+
+  .uni-calendar-item__weeks-box {
+    flex: 1;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    margin: 1px 0;
+    position: relative;
+  }
+
+  .uni-calendar-item__weeks-box-text {
+    font-size: 14px;
+    // font-family: Lato-Bold, Lato;
+    font-weight: bold;
+    color: darken($color: $uni-primary, $amount: 40%);
+  }
+
+  .uni-calendar-item__weeks-lunar-text {
+    font-size: 12px;
+    color: #333;
+  }
+
+  .uni-calendar-item__weeks-box-item {
+    position: relative;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    width: 40px;
+    height: 40px;
+    /* #ifdef H5 */
+    cursor: pointer;
+    /* #endif */
+  }
+
+  .uni-calendar-item__weeks-box-circle {
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    width: 8px;
+    height: 8px;
+    border-radius: 8px;
+    background-color: #dd524d;
+
+  }
+
+  .uni-calendar-item__weeks-box .uni-calendar-item--disable {
+    // background-color: rgba(249, 249, 249, $uni-opacity-disabled);
+    cursor: default;
+  }
+
+  .uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
+    color: #D1D1D1;
+  }
+
+  .uni-calendar-item--isDay {
+    position: absolute;
+    top: 10px;
+    right: 17%;
+    background-color: #dd524d;
+    width:6px;
+    height: 6px;
+    border-radius: 50%;
+  }
+
+  .uni-calendar-item--extra {
+    color: #dd524d;
+    opacity: 0.8;
+  }
+
+  .uni-calendar-item__weeks-box .uni-calendar-item--checked {
+    background-color: $uni-primary;
+    border-radius: 50%;
+    box-sizing: border-box;
+    border: 3px solid #fff;
+  }
+
+  .uni-calendar-item--checked .uni-calendar-item--checked-text {
+    color: #fff;
+  }
+
+  .uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
+    color: #333;
+  }
+
+  .uni-calendar-item--multiple {
+    background-color:  #F6F7FC;
+    // color: #fff;
+  }
+
+  .uni-calendar-item--multiple .uni-calendar-item--before-checked,
+  .uni-calendar-item--multiple .uni-calendar-item--after-checked {
+    background-color: $uni-primary;
+    border-radius: 50%;
+    box-sizing: border-box;
+    border: 3px solid #F6F7FC;
+  }
+
+  .uni-calendar-item--before-checked .uni-calendar-item--checked-text,
+  .uni-calendar-item--after-checked .uni-calendar-item--checked-text {
+    color: #fff;
+  }
+
+  .uni-calendar-item--before-checked-x {
+    border-top-left-radius: 50px;
+    border-bottom-left-radius: 50px;
+    box-sizing: border-box;
+    background-color: #F6F7FC;
+  }
+
+  .uni-calendar-item--after-checked-x {
+    border-top-right-radius: 50px;
+    border-bottom-right-radius: 50px;
+    background-color: #F6F7FC;
+  }
+</style>