@uxda/appkit 4.1.16 → 4.1.19

package/src/balance/components/DateFilter.vue

@@ -1,227 +1,249 @@
-<template>
-  <div class="consumption-date-filter">
-    <div class="date-filter-header">日期选择</div>
-    <div class="content">
-      <div class="title">自定义</div>
-      <div class="time">
-        <div
-          class="item"
-          :class="focused === 'from' ? 'current' : ''"
-          @click="switchDateInput('from')"
-        >
-          {{ formatDate(result.from) }}
-        </div>
-        <div class="line">-</div>
-        <div class="item" :class="focused === 'to' ? 'current' : ''" @click="switchDateInput('to')">
-          {{ formatDate(result.to) }}
-        </div>
-      </div>
-    </div>
-    <div class="buttons spa-between">
-      <div class="btn" @click="reset">重置</div>
-      <div class="btn confirm" @click="onOkClick">确定</div>
-    </div>
-    <div class="bottom"></div>
-    <nut-popup v-model:visible="datePickerOpen" position="bottom">
-      <nut-date-picker
-        v-model="focusedDate"
-        :min-date="minDate"
-        :max-date="maxDate"
-        :is-show-chinese="false"
-        :three-dimensional="false"
-        @cancel="datePickerOpen = false"
-        @confirm="onDatePickerComplete"
-      ></nut-date-picker>
-    </nut-popup>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { reactive, ref, watch } from 'vue'
-
-type DateFilterProps = {
-  from: string
-  to: string
-}
-
-const props = defineProps<DateFilterProps>()
-
-const emit = defineEmits(['complete', 'reset'])
-
-watch(
-  () => `${props.from}${props.to}`,
-  () => {
-    result.from = props.from
-    result.to = props.to
-  }
-)
-
-/**
- * 日期范围结果
- */
-const result = reactive<DateFilterProps>({ ...props })
-
-/**
- * 目前激活的日期输入框
- */
-const focused = ref<string>('from')
-const focusedDate = ref<any>(props.from)
-
-const minDate = ref<any>()
-const maxDate = ref<Date>(new Date())
-const datePickerOpen = ref<boolean>(false)
-
-/**
- * 日期重置
- */
-function reset() {
-  emit('reset')
-}
-
-/**
- * 确认，提交新时间
- */
-function onOkClick() {
-  emit('complete', result)
-}
-
-function formatDate(date: string) {
-  const [year, month, day] = date.split('-')
-  return year + '年' + month + '月' + day + '日'
-}
-
-function onDatePickerComplete({ selectedValue, selectedOptions }) {
-  let time = selectedOptions.map((val: any) => val.text).join('-')
-  if (focused.value === 'from') {
-    // 如果选择的时间比结束时间大，结束时间改为开始时间
-    result.from = new Date(time) > new Date(result.to) ? result.to : time
-  } else {
-    result.to = time
-  }
-  datePickerOpen.value = false
-}
-
-/**
- * 切换时间逻辑：初始化时有时间，默认聚焦开始时间
- * 当选择开始时间大于结束时间，结束时间改为开始时间
- * 时间选择器都要小于当前时间，结束时间的时间选择器要以开始时间为最小值，
- */
-function switchDateInput(shift: string) {
-  // 要设置一下结束时间的起始值 开始时间往前倒5年
-  if (shift === 'from') {
-    let time = result.from.split('-').map(Number)
-    minDate.value = new Date(time[0] - 5, 1, 1)
-  } else {
-    let time = result.from.split('-').map(Number)
-    minDate.value = new Date(time[0], time[1] - 1, time[2])
-  }
-  focusedDate.value = new Date(result[shift])
-  focused.value = shift
-  datePickerOpen.value = true
-}
-</script>
-<style lang="scss">
-.consumption-date-filter {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  position: relative;
-  .date-filter-header {
-    text-align: center;
-    height: 44px;
-    line-height: 44px;
-    color: #353535;
-    font-size: 17px;
-    background-color: #f5f5f5;
-  }
-  .content {
-    flex: 1;
-    margin: 15px;
-    overflow-y: scroll;
-    color: #353535;
-    font-size: 13px;
-    .title {
-      opacity: 0.6;
-      line-height: 18px;
-    }
-    .info {
-      display: grid;
-      grid-template-columns: 1fr 1fr 1fr;
-      grid-gap: 10px;
-      margin: 10px 0;
-      .item {
-        height: 30px;
-        line-height: 30px;
-        border: 1px solid #ccc;
-        border-radius: 6px;
-        text-align: center;
-      }
-      .current {
-        border: 1px solid;
-        border-image-source: linear-gradient(
-          180deg,
-          rgba(239, 208, 130, 0.8) 0%,
-          rgba(255, 185, 120, 0.8) 100%
-        );
-        background: linear-gradient(
-            180deg,
-            rgba(239, 208, 130, 0.8) 0%,
-            rgba(255, 185, 120, 0.8) 100%
-          ),
-          linear-gradient(180deg, #fff7e3 0%, #fefde6 100%);
-      }
-    }
-  }
-  .buttons {
-    margin: 0 15px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    .btn {
-      flex: 1;
-      height: 40px;
-      line-height: 40px;
-      text-align: center;
-      border: 1px solid #ccc;
-      box-sizing: border-box;
-      color: #666;
-      font-size: 16px;
-      border-radius: 6px;
-    }
-    .confirm {
-      margin-left: 11px;
-      color: #000;
-      border: none;
-      background: linear-gradient(90deg, #ffebc1 0%, #ffd7a7 52.29%, #ffb875 100%);
-    }
-  }
-  .time {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    margin: 10px 0 30px 0;
-    .line {
-      margin: 0 8px;
-    }
-    .item {
-      height: 30px;
-      line-height: 30px;
-      padding: 0 15px;
-      font-size: 13px;
-      color: #353535;
-      border: 1px solid transparent;
-      box-sizing: border-box;
-      background: rgba(#f5f5f5, 0.8);
-      border-radius: 6px;
-    }
-    .current {
-      border: 1px solid #353535;
-    }
-  }
-  .bottom {
-    height: 32px;
-    background: #fff;
-  }
-}
-</style>
+<template>
+  <div class="appkit-date-filter">
+    <div class="date-filter-header">日期选择</div>
+    <div class="content">
+      <div class="title">自定义</div>
+      <div class="time">
+        <div
+          class="item"
+          :class="focused === 'from' ? 'current' : ''"
+          @click="switchDateInput('from')"
+        >
+          {{ formatDate(result.from) }}
+        </div>
+        <div class="line">-</div>
+        <div class="item" :class="focused === 'to' ? 'current' : ''" @click="switchDateInput('to')">
+          {{ formatDate(result.to) }}
+        </div>
+      </div>
+    </div>
+    <div class="buttons spa-between">
+      <div class="btn" @click="reset">重置</div>
+      <div class="btn confirm" @click="onOkClick">确定</div>
+    </div>
+    <div class="bottom"></div>
+    <nut-popup v-model:visible="datePickerOpen"
+      class="appkit-date-filter-picker-popup"
+      position="bottom"
+      overlay-class="appkit-date-filter-picker-overlay">
+      <nut-date-picker
+        v-model="focusedDate"
+        :min-date="minDate"
+        :max-date="maxDate"
+        :is-show-chinese="false"
+        :three-dimensional="false"
+        @cancel="onDatePickerCancel"
+        @confirm="onDatePickerComplete" />
+    </nut-popup>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, watch } from 'vue'
+import { usePopup } from '@uxda/nutshell/taro'
+
+type DateFilterProps = {
+  from: string
+  to: string
+}
+
+const props = defineProps<DateFilterProps>()
+
+const emit = defineEmits(['complete', 'reset']),
+  state = usePopup()
+
+watch(
+  () => `${props.from}${props.to}`,
+  () => {
+    result.from = props.from
+    result.to = props.to
+  }
+)
+
+/**
+ * 日期范围结果
+ */
+const result = reactive<DateFilterProps>({ ...props })
+
+/**
+ * 目前激活的日期输入框
+ */
+const focused = ref<string>('from')
+const focusedDate = ref<any>(props.from)
+
+const minDate = ref<any>()
+const maxDate = ref<Date>(new Date())
+const datePickerOpen = ref<boolean>(false)
+
+state.beforeClose = () => {
+  datePickerOpen.value = false
+  return true
+}
+
+/**
+ * 日期重置
+ */
+function reset() {
+  emit('reset')
+}
+
+/**
+ * 确认，提交新时间
+ */
+function onOkClick() {
+  emit('complete', result)
+}
+
+function formatDate(date: string) {
+  const [year, month, day] = date.split('-')
+  return year + '年' + month + '月' + day + '日'
+}
+
+function onDatePickerComplete({ selectedValue, selectedOptions }) {
+  let time = selectedOptions.map((val: any) => val.text).join('-')
+  if (focused.value === 'from') {
+    // 如果选择的时间比结束时间大，结束时间改为开始时间
+    result.from = new Date(time) > new Date(result.to) ? result.to : time
+  } else {
+    result.to = time
+  }
+  datePickerOpen.value = false
+  state.couldClose = true
+}
+
+function onDatePickerCancel () {
+  datePickerOpen.value = false
+  state.couldClose = true
+}
+
+/**
+ * 切换时间逻辑：初始化时有时间，默认聚焦开始时间
+ * 当选择开始时间大于结束时间，结束时间改为开始时间
+ * 时间选择器都要小于当前时间，结束时间的时间选择器要以开始时间为最小值，
+ */
+function switchDateInput (shift: string) {
+  // 要设置一下结束时间的起始值 开始时间往前倒5年
+  if (shift === 'from') {
+    let time = result.from.split('-').map(Number)
+    minDate.value = new Date(time[0] - 5, 1, 1)
+  } else {
+    let time = result.from.split('-').map(Number)
+    minDate.value = new Date(time[0], time[1] - 1, time[2])
+  }
+  focusedDate.value = new Date(result[shift])
+  focused.value = shift
+  datePickerOpen.value = true
+  // 不允许浮窗关闭
+  state.couldClose = false
+}
+</script>
+<style lang="scss">
+.appkit-date-filter {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  position: relative;
+  .date-filter-header {
+    text-align: center;
+    height: 44px;
+    line-height: 44px;
+    color: #353535;
+    font-size: 17px;
+    background-color: #f5f5f5;
+  }
+  .content {
+    flex: 1;
+    margin: 15px;
+    overflow-y: scroll;
+    color: #353535;
+    font-size: 13px;
+    .title {
+      opacity: 0.6;
+      line-height: 18px;
+    }
+    .info {
+      display: grid;
+      grid-template-columns: 1fr 1fr 1fr;
+      grid-gap: 10px;
+      margin: 10px 0;
+      .item {
+        height: 30px;
+        line-height: 30px;
+        border: 1px solid #ccc;
+        border-radius: 6px;
+        text-align: center;
+      }
+      .current {
+        border: 1px solid;
+        border-image-source: linear-gradient(
+          180deg,
+          rgba(239, 208, 130, 0.8) 0%,
+          rgba(255, 185, 120, 0.8) 100%
+        );
+        background: linear-gradient(
+            180deg,
+            rgba(239, 208, 130, 0.8) 0%,
+            rgba(255, 185, 120, 0.8) 100%
+          ),
+          linear-gradient(180deg, #fff7e3 0%, #fefde6 100%);
+      }
+    }
+  }
+  .buttons {
+    margin: 32px 15px 0 15px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .btn {
+      flex: 1;
+      height: 40px;
+      line-height: 40px;
+      text-align: center;
+      border: 1px solid #ccc;
+      box-sizing: border-box;
+      color: #666;
+      font-size: 16px;
+      border-radius: 6px;
+    }
+    .confirm {
+      margin-left: 11px;
+      color: #000;
+      border: none;
+      background: linear-gradient(90deg, #ffebc1 0%, #ffd7a7 52.29%, #ffb875 100%);
+    }
+  }
+  .time {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    margin: 10px 0 30px 0;
+    .line {
+      margin: 0 8px;
+    }
+    .item {
+      height: 30px;
+      line-height: 30px;
+      padding: 0 15px;
+      font-size: 13px;
+      color: #353535;
+      border: 1px solid transparent;
+      box-sizing: border-box;
+      background: rgba(#f5f5f5, 0.8);
+      border-radius: 6px;
+    }
+    .current {
+      border: 1px solid #353535;
+    }
+  }
+  .bottom {
+    height: 32px;
+    background: #fff;
+  }
+}
+.nut-overlay {
+  &.date-filter-picker-overlay {
+    height: 100vh;
+  }
+}
+</style>

package/src/balance/components/DateRange.vue

@@ -1,78 +1,81 @@
-<template>
-  <div class="date-range" @click="openDateRangePicker">
-    <div class="text">{{ dateRangeDisplay }}</div>
-    <img
-      style="margin-top: -2px"
-      class="time-icon"
-      src="https://cdn.ddjf.com/static/images/bpms-workBench/clound-bean-down.png"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { computed, PropType, reactive } from 'vue'
-import { useNutshell } from '@uxda/nutshell/taro'
-import DateFilter from './DateFilter.vue'
-import dayjs from 'dayjs'
-
-const $n = useNutshell()
-
-export type DateRangeModel = {
-  from: string,
-  to: string
-}
-
-const model = defineModel({
-  type: Object as PropType<DateRangeModel>,
-  required: false,
-  default: {
-    from: dayjs().add(-1, 'M').format('YYYY-MM-DD'),
-    to: dayjs().format('YYYY-MM-DD')
-  }
-})
-
-const openDateRangePicker = () => {
-  $n.sheet({
-    component: DateFilter,
-    props: {
-      from: model.value.from,
-      to: model.value.to,
-    },
-    onComplete (result: any) {
-      console.log('===openDateFilter complete', result)
-      model.value = {
-        from: result.from,
-        to: result.to
-      }
-    }
-  })
-}
-
-const dateRangeDisplay = computed(() => {
-  let startTime = (model.value.from || '').replace(/-/g, '.').substring(2)
-  let endTime = (model.value.to || '').replace(/-/g, '.').substring(2)
-  return startTime + '-' + endTime
-})
-
-</script>
-
-<style lang="scss">
-.date-range {
-  height: 22px;
-  padding-right: 5px;
-  flex: 1;
-  display: flex;
-  align-items: center;
-  .text {
-    width: fit-content;
-    white-space: nowrap;
-  }
-  .time-icon {
-    display: block;
-    font-size: 0;
-    width: 12px;
-    height: 12px;
-    margin-left: 4px;
-  }
-}
+<template>
+  <div class="date-range" @click="openDateRangePicker">
+    <div class="text">{{ dateRangeDisplay }}</div>
+    <img
+      style="margin-top: -2px"
+      class="time-icon"
+      src="https://cdn.ddjf.com/static/images/bpms-workBench/clound-bean-down.png"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed, PropType, ref } from 'vue'
+import { useNutshell } from '@uxda/nutshell/taro'
+import DateFilter from './DateFilter.vue'
+import dayjs from 'dayjs'
+
+const $n = useNutshell()
+
+export type DateRangeModel = {
+  from: string,
+  to: string
+}
+
+const model = defineModel({
+  type: Object as PropType<DateRangeModel>,
+  required: false,
+  default: {
+    from: dayjs().add(-1, 'M').format('YYYY-MM-DD'),
+    to: dayjs().format('YYYY-MM-DD')
+  }
+})
+
+const openDateRangePicker = () => {
+  const child = ref()
+  $n.sheet({
+    component: DateFilter,
+    ref: child,
+    props: {
+      from: model.value.from,
+      to: model.value.to,
+    },
+    modal: true, // 不允许点击 overlay 关闭弹窗
+    mask: true,
+    onComplete (result: any) {
+      model.value = {
+        from: result.from,
+        to: result.to
+      }
+    }
+  })
+}
+
+const dateRangeDisplay = computed(() => {
+  let startTime = (model.value.from || '').replace(/-/g, '.').substring(2)
+  let endTime = (model.value.to || '').replace(/-/g, '.').substring(2)
+  return startTime + '-' + endTime
+})
+
+</script>
+
+<style lang="scss">
+.date-range {
+  height: 22px;
+  padding-right: 5px;
+  flex: 1;
+  display: flex;
+  align-items: center;
+  .text {
+    width: fit-content;
+    white-space: nowrap;
+  }
+  .time-icon {
+    display: block;
+    font-size: 0;
+    width: 12px;
+    height: 12px;
+    margin-left: 4px;
+  }
+}
 </style>