@uxda/appkit 4.1.19 → 4.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "4.1.19",
+  "version": "4.1.21",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",
@@ -20,7 +20,7 @@
   ],
   "author": "",
   "dependencies": {
-    "@babel/runtime": "^7.25.6",
+    "@babel/runtime": "^7.7.7",
     "@nutui/auto-import-resolver": "^1.0.0",
     "@nutui/icons-vue-taro": "^0.0.9",
     "@nutui/nutui-taro": "^4.3.11",
@@ -34,6 +34,7 @@
     "@tarojs/shared": "^4.0.0",
     "@tarojs/taro": "^4.0.0",
     "@types/wechat-miniprogram": "^3.4.7",
+    "@uxda/nutshell": "^1.0.0",
     "dayjs": "^1.11.10",
     "validator": "^13.12.0",
     "vue": "^3.5.0"
@@ -70,8 +71,5 @@
     "unplugin-auto-import": "^0.18.2",
     "unplugin-vue-components": "^0.27.3",
     "webpack": "^5.78.0"
-  },
-  "peerDependencies": {
-    "@uxda/nutshell": "^1.0.0"
   }
 }

package/src/Appkit.ts

@@ -27,10 +27,6 @@ export type AppKitOptions = {
    * 临时 appcode 获取方法
    * 由使用场景提供
    */
-  tempAppcode: () => string
-  /**
-   * 调用 API 时使用的 base url
-   */
   baseUrl(): string
 
   401(): void
@@ -43,7 +39,6 @@ export type AppKitOptions = {
 export type DollarApp = {
   setToken: (token: () => string) => void
   setTempToken: (token: () => string) => void
-  setTempAppcode: (appcode: () => string) => void
   requestPayment: (options: PaymentParams) => void
   invokeRecharge: (options: RechargeParams) => void
 }
@@ -56,7 +51,6 @@ const appKitOptions: AppKitOptions = {
   tenant: () => '',
   token: () => '',
   tempToken: () => '',
-  tempAppcode: () => '',
   baseUrl: () => '',
   401() {},
   gray: () => '',

package/src/balance/components/DateFilter.vue

@@ -1,14 +1,10 @@
 <template>
-  <div class="appkit-date-filter">
+  <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')"
-        >
+        <div class="item" :class="focused === 'from' ? 'current' : ''" @click="switchDateInput('from')">
           {{ formatDate(result.from) }}
         </div>
         <div class="line">-</div>
@@ -22,25 +18,15 @@
       <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 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'
-import { usePopup } from '@uxda/nutshell/taro'
 
 type DateFilterProps = {
   from: string
@@ -49,8 +35,7 @@ type DateFilterProps = {
 
 const props = defineProps<DateFilterProps>()
 
-const emit = defineEmits(['complete', 'reset']),
-  state = usePopup()
+const emit = defineEmits(['complete', 'reset'])
 
 watch(
   () => `${props.from}${props.to}`,
@@ -75,10 +60,7 @@ const minDate = ref<any>()
 const maxDate = ref<Date>(new Date())
 const datePickerOpen = ref<boolean>(false)
 
-state.beforeClose = () => {
-  datePickerOpen.value = false
-  return true
-}
+
 
 /**
  * 日期重置
@@ -108,20 +90,16 @@ function onDatePickerComplete({ selectedValue, selectedOptions }) {
     result.to = time
   }
   datePickerOpen.value = false
-  state.couldClose = true
 }
 
-function onDatePickerCancel () {
-  datePickerOpen.value = false
-  state.couldClose = true
-}
+
 
 /**
  * 切换时间逻辑：初始化时有时间，默认聚焦开始时间
  * 当选择开始时间大于结束时间，结束时间改为开始时间
  * 时间选择器都要小于当前时间，结束时间的时间选择器要以开始时间为最小值，
  */
-function switchDateInput (shift: string) {
+function switchDateInput(shift: string) {
   // 要设置一下结束时间的起始值 开始时间往前倒5年
   if (shift === 'from') {
     let time = result.from.split('-').map(Number)
@@ -133,17 +111,16 @@ function switchDateInput (shift: string) {
   focusedDate.value = new Date(result[shift])
   focused.value = shift
   datePickerOpen.value = true
-  // 不允许浮窗关闭
-  state.couldClose = false
 }
 </script>
 <style lang="scss">
-.appkit-date-filter {
+.consumption-date-filter {
   height: 100%;
   display: flex;
   flex-direction: column;
   width: 100%;
   position: relative;
+
   .date-filter-header {
     text-align: center;
     height: 44px;
@@ -152,21 +129,25 @@ function switchDateInput (shift: string) {
     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;
@@ -174,27 +155,26 @@ function switchDateInput (shift: string) {
         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,
+        border-image-source: linear-gradient(180deg,
             rgba(239, 208, 130, 0.8) 0%,
-            rgba(255, 185, 120, 0.8) 100%
-          ),
+            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;
+    margin: 0 15px;
     display: flex;
     justify-content: space-between;
     align-items: center;
+
     .btn {
       flex: 1;
       height: 40px;
@@ -206,6 +186,7 @@ function switchDateInput (shift: string) {
       font-size: 16px;
       border-radius: 6px;
     }
+
     .confirm {
       margin-left: 11px;
       color: #000;
@@ -213,14 +194,17 @@ function switchDateInput (shift: string) {
       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;
@@ -232,18 +216,15 @@ function switchDateInput (shift: string) {
       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,16 +1,13 @@
 <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"
-    />
+    <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 { computed, PropType, reactive } from 'vue'
 import { useNutshell } from '@uxda/nutshell/taro'
 import DateFilter from './DateFilter.vue'
 import dayjs from 'dayjs'
@@ -32,17 +29,13 @@ const model = defineModel({
 })
 
 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) {
+    onComplete(result: any) {
       model.value = {
         from: result.from,
         to: result.to
@@ -66,10 +59,12 @@ const dateRangeDisplay = computed(() => {
   flex: 1;
   display: flex;
   align-items: center;
+
   .text {
     width: fit-content;
     white-space: nowrap;
   }
+
   .time-icon {
     display: block;
     font-size: 0;

package/src/index.ts

@@ -48,10 +48,6 @@ const $app: DollarApp = {
     const appKitOptions = useAppKitOptions()
     appKitOptions.tempToken = token
   },
-  setTempAppcode: (appcode: () => string) => {
-    const appKitOptions = useAppKitOptions()
-    appKitOptions.tempAppcode = appcode
-  },
   requestPayment: (options: PaymentParams) => {},
   invokeRecharge: (options: RechargeParams) => {},
 }