@uxda/appkit 4.2.82 → 4.2.84

package/src/balance/components/DateRange.vue

@@ -1,112 +1,112 @@
-<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>
-
-  <nut-popup position="bottom" :style="{ height: '40%' }" round :close-on-click-overlay="true"
-    v-model:visible="datePickerOpen">
-    <date-filter :from="model.from" :to="model.to" @reset="onDateReset" @complete="onDateFilterComplete" />
-  </nut-popup>
-</template>
-
-<script lang="ts" setup>
-import { computed, PropType, ref, watch } 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 datePickerOpen = ref<boolean>(false)
-function openDateRangePicker() {
-  datePickerOpen.value = true
-}
-const onDateFilterComplete = (value) => {
-  model.value = {
-    from: value.from,
-    to: value.to
-  }
-  datePickerOpen.value = false
-  emit('complete', model.value)
-}
-function onDateReset() {
-  model.value = {
-    from: dayjs().add(-1, 'M').format('YYYY-MM-DD'),
-    to: dayjs().format('YYYY-MM-DD')
-  }
-  datePickerOpen.value = false
-}
-
-const emit = defineEmits(['complete', 'reset'])
-
-// const openDateRangePicker = () => {
-//   $n.sheet({
-//     component: DateFilter,
-//     class: 'ns-sheet-reset date-filter-sheet',
-//     props: {
-//       from: model.value.from,
-//       to: model.value.to,
-//       onReset() {
-//         model.value.from = dayjs().add(-1, 'M').format('YYYY-MM-DD')
-//         model.value.to = dayjs().format('YYYY-MM-DD')
-//       }
-//     },
-//     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;
-  justify-content: flex-end;
-
-  .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>
+
+  <nut-popup position="bottom" :style="{ height: '40%' }" round :close-on-click-overlay="true"
+    v-model:visible="datePickerOpen">
+    <date-filter :from="model.from" :to="model.to" @reset="onDateReset" @complete="onDateFilterComplete" />
+  </nut-popup>
+</template>
+
+<script lang="ts" setup>
+import { computed, PropType, ref, watch } 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 datePickerOpen = ref<boolean>(false)
+function openDateRangePicker() {
+  datePickerOpen.value = true
+}
+const onDateFilterComplete = (value) => {
+  model.value = {
+    from: value.from,
+    to: value.to
+  }
+  datePickerOpen.value = false
+  emit('complete', model.value)
+}
+function onDateReset() {
+  model.value = {
+    from: dayjs().add(-1, 'M').format('YYYY-MM-DD'),
+    to: dayjs().format('YYYY-MM-DD')
+  }
+  datePickerOpen.value = false
+}
+
+const emit = defineEmits(['complete', 'reset'])
+
+// const openDateRangePicker = () => {
+//   $n.sheet({
+//     component: DateFilter,
+//     class: 'ns-sheet-reset date-filter-sheet',
+//     props: {
+//       from: model.value.from,
+//       to: model.value.to,
+//       onReset() {
+//         model.value.from = dayjs().add(-1, 'M').format('YYYY-MM-DD')
+//         model.value.to = dayjs().format('YYYY-MM-DD')
+//       }
+//     },
+//     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;
+  justify-content: flex-end;
+
+  .text {
+    width: fit-content;
+    white-space: nowrap;
+  }
+
+  .time-icon {
+    display: block;
+    font-size: 0;
+    width: 12px;
+    height: 12px;
+    margin-left: 4px;
+  }
+}
 </style>

package/src/balance/components/ListFilter.vue

@@ -1,63 +1,63 @@
-<template>
-  <div class="list-filter" @click="openPicker">
-    <span class="text">筛选</span>
-    <img class="icon" src="https://cdn.ddjf.com/static/images/bpms-workBench/clound-bean-select-icon.png" />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { computed, PropType, reactive } from 'vue'
-import { useNutshell } from '@uxda/nutshell/taro'
-import ListFilterPicker from './ListFilterPicker.vue'
-
-const $n = useNutshell()
-
-export type ListFilterValue = {
-  type: string,
-}
-
-const model = defineModel({
-  type: Object as PropType<ListFilterValue>,
-  default: {
-    type: ''
-  },
-  required: false,
-})
-
-const emit = defineEmits<{
-  (e: 'update:modelValue', v: ListFilterValue): void,
-  (e: 'change'): void,
-}>()
-
-const openPicker = () => {
-  $n.sheet({
-    component: ListFilterPicker,
-    class: 'ns-sheet-reset list-filter-sheet',
-    props: {
-      modelValue: model,
-      onComplete: (result) => {
-        emit('update:modelValue', {
-          type: result[0]
-        })
-      }
-    }
-  })
-}
-</script>
-
-<style lang="scss">
-.list-filter {
-  display: flex;
-  align-items: center;
-  height: 22px;
-  padding-left: 5px;
-
-  .icon {
-    display: block;
-    font-size: 0;
-    width: 12px;
-    height: 12px;
-    margin-left: 4px;
-  }
-}
+<template>
+  <div class="list-filter" @click="openPicker">
+    <span class="text">筛选</span>
+    <img class="icon" src="https://cdn.ddjf.com/static/images/bpms-workBench/clound-bean-select-icon.png" />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed, PropType, reactive } from 'vue'
+import { useNutshell } from '@uxda/nutshell/taro'
+import ListFilterPicker from './ListFilterPicker.vue'
+
+const $n = useNutshell()
+
+export type ListFilterValue = {
+  type: string,
+}
+
+const model = defineModel({
+  type: Object as PropType<ListFilterValue>,
+  default: {
+    type: ''
+  },
+  required: false,
+})
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', v: ListFilterValue): void,
+  (e: 'change'): void,
+}>()
+
+const openPicker = () => {
+  $n.sheet({
+    component: ListFilterPicker,
+    class: 'ns-sheet-reset list-filter-sheet',
+    props: {
+      modelValue: model,
+      onComplete: (result) => {
+        emit('update:modelValue', {
+          type: result[0]
+        })
+      }
+    }
+  })
+}
+</script>
+
+<style lang="scss">
+.list-filter {
+  display: flex;
+  align-items: center;
+  height: 22px;
+  padding-left: 5px;
+
+  .icon {
+    display: block;
+    font-size: 0;
+    width: 12px;
+    height: 12px;
+    margin-left: 4px;
+  }
+}
 </style>