@uxda/appkit 4.2.74 → 4.2.75

package/dist/appkit.css

@@ -1146,6 +1146,7 @@ page {
   flex: 1;
   display: flex;
   align-items: center;
+  justify-content: flex-end;
 }
 .date-range .text {
   width: fit-content;

package/dist/index.js

@@ -1,7 +1,7 @@
 import { Grid, GridItem, Popup, ActionSheet, Checkbox, Button, Dialog, DatePicker, Form, FormItem, RadioGroup, Radio, Skeleton, Cell, Input, Steps, Step } from '@nutui/nutui-taro';
 import '@nutui/nutui-taro/dist/packages/button/style/css';
 import '@nutui/nutui-taro/dist/packages/checkbox/style/css';
-import { defineComponent, reactive, createBlock, openBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createTextVNode, ref, computed, onUnmounted, createCommentVNode, renderSlot, createVNode, normalizeStyle, unref, isRef, onMounted, createStaticVNode, watch, withDirectives, vShow, useModel, mergeModels, resolveComponent, vModelText, watchPostEffect, withModifiers } from 'vue';
+import { defineComponent, reactive, createBlock, openBlock, withCtx, createElementBlock, Fragment, renderList, normalizeClass, createElementVNode, toDisplayString, createTextVNode, ref, computed, onUnmounted, createCommentVNode, renderSlot, createVNode, normalizeStyle, unref, isRef, onMounted, createStaticVNode, watch, withDirectives, vShow, mergeModels, useModel, resolveComponent, vModelText, watchPostEffect, withModifiers } from 'vue';
 import '@nutui/nutui-taro/dist/packages/grid/style/css';
 import '@nutui/nutui-taro/dist/packages/griditem/style/css';
 import Taro, { showModal, getSystemInfoSync, getMenuButtonBoundingClientRect, uploadFile, request as request$1, showToast, chooseMedia, chooseMessageFile, showLoading, hideLoading, useRouter, useDidShow, getStorageSync } from '@tarojs/taro';
@@ -2648,6 +2648,7 @@ var script$u = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit, state = usePopup();
+    const result = reactive({ ...props });
     watch(
       () => `${props.from}${props.to}`,
       () => {
@@ -2655,7 +2656,6 @@ var script$u = /* @__PURE__ */ defineComponent({
         result.to = props.to;
       }
     );
-    const result = reactive({ ...props });
     const focused = ref("from");
     const focusedDate = ref(props.from);
     const minDate = ref();
@@ -2685,11 +2685,15 @@ var script$u = /* @__PURE__ */ defineComponent({
         result.to = time;
       }
       datePickerOpen.value = false;
-      state.couldClose = true;
+      if (state) {
+        state.couldClose = true;
+      }
     }
     function onDatePickerCancel() {
       datePickerOpen.value = false;
-      state.couldClose = true;
+      if (state) {
+        state.couldClose = true;
+      }
     }
     function switchDateInput(shift) {
       if (shift === "from") {
@@ -2702,7 +2706,9 @@ var script$u = /* @__PURE__ */ defineComponent({
       focusedDate.value = new Date(result[shift]);
       focused.value = shift;
       datePickerOpen.value = true;
-      state.couldClose = false;
+      if (state) {
+        state.couldClose = false;
+      }
     }
     return (_ctx, _cache) => {
       const _component_nut_date_picker = DatePicker;
@@ -3129,6 +3135,8 @@ var script$q = /* @__PURE__ */ defineComponent({
     });
     function onDateReset() {
       resetDateRange();
+      datePickerOpen.value = false;
+      restartSearch();
     }
     function resetDateRange() {
       filtering.dateTo = dayjs().format("YYYY-MM-DD");
@@ -3704,60 +3712,87 @@ var script$o = /* @__PURE__ */ defineComponent({
     },
     "modelModifiers": {}
   },
-  emits: ["update:modelValue"],
-  setup(__props) {
-    const $n = useNutshell();
+  emits: /* @__PURE__ */ mergeModels(["complete", "reset"], ["update:modelValue"]),
+  setup(__props, { emit: __emit }) {
+    useNutshell();
     const model = useModel(__props, "modelValue");
-    const openDateRangePicker = () => {
-      const child = ref();
-      $n.sheet({
-        component: script$u,
-        class: "ns-sheet-reset date-filter-sheet",
-        ref: child,
-        props: {
-          from: model.value.from,
-          to: model.value.to
-        },
-        modal: true,
-        // 不允许点击 overlay 关闭弹窗
-        mask: true,
-        onComplete(result) {
-          model.value = {
-            from: result.from,
-            to: result.to
-          };
-        }
-      });
+    const datePickerOpen = ref(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 = __emit;
     const dateRangeDisplay = computed(() => {
       let startTime = (model.value.from || "").replace(/-/g, ".").substring(2);
       let endTime = (model.value.to || "").replace(/-/g, ".").substring(2);
       return startTime + "-" + endTime;
     });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", {
-        class: "date-range",
-        onClick: openDateRangePicker
-      }, [
-        createElementVNode(
-          "div",
-          _hoisted_1$l,
-          toDisplayString(dateRangeDisplay.value),
-          1
-          /* TEXT */
-        ),
-        _cache[0] || (_cache[0] = createElementVNode(
-          "img",
-          {
-            style: { "margin-top": "-2px" },
-            class: "time-icon",
-            src: "https://cdn.ddjf.com/static/images/bpms-workBench/clound-bean-down.png"
-          },
-          null,
-          -1
-          /* HOISTED */
-        ))
-      ]);
+      const _component_nut_popup = Popup;
+      return openBlock(), createElementBlock(
+        Fragment,
+        null,
+        [
+          createElementVNode("div", {
+            class: "date-range",
+            onClick: openDateRangePicker
+          }, [
+            createElementVNode(
+              "div",
+              _hoisted_1$l,
+              toDisplayString(dateRangeDisplay.value),
+              1
+              /* TEXT */
+            ),
+            _cache[1] || (_cache[1] = createElementVNode(
+              "img",
+              {
+                style: { "margin-top": "-2px" },
+                class: "time-icon",
+                src: "https://cdn.ddjf.com/static/images/bpms-workBench/clound-bean-down.png"
+              },
+              null,
+              -1
+              /* HOISTED */
+            ))
+          ]),
+          createVNode(_component_nut_popup, {
+            position: "bottom",
+            style: { height: "40%" },
+            round: "",
+            "close-on-click-overlay": true,
+            visible: datePickerOpen.value,
+            "onUpdate:visible": _cache[0] || (_cache[0] = ($event) => datePickerOpen.value = $event)
+          }, {
+            default: withCtx(() => [
+              createVNode(script$u, {
+                from: model.value.from,
+                to: model.value.to,
+                onReset: onDateReset,
+                onComplete: onDateFilterComplete
+              }, null, 8, ["from", "to"])
+            ]),
+            _: 1
+            /* STABLE */
+          }, 8, ["visible"])
+        ],
+        64
+        /* STABLE_FRAGMENT */
+      );
     };
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.2.74",
+  "version": "4.2.75",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/balance/components/AccountView.vue

@@ -389,6 +389,8 @@ watch(secondBalanceOpen, () => {
 
 function onDateReset() {
   resetDateRange()
+  datePickerOpen.value = false
+  restartSearch()
 }
 
 /**

package/src/balance/components/DateFilter.vue

@@ -40,6 +40,12 @@ const props = defineProps<DateFilterProps>()
 const emit = defineEmits(['complete', 'reset']),
   state = usePopup()
 
+
+/**
+ * 日期范围结果
+ */
+const result = reactive<DateFilterProps>({ ...props })
+
 watch(
   () => `${props.from}${props.to}`,
   () => {
@@ -48,10 +54,6 @@ watch(
   }
 )
 
-/**
- * 日期范围结果
- */
-const result = reactive<DateFilterProps>({ ...props })
 
 /**
  * 目前激活的日期输入框
@@ -98,12 +100,16 @@ function onDatePickerComplete({ selectedValue, selectedOptions }) {
     result.to = time
   }
   datePickerOpen.value = false
-  state.couldClose = true
+  if (state) {
+    state.couldClose = true
+  }
 }
 
 function onDatePickerCancel() {
   datePickerOpen.value = false
-  state.couldClose = true
+  if (state) {
+    state.couldClose = true
+  }
 }
 
 /**
@@ -124,9 +130,12 @@ function switchDateInput(shift: string) {
   focused.value = shift
   datePickerOpen.value = true
   // 不允许浮窗关闭
-  state.couldClose = false
+  if (state) {
+    state.couldClose = false
+  }
 }
 </script>
+
 <style lang="scss">
 .appkit-date-filter {
   height: 100%;

package/src/balance/components/DateRange.vue

@@ -4,10 +4,15 @@
     <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 } from 'vue'
+import { computed, PropType, ref, watch } from 'vue'
 import { useNutshell } from '@uxda/nutshell/taro'
 import DateFilter from './DateFilter.vue'
 import dayjs from 'dayjs'
@@ -28,26 +33,51 @@ const model = defineModel({
   }
 })
 
-const openDateRangePicker = () => {
-  const child = ref()
-  $n.sheet({
-    component: DateFilter,
-    class: 'ns-sheet-reset date-filter-sheet',
-    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 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)
@@ -64,6 +94,7 @@ const dateRangeDisplay = computed(() => {
   flex: 1;
   display: flex;
   align-items: center;
+  justify-content: flex-end;
 
   .text {
     width: fit-content;