From 56f4a0ef63eb3d9d4ac9ea8f16bbd7dbc7a5b043 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Mon, 28 Oct 2024 11:47:34 +0800
Subject: [PATCH 01/25] =?UTF-8?q?fix=20=E7=B3=BB=E7=BB=9F=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E4=BD=BF=E7=94=A8=E5=88=B0MySQL8=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/baseapi/param/SystemParam.api.ts  |  2 +-
 src/views/baseapi/param/SystemParamEdit.vue | 19 +++++++++++++------
 src/views/baseapi/param/SystemParamList.vue |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/baseapi/param/SystemParam.api.ts b/src/views/baseapi/param/SystemParam.api.ts
index 54465fe1..b5205182 100644
--- a/src/views/baseapi/param/SystemParam.api.ts
+++ b/src/views/baseapi/param/SystemParam.api.ts
@@ -83,7 +83,7 @@ export interface SystemParam extends BaseEntity {
   // 参数名称
   name?: string
   // 参数键名
-  key?: string
+  paramKey?: string
   // 参数值
   value?: string
   // 参数类型
diff --git a/src/views/baseapi/param/SystemParamEdit.vue b/src/views/baseapi/param/SystemParamEdit.vue
index aefbf389..c393d19e 100644
--- a/src/views/baseapi/param/SystemParamEdit.vue
+++ b/src/views/baseapi/param/SystemParamEdit.vue
@@ -29,7 +29,7 @@
       </a-form-item>
       <a-form-item label="参数Key" name="key">
         <a-input
-          v-model:value="form.key"
+          v-model:value="form.paramKey"
           :disabled="showable || form.internal"
           placeholder="请输入参数键名"
         />
@@ -112,14 +112,14 @@
     formEditType,
   } = useFormEdit()
   const { existsByServer } = useValidate()
-  const { dictDropDownNumber } = useDict()
+  const { dictDropDown } = useDict()
 
   // 表单
   const formRef = ref<FormInstance>()
   let form = ref<SystemParam>({
     id: null,
     name: '',
-    key: '',
+    paramKey: '',
     value: '',
     enable: true,
     type: undefined,
@@ -145,7 +145,7 @@
     initFormEditType(editType)
     resetForm()
     getInfo(id, editType)
-    dictDropDownNumber('ParamType').then((res) => (paramTypeList.value = res))
+    dictDropDown('ParamType').then((res) => (paramTypeList.value = res))
   }
   // 获取信息
   function getInfo(id, editType: FormEditType) {
@@ -181,8 +181,15 @@
   }
   // 校验key值
   async function validateKey() {
-    const { key, id } = form.value
-    return existsByServer(key, id, formEditType.value, existsByKey, existsByKeyNotId, '该Key已存在')
+    const { paramKey, id } = form.value
+    return existsByServer(
+      paramKey,
+      id,
+      formEditType.value,
+      existsByKey,
+      existsByKeyNotId,
+      '该Key已存在',
+    )
   }
   defineExpose({
     init,
diff --git a/src/views/baseapi/param/SystemParamList.vue b/src/views/baseapi/param/SystemParamList.vue
index 5b02a430..91b83886 100644
--- a/src/views/baseapi/param/SystemParamList.vue
+++ b/src/views/baseapi/param/SystemParamList.vue
@@ -28,7 +28,7 @@
         >
           <vxe-column type="seq" :min-width="60" />
           <vxe-column field="name" title="参数名称" :min-width="200" />
-          <vxe-column field="key" title="参数Key" :min-width="150" />
+          <vxe-column field="paramKey" title="参数Key" :min-width="150" />
           <vxe-column field="value" title="参数值" :min-width="200" />
           <vxe-column field="type" title="参数类型" :min-width="80">
             <template #default="{ row }">
-- 
Gitee


From 8cc6026e449c80efbc19cd1dbd398ebf0767537e Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Mon, 28 Oct 2024 17:44:16 +0800
Subject: [PATCH 02/25] =?UTF-8?q?feat=20=E5=BE=AE=E4=BF=A1=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=E6=B7=BB=E5=8A=A0=E5=8D=95=E7=8B=AC=E7=9A=84=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E8=B7=B3=E8=BD=AC=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../channel/wechat/config/WechatPayConfig.api.ts   |  2 ++
 .../channel/wechat/config/WechatPayConfigEdit.vue  | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts b/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
index 7bde87ec..a863e5c2 100644
--- a/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
+++ b/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
@@ -32,6 +32,8 @@ export interface WechatPayConfig extends MchEntity {
   wxMchId?: string
   // 是否启用
   enable: boolean
+  // 授权认证地址
+  authUrl?: string
   // 支付限额
   limitAmount?: number
   // API 版本
diff --git a/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue b/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
index 8a64eea0..89abb11f 100644
--- a/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
+++ b/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
@@ -38,6 +38,20 @@
             placeholder="用于获取接口调用凭证时使用, 如OpenId/AccessToken等"
           />
         </a-form-item>
+        <a-form-item name="authUrl">
+          <template #label>
+            <basic-title
+              helpMessage="OAuth2认证服务地址, 需要将该地址映射转发到网关服务地址（置空将使用系统配置的网关服务地址进行拼接）"
+            >
+              OAuth2认证地址
+            </basic-title>
+          </template>
+          <a-input
+            v-model:value="form.authUrl"
+            :disabled="showable"
+            placeholder="请输入OAuth2认证地址"
+          />
+        </a-form-item>
         <a-form-item label="是否启用" name="enable">
           <a-switch
             checked-children="启用"
-- 
Gitee


From c5701a6747c4c48afd66b2473883a236a0218307 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Mon, 18 Nov 2024 16:51:21 +0800
Subject: [PATCH 03/25] =?UTF-8?q?feat(daxpay):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E8=B4=A6=E4=BA=A4=E6=98=93=E7=9B=B8=E5=85=B3=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增分账交易 API 接口
- 实现分账订单列表、明细列表和交易信息页面
- 添加分账重试、同步和完结功能
- 优化表格样式和操作功能
---
 .../transaction/AllocDetailList.vue           | 137 +++++++++
 .../transaction/AllocTransactionInfo.vue      |  11 +
 .../transaction/AllocTransactionList.vue      | 270 ++++++++++++++++++
 .../allocation/transaction/Allocation.api.ts  | 171 +++++++++++
 4 files changed, 589 insertions(+)
 create mode 100644 src/views/daxpay/common/allocation/transaction/AllocDetailList.vue
 create mode 100644 src/views/daxpay/common/allocation/transaction/AllocTransactionInfo.vue
 create mode 100644 src/views/daxpay/common/allocation/transaction/AllocTransactionList.vue
 create mode 100644 src/views/daxpay/common/allocation/transaction/Allocation.api.ts

diff --git a/src/views/daxpay/common/allocation/transaction/AllocDetailList.vue b/src/views/daxpay/common/allocation/transaction/AllocDetailList.vue
new file mode 100644
index 00000000..c72283cf
--- /dev/null
+++ b/src/views/daxpay/common/allocation/transaction/AllocDetailList.vue
@@ -0,0 +1,137 @@
+<template>
+  <basic-drawer
+    forceRender
+    v-bind="$attrs"
+    title="分账订单明细"
+    width="60%"
+    :visible="visible"
+    @close="visible = false"
+  >
+    <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
+    <vxe-table
+      keyField="id"
+      ref="xTable"
+      :data="records"
+      :loading="loading"
+      :cell-style="cellStyle"
+    >
+      <vxe-column type="seq" width="60" />
+      <vxe-column field="receiverNo" title="接收方编号" :min-width="120" />
+      <vxe-column field="receiverName" title="接收方姓名" :min-width="100" />
+      <vxe-column field="receiverType" title="接收方类型" :min-width="100">
+        <template #default="{ row }">
+          {{ dictConvert('AllocReceiverType', row.receiverType) }}
+        </template>
+      </vxe-column>
+      <vxe-column field="rate" title="分账比例" :min-width="100">
+        <template #default="{ row }"> {{ row.rate / 100.0 }}% </template>
+      </vxe-column>
+      <vxe-column field="amount" title="分账金额" :min-width="100">
+        <template #default="{ row }"> {{ row.amount / 100.0 }} 元 </template>
+      </vxe-column>
+      <vxe-column field="result" title="分账结果" :min-width="130">
+        <template #default="{ row }"> {{ dictConvert('AllocDetailResult', row.result) }} </template>
+      </vxe-column>
+      <vxe-column field="errorMsg" title="错误原因" :min-width="160">
+        <template #default="{ row }"> {{ row.errorMsg }} </template>
+      </vxe-column>
+      <vxe-column field="finishTime" title="完成时间" :min-width="160">
+        <template #default="{ row }"> {{ row.finishTime }} </template>
+      </vxe-column>
+      <vxe-column fixed="right" :min-width="60" :showOverflow="false" title="操作">
+        <template #default="{ row }">
+          <span>
+            <a href="javascript:" @click="show(row)">查看</a>
+          </span>
+        </template>
+      </vxe-column>
+    </vxe-table>
+  </basic-drawer>
+</template>
+
+<script setup lang="ts">
+  import { nextTick, ref } from 'vue'
+  import useTablePage from '@/hooks/bootx/useTablePage'
+  import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+  import BasicDrawer from '@/components/Drawer/src/BasicDrawer.vue'
+  import { useDict } from '@/hooks/bootx/useDict'
+  import { AllocationOrder, AllocationOrderDetail, detailList } from './Allocation.api'
+  // 使用hooks
+  const { loading } = useTablePage(queryPage)
+  const { dictConvert } = useDict()
+
+  let visible = ref(false)
+  let order = ref<AllocationOrder>({})
+  let records = ref<AllocationOrderDetail[]>([])
+  const xTable = ref<VxeTableInstance>()
+  const xToolbar = ref<VxeToolbarInstance>()
+  const allocationOrderDetailInfo = ref<any>()
+
+  nextTick(() => {
+    xTable.value?.connect(xToolbar.value as VxeToolbarInstance)
+  })
+
+  /**
+   * 入口
+   * @param record
+   */
+  function init(record) {
+    visible.value = true
+    order.value = record
+    queryPage()
+  }
+
+  /**
+   * 分页查询
+   */
+  function queryPage() {
+    loading.value = true
+    detailList(order.value.id).then(({ data }) => {
+      records.value = data
+      loading.value = false
+    })
+  }
+  /**
+   * 查看
+   */
+  function show(record) {
+    allocationOrderDetailInfo.value.init(record)
+  }
+
+  function cellStyle({ row, column }) {
+    if (column.field == 'status') {
+      if (row.status == 'success') {
+        return { color: 'green' }
+      }
+      if (row.status == 'fail') {
+        return { color: 'red' }
+      }
+      if (row.status == 'progress') {
+        return { color: 'orange' }
+      }
+      if (row.status == 'close') {
+        return { color: 'gray' }
+      }
+      return { color: 'red' }
+    }
+    if (column.field == 'asyncPay') {
+      if (row.asyncPay) {
+        return { color: 'green' }
+      } else {
+        return { color: 'gray' }
+      }
+    }
+    if (column.field == 'combinationPay') {
+      if (row.combinationPay) {
+        return { color: 'green' }
+      } else {
+        return { color: 'gray' }
+      }
+    }
+  }
+  defineExpose({
+    init,
+  })
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/allocation/transaction/AllocTransactionInfo.vue b/src/views/daxpay/common/allocation/transaction/AllocTransactionInfo.vue
new file mode 100644
index 00000000..0a8d203d
--- /dev/null
+++ b/src/views/daxpay/common/allocation/transaction/AllocTransactionInfo.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/views/daxpay/common/allocation/transaction/AllocTransactionList.vue b/src/views/daxpay/common/allocation/transaction/AllocTransactionList.vue
new file mode 100644
index 00000000..9c4adeff
--- /dev/null
+++ b/src/views/daxpay/common/allocation/transaction/AllocTransactionList.vue
@@ -0,0 +1,270 @@
+<template>
+  <div>
+    <div class="m-3 p-3 pt-5 bg-white">
+      <b-query
+        :query-params="model.queryParam"
+        :fields="fields"
+        :default-item-count="3"
+        @query="queryPage"
+        @reset="resetQueryParams"
+      />
+    </div>
+    <div class="m-3 p-3 bg-white">
+      <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
+      <vxe-table
+        keyField="id"
+        ref="xTable"
+        :data="pagination.records"
+        :loading="loading"
+        :sort-config="{ remote: true, trigger: 'cell' }"
+        @sort-change="sortChange"
+      >
+        <vxe-column type="seq" title="序号" width="60" />
+        <vxe-column field="allocNo" title="分账单号" :min-width="230">
+          <template #default="{ row }">
+            <a @click="show(row)">
+              {{ row.allocNo }}
+            </a>
+          </template>
+        </vxe-column>
+        <vxe-column field="title" title="订单标题" :min-width="150" />
+        <vxe-column field="orderNo" title="支付订单号" :min-width="230">
+          <template #default="{ row }">
+            <a @click="showPayOrder(row)">
+              {{ row.orderNo }}
+            </a>
+          </template>
+        </vxe-column>
+
+        <vxe-column field="channel" title="所属通道" :min-width="100">
+          <template #default="{ row }">
+            <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="amount" title="总分账金额(元)" :min-width="120">
+          <template #default="{ row }">
+            {{ row.amount ? (row.amount / 100).toFixed(2) : 0 }}
+          </template>
+        </vxe-column>
+        <vxe-column field="status" title="状态" :min-width="120">
+          <template #default="{ row }">
+            <a-tag>{{ dictConvert('AllocOrderStatus', row.status) }}</a-tag>
+          </template>
+        </vxe-column>
+        <vxe-column field="result" title="分账结果" :min-width="100">
+          <template #default="{ row }">
+            {{ dictConvert('AllocOrderResult', row.result) }}
+          </template> </vxe-column
+        ><vxe-column field="errorMsg" title="错误原因" :min-width="160" />
+        <vxe-column field="createTime" title="创建时间" :min-width="160" />
+        <vxe-column fixed="right" :min-width="200" :showOverflow="false" title="操作">
+          <template #default="{ row }">
+            <a-link @click="show(row)">查看</a-link>
+            <a-divider type="vertical" />
+            <a-link @click="showDetail(row)">明细列表</a-link>
+            <a-divider type="vertical" />
+            <a-dropdown>
+              <a>
+                更多
+                <icon icon="ant-design:down-outlined" :size="12" />
+              </a>
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item
+                    v-if="
+                      ['allocation_processing', 'allocation_end', 'allocation_failed'].includes(
+                        row.status,
+                      )
+                    "
+                  >
+                    <a-link @click="retryInfo(row)">重试</a-link>
+                  </a-menu-item>
+                  <a-menu-item>
+                    <a-link @click="syncInfo(row)">同步</a-link>
+                  </a-menu-item>
+                  <a-menu-item v-if="['allocation_end', 'finish_failed'].includes(row.status)">
+                    <a-link @click="finishInfo(row)">完结</a-link>
+                  </a-menu-item>
+                </a-menu>
+              </template>
+            </a-dropdown>
+          </template>
+        </vxe-column>
+      </vxe-table>
+      <vxe-pager
+        size="medium"
+        :loading="loading"
+        :current-page="pagination.current"
+        :page-size="pagination.size"
+        :total="pagination.total"
+        @page-change="handleTableChange"
+      />
+    </div>
+    <AllocDetailList ref="allocDetailList" />
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { computed, onMounted, ref } from 'vue'
+  import { page, sync, finish, retry } from './Allocation.api'
+  import useTablePage from '@/hooks/bootx/useTablePage'
+  import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
+  import { useMessage } from '@/hooks/web/useMessage'
+  import { useDict } from '@/hooks/bootx/useDict'
+  import ALink from '/@/components/Link/Link.vue'
+  import BQuery from '/@/components/Bootx/Query/BQuery.vue'
+  import { LIST, QueryField, STRING } from '@/components/Bootx/Query/Query'
+  import { LabeledValue } from 'ant-design-vue/lib/select'
+  import { FormEditType } from '@/enums/formTypeEnum'
+  import AllocDetailList from './AllocDetailList.vue'
+  import { Icon } from '@/components/Icon'
+
+  // 使用hooks
+  const {
+    handleTableChange,
+    pageQueryResHandel,
+    resetQueryParams,
+    pagination,
+    sortChange,
+    sortParam,
+    pages,
+    model,
+    loading,
+  } = useTablePage(queryPage)
+  const { createMessage, createConfirm } = useMessage()
+  const { dictConvert } = useDict()
+
+  const xTable = ref<VxeTableInstance>()
+  const xToolbar = ref<VxeToolbarInstance>()
+  const allocDetailList = ref<any>()
+  const allocationOrderInfo = ref<any>()
+
+  let payChannelList = ref<LabeledValue[]>([])
+  const payOrderInfo = ref<any>()
+
+  const fields = computed(() => {
+    return [
+      {
+        field: 'channel',
+        type: LIST,
+        name: '分账通道',
+        placeholder: '请选择分账通道',
+        selectList: payChannelList.value,
+      },
+      { field: 'orderNo', type: STRING, name: '分账订单号', placeholder: '请输入分账订单号' },
+      { field: 'paymentId', type: STRING, name: '支付订单ID', placeholder: '请输入支付订单ID' },
+      { field: 'title', type: STRING, name: '支付订单标题', placeholder: '请输入支付订单标题' },
+      { field: 'allocNo', type: STRING, name: '分账业务号', placeholder: '请输入分账业务号' },
+    ] as QueryField[]
+  })
+  onMounted(() => {
+    vxeBind()
+    initData()
+    queryPage()
+  })
+
+  /**
+   * 绑定
+   */
+  function vxeBind() {
+    xTable.value?.connect(xToolbar.value as VxeToolbarInstance)
+  }
+
+  /**
+   * 初始化数据
+   */
+  async function initData() {
+    // findChannels().then(({ data }) => (payChannelList.value = data))
+  }
+
+  /**
+   * 查看
+   */
+  function show(record) {
+    allocationOrderInfo.value.init(record.allocNo, FormEditType.Show)
+  }
+
+  /**
+   * 查询分账明细列表
+   * @param record
+   */
+  function showDetail(record) {
+    allocDetailList.value.init(record)
+  }
+
+  /**
+   * 查看支付单信息
+   */
+  function showPayOrder(record) {
+    payOrderInfo.value.init(record.orderNo)
+  }
+
+  /**
+   * 同步分账状态
+   * @param record
+   */
+  function syncInfo(record) {
+    createConfirm({
+      iconType: 'info',
+      title: '同步分账状态',
+      content: '确定同步分账状态吗？',
+      onOk: () => {
+        sync(record.allocNo).then(() => {
+          createMessage.success('同步成功')
+          queryPage()
+        })
+      },
+    })
+  }
+
+  /**
+   * 分账重试
+   */
+  function retryInfo(record) {
+    createConfirm({
+      iconType: 'info',
+      title: '分账重试',
+      content: '确定分账重试吗？',
+      onOk: () => {
+        retry(record.bizAllocNo).then(() => {
+          createMessage.success('分账重试请求发送成功')
+          queryPage()
+        })
+      },
+    })
+  }
+
+  /**
+   * 完结分账
+   */
+  function finishInfo(record) {
+    createConfirm({
+      iconType: 'info',
+      title: '完结分账',
+      content: '确定完结分账吗？',
+      onOk: () => {
+        finish(record.allocNo).then(() => {
+          createMessage.success('完结请求发送成功')
+          queryPage()
+        })
+      },
+    })
+  }
+
+  /**
+   * 分页查询
+   */
+  function queryPage() {
+    loading.value = true
+    page({
+      ...model.queryParam,
+      ...pages,
+      ...sortParam,
+    }).then(({ data }) => {
+      pageQueryResHandel(data)
+    })
+    return Promise.resolve()
+  }
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/allocation/transaction/Allocation.api.ts b/src/views/daxpay/common/allocation/transaction/Allocation.api.ts
new file mode 100644
index 00000000..04309527
--- /dev/null
+++ b/src/views/daxpay/common/allocation/transaction/Allocation.api.ts
@@ -0,0 +1,171 @@
+import { defHttp } from '@/utils/http/axios'
+import { PageResult, Result } from '#/axios'
+import { MchEntity } from '#/web'
+
+/**
+ * 分页
+ */
+export function page(params) {
+  return defHttp.get<Result<PageResult<AllocationOrder>>>({
+    url: '/allocation/transaction/page',
+    params,
+  })
+}
+
+/**
+ * 查询详情
+ */
+export function get(id) {
+  return defHttp.get<Result<AllocationOrder>>({
+    url: '/allocation/transaction/findById',
+    params: { id },
+  })
+}
+
+/**
+ * 获取订单详细信息
+ */
+export function getOrderByAllocNo(allocNo: string) {
+  return defHttp.get<Result>({
+    url: '/allocation/transaction/findByAllocNo',
+    params: { allocNo },
+  })
+}
+
+/**
+ * 扩展信息
+ */
+export function getExtra(id) {
+  return defHttp.get<Result<AllocationOrder>>({
+    url: '/allocation/transaction/findById',
+    params: { id },
+  })
+}
+
+/**
+ * 明细列表
+ */
+export function detailList(orderId) {
+  return defHttp.get<Result<AllocationOrderDetail[]>>({
+    url: '/allocation/transaction/detail/findAll',
+    params: { orderId },
+  })
+}
+
+/**
+ * 明细详情
+ */
+export function detail(id) {
+  return defHttp.get<Result<AllocationOrderDetail>>({
+    url: '/allocation/transaction/detail/findById',
+    params: { id },
+  })
+}
+
+/**
+ * 分账完结
+ */
+export function finish(allocNo) {
+  return defHttp.post<Result<AllocationOrder>>({
+    url: '/allocation/transaction/finish',
+    params: { allocNo },
+  })
+}
+
+/**
+ * 分账完结
+ */
+export function retry(bizAllocNo) {
+  return defHttp.post<Result<AllocationOrder>>({
+    url: '/allocation/transaction/retry',
+    params: { bizAllocNo },
+  })
+}
+
+/**
+ * 查询分账结果
+ */
+export function sync(allocNo) {
+  return defHttp.post<Result<AllocationOrder>>({
+    url: '/allocation/transaction/sync',
+    params: { allocNo },
+  })
+}
+
+/**
+ * 分账订单
+ */
+export interface AllocationOrder extends MchEntity {
+  // 分账单号
+  allocNo?: string
+  // 商户分账单号
+  bizAllocNo?: string
+  // 通道分账号
+  outAllocNo?: string
+  // 支付订单ID
+  orderId?: string
+  // 支付订单号
+  orderNo?: string
+  // 商户支付订单号
+  bizOrderNo?: string
+  // 外部系统支付订单号
+  outOrderNo?: string
+  // 支付订单标题
+  title?: string
+  // 所属通道
+  channel?: string
+  // 总分账金额
+  amount?: number
+  // 分账描述
+  description?: string
+  // 状态
+  status?: string
+  // 处理结果
+  result?: string
+  // 完成时间
+  finishTime?: string
+  // 异步通知地址
+  notifyUrl?: string
+  // 商户扩展参数
+  attach?: string
+  // 附加参数
+  extraParam?: string
+  // 请求时间
+  reqTime?: string
+  // 支付终端ip
+  clientIp?: string
+  // 错误码
+  errorCode?: string
+  // 错误原因
+  errorMsg?: string
+}
+
+/**
+ * 分账订单明细
+ */
+export interface AllocationOrderDetail extends MchEntity {
+  // 分账订单ID
+  orderId?: string
+  // 分账明细单号
+  receiverId?: string
+  // 比例
+  rate: number
+  // 金额
+  amount: number
+  // 分账接收方类型
+  receiverType?: string
+  // 接收方账号
+  receiverAccount?: string
+  // 接收方姓名
+  receiverName?: string
+  // 接收方编号
+  receiverNo?: string
+  // 分账结果
+  result?: string
+  // 错误代码
+  errorCode?: string
+  // 错误原因
+  errorMsg?: string
+  // 完成时间
+  finishTime?: string
+}
-- 
Gitee


From 52f9baba8cf89a1f055f8d2bf65ec061fbd3435f Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Thu, 21 Nov 2024 13:44:31 +0800
Subject: [PATCH 04/25] =?UTF-8?q?feat(cashier):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=A0=81=E7=89=8C=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加 CashierCodeConfig 相关 API 接口
- 实现码牌配置列表、编辑、删除等功能
- 新增码牌类型配置相关功能
- 重构原 ChannelCashierConfig 相关组件，改为 CashierCodeConfig
---
 .../cashier/checkout/CheckoutConfig.api.vue   |  11 +
 .../cashier/code/CashierCodeConfig.api.ts     | 134 +++++++++++
 .../cashier/code/CashierCodeConfigEdit.vue    | 165 +++++++++++++
 .../cashier/code/CashierCodeConfigList.vue    | 218 ++++++++++++++++++
 .../code/CashierCodeTypeConfigEdit.vue}       |  61 ++---
 .../code/CashierCodeTypeConfigList.vue}       |  58 +++--
 .../daxpay/common/merchant/app/MchApp.api.ts  |  10 +-
 .../daxpay/common/merchant/app/MchAppList.vue |  29 ++-
 .../cashier/ChannelCashierConfig.api.ts       | 103 ---------
 .../merchant/cashier/ChannelCashierQrCode.vue |  82 -------
 .../daxpay/common/order/pay/PayOrder.api.ts   |   2 +-
 .../daxpay/common/order/pay/PayOrderList.vue  |   4 +-
 12 files changed, 600 insertions(+), 277 deletions(-)
 create mode 100644 src/views/daxpay/common/config/cashier/checkout/CheckoutConfig.api.vue
 create mode 100644 src/views/daxpay/common/config/cashier/code/CashierCodeConfig.api.ts
 create mode 100644 src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue
 create mode 100644 src/views/daxpay/common/config/cashier/code/CashierCodeConfigList.vue
 rename src/views/daxpay/common/{merchant/cashier/ChannelCashierConfigEdit.vue => config/cashier/code/CashierCodeTypeConfigEdit.vue} (73%)
 rename src/views/daxpay/common/{merchant/cashier/ChannelCashierConfigList.vue => config/cashier/code/CashierCodeTypeConfigList.vue} (61%)
 delete mode 100644 src/views/daxpay/common/merchant/cashier/ChannelCashierConfig.api.ts
 delete mode 100644 src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue

diff --git a/src/views/daxpay/common/config/cashier/checkout/CheckoutConfig.api.vue b/src/views/daxpay/common/config/cashier/checkout/CheckoutConfig.api.vue
new file mode 100644
index 00000000..0a8d203d
--- /dev/null
+++ b/src/views/daxpay/common/config/cashier/checkout/CheckoutConfig.api.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/views/daxpay/common/config/cashier/code/CashierCodeConfig.api.ts b/src/views/daxpay/common/config/cashier/code/CashierCodeConfig.api.ts
new file mode 100644
index 00000000..5cf9a866
--- /dev/null
+++ b/src/views/daxpay/common/config/cashier/code/CashierCodeConfig.api.ts
@@ -0,0 +1,134 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+
+/**
+ * 根据AppId查询码牌列表
+ */
+export const findAllByAppId = (appId) =>
+  defHttp.get<Result<CashierCodeConfig[]>>({
+    url: '/cashier/code/config/findAllByAppId',
+    params: { appId },
+  })
+
+/**
+ * 根据id查询码牌信息
+ */
+export const findById = (id) =>
+  defHttp.get<Result<CashierCodeConfig>>({ url: '/cashier/code/config/findById', params: { id } })
+
+/**
+ * 码牌配置保存
+ */
+export const save = (param: CashierCodeConfig) =>
+  defHttp.post({ url: '/cashier/code/config/save', data: param })
+
+/**
+ * 码牌配置更新
+ */
+export const update = (param: CashierCodeConfig) =>
+  defHttp.post({ url: '/cashier/code/config/update', data: param })
+
+/**
+ * 码牌配置删除
+ */
+export const remove = (id) => defHttp.post({ url: '/cashier/code/config/delete', params: { id } })
+
+/**
+ * 获取码牌地址
+ */
+export const getCashierCodeUrl = (id) =>
+  defHttp.get<Result<string>>({ url: '/cashier/code/config/getCashierCodeUrl', params: { id } })
+/**
+ * 获取码牌各类型配置列表
+ */
+export const findTypeByCodeId = (cashierCodeId) =>
+  defHttp.get<Result<CashierCodeTypeConfig[]>>({
+    url: '/cashier/code/config/type/findAll',
+    params: { cashierCodeId },
+  })
+/**
+ * 获取码牌类型配置详情
+ */
+export const findTypeById = (id) =>
+  defHttp.get<Result<CashierCodeTypeConfig>>({ url: '/cashier/code/config/type/findById', params: { id } })
+/**
+ * 码牌类型配置保存
+ */
+export const saveType = (param: CashierCodeTypeConfig) =>
+  defHttp.post({ url: '/cashier/code/config/type/save', data: param })
+/**
+ * 码牌类型配置更新
+ */
+export const updateType = (param: CashierCodeTypeConfig) =>
+  defHttp.post({ url: '/cashier/code/config/type/update', data: param })
+/**
+ * 码牌类型配置删除
+ */
+export const deleteType = (id) => defHttp.post({ url: '/cashier/code/config/type/delete', params: { id } })
+
+/**
+ * 码牌类型是否存在
+ */
+export const existsByType = (type, cashierCodeId) =>
+  defHttp.get<Result<boolean>>({
+    url: '/cashier/code/config/type/exists',
+    params: { type, cashierCodeId },
+  })
+
+/**
+ * 码牌类型是否存在(不包括自身)
+ */
+export const existsByTypeNotId = (type, cashierCodeId, id) =>
+  defHttp.get<Result<boolean>>({
+    url: '/cashier/code/config/type/existsNotId',
+    params: { type, cashierCodeId, id },
+  })
+
+/**
+ * 收银台码牌配置
+ */
+export interface CashierCodeConfig extends MchEntity {
+  /** 码牌名称 */
+  name?: string
+  /** 码牌code */
+  code?: string
+  /** 模板编号 */
+  templateCode?: string
+  /** 是否启用 */
+  enable?: boolean
+  /** 备注 */
+  remark?: string
+}
+
+/**
+ * 特定类型码牌配置
+ */
+export interface CashierCodeTypeConfig extends MchEntity {
+  /** 码牌ID */
+  cashierCodeId?: string
+
+  /**
+   * 码牌类型
+   */
+  type?: string
+
+  /**
+   * 支付通道
+   */
+  channel?: string
+
+  /**
+   * 支付方式
+   */
+  payMethod?: string
+
+  /** 是否开启分账 */
+  allocation?: boolean
+
+  /** 自动分账 */
+  autoAllocation?: boolean
+
+  /** 备注 */
+  remark?: string
+}
diff --git a/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue b/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue
new file mode 100644
index 00000000..38473e36
--- /dev/null
+++ b/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue
@@ -0,0 +1,165 @@
+<template>
+  <basic-modal
+    v-bind="$attrs"
+    :loading="confirmLoading"
+    :width="modalWidth"
+    :title="title"
+    :open="visible"
+    :mask-closable="showable"
+    @cancel="handleCancel"
+  >
+    <a-form
+      class="small-from-item"
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :validate-trigger="['blur', 'change']"
+      :label-col="labelCol"
+      :wrapper-col="wrapperCol"
+    >
+      <a-form-item label="主键" name="id" :hidden="true">
+        <a-input v-model:value="form.id" :disabled="showable" />
+      </a-form-item>
+      <a-form-item label="码牌编码" name="code" v-show="form.code">
+        <a-input v-model:value="form.code" disabled />
+      </a-form-item>
+      <a-form-item label="码牌名称" name="name">
+        <a-input v-model:value="form.name" :disabled="showable" placeholder="请输入码牌名称" />
+      </a-form-item>
+      <a-form-item label="是否启用" name="enable">
+        <a-switch
+          checked-children="启用"
+          un-checked-children="停用"
+          v-model:checked="form.enable"
+          :disabled="showable"
+        />
+      </a-form-item>
+      <a-form-item label="备注" name="remark">
+        <a-textarea v-model:value="form.remark" :disabled="showable" placeholder="请输入备注" />
+      </a-form-item>
+    </a-form>
+    <template #footer>
+      <a-space>
+        <a-button key="cancel" @click="handleCancel">取消</a-button>
+        <a-button
+          v-if="!showable"
+          key="forward"
+          :loading="confirmLoading"
+          type="primary"
+          @click="handleOk"
+          >保存</a-button
+        >
+      </a-space>
+    </template>
+  </basic-modal>
+</template>
+
+<script lang="ts" setup>
+  import { nextTick, onMounted, reactive, ref, unref } from 'vue'
+  import useFormEdit from '@/hooks/bootx/useFormEdit'
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+  import { FormEditType } from '@/enums/formTypeEnum'
+  import { BasicModal } from '@/components/Modal'
+  import { LabeledValue } from 'ant-design-vue/lib/select'
+  import { findById, save, update, CashierCodeConfig } from './CashierCodeConfig.api'
+  import { useDict } from '@/hooks/bootx/useDict'
+
+  const {
+    initFormEditType,
+    handleCancel,
+    labelCol,
+    wrapperCol,
+    modalWidth,
+    title,
+    confirmLoading,
+    visible,
+    showable,
+    formEditType,
+  } = useFormEdit()
+
+  const { dictDropDown } = useDict()
+
+  // 表单
+  const formRef = ref<FormInstance>()
+
+  const cashierTypeList = ref<LabeledValue[]>([])
+  const channelList = ref<LabeledValue[]>([])
+  const methodList = ref<LabeledValue[]>([])
+
+  let form = ref<CashierCodeConfig>({
+    enable: true,
+  })
+  // 校验
+  const rules = reactive({
+    code: [{ required: true, message: '' }],
+    name: [{ required: true, message: '请输入码牌名称' }],
+    enable: [{ required: true, message: '是否启用' }],
+  } as Record<string, Rule[]>)
+
+  // 事件
+  const emits = defineEmits(['ok'])
+
+  onMounted(() => {
+    initData()
+  })
+
+  /**
+   * 初始化数据
+   */
+  async function initData() {
+    cashierTypeList.value = await dictDropDown('cashier_type')
+    channelList.value = await dictDropDown('channel')
+    methodList.value = await dictDropDown('pay_method')
+  }
+
+  /**
+   * 入口
+   */
+  function init(id, editType: FormEditType, appId: string) {
+    initFormEditType(editType)
+    resetForm()
+    form.value.appId = unref(appId)
+    getInfo(id, editType)
+  }
+  /**
+   * 获取信息
+   */
+  function getInfo(id, editType: FormEditType) {
+    if ([FormEditType.Edit, FormEditType.Show].includes(editType)) {
+      confirmLoading.value = true
+      findById(id).then(({ data }) => {
+        form.value = data
+        confirmLoading.value = false
+      })
+    } else {
+      confirmLoading.value = false
+    }
+  }
+  /**
+   * 保存
+   */
+  function handleOk() {
+    formRef.value?.validate().then(async () => {
+      confirmLoading.value = true
+      if (formEditType.value === FormEditType.Add) {
+        await save(form.value).finally(() => (confirmLoading.value = false))
+      } else if (formEditType.value === FormEditType.Edit) {
+        await update(form.value).finally(() => (confirmLoading.value = false))
+      }
+      handleCancel()
+      emits('ok')
+    })
+  }
+
+  // 重置表单的校验
+  function resetForm() {
+    nextTick(() => {
+      formRef.value?.resetFields()
+    })
+  }
+  defineExpose({
+    init,
+  })
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/daxpay/common/config/cashier/code/CashierCodeConfigList.vue b/src/views/daxpay/common/config/cashier/code/CashierCodeConfigList.vue
new file mode 100644
index 00000000..7df6fc83
--- /dev/null
+++ b/src/views/daxpay/common/config/cashier/code/CashierCodeConfigList.vue
@@ -0,0 +1,218 @@
+<template>
+  <basic-drawer
+    showFooter
+    v-bind="$attrs"
+    width="70%"
+    title="码牌配置"
+    :mask-closable="true"
+    :open="visible"
+    @close="handleCancel"
+  >
+    <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
+      <template #buttons>
+        <a-space>
+          <a-button type="primary" pre-icon="ant-design:plus-outlined" @click="add">新建</a-button>
+        </a-space>
+      </template>
+    </vxe-toolbar>
+    <vxe-table ey-field="id" ref="xTable" :data="records" :loading="loading">
+      <vxe-column type="seq" width="60" />
+      <vxe-column field="name" title="码牌名称" :min-width="150">
+        <template #default="{ row }">
+          <a href="javascript:" @click="show(row)">{{ row.name }}</a>
+        </template>
+      </vxe-column>
+      <vxe-column field="code" title="码牌编号" :min-width="220" />
+      <vxe-column field="enable" title="是否启用" :min-width="150">
+        <template #default="{ row }">
+          <a-tag v-if="row.enable" color="green">开启</a-tag>
+          <a-tag v-else color="red">关闭</a-tag>
+        </template>
+      </vxe-column>
+      <vxe-column field="remark" title="备注" :min-width="170" />
+      <vxe-column field="createTime" title="创建时间" :min-width="170" />
+      <vxe-column fixed="right" :width="240" :showOverflow="false" title="操作">
+        <template #default="{ row }">
+          <a href="javascript:" @click="edit(row)">编辑</a>
+          <a-divider type="vertical" />
+          <a href="javascript:" @click="typeList(row)">类型配置</a>
+          <a-divider type="vertical" />
+          <a href="javascript:" @click="getUrl(row)">获取码牌</a>
+          <a-divider type="vertical" />
+          <a href="javascript:" style="color: red" @click="del(row)">删除</a>
+        </template>
+      </vxe-column>
+    </vxe-table>
+    <a-modal
+      title="商户收款码牌"
+      :loading="modelLoading"
+      :width="500"
+      :open="modelVisible"
+      :mask-closable="false"
+      :footer="null"
+      @cancel="() => (modelVisible = false)"
+    >
+      <div class="flex justify-center" style="padding: 30px 0">
+        <a-qrcode
+          ref="qrcodeCanvasRef"
+          :status="modelLoading ? 'loading' : 'active'"
+          :size="350"
+          :value="qrUrl"
+          :error-level="'Q'"
+          color="black"
+          bg-color="white"
+        />
+      </div>
+      <div class="flex justify-center" style="margin-bottom: 20px">
+        <a-button type="primary" @click="download">保存码牌</a-button>
+        <a-button style="margin-left: 25px" @click="copy">复制地址</a-button>
+      </div>
+    </a-modal>
+
+    <CashierCodeConfigEdit ref="cashierCodeConfigEdit" @ok="queryPage" />
+    <CashierCodeTypeConfigList ref="cashierCodeTypeConfigList" />
+  </basic-drawer>
+</template>
+<script setup lang="ts">
+  import { BasicDrawer } from '@/components/Drawer'
+  import { ref } from 'vue'
+  import {
+    findAllByAppId,
+    remove,
+    CashierCodeConfig,
+    getCashierCodeUrl,
+  } from './CashierCodeConfig.api'
+  import CashierCodeTypeConfigList from './CashierCodeTypeConfigList.vue'
+  import CashierCodeConfigEdit from './CashierCodeConfigEdit.vue'
+  import { FormEditType } from '@/enums/formTypeEnum'
+  import { useMessage } from '@/hooks/web/useMessage'
+  import { copyText } from '@/utils/copyTextToClipboard'
+
+  const { createConfirm, createMessage } = useMessage()
+
+  const currentAppId = ref<string>()
+
+  const loading = ref(false)
+  const visible = ref(false)
+  const records = ref<CashierCodeConfig[]>([])
+
+  const modelLoading = ref(false)
+  const modelVisible = ref(false)
+  const qrUrl = ref<string>('')
+
+  const cashierCodeTypeConfigList = ref<any>()
+  const cashierCodeConfigEdit = ref<any>()
+  const qrcodeCanvasRef = ref<any>()
+  /**
+   * 初始化并展示
+   */
+  async function init(appId: string) {
+    visible.value = true
+    loading.value = false
+    currentAppId.value = appId
+    queryPage()
+  }
+
+  /**
+   * 查询
+   */
+  function queryPage() {
+    // 列表信息
+    loading.value = true
+    findAllByAppId(currentAppId.value).then(({ data }) => {
+      records.value = data
+      loading.value = false
+    })
+  }
+
+  /**
+   * 关闭页面
+   */
+  function handleCancel() {
+    visible.value = false
+  }
+
+  /**
+   * 新增
+   */
+  function add() {
+    cashierCodeConfigEdit.value.init(null, FormEditType.Add, currentAppId.value)
+  }
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    cashierCodeConfigEdit.value.init(record.id, FormEditType.Edit, currentAppId.value)
+  }
+  /**
+   * 查看
+   */
+  function show(record) {
+    cashierCodeConfigEdit.value.init(record.id, FormEditType.Show, currentAppId.value)
+  }
+
+  /**
+   * 类型配置列表
+   */
+  function typeList(record) {
+    cashierCodeTypeConfigList.value.init(record)
+  }
+
+  /**
+   * 获取码牌地址
+   */
+  function getUrl(record) {
+    modelVisible.value = true
+    modelLoading.value = true
+    getCashierCodeUrl(record.id)
+      .then(({ data }) => {
+        qrUrl.value = data
+        modelLoading.value = false
+      })
+      .catch(() => {
+        createMessage.error('获取码牌地址失败')
+      })
+  }
+
+  /**
+   * 复制
+   */
+  function copy() {
+    copyText(qrUrl.value)
+  }
+
+  /**
+   * 下载
+   */
+  async function download() {
+    const url = qrcodeCanvasRef.value.toDataURL()
+    const a = document.createElement('a')
+    a.download = 'QRCode.png'
+    a.href = url
+    document.body.appendChild(a)
+    a.click()
+    document.body.removeChild(a)
+  }
+
+  /**
+   * 删除
+   */
+  function del(record) {
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '是否删除该数据',
+      onOk: () => {
+        loading.value = true
+        remove(record.id).then(() => {
+          createMessage.success('删除成功')
+          queryPage()
+        })
+      },
+    })
+  }
+  defineExpose({
+    init,
+  })
+</script>
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue b/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigEdit.vue
similarity index 73%
rename from src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue
rename to src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigEdit.vue
index 5b02b914..b31bf4a9 100644
--- a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigEdit.vue
+++ b/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigEdit.vue
@@ -20,23 +20,16 @@
       <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
-      <a-form-item label="收银台类型" validate-first name="cashierType">
+      <a-form-item label="码牌类型" validate-first name="type">
         <a-select
           style="width: 300px"
-          v-model:value="form.cashierType"
+          v-model:value="form.type"
           :disabled="showable"
           :options="cashierTypeList"
           allow-clear
           placeholder="请选择收银台类型"
         />
       </a-form-item>
-      <a-form-item label="收银台名称" name="cashierName">
-        <a-input
-          v-model:value="form.cashierName"
-          :disabled="showable"
-          placeholder="请输入收银台名称"
-        />
-      </a-form-item>
       <a-form-item label="支付通道" name="channel">
         <a-select
           style="width: 300px"
@@ -65,14 +58,6 @@
           :disabled="showable"
         />
       </a-form-item>
-      <a-form-item label="自动分账" name="autoAllocation">
-        <a-switch
-          checked-children="启用"
-          un-checked-children="停用"
-          v-model:checked="form.autoAllocation"
-          :disabled="showable"
-        />
-      </a-form-item>
       <a-form-item label="备注" name="remark">
         <a-textarea v-model:value="form.remark" :disabled="showable" placeholder="请输入备注" />
       </a-form-item>
@@ -101,15 +86,14 @@
   import { BasicModal } from '@/components/Modal'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import {
-    get,
-    add,
-    update,
+    findTypeById,
+    saveType,
+    updateType,
     existsByType,
     existsByTypeNotId,
-    ChannelCashierConfig,
-  } from './ChannelCashierConfig.api'
+    CashierCodeTypeConfig,
+  } from './CashierCodeConfig.api'
   import { useDict } from '@/hooks/bootx/useDict'
-  import { MchApp } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   const {
     initFormEditType,
@@ -133,18 +117,19 @@
   const channelList = ref<LabeledValue[]>([])
   const methodList = ref<LabeledValue[]>([])
 
-  let form = ref<ChannelCashierConfig>({
+  let form = ref<CashierCodeTypeConfig>({
     allocation: false,
     autoAllocation: false,
   })
   // 校验
   const rules = reactive({
-    cashierType: [
+    type: [
       { required: true, message: '请选择收银台类型' },
       { validator: validateCode, trigger: 'blur' },
     ],
-    cashierName: [{ required: true, message: '请输入收银台名称' }],
-    name: [{ required: true, message: '请输入字典项名称' }],
+    channel: [{ required: true, message: '请选择支付通道' }],
+    payMethod: [{ required: true, message: '请选择支付方式' }],
+    allocation: [{ required: true, message: '' }],
   } as Record<string, Rule[]>)
 
   // 事件
@@ -158,7 +143,7 @@
    * 初始化数据
    */
   async function initData() {
-    cashierTypeList.value = await dictDropDown('cashier_type')
+    cashierTypeList.value = await dictDropDown('cashier_code_type')
     channelList.value = await dictDropDown('channel')
     methodList.value = await dictDropDown('pay_method')
   }
@@ -166,10 +151,10 @@
   /**
    * 入口
    */
-  function init(id, editType: FormEditType, mchApp: MchApp) {
+  function init(id, editType: FormEditType, configId: string) {
     initFormEditType(editType)
     resetForm()
-    form.value.appId = unref(mchApp.appId)
+    form.value.cashierCodeId = unref(configId)
     getInfo(id, editType)
   }
   /**
@@ -178,7 +163,7 @@
   function getInfo(id, editType: FormEditType) {
     if ([FormEditType.Edit, FormEditType.Show].includes(editType)) {
       confirmLoading.value = true
-      get(id).then(({ data }) => {
+      findTypeById(id).then(({ data }) => {
         form.value = data
         confirmLoading.value = false
       })
@@ -193,9 +178,9 @@
     formRef.value?.validate().then(async () => {
       confirmLoading.value = true
       if (formEditType.value === FormEditType.Add) {
-        await add(form.value).finally(() => (confirmLoading.value = false))
+        await saveType(form.value).finally(() => (confirmLoading.value = false))
       } else if (formEditType.value === FormEditType.Edit) {
-        await update(form.value).finally(() => (confirmLoading.value = false))
+        await updateType(form.value).finally(() => (confirmLoading.value = false))
       }
       handleCancel()
       emits('ok')
@@ -206,13 +191,13 @@
    * 校验编码重复
    */
   async function validateCode() {
-    const { cashierType, appId, id } = form.value
+    const { type, cashierCodeId, id } = form.value
     if (id) {
-      const res = await existsByTypeNotId(appId, cashierType, id)
-      return res.data ? Promise.reject('该收银台类型已存在') : Promise.resolve()
+      const res = await existsByTypeNotId(type, cashierCodeId, id)
+      return res.data ? Promise.reject('该码牌类型已存在') : Promise.resolve()
     } else {
-      const res = await existsByType(appId, cashierType)
-      return res.data ? Promise.reject('该收银台类型已存在') : Promise.resolve()
+      const res = await existsByType(type, cashierCodeId)
+      return res.data ? Promise.reject('该码牌类型已存在') : Promise.resolve()
     }
   }
 
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue b/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigList.vue
similarity index 61%
rename from src/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue
rename to src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigList.vue
index 91974308..98f9f6c7 100644
--- a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue
+++ b/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigList.vue
@@ -3,7 +3,7 @@
     showFooter
     v-bind="$attrs"
     width="70%"
-    title="收银配置"
+    title="码牌类型配置"
     :mask-closable="true"
     :open="visible"
     @close="handleCancel"
@@ -17,32 +17,25 @@
     </vxe-toolbar>
     <vxe-table ey-field="id" ref="xTable" :data="records" :loading="loading">
       <vxe-column type="seq" width="60" />
-      <vxe-column field="cashierType" title="收银台类型" :min-width="150">
+      <vxe-column field="type" title="码牌类型" :min-width="150">
         <template #default="{ row }">
-          <a-tag color="green">{{ dictConvert('cashier_type', row.cashierType) }}</a-tag>
+          {{ dictConvert('cashier_code_type', row.type) }}
         </template>
       </vxe-column>
-      <vxe-column field="cashierName" title="收银台名称" :min-width="150" />
-      <vxe-column field="channel" title="关联通道" :min-width="150">
+      <vxe-column field="channel" title="支付通道" :min-width="150">
         <template #default="{ row }">
-          <a-tag color="green">{{ dictConvert('channel', row.channel) }}</a-tag>
+          {{ dictConvert('channel', row.channel) }}
         </template>
       </vxe-column>
-      <vxe-column field="channel" title="关联支付方式" :min-width="150">
+      <vxe-column field="payMethod" title="支付方式" :min-width="150">
         <template #default="{ row }">
-          <a-tag color="green">{{ dictConvert('pay_method', row.payMethod) }}</a-tag>
+          {{ dictConvert('pay_method', row.payMethod) }}
         </template>
       </vxe-column>
       <vxe-column field="allocation" title="开启分账" :min-width="150">
         <template #default="{ row }">
-          <a-tag v-if="row.allocation" color="green">开启</a-tag>
-          <a-tag v-else color="red">关闭</a-tag>
-        </template>
-      </vxe-column>
-      <vxe-column field="autoAllocation" title="自动分账" :min-width="150">
-        <template #default="{ row }">
-          <a-tag v-if="row.autoAllocation" color="green">开启</a-tag>
-          <a-tag v-else color="red">关闭</a-tag>
+          <a-tag color="green" v-if="row.allocation">开启</a-tag>
+          <a-tag v-else>关闭</a-tag>
         </template>
       </vxe-column>
       <vxe-column field="remark" title="备注" :min-width="170" />
@@ -57,36 +50,39 @@
         </template>
       </vxe-column>
     </vxe-table>
-    <ChannelCashierConfigEdit ref="channelCashierConfigEdit" @ok="queryPage" />
+    <CashierCodeTypeConfigEdit ref="cashierCodeTypeConfigEdit" @ok="queryPage" />
   </basic-drawer>
 </template>
 <script setup lang="ts">
   import { BasicDrawer } from '@/components/Drawer'
   import { ref } from 'vue'
-  import { findAll, remove, ChannelCashierConfig } from './ChannelCashierConfig.api'
-  import ChannelCashierConfigEdit from './ChannelCashierConfigEdit.vue'
+  import {
+    deleteType,
+    findTypeByCodeId,
+    CashierCodeConfig,
+    CashierCodeTypeConfig,
+  } from './CashierCodeConfig.api'
+  import CashierCodeTypeConfigEdit from './CashierCodeTypeConfigEdit.vue'
   import { FormEditType } from '@/enums/formTypeEnum'
   import { useMessage } from '@/hooks/web/useMessage'
   import { useDict } from '@/hooks/bootx/useDict'
-  import { MchApp } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   const { createConfirm, createMessage } = useMessage()
   const { dictConvert } = useDict()
 
-  const currentApp = ref<MchApp>({})
-
   const loading = ref(false)
   const visible = ref(false)
-  const records = ref<ChannelCashierConfig[]>([])
+  const records = ref<CashierCodeTypeConfig[]>([])
+  const codeConfig = ref<CashierCodeConfig>({})
 
-  const channelCashierConfigEdit = ref<any>()
+  const cashierCodeTypeConfigEdit = ref<any>()
   /**
    * 初始化并展示
    */
-  async function init(mchApp: MchApp) {
+  async function init(config: CashierCodeConfig) {
     visible.value = true
     loading.value = false
-    currentApp.value = mchApp
+    codeConfig.value = config
     queryPage()
   }
 
@@ -96,7 +92,7 @@
   function queryPage() {
     // 列表信息
     loading.value = true
-    findAll(currentApp.value.appId).then(({ data }) => {
+    findTypeByCodeId(codeConfig.value.id).then(({ data }) => {
       records.value = data
       loading.value = false
     })
@@ -113,19 +109,19 @@
    * 新增
    */
   function add() {
-    channelCashierConfigEdit.value.init(null, FormEditType.Add, currentApp.value)
+    cashierCodeTypeConfigEdit.value.init(null, FormEditType.Add, codeConfig.value.id)
   }
   /**
    * 编辑
    */
   function edit(record) {
-    channelCashierConfigEdit.value.init(record.id, FormEditType.Edit, currentApp.value)
+    cashierCodeTypeConfigEdit.value.init(record.id, FormEditType.Edit, codeConfig.value.id)
   }
   /**
    * 查看
    */
   function show(record) {
-    channelCashierConfigEdit.value.init(record.id, FormEditType.Show, currentApp.value)
+    cashierCodeTypeConfigEdit.value.init(record.id, FormEditType.Show, codeConfig.value.id)
   }
 
   /**
@@ -138,7 +134,7 @@
       content: '是否删除该数据',
       onOk: () => {
         loading.value = true
-        remove(record.id).then(() => {
+        deleteType(record.id).then(() => {
           createMessage.success('删除成功')
           queryPage()
         })
diff --git a/src/views/daxpay/common/merchant/app/MchApp.api.ts b/src/views/daxpay/common/merchant/app/MchApp.api.ts
index 27b42d84..23405e26 100644
--- a/src/views/daxpay/common/merchant/app/MchApp.api.ts
+++ b/src/views/daxpay/common/merchant/app/MchApp.api.ts
@@ -68,17 +68,17 @@ export interface MchApp extends BaseEntity {
   // 应用名称
   appName?: string
   // 签名方式
-  signType: string
+  signType?: string
   // 签名秘钥
   signSecret?: string
   // 是否对请求进行验签
-  reqSign: boolean
+  reqSign?: boolean
   // 支付限额
-  limitAmount: number
+  limitAmount?: number
   // 订单默认超时时间(分钟)
-  orderTimeout: number
+  orderTimeout?: number
   // 异步消息通知类型
-  notifyType: string
+  notifyType?: string
   // 通知地址, http/WebSocket 需要配置
   notifyUrl?: string
   // 状态
diff --git a/src/views/daxpay/common/merchant/app/MchAppList.vue b/src/views/daxpay/common/merchant/app/MchAppList.vue
index ad70c758..33532c42 100644
--- a/src/views/daxpay/common/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppList.vue
@@ -53,17 +53,19 @@
               <a-link @click="showChannelSetup(row)">通道配置</a-link>
               <a-divider type="vertical" />
               <a-dropdown>
-                <a style="color:red"> 其他配置 <Icon icon="ant-design:down-outlined" :size="12" /> </a>
+                <a style="color: red">
+                  其他配置 <Icon icon="ant-design:down-outlined" :size="12" />
+                </a>
                 <template #overlay>
                   <a-menu>
                     <a-menu-item>
                       <a-link @click="showNotifyConfig(row)">订阅配置</a-link>
                     </a-menu-item>
                     <a-menu-item>
-                      <a-link @click="showCashierConfig(row)">收银配置</a-link>
+                      <a-link @click="showCheckoutConfig(row)">收银台配置</a-link>
                     </a-menu-item>
                     <a-menu-item>
-                      <a-link @click="showCashierQrCOde(row)">收银码牌</a-link>
+                      <a-link @click="showCashierCode(row)">码牌配置</a-link>
                     </a-menu-item>
                     <a-menu-item>
                       <a-link @click="showAllocConfig(row)">分账配置</a-link>
@@ -94,9 +96,8 @@
       />
       <mch-app-edit ref="mchApp" @ok="queryPage" />
       <channel-config-list ref="channelSetup" />
-      <ChannelCashierConfigList ref="channelCashierConfigList" />
-      <ChannelCashierQrCode ref="channelCashierQrCode" />
       <MerchantNotifyConfigList ref="merchantNotifyConfigList" />
+      <CashierCodeConfigList ref="cashierCodeConfigList" />
       <AllocationReceiverList ref="allocationReceiverList" />
       <AllocationGroupList ref="allocationGroupList" />
     </div>
@@ -118,10 +119,9 @@
   import ChannelConfigList from '@/views/daxpay/common/merchant/channel/ChannelConfigList.vue'
   import MerchantNotifyConfigList from '@/views/daxpay/common/merchant/notify/MerchantNotifyConfigList.vue'
   import Icon from '@/components/Icon/Icon.vue'
-  import ChannelCashierConfigList from '@/views/daxpay/common/merchant/cashier/ChannelCashierConfigList.vue'
-  import ChannelCashierQrCode from '@/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue'
   import AllocationReceiverList from '@/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue'
   import AllocationGroupList from '@/views/daxpay/common/allocation/group/AllocationGroupList.vue'
+  import CashierCodeConfigList from '@/views/daxpay/common/config/cashier/code/CashierCodeConfigList.vue'
 
   // 使用hooks
   const {
@@ -148,8 +148,7 @@
   const mchApp = ref<any>()
   const channelSetup = ref<any>()
   const merchantNotifyConfigList = ref<any>()
-  const channelCashierConfigList = ref<any>()
-  const channelCashierQrCode = ref<any>()
+  const cashierCodeConfigList = ref<any>()
   const allocationReceiverList = ref<any>()
   const allocationGroupList = ref<any>()
 
@@ -205,16 +204,16 @@
     merchantNotifyConfigList.value.init(record.appId)
   }
   /**
-   * 收银配置
+   * 收银台配置
    */
-  function showCashierConfig(record) {
-    channelCashierConfigList.value.init(record)
+  function showCheckoutConfig(record) {
   }
   /**
-   * 收银码牌
+   * 收银码牌配置
    */
-  function showCashierQrCOde(record) {
-    channelCashierQrCode.value.init(record.appId)
+  function showCashierCode(record) {
+    cashierCodeConfigList.value.init(record.appId)
+
   }
   /**
    * 分账配置
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfig.api.ts b/src/views/daxpay/common/merchant/cashier/ChannelCashierConfig.api.ts
deleted file mode 100644
index 5643998d..00000000
--- a/src/views/daxpay/common/merchant/cashier/ChannelCashierConfig.api.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { defHttp } from '@/utils/http/axios'
-import { Result } from '#/axios'
-import { MchEntity } from '#/web'
-
-/**
- * 配置列表
- */
-export function findAll(appId) {
-  return defHttp.get<Result<ChannelCashierConfig[]>>({
-    url: '/channel/cashier/config/findByAppId',
-    params: { appId },
-  })
-}
-
-/**
- * 配置详情
- */
-export function get(id) {
-  return defHttp.get<Result<ChannelCashierConfig>>({
-    url: '/channel/cashier/config/findById',
-    params: { id },
-  })
-}
-
-/**
- * 配置是否存在
- */
-export function existsByType(appId, type) {
-  return defHttp.get<Result<boolean>>({
-    url: '/channel/cashier/config/existsByType',
-    params: { appId, type },
-  })
-}
-
-/**
- * 配置是否存在
- */
-export function existsByTypeNotId(appId, type, id) {
-  return defHttp.get<Result<boolean>>({
-    url: '/channel/cashier/config/existsByTypeNotId',
-    params: { appId, type, id },
-  })
-}
-
-/**
- * 配置保存
- */
-export function add(data: ChannelCashierConfig) {
-  return defHttp.post<Result<ChannelCashierConfig>>({
-    url: '/channel/cashier/config/save',
-    data,
-  })
-}
-
-/**
- * 配置更新
- */
-export function update(data: ChannelCashierConfig) {
-  return defHttp.post<Result<ChannelCashierConfig>>({
-    url: '/channel/cashier/config/update',
-    data,
-  })
-}
-
-/**
- * 配置删除
- */
-export function remove(id) {
-  return defHttp.post<Result<ChannelCashierConfig>>({
-    url: '/channel/cashier/config/delete',
-    params: { id },
-  })
-}
-
-/**
- * 获取码牌地址
- */
-export function getQrCodeUrl(appId) {
-  return defHttp.get<Result<string>>({
-    url: '/channel/cashier/config/qrCodeUrl',
-    params: { appId },
-  })
-}
-
-/**
- * 通道收银台配置
- */
-export interface ChannelCashierConfig extends MchEntity {
-  // 收银台类型
-  cashierType?: string
-  // 收银台名称
-  cashierName?: string
-  // 支付通道
-  channel?: string
-  // 支付方式
-  payMethod?: string
-  // 是否开启分账
-  allocation?: boolean
-  // 自动分账
-  autoAllocation?: boolean
-  // 备注
-  remark?: string
-}
diff --git a/src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue b/src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue
deleted file mode 100644
index 59cfc922..00000000
--- a/src/views/daxpay/common/merchant/cashier/ChannelCashierQrCode.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-  <a-modal
-    title="商户收款码牌"
-    :loading="confirmLoading"
-    :width="500"
-    :open="visible"
-    :mask-closable="false"
-    :footer="null"
-    @cancel="handleCancel"
-  >
-    <div class="flex justify-center" style="padding: 30px 0">
-      <a-qrcode
-        ref="qrcodeCanvasRef"
-        :status="confirmLoading ? 'loading' : 'active'"
-        :size="350"
-        :value="url"
-        :error-level="'Q'"
-        color="black"
-        bg-color="white"
-      />
-    </div>
-    <div class="flex justify-center" style="margin-bottom: 20px">
-      <a-button type="primary" @click="download">保存码牌</a-button>
-      <a-button style="margin-left: 25px" @click="copy">复制地址</a-button>
-    </div>
-  </a-modal>
-</template>
-
-<script setup lang="ts">
-  import { ref } from 'vue'
-  import { copyText } from '@/utils/copyTextToClipboard'
-  import { getQrCodeUrl } from './ChannelCashierConfig.api'
-
-  const confirmLoading = ref(false)
-  const visible = ref(false)
-  const url = ref('')
-  const qrcodeCanvasRef = ref()
-
-  /**
-   * 初始化
-   */
-  function init(appId: string) {
-    visible.value = true
-    confirmLoading.value = true
-    getQrCodeUrl(appId).then((res) => {
-      url.value = res.data
-      confirmLoading.value = false
-    })
-  }
-
-  /**
-   * 复制
-   */
-  function copy() {
-    copyText(url.value)
-  }
-  /**
-   * 关闭
-   */
-  function handleCancel() {
-    visible.value = false
-  }
-
-  /**
-   * 下嘴
-   */
-  async function download() {
-    const url = qrcodeCanvasRef.value.toDataURL()
-    const a = document.createElement('a')
-    a.download = 'QRCode.png'
-    a.href = url
-    document.body.appendChild(a)
-    a.click()
-    document.body.removeChild(a)
-  }
-
-  defineExpose({
-    init,
-  })
-</script>
-
-<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/order/pay/PayOrder.api.ts b/src/views/daxpay/common/order/pay/PayOrder.api.ts
index f8e53ce7..774a49f2 100644
--- a/src/views/daxpay/common/order/pay/PayOrder.api.ts
+++ b/src/views/daxpay/common/order/pay/PayOrder.api.ts
@@ -70,7 +70,7 @@ export function cancel(id) {
 /**
  * 触发分账
  */
-export function allocationByOrderNo(orderNo) {
+export function allocByOrderNo(orderNo) {
   return defHttp.post<Result<void>>({
     url: '/order/pay/allocation',
     params: { orderNo },
diff --git a/src/views/daxpay/common/order/pay/PayOrderList.vue b/src/views/daxpay/common/order/pay/PayOrderList.vue
index fc837310..af5cc7ba 100644
--- a/src/views/daxpay/common/order/pay/PayOrderList.vue
+++ b/src/views/daxpay/common/order/pay/PayOrderList.vue
@@ -137,7 +137,7 @@
 <script lang="ts" setup>
   import { computed, onMounted, ref, watch } from 'vue'
   import {
-    allocationByOrderNo,
+    allocByOrderNo,
     close,
     getTotalAmount,
     page,
@@ -356,7 +356,7 @@
       title: '警告',
       content: '是否触发该订单的分账操作',
       onOk: () => {
-        allocationByOrderNo(record.orderNo).then(() => {
+        allocByOrderNo(record.orderNo).then(() => {
           createMessage.success('分账请求已发送')
           queryPage()
         })
-- 
Gitee


From 95c6f55dee39344ddcdafa4c094e916aca3eb60f Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Sun, 24 Nov 2024 17:15:53 +0800
Subject: [PATCH 05/25] =?UTF-8?q?refactor(daxpay):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=88=86=E8=B4=A6=E5=8A=9F=E8=83=BD=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 AllocationGroupEdit 和 AllocationReceiverEdit组件，使用 unref 获取 appId值
- 更新 AllocationReceiver.api.ts，添加 reqTime 字段- 调整 PayOrder.api.ts 中的分账接口，使用 id 替代 orderNo
- 优化 PayOrderList 组件中的分账逻辑
- 移除 MchAppList 组件中的分账配置选项
- 更新 DevelopTradePay 组件，增加是否分账的开关
- 在 ChannelConstList 组件中添加支持分账的列
---
 .../allocation/group/AllocationGroupEdit.vue  |  7 ++++--
 .../allocation/group/AllocationGroupList.vue  |  2 +-
 .../receiver/AllocationReceiver.api.ts        |  2 ++
 .../receiver/AllocationReceiverEdit.vue       |  6 +++--
 .../receiver/AllocationReceiverList.vue       | 10 ++++----
 .../constant/channel/ChannelConstList.vue     |  6 +++++
 .../common/develop/trade/DevelopTradePay.vue  |  8 +++++++
 .../daxpay/common/merchant/app/MchAppList.vue |  6 ++---
 .../daxpay/common/order/pay/PayOrder.api.ts   |  4 ++--
 .../daxpay/common/order/pay/PayOrderList.vue  | 23 +++++++++----------
 10 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue b/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue
index 9ede7452..67343e23 100644
--- a/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue
+++ b/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue
@@ -67,7 +67,7 @@
 
 <script setup lang="ts">
   import useFormEdit from '@/hooks/bootx/useFormEdit'
-  import { computed, nextTick, ref } from 'vue'
+  import { computed, nextTick, ref, unref } from "vue";
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import { get, add, update, AllocGroup, existsByNo } from './AllocationGroup.api'
   import { FormEditType } from '@/enums/formTypeEnum'
@@ -114,7 +114,7 @@
     initFormEditType(editType)
     resetForm()
     initData()
-    form.value.appId = appId
+    form.value.appId = unref(appId)
     getInfo(record, editType)
   }
 
@@ -161,6 +161,9 @@
    */
   async function validateCode() {
     const { groupNo, appId } = form.value
+    if (!addable.value) {
+      return Promise.resolve()
+    }
     const res = await existsByNo(groupNo, appId)
     return res.data ? Promise.reject('该分账组编号已经存在') : Promise.resolve()
   }
diff --git a/src/views/daxpay/common/allocation/group/AllocationGroupList.vue b/src/views/daxpay/common/allocation/group/AllocationGroupList.vue
index 7d8d9aed..19aad6aa 100644
--- a/src/views/daxpay/common/allocation/group/AllocationGroupList.vue
+++ b/src/views/daxpay/common/allocation/group/AllocationGroupList.vue
@@ -184,7 +184,7 @@
    * 新建
    */
   function add() {
-    allocationGroupEdit.value.init(null, FormEditType.Add, appId)
+    allocationGroupEdit.value.init(null, FormEditType.Add, appId.value)
   }
 
   /**
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts b/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts
index 69b4ab82..835a964a 100644
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts
+++ b/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts
@@ -100,4 +100,6 @@ export interface AllocReceiver extends MchEntity {
   relationType?: string
   // 关系名称
   relationName?: string
+  // 请求时间
+  reqTime?: string
 }
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue b/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
index 90883895..98bf3d2a 100644
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
+++ b/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
@@ -107,7 +107,7 @@
 <script setup lang="ts">
   import useFormEdit from '@/hooks/bootx/useFormEdit'
   import { useMessage } from '@/hooks/web/useMessage'
-  import { computed, nextTick, ref } from 'vue'
+  import { computed, nextTick, ref, unref } from "vue";
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import {
     add,
@@ -124,6 +124,7 @@
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import { Icon } from '@/components/Icon'
   import OpenIdQrCode from './OpenIdQrCode.vue'
+  import XEUtils from 'xe-utils'
 
   const {
     initFormEditType,
@@ -177,7 +178,7 @@
   function init(record, editType: FormEditType, appId) {
     initFormEditType(editType)
     resetForm()
-    form.value.appId = appId
+    form.value.appId = unref(appId)
     initData()
     getInfo(record, editType)
   }
@@ -226,6 +227,7 @@
     formRef.value?.validate().then(async () => {
       confirmLoading.value = true
       try {
+        form.value.reqTime = XEUtils.toDateString(new Date(), 'yyyy-MM-dd HH:mm:ss')
         if (formEditType.value === FormEditType.Add) {
           await add(form.value)
         } else if (formEditType.value === FormEditType.Edit) {
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue b/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
index 30e261b3..4f053c44 100644
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
+++ b/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
@@ -41,7 +41,7 @@
             <a-link @click="show(row)">{{ row.receiverNo }}</a-link>
           </template>
         </vxe-column>
-        <vxe-column field="channel" title="所属通道" :min-width="120" align="center">
+        <vxe-column field="channel" title="所属通道" :min-width="150" align="center">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('channel', row.channel) }}</a-tag>
           </template>
@@ -75,7 +75,7 @@
         @page-change="handleTableChange"
       />
     </div>
-    <allocation-receiver-edit ref="allocationReceiverEdit" @ok="queryPage" />
+    <AllocationReceiverEdit ref="allocationReceiverEdit" @ok="queryPage" />
   </basic-drawer>
 </template>
 
@@ -127,21 +127,21 @@
         type: LIST,
         name: '分账通道',
         placeholder: '请选择分账通道',
-        selectList: payChannelList,
+        selectList: payChannelList.value,
       },
       {
         field: 'allocReceiverType',
         type: LIST,
         name: '接收方类型',
         placeholder: '请选择接收方类型',
-        selectList: receiverTypeList,
+        selectList: receiverTypeList.value,
       },
       {
         field: 'relationType',
         type: LIST,
         name: '分账关系',
         placeholder: '请选择分账关系',
-        selectList: relationTypeList,
+        selectList: relationTypeList.value,
       },
     ] as QueryField[]
   })
diff --git a/src/views/daxpay/common/constant/channel/ChannelConstList.vue b/src/views/daxpay/common/constant/channel/ChannelConstList.vue
index 14bc878a..1ae5a032 100644
--- a/src/views/daxpay/common/constant/channel/ChannelConstList.vue
+++ b/src/views/daxpay/common/constant/channel/ChannelConstList.vue
@@ -27,6 +27,12 @@
               <a-tag v-else color="red">停用</a-tag>
             </template>
           </vxe-column>
+          <vxe-column field="enable" title="支持分账">
+            <template #default="{ row }">
+              <a-tag v-if="row.enable" color="green">支持</a-tag>
+              <a-tag v-else color="red">不支持</a-tag>
+            </template>
+          </vxe-column>
           <vxe-column field="remark" title="备注" />
         </vxe-table>
       </div>
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
index 44ad905e..ca16f431 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
@@ -55,6 +55,13 @@
             placeholder="请选择支付方式"
           />
         </a-form-item>
+        <a-form-item label="是否分账" name="allocation">
+          <a-switch
+            checked-children="是"
+            un-checked-children="否"
+            v-model:checked="form.allocation"
+          />
+        </a-form-item>
         <a-form-item label="支付描述" name="description">
           <a-input v-model:value="form.description" placeholder="请输入支付描述" />
         </a-form-item>
@@ -150,6 +157,7 @@
       title: [{ required: true, message: '支付标题不可为空' }],
       amount: [{ required: true, message: '支付金额不可为空' }],
       method: [{ required: true, message: '支付方式不可为空' }],
+      allocation: [{ required: true, message: '分账不可为空' }],
       clientIp: [{ required: true, message: '终端IP不可为空' }],
       nonceStr: [{ required: true, message: '随机数不可为空' }],
       reqTime: [{ required: true, message: '请求时间不可为空' }],
diff --git a/src/views/daxpay/common/merchant/app/MchAppList.vue b/src/views/daxpay/common/merchant/app/MchAppList.vue
index 33532c42..3de9558b 100644
--- a/src/views/daxpay/common/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppList.vue
@@ -67,9 +67,9 @@
                     <a-menu-item>
                       <a-link @click="showCashierCode(row)">码牌配置</a-link>
                     </a-menu-item>
-                    <a-menu-item>
-                      <a-link @click="showAllocConfig(row)">分账配置</a-link>
-                    </a-menu-item>
+<!--                    <a-menu-item>-->
+<!--                      <a-link @click="showAllocConfig(row)">分账配置</a-link>-->
+<!--                    </a-menu-item>-->
                     <a-menu-item>
                       <a-link @click="showAllocReceiver(row)">分账接收方</a-link>
                     </a-menu-item>
diff --git a/src/views/daxpay/common/order/pay/PayOrder.api.ts b/src/views/daxpay/common/order/pay/PayOrder.api.ts
index 774a49f2..913b6b8e 100644
--- a/src/views/daxpay/common/order/pay/PayOrder.api.ts
+++ b/src/views/daxpay/common/order/pay/PayOrder.api.ts
@@ -70,10 +70,10 @@ export function cancel(id) {
 /**
  * 触发分账
  */
-export function allocByOrderNo(orderNo) {
+export function allocation(id) {
   return defHttp.post<Result<void>>({
     url: '/order/pay/allocation',
-    params: { orderNo },
+    params: { id },
   })
 }
 
diff --git a/src/views/daxpay/common/order/pay/PayOrderList.vue b/src/views/daxpay/common/order/pay/PayOrderList.vue
index af5cc7ba..57cd4d39 100644
--- a/src/views/daxpay/common/order/pay/PayOrderList.vue
+++ b/src/views/daxpay/common/order/pay/PayOrderList.vue
@@ -99,7 +99,7 @@
                         PayStatusEnum.SUCCESS === row.status
                       "
                     >
-                      <a-link @click="allocation(row)">分账</a-link>
+                      <a-link @click="allocationOrder(row)">分账</a-link>
                     </a-menu-item>
                     <a-menu-item
                       v-if="
@@ -135,9 +135,9 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, onMounted, ref, watch } from 'vue'
+  import { computed, onMounted, ref } from 'vue'
   import {
-    allocByOrderNo,
+    allocation,
     close,
     getTotalAmount,
     page,
@@ -340,29 +340,28 @@
       },
     })
   }
-  /**
-   * 退款
-   */
-  function refund(record) {
-    refundModel.value.init(record.id)
-  }
-
   /**
    * 触发分账
    */
-  function allocation(record) {
+  function allocationOrder(record) {
     createConfirm({
       iconType: 'warning',
       title: '警告',
       content: '是否触发该订单的分账操作',
       onOk: () => {
-        allocByOrderNo(record.orderNo).then(() => {
+        allocation(record.id).then(() => {
           createMessage.success('分账请求已发送')
           queryPage()
         })
       },
     })
   }
+  /**
+   * 退款
+   */
+  function refund(record) {
+    refundModel.value.init(record.id)
+  }
 </script>
 
 <style lang="less" scoped></style>
-- 
Gitee


From 38772bb86355b98b3f526b51cd0954adb6748634 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Mon, 25 Nov 2024 20:27:20 +0800
Subject: [PATCH 06/25] =?UTF-8?q?refactor(daxpay):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=A0=81=E7=89=8C=E9=85=8D=E7=BD=AE=E7=9B=B8=E5=85=B3=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-将 CashierCodeConfigEdit 组件中的 v-show 改为 v-if，提高渲染性能
- 移除 CashierCodeConfigList 和 CashierCodeTypeConfigList 组件中的 showFooter 属性
---
 .../daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue | 2 +-
 .../daxpay/common/config/cashier/code/CashierCodeConfigList.vue | 1 -
 .../common/config/cashier/code/CashierCodeTypeConfigList.vue    | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue b/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue
index 38473e36..34459b1e 100644
--- a/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue
+++ b/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue
@@ -20,7 +20,7 @@
       <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
-      <a-form-item label="码牌编码" name="code" v-show="form.code">
+      <a-form-item label="码牌编码" name="code" v-if="form.code">
         <a-input v-model:value="form.code" disabled />
       </a-form-item>
       <a-form-item label="码牌名称" name="name">
diff --git a/src/views/daxpay/common/config/cashier/code/CashierCodeConfigList.vue b/src/views/daxpay/common/config/cashier/code/CashierCodeConfigList.vue
index 7df6fc83..4c7213a7 100644
--- a/src/views/daxpay/common/config/cashier/code/CashierCodeConfigList.vue
+++ b/src/views/daxpay/common/config/cashier/code/CashierCodeConfigList.vue
@@ -1,6 +1,5 @@
 <template>
   <basic-drawer
-    showFooter
     v-bind="$attrs"
     width="70%"
     title="码牌配置"
diff --git a/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigList.vue b/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigList.vue
index 98f9f6c7..d3e301fc 100644
--- a/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigList.vue
+++ b/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigList.vue
@@ -1,6 +1,5 @@
 <template>
   <basic-drawer
-    showFooter
     v-bind="$attrs"
     width="70%"
     title="码牌类型配置"
-- 
Gitee


From 43efc2316b04e51c3be68dc21990ff20da11d7e9 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Thu, 28 Nov 2024 20:13:57 +0800
Subject: [PATCH 07/25] =?UTF-8?q?feat(config):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加收银台配置相关的 API 接口
- 实现收银台配置的编辑和列表展示功能
- 新增聚合支付配置、分组配置和配置项功能
- 优化码牌配置界面布局
---
 .../cashier/checkout/CheckoutConfig.api.vue   |  11 -
 .../cashier/code/CashierCodeConfigEdit.vue    |  62 ++--
 .../code/CashierCodeTypeConfigEdit.vue        |   1 +
 .../checkout/CheckoutAggregateConfigEdit.vue  | 211 +++++++++++++
 .../checkout/CheckoutAggregateConfigList.vue  | 126 ++++++++
 .../config/checkout/CheckoutConfig.api.ts     | 279 ++++++++++++++++++
 .../config/checkout/CheckoutConfigEdit.vue    | 111 +++++++
 .../config/checkout/CheckoutConfigModel.vue   |  57 ++++
 .../checkout/CheckoutGroupConfigEdit.vue      | 148 ++++++++++
 .../checkout/CheckoutGroupConfigList.vue      | 119 ++++++++
 .../checkout/CheckoutItemConfigEdit.vue       | 186 ++++++++++++
 .../checkout/CheckoutItemConfigList.vue       | 142 +++++++++
 .../daxpay/common/merchant/app/MchAppEdit.vue |   1 -
 .../daxpay/common/merchant/app/MchAppList.vue |  11 +-
 14 files changed, 1419 insertions(+), 46 deletions(-)
 delete mode 100644 src/views/daxpay/common/config/cashier/checkout/CheckoutConfig.api.vue
 create mode 100644 src/views/daxpay/common/config/checkout/CheckoutAggregateConfigEdit.vue
 create mode 100644 src/views/daxpay/common/config/checkout/CheckoutAggregateConfigList.vue
 create mode 100644 src/views/daxpay/common/config/checkout/CheckoutConfig.api.ts
 create mode 100644 src/views/daxpay/common/config/checkout/CheckoutConfigEdit.vue
 create mode 100644 src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue
 create mode 100644 src/views/daxpay/common/config/checkout/CheckoutGroupConfigEdit.vue
 create mode 100644 src/views/daxpay/common/config/checkout/CheckoutGroupConfigList.vue
 create mode 100644 src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue
 create mode 100644 src/views/daxpay/common/config/checkout/CheckoutItemConfigList.vue

diff --git a/src/views/daxpay/common/config/cashier/checkout/CheckoutConfig.api.vue b/src/views/daxpay/common/config/cashier/checkout/CheckoutConfig.api.vue
deleted file mode 100644
index 0a8d203d..00000000
--- a/src/views/daxpay/common/config/cashier/checkout/CheckoutConfig.api.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<script setup lang="ts">
-
-</script>
-
-<template>
-
-</template>
-
-<style scoped lang="less">
-
-</style>
diff --git a/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue b/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue
index 34459b1e..a781b694 100644
--- a/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue
+++ b/src/views/daxpay/common/config/cashier/code/CashierCodeConfigEdit.vue
@@ -8,36 +8,38 @@
     :mask-closable="showable"
     @cancel="handleCancel"
   >
-    <a-form
-      class="small-from-item"
-      ref="formRef"
-      :model="form"
-      :rules="rules"
-      :validate-trigger="['blur', 'change']"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
-    >
-      <a-form-item label="主键" name="id" :hidden="true">
-        <a-input v-model:value="form.id" :disabled="showable" />
-      </a-form-item>
-      <a-form-item label="码牌编码" name="code" v-if="form.code">
-        <a-input v-model:value="form.code" disabled />
-      </a-form-item>
-      <a-form-item label="码牌名称" name="name">
-        <a-input v-model:value="form.name" :disabled="showable" placeholder="请输入码牌名称" />
-      </a-form-item>
-      <a-form-item label="是否启用" name="enable">
-        <a-switch
-          checked-children="启用"
-          un-checked-children="停用"
-          v-model:checked="form.enable"
-          :disabled="showable"
-        />
-      </a-form-item>
-      <a-form-item label="备注" name="remark">
-        <a-textarea v-model:value="form.remark" :disabled="showable" placeholder="请输入备注" />
-      </a-form-item>
-    </a-form>
+    <a-spin :spinning="confirmLoading">
+      <a-form
+        class="small-from-item"
+        ref="formRef"
+        :model="form"
+        :rules="rules"
+        :validate-trigger="['blur', 'change']"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-item label="主键" name="id" :hidden="true">
+          <a-input v-model:value="form.id" :disabled="showable" />
+        </a-form-item>
+        <a-form-item label="码牌编码" name="code" v-if="form.code">
+          <a-input v-model:value="form.code" disabled />
+        </a-form-item>
+        <a-form-item label="码牌名称" name="name">
+          <a-input v-model:value="form.name" :disabled="showable" placeholder="请输入码牌名称" />
+        </a-form-item>
+        <a-form-item label="是否启用" name="enable">
+          <a-switch
+            checked-children="启用"
+            un-checked-children="停用"
+            v-model:checked="form.enable"
+            :disabled="showable"
+          />
+        </a-form-item>
+        <a-form-item label="备注" name="remark">
+          <a-textarea v-model:value="form.remark" :disabled="showable" placeholder="请输入备注" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
     <template #footer>
       <a-space>
         <a-button key="cancel" @click="handleCancel">取消</a-button>
diff --git a/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigEdit.vue b/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigEdit.vue
index b31bf4a9..5f496e5f 100644
--- a/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigEdit.vue
+++ b/src/views/daxpay/common/config/cashier/code/CashierCodeTypeConfigEdit.vue
@@ -157,6 +157,7 @@
     form.value.cashierCodeId = unref(configId)
     getInfo(id, editType)
   }
+
   /**
    * 获取信息
    */
diff --git a/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigEdit.vue b/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigEdit.vue
new file mode 100644
index 00000000..b1d29951
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigEdit.vue
@@ -0,0 +1,211 @@
+<template>
+  <basic-modal
+    title="聚合支付配置"
+    v-bind="$attrs"
+    :loading="confirmLoading"
+    :width="750"
+    :open="visible"
+    :mask-closable="showable"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form
+        class="small-from-item"
+        ref="formRef"
+        :model="form"
+        :rules="rules"
+        :validate-trigger="['blur', 'change']"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-item label="主键" name="id" :hidden="true">
+          <a-input v-model:value="form.id" :disabled="showable" />
+        </a-form-item>
+        <a-form-item label="聚合支付类型" validate-first name="type">
+          <a-select
+            style="width: 300px"
+            v-model:value="form.type"
+            :disabled="showable"
+            :options="aggregateTypeList"
+            allow-clear
+            placeholder="请选择聚合支付类型"
+          />
+        </a-form-item>
+        <a-form-item label="支付通道" name="channel">
+          <a-select
+            style="width: 300px"
+            v-model:value="form.channel"
+            :disabled="showable"
+            :options="channelList"
+            allow-clear
+            placeholder="请选择支付通道"
+          />
+        </a-form-item>
+        <a-form-item label="支付方式" name="payMethod">
+          <a-select
+            style="width: 300px"
+            v-model:value="form.payMethod"
+            :disabled="showable"
+            :options="methodList"
+            allow-clear
+            placeholder="请选择支付方式"
+          />
+        </a-form-item>
+        <a-form-item label="自动拉起支付" name="allocation">
+          <a-switch
+            checked-children="是"
+            un-checked-children="否"
+            v-model:checked="form.autoLaunch"
+            :disabled="showable"
+          />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+    <template #footer>
+      <a-space>
+        <a-button key="cancel" @click="handleCancel">取消</a-button>
+        <a-button
+          v-if="!showable"
+          key="forward"
+          :loading="confirmLoading"
+          type="primary"
+          @click="handleOk"
+          >保存</a-button
+        >
+      </a-space>
+    </template>
+  </basic-modal>
+</template>
+
+<script setup lang="ts">
+  import { BasicModal } from '@/components/Modal'
+  import useFormEdit from '@/hooks/bootx/useFormEdit'
+  import { FormEditType } from '@/enums/formTypeEnum'
+  import {
+    saveAggregateConfig,
+    updateAggregateConfig,
+    CheckoutAggregateConfig,
+    getAggregateConfig,
+    existsAggregateConfig,
+    existsAggregateConfigNotId,
+  } from './CheckoutConfig.api'
+  import { nextTick, ref, unref } from 'vue'
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+  import { LabeledValue } from 'ant-design-vue/lib/select'
+  import { useDict } from '@/hooks/bootx/useDict'
+
+  const props = defineProps({
+    appId: String,
+  })
+
+  const { dictDropDown } = useDict()
+
+  const {
+    handleCancel,
+    initFormEditType,
+    formEditType,
+    confirmLoading,
+    visible,
+    showable,
+    labelCol,
+    wrapperCol,
+  } = useFormEdit()
+
+  const aggregateTypeList = ref<LabeledValue[]>([])
+  const channelList = ref<LabeledValue[]>([])
+  const methodList = ref<LabeledValue[]>([])
+
+  const formRef = ref<FormInstance>()
+
+  let form = ref<CheckoutAggregateConfig>({
+    autoLaunch: true,
+  })
+  // 校验
+  const rules = {
+    type: [
+      { required: true, message: '请选择聚合支付类型' },
+      { validator: validateCode, trigger: 'blur' },
+    ],
+    channel: [{ required: true, message: '请选择支付通道类型' }],
+    payMethod: [{ required: true, message: '请选择支付方式' }],
+    autoLaunch: [{ required: true, message: '' }],
+  } as Record<string, Rule[]>
+
+  // 事件
+  const emits = defineEmits(['ok'])
+
+  /**
+   * 入口
+   */
+  function init(id, editType: FormEditType) {
+    initFormEditType(editType)
+    resetForm()
+    getInfo(id, editType)
+    form.value.appId = props.appId
+    initData()
+  }
+
+  /**
+   * 初始化数据
+   */
+  async function initData() {
+    aggregateTypeList.value = await dictDropDown('checkout_aggregate')
+    channelList.value = await dictDropDown('channel')
+    methodList.value = await dictDropDown('pay_method')
+  }
+
+  /**
+   * 获取信息
+   */
+  function getInfo(id, editType: FormEditType) {
+    if ([FormEditType.Edit, FormEditType.Show].includes(editType)) {
+      confirmLoading.value = true
+      getAggregateConfig(id).then(({ data }) => {
+        form.value = data
+        confirmLoading.value = false
+      })
+    } else {
+      confirmLoading.value = false
+    }
+  }
+
+  /**
+   * 保存
+   */
+  function handleOk() {
+    formRef.value?.validate().then(async () => {
+      confirmLoading.value = true
+      if (formEditType.value === FormEditType.Add) {
+        await saveAggregateConfig(unref(form)).finally(() => (confirmLoading.value = false))
+      } else if (formEditType.value === FormEditType.Edit) {
+        await updateAggregateConfig(unref(form)).finally(() => (confirmLoading.value = false))
+      }
+      handleCancel()
+      emits('ok')
+    })
+  }
+
+  /**
+   * 校验编码重复
+   */
+  async function validateCode() {
+    const { appId, type, id } = form.value
+    if (id) {
+      const res = await existsAggregateConfigNotId(appId, type, id)
+      return res.data ? Promise.reject('该聚合支付类型已存在') : Promise.resolve()
+    } else {
+      const res = await existsAggregateConfig(appId, type)
+      return res.data ? Promise.reject('该聚合支付类型已存在') : Promise.resolve()
+    }
+  }
+
+  // 重置表单的校验
+  function resetForm() {
+    nextTick(() => {
+      formRef.value?.resetFields()
+    })
+  }
+  defineExpose({ init })
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigList.vue b/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigList.vue
new file mode 100644
index 00000000..d086ed62
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutAggregateConfigList.vue
@@ -0,0 +1,126 @@
+<template>
+  <div>
+    <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
+      <template #buttons>
+        <a-space>
+          <a-button type="primary" pre-icon="ant-design:plus-outlined" @click="add">新建</a-button>
+        </a-space>
+      </template>
+    </vxe-toolbar>
+    <vxe-table ey-field="id" ref="xTable" :data="records" :loading="loading">
+      <vxe-column type="seq" width="60" />
+
+      <vxe-column field="type" title="类型" :min-width="150">
+        <template #default="{ row }">
+          <a href="javascript:" @click="show(row)">{{
+            dictConvert('checkout_aggregate', row.type)
+          }}</a>
+        </template>
+      </vxe-column>
+      <vxe-column field="channel" title="支付通道" :min-width="150">
+        <template #default="{ row }">
+          {{ dictConvert('channel', row.channel) }}
+        </template>
+      </vxe-column>
+      <vxe-column field="payMethod" title="支付方式" :min-width="150">
+        <template #default="{ row }">
+          {{ dictConvert('pay_method', row.payMethod) }}
+        </template>
+      </vxe-column>
+      <vxe-column field="autoLaunch" title="自动拉起支付" :min-width="150">
+        <template #default="{ row }">
+          <a-tag color="green" v-if="row.autoLaunch">是</a-tag>
+          <a-tag color="red" v-else>否</a-tag>
+        </template>
+      </vxe-column>
+      <vxe-column field="createTime" title="创建时间" :min-width="170" />
+      <vxe-column fixed="right" :width="180" :showOverflow="false" title="操作">
+        <template #default="{ row }">
+          <a href="javascript:" @click="edit(row)">编辑</a>
+          <a-divider type="vertical" />
+          <a href="javascript:" style="color: red" @click="del(row)">删除</a>
+        </template>
+      </vxe-column>
+    </vxe-table>
+    <CheckoutAggregateConfigEdit ref="checkoutAggregateConfigEdit" :appId="appId" @ok="queryPage" />
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { onMounted, ref } from 'vue'
+  import {
+    CheckoutAggregateConfig,
+    delAggregateConfig,
+    getAggregateConfigs,
+  } from './CheckoutConfig.api'
+  import { useMessage } from '@/hooks/web/useMessage'
+  import CheckoutAggregateConfigEdit from './CheckoutAggregateConfigEdit.vue'
+  import { FormEditType } from '@/enums/formTypeEnum'
+  import { useDict } from '@/hooks/bootx/useDict'
+
+  const { createMessage, createConfirm } = useMessage()
+  const { dictConvert } = useDict()
+
+  const loading = ref(false)
+  const records = ref<CheckoutAggregateConfig[]>([])
+
+  const checkoutAggregateConfigEdit = ref<any>()
+
+  const props = defineProps({
+    appId: String,
+    type: String,
+  })
+
+  onMounted(() => queryPage())
+
+  /**
+   * 查询列表
+   */
+  function queryPage() {
+    loading.value = true
+    getAggregateConfigs(props.appId).then(({ data }) => {
+      records.value = data
+      loading.value = false
+    })
+  }
+
+  /**
+   * 新增
+   */
+  function add() {
+    checkoutAggregateConfigEdit.value.init(null, FormEditType.Add)
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    checkoutAggregateConfigEdit.value.init(record.id, FormEditType.Edit)
+  }
+  /**
+   * 查看
+   */
+  function show(record) {
+    checkoutAggregateConfigEdit.value.init(record.id, FormEditType.Show)
+  }
+
+  /**
+   * 删除
+   */
+  function del(record) {
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '是否删除该数据',
+      onOk: () => {
+        loading.value = true
+        delAggregateConfig(record.id).then(() => {
+          createMessage.success('删除成功')
+          queryPage()
+        })
+      },
+    })
+  }
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/config/checkout/CheckoutConfig.api.ts b/src/views/daxpay/common/config/checkout/CheckoutConfig.api.ts
new file mode 100644
index 00000000..ec0690d1
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutConfig.api.ts
@@ -0,0 +1,279 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+
+/**
+ * 获取收银台配置
+ */
+export function getConfig(appId) {
+  return defHttp.get<Result<CheckoutConfig>>({
+    url: '/checkout/config/get',
+    params: {
+      appId,
+    },
+  })
+}
+
+/**
+ * 保存收银台配置
+ */
+export function saveConfig(data: CheckoutConfig) {
+  return defHttp.post<Result<CheckoutConfig>>({
+    url: '/checkout/config/save',
+    data,
+  })
+}
+
+/**
+ * 更新收银台配置
+ */
+export function updateConfig(data: CheckoutConfig) {
+  return defHttp.post<Result<CheckoutConfig>>({
+    url: '/checkout/config/update',
+    data,
+  })
+}
+
+/**
+ * 获取分组配置列表
+ */
+export function getGroupConfigs(appId, checkoutType) {
+  return defHttp.get<Result<CheckoutGroupConfig[]>>({
+    url: '/checkout/config/group/list',
+    params: {
+      appId,
+      checkoutType,
+    },
+  })
+}
+
+/**
+ * 获取分组配置列表
+ */
+export function getGroupConfig(id) {
+  return defHttp.get<Result<CheckoutGroupConfig>>({
+    url: '/checkout/config/group/get',
+    params: { id },
+  })
+}
+
+/**
+ * 保存分组配置
+ */
+export function saveGroupConfig(data: CheckoutGroupConfig) {
+  return defHttp.post<Result<CheckoutGroupConfig>>({
+    url: '/checkout/config/group/save',
+    data,
+  })
+}
+
+/**
+ * 更新分组配置
+ */
+export function updateGroupConfig(data: CheckoutGroupConfig) {
+  return defHttp.post<Result<CheckoutGroupConfig>>({
+    url: '/checkout/config/group/update',
+    data,
+  })
+}
+
+/**
+ * 删除分组配置
+ */
+export function delGroupConfig(id) {
+  return defHttp.post({
+    url: '/checkout/config/group/delete',
+    params: { id },
+  })
+}
+
+/**
+ * 获取配置项配置
+ */
+export function getItemConfigs(groupId) {
+  return defHttp.get<Result<CheckoutItemConfig[]>>({
+    url: '/checkout/config/item/list',
+    params: {
+      groupId,
+    },
+  })
+}
+/**
+ * 获取配置项配置
+ */
+export function getItemConfig(id) {
+  return defHttp.get<Result<CheckoutItemConfig>>({
+    url: '/checkout/config/item/get',
+    params: {
+      id,
+    },
+  })
+}
+
+/**
+ * 保存配置项配置
+ */
+export function saveItemConfig(data: CheckoutItemConfig) {
+  return defHttp.post<Result<CheckoutItemConfig>>({
+    url: '/checkout/config/item/save',
+    data,
+  })
+}
+
+/**
+ * 更新配置项配置
+ */
+export function updateItemConfig(data: CheckoutItemConfig) {
+  return defHttp.post<Result<CheckoutItemConfig>>({
+    url: '/checkout/config/item/update',
+    data,
+  })
+}
+
+/**
+ * 删除配置项配置
+ */
+export function delItemConfig(id) {
+  return defHttp.post({
+    url: '/checkout/config/item/delete',
+    params: { id },
+  })
+}
+
+/**
+ * 获取聚合支付配置
+ */
+export function getAggregateConfigs(appId) {
+  return defHttp.get<Result<CheckoutAggregateConfig[]>>({
+    url: '/checkout/config/aggregate/list',
+    params: {
+      appId,
+    },
+  })
+}
+
+/**
+ * 获取聚合支付配置
+ */
+export function getAggregateConfig(id) {
+  return defHttp.get<Result<CheckoutAggregateConfig>>({
+    url: '/checkout/config/aggregate/get',
+    params: {
+      id,
+    },
+  })
+}
+
+/**
+ * 聚合支付配置是否存在
+ */
+export function existsAggregateConfig(appId, type) {
+  return defHttp.get<Result<boolean>>({
+    url: '/checkout/config/aggregate/exists',
+    params: {
+      appId,
+      type
+    },
+  })
+}
+
+/**
+ * 聚合支付配置是否存在(不包含自身)
+ */
+export function existsAggregateConfigNotId(appId, type, id) {
+  return defHttp.get<Result<boolean>>({
+    url: '/checkout/config/aggregate/existsNotId',
+    params: {
+      appId,
+      type,
+      id,
+    },
+  })
+}
+
+/**
+ * 保存聚合支付配置
+ */
+export function saveAggregateConfig(data: CheckoutAggregateConfig) {
+  return defHttp.post<Result<CheckoutAggregateConfig>>({
+    url: '/checkout/config/aggregate/save',
+    data,
+  })
+}
+
+/**
+ * 更新聚合支付配置
+ */
+export function updateAggregateConfig(data: CheckoutAggregateConfig) {
+  return defHttp.post<Result<CheckoutAggregateConfig>>({
+    url: '/checkout/config/aggregate/update',
+    data,
+  })
+}
+
+/**
+ * 删除聚合支付配置
+ */
+export function delAggregateConfig(id) {
+  return defHttp.post({
+    url: '/checkout/config/aggregate/delete',
+    params: { id },
+  })
+}
+
+/**
+ * 收银台配置
+ */
+export interface CheckoutConfig extends MchEntity {
+  /** 收银台名称 */
+  name?: string
+  /** PC收银台是否同时显示聚合收银码 */
+  aggregateShow?: boolean
+  /** h5收银台自动升级聚合支付 */
+  h5AutoUpgrade?: boolean
+}
+/**
+ * 收银台类目配置
+ */
+export interface CheckoutGroupConfig extends MchEntity {
+  /** 类型 web/h5/小程序 */
+  type?: string
+  /** 名称 */
+  name?: string
+  /** 图标 */
+  icon?: string
+  /** 排序 */
+  sortNo?: number
+}
+/**
+ * 收银台配置项
+ */
+export interface CheckoutItemConfig extends MchEntity {
+  /** 类目配置Id */
+  groupId?: string
+  /** 名称 */
+  name?: string
+  /** 图标 */
+  icon?: string
+  /** 排序 */
+  sortNo?: number
+  /** 发起调用的类型 */
+  callType?: string
+  /** 支付通道 */
+  channel?: string
+  /** 支付方式 */
+  payMethod?: string
+}
+/**
+ * 收银台聚合扫码支付配置
+ */
+export interface CheckoutAggregateConfig extends MchEntity {
+  /** 支付类型 */
+  type?: string
+  /** 通道 */
+  channel?: string
+  /** 支付方式 */
+  payMethod?: string
+  /** 自动拉起支付 */
+  autoLaunch?: boolean
+}
diff --git a/src/views/daxpay/common/config/checkout/CheckoutConfigEdit.vue b/src/views/daxpay/common/config/checkout/CheckoutConfigEdit.vue
new file mode 100644
index 00000000..a9dba1de
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutConfigEdit.vue
@@ -0,0 +1,111 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form
+      class="small-from-item"
+      :model="form"
+      ref="formRef"
+      :validate-trigger="['blur', 'change']"
+      :rules="rules"
+      :label-col="labelCol"
+      :wrapper-col="wrapperCol"
+    >
+      <a-form-item label="主键" name="id" :hidden="true">
+        <a-input v-model:value="form.id" :disabled="showable" />
+      </a-form-item>
+      <a-form-item label="收银台名称" name="name">
+        <a-input v-model:value="form.name" :disabled="!edit" placeholder="请输入收银台名称" />
+      </a-form-item>
+      <a-form-item label="同时显示聚合收银码" name="aggregateShow">
+        <a-radio-group v-model:value="form.aggregateShow" :disabled="!edit" button-style="solid">
+          <a-radio-button :value="false">不显示</a-radio-button>
+          <a-radio-button :value="true">显示</a-radio-button>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item label="H5收银台自动升级聚合支付" name="h5AutoUpgrade">
+        <a-radio-group v-model:value="form.h5AutoUpgrade" :disabled="!edit" button-style="solid">
+          <a-radio-button :value="false">不升级</a-radio-button>
+          <a-radio-button :value="true">升级</a-radio-button>
+        </a-radio-group>
+      </a-form-item>
+    </a-form>
+    <a-space :size="55" class="flex justify-center">
+      <a-button v-if="edit" @click="initData">取消</a-button>
+      <a-button v-if="edit" type="primary" @click="update">{{
+        form.id ? '更新' : '保存'
+      }}</a-button>
+      <a-button v-if="!edit" @click="edit = true">编辑信息</a-button>
+    </a-space>
+  </a-spin>
+</template>
+
+<script setup lang="ts">
+  import useFormEdit from '@/hooks/bootx/useFormEdit'
+  import { onMounted, ref } from 'vue'
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+  import { CheckoutConfig, getConfig, saveConfig, updateConfig } from './CheckoutConfig.api'
+  import { useMessage } from '@/hooks/web/useMessage'
+
+  const { labelCol, wrapperCol, confirmLoading, showable } = useFormEdit()
+  const { createMessage } = useMessage()
+
+  const edit = ref<boolean>(false)
+
+  const props = defineProps({
+    appId: String,
+  })
+
+  onMounted(() => {
+    initData()
+  })
+  // 表单
+  const formRef = ref<FormInstance>()
+  const form = ref<CheckoutConfig>({
+    aggregateShow: false,
+    h5AutoUpgrade: false,
+  })
+
+  const rules = {
+    name: [{ required: true, message: '请输入收银台名称' }],
+    aggregateShow: [{ required: true, message: '' }],
+    h5AutoUpgrade: [{ required: true, message: '' }],
+  } as Record<string, Rule[]>
+
+  /**
+   * 重置信息
+   */
+  function initData() {
+    confirmLoading.value = true
+    edit.value = false
+    getConfig(props.appId).then(({ data }) => {
+      form.value = data
+      confirmLoading.value = false
+      form.value.appId = props.appId
+    })
+  }
+
+  /**
+   * 更新配置
+   */
+  function update() {
+    formRef.value?.validate().then(async () => {
+      confirmLoading.value = true
+      if (form.value.id) {
+        updateConfig(form.value)
+          .then(() => {
+            edit.value = false
+            createMessage.success('更新成功')
+          })
+          .finally(() => (confirmLoading.value = false))
+      } else {
+        saveConfig(form.value)
+          .then(() => {
+            createMessage.success('保存成功')
+            initData()
+          })
+          .finally(() => (confirmLoading.value = false))
+      }
+    })
+  }
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue b/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue
new file mode 100644
index 00000000..5c72d925
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue
@@ -0,0 +1,57 @@
+<template>
+  <basic-drawer
+    destroyOnClose
+    v-bind="$attrs"
+    width="60%"
+    title="码牌配置"
+    :mask-closable="true"
+    :open="visible"
+    @close="handleCancel"
+  >
+    <a-tabs v-model:activeKey="activeKey" type="card">
+      <a-tab-pane :key="1" tab="公共配置">
+        <checkout-config-edit :appId="currentAppId" />
+      </a-tab-pane>
+      <a-tab-pane :key="2" tab="PC收银配置">
+        <checkout-group-config-list :appId="currentAppId" type="pc" />
+      </a-tab-pane>
+      <a-tab-pane :key="3" tab="H5收银配置">
+        <checkout-group-config-list :appId="currentAppId" type="h5" />
+      </a-tab-pane>
+      <a-tab-pane :key="4" tab="聚合支付配置">
+        <checkout-aggregate-config-list :appId="currentAppId" />
+      </a-tab-pane>
+    </a-tabs>
+  </basic-drawer>
+</template>
+<script setup lang="ts">
+  import { BasicDrawer } from '@/components/Drawer'
+  import { ref } from 'vue'
+  import CheckoutConfigEdit from './CheckoutConfigEdit.vue'
+  import CheckoutGroupConfigList from './CheckoutGroupConfigList.vue'
+  import CheckoutAggregateConfigList from './CheckoutAggregateConfigList.vue'
+
+  const visible = ref(false)
+  const activeKey = ref(1)
+  const currentAppId = ref('')
+
+  /**
+   * 入口
+   */
+  function init(appId: string) {
+    visible.value = true
+    activeKey.value = 1
+    currentAppId.value = appId
+  }
+
+  /**
+   * 关闭页面
+   */
+  function handleCancel() {
+    visible.value = false
+  }
+
+  defineExpose({ init })
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/config/checkout/CheckoutGroupConfigEdit.vue b/src/views/daxpay/common/config/checkout/CheckoutGroupConfigEdit.vue
new file mode 100644
index 00000000..5f86497b
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutGroupConfigEdit.vue
@@ -0,0 +1,148 @@
+<template>
+  <basic-modal
+    title="收银台分组配置"
+    v-bind="$attrs"
+    :loading="confirmLoading"
+    :width="750"
+    :open="visible"
+    :mask-closable="showable"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form
+        class="small-from-item"
+        ref="formRef"
+        :model="form"
+        :rules="rules"
+        :validate-trigger="['blur', 'change']"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-item label="主键" name="id" :hidden="true">
+          <a-input v-model:value="form.id" :disabled="showable" />
+        </a-form-item>
+        <a-form-item label="分类名称" name="name">
+          <a-input
+            v-model:value="form.name"
+            :disabled="showable"
+            placeholder="请输入分类配置名称"
+          />
+        </a-form-item>
+        <a-form-item label="排序" name="sort">
+          <a-input-number
+            v-model:value="form.sortNo"
+            :disabled="showable"
+            placeholder="请输入排序"
+          />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+    <template #footer>
+      <a-space>
+        <a-button key="cancel" @click="handleCancel">取消</a-button>
+        <a-button
+          v-if="!showable"
+          key="forward"
+          :loading="confirmLoading"
+          type="primary"
+          @click="handleOk"
+          >保存</a-button
+        >
+      </a-space>
+    </template>
+  </basic-modal>
+</template>
+
+<script setup lang="ts">
+  import { BasicModal } from '@/components/Modal'
+  import useFormEdit from '@/hooks/bootx/useFormEdit'
+  import { FormEditType } from '@/enums/formTypeEnum'
+  import {
+    saveGroupConfig,
+    updateGroupConfig,
+    CheckoutGroupConfig,
+    getGroupConfig,
+  } from './CheckoutConfig.api'
+  import { nextTick, ref, unref } from 'vue'
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+
+  const props = defineProps({
+    appId: String,
+    type: String,
+  })
+
+  const {
+    handleCancel,
+    initFormEditType,
+    formEditType,
+    confirmLoading,
+    visible,
+    showable,
+    labelCol,
+    wrapperCol,
+  } = useFormEdit()
+
+  const formRef = ref<FormInstance>()
+
+  let form = ref<CheckoutGroupConfig>({
+    sortNo: 0,
+  })
+  // 校验
+  const rules = {
+    code: [{ required: true, message: '' }],
+    name: [{ required: true, message: '请输入码牌名称' }],
+    enable: [{ required: true, message: '是否启用' }],
+  } as Record<string, Rule[]>
+
+  // 事件
+  const emits = defineEmits(['ok'])
+
+  /**
+   * 入口
+   */
+  function init(id, editType: FormEditType) {
+    initFormEditType(editType)
+    resetForm()
+    getInfo(id, editType)
+  }
+
+  // 获取信息
+  function getInfo(id, editType: FormEditType) {
+    if ([FormEditType.Edit, FormEditType.Show].includes(editType)) {
+      confirmLoading.value = true
+      getGroupConfig(id).then(({ data }) => {
+        form.value = data
+        confirmLoading.value = false
+      })
+    } else {
+      confirmLoading.value = false
+    }
+  }
+
+  /**
+   * 保存
+   */
+  function handleOk() {
+    formRef.value?.validate().then(async () => {
+      confirmLoading.value = true
+      form.value.appId = props.appId
+      form.value.type = props.type
+      if (formEditType.value === FormEditType.Add) {
+        await saveGroupConfig(unref(form)).finally(() => (confirmLoading.value = false))
+      } else if (formEditType.value === FormEditType.Edit) {
+        await updateGroupConfig(unref(form)).finally(() => (confirmLoading.value = false))
+      }
+      handleCancel()
+      emits('ok')
+    })
+  }
+  // 重置表单的校验
+  function resetForm() {
+    nextTick(() => {
+      formRef.value?.resetFields()
+    })
+  }
+  defineExpose({ init })
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/config/checkout/CheckoutGroupConfigList.vue b/src/views/daxpay/common/config/checkout/CheckoutGroupConfigList.vue
new file mode 100644
index 00000000..a999f872
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutGroupConfigList.vue
@@ -0,0 +1,119 @@
+<template>
+  <div>
+    <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
+      <template #buttons>
+        <a-space>
+          <a-button type="primary" pre-icon="ant-design:plus-outlined" @click="add">新建</a-button>
+        </a-space>
+      </template>
+    </vxe-toolbar>
+    <vxe-table ey-field="id" ref="xTable" :data="records" :loading="loading">
+      <vxe-column type="seq" width="60" />
+
+      <vxe-column field="name" title="分组名称" :min-width="150">
+        <template #default="{ row }">
+          <a href="javascript:" @click="show(row)">{{ row.name }}</a>
+        </template>
+      </vxe-column>
+      <vxe-column field="sortNo" title="排序" :min-width="150" />
+      <vxe-column field="createTime" title="创建时间" :min-width="170" />
+      <vxe-column fixed="right" :width="180" :showOverflow="false" title="操作">
+        <template #default="{ row }">
+          <a href="javascript:" @click="edit(row)">编辑</a>
+          <a-divider type="vertical" />
+          <a href="javascript:" @click="list(row)">配置项</a>
+          <a-divider type="vertical" />
+          <a href="javascript:" style="color: red" @click="del(row)">删除</a>
+        </template>
+      </vxe-column>
+    </vxe-table>
+    <CheckoutItemConfigList ref="checkoutItemConfigList" :appId="appId" :type="type" />
+    <CheckoutGroupConfigEdit
+      ref="checkoutGroupConfigEdit"
+      :appId="appId"
+      :type="type"
+      @ok="queryPage"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+  import { onMounted, ref } from 'vue'
+  import { CheckoutGroupConfig, delGroupConfig, getGroupConfigs } from './CheckoutConfig.api'
+  import { useMessage } from '@/hooks/web/useMessage'
+  import CheckoutItemConfigList from './CheckoutItemConfigList.vue'
+  import CheckoutGroupConfigEdit from '@/views/daxpay/common/config/checkout/CheckoutGroupConfigEdit.vue'
+  import { FormEditType } from '@/enums/formTypeEnum'
+
+  const { createMessage, createConfirm } = useMessage()
+
+  const loading = ref(false)
+  const records = ref<CheckoutGroupConfig[]>([])
+
+  const checkoutItemConfigList = ref<any>()
+  const checkoutGroupConfigEdit = ref<any>()
+
+  const props = defineProps({
+    appId: String,
+    type: String,
+  })
+
+  onMounted(() => queryPage())
+
+  /**
+   * 查询列表
+   */
+  function queryPage() {
+    loading.value = true
+    getGroupConfigs(props.appId, props.type).then(({ data }) => {
+      records.value = data
+      loading.value = false
+    })
+  }
+
+  /**
+   * 新增
+   */
+  function add() {
+    checkoutGroupConfigEdit.value.init(null, FormEditType.Add)
+  }
+
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    checkoutGroupConfigEdit.value.init(record.id, FormEditType.Edit)
+  }
+  /**
+   * 查看
+   */
+  function show(record) {
+    checkoutGroupConfigEdit.value.init(record.id, FormEditType.Show)
+  }
+  /**
+   * 配置项列表
+   */
+  function list(record) {
+    checkoutItemConfigList.value.init(record.id)
+  }
+
+  /**
+   * 删除
+   */
+  function del(record) {
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '是否删除该数据',
+      onOk: () => {
+        loading.value = true
+        delGroupConfig(record.id).then(() => {
+          createMessage.success('删除成功')
+          queryPage()
+        })
+      },
+    })
+  }
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue b/src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue
new file mode 100644
index 00000000..2bd6bc91
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue
@@ -0,0 +1,186 @@
+<template>
+  <basic-modal
+    v-bind="$attrs"
+    :loading="confirmLoading"
+    :width="modalWidth"
+    :title="title"
+    :open="visible"
+    :mask-closable="showable"
+    @cancel="handleCancel"
+  >
+    <a-form
+      class="small-from-item"
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :validate-trigger="['blur', 'change']"
+      :label-col="labelCol"
+      :wrapper-col="wrapperCol"
+    >
+      <a-form-item label="主键" name="id" :hidden="true">
+        <a-input v-model:value="form.id" :disabled="showable" />
+      </a-form-item>
+      <a-form-item label="名称" name="name">
+        <a-input v-model:value="form.name" :disabled="showable" placeholder="请输入配置项名称" />
+      </a-form-item>
+      <a-form-item label="调用方式" validate-first name="callType">
+        <a-select
+          v-model:value="form.callType"
+          :disabled="showable"
+          :options="callTypeTypeList"
+          allow-clear
+          placeholder="请选择收银台类型"
+        />
+      </a-form-item>
+      <a-form-item label="支付通道" name="channel">
+        <a-select
+          v-model:value="form.channel"
+          :disabled="showable"
+          :options="channelList"
+          allow-clear
+          placeholder="请选择支付通道"
+        />
+      </a-form-item>
+      <a-form-item label="支付方式" name="payMethod">
+        <a-select
+          v-model:value="form.payMethod"
+          :disabled="showable"
+          :options="methodList"
+          allow-clear
+          placeholder="请选择支付方式"
+        />
+      </a-form-item>
+      <a-form-item label="排序" name="sort">
+        <a-input-number v-model:value="form.sortNo" :disabled="showable" placeholder="请输入排序" />
+      </a-form-item>
+    </a-form>
+    <template #footer>
+      <a-space>
+        <a-button key="cancel" @click="handleCancel">取消</a-button>
+        <a-button
+          v-if="!showable"
+          key="forward"
+          :loading="confirmLoading"
+          type="primary"
+          @click="handleOk"
+          >保存</a-button
+        >
+      </a-space>
+    </template>
+  </basic-modal>
+</template>
+
+<script lang="ts" setup>
+  import { nextTick, onMounted, reactive, ref, unref } from 'vue'
+  import useFormEdit from '@/hooks/bootx/useFormEdit'
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+  import { FormEditType } from '@/enums/formTypeEnum'
+  import { BasicModal } from '@/components/Modal'
+  import { LabeledValue } from 'ant-design-vue/lib/select'
+  import {
+    getItemConfig,
+    saveItemConfig,
+    updateItemConfig,
+    CheckoutItemConfig,
+  } from './CheckoutConfig.api'
+  import { useDict } from '@/hooks/bootx/useDict'
+
+  const {
+    initFormEditType,
+    handleCancel,
+    labelCol,
+    wrapperCol,
+    modalWidth,
+    title,
+    confirmLoading,
+    visible,
+    showable,
+    formEditType,
+  } = useFormEdit()
+
+  const { dictDropDown } = useDict()
+
+  // 表单
+  const formRef = ref<FormInstance>()
+
+  const callTypeTypeList = ref<LabeledValue[]>([])
+  const channelList = ref<LabeledValue[]>([])
+  const methodList = ref<LabeledValue[]>([])
+
+  let form = ref<CheckoutItemConfig>({})
+  // 校验
+  const rules = reactive({
+    name: [{ required: true, message: '请输入配置项名称' }],
+    callType: [{ required: true, message: '请选择支付通道' }],
+    channel: [{ required: true, message: '请选择支付通道' }],
+    payMethod: [{ required: true, message: '请选择支付方式' }],
+  } as Record<string, Rule[]>)
+
+  // 事件
+  const emits = defineEmits(['ok'])
+
+  onMounted(() => {
+    initData()
+  })
+
+  /**
+   * 初始化数据
+   */
+  async function initData() {
+    callTypeTypeList.value = await dictDropDown('checkout_call_type')
+    channelList.value = await dictDropDown('channel')
+    methodList.value = await dictDropDown('pay_method')
+  }
+
+  /**
+   * 入口
+   */
+  function init(id, editType: FormEditType, groupId: string) {
+    initFormEditType(editType)
+    resetForm()
+    form.value.groupId = unref(groupId)
+    getInfo(id, editType)
+  }
+
+  /**
+   * 获取信息
+   */
+  function getInfo(id, editType: FormEditType) {
+    if ([FormEditType.Edit, FormEditType.Show].includes(editType)) {
+      confirmLoading.value = true
+      getItemConfig(id).then(({ data }) => {
+        form.value = data
+        confirmLoading.value = false
+      })
+    } else {
+      confirmLoading.value = false
+    }
+  }
+  /**
+   * 保存
+   */
+  function handleOk() {
+    formRef.value?.validate().then(async () => {
+      confirmLoading.value = true
+      if (formEditType.value === FormEditType.Add) {
+        await saveItemConfig(form.value).finally(() => (confirmLoading.value = false))
+      } else if (formEditType.value === FormEditType.Edit) {
+        await updateItemConfig(form.value).finally(() => (confirmLoading.value = false))
+      }
+      handleCancel()
+      emits('ok')
+    })
+  }
+
+  // 重置表单的校验
+  function resetForm() {
+    nextTick(() => {
+      formRef.value?.resetFields()
+    })
+  }
+  defineExpose({
+    init,
+  })
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/daxpay/common/config/checkout/CheckoutItemConfigList.vue b/src/views/daxpay/common/config/checkout/CheckoutItemConfigList.vue
new file mode 100644
index 00000000..1aeaa2a9
--- /dev/null
+++ b/src/views/daxpay/common/config/checkout/CheckoutItemConfigList.vue
@@ -0,0 +1,142 @@
+<template>
+  <basic-drawer
+    v-bind="$attrs"
+    width="70%"
+    title="收银台配置项管理"
+    :mask-closable="true"
+    :open="visible"
+    @close="handleCancel"
+  >
+    <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }">
+      <template #buttons>
+        <a-space>
+          <a-button type="primary" pre-icon="ant-design:plus-outlined" @click="add">新建</a-button>
+        </a-space>
+      </template>
+    </vxe-toolbar>
+    <vxe-table ey-field="id" ref="xTable" :data="records" :loading="loading">
+      <vxe-column type="seq" width="60" />
+      <vxe-column field="name" title="名称" :min-width="150" />
+      <vxe-column field="callType" title="调用方式" :min-width="150">
+        <template #default="{ row }">
+          {{ dictConvert('checkout_call_type', row.callType) }}
+        </template>
+      </vxe-column>
+      <vxe-column field="channel" title="支付通道" :min-width="150">
+        <template #default="{ row }">
+          {{ dictConvert('channel', row.channel) }}
+        </template>
+      </vxe-column>
+      <vxe-column field="payMethod" title="支付方式" :min-width="150">
+        <template #default="{ row }">
+          {{ dictConvert('pay_method', row.payMethod) }}
+        </template>
+      </vxe-column>
+      <vxe-column field="sortNo" title="排序" :min-width="50" />
+      <vxe-column field="createTime" title="创建时间" :min-width="170" />
+      <vxe-column fixed="right" :width="150" :showOverflow="false" title="操作">
+        <template #default="{ row }">
+          <a href="javascript:" @click="show(row)">查看</a>
+          <a-divider type="vertical" />
+          <a href="javascript:" @click="edit(row)">编辑</a>
+          <a-divider type="vertical" />
+          <a href="javascript:" style="color: red" @click="del(row)">删除</a>
+        </template>
+      </vxe-column>
+    </vxe-table>
+    <CheckoutItemConfigEdit ref="checkoutItemConfigEdit" @ok="queryPage" :appId="appId" />
+  </basic-drawer>
+</template>
+<script setup lang="ts">
+  import { BasicDrawer } from '@/components/Drawer'
+  import { ref } from 'vue'
+  import { delItemConfig, getItemConfigs, CheckoutItemConfig } from './CheckoutConfig.api'
+  import { FormEditType } from '@/enums/formTypeEnum'
+  import { useMessage } from '@/hooks/web/useMessage'
+  import { useDict } from '@/hooks/bootx/useDict'
+  import CheckoutItemConfigEdit from './CheckoutItemConfigEdit.vue'
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const props = defineProps({
+    appId: String,
+  })
+
+  const { createConfirm, createMessage } = useMessage()
+  const { dictConvert } = useDict()
+
+  const currentGroupId = ref<string>('')
+  const loading = ref(false)
+  const visible = ref(false)
+  const records = ref<CheckoutItemConfig[]>([])
+
+  const checkoutItemConfigEdit = ref<any>()
+  /**
+   * 初始化并展示
+   */
+  async function init(groupId) {
+    visible.value = true
+    loading.value = false
+    currentGroupId.value = groupId
+    queryPage()
+  }
+
+  /**
+   * 查询
+   */
+  function queryPage() {
+    // 列表信息
+    loading.value = true
+    getItemConfigs(currentGroupId.value).then(({ data }) => {
+      records.value = data
+      loading.value = false
+    })
+  }
+
+  /**
+   * 关闭页面
+   */
+  function handleCancel() {
+    visible.value = false
+  }
+
+  /**
+   * 新增
+   */
+  function add() {
+    checkoutItemConfigEdit.value.init(null, FormEditType.Add, currentGroupId.value)
+  }
+  /**
+   * 编辑
+   */
+  function edit(record) {
+    checkoutItemConfigEdit.value.init(record.id, FormEditType.Edit, currentGroupId.value)
+  }
+  /**
+   * 查看
+   */
+  function show(record) {
+    checkoutItemConfigEdit.value.init(record.id, FormEditType.Show, currentGroupId.value)
+  }
+
+  /**
+   * 删除
+   */
+  function del(record) {
+    createConfirm({
+      iconType: 'warning',
+      title: '删除',
+      content: '是否删除该数据',
+      onOk: () => {
+        loading.value = true
+        delItemConfig(record.id).then(() => {
+          createMessage.success('删除成功')
+          queryPage()
+        })
+      },
+    })
+  }
+  defineExpose({
+    init,
+  })
+</script>
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/merchant/app/MchAppEdit.vue b/src/views/daxpay/common/merchant/app/MchAppEdit.vue
index 7a4675f7..3fd7927e 100644
--- a/src/views/daxpay/common/merchant/app/MchAppEdit.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppEdit.vue
@@ -117,7 +117,6 @@
   const {
     initFormEditType,
     handleCancel,
-    search,
     labelCol,
     wrapperCol,
     title,
diff --git a/src/views/daxpay/common/merchant/app/MchAppList.vue b/src/views/daxpay/common/merchant/app/MchAppList.vue
index 3de9558b..d2600bb2 100644
--- a/src/views/daxpay/common/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppList.vue
@@ -67,9 +67,9 @@
                     <a-menu-item>
                       <a-link @click="showCashierCode(row)">码牌配置</a-link>
                     </a-menu-item>
-<!--                    <a-menu-item>-->
-<!--                      <a-link @click="showAllocConfig(row)">分账配置</a-link>-->
-<!--                    </a-menu-item>-->
+                    <!--                    <a-menu-item>-->
+                    <!--                      <a-link @click="showAllocConfig(row)">分账配置</a-link>-->
+                    <!--                    </a-menu-item>-->
                     <a-menu-item>
                       <a-link @click="showAllocReceiver(row)">分账接收方</a-link>
                     </a-menu-item>
@@ -98,6 +98,7 @@
       <channel-config-list ref="channelSetup" />
       <MerchantNotifyConfigList ref="merchantNotifyConfigList" />
       <CashierCodeConfigList ref="cashierCodeConfigList" />
+      <CheckoutConfigModel ref="checkoutConfigModel" />
       <AllocationReceiverList ref="allocationReceiverList" />
       <AllocationGroupList ref="allocationGroupList" />
     </div>
@@ -122,6 +123,7 @@
   import AllocationReceiverList from '@/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue'
   import AllocationGroupList from '@/views/daxpay/common/allocation/group/AllocationGroupList.vue'
   import CashierCodeConfigList from '@/views/daxpay/common/config/cashier/code/CashierCodeConfigList.vue'
+  import CheckoutConfigModel from '@/views/daxpay/common/config/checkout/CheckoutConfigModel.vue'
 
   // 使用hooks
   const {
@@ -149,6 +151,7 @@
   const channelSetup = ref<any>()
   const merchantNotifyConfigList = ref<any>()
   const cashierCodeConfigList = ref<any>()
+  const checkoutConfigModel = ref<any>()
   const allocationReceiverList = ref<any>()
   const allocationGroupList = ref<any>()
 
@@ -207,13 +210,13 @@
    * 收银台配置
    */
   function showCheckoutConfig(record) {
+    checkoutConfigModel.value.init(record.appId)
   }
   /**
    * 收银码牌配置
    */
   function showCashierCode(record) {
     cashierCodeConfigList.value.init(record.appId)
-
   }
   /**
    * 分账配置
-- 
Gitee


From 2546c3fc826f582a6d4ff3759109e68763deae65 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Wed, 4 Dec 2024 15:12:18 +0800
Subject: [PATCH 08/25] =?UTF-8?q?feat(daxpay):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0=E6=94=AF=E4=BB=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加收银台支付相关的 API 接口和请求参数
- 实现收银台支付页面组件，包括表单验证、签名生成和请求提交等功能
- 在开发交易页面中集成收银台支付选项
- 更新支付状态枚举，增加待支付状态
- 优化支付订单列表的支付状态显示
---
 src/enums/daxpay/tradeStatusEnum.ts           |   4 +
 .../common/develop/trade/DevelopTrade.api.ts  |  68 +++++
 .../common/develop/trade/DevelopTrade.vue     |   3 +
 .../develop/trade/DevelopTradeCheck.vue       | 255 ++++++++++++++++++
 .../common/develop/trade/DevelopTradePay.vue  |   1 +
 .../develop/trade/DevelopTradeTransfer.vue    |   2 +-
 .../daxpay/common/order/pay/PayOrder.api.ts   |   2 +
 7 files changed, 334 insertions(+), 1 deletion(-)
 create mode 100644 src/views/daxpay/common/develop/trade/DevelopTradeCheck.vue

diff --git a/src/enums/daxpay/tradeStatusEnum.ts b/src/enums/daxpay/tradeStatusEnum.ts
index 42bcd9bf..de7b266f 100644
--- a/src/enums/daxpay/tradeStatusEnum.ts
+++ b/src/enums/daxpay/tradeStatusEnum.ts
@@ -2,6 +2,10 @@
  * 支付状态
  */
 export enum PayStatusEnum {
+  /**
+   * 待支付
+   */
+  WAIT = 'wait',
   /**
    * 支付中
    */
diff --git a/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts b/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts
index 72a5ba04..a8534be9 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts
+++ b/src/views/daxpay/common/develop/trade/DevelopTrade.api.ts
@@ -43,6 +43,20 @@ export function tradeTransfer(params) {
   return defHttp.post<Result<TransferResult>>({ url: '/develop/trade/transfer', data: params })
 }
 
+/**
+ * 创建收银台链接签名
+ */
+export function checkoutSign(param: CheckoutCreatParam) {
+  return defHttp.post<Result<string>>({ url: '/develop/trade/sign/checkout', data: param })
+}
+
+/**
+ * 创建收银台链接
+ */
+export function checkoutUrl(params) {
+  return defHttp.post<Result<CheckoutUrlResult>>({ url: '/develop/trade/checkoutUrl', data: params })
+}
+
 /**
  * 支付请求参数
  */
@@ -213,3 +227,57 @@ export interface TransferResult {
   /** 签名 */
   sign?: string
 }
+
+/**
+ * 收银台创建参数
+ */
+export interface CheckoutCreatParam {
+  /** 收银台类型 */
+  checkoutType?: string
+  /** 商户订单号 */
+  bizOrderNo?: string
+  /** 支付标题 */
+  title?: string
+  /** 支付描述 */
+  description?: string
+  /** 是否开启分账 */
+  allocation?: boolean
+  /** 自动分账 */
+  autoAllocation?: boolean
+  /** 过期时间 */
+  expiredTime?: string
+  /** 支付通道编码 */
+  channel?: string
+  /** 支付方式编码 */
+  method?: string
+  /** 支付金额 */
+  amount?: number
+  /** 支付扩展参数 */
+  extraParam?: string
+  /** 商户扩展参数 */
+  attach?: string
+  /** 同步跳转地址 */
+  returnUrl?: string
+  /** 用户付款中途退出返回商户网站的地址 */
+  quitUrl?: string
+  /** 异步通知地址 */
+  notifyUrl?: string
+  /** 终端IP */
+  clientIp?: string
+  /** 应用号 */
+  appId?: string
+  /** 随机数 */
+  nonceStr?: string
+  /** 签名 */
+  sign?: string
+  /** 请求时间 */
+  reqTime?: string
+}
+
+/**
+ * 收银台响应参数
+ */
+export interface CheckoutUrlResult {
+  /** 收银台链接 */
+  url?: string
+}
diff --git a/src/views/daxpay/common/develop/trade/DevelopTrade.vue b/src/views/daxpay/common/develop/trade/DevelopTrade.vue
index 02f114ec..01b9deff 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTrade.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTrade.vue
@@ -11,6 +11,7 @@
         <develop-trade-pay v-if="tradeType === TradeTypeEnum.PAY" />
         <develop-trade-refund v-if="tradeType === TradeTypeEnum.REFUND" />
         <develop-trade-transfer v-if="tradeType === TradeTypeEnum.TRANSFER" />
+        <develop-trade-check v-if="tradeType === 'checkout'" />
       </div>
     </div>
   </div>
@@ -24,6 +25,7 @@
   import DevelopTradePay from './DevelopTradePay.vue'
   import DevelopTradeRefund from './DevelopTradeRefund.vue'
   import DevelopTradeTransfer from './DevelopTradeTransfer.vue'
+  import DevelopTradeCheck from './DevelopTradeCheck.vue'
 
   const { dictDropDown } = useDict()
 
@@ -37,6 +39,7 @@
    */
   async function initData() {
     tradeTypes.value = await dictDropDown('trade_type')
+    tradeTypes.value.push({ label: '收银台', value: 'checkout' })
   }
 </script>
 
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradeCheck.vue b/src/views/daxpay/common/develop/trade/DevelopTradeCheck.vue
new file mode 100644
index 00000000..4c68efa6
--- /dev/null
+++ b/src/views/daxpay/common/develop/trade/DevelopTradeCheck.vue
@@ -0,0 +1,255 @@
+<template>
+  <div>
+    <a-spin :spinning="confirmLoading">
+      <a-form
+        class="small-from-item w-40vw"
+        ref="formRef"
+        :model="form"
+        :rules="rules"
+        :labelCol="{ span: 6 }"
+        :wrapperCol="{ span: 18 }"
+        :validate-trigger="['blur', 'change']"
+      >
+        <a-form-item label="应用号" name="appId">
+          <a-select
+            :filter-option="search"
+            :options="mchAppList"
+            v-model:value="form.appId"
+            placeholder="请选择商户应用"
+          />
+        </a-form-item>
+        <a-form-item label="收银台类型" name="checkoutType">
+          <a-select
+            allow-clear
+            v-model:value="form.checkoutType"
+            :options="checkoutOptions"
+            placeholder="请选择收银台类型"
+          />
+        </a-form-item>
+        <a-form-item label="订单号" name="bizOrderNo">
+          <a-input-group compact>
+            <a-input
+              v-model:value="form.bizOrderNo"
+              placeholder="请输入订单号"
+              style="width: calc(100% - 60px)"
+            />
+            <a-button @click="genBizOrderNo">生成</a-button>
+          </a-input-group>
+        </a-form-item>
+        <a-form-item label="支付标题" name="title">
+          <a-input v-model:value="form.title" placeholder="请输入支付标题" />
+        </a-form-item>
+        <a-form-item label="支付金额" name="amount">
+          <a-input-number
+            v-model:value="form.amount"
+            :min="0.01"
+            :precision="2"
+            placeholder="请输入支付金额"
+          />
+        </a-form-item>
+        <a-form-item label="是否分账" name="allocation">
+          <a-switch
+            checked-children="是"
+            un-checked-children="否"
+            v-model:checked="form.allocation"
+          />
+        </a-form-item>
+        <a-form-item label="支付描述" name="description">
+          <a-input v-model:value="form.description" placeholder="请输入支付描述" />
+        </a-form-item>
+        <a-form-item label="支付扩展参数" name="extraParam">
+          <a-textarea v-model:value="form.extraParam" :rows="3" placeholder="请输入支付扩展参数" />
+        </a-form-item>
+        <a-form-item label="商户扩展参数" name="attach">
+          <a-textarea
+            v-model:value="form.attach"
+            :rows="3"
+            placeholder="请输入商户扩展参数, 会原样回调返回"
+          />
+        </a-form-item>
+        <a-form-item label="异步通知地址" name="notifyUrl">
+          <a-input v-model:value="form.notifyUrl" placeholder="请输入异步通知地址" />
+        </a-form-item>
+        <a-form-item label="支付超时时间" name="expiredTime">
+          <!-- 日期时间 -->
+          <a-date-picker
+            allowClear
+            showTime
+            style="width: 100%"
+            placeholder="请选择订单过期时间"
+            :valueFormat="'YYYY-MM-DD HH:mm:ss'"
+            v-model:value="form.expiredTime"
+          />
+        </a-form-item>
+        <a-form-item label="终端IP" name="clientIp">
+          <a-input v-model:value="form.clientIp" placeholder="请输入终端IP地址" />
+        </a-form-item>
+        <a-form-item label="随机数" name="nonceStr">
+          <a-input-group compact>
+            <a-input
+              v-model:value="form.nonceStr"
+              style="width: calc(100% - 60px)"
+              placeholder="请输入随机数"
+            />
+            <a-button @click="genNonceStr">生成</a-button>
+          </a-input-group>
+        </a-form-item>
+        <a-form-item label="请求时间" name="reqTime">
+          <a-input-group compact>
+            <a-input disabled v-model:value="form.reqTime" style="width: calc(100% - 60px)" />
+            <a-button @click="updateReqTime">更新</a-button>
+          </a-input-group>
+        </a-form-item>
+        <a-form-item label="签名" name="sign">
+          <a-input-group compact>
+            <a-input
+              placeholder="请输入签名"
+              v-model:value="form.sign"
+              style="width: calc(100% - 60px)"
+            />
+            <a-button @click="getSign">生成</a-button>
+          </a-input-group>
+        </a-form-item>
+        <a-space style="display: flex; justify-content: center">
+          <a-button @click="handleReset">重置表单</a-button>
+          <a-button type="primary" @click="handleSubmit">提交请求</a-button>
+        </a-space>
+      </a-form>
+    </a-spin>
+  </div>
+</template>
+<script setup lang="ts">
+  import { computed, onMounted, reactive, ref } from 'vue'
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+  import { Modal } from 'ant-design-vue'
+  import { CheckoutCreatParam, checkoutSign, checkoutUrl } from './DevelopTrade.api'
+  import { LabeledValue } from 'ant-design-vue/lib/select'
+  import useFormEdit from '@/hooks/bootx/useFormEdit'
+  import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
+  import { useDict } from '@/hooks/bootx/useDict'
+  import XEUtils from 'xe-utils'
+  import { buildShortUUID, buildUUID } from '@/utils/uuid'
+  import { copyText } from '@/utils/copyTextToClipboard'
+
+  const { search } = useFormEdit()
+  const { dictDropDown } = useDict()
+
+  const confirmLoading = ref(false)
+  const formRef = ref<FormInstance>()
+  const form = reactive<CheckoutCreatParam>({
+    title: '测试收银台支付',
+    clientIp: '127.0.0.1',
+    amount: 0.1,
+    allocation: false,
+  })
+  const rules = computed(() => {
+    return {
+      checkoutType: [{ required: true, message: '应用号不可为空' }],
+      appId: [{ required: true, message: '应用号不可为空' }],
+      bizOrderNo: [{ required: true, message: '订单号不可为空' }],
+      title: [{ required: true, message: '支付标题不可为空' }],
+      amount: [{ required: true, message: '支付金额不可为空' }],
+      allocation: [{ required: true, message: '分账不可为空' }],
+      clientIp: [{ required: true, message: '终端IP不可为空' }],
+      nonceStr: [{ required: true, message: '随机数不可为空' }],
+      reqTime: [{ required: true, message: '请求时间不可为空' }],
+    } as Record<string, Rule[]>
+  })
+
+  const mchAppList = ref<LabeledValue[]>([])
+  const checkoutOptions = ref<LabeledValue[]>([])
+
+  onMounted(() => {
+    initData()
+  })
+
+  /**
+   * 初始化数据
+   */
+  async function initData() {
+    confirmLoading.value = false
+    checkoutOptions.value = await dictDropDown('checkout_type')
+    // 时间默认30M后
+    form.expiredTime = XEUtils.toDateString(
+      new Date(new Date().getTime() + 30 * 60 * 1000),
+      'yyyy-MM-dd HH:mm:ss',
+    )
+    initMchApp()
+    genNonceStr()
+    genBizOrderNo()
+    updateReqTime()
+  }
+
+  /**
+   * 商户变动时刷新应用列表
+   */
+  function initMchApp() {
+    mchAppDropdown().then(({ data }) => {
+      mchAppList.value = data
+    })
+  }
+
+  /**
+   * 生成订单号
+   */
+  function genBizOrderNo() {
+    form.bizOrderNo = buildShortUUID('PAY')
+  }
+
+  /**
+   * 生成随机数
+   */
+  function genNonceStr() {
+    form.nonceStr = buildUUID()
+  }
+
+  /**
+   * 更新请求时间
+   */
+  function updateReqTime() {
+    form.reqTime = XEUtils.toDateString(new Date(), 'yyyy-MM-dd HH:mm:ss')
+  }
+  /**
+   * 获取签名
+   */
+  function getSign() {
+    formRef.value?.validate().then(() => {
+      checkoutSign(form).then(({ data }) => {
+        form.sign = data
+      })
+    })
+  }
+
+  /**
+   * 重置
+   */
+  function handleReset() {
+    formRef.value?.resetFields()
+    initData()
+  }
+
+  /**
+   * 提交
+   */
+  function handleSubmit() {
+    formRef.value?.validate().then(() => {
+      confirmLoading.value = true
+      checkoutUrl(form)
+        .then(({ data }) => {
+          Modal.info({
+            title: '响应结果',
+            content: data.url,
+            okText: '复制链接',
+            onOk() {
+              copyText(data.url as string)
+            },
+          })
+        })
+        .finally(() => {
+          confirmLoading.value = false
+        })
+    })
+  }
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
index ca16f431..5b8cc339 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
@@ -148,6 +148,7 @@
     title: '测试支付',
     clientIp: '127.0.0.1',
     amount: 0.01,
+    allocation: false,
   })
   const rules = computed(() => {
     return {
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue b/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue
index 835d73ad..05d76ce1 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue
@@ -26,7 +26,7 @@
             placeholder="请选择转账通道"
           />
         </a-form-item>
-        <a-form-item label="转账号" name="bizRefundNo">
+        <a-form-item label="转账号" name="bizTransferNo">
           <a-input-group compact>
             <a-input
               v-model:value="form.bizTransferNo"
diff --git a/src/views/daxpay/common/order/pay/PayOrder.api.ts b/src/views/daxpay/common/order/pay/PayOrder.api.ts
index 913b6b8e..f8ffe867 100644
--- a/src/views/daxpay/common/order/pay/PayOrder.api.ts
+++ b/src/views/daxpay/common/order/pay/PayOrder.api.ts
@@ -94,6 +94,8 @@ export function cellStyle({ row, column }) {
   // 支付状态
   if (column.field == 'status') {
     switch (row.status) {
+      case PayStatusEnum.WAIT:
+        return { color: 'orange' }
       case PayStatusEnum.SUCCESS:
         return { color: 'green' }
       case PayStatusEnum.FAIL:
-- 
Gitee


From 7412e0b5651357f5474ded0efa974735d4280bce Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Wed, 4 Dec 2024 19:23:30 +0800
Subject: [PATCH 09/25] =?UTF-8?q?feat(checkout):=20=E6=B7=BB=E5=8A=A0=20ap?=
 =?UTF-8?q?pId=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 CheckoutItemConfigEdit组件中添加 appId 属性
- 在表单初始化时打印 appId- 在表单提交时将 appId 设置为表单值
---
 .../daxpay/common/config/checkout/CheckoutItemConfigEdit.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue b/src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue
index 2bd6bc91..52c0949c 100644
--- a/src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue
+++ b/src/views/daxpay/common/config/checkout/CheckoutItemConfigEdit.vue
@@ -85,6 +85,9 @@
   } from './CheckoutConfig.api'
   import { useDict } from '@/hooks/bootx/useDict'
 
+  const props = defineProps({
+    appId: String,
+  })
   const {
     initFormEditType,
     handleCancel,
@@ -136,6 +139,7 @@
    * 入口
    */
   function init(id, editType: FormEditType, groupId: string) {
+    console.log(props.appId)
     initFormEditType(editType)
     resetForm()
     form.value.groupId = unref(groupId)
@@ -162,6 +166,7 @@
   function handleOk() {
     formRef.value?.validate().then(async () => {
       confirmLoading.value = true
+      form.value.appId = props.appId
       if (formEditType.value === FormEditType.Add) {
         await saveItemConfig(form.value).finally(() => (confirmLoading.value = false))
       } else if (formEditType.value === FormEditType.Edit) {
-- 
Gitee


From aea858a6fcaa41843bc042c81996857a4c8bf20c Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Wed, 4 Dec 2024 22:42:52 +0800
Subject: [PATCH 10/25] =?UTF-8?q?feat(daxpay):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0=E6=94=AF=E4=BB=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增收银台支付相关的枚举和接口定义
- 实现收银台支付页面组件和相关API- 更新路由配置，添加收银台支付页面路由
- 修改现有组件，使用新的枚举定义
---
 .../daxpay/{daxpayEnum.ts => channelEnum.ts}  |  46 ++++-
 src/router/routes/project.ts                  |  12 +-
 .../common/develop/auth/ChannelAuth.vue       |   2 +-
 .../common/develop/trade/DevelopTrade.vue     |   2 +-
 .../merchant/channel/ChannelConfigEdit.vue    |   8 +-
 .../merchant/channel/ChannelConfigList.vue    |   8 +-
 .../common/notice/notify/NotifyTaskList.vue   |   2 +-
 .../discrepancy/ReconcileDiscrepancyList.vue  |   2 +-
 .../callback/TradeCallbackRecordList.vue      |   2 +-
 .../record/flow/TradeFlowRecordList.vue       |   2 +-
 .../record/sync/TradeSyncRecordList.vue       |   2 +-
 .../outside/checkout/CheckoutPay.api.ts       | 146 +++++++++++++++
 .../daxpay/outside/checkout/CheckoutPay.vue   | 177 ++++++++++++++++++
 src/views/daxpay/outside/checkout/style.less  |  79 ++++++++
 14 files changed, 465 insertions(+), 25 deletions(-)
 rename src/enums/daxpay/{daxpayEnum.ts => channelEnum.ts} (53%)
 create mode 100644 src/views/daxpay/outside/checkout/CheckoutPay.api.ts
 create mode 100644 src/views/daxpay/outside/checkout/CheckoutPay.vue
 create mode 100644 src/views/daxpay/outside/checkout/style.less

diff --git a/src/enums/daxpay/daxpayEnum.ts b/src/enums/daxpay/channelEnum.ts
similarity index 53%
rename from src/enums/daxpay/daxpayEnum.ts
rename to src/enums/daxpay/channelEnum.ts
index 5f71adb4..945c4e5a 100644
--- a/src/enums/daxpay/daxpayEnum.ts
+++ b/src/enums/daxpay/channelEnum.ts
@@ -1,12 +1,24 @@
 /**
  * 支付通道
  */
-export enum DaxpayEnum {
+export enum ChannelEnum {
   ALI = 'ali_pay',
   WECHAT = 'wechat_pay',
   UNION_PAY = 'union_pay',
 }
 
+/**
+ * 支付方式
+ */
+export enum PayMethodEnum {
+  WAP = 'wap',
+  APP = 'app',
+  WEB = 'web',
+  QRCODE = 'qrcode',
+  BARCODE = 'barcode',
+  JSAPI = 'jsapi',
+}
+
 /**
  * 交易类型
  */
@@ -51,10 +63,36 @@ export enum ChannelAuthStatusEnum {
   NOT_EXIST = 'not_exist',
 }
 
+
 /**
  * 收银台类型
  */
-export enum CashierTypeEnum {
-  WECHAT_PAY = 'wechat_pay',
-  ALIPAY = 'alipay',
+export enum CheckoutTypeEnum {
+  H5 = 'h5',
+  PC = 'pc',
+  MINI_APP = 'mini_app',
+  AGGREGATE = 'aggregate',
+}
+
+/**
+ * 支付调起类型
+ */
+export enum CheckoutCallTypeEnum {
+
+  /** 扫码支付 */
+  QR_CODE = 'qr_code',
+  /** 条码支付 */
+  BAR_CODE = 'bar_code',
+  /** 跳转链接 */
+  LINK = 'link',
+  /** 小程序 */
+  MINI_APP = 'mini_app',
+  /** APP支付 */
+  APP = 'app',
+  /** JSAPI */
+  JSAPI = 'jsapi',
+  /** 表单方式 */
+  FROM = 'from',
+
 }
+
diff --git a/src/router/routes/project.ts b/src/router/routes/project.ts
index bbf9fb05..fec720d3 100644
--- a/src/router/routes/project.ts
+++ b/src/router/routes/project.ts
@@ -36,12 +36,12 @@ export const OUTSIDE: AppRouteModule = {
   name: 'PROJECT_OUTSIDE',
   meta: { title: '' },
   children: [
-    // {
-    //   path: '/cashier',
-    //   name: 'cashier',
-    //   component: () => import('@/views/demo/cashier/Cashier.vue'),
-    //   meta: { title: '收银台演示', ignoreAuth: true },
-    // },
+    {
+      path: '/checkout/:orderNo',
+      name: 'CheckoutPay',
+      component: () => import('@/views/daxpay/outside/checkout/CheckoutPay.vue'),
+      meta: { title: '收银台', ignoreAuth: true },
+    },
   ],
 }
 
diff --git a/src/views/daxpay/common/develop/auth/ChannelAuth.vue b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
index 9c929a4c..108044f0 100644
--- a/src/views/daxpay/common/develop/auth/ChannelAuth.vue
+++ b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
@@ -83,7 +83,7 @@
   import useFormEdit from '@/hooks/bootx/useFormEdit'
   import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
   import { useDict } from '@/hooks/bootx/useDict'
-  import { ChannelAuthStatusEnum } from '@/enums/daxpay/daxpayEnum'
+  import { ChannelAuthStatusEnum } from '@/enums/daxpay/channelEnum'
 
   const { createMessage } = useMessage()
   const { dictDropDown } = useDict()
diff --git a/src/views/daxpay/common/develop/trade/DevelopTrade.vue b/src/views/daxpay/common/develop/trade/DevelopTrade.vue
index 01b9deff..2cccb943 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTrade.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTrade.vue
@@ -19,7 +19,7 @@
 
 <script setup lang="ts">
   import { onMounted, ref } from 'vue'
-  import { TradeTypeEnum } from '@/enums/daxpay/daxpayEnum'
+  import { TradeTypeEnum } from '@/enums/daxpay/channelEnum'
   import { useDict } from '@/hooks/bootx/useDict'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import DevelopTradePay from './DevelopTradePay.vue'
diff --git a/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue b/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
index 10dc62ad..e4bf0f57 100644
--- a/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
+++ b/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
   import { ref } from 'vue'
   import { useMessage } from '@/hooks/web/useMessage'
-  import { DaxpayEnum } from '@/enums/daxpay/daxpayEnum'
+  import { ChannelEnum } from '@/enums/daxpay/channelEnum'
   import { ChannelConfig } from './ChannelConfig.api'
   import AlipayConfigEdit from '@/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue'
   import WechatPayConfigEdit from '@/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue'
@@ -24,15 +24,15 @@
    */
   function show(record: ChannelConfig) {
     switch (record.channel) {
-      case DaxpayEnum.ALI: {
+      case ChannelEnum.ALI: {
         alipay.value.init(record)
         break
       }
-      case DaxpayEnum.WECHAT: {
+      case ChannelEnum.WECHAT: {
         wechat.value.init(record)
         break
       }
-      case DaxpayEnum.UNION_PAY: {
+      case ChannelEnum.UNION_PAY: {
         union.value.init(record)
         break
       }
diff --git a/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue b/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
index ec4840d0..2fdff5e2 100644
--- a/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
+++ b/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
@@ -54,7 +54,7 @@
   import { BasicDrawer } from '@/components/Drawer'
   import { ref } from 'vue'
   import { findAll, ChannelConfig } from './ChannelConfig.api'
-  import { DaxpayEnum } from '@/enums/daxpay/daxpayEnum'
+  import { ChannelEnum } from '@/enums/daxpay/channelEnum'
   import alipay from '@/assets/daxpay/alipay.svg'
   import wechat from '@/assets/daxpay/wechat.svg'
   import unionPay from '@/assets/daxpay/unionPay.svg'
@@ -112,11 +112,11 @@
    */
   function getIcon(type: string) {
     switch (type) {
-      case DaxpayEnum.ALI:
+      case ChannelEnum.ALI:
         return alipay
-      case DaxpayEnum.WECHAT:
+      case ChannelEnum.WECHAT:
         return wechat
-      case DaxpayEnum.UNION_PAY:
+      case ChannelEnum.UNION_PAY:
         return unionPay
       default:
         return ''
diff --git a/src/views/daxpay/common/notice/notify/NotifyTaskList.vue b/src/views/daxpay/common/notice/notify/NotifyTaskList.vue
index 8f91747a..cdac8728 100644
--- a/src/views/daxpay/common/notice/notify/NotifyTaskList.vue
+++ b/src/views/daxpay/common/notice/notify/NotifyTaskList.vue
@@ -88,7 +88,7 @@
   import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
   import TransferOrderInfo from '@/views/daxpay/common/order/transfer/TransferOrderInfo.vue'
   import NotifyRecordList from './NotifyRecordList.vue'
-  import { NotifyContentTypeEnum } from '@/enums/daxpay/daxpayEnum'
+  import { NotifyContentTypeEnum } from '@/enums/daxpay/channelEnum'
   import RefundOrderInfo from '@/views/daxpay/common/order/refund/RefundOrderInfo.vue'
   import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
diff --git a/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyList.vue b/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyList.vue
index 1b1dcf1e..1d891784 100644
--- a/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyList.vue
+++ b/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyList.vue
@@ -118,7 +118,7 @@
   import BQuery from '/@/components/Bootx/Query/BQuery.vue'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import { useDict } from '@/hooks/bootx/useDict'
-  import { TradeTypeEnum } from '@/enums/daxpay/daxpayEnum'
+  import { TradeTypeEnum } from '@/enums/daxpay/channelEnum'
   import ReconcileDiscrepancyInfo from './ReconcileDiscrepancyInfo.vue'
   import ReconcileStatementInfo from '../statement/ReconcileStatementInfo.vue'
   import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
diff --git a/src/views/daxpay/common/record/callback/TradeCallbackRecordList.vue b/src/views/daxpay/common/record/callback/TradeCallbackRecordList.vue
index e8e80638..4c7b0aa8 100644
--- a/src/views/daxpay/common/record/callback/TradeCallbackRecordList.vue
+++ b/src/views/daxpay/common/record/callback/TradeCallbackRecordList.vue
@@ -86,7 +86,7 @@
   import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
   import RefundOrderInfo from '@/views/daxpay/common/order/refund/RefundOrderInfo.vue'
   import TransferOrderInfo from '@/views/daxpay/common/order/transfer/TransferOrderInfo.vue'
-  import { TradeTypeEnum } from '@/enums/daxpay/daxpayEnum'
+  import { TradeTypeEnum } from '@/enums/daxpay/channelEnum'
   import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
diff --git a/src/views/daxpay/common/record/flow/TradeFlowRecordList.vue b/src/views/daxpay/common/record/flow/TradeFlowRecordList.vue
index 2840d378..a3817073 100644
--- a/src/views/daxpay/common/record/flow/TradeFlowRecordList.vue
+++ b/src/views/daxpay/common/record/flow/TradeFlowRecordList.vue
@@ -96,7 +96,7 @@
   import TransferOrderInfo from '@/views/daxpay/common/order/transfer/TransferOrderInfo.vue'
   import ALink from '@/components/Link/Link.vue'
   import TradeFlowRecordInfo from './TradeFlowRecordInfo.vue'
-  import { TradeTypeEnum } from '@/enums/daxpay/daxpayEnum'
+  import { TradeTypeEnum } from '@/enums/daxpay/channelEnum'
   import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
diff --git a/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue b/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue
index 99d9ca9f..1c6275d4 100644
--- a/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue
+++ b/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue
@@ -82,7 +82,7 @@
   import BQuery from '@/components/Bootx/Query/BQuery.vue'
   import { LIST, QueryField, STRING } from '@/components/Bootx/Query/Query'
   import { useDict } from '@/hooks/bootx/useDict'
-  import { TradeTypeEnum } from '@/enums/daxpay/daxpayEnum'
+  import { TradeTypeEnum } from '@/enums/daxpay/channelEnum'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import ALink from '/@/components/Link/Link.vue'
   import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
diff --git a/src/views/daxpay/outside/checkout/CheckoutPay.api.ts b/src/views/daxpay/outside/checkout/CheckoutPay.api.ts
new file mode 100644
index 00000000..9987d6f2
--- /dev/null
+++ b/src/views/daxpay/outside/checkout/CheckoutPay.api.ts
@@ -0,0 +1,146 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import {PayResult} from "@/views/daxpay/common/develop/trade/DevelopTrade.api";
+
+/**
+ * 获取收银台订单和配置信息
+ */
+export function getOrderAndConfig(orderNo, checkoutType) {
+  return defHttp.get({
+    url: '/unipay/checkout/getOrderAndConfig',
+    params: {
+      orderNo,
+      checkoutType,
+    },
+  })
+}
+/**
+ * 发起普通支付
+ */
+export function getCheckoutUrl(orderNo,checkoutType) {
+  return defHttp.get<Result<string>>({
+    url: '/unipay/checkout/getCheckoutUrl',
+    params: {orderNo,checkoutType},
+  })
+}
+/**
+ * 发起普通支付
+ */
+export function checkoutPay(param: CheckoutPayParam) {
+  return defHttp.post<Result<PayResult>>({
+    url: '/unipay/checkout/pay',
+    data: param,
+  })
+}
+
+
+
+/**
+ * 收银台支付参数
+ */
+export interface CheckoutPayParam {
+  /** 订单号 */
+  orderNo?: string
+  /** 支付配置项ID */
+  itemId?: string
+  /** 唯一标识 */
+  openId?: string
+  /** 付款码 */
+  barCode?: string
+}
+
+/**
+ * 收银台配置
+ */
+export interface CheckoutOrderAndConfigResult {
+  /** 订单信息 */
+  order: CheckoutOrderResult
+  /** 收银台配置信息 */
+  config: CheckoutConfigResult
+  /** 收银台分类配置信息 */
+  groupConfigs: CheckoutGroupConfigResult[]
+}
+
+/**
+ * 收银台聚合支付配置
+ */
+export interface AggregateOrderAndConfigResult {
+  /** 订单信息 */
+  order: CheckoutOrderResult
+  /** 收银台配置信息 */
+  config: CheckoutConfigResult
+  /** 收银台聚合配置信息 */
+  aggregateConfig: AggregateConfigResult
+}
+
+/**
+ * 订单信息
+ */
+export interface CheckoutOrderResult {
+  /** 商户订单号 */
+  bizOrderNo?: string
+  /** 订单号 */
+  orderNo?: string
+  /** 标题 */
+  title?: string
+  /** 描述 */
+  description?: string
+  /** 金额(元) */
+  amount?: string
+
+}
+/**
+ * 收银台配置信息
+ */
+export interface CheckoutConfigResult {
+  /** 收银台名称 */
+  name?: string
+  /** PC收银台是否同时显示聚合收银码 */
+  aggregateShow?: boolean
+  /** h5收银台自动升级聚合支付 */
+  h5AutoUpgrade?: boolean
+}
+
+/**
+ * 收银台分类配置
+ */
+export interface CheckoutGroupConfigResult {
+  /** 主键 */
+  id?: string
+  /** 类型 */
+  type?: string
+  /** 名称 */
+  name?: string
+  /** 配置项列表 */
+  items?: CheckoutItemConfigResult[]
+}
+
+/**
+ * 收银台配置项
+ */
+export interface CheckoutItemConfigResult {
+  /** 主键 */
+  id?: string
+  /** 发起调用的类型 */
+  callType?: string
+  /** 名称 */
+  name?: string
+  /** 支付通道 */
+  channel?: string
+  /** 支付方式 */
+  payMethod?: string
+}
+
+/**
+ * 收银台聚合配置信息
+ */
+export interface AggregateConfigResult {
+  /** 支付类型 */
+  type?: string
+  /** 通道 */
+  channel?: string
+  /** 支付方式 */
+  payMethod?: string
+  /** 自动拉起支付 */
+  autoLaunch?: boolean
+}
diff --git a/src/views/daxpay/outside/checkout/CheckoutPay.vue b/src/views/daxpay/outside/checkout/CheckoutPay.vue
new file mode 100644
index 00000000..f446b574
--- /dev/null
+++ b/src/views/daxpay/outside/checkout/CheckoutPay.vue
@@ -0,0 +1,177 @@
+<template>
+<div>
+  <div class="page paydemo">
+    <div class="blog-container" id="container">
+      <a-spin :spinning="loading">
+        <div class="content" style="padding-top: 70px">
+          <div style="width: 100%">
+            <div class="paydemo-type-content" style="display: flex;height: 300px">
+              <div style="width: 50%;">
+                <div class="paydemo-type-name">支付信息</div>
+                <a-form>
+                  <div class="paydemo-form-item">
+                    <label>标题：</label>
+                    <span>
+                      {{ orderAndConfig.order.title }}
+                    </span>
+                  </div>
+                  <div class="paydemo-form-item">
+                    <label>商户订单号：</label>
+                    <span>
+                      {{ orderAndConfig.order.bizOrderNo }}
+                    </span>
+                  </div>
+                  <div class="paydemo-form-item">
+                    <label>订单号：</label>
+                    <span>
+                      {{ orderAndConfig.order.orderNo }}
+                    </span>
+                  </div>
+                  <div class="paydemo-form-item">
+                    <label>描述：</label>
+                    <span>
+                      {{ orderAndConfig.order.description }}
+                    </span>
+                  </div>
+
+
+                </a-form>
+              </div>
+              <div style="width: 50%;display: flex;flex-direction:column;align-items: center" v-if="aggregateUrl">
+                <a-alert message="请使用支付宝、微信等应用扫码支付" type="info" style="width: 250px;margin-bottom: 10px"/>
+                <a-qrcode :value="aggregateUrl" :size="200" />
+              </div>
+            </div>
+            <div class="paydemo-type-content" style="height: 350px">
+              <a-tabs v-model:activeKey="activeKey" type="card">
+                <a-tab-pane v-for="group in orderAndConfig.groupConfigs" :key="group.id" :tab="group.name">
+                  <div class="paydemo-type-body">
+                    <div @click="()=>currentItem=config" v-for="config in group.items" :key="config.id">
+                      <div :class="config.id === currentItem.id ? 'colorChange' : 'paydemoType'">
+                        <span class="color-change">{{ config.name }}</span>
+                      </div>
+                    </div>
+                  </div>
+                </a-tab-pane>
+              </a-tabs>
+            </div>
+            <div style="margin-top: 20px; text-align: right">
+                <span style="color: #fd482c; font-size: 18px; padding-right: 10px">{{ '¥ ' +  orderAndConfig.order.amount }} 元</span>
+                <a-button type="primary" :disabled="!currentItem" @click="pay">立即支付</a-button>
+            </div>
+          </div>
+        </div>
+      </a-spin>
+    </div>
+  </div>
+
+</div>
+</template>
+
+<script setup lang="ts">
+
+
+import {useRoute} from "vue-router";
+import {onMounted, ref} from "vue";
+import {
+  CheckoutItemConfigResult,
+  CheckoutOrderAndConfigResult, checkoutPay, CheckoutPayParam, getCheckoutUrl,
+  getOrderAndConfig
+} from "./CheckoutPay.api";
+import {CheckoutCallTypeEnum, CheckoutTypeEnum,} from "@/enums/daxpay/channelEnum";
+import {useMessage} from "@/hooks/web/useMessage";
+
+const route = useRoute()
+
+const { orderNo } = route.params
+
+const activeKey = ref<string>()
+
+const { createMessage } = useMessage()
+
+let payForm = ref<string>()
+const aggregateUrl = ref('1')
+
+// 当前选择支付渠道和方式
+let currentItem = ref<CheckoutItemConfigResult>({})
+
+
+const loading = ref(false)
+const orderAndConfig = ref<CheckoutOrderAndConfigResult>({
+  order: {},
+  config: {},
+  groupConfigs: [],
+})
+
+/**
+ * 初始化
+ */
+onMounted(() => {
+  initData()
+})
+
+/**
+ * 初始化数据
+ */
+async function initData() {
+  // 获取收银台配置
+  await getOrderAndConfig(orderNo, CheckoutTypeEnum.PC).then(({ data }) => {
+    orderAndConfig.value = data
+    activeKey.value = orderAndConfig.value.groupConfigs?.[0].id
+    currentItem.value = orderAndConfig.value.groupConfigs?.[0].items?.[0] as CheckoutItemConfigResult
+  })
+  // 是否同时显示聚合支付码
+  if (orderAndConfig.value.config.aggregateShow){
+    getCheckoutUrl(orderNo, CheckoutTypeEnum.AGGREGATE).then(({data})=>{
+      aggregateUrl.value = data
+    })
+  }
+}
+
+/**
+ * 发起支付
+ */
+function pay() {
+  // 条码支付
+  if (CheckoutCallTypeEnum.BAR_CODE === currentItem.value.callType){
+
+  }
+
+  // 支付调起类型
+  switch (currentItem.value.callType){
+    case CheckoutCallTypeEnum.LINK:{
+      break;
+    }
+    case CheckoutCallTypeEnum.FROM:{
+      break;
+
+    }
+    case CheckoutCallTypeEnum.QR_CODE:{
+      break;
+    }
+    case CheckoutCallTypeEnum.BAR_CODE:{
+      break;
+    }
+    default:{
+      createMessage.warning('暂不支持该支付方式')
+    }
+  }
+
+  loading.value = true
+  const from = {
+    orderNo,
+    itemId: currentItem.value.id,
+  } as CheckoutPayParam
+  checkoutPay(from).then(({ data }) => {
+    loading.value = false
+    // 跳转到支付页面
+    location.replace(data.payBody as string)
+  })
+}
+
+</script>
+
+
+<style scoped lang="less">
+@import 'style.less';
+</style>
diff --git a/src/views/daxpay/outside/checkout/style.less b/src/views/daxpay/outside/checkout/style.less
new file mode 100644
index 00000000..2f514e2d
--- /dev/null
+++ b/src/views/daxpay/outside/checkout/style.less
@@ -0,0 +1,79 @@
+.page {
+  box-sizing: border-box;
+  min-height: 100%;
+  //padding-bottom: 80px;
+  //margin-top: 81px;
+}
+.paydemo {
+  .content {
+    max-width: 1120px;
+    margin: 0 auto;
+  }
+  .paydemo-type-content {
+    padding: 20px;
+    margin-bottom: 10px;
+    background-color: #FFFFFF;
+    border-radius: 6px;
+    p {
+      margin-bottom: 10px;
+      text-align: left;
+    }
+  }
+  .colorChange {
+    color: #1953ff;
+    border: solid 2px #1953ff;
+    padding: 12px;
+    margin-right: 10px;
+    cursor: pointer;
+  }
+  .paydemoType {
+    padding: 12px;
+    border: solid 2px #e2e2e2;
+    margin-right: 10px;
+    cursor: pointer;
+  }
+  .paydemo-type-img {
+    width: 40px;
+    height: 40px;
+    vertical-align: center;
+  }
+  .paydemo-type-name {
+    font-size: 16px;
+    margin-bottom: 12px;
+    display: flex;
+    align-items: center;
+  }
+  .paydemo-type-body {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+  .paydemo-type-h5 {
+    padding: 12px;
+    border: solid 2px #e2e2e2;
+    margin-right: 10px;
+    cursor: pointer;
+    font-size: 14px;
+  }
+  .codeImg_wx_h5 {
+    position: absolute;
+    z-index: 1001;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    background-color: #ffffff;
+    width: 160px;
+  }
+  .paydemo-form-item {
+    height: 38px;
+    margin-bottom: 5px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+}
+img {
+  border: 0;
+  vertical-align: middle;
+}
-- 
Gitee


From d2ca977cf21e4f7a04c7e604c33b242d17eb2b79 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Thu, 5 Dec 2024 14:37:52 +0800
Subject: [PATCH 11/25] =?UTF-8?q?feat(daxpay):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0=E6=94=AF=E4=BB=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增条码支付和聚合支付功能
- 优化支付流程和用户界面
---
 index.html                                    |   2 +-
 src/router/index.ts                           |   2 +-
 src/router/routes/index.ts                    |  20 +-
 src/router/routes/project.ts                  |  11 +-
 .../outside/checkout/CheckoutBarCode.vue      |  62 +++
 .../outside/checkout/CheckoutPay.api.ts       |  60 +--
 .../daxpay/outside/checkout/CheckoutPay.vue   | 381 +++++++++++-------
 .../outside/checkout/CheckoutQrCode.vue       |  36 ++
 src/views/daxpay/outside/checkout/style.less  |  34 +-
 9 files changed, 400 insertions(+), 208 deletions(-)
 create mode 100644 src/views/daxpay/outside/checkout/CheckoutBarCode.vue
 create mode 100644 src/views/daxpay/outside/checkout/CheckoutQrCode.vue

diff --git a/index.html b/index.html
index 41d55cf5..c86caf63 100644
--- a/index.html
+++ b/index.html
@@ -137,7 +137,7 @@
           <div class="app-loading-dots">
             <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
           </div>
-          <div class="app-loading-title"><%= VITE_GLOB_APP_TITLE %></div>
+          <div class="app-loading-title">DaxPay</div>
         </div>
       </div>
     </div>
diff --git a/src/router/index.ts b/src/router/index.ts
index 73d52ba7..2ccd7708 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,7 +1,7 @@
 import type { RouteRecordRaw } from 'vue-router'
 import type { App } from 'vue'
 
-import {createRouter, createWebHistory} from 'vue-router'
+import { createRouter, createWebHistory } from 'vue-router'
 import { basicRoutes } from './routes'
 
 // 白名单应该包含基本静态路由
diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts
index b1c52ea6..2832c8ab 100644
--- a/src/router/routes/index.ts
+++ b/src/router/routes/index.ts
@@ -36,6 +36,22 @@ export const LoginRoute: AppRouteRecordRaw = {
   },
 }
 
-// Basic routing without permission
+/**
+ * 外部页面, 不需要登陆
+ */
+export const OUTSIDE: AppRouteModule = {
+  path: '/not/login/outside/',
+  name: 'NOT_LOGIN_OUTSIDE',
+  meta: { title: '' },
+  children: [
+    {
+      path: '/checkout/:orderNo',
+      name: 'CheckoutPay',
+      component: () => import('@/views/daxpay/outside/checkout/CheckoutPay.vue'),
+      meta: { title: '收银台', ignoreAuth: true },
+    },
+  ],
+}
+
 // 未经许可的基本路由
-export const basicRoutes = [LoginRoute, RootRoute, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE]
+export const basicRoutes = [LoginRoute, RootRoute, REDIRECT_ROUTE, PAGE_NOT_FOUND_ROUTE,OUTSIDE]
diff --git a/src/router/routes/project.ts b/src/router/routes/project.ts
index fec720d3..86764535 100644
--- a/src/router/routes/project.ts
+++ b/src/router/routes/project.ts
@@ -29,20 +29,13 @@ export const INTERNAL: AppRouteModule = {
 }
 
 /**
- * 位于主框架外的页面
+ * 位于主框架外的页面 也需要登陆
  */
 export const OUTSIDE: AppRouteModule = {
   path: '/outside',
   name: 'PROJECT_OUTSIDE',
   meta: { title: '' },
-  children: [
-    {
-      path: '/checkout/:orderNo',
-      name: 'CheckoutPay',
-      component: () => import('@/views/daxpay/outside/checkout/CheckoutPay.vue'),
-      meta: { title: '收银台', ignoreAuth: true },
-    },
-  ],
+  children: [],
 }
 
 /**
diff --git a/src/views/daxpay/outside/checkout/CheckoutBarCode.vue b/src/views/daxpay/outside/checkout/CheckoutBarCode.vue
new file mode 100644
index 00000000..d9146d08
--- /dev/null
+++ b/src/views/daxpay/outside/checkout/CheckoutBarCode.vue
@@ -0,0 +1,62 @@
+<template>
+  <a-modal :open="visible" title="条码支付" :width="350" @cancel="handleClose">
+    <a-spin :spinning="loading">
+      <div>
+        <div
+          style="margin-bottom: 10px; display: flex; flex-direction: row; justify-content: start"
+        >
+        </div>
+        <div style="display: flex; flex-direction: row; justify-content: space-between">
+          <a-input allowClear v-model:value="authCode" placeholder="请输入付款条码" />
+        </div>
+      </div>
+    </a-spin>
+    <template #footer>
+      <a-button key="cancel" @click="handleClose">取消</a-button>
+      <a-button key="forward" :loading="loading" type="primary" @click="handleOk">确定</a-button>
+    </template>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue'
+
+  let visible = ref(false)
+  let aggregate = ref(false)
+  let loading = ref(false)
+  let authCode = ref('')
+
+  const emits = defineEmits(['ok', 'cancel'])
+
+  /**
+   * 初始化
+   */
+  function init(isAggregate: boolean) {
+    visible.value = true
+    loading.value = false
+    aggregate.value = isAggregate
+    authCode.value = ''
+  }
+
+  /**
+   * 回调
+   */
+  function handleOk() {
+    if (authCode.value) {
+      loading.value = true
+      emits('ok', authCode.value, aggregate.value)
+    } else {
+      handleClose()
+    }
+  }
+
+  /**
+   * 关闭
+   */
+  function handleClose() {
+    visible.value = false
+  }
+  defineExpose({ init, handleClose })
+</script>
+
+<style scoped></style>
diff --git a/src/views/daxpay/outside/checkout/CheckoutPay.api.ts b/src/views/daxpay/outside/checkout/CheckoutPay.api.ts
index 9987d6f2..c6582c06 100644
--- a/src/views/daxpay/outside/checkout/CheckoutPay.api.ts
+++ b/src/views/daxpay/outside/checkout/CheckoutPay.api.ts
@@ -1,6 +1,6 @@
 import { defHttp } from '@/utils/http/axios'
 import { Result } from '#/axios'
-import {PayResult} from "@/views/daxpay/common/develop/trade/DevelopTrade.api";
+import { PayResult } from '@/views/daxpay/common/develop/trade/DevelopTrade.api'
 
 /**
  * 获取收银台订单和配置信息
@@ -17,10 +17,10 @@ export function getOrderAndConfig(orderNo, checkoutType) {
 /**
  * 发起普通支付
  */
-export function getCheckoutUrl(orderNo,checkoutType) {
+export function getCheckoutUrl(orderNo, checkoutType) {
   return defHttp.get<Result<string>>({
     url: '/unipay/checkout/getCheckoutUrl',
-    params: {orderNo,checkoutType},
+    params: { orderNo, checkoutType },
   })
 }
 /**
@@ -33,7 +33,25 @@ export function checkoutPay(param: CheckoutPayParam) {
   })
 }
 
+/**
+ * 聚合条码支付
+ */
+export function aggregateBarPay(param: AggregateBarPayParam) {
+  return defHttp.post<Result<PayResult>>({
+    url: '/unipay/checkout/aggregateBarPay',
+    data: param,
+  })
+}
 
+/**
+ * 查询订单状态
+ */
+export function findStatusByOrderNo(orderNo) {
+  return defHttp.get<Result<boolean>>({
+    url: '/unipay/checkout/findStatusByOrderNo',
+    params: { orderNo },
+  })
+}
 
 /**
  * 收银台支付参数
@@ -49,6 +67,15 @@ export interface CheckoutPayParam {
   barCode?: string
 }
 
+/**
+ * 聚合条码支付参数
+ */
+export interface AggregateBarPayParam {
+  /** 订单号 */
+  orderNo?: string
+  /** 付款码 */
+  barCode?: string
+}
 /**
  * 收银台配置
  */
@@ -61,18 +88,6 @@ export interface CheckoutOrderAndConfigResult {
   groupConfigs: CheckoutGroupConfigResult[]
 }
 
-/**
- * 收银台聚合支付配置
- */
-export interface AggregateOrderAndConfigResult {
-  /** 订单信息 */
-  order: CheckoutOrderResult
-  /** 收银台配置信息 */
-  config: CheckoutConfigResult
-  /** 收银台聚合配置信息 */
-  aggregateConfig: AggregateConfigResult
-}
-
 /**
  * 订单信息
  */
@@ -87,7 +102,6 @@ export interface CheckoutOrderResult {
   description?: string
   /** 金额(元) */
   amount?: string
-
 }
 /**
  * 收银台配置信息
@@ -130,17 +144,3 @@ export interface CheckoutItemConfigResult {
   /** 支付方式 */
   payMethod?: string
 }
-
-/**
- * 收银台聚合配置信息
- */
-export interface AggregateConfigResult {
-  /** 支付类型 */
-  type?: string
-  /** 通道 */
-  channel?: string
-  /** 支付方式 */
-  payMethod?: string
-  /** 自动拉起支付 */
-  autoLaunch?: boolean
-}
diff --git a/src/views/daxpay/outside/checkout/CheckoutPay.vue b/src/views/daxpay/outside/checkout/CheckoutPay.vue
index f446b574..a3492b3e 100644
--- a/src/views/daxpay/outside/checkout/CheckoutPay.vue
+++ b/src/views/daxpay/outside/checkout/CheckoutPay.vue
@@ -1,177 +1,278 @@
 <template>
-<div>
-  <div class="page paydemo">
-    <div class="blog-container" id="container">
-      <a-spin :spinning="loading">
-        <div class="content" style="padding-top: 70px">
-          <div style="width: 100%">
-            <div class="paydemo-type-content" style="display: flex;height: 300px">
-              <div style="width: 50%;">
-                <div class="paydemo-type-name">支付信息</div>
-                <a-form>
-                  <div class="paydemo-form-item">
-                    <label>标题：</label>
-                    <span>
-                      {{ orderAndConfig.order.title }}
-                    </span>
-                  </div>
-                  <div class="paydemo-form-item">
-                    <label>商户订单号：</label>
-                    <span>
-                      {{ orderAndConfig.order.bizOrderNo }}
-                    </span>
-                  </div>
-                  <div class="paydemo-form-item">
-                    <label>订单号：</label>
-                    <span>
-                      {{ orderAndConfig.order.orderNo }}
-                    </span>
-                  </div>
-                  <div class="paydemo-form-item">
-                    <label>描述：</label>
-                    <span>
-                      {{ orderAndConfig.order.description }}
-                    </span>
-                  </div>
-
-
-                </a-form>
-              </div>
-              <div style="width: 50%;display: flex;flex-direction:column;align-items: center" v-if="aggregateUrl">
-                <a-alert message="请使用支付宝、微信等应用扫码支付" type="info" style="width: 250px;margin-bottom: 10px"/>
-                <a-qrcode :value="aggregateUrl" :size="200" />
+  <div>
+    <!--  云闪付表单方式专用  -->
+    <div v-html="payForm"></div>
+    <div class="page pay">
+      <div class="blog-container" id="container">
+        <a-spin :spinning="loading">
+          <div class="content" style="padding-top: 70px">
+            <div style="width: 100%">
+              <div class="pay-type-content" style="display: flex; height: 300px">
+                <div style="width: 50%">
+                  <div class="pay-type-name">支付信息</div>
+                  <a-form>
+                    <div class="pay-form-item">
+                      <label>标题：</label>
+                      <span>
+                        {{ orderAndConfig.order.title }}
+                      </span>
+                    </div>
+                    <div class="pay-form-item">
+                      <label>商户订单号：</label>
+                      <span>
+                        {{ orderAndConfig.order.bizOrderNo }}
+                      </span>
+                    </div>
+                    <div class="pay-form-item">
+                      <label>订单号：</label>
+                      <span>
+                        {{ orderAndConfig.order.orderNo }}
+                      </span>
+                    </div>
+                    <div class="pay-form-item">
+                      <label>描述：</label>
+                      <span>
+                        {{ orderAndConfig.order.description }}
+                      </span>
+                    </div>
+                  </a-form>
+                </div>
+                <div
+                  style="width: 50%; display: flex; flex-direction: column; align-items: center"
+                  v-if="aggregateUrl"
+                >
+                  <a-alert
+                    message="请使用支付宝、微信等应用扫码支付"
+                    type="info"
+                    style="width: 250px; margin-bottom: 10px"
+                  />
+                  <a-qrcode :value="aggregateUrl" :size="200" />
+                  <a-button style="margin-top: 10px" @click="barPayShow(true)"
+                    >付款码支付(聚合)</a-button
+                  >
+                </div>
               </div>
-            </div>
-            <div class="paydemo-type-content" style="height: 350px">
-              <a-tabs v-model:activeKey="activeKey" type="card">
-                <a-tab-pane v-for="group in orderAndConfig.groupConfigs" :key="group.id" :tab="group.name">
-                  <div class="paydemo-type-body">
-                    <div @click="()=>currentItem=config" v-for="config in group.items" :key="config.id">
-                      <div :class="config.id === currentItem.id ? 'colorChange' : 'paydemoType'">
-                        <span class="color-change">{{ config.name }}</span>
+              <div class="pay-type-content" style="height: 350px">
+                <a-tabs v-model:activeKey="activeKey" type="card">
+                  <a-tab-pane
+                    v-for="group in orderAndConfig.groupConfigs"
+                    :key="group.id"
+                    :tab="group.name"
+                  >
+                    <div class="pay-type-body">
+                      <div
+                        @click="() => (currentItem = config)"
+                        v-for="config in group.items"
+                        :key="config.id"
+                      >
+                        <div :class="config.id === currentItem.id ? 'colorChange' : 'payType'">
+                          <span class="color-change">{{ config.name }}</span>
+                        </div>
                       </div>
                     </div>
-                  </div>
-                </a-tab-pane>
-              </a-tabs>
-            </div>
-            <div style="margin-top: 20px; text-align: right">
-                <span style="color: #fd482c; font-size: 18px; padding-right: 10px">{{ '¥ ' +  orderAndConfig.order.amount }} 元</span>
+                  </a-tab-pane>
+                </a-tabs>
+              </div>
+              <div style="margin-top: 20px; text-align: right">
+                <span style="color: #fd482c; font-size: 18px; padding-right: 10px"
+                  >{{ '¥ ' + orderAndConfig.order.amount }} 元</span
+                >
                 <a-button type="primary" :disabled="!currentItem" @click="pay">立即支付</a-button>
+              </div>
             </div>
           </div>
-        </div>
-      </a-spin>
+        </a-spin>
+      </div>
+      <checkout-bar-code ref="cashierBarCode" @ok="barPay" />
+      <checkout-qr-code ref="cashierQrCode" />
     </div>
   </div>
-
-</div>
 </template>
 
 <script setup lang="ts">
+  import { useRoute } from 'vue-router'
+  import { nextTick, onMounted, ref } from 'vue'
+  import {
+    aggregateBarPay,
+    AggregateBarPayParam,
+    CheckoutItemConfigResult,
+    CheckoutOrderAndConfigResult,
+    checkoutPay,
+    CheckoutPayParam,
+    findStatusByOrderNo,
+    getCheckoutUrl,
+    getOrderAndConfig,
+  } from './CheckoutPay.api'
+  import { CheckoutCallTypeEnum, CheckoutTypeEnum } from '@/enums/daxpay/channelEnum'
+  import { useMessage } from '@/hooks/web/useMessage'
+  import { PayResult } from '@/views/daxpay/common/develop/trade/DevelopTrade.api'
+  import { useIntervalFn } from '@vueuse/shared'
+  import CheckoutBarCode from './CheckoutBarCode.vue'
+  import CheckoutQrCode from './CheckoutQrCode.vue'
 
+  const route = useRoute()
 
-import {useRoute} from "vue-router";
-import {onMounted, ref} from "vue";
-import {
-  CheckoutItemConfigResult,
-  CheckoutOrderAndConfigResult, checkoutPay, CheckoutPayParam, getCheckoutUrl,
-  getOrderAndConfig
-} from "./CheckoutPay.api";
-import {CheckoutCallTypeEnum, CheckoutTypeEnum,} from "@/enums/daxpay/channelEnum";
-import {useMessage} from "@/hooks/web/useMessage";
-
-const route = useRoute()
-
-const { orderNo } = route.params
+  const { orderNo } = route.params
+  const activeKey = ref<string>()
+  const { createMessage } = useMessage()
 
-const activeKey = ref<string>()
+  let payForm = ref<string>()
+  const aggregateUrl = ref('')
 
-const { createMessage } = useMessage()
+  const cashierQrCode = ref<any>()
+  const cashierBarCode = ref<any>()
 
-let payForm = ref<string>()
-const aggregateUrl = ref('1')
+  // 当前选择支付渠道和方式
+  let currentItem = ref<CheckoutItemConfigResult>({})
 
-// 当前选择支付渠道和方式
-let currentItem = ref<CheckoutItemConfigResult>({})
-
-
-const loading = ref(false)
-const orderAndConfig = ref<CheckoutOrderAndConfigResult>({
-  order: {},
-  config: {},
-  groupConfigs: [],
-})
+  const loading = ref(false)
+  const orderAndConfig = ref<CheckoutOrderAndConfigResult>({
+    order: {},
+    config: {},
+    groupConfigs: [],
+  })
 
-/**
- * 初始化
- */
-onMounted(() => {
-  initData()
-})
+  // 检查支付状态
+  const { pause, resume } = useIntervalFn(
+    () => {
+      findStatusByOrderNo(orderNo as string)
+        .then((res) => {
+          // 成功
+          if (res.data) {
+            createMessage.success('支付成功')
+            handleCancel()
+          }
+        })
+        .catch(() => {
+          // 失败
+          handleCancel()
+        })
+    },
+    1000 * 3,
+    { immediate: false },
+  )
 
-/**
- * 初始化数据
- */
-async function initData() {
-  // 获取收银台配置
-  await getOrderAndConfig(orderNo, CheckoutTypeEnum.PC).then(({ data }) => {
-    orderAndConfig.value = data
-    activeKey.value = orderAndConfig.value.groupConfigs?.[0].id
-    currentItem.value = orderAndConfig.value.groupConfigs?.[0].items?.[0] as CheckoutItemConfigResult
+  /**
+   * 初始化
+   */
+  onMounted(() => {
+    resume()
+    initData()
   })
-  // 是否同时显示聚合支付码
-  if (orderAndConfig.value.config.aggregateShow){
-    getCheckoutUrl(orderNo, CheckoutTypeEnum.AGGREGATE).then(({data})=>{
-      aggregateUrl.value = data
+
+  /**
+   * 初始化数据
+   */
+  async function initData() {
+    // 获取收银台配置
+    await getOrderAndConfig(orderNo, CheckoutTypeEnum.PC).then(({ data }) => {
+      orderAndConfig.value = data
+      activeKey.value = orderAndConfig.value.groupConfigs?.[0].id
+      currentItem.value = orderAndConfig.value.groupConfigs?.[0]
+        .items?.[0] as CheckoutItemConfigResult
     })
+    // 是否同时显示聚合支付码
+    if (orderAndConfig.value.config.aggregateShow) {
+      getCheckoutUrl(orderNo, CheckoutTypeEnum.AGGREGATE).then(({ data }) => {
+        aggregateUrl.value = data
+      })
+    }
   }
-}
-
-/**
- * 发起支付
- */
-function pay() {
-  // 条码支付
-  if (CheckoutCallTypeEnum.BAR_CODE === currentItem.value.callType){
 
+  /**
+   * 条码支付框显示
+   */
+  function barPayShow(aggregate) {
+    cashierBarCode.value.init(aggregate)
   }
 
-  // 支付调起类型
-  switch (currentItem.value.callType){
-    case CheckoutCallTypeEnum.LINK:{
-      break;
+  /**
+   * 发起支付
+   */
+  function pay() {
+    // 条码支付
+    if (CheckoutCallTypeEnum.BAR_CODE === currentItem.value.callType) {
+      barPayShow(false)
+      return
     }
-    case CheckoutCallTypeEnum.FROM:{
-      break;
 
+    loading.value = true
+    const from = {
+      orderNo,
+      itemId: currentItem.value.id,
+    } as CheckoutPayParam
+    checkoutPay(from).then(({ data }) => {
+      loading.value = false
+      payCall(data)
+    })
+  }
+
+  /**
+   * 支付调起操作
+   */
+  function payCall(data: PayResult) {
+    // 支付调起类型
+    switch (currentItem.value.callType) {
+      // 跳转到支付页面
+      case CheckoutCallTypeEnum.LINK: {
+        window.location.href = data.payBody as string
+        break
+      }
+      // 本地提交提交支付表单
+      case CheckoutCallTypeEnum.FROM: {
+        payForm.value = data.payBody
+        nextTick(() => {
+          console.log(document.forms[0])
+          document.forms[0].submit()
+        })
+        break
+      }
+      // 扫码支付
+      case CheckoutCallTypeEnum.QR_CODE: {
+        cashierQrCode.value.init(data.payBody)
+        break
+      }
+      default: {
+        createMessage.warning('暂不支持该支付方式')
+      }
     }
-    case CheckoutCallTypeEnum.QR_CODE:{
-      break;
-    }
-    case CheckoutCallTypeEnum.BAR_CODE:{
-      break;
-    }
-    default:{
-      createMessage.warning('暂不支持该支付方式')
+  }
+
+  /**
+   * 条码支付
+   */
+  function barPay(barCode: string, aggregate: boolean) {
+    if (aggregate) {
+      const param = {
+        orderNo,
+        barCode,
+      } as AggregateBarPayParam
+      aggregateBarPay(param).then(() => {
+        cashierBarCode.value.handleClose()
+      })
+    } else {
+      const param = {
+        orderNo,
+        itemId: currentItem.value,
+        barCode,
+      } as CheckoutPayParam
+      checkoutPay(param).then(() => {
+        cashierBarCode.value.handleClose()
+      })
     }
   }
 
-  loading.value = true
-  const from = {
-    orderNo,
-    itemId: currentItem.value.id,
-  } as CheckoutPayParam
-  checkoutPay(from).then(({ data }) => {
+  /**
+   * 关闭
+   */
+  function handleCancel() {
+    cashierQrCode.value.handleClose()
+    cashierBarCode.value.handleClose()
     loading.value = false
-    // 跳转到支付页面
-    location.replace(data.payBody as string)
-  })
-}
-
+    pause()
+  }
 </script>
 
-
 <style scoped lang="less">
-@import 'style.less';
+  @import 'style.less';
 </style>
diff --git a/src/views/daxpay/outside/checkout/CheckoutQrCode.vue b/src/views/daxpay/outside/checkout/CheckoutQrCode.vue
new file mode 100644
index 00000000..7fd8afc8
--- /dev/null
+++ b/src/views/daxpay/outside/checkout/CheckoutQrCode.vue
@@ -0,0 +1,36 @@
+<template>
+  <a-modal :open="visible" title="扫码支付" @cancel="handleCancel" :footer="null" :width="250">
+    <div style="display: flex; flex-direction: column; align-items: center; padding-top: 15px">
+      <qr-code :options="{ margin: 0 }" :width="180" :value="qrUrl" />
+      <div
+        class="mt-15px mb-15px"
+        style="display: flex; flex-direction: row; align-items: center; justify-content: center"
+      >
+      </div>
+    </div>
+  </a-modal>
+</template>
+
+<script lang="ts" setup>
+  import QrCode from '/@/components/Qrcode/src/Qrcode.vue'
+  import { ref } from 'vue'
+
+  let visible = ref(false)
+  let qrUrl = ref('')
+
+  const emits = defineEmits(['cancel'])
+  function init(url:string) {
+    visible.value = true
+    qrUrl.value = url
+  }
+  function handleCancel() {
+    handleClose()
+    emits('cancel')
+  }
+  function handleClose() {
+    visible.value = false
+  }
+  defineExpose({ init, handleClose })
+</script>
+
+<style scoped></style>
diff --git a/src/views/daxpay/outside/checkout/style.less b/src/views/daxpay/outside/checkout/style.less
index 2f514e2d..73c10ab5 100644
--- a/src/views/daxpay/outside/checkout/style.less
+++ b/src/views/daxpay/outside/checkout/style.less
@@ -1,15 +1,15 @@
 .page {
   box-sizing: border-box;
   min-height: 100%;
-  //padding-bottom: 80px;
-  //margin-top: 81px;
+  padding-bottom: 80px;
+  margin-top: 81px;
 }
-.paydemo {
+.pay {
   .content {
     max-width: 1120px;
     margin: 0 auto;
   }
-  .paydemo-type-content {
+  .pay-type-content {
     padding: 20px;
     margin-bottom: 10px;
     background-color: #FFFFFF;
@@ -26,46 +26,30 @@
     margin-right: 10px;
     cursor: pointer;
   }
-  .paydemoType {
+  .payType {
     padding: 12px;
     border: solid 2px #e2e2e2;
     margin-right: 10px;
     cursor: pointer;
   }
-  .paydemo-type-img {
+  .pay-type-img {
     width: 40px;
     height: 40px;
     vertical-align: center;
   }
-  .paydemo-type-name {
+  .pay-type-name {
     font-size: 16px;
     margin-bottom: 12px;
     display: flex;
     align-items: center;
   }
-  .paydemo-type-body {
+  .pay-type-body {
     display: flex;
     flex-direction: row;
     align-items: center;
     margin-bottom: 10px;
   }
-  .paydemo-type-h5 {
-    padding: 12px;
-    border: solid 2px #e2e2e2;
-    margin-right: 10px;
-    cursor: pointer;
-    font-size: 14px;
-  }
-  .codeImg_wx_h5 {
-    position: absolute;
-    z-index: 1001;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    background-color: #ffffff;
-    width: 160px;
-  }
-  .paydemo-form-item {
+  .pay-form-item {
     height: 38px;
     margin-bottom: 5px;
     display: flex;
-- 
Gitee


From 317fbb93b116f5141fa0d9ff428799a405704de0 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Thu, 5 Dec 2024 20:55:12 +0800
Subject: [PATCH 12/25] =?UTF-8?q?refactor(daxpay):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E5=88=86=E8=B4=A6=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2,=20?=
 =?UTF-8?q?=E5=A4=9A=E9=A1=B9=E9=85=8D=E7=BD=AE=E5=90=88=E5=B9=B6=E4=B8=BA?=
 =?UTF-8?q?=E6=89=80tabs=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocation/AllocationConfigModel.vue      |  49 ++++++
 .../allocation/group/AllocationGroupList.vue  | 150 ++++++++----------
 .../receiver/AllocationReceiverList.vue       | 114 ++++++-------
 .../daxpay/common/merchant/app/MchAppList.vue |  31 +---
 4 files changed, 174 insertions(+), 170 deletions(-)
 create mode 100644 src/views/daxpay/common/allocation/AllocationConfigModel.vue

diff --git a/src/views/daxpay/common/allocation/AllocationConfigModel.vue b/src/views/daxpay/common/allocation/AllocationConfigModel.vue
new file mode 100644
index 00000000..192f4ada
--- /dev/null
+++ b/src/views/daxpay/common/allocation/AllocationConfigModel.vue
@@ -0,0 +1,49 @@
+<template>
+  <basic-drawer
+    v-bind="$attrs"
+    width="70%"
+    title="分账组配置"
+    :mask-closable="true"
+    :open="visible"
+    @close="visible = false"
+  >
+    <a-tabs v-model:activeKey="activeKey" type="card">
+      <a-tab-pane :key="1" tab="分账配置">
+      </a-tab-pane>
+      <a-tab-pane :key="2" tab="分账接收方">
+        <AllocationReceiverList ref="allocationReceiverList" :appId="appId"/>
+      </a-tab-pane>
+      <a-tab-pane :key="3" tab="分账组">
+        <AllocationGroupList ref="allocationGroupList" :appId="appId" />
+      </a-tab-pane>
+    </a-tabs>
+  </basic-drawer>
+</template>
+
+<script setup lang="ts">
+  import AllocationReceiverList from '@/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue'
+  import AllocationGroupList from '@/views/daxpay/common/allocation/group/AllocationGroupList.vue'
+  import { ref } from 'vue'
+  import { BasicDrawer } from '@/components/Drawer'
+
+  const allocationReceiverList = ref<any>()
+  const allocationGroupList = ref<any>()
+
+  const visible = ref(false)
+  const activeKey = ref(2)
+  const appId = ref('')
+
+  /**
+   * 入口
+   * @param appid
+   */
+  function init(appid: string) {
+    visible.value = true
+    appId.value = appid
+  }
+
+
+  defineExpose({ init })
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/allocation/group/AllocationGroupList.vue b/src/views/daxpay/common/allocation/group/AllocationGroupList.vue
index 19aad6aa..371618e9 100644
--- a/src/views/daxpay/common/allocation/group/AllocationGroupList.vue
+++ b/src/views/daxpay/common/allocation/group/AllocationGroupList.vue
@@ -1,14 +1,6 @@
 <template>
-  <basic-drawer
-    showFooter
-    v-bind="$attrs"
-    width="70%"
-    title="分账组配置"
-    :mask-closable="true"
-    :open="visible"
-    @close="visible = false"
-  >
-    <div class="m-3 p-3 pt-5 bg-white">
+  <div>
+    <div class="p-3">
       <b-query
         :query-params="model.queryParam"
         :fields="fields"
@@ -27,62 +19,65 @@
           </a-space>
         </template>
       </vxe-toolbar>
-      <vxe-table
-        key-field="id"
-        ref="xTable"
-        :data="pagination.records"
-        :loading="loading"
-        :sort-config="{ remote: true, trigger: 'cell' }"
-        @sort-change="sortChange"
-      >
-        <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="groupNo" title="分组编号" :min-width="160">
-          <template #default="{ row }">
-            <a-link @click="show(row)">{{ row.groupNo }}</a-link>
-          </template>
-        </vxe-column>
-        <vxe-column field="name" title="分组名称" :min-width="160" />
-        <vxe-column field="channel" title="所属通道" :min-width="120" align="center">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('channel', row.channel) }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="totalRate" title="分账比例" align="center" :min-width="100">
-          <template #default="{ row }"> {{ row.totalRate }}% </template>
-        </vxe-column>
-        <vxe-column field="defaultGroup" title="默认分账组" align="center" :min-width="100">
-          <template #default="{ row }">
-            <a-tag color="green" v-if="row.defaultGroup">是</a-tag>
-            <a-tag v-else>否</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="remark" title="备注" :min-width="160" />
-        <vxe-column fixed="right" :min-width="160" :showOverflow="false" title="操作">
-          <template #default="{ row }">
-            <a-link danger @click="config(row)">接收方配置</a-link>
-            <a-divider type="vertical" />
-            <a-dropdown>
-              <a> 更多 <icon icon="ant-design:down-outlined" :size="12" /> </a>
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item v-if="!row.defaultGroup">
-                    <a-link @click="setUpDefault(row)">设为默认</a-link>
-                  </a-menu-item>
-                  <a-menu-item v-if="row.defaultGroup">
-                    <a-link @click="clearDefault(row)">取消默认</a-link>
-                  </a-menu-item>
-                  <a-menu-item>
-                    <a-link @click="edit(row)">编辑</a-link>
-                  </a-menu-item>
-                  <a-menu-item>
-                    <a-link danger :disabled="row.defaultGroup" @click="remove(row)">删除</a-link>
-                  </a-menu-item>
-                </a-menu>
-              </template>
-            </a-dropdown>
-          </template>
-        </vxe-column>
-      </vxe-table>
+      <div class="h-60vh">
+        <vxe-table
+          height="auto"
+          key-field="id"
+          ref="xTable"
+          :data="pagination.records"
+          :loading="loading"
+          :sort-config="{ remote: true, trigger: 'cell' }"
+          @sort-change="sortChange"
+        >
+          <vxe-column type="seq" title="序号" width="60" />
+          <vxe-column field="groupNo" title="分组编号" :min-width="160">
+            <template #default="{ row }">
+              <a-link @click="show(row)">{{ row.groupNo }}</a-link>
+            </template>
+          </vxe-column>
+          <vxe-column field="name" title="分组名称" :min-width="160" />
+          <vxe-column field="channel" title="所属通道" :min-width="120" align="center">
+            <template #default="{ row }">
+              <a-tag>{{ dictConvert('channel', row.channel) }}</a-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="totalRate" title="分账比例" align="center" :min-width="100">
+            <template #default="{ row }"> {{ row.totalRate }}% </template>
+          </vxe-column>
+          <vxe-column field="defaultGroup" title="默认分账组" align="center" :min-width="100">
+            <template #default="{ row }">
+              <a-tag color="green" v-if="row.defaultGroup">是</a-tag>
+              <a-tag v-else>否</a-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="remark" title="备注" :min-width="160" />
+          <vxe-column fixed="right" :min-width="160" :showOverflow="false" title="操作">
+            <template #default="{ row }">
+              <a-link danger @click="config(row)">接收方配置</a-link>
+              <a-divider type="vertical" />
+              <a-dropdown>
+                <a> 更多 <icon icon="ant-design:down-outlined" :size="12" /> </a>
+                <template #overlay>
+                  <a-menu>
+                    <a-menu-item v-if="!row.defaultGroup">
+                      <a-link @click="setUpDefault(row)">设为默认</a-link>
+                    </a-menu-item>
+                    <a-menu-item v-if="row.defaultGroup">
+                      <a-link @click="clearDefault(row)">取消默认</a-link>
+                    </a-menu-item>
+                    <a-menu-item>
+                      <a-link @click="edit(row)">编辑</a-link>
+                    </a-menu-item>
+                    <a-menu-item>
+                      <a-link danger :disabled="row.defaultGroup" @click="remove(row)">删除</a-link>
+                    </a-menu-item>
+                  </a-menu>
+                </template>
+              </a-dropdown>
+            </template>
+          </vxe-column>
+        </vxe-table>
+      </div>
       <vxe-pager
         size="medium"
         :loading="loading"
@@ -94,7 +89,7 @@
     </div>
     <AllocationGroupEdit ref="allocationGroupEdit" @ok="queryPage" />
     <AllocationGroupConfig ref="allocationGroupConfig" />
-  </basic-drawer>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -113,8 +108,10 @@
   import AllocationGroupConfig from './AllocationGroupConfig.vue'
   import { FormEditType } from '@/enums/formTypeEnum'
   import { findChannels } from '../receiver/AllocationReceiver.api'
-  import { BasicDrawer } from '@/components/Drawer'
 
+  const props = defineProps({
+    appId: String,
+  })
   // 使用hooks
   const {
     handleTableChange,
@@ -130,13 +127,11 @@
   const { createMessage, createConfirm } = useMessage()
   const { dictConvert } = useDict()
 
-  const appId = ref('')
   const allocationGroupEdit = ref<any>()
   const allocationGroupConfig = ref<any>()
   const xTable = ref<VxeTableInstance>()
   const xToolbar = ref<VxeToolbarInstance>()
 
-  const visible = ref(false)
   let payChannelList = ref<LabeledValue[]>([])
 
   const fields = computed(() => {
@@ -155,6 +150,7 @@
   onMounted(() => {
     vxeBind()
     initData()
+    queryPage()
   })
 
   /**
@@ -164,15 +160,6 @@
     xTable.value?.connect(xToolbar.value as VxeToolbarInstance)
   }
 
-  /**
-   * 入口
-   */
-  function init(mchAppId) {
-    appId.value = mchAppId
-    visible.value = true
-    queryPage()
-  }
-
   /**
    * 初始化数据
    */
@@ -184,7 +171,7 @@
    * 新建
    */
   function add() {
-    allocationGroupEdit.value.init(null, FormEditType.Add, appId.value)
+    allocationGroupEdit.value.init(null, FormEditType.Add, props.appId)
   }
 
   /**
@@ -215,7 +202,7 @@
     loading.value = true
     page({
       ...model.queryParam,
-      appId: appId.value,
+      appId: props.appId,
       ...pages,
       ...sortParam,
     }).then(({ data }) => {
@@ -277,7 +264,6 @@
       },
     })
   }
-  defineExpose({ init })
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue b/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
index 4f053c44..071596fc 100644
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
+++ b/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
@@ -1,14 +1,6 @@
 <template>
-  <basic-drawer
-    showFooter
-    v-bind="$attrs"
-    width="70%"
-    title="接收方配置"
-    :mask-closable="true"
-    :open="visible"
-    @close="visible = false"
-  >
-    <div class="m-3 p-3 pt-5 bg-white">
+  <div>
+    <div class="p-3">
       <b-query
         :query-params="model.queryParam"
         :fields="fields"
@@ -27,45 +19,48 @@
           </a-space>
         </template>
       </vxe-toolbar>
-      <vxe-table
-        key-field="id"
-        ref="xTable"
-        :data="pagination.records"
-        :loading="loading"
-        :sort-config="{ remote: true, trigger: 'cell' }"
-        @sort-change="sortChange"
-      >
-        <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="receiverNo" title="接收方编号" :min-width="180">
-          <template #default="{ row }">
-            <a-link @click="show(row)">{{ row.receiverNo }}</a-link>
-          </template>
-        </vxe-column>
-        <vxe-column field="channel" title="所属通道" :min-width="150" align="center">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('channel', row.channel) }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="receiverType" title="接收方类型" :min-width="100" align="center">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('alloc_receiver_type', row.receiverType) }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="receiverAccount" title="接收方账号" :min-width="230" />
-        <vxe-column field="receiverName" title="接收方姓名" :min-width="160" />
-        <vxe-column field="relationType" title="分账关系" :min-width="100" align="center">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('alloc_relation_type', row.relationType) }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column fixed="right" min-width="100" :showOverflow="false" title="操作">
-          <template #default="{ row }">
-            <a-link @click="show(row)">查看</a-link>
-            <a-divider type="vertical" />
-            <a-link @click="remove(row)">删除</a-link>
-          </template>
-        </vxe-column>
-      </vxe-table>
+      <div class="h-60vh">
+        <vxe-table
+          height="auto"
+          key-field="id"
+          ref="xTable"
+          :data="pagination.records"
+          :loading="loading"
+          :sort-config="{ remote: true, trigger: 'cell' }"
+          @sort-change="sortChange"
+        >
+          <vxe-column type="seq" title="序号" width="60" />
+          <vxe-column field="receiverNo" title="接收方编号" :min-width="180">
+            <template #default="{ row }">
+              <a-link @click="show(row)">{{ row.receiverNo }}</a-link>
+            </template>
+          </vxe-column>
+          <vxe-column field="channel" title="所属通道" :min-width="150" align="center">
+            <template #default="{ row }">
+              <a-tag>{{ dictConvert('channel', row.channel) }}</a-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="receiverType" title="接收方类型" :min-width="100" align="center">
+            <template #default="{ row }">
+              <a-tag>{{ dictConvert('alloc_receiver_type', row.receiverType) }}</a-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="receiverAccount" title="接收方账号" :min-width="230" />
+          <vxe-column field="receiverName" title="接收方姓名" :min-width="160" />
+          <vxe-column field="relationType" title="分账关系" :min-width="100" align="center">
+            <template #default="{ row }">
+              <a-tag>{{ dictConvert('alloc_relation_type', row.relationType) }}</a-tag>
+            </template>
+          </vxe-column>
+          <vxe-column fixed="right" min-width="100" :showOverflow="false" title="操作">
+            <template #default="{ row }">
+              <a-link @click="show(row)">查看</a-link>
+              <a-divider type="vertical" />
+              <a-link @click="remove(row)">删除</a-link>
+            </template>
+          </vxe-column>
+        </vxe-table>
+      </div>
       <vxe-pager
         size="medium"
         :loading="loading"
@@ -76,7 +71,7 @@
       />
     </div>
     <AllocationReceiverEdit ref="allocationReceiverEdit" @ok="queryPage" />
-  </basic-drawer>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -92,7 +87,10 @@
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import AllocationReceiverEdit from './AllocationReceiverEdit.vue'
   import { FormEditType } from '@/enums/formTypeEnum'
-  import { BasicDrawer } from '@/components/Drawer'
+
+  const props = defineProps({
+    appId: String,
+  })
 
   // 使用hooks
   const {
@@ -109,8 +107,6 @@
   const { createMessage, createConfirm } = useMessage()
   const { dictConvert, dictDropDown } = useDict()
 
-  const appId = ref('')
-  const visible = ref(false)
   const allocationReceiverEdit = ref<any>()
   const xTable = ref<VxeTableInstance>()
   const xToolbar = ref<VxeToolbarInstance>()
@@ -148,13 +144,8 @@
   onMounted(() => {
     vxeBind()
     initData()
-  })
-
-  function init(mchAppId: string) {
-    visible.value = true
-    appId.value = mchAppId
     queryPage()
-  }
+  })
 
   /**
    * 绑定
@@ -176,7 +167,7 @@
    * 新建
    */
   function add() {
-    allocationReceiverEdit.value.init(null, FormEditType.Add, appId)
+    allocationReceiverEdit.value.init(null, FormEditType.Add, props.appId)
   }
 
   /**
@@ -193,7 +184,7 @@
     loading.value = true
     page({
       ...model.queryParam,
-      appId: appId.value,
+      appId: props.appId,
       ...pages,
       ...sortParam,
     }).then(({ data }) => {
@@ -219,7 +210,6 @@
       },
     })
   }
-  defineExpose({ init })
 </script>
 
 <style scoped lang="less"></style>
diff --git a/src/views/daxpay/common/merchant/app/MchAppList.vue b/src/views/daxpay/common/merchant/app/MchAppList.vue
index d2600bb2..f40be7a7 100644
--- a/src/views/daxpay/common/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppList.vue
@@ -67,14 +67,8 @@
                     <a-menu-item>
                       <a-link @click="showCashierCode(row)">码牌配置</a-link>
                     </a-menu-item>
-                    <!--                    <a-menu-item>-->
-                    <!--                      <a-link @click="showAllocConfig(row)">分账配置</a-link>-->
-                    <!--                    </a-menu-item>-->
                     <a-menu-item>
-                      <a-link @click="showAllocReceiver(row)">分账接收方</a-link>
-                    </a-menu-item>
-                    <a-menu-item>
-                      <a-link @click="showAllocGroup(row)">分账组</a-link>
+                      <a-link @click="showAllocConfig(row)">分账配置</a-link>
                     </a-menu-item>
                     <a-menu-item>
                       <a-link danger @click="remove(row)">删除应用</a-link>
@@ -99,8 +93,7 @@
       <MerchantNotifyConfigList ref="merchantNotifyConfigList" />
       <CashierCodeConfigList ref="cashierCodeConfigList" />
       <CheckoutConfigModel ref="checkoutConfigModel" />
-      <AllocationReceiverList ref="allocationReceiverList" />
-      <AllocationGroupList ref="allocationGroupList" />
+      <AllocationConfigModel ref="allocationConfigModel" />
     </div>
   </div>
 </template>
@@ -120,10 +113,9 @@
   import ChannelConfigList from '@/views/daxpay/common/merchant/channel/ChannelConfigList.vue'
   import MerchantNotifyConfigList from '@/views/daxpay/common/merchant/notify/MerchantNotifyConfigList.vue'
   import Icon from '@/components/Icon/Icon.vue'
-  import AllocationReceiverList from '@/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue'
-  import AllocationGroupList from '@/views/daxpay/common/allocation/group/AllocationGroupList.vue'
   import CashierCodeConfigList from '@/views/daxpay/common/config/cashier/code/CashierCodeConfigList.vue'
   import CheckoutConfigModel from '@/views/daxpay/common/config/checkout/CheckoutConfigModel.vue'
+  import AllocationConfigModel from '@/views/daxpay/common/allocation/AllocationConfigModel.vue'
 
   // 使用hooks
   const {
@@ -152,8 +144,7 @@
   const merchantNotifyConfigList = ref<any>()
   const cashierCodeConfigList = ref<any>()
   const checkoutConfigModel = ref<any>()
-  const allocationReceiverList = ref<any>()
-  const allocationGroupList = ref<any>()
+  const allocationConfigModel = ref<any>()
 
   onMounted(() => {
     vxeBind()
@@ -222,19 +213,7 @@
    * 分账配置
    */
   function showAllocConfig(record) {
-    createMessage.warn('暂未开放')
-  }
-  /**
-   * 分账接收方
-   */
-  function showAllocReceiver(record) {
-    allocationReceiverList.value.init(record.appId)
-  }
-  /**
-   * 分账组
-   */
-  function showAllocGroup(record) {
-    allocationGroupList.value.init(record.appId)
+    allocationConfigModel.value.init(record.appId)
   }
   /**
    * 删除
-- 
Gitee


From 3c423633c5db23d149e354d9bed246c04ae9eb44 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Sun, 8 Dec 2024 10:55:35 +0800
Subject: [PATCH 13/25] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE=E6=97=B6=E7=AD=BE?=
 =?UTF-8?q?=E5=90=8D=E7=A7=98=E9=92=A5=E9=BB=98=E8=AE=A4=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E4=BC=9A=E6=94=B9=E5=8F=98=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../daxpay/common/merchant/app/MchAppEdit.vue    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/daxpay/common/merchant/app/MchAppEdit.vue b/src/views/daxpay/common/merchant/app/MchAppEdit.vue
index 3fd7927e..ebe6501d 100644
--- a/src/views/daxpay/common/merchant/app/MchAppEdit.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppEdit.vue
@@ -78,7 +78,7 @@
             >
           </a-radio-group>
         </a-form-item>
-        <a-form-item label="通知地址" name="notifyUrl" v-if="form.notifyType !== 'none'">
+        <a-form-item label="通知地址" name="notifyUrl" v-show="form.notifyType !== 'none'">
           <a-input
             v-model:value="form.notifyUrl"
             :disabled="showable"
@@ -135,6 +135,7 @@
     signType: 'hmac_sha256',
     limitAmount: 200.0,
     orderTimeout: 30,
+    signSecret: '',
     reqSign: true,
   })
   const signTypes = ref<LabeledValue[]>([])
@@ -156,10 +157,10 @@
   /**
    * 入口
    */
-  function init(id, editType: FormEditType) {
+  async function init(id, editType: FormEditType) {
     initData()
     initFormEditType(editType)
-    resetForm()
+    await resetForm()
     getInfo(id, editType)
   }
 
@@ -210,13 +211,18 @@
    * 生成秘钥
    */
   function genSignSecret() {
+    console.log(form.value.signSecret)
     form.value.signSecret = buildUUID() + buildUUID()
+    console.log(form.value.signSecret)
   }
   /**
    * 重置表单的校验
    */
-  function resetForm() {
-    nextTick(() => formRef.value?.resetFields())
+  async function resetForm() {
+    await nextTick(() => {
+      formRef.value?.resetFields()
+      console.log(form.value)
+    })
   }
   defineExpose({
     init,
-- 
Gitee


From a67c0bb092915cfd04ed6045bc4e3209aa84df00 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Sun, 8 Dec 2024 22:30:23 +0800
Subject: [PATCH 14/25] =?UTF-8?q?feat(menu):=20=E6=B7=BB=E5=8A=A0=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=85=A8=E5=B1=8F=E5=B1=9E=E6=80=A7=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=88=86=E8=B4=A6=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在菜单模型中添加全屏属性，用于控制菜单是否全屏显示- 优化分账配置界面，增加分账模式选项
- 修改支付限额帮助信息，明确以应用支付限额为准
- 移除微信支付配置中的沙箱环境选项
- 更新收银台配置和通道配置界面标题
---
 src/api/sys/model/menuModel.ts                      |  1 +
 src/store/modules/permission.ts                     |  1 +
 .../common/allocation/AllocationConfigModel.vue     | 11 +++++------
 .../allocation/config/AllocationConfig.api.ts       |  0
 .../common/allocation/config/AllocationConfig.vue   | 11 +++++++++++
 .../channel/alipay/config/AlipayConfigEdit.vue      |  2 +-
 .../channel/union/config/UnionPayConfigEdit.vue     |  2 +-
 .../channel/wechat/config/WechatPayConfig.api.ts    |  2 --
 .../channel/wechat/config/WechatPayConfigEdit.vue   | 13 +++++++------
 .../common/config/checkout/CheckoutConfigModel.vue  |  2 +-
 .../common/merchant/channel/ChannelConfigList.vue   |  1 -
 11 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
 create mode 100644 src/views/daxpay/common/allocation/config/AllocationConfig.vue

diff --git a/src/api/sys/model/menuModel.ts b/src/api/sys/model/menuModel.ts
index 09c8153a..20f5a4b7 100644
--- a/src/api/sys/model/menuModel.ts
+++ b/src/api/sys/model/menuModel.ts
@@ -16,5 +16,6 @@ export interface PermMenu {
   sortNo: number
   keepAlive: boolean
   targetOutside: boolean
+  fullScreen: boolean
   children: Array<PermMenu>
 }
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 194bf1d1..f674fb5f 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -103,6 +103,7 @@ export const usePermissionStore = defineStore({
             targetOutside: o.targetOutside,
             iframeUrl: o.iframeUrl,
             redirect: o.redirect,
+            fullScreen: o.fullScreen,
             meta: {
               orderNo: o.sortNo,
               title: o.title,
diff --git a/src/views/daxpay/common/allocation/AllocationConfigModel.vue b/src/views/daxpay/common/allocation/AllocationConfigModel.vue
index 192f4ada..3040c2e6 100644
--- a/src/views/daxpay/common/allocation/AllocationConfigModel.vue
+++ b/src/views/daxpay/common/allocation/AllocationConfigModel.vue
@@ -8,13 +8,14 @@
     @close="visible = false"
   >
     <a-tabs v-model:activeKey="activeKey" type="card">
-      <a-tab-pane :key="1" tab="分账配置">
+      <a-tab-pane :key="1" tab="分账模式">
+        <AllocationConfig :appId="appId"/>
       </a-tab-pane>
       <a-tab-pane :key="2" tab="分账接收方">
-        <AllocationReceiverList ref="allocationReceiverList" :appId="appId"/>
+        <AllocationReceiverList :appId="appId"/>
       </a-tab-pane>
       <a-tab-pane :key="3" tab="分账组">
-        <AllocationGroupList ref="allocationGroupList" :appId="appId" />
+        <AllocationGroupList :appId="appId" />
       </a-tab-pane>
     </a-tabs>
   </basic-drawer>
@@ -25,9 +26,7 @@
   import AllocationGroupList from '@/views/daxpay/common/allocation/group/AllocationGroupList.vue'
   import { ref } from 'vue'
   import { BasicDrawer } from '@/components/Drawer'
-
-  const allocationReceiverList = ref<any>()
-  const allocationGroupList = ref<any>()
+  import AllocationConfig from "@/views/daxpay/common/allocation/config/AllocationConfig.vue";
 
   const visible = ref(false)
   const activeKey = ref(2)
diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts b/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.vue b/src/views/daxpay/common/allocation/config/AllocationConfig.vue
new file mode 100644
index 00000000..0a8d203d
--- /dev/null
+++ b/src/views/daxpay/common/allocation/config/AllocationConfig.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+
+</template>
+
+<style scoped lang="less">
+
+</style>
diff --git a/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue b/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue
index 1607a0ce..71452ffe 100644
--- a/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue
+++ b/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue
@@ -34,7 +34,7 @@
         <a-form-item name="limitAmount">
           <template #label>
             <basic-title
-              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了全局支付限额，则以额度低的为准"
+              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了应用支付限额，则以额度低的为准"
             >
               支付限额(元)
             </basic-title>
diff --git a/src/views/daxpay/common/channel/union/config/UnionPayConfigEdit.vue b/src/views/daxpay/common/channel/union/config/UnionPayConfigEdit.vue
index 5af10284..03052eba 100644
--- a/src/views/daxpay/common/channel/union/config/UnionPayConfigEdit.vue
+++ b/src/views/daxpay/common/channel/union/config/UnionPayConfigEdit.vue
@@ -38,7 +38,7 @@
         <a-form-item name="limitAmount">
           <template #label>
             <basic-title
-              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了全局支付限额，则以额度低的为准"
+              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了应用支付限额，则以额度低的为准"
             >
               支付限额(元)
             </basic-title>
diff --git a/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts b/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
index a863e5c2..fcc946d6 100644
--- a/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
+++ b/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
@@ -60,8 +60,6 @@ export interface WechatPayConfig extends MchEntity {
   notifyUrl?: string
   // 页面跳转同步通知页面路径
   returnUrl?: string
-  // 是否沙箱环境
-  sandbox?: boolean
   // 备注
   remark?: string
 }
diff --git a/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue b/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
index 89abb11f..c3e5f920 100644
--- a/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
+++ b/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
@@ -62,7 +62,7 @@
         <a-form-item name="limitAmount">
           <template #label>
             <basic-title
-              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了全局支付限额，则以额度低的为准"
+              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了应用支付限额，则以额度低的为准"
             >
               支付限额(元)
             </basic-title>
@@ -74,9 +74,6 @@
             placeholder="请输入支付限额(元)"
           />
         </a-form-item>
-        <a-form-item label="沙箱环境" name="sandbox">
-          <a-switch checked-children="是" un-checked-children="否" v-model:checked="form.sandbox" />
-        </a-form-item>
         <a-form-item label="API版本" name="apiVersion">
           <a-radio-group v-model:value="form.apiVersion" button-style="solid">
             <a-radio-button value="apiV2"> API_V2 </a-radio-button>
@@ -99,7 +96,12 @@
             placeholder="请输入APIv3密钥"
           />
         </a-form-item>
-        <a-form-item label="证书序列号" name="certSerialNo">
+        <a-form-item name="certSerialNo">
+          <template #label>
+            <basic-title helpMessage="登录微信支付平台进入到账户中心 – API安全 – 查看证书, 查看证书序列号">
+              证书序列号
+            </basic-title>
+          </template>
           <a-input
             :disabled="showable"
             v-model:value="form.certSerialNo"
@@ -247,7 +249,6 @@
     apiKeyV3: '',
     notifyUrl: '',
     returnUrl: '',
-    sandbox: false,
     remark: '',
   })
 
diff --git a/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue b/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue
index 5c72d925..4bb99960 100644
--- a/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue
+++ b/src/views/daxpay/common/config/checkout/CheckoutConfigModel.vue
@@ -3,7 +3,7 @@
     destroyOnClose
     v-bind="$attrs"
     width="60%"
-    title="码牌配置"
+    title="收银台配置"
     :mask-closable="true"
     :open="visible"
     @close="handleCancel"
diff --git a/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue b/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
index 2fdff5e2..7fe9a8da 100644
--- a/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
+++ b/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
@@ -1,6 +1,5 @@
 <template>
   <basic-drawer
-    showFooter
     v-bind="$attrs"
     width="70%"
     title="通道配置"
-- 
Gitee


From 7ce5a26d3fd8d329528cb73b006a4c5e333e2e13 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Mon, 9 Dec 2024 19:48:27 +0800
Subject: [PATCH 15/25] =?UTF-8?q?feat=20=E5=9F=BA=E7=A1=80=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E5=8D=87=E7=BA=A7=EF=BC=8C=20=E5=88=86=E8=B4=A6?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   46 +-
 pnpm-lock.yaml                                | 2813 ++++++++++-------
 .../allocation/AllocationConfigModel.vue      |   13 +-
 .../allocation/config/AllocationConfig.api.ts |   37 +
 .../allocation/config/AllocationConfig.vue    |  123 +-
 5 files changed, 1834 insertions(+), 1198 deletions(-)

diff --git a/package.json b/package.json
index 1a6f7968..8e6cfa4b 100644
--- a/package.json
+++ b/package.json
@@ -56,12 +56,12 @@
     "@ant-design/icons-vue": "^7.0.1",
     "@iconify/iconify": "^3.1.1",
     "@vben/hooks": "workspace:*",
-    "@vue/shared": "^3.5.8",
+    "@vue/shared": "^3.5.13",
     "@vueuse/core": "^10.11.1",
     "@vueuse/shared": "^10.11.1",
     "@zxcvbn-ts/core": "^3.0.4",
-    "ant-design-vue": "^4.2.5",
-    "axios": "^1.7.7",
+    "ant-design-vue": "^4.2.6",
+    "axios": "^1.7.9",
     "codemirror": "^5.65.18",
     "cropperjs": "^1.6.2",
     "crypto-js": "^4.2.0",
@@ -73,31 +73,31 @@
     "pinia": "2.1.7",
     "pinia-plugin-persistedstate": "^3.2.3",
     "qrcode": "^1.5.4",
-    "qs": "^6.13.0",
+    "qs": "^6.13.1",
     "resize-observer-polyfill": "^1.5.1",
     "showdown": "^2.1.0",
-    "sortablejs": "^1.15.3",
+    "sortablejs": "^1.15.6",
     "unocss": "^0.59.4",
-    "vue": "^3.5.8",
+    "vue": "^3.5.13",
     "vue-json-pretty": "^2.4.0",
-    "vue-router": "^4.4.5",
+    "vue-router": "4.3.3",
     "vue-types": "^5.1.3",
     "vuedraggable": "^4.1.0",
-    "vxe-pc-ui": "^4.2.2",
-    "vxe-table": "^4.7.81",
-    "xe-utils": "^3.5.30"
+    "vxe-pc-ui": "^4.3.23",
+    "vxe-table": "^4.9.19",
+    "xe-utils": "^3.5.32"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.5.0",
-    "@commitlint/config-conventional": "^19.5.0",
-    "@iconify/json": "^2.2.252",
+    "@commitlint/cli": "^19.6.0",
+    "@commitlint/config-conventional": "^19.6.0",
+    "@iconify/json": "^2.2.281",
     "@purge-icons/generated": "^0.10.0",
     "@types/codemirror": "^5.60.15",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash-es": "^4.17.12",
     "@types/nprogress": "^0.2.3",
     "@types/qrcode": "^1.5.5",
-    "@types/qs": "^6.9.16",
+    "@types/qs": "^6.9.17",
     "@types/showdown": "^2.0.6",
     "@types/sortablejs": "^1.15.8",
     "@vben/eslint-config": "workspace:*",
@@ -105,22 +105,22 @@
     "@vben/ts-config": "workspace:*",
     "@vben/types": "workspace:*",
     "@vben/vite-config": "workspace:*",
-    "@vue/compiler-sfc": "^3.5.8",
+    "@vue/compiler-sfc": "^3.5.13",
     "@vue/test-utils": "^2.4.6",
     "conventional-changelog-cli": "^4.1.0",
     "cross-env": "^7.0.3",
-    "cz-git": "^1.9.4",
-    "czg": "^1.9.4",
+    "cz-git": "^1.11.0",
+    "czg": "^1.11.0",
     "lint-staged": "15.2.2",
-    "prettier": "^3.3.3",
-    "prettier-plugin-packagejson": "^2.5.2",
+    "prettier": "^3.4.2",
+    "prettier-plugin-packagejson": "^2.5.6",
     "rimraf": "^5.0.10",
     "turbo": "^1.13.4",
-    "typescript": "^5.6.2",
+    "typescript": "^5.7.2",
     "unbuild": "^2.0.0",
-    "vite": "^5.4.7",
-    "vite-plugin-vue-devtools": "^7.4.5",
-    "vue-tsc": "^2.1.6"
+    "vite": "^5.4.11",
+    "vite-plugin-vue-devtools": "^7.6.7",
+    "vue-tsc": "^2.1.10"
   },
   "engines": {
     "node": ">=18.12.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 415ffa4b..fb313300 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -10,7 +10,7 @@ importers:
     dependencies:
       '@ant-design/icons-vue':
         specifier: ^7.0.1
-        version: 7.0.1(vue@3.5.8(typescript@5.6.2))
+        version: 7.0.1(vue@3.5.13(typescript@5.7.2))
       '@iconify/iconify':
         specifier: ^3.1.1
         version: 3.1.1
@@ -18,23 +18,23 @@ importers:
         specifier: workspace:*
         version: link:packages/hooks
       '@vue/shared':
-        specifier: ^3.5.8
-        version: 3.5.8
+        specifier: ^3.5.13
+        version: 3.5.13
       '@vueuse/core':
         specifier: ^10.11.1
-        version: 10.11.1(vue@3.5.8(typescript@5.6.2))
+        version: 10.11.1(vue@3.5.13(typescript@5.7.2))
       '@vueuse/shared':
         specifier: ^10.11.1
-        version: 10.11.1(vue@3.5.8(typescript@5.6.2))
+        version: 10.11.1(vue@3.5.13(typescript@5.7.2))
       '@zxcvbn-ts/core':
         specifier: ^3.0.4
         version: 3.0.4
       ant-design-vue:
-        specifier: ^4.2.5
-        version: 4.2.5(vue@3.5.8(typescript@5.6.2))
+        specifier: ^4.2.6
+        version: 4.2.6(vue@3.5.13(typescript@5.7.2))
       axios:
-        specifier: ^1.7.7
-        version: 1.7.7
+        specifier: ^1.7.9
+        version: 1.7.9
       codemirror:
         specifier: ^5.65.18
         version: 5.65.18
@@ -61,16 +61,16 @@ importers:
         version: 6.3.0
       pinia:
         specifier: 2.1.7
-        version: 2.1.7(typescript@5.6.2)(vue@3.5.8(typescript@5.6.2))
+        version: 2.1.7(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2))
       pinia-plugin-persistedstate:
         specifier: ^3.2.3
-        version: 3.2.3(pinia@2.1.7(typescript@5.6.2)(vue@3.5.8(typescript@5.6.2)))
+        version: 3.2.3(pinia@2.1.7(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))
       qrcode:
         specifier: ^1.5.4
         version: 1.5.4
       qs:
-        specifier: ^6.13.0
-        version: 6.13.0
+        specifier: ^6.13.1
+        version: 6.13.1
       resize-observer-polyfill:
         specifier: ^1.5.1
         version: 1.5.1
@@ -78,45 +78,45 @@ importers:
         specifier: ^2.1.0
         version: 2.1.0
       sortablejs:
-        specifier: ^1.15.3
-        version: 1.15.3
+        specifier: ^1.15.6
+        version: 1.15.6
       unocss:
         specifier: ^0.59.4
-        version: 0.59.4(postcss@8.4.47)(rollup@3.29.5)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3))
+        version: 0.59.4(postcss@8.4.49)(rollup@3.29.5)(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3))
       vue:
-        specifier: ^3.5.8
-        version: 3.5.8(typescript@5.6.2)
+        specifier: ^3.5.13
+        version: 3.5.13(typescript@5.7.2)
       vue-json-pretty:
         specifier: ^2.4.0
-        version: 2.4.0(vue@3.5.8(typescript@5.6.2))
+        version: 2.4.0(vue@3.5.13(typescript@5.7.2))
       vue-router:
-        specifier: ^4.4.5
-        version: 4.4.5(vue@3.5.8(typescript@5.6.2))
+        specifier: 4.3.3
+        version: 4.3.3(vue@3.5.13(typescript@5.7.2))
       vue-types:
         specifier: ^5.1.3
-        version: 5.1.3(vue@3.5.8(typescript@5.6.2))
+        version: 5.1.3(vue@3.5.13(typescript@5.7.2))
       vuedraggable:
         specifier: ^4.1.0
-        version: 4.1.0(vue@3.5.8(typescript@5.6.2))
+        version: 4.1.0(vue@3.5.13(typescript@5.7.2))
       vxe-pc-ui:
-        specifier: ^4.2.2
-        version: 4.2.2
+        specifier: ^4.3.23
+        version: 4.3.23(vue@3.5.13(typescript@5.7.2))
       vxe-table:
-        specifier: ^4.7.81
-        version: 4.7.81
+        specifier: ^4.9.19
+        version: 4.9.19(vue@3.5.13(typescript@5.7.2))
       xe-utils:
-        specifier: ^3.5.30
-        version: 3.5.30
+        specifier: ^3.5.32
+        version: 3.5.32
     devDependencies:
       '@commitlint/cli':
-        specifier: ^19.5.0
-        version: 19.5.0(@types/node@22.5.5)(typescript@5.6.2)
+        specifier: ^19.6.0
+        version: 19.6.0(@types/node@22.10.1)(typescript@5.7.2)
       '@commitlint/config-conventional':
-        specifier: ^19.5.0
-        version: 19.5.0
+        specifier: ^19.6.0
+        version: 19.6.0
       '@iconify/json':
-        specifier: ^2.2.252
-        version: 2.2.252
+        specifier: ^2.2.281
+        version: 2.2.281
       '@purge-icons/generated':
         specifier: ^0.10.0
         version: 0.10.0
@@ -136,8 +136,8 @@ importers:
         specifier: ^1.5.5
         version: 1.5.5
       '@types/qs':
-        specifier: ^6.9.16
-        version: 6.9.16
+        specifier: ^6.9.17
+        version: 6.9.17
       '@types/showdown':
         specifier: ^2.0.6
         version: 2.0.6
@@ -160,8 +160,8 @@ importers:
         specifier: workspace:*
         version: link:internal/vite-config
       '@vue/compiler-sfc':
-        specifier: ^3.5.8
-        version: 3.5.8
+        specifier: ^3.5.13
+        version: 3.5.13
       '@vue/test-utils':
         specifier: ^2.4.6
         version: 2.4.6
@@ -172,20 +172,20 @@ importers:
         specifier: ^7.0.3
         version: 7.0.3
       cz-git:
-        specifier: ^1.9.4
-        version: 1.9.4
+        specifier: ^1.11.0
+        version: 1.11.0
       czg:
-        specifier: ^1.9.4
-        version: 1.9.4
+        specifier: ^1.11.0
+        version: 1.11.0
       lint-staged:
         specifier: 15.2.2
         version: 15.2.2
       prettier:
-        specifier: ^3.3.3
-        version: 3.3.3
+        specifier: ^3.4.2
+        version: 3.4.2
       prettier-plugin-packagejson:
-        specifier: ^2.5.2
-        version: 2.5.2(prettier@3.3.3)
+        specifier: ^2.5.6
+        version: 2.5.6(prettier@3.4.2)
       rimraf:
         specifier: ^5.0.10
         version: 5.0.10
@@ -193,20 +193,20 @@ importers:
         specifier: ^1.13.4
         version: 1.13.4
       typescript:
-        specifier: ^5.6.2
-        version: 5.6.2
+        specifier: ^5.7.2
+        version: 5.7.2
       unbuild:
         specifier: ^2.0.0
-        version: 2.0.0(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2))
+        version: 2.0.0(typescript@5.7.2)(vue-tsc@2.1.10(typescript@5.7.2))
       vite:
-        specifier: ^5.4.7
-        version: 5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3)
+        specifier: ^5.4.11
+        version: 5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3)
       vite-plugin-vue-devtools:
-        specifier: ^7.4.5
-        version: 7.4.5(rollup@3.29.5)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3))(vue@3.5.8(typescript@5.6.2))
+        specifier: ^7.6.7
+        version: 7.6.7(rollup@3.29.5)(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3))(vue@3.5.13(typescript@5.7.2))
       vue-tsc:
-        specifier: ^2.1.6
-        version: 2.1.6(typescript@5.6.2)
+        specifier: ^2.1.10
+        version: 2.1.10(typescript@5.7.2)
 
   apps/test-server:
     dependencies:
@@ -267,7 +267,7 @@ importers:
         version: 4.2.0
       tsup:
         specifier: ^7.1.0
-        version: 7.3.0(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)
+        version: 7.3.0(postcss@8.4.49)(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5)
       typescript:
         specifier: ^5.1.6
         version: 5.4.5
@@ -276,10 +276,10 @@ importers:
     devDependencies:
       '@typescript-eslint/eslint-plugin':
         specifier: ^7.0.1
-        version: 7.7.0(@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)(typescript@5.6.2)
+        version: 7.7.0(@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2)
       '@typescript-eslint/parser':
         specifier: ^7.0.1
-        version: 7.7.0(eslint@8.57.0)(typescript@5.6.2)
+        version: 7.7.0(eslint@8.57.0)(typescript@5.7.2)
       eslint:
         specifier: ^8.56.0
         version: 8.57.0
@@ -288,10 +288,10 @@ importers:
         version: 9.1.0(eslint@8.57.0)
       eslint-plugin-import:
         specifier: ^2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)
+        version: 2.29.1(@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)
       eslint-plugin-prettier:
         specifier: ^5.1.3
-        version: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.3)
+        version: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.4.2)
       eslint-plugin-simple-import-sort:
         specifier: ^12.0.0
         version: 12.1.0(eslint@8.57.0)
@@ -321,28 +321,28 @@ importers:
         version: 3.2.5
       stylelint:
         specifier: ^16.4.0
-        version: 16.4.0(typescript@5.6.2)
+        version: 16.4.0(typescript@5.7.2)
       stylelint-config-property-sort-order-smacss:
         specifier: ^10.0.0
-        version: 10.0.0(stylelint@16.4.0(typescript@5.6.2))
+        version: 10.0.0(stylelint@16.4.0(typescript@5.7.2))
       stylelint-config-recommended-scss:
         specifier: ^14.0.0
-        version: 14.0.0(postcss@8.4.38)(stylelint@16.4.0(typescript@5.6.2))
+        version: 14.0.0(postcss@8.4.38)(stylelint@16.4.0(typescript@5.7.2))
       stylelint-config-recommended-vue:
         specifier: ^1.5.0
-        version: 1.5.0(postcss-html@1.6.0)(stylelint@16.4.0(typescript@5.6.2))
+        version: 1.5.0(postcss-html@1.6.0)(stylelint@16.4.0(typescript@5.7.2))
       stylelint-config-standard:
         specifier: ^36.0.0
-        version: 36.0.0(stylelint@16.4.0(typescript@5.6.2))
+        version: 36.0.0(stylelint@16.4.0(typescript@5.7.2))
       stylelint-config-standard-scss:
         specifier: ^13.1.0
-        version: 13.1.0(postcss@8.4.38)(stylelint@16.4.0(typescript@5.6.2))
+        version: 13.1.0(postcss@8.4.38)(stylelint@16.4.0(typescript@5.7.2))
       stylelint-order:
         specifier: ^6.0.4
-        version: 6.0.4(stylelint@16.4.0(typescript@5.6.2))
+        version: 6.0.4(stylelint@16.4.0(typescript@5.7.2))
       stylelint-prettier:
         specifier: ^5.0.0
-        version: 5.0.0(prettier@3.2.5)(stylelint@16.4.0(typescript@5.6.2))
+        version: 5.0.0(prettier@3.2.5)(stylelint@16.4.0(typescript@5.7.2))
 
   internal/ts-config:
     dependencies:
@@ -360,20 +360,20 @@ importers:
         version: 7.0.2
       vite:
         specifier: ^5.2.10
-        version: 5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
+        version: 5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
     devDependencies:
       '@types/fs-extra':
         specifier: ^11.0.4
         version: 11.0.4
       '@vitejs/plugin-vue':
         specifier: ^5.0.4
-        version: 5.0.4(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))(vue@3.5.8(typescript@5.6.2))
+        version: 5.0.4(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))(vue@3.5.13(typescript@5.7.2))
       '@vitejs/plugin-vue-jsx':
         specifier: ^3.1.0
-        version: 3.1.0(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))(vue@3.5.8(typescript@5.6.2))
+        version: 3.1.0(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))(vue@3.5.13(typescript@5.7.2))
       ant-design-vue:
         specifier: ^4.2.1
-        version: 4.2.1(vue@3.5.8(typescript@5.6.2))
+        version: 4.2.1(vue@3.5.13(typescript@5.7.2))
       dayjs:
         specifier: ^1.11.10
         version: 1.11.10
@@ -394,40 +394,40 @@ importers:
         version: 1.1.0
       rollup-plugin-visualizer:
         specifier: ^5.12.0
-        version: 5.12.0(rollup@4.22.4)
+        version: 5.12.0(rollup@4.28.1)
       sass:
         specifier: ^1.75.0
         version: 1.75.0
       unocss:
         specifier: 0.59.4
-        version: 0.59.4(postcss@5.2.18)(rollup@4.22.4)(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
+        version: 0.59.4(postcss@5.2.18)(rollup@4.28.1)(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
       vite-plugin-compression:
         specifier: ^0.5.1
-        version: 0.5.1(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
+        version: 0.5.1(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
       vite-plugin-dts:
         specifier: ^3.9.0
-        version: 3.9.0(@types/node@22.5.5)(rollup@4.22.4)(typescript@5.6.2)(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
+        version: 3.9.0(@types/node@22.10.1)(rollup@4.28.1)(typescript@5.7.2)(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
       vite-plugin-html:
         specifier: ^3.2.2
-        version: 3.2.2(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
+        version: 3.2.2(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
       vite-plugin-purge-icons:
         specifier: ^0.10.0
-        version: 0.10.0(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
+        version: 0.10.0(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
       vite-plugin-svg-icons:
         specifier: ^2.0.1
-        version: 2.0.1(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
+        version: 2.0.1(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
 
   packages/hooks:
     dependencies:
       '@vueuse/core':
         specifier: ^10.9.0
-        version: 10.9.0(vue@3.4.25(typescript@5.6.2))
+        version: 10.9.0(vue@3.4.25(typescript@5.7.2))
       lodash-es:
         specifier: ^4.17.21
         version: 4.17.21
       vue:
         specifier: ^3.4.25
-        version: 3.4.25(typescript@5.6.2)
+        version: 3.4.25(typescript@5.7.2)
     devDependencies:
       '@vben/types':
         specifier: workspace:*
@@ -469,8 +469,8 @@ packages:
     resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/code-frame@7.24.7':
-    resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==}
+  '@babel/code-frame@7.26.2':
+    resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==}
     engines: {node: '>=6.9.0'}
 
   '@babel/compat-data@7.24.4':
@@ -481,6 +481,10 @@ packages:
     resolution: {integrity: sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/compat-data@7.26.3':
+    resolution: {integrity: sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/core@7.24.4':
     resolution: {integrity: sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==}
     engines: {node: '>=6.9.0'}
@@ -489,6 +493,10 @@ packages:
     resolution: {integrity: sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/core@7.26.0':
+    resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/generator@7.24.4':
     resolution: {integrity: sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==}
     engines: {node: '>=6.9.0'}
@@ -497,12 +505,16 @@ packages:
     resolution: {integrity: sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/generator@7.26.3':
+    resolution: {integrity: sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-annotate-as-pure@7.22.5':
     resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-annotate-as-pure@7.24.7':
-    resolution: {integrity: sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==}
+  '@babel/helper-annotate-as-pure@7.25.9':
+    resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-compilation-targets@7.23.6':
@@ -513,14 +525,18 @@ packages:
     resolution: {integrity: sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-compilation-targets@7.25.9':
+    resolution: {integrity: sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-create-class-features-plugin@7.24.4':
     resolution: {integrity: sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-create-class-features-plugin@7.25.4':
-    resolution: {integrity: sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==}
+  '@babel/helper-create-class-features-plugin@7.25.9':
+    resolution: {integrity: sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -541,8 +557,8 @@ packages:
     resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-member-expression-to-functions@7.24.8':
-    resolution: {integrity: sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==}
+  '@babel/helper-member-expression-to-functions@7.25.9':
+    resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-module-imports@7.22.15':
@@ -553,8 +569,8 @@ packages:
     resolution: {integrity: sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-module-imports@7.24.7':
-    resolution: {integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==}
+  '@babel/helper-module-imports@7.25.9':
+    resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-module-transforms@7.23.3':
@@ -569,12 +585,18 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
 
+  '@babel/helper-module-transforms@7.26.0':
+    resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
   '@babel/helper-optimise-call-expression@7.22.5':
     resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-optimise-call-expression@7.24.7':
-    resolution: {integrity: sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==}
+  '@babel/helper-optimise-call-expression@7.25.9':
+    resolution: {integrity: sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-plugin-utils@7.24.0':
@@ -585,14 +607,18 @@ packages:
     resolution: {integrity: sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-plugin-utils@7.25.9':
+    resolution: {integrity: sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-replace-supers@7.24.1':
     resolution: {integrity: sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-replace-supers@7.25.0':
-    resolution: {integrity: sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==}
+  '@babel/helper-replace-supers@7.25.9':
+    resolution: {integrity: sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
@@ -609,8 +635,8 @@ packages:
     resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-skip-transparent-expression-wrappers@7.24.7':
-    resolution: {integrity: sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==}
+  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
+    resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-split-export-declaration@7.22.6':
@@ -621,16 +647,16 @@ packages:
     resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-string-parser@7.24.8':
-    resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==}
+  '@babel/helper-string-parser@7.25.9':
+    resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-validator-identifier@7.22.20':
     resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-validator-identifier@7.24.7':
-    resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==}
+  '@babel/helper-validator-identifier@7.25.9':
+    resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
     engines: {node: '>=6.9.0'}
 
   '@babel/helper-validator-option@7.23.5':
@@ -641,6 +667,10 @@ packages:
     resolution: {integrity: sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-validator-option@7.25.9':
+    resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helpers@7.24.4':
     resolution: {integrity: sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==}
     engines: {node: '>=6.9.0'}
@@ -649,33 +679,33 @@ packages:
     resolution: {integrity: sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/highlight@7.24.2':
-    resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==}
+  '@babel/helpers@7.26.0':
+    resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/highlight@7.24.7':
-    resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==}
+  '@babel/highlight@7.24.2':
+    resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/parser@7.25.6':
-    resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==}
+  '@babel/parser@7.26.3':
+    resolution: {integrity: sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==}
     engines: {node: '>=6.0.0'}
     hasBin: true
 
-  '@babel/plugin-proposal-decorators@7.24.7':
-    resolution: {integrity: sha512-RL9GR0pUG5Kc8BUWLNDm2T5OpYwSX15r98I0IkgmRQTXuELq/OynH8xtMTMvTJFjXbMWFVTKtYkTaYQsuAwQlQ==}
+  '@babel/plugin-proposal-decorators@7.25.9':
+    resolution: {integrity: sha512-smkNLL/O1ezy9Nhy4CNosc4Va+1wo5w4gzSZeLe6y6dM4mmHfYOCPolXQPHQxonZCF+ZyebxN9vqOolkYrSn5g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-decorators@7.24.7':
-    resolution: {integrity: sha512-Ui4uLJJrRV1lb38zg1yYTmRKmiZLiftDEvZN2iq3kd9kUFU+PttmzTbAFC2ucRk/XJmtek6G23gPsuZbhrT8fQ==}
+  '@babel/plugin-syntax-decorators@7.25.9':
+    resolution: {integrity: sha512-ryzI0McXUPJnRCvMo4lumIKZUzhYUO/ScI+Mz4YVaTLt04DHNSjEUjKVvbzQjZFLuod/cYEc07mJWhzl6v4DPg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-import-attributes@7.25.6':
-    resolution: {integrity: sha512-sXaDXaJN9SNLymBdlWFA+bjzBhFD617ZaFiY13dGt7TVslVvVgA6fkZOP7Ki3IGElC45lwHdOTrCtKZGVAWeLQ==}
+  '@babel/plugin-syntax-import-attributes@7.26.0':
+    resolution: {integrity: sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -697,14 +727,20 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-syntax-jsx@7.25.9':
+    resolution: {integrity: sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-syntax-typescript@7.24.1':
     resolution: {integrity: sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-syntax-typescript@7.25.4':
-    resolution: {integrity: sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg==}
+  '@babel/plugin-syntax-typescript@7.25.9':
+    resolution: {integrity: sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -721,8 +757,8 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/plugin-transform-typescript@7.25.2':
-    resolution: {integrity: sha512-lBwRvjSmqiMYe/pS0+1gggjJleUJi7NzjvQ1Fkqtt69hBa/0t1YuW/MLQMAPixfwaQOHUXsd6jeU3Z+vdGv3+A==}
+  '@babel/plugin-transform-typescript@7.26.3':
+    resolution: {integrity: sha512-6+5hpdr6mETwSKjmJUdYw0EIkATiQhnELWlE3kJFBwSg/BGIVwVaVbX+gOXBCdc7Ln1RXZxyWGecIXhUfnl7oA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
@@ -737,12 +773,12 @@ packages:
     resolution: {integrity: sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/runtime@7.25.6':
-    resolution: {integrity: sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==}
+  '@babel/runtime@7.26.0':
+    resolution: {integrity: sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/standalone@7.25.6':
-    resolution: {integrity: sha512-Kf2ZcZVqsKbtYhlA7sP0z5A3q5hmCVYMKMWRWNK/5OVwHIve3JY1djVRmIVAx8FMueLIfZGKQDIILK2w8zO4mg==}
+  '@babel/standalone@7.26.4':
+    resolution: {integrity: sha512-SF+g7S2mhTT1b7CHyfNjDkPU1corxg4LPYsyP0x5KuCl+EbtBQHRLqr9N3q7e7+x7NQ5LYxQf8mJ2PmzebLr0A==}
     engines: {node: '>=6.9.0'}
 
   '@babel/template@7.24.0':
@@ -753,6 +789,10 @@ packages:
     resolution: {integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/template@7.25.9':
+    resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/traverse@7.24.1':
     resolution: {integrity: sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==}
     engines: {node: '>=6.9.0'}
@@ -761,21 +801,25 @@ packages:
     resolution: {integrity: sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/traverse@7.26.4':
+    resolution: {integrity: sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/types@7.24.0':
     resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/types@7.25.6':
-    resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==}
+  '@babel/types@7.26.3':
+    resolution: {integrity: sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==}
     engines: {node: '>=6.9.0'}
 
-  '@commitlint/cli@19.5.0':
-    resolution: {integrity: sha512-gaGqSliGwB86MDmAAKAtV9SV1SHdmN8pnGq4EJU4+hLisQ7IFfx4jvU4s+pk6tl0+9bv6yT+CaZkufOinkSJIQ==}
+  '@commitlint/cli@19.6.0':
+    resolution: {integrity: sha512-v17BgGD9w5KnthaKxXnEg6KLq6DYiAxyiN44TpiRtqyW8NSq+Kx99mkEG8Qo6uu6cI5eMzMojW2muJxjmPnF8w==}
     engines: {node: '>=v18'}
     hasBin: true
 
-  '@commitlint/config-conventional@19.5.0':
-    resolution: {integrity: sha512-OBhdtJyHNPryZKg0fFpZNOBM1ZDbntMvqMuSmpfyP86XSfwzGw4CaoYRG4RutUPg0BTK07VMRIkNJT6wi2zthg==}
+  '@commitlint/config-conventional@19.6.0':
+    resolution: {integrity: sha512-DJT40iMnTYtBtUfw9ApbsLZFke1zKh6llITVJ+x9mtpHD08gsNXaIRqHTmwTZL3dNX5+WoyK7pCN/5zswvkBCQ==}
     engines: {node: '>=v18'}
 
   '@commitlint/config-validator@19.5.0':
@@ -794,12 +838,12 @@ packages:
     resolution: {integrity: sha512-yNy088miE52stCI3dhG/vvxFo9e4jFkU1Mj3xECfzp/bIS/JUay4491huAlVcffOoMK1cd296q0W92NlER6r3A==}
     engines: {node: '>=v18'}
 
-  '@commitlint/is-ignored@19.5.0':
-    resolution: {integrity: sha512-0XQ7Llsf9iL/ANtwyZ6G0NGp5Y3EQ8eDQSxv/SRcfJ0awlBY4tHFAvwWbw66FVUaWICH7iE5en+FD9TQsokZ5w==}
+  '@commitlint/is-ignored@19.6.0':
+    resolution: {integrity: sha512-Ov6iBgxJQFR9koOupDPHvcHU9keFupDgtB3lObdEZDroiG4jj1rzky60fbQozFKVYRTUdrBGICHG0YVmRuAJmw==}
     engines: {node: '>=v18'}
 
-  '@commitlint/lint@19.5.0':
-    resolution: {integrity: sha512-cAAQwJcRtiBxQWO0eprrAbOurtJz8U6MgYqLz+p9kLElirzSCc0vGMcyCaA1O7AqBuxo11l1XsY3FhOFowLAAg==}
+  '@commitlint/lint@19.6.0':
+    resolution: {integrity: sha512-LRo7zDkXtcIrpco9RnfhOKeg8PAnE3oDDoalnrVU/EVaKHYBWYL1DlRR7+3AWn0JiBqD8yKOfetVxJGdEtZ0tg==}
     engines: {node: '>=v18'}
 
   '@commitlint/load@19.5.0':
@@ -822,8 +866,8 @@ packages:
     resolution: {integrity: sha512-CU/GscZhCUsJwcKTJS9Ndh3AKGZTNFIOoQB2n8CmFnizE0VnEuJoum+COW+C1lNABEeqk6ssfc1Kkalm4bDklA==}
     engines: {node: '>=v18'}
 
-  '@commitlint/rules@19.5.0':
-    resolution: {integrity: sha512-hDW5TPyf/h1/EufSHEKSp6Hs+YVsDMHazfJ2azIk9tHPXS6UqSz1dIRs1gpqS3eMXgtkT7JH6TW4IShdqOwhAw==}
+  '@commitlint/rules@19.6.0':
+    resolution: {integrity: sha512-1f2reW7lbrI0X0ozZMesS/WZxgPa4/wi56vFuJENBmed6mWq5KsheN/nxqnl/C23ioxpPO/PL6tXpiiFy5Bhjw==}
     engines: {node: '>=v18'}
 
   '@commitlint/to-lines@19.5.0':
@@ -899,8 +943,8 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/aix-ppc64@0.23.1':
-    resolution: {integrity: sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==}
+  '@esbuild/aix-ppc64@0.24.0':
+    resolution: {integrity: sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
@@ -923,8 +967,8 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.23.1':
-    resolution: {integrity: sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==}
+  '@esbuild/android-arm64@0.24.0':
+    resolution: {integrity: sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
@@ -947,8 +991,8 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.23.1':
-    resolution: {integrity: sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==}
+  '@esbuild/android-arm@0.24.0':
+    resolution: {integrity: sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
@@ -971,8 +1015,8 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.23.1':
-    resolution: {integrity: sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==}
+  '@esbuild/android-x64@0.24.0':
+    resolution: {integrity: sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
@@ -995,8 +1039,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.23.1':
-    resolution: {integrity: sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==}
+  '@esbuild/darwin-arm64@0.24.0':
+    resolution: {integrity: sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
@@ -1019,8 +1063,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.23.1':
-    resolution: {integrity: sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==}
+  '@esbuild/darwin-x64@0.24.0':
+    resolution: {integrity: sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
@@ -1043,8 +1087,8 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.23.1':
-    resolution: {integrity: sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==}
+  '@esbuild/freebsd-arm64@0.24.0':
+    resolution: {integrity: sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
@@ -1067,8 +1111,8 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.23.1':
-    resolution: {integrity: sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==}
+  '@esbuild/freebsd-x64@0.24.0':
+    resolution: {integrity: sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
@@ -1091,8 +1135,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.23.1':
-    resolution: {integrity: sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==}
+  '@esbuild/linux-arm64@0.24.0':
+    resolution: {integrity: sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
@@ -1115,8 +1159,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.23.1':
-    resolution: {integrity: sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==}
+  '@esbuild/linux-arm@0.24.0':
+    resolution: {integrity: sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
@@ -1139,8 +1183,8 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.23.1':
-    resolution: {integrity: sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==}
+  '@esbuild/linux-ia32@0.24.0':
+    resolution: {integrity: sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
@@ -1163,8 +1207,8 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.23.1':
-    resolution: {integrity: sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==}
+  '@esbuild/linux-loong64@0.24.0':
+    resolution: {integrity: sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==}
     engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
@@ -1187,8 +1231,8 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.23.1':
-    resolution: {integrity: sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==}
+  '@esbuild/linux-mips64el@0.24.0':
+    resolution: {integrity: sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==}
     engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
@@ -1211,8 +1255,8 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.23.1':
-    resolution: {integrity: sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==}
+  '@esbuild/linux-ppc64@0.24.0':
+    resolution: {integrity: sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
@@ -1235,8 +1279,8 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.23.1':
-    resolution: {integrity: sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==}
+  '@esbuild/linux-riscv64@0.24.0':
+    resolution: {integrity: sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==}
     engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
@@ -1259,8 +1303,8 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.23.1':
-    resolution: {integrity: sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==}
+  '@esbuild/linux-s390x@0.24.0':
+    resolution: {integrity: sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==}
     engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
@@ -1283,8 +1327,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.23.1':
-    resolution: {integrity: sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==}
+  '@esbuild/linux-x64@0.24.0':
+    resolution: {integrity: sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
@@ -1307,14 +1351,14 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.23.1':
-    resolution: {integrity: sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==}
+  '@esbuild/netbsd-x64@0.24.0':
+    resolution: {integrity: sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/openbsd-arm64@0.23.1':
-    resolution: {integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==}
+  '@esbuild/openbsd-arm64@0.24.0':
+    resolution: {integrity: sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
@@ -1337,8 +1381,8 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.23.1':
-    resolution: {integrity: sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==}
+  '@esbuild/openbsd-x64@0.24.0':
+    resolution: {integrity: sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
@@ -1361,8 +1405,8 @@ packages:
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.23.1':
-    resolution: {integrity: sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==}
+  '@esbuild/sunos-x64@0.24.0':
+    resolution: {integrity: sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
@@ -1385,8 +1429,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.23.1':
-    resolution: {integrity: sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==}
+  '@esbuild/win32-arm64@0.24.0':
+    resolution: {integrity: sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
@@ -1409,8 +1453,8 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.23.1':
-    resolution: {integrity: sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==}
+  '@esbuild/win32-ia32@0.24.0':
+    resolution: {integrity: sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
@@ -1433,8 +1477,8 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.23.1':
-    resolution: {integrity: sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==}
+  '@esbuild/win32-x64@0.24.0':
+    resolution: {integrity: sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
@@ -1482,8 +1526,8 @@ packages:
     resolution: {integrity: sha512-1nemfyD/OJzh9ALepH7YfuuP8BdEB24Skhd8DXWh0hzcOxImbb1ZizSZkpCzAwSZSGcJFmscIBaBQu+yLyWaxQ==}
     deprecated: no longer maintained, switch to modern iconify-icon web component
 
-  '@iconify/json@2.2.252':
-    resolution: {integrity: sha512-AtdDjLhN4aBEncnWghiw9JdBRxKAXFcaQmwDFDWPL1UF/cPuuC8BADZzfHIoVcVlEvEbv69tFrzmhj1z/+PGlA==}
+  '@iconify/json@2.2.281':
+    resolution: {integrity: sha512-4AjvOQzMHiKa4n4MxQ3IxwWBRF564TMFQwYYP+OY83afINJttbD4rZvSA/wACgZL7jntsd3NDZ9CwJOVkFRaFQ==}
 
   '@iconify/types@2.0.0':
     resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
@@ -1620,8 +1664,8 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/plugin-node-resolve@15.2.4':
-    resolution: {integrity: sha512-wnKAGisav1m2vgVK2/2mNowK5DCqff7kpz76cY1pECVE0qRQTCAIcWP5xmdGDi8X8K9SYeeC98i6cD3fk6qkDg==}
+  '@rollup/plugin-node-resolve@15.3.0':
+    resolution: {integrity: sha512-9eO5McEICxMzJpDW9OnMYSv4Sta3hmt7VtBFz5zR9273suNOydOyq/FrGeGy+KsTRFm8w0SLVhzig2ILFT63Ag==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       rollup: ^2.78.0||^3.0.0||^4.0.0
@@ -1651,8 +1695,8 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/pluginutils@5.1.1':
-    resolution: {integrity: sha512-bVRmQqBIyGD+VMihdEV2IBurfIrdW9tD9yzJUL3CBRDbyPBVzQnBSMSgyUZHl1E335rpMRj7r4o683fXLYw8iw==}
+  '@rollup/pluginutils@5.1.3':
+    resolution: {integrity: sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
@@ -1665,8 +1709,8 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm-eabi@4.22.4':
-    resolution: {integrity: sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==}
+  '@rollup/rollup-android-arm-eabi@4.28.1':
+    resolution: {integrity: sha512-2aZp8AES04KI2dy3Ss6/MDjXbwBzj+i0GqKtWXgw2/Ma6E4jJvujryO6gJAghIRVz7Vwr9Gtl/8na3nDUKpraQ==}
     cpu: [arm]
     os: [android]
 
@@ -1675,8 +1719,8 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.22.4':
-    resolution: {integrity: sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==}
+  '@rollup/rollup-android-arm64@4.28.1':
+    resolution: {integrity: sha512-EbkK285O+1YMrg57xVA+Dp0tDBRB93/BZKph9XhMjezf6F4TpYjaUSuPt5J0fZXlSag0LmZAsTmdGGqPp4pQFA==}
     cpu: [arm64]
     os: [android]
 
@@ -1685,8 +1729,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-arm64@4.22.4':
-    resolution: {integrity: sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==}
+  '@rollup/rollup-darwin-arm64@4.28.1':
+    resolution: {integrity: sha512-prduvrMKU6NzMq6nxzQw445zXgaDBbMQvmKSJaxpaZ5R1QDM8w+eGxo6Y/jhT/cLoCvnZI42oEqf9KQNYz1fqQ==}
     cpu: [arm64]
     os: [darwin]
 
@@ -1695,18 +1739,28 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.22.4':
-    resolution: {integrity: sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==}
+  '@rollup/rollup-darwin-x64@4.28.1':
+    resolution: {integrity: sha512-WsvbOunsUk0wccO/TV4o7IKgloJ942hVFK1CLatwv6TJspcCZb9umQkPdvB7FihmdxgaKR5JyxDjWpCOp4uZlQ==}
     cpu: [x64]
     os: [darwin]
 
+  '@rollup/rollup-freebsd-arm64@4.28.1':
+    resolution: {integrity: sha512-HTDPdY1caUcU4qK23FeeGxCdJF64cKkqajU0iBnTVxS8F7H/7BewvYoG+va1KPSL63kQ1PGNyiwKOfReavzvNA==}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@rollup/rollup-freebsd-x64@4.28.1':
+    resolution: {integrity: sha512-m/uYasxkUevcFTeRSM9TeLyPe2QDuqtjkeoTpP9SW0XxUWfcYrGDMkO/m2tTw+4NMAF9P2fU3Mw4ahNvo7QmsQ==}
+    cpu: [x64]
+    os: [freebsd]
+
   '@rollup/rollup-linux-arm-gnueabihf@4.14.3':
     resolution: {integrity: sha512-ge2DC7tHRHa3caVEoSbPRJpq7azhG+xYsd6u2MEnJ6XzPSzQsTKyXvh6iWjXRf7Rt9ykIUWHtl0Uz3T6yXPpKw==}
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.22.4':
-    resolution: {integrity: sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.28.1':
+    resolution: {integrity: sha512-QAg11ZIt6mcmzpNE6JZBpKfJaKkqTm1A9+y9O+frdZJEuhQxiugM05gnCWiANHj4RmbgeVJpTdmKRmH/a+0QbA==}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
@@ -1716,8 +1770,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.22.4':
-    resolution: {integrity: sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==}
+  '@rollup/rollup-linux-arm-musleabihf@4.28.1':
+    resolution: {integrity: sha512-dRP9PEBfolq1dmMcFqbEPSd9VlRuVWEGSmbxVEfiq2cs2jlZAl0YNxFzAQS2OrQmsLBLAATDMb3Z6MFv5vOcXg==}
     cpu: [arm]
     os: [linux]
     libc: [musl]
@@ -1728,8 +1782,8 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-arm64-gnu@4.22.4':
-    resolution: {integrity: sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==}
+  '@rollup/rollup-linux-arm64-gnu@4.28.1':
+    resolution: {integrity: sha512-uGr8khxO+CKT4XU8ZUH1TTEUtlktK6Kgtv0+6bIFSeiSlnGJHG1tSFSjm41uQ9sAO/5ULx9mWOz70jYLyv1QkA==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
@@ -1740,20 +1794,26 @@ packages:
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-arm64-musl@4.22.4':
-    resolution: {integrity: sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==}
+  '@rollup/rollup-linux-arm64-musl@4.28.1':
+    resolution: {integrity: sha512-QF54q8MYGAqMLrX2t7tNpi01nvq5RI59UBNx+3+37zoKX5KViPo/gk2QLhsuqok05sSCRluj0D00LzCwBikb0A==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
+  '@rollup/rollup-linux-loongarch64-gnu@4.28.1':
+    resolution: {integrity: sha512-vPul4uodvWvLhRco2w0GcyZcdyBfpfDRgNKU+p35AWEbJ/HPs1tOUrkSueVbBS0RQHAf/A+nNtDpvw95PeVKOA==}
+    cpu: [loong64]
+    os: [linux]
+    libc: [glibc]
+
   '@rollup/rollup-linux-powerpc64le-gnu@4.14.3':
     resolution: {integrity: sha512-5aRjvsS8q1nWN8AoRfrq5+9IflC3P1leMoy4r2WjXyFqf3qcqsxRCfxtZIV58tCxd+Yv7WELPcO9mY9aeQyAmw==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.22.4':
-    resolution: {integrity: sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==}
+  '@rollup/rollup-linux-powerpc64le-gnu@4.28.1':
+    resolution: {integrity: sha512-pTnTdBuC2+pt1Rmm2SV7JWRqzhYpEILML4PKODqLz+C7Ou2apEV52h19CR7es+u04KlqplggmN9sqZlekg3R1A==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
@@ -1764,8 +1824,8 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.22.4':
-    resolution: {integrity: sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==}
+  '@rollup/rollup-linux-riscv64-gnu@4.28.1':
+    resolution: {integrity: sha512-vWXy1Nfg7TPBSuAncfInmAI/WZDd5vOklyLJDdIRKABcZWojNDY0NJwruY2AcnCLnRJKSaBgf/GiJfauu8cQZA==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
@@ -1776,8 +1836,8 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-s390x-gnu@4.22.4':
-    resolution: {integrity: sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==}
+  '@rollup/rollup-linux-s390x-gnu@4.28.1':
+    resolution: {integrity: sha512-/yqC2Y53oZjb0yz8PVuGOQQNOTwxcizudunl/tFs1aLvObTclTwZ0JhXF2XcPT/zuaymemCDSuuUPXJJyqeDOg==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
@@ -1788,8 +1848,8 @@ packages:
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-x64-gnu@4.22.4':
-    resolution: {integrity: sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==}
+  '@rollup/rollup-linux-x64-gnu@4.28.1':
+    resolution: {integrity: sha512-fzgeABz7rrAlKYB0y2kSEiURrI0691CSL0+KXwKwhxvj92VULEDQLpBYLHpF49MSiPG4sq5CK3qHMnb9tlCjBw==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
@@ -1800,8 +1860,8 @@ packages:
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-x64-musl@4.22.4':
-    resolution: {integrity: sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==}
+  '@rollup/rollup-linux-x64-musl@4.28.1':
+    resolution: {integrity: sha512-xQTDVzSGiMlSshpJCtudbWyRfLaNiVPXt1WgdWTwWz9n0U12cI2ZVtWe/Jgwyv/6wjL7b66uu61Vg0POWVfz4g==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
@@ -1811,8 +1871,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-arm64-msvc@4.22.4':
-    resolution: {integrity: sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==}
+  '@rollup/rollup-win32-arm64-msvc@4.28.1':
+    resolution: {integrity: sha512-wSXmDRVupJstFP7elGMgv+2HqXelQhuNf+IS4V+nUpNVi/GUiBgDmfwD0UGN3pcAnWsgKG3I52wMOBnk1VHr/A==}
     cpu: [arm64]
     os: [win32]
 
@@ -1821,8 +1881,8 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.22.4':
-    resolution: {integrity: sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==}
+  '@rollup/rollup-win32-ia32-msvc@4.28.1':
+    resolution: {integrity: sha512-ZkyTJ/9vkgrE/Rk9vhMXhf8l9D+eAhbAVbsGsXKy2ohmJaWg0LPQLnIxRdRp/bKyr8tXuPlXhIoGlEB5XpJnGA==}
     cpu: [ia32]
     os: [win32]
 
@@ -1831,8 +1891,8 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.22.4':
-    resolution: {integrity: sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==}
+  '@rollup/rollup-win32-x64-msvc@4.28.1':
+    resolution: {integrity: sha512-ZvK2jBafvttJjoIdKm/Q/Bh7IJ1Ose9IBOwpOXcOvW3ikGTQGmKDgxTC6oCAzW6PynbkKP8+um1du81XJHZ0JA==}
     cpu: [x64]
     os: [win32]
 
@@ -1858,9 +1918,16 @@ packages:
   '@rushstack/ts-command-line@4.19.1':
     resolution: {integrity: sha512-J7H768dgcpG60d7skZ5uSSwyCZs/S2HrWP1Ds8d1qYAyaaeJmpmmLr9BVw97RjFzmQPOYnoXcKA4GkqDCkduQg==}
 
+  '@sec-ant/readable-stream@0.4.1':
+    resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==}
+
   '@simonwep/pickr@1.8.2':
     resolution: {integrity: sha512-/l5w8BIkrpP6n1xsetx9MWPWlU6OblN5YgZZphxan0Tq4BByTCETL6lyIeY8lagalS2Nbt4F2W034KHLIiunKA==}
 
+  '@sindresorhus/merge-streams@4.0.0':
+    resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==}
+    engines: {node: '>=18'}
+
   '@tootallnate/quickjs-emscripten@0.23.0':
     resolution: {integrity: sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==}
 
@@ -1901,8 +1968,8 @@ packages:
   '@types/content-disposition@0.5.8':
     resolution: {integrity: sha512-QVSSvno3dE0MgO76pJhmv4Qyi/j0Yk9pBp0Y7TJ2Tlj+KCgJWY6qX7nnxCOLkZ3VYRSIk1WTxCvwUSdx6CCLdg==}
 
-  '@types/conventional-commits-parser@5.0.0':
-    resolution: {integrity: sha512-loB369iXNmAZglwWATL+WRe+CRMmmBPtpolYzIebFaX4YA3x+BEfLqhUAV9WanycKI3TG1IMr5bMJDajDKLlUQ==}
+  '@types/conventional-commits-parser@5.0.1':
+    resolution: {integrity: sha512-7uz5EHdzz2TqoMfV7ee61Egf5y6NkcO4FB/1iCCQnbeiI1F3xzv3vK5dBCXUCLQgGYS+mUeigK1iKQzvED+QnQ==}
 
   '@types/cookies@0.9.0':
     resolution: {integrity: sha512-40Zk8qR147RABiQ7NQnBzWzDcjKzNrntB5BAmeGCb2p/MIyOE+4BVvc17wumsUqUw00bJYqoXFHYygQnEFh4/Q==}
@@ -1961,8 +2028,8 @@ packages:
   '@types/lodash-es@4.17.12':
     resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==}
 
-  '@types/lodash@4.17.7':
-    resolution: {integrity: sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==}
+  '@types/lodash@4.17.13':
+    resolution: {integrity: sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==}
 
   '@types/mime@1.3.5':
     resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}
@@ -1970,8 +2037,8 @@ packages:
   '@types/node@20.12.7':
     resolution: {integrity: sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==}
 
-  '@types/node@22.5.5':
-    resolution: {integrity: sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==}
+  '@types/node@22.10.1':
+    resolution: {integrity: sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==}
 
   '@types/normalize-package-data@2.4.4':
     resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
@@ -1982,8 +2049,8 @@ packages:
   '@types/qrcode@1.5.5':
     resolution: {integrity: sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg==}
 
-  '@types/qs@6.9.16':
-    resolution: {integrity: sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==}
+  '@types/qs@6.9.17':
+    resolution: {integrity: sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==}
 
   '@types/range-parser@1.2.7':
     resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==}
@@ -2179,20 +2246,20 @@ packages:
   '@volar/language-core@1.11.1':
     resolution: {integrity: sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==}
 
-  '@volar/language-core@2.4.5':
-    resolution: {integrity: sha512-F4tA0DCO5Q1F5mScHmca0umsi2ufKULAnMOVBfMsZdT4myhVl4WdKRwCaKcfOkIEuyrAVvtq1ESBdZ+rSyLVww==}
+  '@volar/language-core@2.4.10':
+    resolution: {integrity: sha512-hG3Z13+nJmGaT+fnQzAkS0hjJRa2FCeqZt6Bd+oGNhUkQ+mTFsDETg5rqUTxyzIh5pSOGY7FHCWUS8G82AzLCA==}
 
   '@volar/source-map@1.11.1':
     resolution: {integrity: sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==}
 
-  '@volar/source-map@2.4.5':
-    resolution: {integrity: sha512-varwD7RaKE2J/Z+Zu6j3mNNJbNT394qIxXwdvz/4ao/vxOfyClZpSDtLKkwWmecinkOVos5+PWkWraelfMLfpw==}
+  '@volar/source-map@2.4.10':
+    resolution: {integrity: sha512-OCV+b5ihV0RF3A7vEvNyHPi4G4kFa6ukPmyVocmqm5QzOd8r5yAtiNvaPEjl8dNvgC/lj4JPryeeHLdXd62rWA==}
 
   '@volar/typescript@1.11.1':
     resolution: {integrity: sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==}
 
-  '@volar/typescript@2.4.5':
-    resolution: {integrity: sha512-mcT1mHvLljAEtHviVcBuOyAwwMKz1ibXTi5uYtP/pf4XxoAzpdkQ+Br2IC0NPCvLCbjPZmbf3I0udndkfB1CDg==}
+  '@volar/typescript@2.4.10':
+    resolution: {integrity: sha512-F8ZtBMhSXyYKuBfGpYwqA5rsONnOwAVvjyE7KPYJ7wgZqo2roASqNWUnianOomJX5u1cxeRooHV59N0PhvEOgw==}
 
   '@vue/babel-helper-vue-transform-on@1.2.2':
     resolution: {integrity: sha512-nOttamHUR3YzdEqdM/XXDyCSdxMA9VizUKoroLX6yTyRtggzQMHXcmwh8a7ZErcJttIBIc9s68a1B8GZ+Dmvsw==}
@@ -2229,26 +2296,26 @@ packages:
   '@vue/compiler-core@3.4.25':
     resolution: {integrity: sha512-Y2pLLopaElgWnMNolgG8w3C5nNUVev80L7hdQ5iIKPtMJvhVpG0zhnBG/g3UajJmZdvW0fktyZTotEHD1Srhbg==}
 
-  '@vue/compiler-core@3.5.8':
-    resolution: {integrity: sha512-Uzlxp91EPjfbpeO5KtC0KnXPkuTfGsNDeaKQJxQN718uz+RqDYarEf7UhQJGK+ZYloD2taUbHTI2J4WrUaZQNA==}
+  '@vue/compiler-core@3.5.13':
+    resolution: {integrity: sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==}
 
   '@vue/compiler-dom@3.4.25':
     resolution: {integrity: sha512-Ugz5DusW57+HjllAugLci19NsDK+VyjGvmbB2TXaTcSlQxwL++2PETHx/+Qv6qFwNLzSt7HKepPe4DcTE3pBWg==}
 
-  '@vue/compiler-dom@3.5.8':
-    resolution: {integrity: sha512-GUNHWvoDSbSa5ZSHT9SnV5WkStWfzJwwTd6NMGzilOE/HM5j+9EB9zGXdtu/fCNEmctBqMs6C9SvVPpVPuk1Eg==}
+  '@vue/compiler-dom@3.5.13':
+    resolution: {integrity: sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==}
 
   '@vue/compiler-sfc@3.4.25':
     resolution: {integrity: sha512-m7rryuqzIoQpOBZ18wKyq05IwL6qEpZxFZfRxlNYuIPDqywrXQxgUwLXIvoU72gs6cRdY6wHD0WVZIFE4OEaAQ==}
 
-  '@vue/compiler-sfc@3.5.8':
-    resolution: {integrity: sha512-taYpngQtSysrvO9GULaOSwcG5q821zCoIQBtQQSx7Uf7DxpR6CIHR90toPr9QfDD2mqHQPCSgoWBvJu0yV9zjg==}
+  '@vue/compiler-sfc@3.5.13':
+    resolution: {integrity: sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==}
 
   '@vue/compiler-ssr@3.4.25':
     resolution: {integrity: sha512-H2ohvM/Pf6LelGxDBnfbbXFPyM4NE3hrw0e/EpwuSiYu8c819wx+SVGdJ65p/sFrYDd6OnSDxN1MB2mN07hRSQ==}
 
-  '@vue/compiler-ssr@3.5.8':
-    resolution: {integrity: sha512-W96PtryNsNG9u0ZnN5Q5j27Z/feGrFV6zy9q5tzJVyJaLiwYxvC0ek4IXClZygyhjm+XKM7WD9pdKi/wIRVC/Q==}
+  '@vue/compiler-ssr@3.5.13':
+    resolution: {integrity: sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==}
 
   '@vue/compiler-vue2@2.7.16':
     resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
@@ -2256,16 +2323,16 @@ packages:
   '@vue/devtools-api@6.6.4':
     resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
 
-  '@vue/devtools-core@7.4.5':
-    resolution: {integrity: sha512-QwrgKYxwafJUJrKRvJGbzQLuGt0BC1P4qTr4qlEKgOOs+GV0n6zTry2oeHiwmj5H6pOkLoHnwFMOTB9rFtn9QQ==}
+  '@vue/devtools-core@7.6.7':
+    resolution: {integrity: sha512-6fW8Q0H1NHDXdEcuV6dylT5U2Yxg3SdMnVCey99Y6S4R2PNgFL2vC+VU9U9rHIiaoEUkeza42S7FfHxV4VI3Jg==}
     peerDependencies:
       vue: ^3.0.0
 
-  '@vue/devtools-kit@7.4.5':
-    resolution: {integrity: sha512-Uuki4Z6Bc/ExvtlPkeDNGSAe4580R+HPcVABfTE9TF7BTz3Nntk7vxIRUyWblZkUEcB/x+wn2uofyt5i2LaUew==}
+  '@vue/devtools-kit@7.6.7':
+    resolution: {integrity: sha512-V8/jrXY/swHgnblABG9U4QCbE60c6RuPasmv2d9FvVqc5d94t1vDiESuvRmdNJBdWz4/D3q6ffgyAfRVjwHYEw==}
 
-  '@vue/devtools-shared@7.4.5':
-    resolution: {integrity: sha512-2XgUOkL/7QDmyYI9J7cm+rz/qBhcGv+W5+i1fhwdQ0HQ1RowhdK66F0QBuJSz/5k12opJY8eN6m03/XZMs7imQ==}
+  '@vue/devtools-shared@7.6.7':
+    resolution: {integrity: sha512-QggO6SviAsolrePAXZ/sA1dSicSPt4TueZibCvydfhNDieL1lAuyMTgQDGst7TEvMGb4vgYv2I+1sDkO4jWNnw==}
 
   '@vue/language-core@1.8.27':
     resolution: {integrity: sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==}
@@ -2275,8 +2342,8 @@ packages:
       typescript:
         optional: true
 
-  '@vue/language-core@2.1.6':
-    resolution: {integrity: sha512-MW569cSky9R/ooKMh6xa2g1D0AtRKbL56k83dzus/bx//RDJk24RHWkMzbAlXjMdDNyxAaagKPRquBIxkxlCkg==}
+  '@vue/language-core@2.1.10':
+    resolution: {integrity: sha512-DAI289d0K3AB5TUG3xDp9OuQ71CnrujQwJrQnfuZDwo6eGNf0UoRlPuaVNO+Zrn65PC3j0oB2i7mNmVPggeGeQ==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
@@ -2286,36 +2353,36 @@ packages:
   '@vue/reactivity@3.4.25':
     resolution: {integrity: sha512-mKbEtKr1iTxZkAG3vm3BtKHAOhuI4zzsVcN0epDldU/THsrvfXRKzq+lZnjczZGnTdh3ojd86/WrP+u9M51pWQ==}
 
-  '@vue/reactivity@3.5.8':
-    resolution: {integrity: sha512-mlgUyFHLCUZcAYkqvzYnlBRCh0t5ZQfLYit7nukn1GR96gc48Bp4B7OIcSfVSvlG1k3BPfD+p22gi1t2n9tsXg==}
+  '@vue/reactivity@3.5.13':
+    resolution: {integrity: sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==}
 
   '@vue/runtime-core@3.4.25':
     resolution: {integrity: sha512-3qhsTqbEh8BMH3pXf009epCI5E7bKu28fJLi9O6W+ZGt/6xgSfMuGPqa5HRbUxLoehTNp5uWvzCr60KuiRIL0Q==}
 
-  '@vue/runtime-core@3.5.8':
-    resolution: {integrity: sha512-fJuPelh64agZ8vKkZgp5iCkPaEqFJsYzxLk9vSC0X3G8ppknclNDr61gDc45yBGTaN5Xqc1qZWU3/NoaBMHcjQ==}
+  '@vue/runtime-core@3.5.13':
+    resolution: {integrity: sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==}
 
   '@vue/runtime-dom@3.4.25':
     resolution: {integrity: sha512-ode0sj77kuwXwSc+2Yhk8JMHZh1sZp9F/51wdBiz3KGaWltbKtdihlJFhQG4H6AY+A06zzeMLkq6qu8uDSsaoA==}
 
-  '@vue/runtime-dom@3.5.8':
-    resolution: {integrity: sha512-DpAUz+PKjTZPUOB6zJgkxVI3GuYc2iWZiNeeHQUw53kdrparSTG6HeXUrYDjaam8dVsCdvQxDz6ZWxnyjccUjQ==}
+  '@vue/runtime-dom@3.5.13':
+    resolution: {integrity: sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==}
 
   '@vue/server-renderer@3.4.25':
     resolution: {integrity: sha512-8VTwq0Zcu3K4dWV0jOwIVINESE/gha3ifYCOKEhxOj6MEl5K5y8J8clQncTcDhKF+9U765nRw4UdUEXvrGhyVQ==}
     peerDependencies:
       vue: 3.4.25
 
-  '@vue/server-renderer@3.5.8':
-    resolution: {integrity: sha512-7AmC9/mEeV9mmXNVyUIm1a1AjUhyeeGNbkLh39J00E7iPeGks8OGRB5blJiMmvqSh8SkaS7jkLWSpXtxUCeagA==}
+  '@vue/server-renderer@3.5.13':
+    resolution: {integrity: sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==}
     peerDependencies:
-      vue: 3.5.8
+      vue: 3.5.13
 
   '@vue/shared@3.4.25':
     resolution: {integrity: sha512-k0yappJ77g2+KNrIaF0FFnzwLvUBLUYr8VOwz+/6vLsmItFp51AcxLL7Ey3iPd7BIRyWPOcqUjMnm7OkahXllA==}
 
-  '@vue/shared@3.5.8':
-    resolution: {integrity: sha512-mJleSWbAGySd2RJdX1RBtcrUBX6snyOc0qHpgk3lGi4l9/P/3ny3ELqFWqYdkXIwwNN/kdm8nD9ky8o6l/Lx2A==}
+  '@vue/shared@3.5.13':
+    resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==}
 
   '@vue/test-utils@2.4.6':
     resolution: {integrity: sha512-FMxEjOpYNYiFe0GkaHsnJPXFHxQ6m4t8vI/ElPGpMWxZKpmRvQ33OIrvRXemy6yha03RxhOlQuy+gZMC3CQSow==}
@@ -2338,8 +2405,10 @@ packages:
   '@vueuse/shared@10.9.0':
     resolution: {integrity: sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==}
 
-  '@vxe-ui/core@4.0.12':
-    resolution: {integrity: sha512-ft8f874eQSv4N9+oulFKeg8APgd8RMHeFeUUUTNckIRJ/cNi0dbR0Fe2+ZZpRl3BwRtbE2hHb2FKWmL2oyZkfw==}
+  '@vxe-ui/core@4.0.20':
+    resolution: {integrity: sha512-p71vkINIUyzYlzUBZ8Hfs4MQ76ckOMcaC0nCE5slobGZFVHcm16D0+utz/fRrGWLATuin2JmWxysqEgSwWbJVw==}
+    peerDependencies:
+      vue: ^3.2.0
 
   '@zxcvbn-ts/core@3.0.4':
     resolution: {integrity: sha512-aQeiT0F09FuJaAqNrxynlAwZ2mW/1MdXakKWNmGM1Qp/VaY6CnB/GfnMS2T8gB2231Esp1/maCWd8vTG4OuShw==}
@@ -2373,8 +2442,8 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  acorn@8.12.1:
-    resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==}
+  acorn@8.14.0:
+    resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==}
     engines: {node: '>=0.4.0'}
     hasBin: true
 
@@ -2394,6 +2463,9 @@ packages:
   ajv@8.17.1:
     resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
 
+  alien-signals@0.2.2:
+    resolution: {integrity: sha512-cZIRkbERILsBOXTQmMrxc9hgpxglstn69zm+F1ARf4aPAzdAFYd6sBq87ErO0Fj3DV94tglcyHG5kQz9nDC/8A==}
+
   amp-message@0.1.2:
     resolution: {integrity: sha512-JqutcFwoU1+jhv7ArgW38bqrE+LQdcRv4NxNw0mp0JHQyB6tXesWRjtYKlDgHRY2o3JE5UTaBGUK8kSWUdxWUg==}
 
@@ -2442,8 +2514,8 @@ packages:
     peerDependencies:
       vue: '>=3.2.0'
 
-  ant-design-vue@4.2.5:
-    resolution: {integrity: sha512-dh5CBXSaxJZBFQBd156sOUuZPfxI7pZsNXDYpHNBt/JyKZoYlbetRp/nJmSragS2Oo0mVC23Ote+TQSGc0TX6g==}
+  ant-design-vue@4.2.6:
+    resolution: {integrity: sha512-t7eX13Yj3i9+i5g9lqFyYneoIb3OzTvQjq9Tts1i+eiOd3Eva/6GagxBSXM1fOCjqemIu0FYVE1ByZ/38epR3Q==}
     engines: {node: '>=12.22.0'}
     peerDependencies:
       vue: '>=3.2.0'
@@ -2564,8 +2636,8 @@ packages:
   axios@0.26.1:
     resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==}
 
-  axios@1.7.7:
-    resolution: {integrity: sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==}
+  axios@1.7.9:
+    resolution: {integrity: sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==}
 
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
@@ -2588,8 +2660,8 @@ packages:
     resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
     engines: {node: '>=8'}
 
-  birpc@0.2.17:
-    resolution: {integrity: sha512-+hkTxhot+dWsLpp3gia5AkVHIsKlZybNT5gIYiDlNzJrmYPcTM9k5/w2uaj3IPpd7LlEYpmCj4Jj1nC41VhDFg==}
+  birpc@0.2.19:
+    resolution: {integrity: sha512-5WeXXAvTmitV1RqJFppT5QtUiz2p1mRSYU000Jkft5ZUCLJIk4uQriYNO50HknxKwM6jd8utNc66K1qGIwwWBQ==}
 
   blessed@0.1.81:
     resolution: {integrity: sha512-LoF5gae+hlmfORcG1M5+5XZi4LBmvlXTzwJWzUlPryN/SJdSflZvROM2TwkT0GMpq7oqT48NRd4GS7BiVBc5OQ==}
@@ -2633,6 +2705,11 @@ packages:
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
+  browserslist@4.24.2:
+    resolution: {integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
   buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
@@ -2662,10 +2739,18 @@ packages:
     resolution: {integrity: sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==}
     engines: {node: '>= 6.0.0'}
 
+  call-bind-apply-helpers@1.0.1:
+    resolution: {integrity: sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==}
+    engines: {node: '>= 0.4'}
+
   call-bind@1.0.7:
     resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
     engines: {node: '>= 0.4'}
 
+  call-bind@1.0.8:
+    resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==}
+    engines: {node: '>= 0.4'}
+
   callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
@@ -2687,6 +2772,9 @@ packages:
   caniuse-lite@1.0.30001663:
     resolution: {integrity: sha512-o9C3X27GLKbLeTYZ6HBOLU1tsAcBZsLis28wrVzddShCS16RujjHp9GDHKZqrB3meE0YjhawvMFsGb/igqiPzA==}
 
+  caniuse-lite@1.0.30001687:
+    resolution: {integrity: sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==}
+
   chalk@1.1.3:
     resolution: {integrity: sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==}
     engines: {node: '>=0.10.0'}
@@ -2836,6 +2924,9 @@ packages:
   confbox@0.1.7:
     resolution: {integrity: sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==}
 
+  confbox@0.1.8:
+    resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
+
   config-chain@1.1.13:
     resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}
 
@@ -2949,15 +3040,15 @@ packages:
   copy-to@2.0.1:
     resolution: {integrity: sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==}
 
-  core-js@3.38.1:
-    resolution: {integrity: sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==}
+  core-js@3.39.0:
+    resolution: {integrity: sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==}
 
   cors@2.8.5:
     resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
     engines: {node: '>= 0.10'}
 
-  cosmiconfig-typescript-loader@5.0.0:
-    resolution: {integrity: sha512-+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA==}
+  cosmiconfig-typescript-loader@5.1.0:
+    resolution: {integrity: sha512-7PtBB+6FdsOvZyJtlF3hEPpACq7RQX6BVGsgC7/lfVXnKMvNCu/XY3ykreqG5w/rBNdu2z8LCIKoF3kpHHdHlA==}
     engines: {node: '>=v16'}
     peerDependencies:
       '@types/node': '*'
@@ -2994,6 +3085,10 @@ packages:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
 
+  cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
+    engines: {node: '>= 8'}
+
   crypto-js@4.2.0:
     resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
 
@@ -3069,12 +3164,12 @@ packages:
   culvert@0.1.2:
     resolution: {integrity: sha512-yi1x3EAWKjQTreYWeSd98431AV+IEE0qoDyOoaHJ7KJ21gv6HtBXHVLX74opVSGqcR8/AbjJBHAHpcOy2bj5Gg==}
 
-  cz-git@1.9.4:
-    resolution: {integrity: sha512-VntWcIEFfW8+7RgwYaRn1r10NhUkl8/8ZdJQRupEdqE7QXBCSjNP8hKSk9zhSLzYAsdXfGEAwiAYJM1T2Qsh8w==}
+  cz-git@1.11.0:
+    resolution: {integrity: sha512-FCNkpyVmNPX0P8kHtX8uoFcXsJ4bjivMXVS5vc/qCyM8jj+Tuqo6CXQjGQKwKl0Lk9VNz7o6JfPoU/mM/XhxqA==}
     engines: {node: '>=v12.20.0'}
 
-  czg@1.9.4:
-    resolution: {integrity: sha512-x9V/FXA3XUmK6PMvP2WC3WPTA4xAUCcjFcL6HxJSLUAn4gKshMHWLkIfWSCsEqmenn5IIX0/L7NuBJ7/luDqCA==}
+  czg@1.11.0:
+    resolution: {integrity: sha512-go39avnHPvDn1HF4LS1qxj5XPGCQexZ9+y8f+0VlE9plZgRyWUOl4rUCwE4vD1azouIhz/KaauB45A7jPfMxpw==}
     engines: {node: '>=v12.20.0'}
     hasBin: true
 
@@ -3135,8 +3230,8 @@ packages:
       supports-color:
         optional: true
 
-  debug@4.3.7:
-    resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
+  debug@4.4.0:
+    resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
     engines: {node: '>=6.0'}
     peerDependencies:
       supports-color: '*'
@@ -3316,6 +3411,10 @@ packages:
     resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==}
     engines: {node: '>=12'}
 
+  dunder-proto@1.0.0:
+    resolution: {integrity: sha512-9+Sj30DIu+4KvHqMfLUGLFYL2PkURSYMVXJyXe92nFRvlYq5hBjLEhblKB+vkd/WVlUYMWigiY07T91Fkk0+4A==}
+    engines: {node: '>= 0.4'}
+
   duplexer@0.1.2:
     resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
 
@@ -3344,6 +3443,9 @@ packages:
   electron-to-chromium@1.5.27:
     resolution: {integrity: sha512-o37j1vZqCoEgBuWWXLHQgTN/KDKe7zwpiY5CPeq2RvUqOyJw9xnrULzZAEVQ5p4h+zjMk7hgtOoPdnLxr7m/jw==}
 
+  electron-to-chromium@1.5.71:
+    resolution: {integrity: sha512-dB68l59BI75W1BUGVTAEJy45CEVuEGy9qPVVQ8pnHyHMn36PLPPoE1mjLH+lo9rKulO3HC2OhbACI/8tCqJBcA==}
+
   emitter-listener@1.1.2:
     resolution: {integrity: sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==}
 
@@ -3404,6 +3506,10 @@ packages:
     resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
     engines: {node: '>= 0.4'}
 
+  es-define-property@1.0.1:
+    resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
+    engines: {node: '>= 0.4'}
+
   es-errors@1.3.0:
     resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
     engines: {node: '>= 0.4'}
@@ -3438,8 +3544,8 @@ packages:
     engines: {node: '>=12'}
     hasBin: true
 
-  esbuild@0.23.1:
-    resolution: {integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==}
+  esbuild@0.24.0:
+    resolution: {integrity: sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -3593,6 +3699,10 @@ packages:
     resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
     engines: {node: '>=16.17'}
 
+  execa@9.5.2:
+    resolution: {integrity: sha512-EHlpxMCpHWSAh1dgS6bVeoLAXGnJNdR93aabr4QCGbzOM73o5XmRfM/e5FUqsw3aagP8S8XEWUWFAxnRBnAF0Q==}
+    engines: {node: ^18.19.0 || >=20.5.0}
+
   expand-brackets@2.1.4:
     resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==}
     engines: {node: '>=0.10.0'}
@@ -3631,8 +3741,8 @@ packages:
   fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
-  fast-uri@3.0.1:
-    resolution: {integrity: sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==}
+  fast-uri@3.0.3:
+    resolution: {integrity: sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==}
 
   fastest-levenshtein@1.0.16:
     resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
@@ -3644,6 +3754,18 @@ packages:
   fclone@1.0.11:
     resolution: {integrity: sha512-GDqVQezKzRABdeqflsgMr7ktzgF9CyS+p2oe0jJqUY6izSSbhPIQJDpoU4PtGcD7VPM9xh/dVrTu6z1nwgmEGw==}
 
+  fdir@6.4.2:
+    resolution: {integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
+  figures@6.1.0:
+    resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==}
+    engines: {node: '>=18'}
+
   file-entry-cache@6.0.1:
     resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
     engines: {node: ^10.12.0 || >=12.0.0}
@@ -3718,8 +3840,8 @@ packages:
     resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==}
     engines: {node: '>=14'}
 
-  form-data@4.0.0:
-    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
+  form-data@4.0.1:
+    resolution: {integrity: sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==}
     engines: {node: '>= 6'}
 
   formidable@2.1.2:
@@ -3774,14 +3896,18 @@ packages:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
 
-  get-east-asian-width@1.2.0:
-    resolution: {integrity: sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==}
+  get-east-asian-width@1.3.0:
+    resolution: {integrity: sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==}
     engines: {node: '>=18'}
 
   get-intrinsic@1.2.4:
     resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
     engines: {node: '>= 0.4'}
 
+  get-intrinsic@1.2.5:
+    resolution: {integrity: sha512-Y4+pKa7XeRUPWFNvOOYHkRYrfzW07oraURSvjDmRVOJ748OrVmeXtpE4+GCEHncjCjkTxPNRt8kEbxDhsn6VTg==}
+    engines: {node: '>= 0.4'}
+
   get-stdin@9.0.0:
     resolution: {integrity: sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==}
     engines: {node: '>=12'}
@@ -3794,6 +3920,10 @@ packages:
     resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
     engines: {node: '>=16'}
 
+  get-stream@9.0.1:
+    resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==}
+    engines: {node: '>=18'}
+
   get-symbol-description@1.0.2:
     resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
     engines: {node: '>= 0.4'}
@@ -3894,6 +4024,10 @@ packages:
   gopd@1.0.1:
     resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
 
+  gopd@1.2.0:
+    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
+    engines: {node: '>= 0.4'}
+
   graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
@@ -3939,6 +4073,10 @@ packages:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
 
+  has-symbols@1.1.0:
+    resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
+    engines: {node: '>= 0.4'}
+
   has-tostringtag@1.0.2:
     resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
     engines: {node: '>= 0.4'}
@@ -4025,6 +4163,10 @@ packages:
     resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
     engines: {node: '>=16.17.0'}
 
+  human-signals@8.0.0:
+    resolution: {integrity: sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==}
+    engines: {node: '>=18.18.0'}
+
   iconv-lite@0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -4265,6 +4407,10 @@ packages:
     resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
+  is-stream@4.0.1:
+    resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==}
+    engines: {node: '>=18'}
+
   is-string@1.0.7:
     resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
     engines: {node: '>= 0.4'}
@@ -4281,6 +4427,10 @@ packages:
     resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
     engines: {node: '>= 0.4'}
 
+  is-unicode-supported@2.1.0:
+    resolution: {integrity: sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==}
+    engines: {node: '>=18'}
+
   is-weakref@1.0.2:
     resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
 
@@ -4339,6 +4489,10 @@ packages:
     resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==}
     hasBin: true
 
+  jiti@2.4.1:
+    resolution: {integrity: sha512-yPBThwecp1wS9DmoA4x4KR2h3QoslacnDR8ypuFM962kI4/456Iy1oHx2RAgh4jfZNdn0bctsdadceiBUgpU1g==}
+    hasBin: true
+
   jju@1.4.0:
     resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}
 
@@ -4379,6 +4533,11 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
+  jsesc@3.0.2:
+    resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
+    engines: {node: '>=6'}
+    hasBin: true
+
   json-buffer@3.0.1:
     resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
 
@@ -4513,8 +4672,8 @@ packages:
     resolution: {integrity: sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==}
     engines: {node: '>=14'}
 
-  lilconfig@3.1.2:
-    resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==}
+  lilconfig@3.1.3:
+    resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
     engines: {node: '>=14'}
 
   lines-and-columns@1.2.4:
@@ -4641,8 +4800,8 @@ packages:
   magic-string@0.30.10:
     resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==}
 
-  magic-string@0.30.11:
-    resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==}
+  magic-string@0.30.14:
+    resolution: {integrity: sha512-5c99P1WKTed11ZC0HMJOj6CDIue6F8ySu+bJL+85q1zBEIY8IklrJ1eiKC2NDRh3Ct3FcvmJPyQHb9erXMTJNw==}
 
   make-dir@2.1.0:
     resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
@@ -4776,8 +4935,8 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  mkdist@1.5.9:
-    resolution: {integrity: sha512-PdJimzhcgDxaHpk1SUabw56gT3BU15vBHUTHkeeus8Kl7jUkpgG7+z0PiS/y23XXgO8TiU/dKP3L1oG55qrP1g==}
+  mkdist@1.6.0:
+    resolution: {integrity: sha512-nD7J/mx33Lwm4Q4qoPgRBVA9JQNKgyE7fLo5vdPWVDdjz96pXglGERp/fRnGPCTB37Kykfxs5bDdXa9BWOT9nw==}
     hasBin: true
     peerDependencies:
       sass: ^1.78.0
@@ -4794,8 +4953,8 @@ packages:
   mlly@1.6.1:
     resolution: {integrity: sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==}
 
-  mlly@1.7.1:
-    resolution: {integrity: sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==}
+  mlly@1.7.3:
+    resolution: {integrity: sha512-xUsx5n/mN0uQf4V548PKQ+YShA4/IW0KI1dZhrNrPCLG+xizETbHTkOa1f8/xut9JRPp8kQuMnz0oqwkTiLo/A==}
 
   module-details-from-path@1.0.3:
     resolution: {integrity: sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==}
@@ -4834,6 +4993,16 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
+  nanoid@3.3.8:
+    resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
+  nanoid@5.0.9:
+    resolution: {integrity: sha512-Aooyr6MXU6HpvvWXKoVoXwKMs/KyVakWwg7xQfv5/S/RIgJMy0Ifa45H9qqYy7pTCszrHzP21Uk4PZq2HpEM8Q==}
+    engines: {node: ^18 || >=20}
+    hasBin: true
+
   nanomatch@1.2.13:
     resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
     engines: {node: '>=0.10.0'}
@@ -4923,6 +5092,10 @@ packages:
     resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
+  npm-run-path@6.0.0:
+    resolution: {integrity: sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==}
+    engines: {node: '>=18'}
+
   nprogress@0.2.0:
     resolution: {integrity: sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==}
 
@@ -4941,8 +5114,8 @@ packages:
     resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
     engines: {node: '>=0.10.0'}
 
-  object-inspect@1.13.2:
-    resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
+  object-inspect@1.13.3:
+    resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==}
     engines: {node: '>= 0.4'}
 
   object-keys@1.1.1:
@@ -5046,8 +5219,8 @@ packages:
     resolution: {integrity: sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==}
     engines: {node: '>= 14'}
 
-  package-json-from-dist@1.0.0:
-    resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==}
+  package-json-from-dist@1.0.1:
+    resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
 
   package-manager-detector@0.2.0:
     resolution: {integrity: sha512-E385OSk9qDcXhcM9LNSe4sdhx8a9mAPrZ4sMLW+tmxl5ZuGtPUcdFu+MPP2jbgiWAZ6Pfe5soGFMd+0Db5Vrog==}
@@ -5070,6 +5243,10 @@ packages:
     resolution: {integrity: sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==}
     engines: {node: '>=16'}
 
+  parse-ms@4.0.0:
+    resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==}
+    engines: {node: '>=18'}
+
   parse-node-version@1.0.1:
     resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==}
     engines: {node: '>= 0.10'}
@@ -5141,13 +5318,17 @@ packages:
   picocolors@1.0.0:
     resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
 
-  picocolors@1.1.0:
-    resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==}
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
   picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
+  picomatch@4.0.2:
+    resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
+    engines: {node: '>=12'}
+
   pidtree@0.6.0:
     resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
     engines: {node: '>=0.10'}
@@ -5189,8 +5370,8 @@ packages:
   pkg-types@1.1.0:
     resolution: {integrity: sha512-/RpmvKdxKf8uILTtoOhAgf30wYbP2Qw+L9p3Rvshx1JZVX+XQNZQFjlbmGHEGIm4CkVPlSn+NXmIM8+9oWQaSA==}
 
-  pkg-types@1.2.0:
-    resolution: {integrity: sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA==}
+  pkg-types@1.2.1:
+    resolution: {integrity: sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==}
 
   pm2-axon-rpc@0.7.1:
     resolution: {integrity: sha512-FbLvW60w+vEyvMjP/xom2UPhUN/2bVpdtLfKJeYM3gwzYhoTEEChCOICfFzxkxuoEleOlnpjie+n1nue91bDQw==}
@@ -5470,8 +5651,8 @@ packages:
     resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
     engines: {node: ^10 || ^12 || >=14}
 
-  postcss@8.4.47:
-    resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==}
+  postcss@8.4.49:
+    resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==}
     engines: {node: ^10 || ^12 || >=14}
 
   posthtml-parser@0.2.1:
@@ -5499,8 +5680,8 @@ packages:
     resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
     engines: {node: '>=6.0.0'}
 
-  prettier-plugin-packagejson@2.5.2:
-    resolution: {integrity: sha512-w+TmoLv2pIa+siplW1cCj2ujEXQQS6z7wmWLOiLQK/2QVl7Wy6xh/ZUpqQw8tbKMXDodmSW4GONxlA33xpdNOg==}
+  prettier-plugin-packagejson@2.5.6:
+    resolution: {integrity: sha512-TY7KiLtyt6Tlf53BEbXUWkN0+TRdHKgIMmtXtDCyHH6yWnZ50Lwq6Vb6lyjapZrhDTXooC4EtlY5iLe1sCgi5w==}
     peerDependencies:
       prettier: '>= 1.16.0'
     peerDependenciesMeta:
@@ -5512,8 +5693,8 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
-  prettier@3.3.3:
-    resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==}
+  prettier@3.4.2:
+    resolution: {integrity: sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -5521,6 +5702,10 @@ packages:
     resolution: {integrity: sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==}
     engines: {node: ^14.13.1 || >=16.0.0}
 
+  pretty-ms@9.2.0:
+    resolution: {integrity: sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg==}
+    engines: {node: '>=18'}
+
   promptly@2.2.0:
     resolution: {integrity: sha512-aC9j+BZsRSSzEsXBNBwDnAxujdx19HycZoKgRgzWnS8eOHg1asuf9heuLprfbe739zY3IdUQx+Egv6Jn135WHA==}
 
@@ -5549,8 +5734,8 @@ packages:
     engines: {node: '>=10.13.0'}
     hasBin: true
 
-  qs@6.13.0:
-    resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
+  qs@6.13.1:
+    resolution: {integrity: sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==}
     engines: {node: '>=0.6'}
 
   query-string@4.3.4:
@@ -5708,8 +5893,8 @@ packages:
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
-  rollup@4.22.4:
-    resolution: {integrity: sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==}
+  rollup@4.28.1:
+    resolution: {integrity: sha512-61fXYl/qNVinKmGSTHAZ6Yy8I3YIJC/r2m9feHo6SwVAVcLT5MPwOUFe7EuURA/4m0NR8lXG4BBXuo/IZEsjMg==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -5839,6 +6024,10 @@ packages:
     resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==}
     engines: {node: '>= 10'}
 
+  sirv@3.0.0:
+    resolution: {integrity: sha512-BPwJGUeDaDCHihkORDchNyyTvWFhcusy1XMmhEVTQTwGeybFbp8YEmB+njbPnth1FibULBSBVwCQni25XlCUDg==}
+    engines: {node: '>=18'}
+
   slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
@@ -5886,15 +6075,15 @@ packages:
   sort-object-keys@1.1.3:
     resolution: {integrity: sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==}
 
-  sort-package-json@2.10.1:
-    resolution: {integrity: sha512-d76wfhgUuGypKqY72Unm5LFnMpACbdxXsLPcL27pOsSrmVqH3PztFp1uq+Z22suk15h7vXmTesuh2aEjdCqb5w==}
+  sort-package-json@2.12.0:
+    resolution: {integrity: sha512-/HrPQAeeLaa+vbAH/znjuhwUluuiM/zL5XX9kop8UpDgjtyWKt43hGDk2vd/TBdDpzIyzIHVUgmYofzYrAQjew==}
     hasBin: true
 
   sortablejs@1.14.0:
     resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==}
 
-  sortablejs@1.15.3:
-    resolution: {integrity: sha512-zdK3/kwwAK1cJgy1rwl1YtNTbRmc8qW/+vgXf75A7NHag5of4pyI6uK86ktmQETyWRH7IGaE73uZOOBcGxgqZg==}
+  sortablejs@1.15.6:
+    resolution: {integrity: sha512-aNfiuwMEpfBM/CN6LY0ibyhxPfPbyFeBTYJKCvzkJ2GkUpazIt3H+QIPAMHwqQ7tMKaHz1Qj+rJJCqljnf4p3A==}
 
   source-map-js@1.2.0:
     resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
@@ -6038,6 +6227,10 @@ packages:
     resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
     engines: {node: '>=12'}
 
+  strip-final-newline@4.0.0:
+    resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==}
+    engines: {node: '>=18'}
+
   strip-json-comments@3.1.1:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
@@ -6134,8 +6327,8 @@ packages:
     engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
 
-  superjson@2.2.1:
-    resolution: {integrity: sha512-8iGv75BYOa0xRJHK5vRLEjE2H/i4lulTjzpUXic3Eg8akftYjkmQDa8JARQ42rlczXyFR3IeRoeFCc7RxHsYZA==}
+  superjson@2.2.2:
+    resolution: {integrity: sha512-5JRxVqC8I8NuOUjzBbvVJAKNM8qoVuH0O77h4WInc/qC2q5IreqKxYwgkga3PfA22OayK2ikceb/B26dztPl+Q==}
     engines: {node: '>=16'}
 
   supports-color@2.0.0:
@@ -6186,8 +6379,8 @@ packages:
     resolution: {integrity: sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
 
-  synckit@0.9.1:
-    resolution: {integrity: sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==}
+  synckit@0.9.2:
+    resolution: {integrity: sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==}
     engines: {node: ^14.18.0 || >=16.0.0}
 
   systeminformation@5.22.7:
@@ -6238,8 +6431,12 @@ packages:
   through@2.3.8:
     resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
 
-  tinyexec@0.3.0:
-    resolution: {integrity: sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==}
+  tinyexec@0.3.1:
+    resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==}
+
+  tinyglobby@0.2.10:
+    resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==}
+    engines: {node: '>=12.0.0'}
 
   to-fast-properties@2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
@@ -6326,8 +6523,8 @@ packages:
   tslib@2.6.2:
     resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
 
-  tslib@2.7.0:
-    resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==}
+  tslib@2.8.1:
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
   tsscmp@1.0.6:
     resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
@@ -6403,8 +6600,8 @@ packages:
     resolution: {integrity: sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==}
     engines: {node: '>=14.16'}
 
-  type-fest@4.26.1:
-    resolution: {integrity: sha512-yOGpmOAL7CkKe/91I5O3gPICmJNLJ1G4zFYVAsRHg7M64biSnPtRj0WNQt++bRkjYOqjWXrhnUw1utzmVErAdg==}
+  type-fest@4.30.0:
+    resolution: {integrity: sha512-G6zXWS1dLj6eagy6sVhOMQiLtJdxQBHIA9Z6HFUNLOlr6MFOgzV8wvmidtPONfPtEUv0uZsy77XJNzTAfwPDaA==}
     engines: {node: '>=16'}
 
   type-is@1.6.18:
@@ -6441,8 +6638,8 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  typescript@5.6.2:
-    resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==}
+  typescript@5.7.2:
+    resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -6478,13 +6675,17 @@ packages:
   undici-types@5.26.5:
     resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
 
-  undici-types@6.19.8:
-    resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
+  undici-types@6.20.0:
+    resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==}
 
   unicorn-magic@0.1.0:
     resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
     engines: {node: '>=18'}
 
+  unicorn-magic@0.3.0:
+    resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==}
+    engines: {node: '>=18'}
+
   union-value@1.0.1:
     resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
     engines: {node: '>=0.10.0'}
@@ -6517,8 +6718,8 @@ packages:
     resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
     engines: {node: '>=0.10.0'}
 
-  untyped@1.4.2:
-    resolution: {integrity: sha512-nC5q0DnPEPVURPhfPQLahhSTnemVtPzdx7ofiRxXpOB2SYnb3MfdU3DVGyJdS8Lx+tBWeAePO8BfU/3EgksM7Q==}
+  untyped@1.5.1:
+    resolution: {integrity: sha512-reBOnkJBFfBZ8pCKaeHgfZLcehXtM6UTxc+vqs1JvCps0c4amLNp3fhdGBZwYp+VLyoY9n3X5KOP7lCyWBUX9A==}
     hasBin: true
 
   update-browserslist-db@1.0.13:
@@ -6533,6 +6734,12 @@ packages:
     peerDependencies:
       browserslist: '>= 4.21.0'
 
+  update-browserslist-db@1.1.1:
+    resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+
   uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
 
@@ -6566,10 +6773,10 @@ packages:
     resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
     engines: {node: '>= 0.8'}
 
-  vite-hot-client@0.2.3:
-    resolution: {integrity: sha512-rOGAV7rUlUHX89fP2p2v0A2WWvV3QMX2UYq0fRqsWSvFvev4atHWqjwGoKaZT1VTKyLGk533ecu3eyd0o59CAg==}
+  vite-hot-client@0.2.4:
+    resolution: {integrity: sha512-a1nzURqO7DDmnXqabFOliz908FRmIppkBKsJthS8rbe8hBEXwEwe4C3Pp33Z1JoFCYfVL4kTOMLKk0ZZxREIeA==}
     peerDependencies:
-      vite: ^2.6.0 || ^3.0.0 || ^4.0.0 || ^5.0.0-0
+      vite: ^2.6.0 || ^3.0.0 || ^4.0.0 || ^5.0.0-0 || ^6.0.0-0
 
   vite-plugin-compression@0.5.1:
     resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
@@ -6591,8 +6798,8 @@ packages:
     peerDependencies:
       vite: '>=2.0.0'
 
-  vite-plugin-inspect@0.8.7:
-    resolution: {integrity: sha512-/XXou3MVc13A5O9/2Nd6xczjrUwt7ZyI9h8pTnUMkr5SshLcb0PJUOVq2V+XVkdeU4njsqAtmK87THZuO2coGA==}
+  vite-plugin-inspect@0.8.8:
+    resolution: {integrity: sha512-aZlBuXsWUPJFmMK92GIv6lH7LrwG2POu4KJ+aEdcqnu92OAf+rhBnfMDQvxIJPEB7hE2t5EyY/PMgf5aDLT8EA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@nuxt/kit': '*'
@@ -6612,16 +6819,16 @@ packages:
     peerDependencies:
       vite: '>=2.0.0'
 
-  vite-plugin-vue-devtools@7.4.5:
-    resolution: {integrity: sha512-8D9Dv7uw620r96uI45M7hCyfsBA9KwttdmxA/DAd0/1KpuGmrFEhNwo4ob/sjaou1noAeK2TrnKdW+sFMR6aKQ==}
+  vite-plugin-vue-devtools@7.6.7:
+    resolution: {integrity: sha512-H1ZyjtpWjP5mHA5R15sQeYgAARuh2Myg3TDFXWZK6QOQRy8s3XjTIt319DogVjU/x3rC3L/jJQjIasRU04mWXA==}
     engines: {node: '>=v14.21.3'}
     peerDependencies:
-      vite: ^3.1.0 || ^4.0.0-0 || ^5.0.0-0
+      vite: ^3.1.0 || ^4.0.0-0 || ^5.0.0-0 || ^6.0.0-0
 
-  vite-plugin-vue-inspector@5.2.0:
-    resolution: {integrity: sha512-wWxyb9XAtaIvV/Lr7cqB1HIzmHZFVUJsTNm3yAxkS87dgh/Ky4qr2wDEWNxF23fdhVa3jQ8MZREpr4XyiuaRqA==}
+  vite-plugin-vue-inspector@5.3.1:
+    resolution: {integrity: sha512-cBk172kZKTdvGpJuzCCLg8lJ909wopwsu3Ve9FsL1XsnLBiRT9U3MePcqrgGHgCX2ZgkqZmAGR8taxw+TV6s7A==}
     peerDependencies:
-      vite: ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0
+      vite: ^3.0.0-0 || ^4.0.0-0 || ^5.0.0-0 || ^6.0.0-0
 
   vite@5.2.10:
     resolution: {integrity: sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==}
@@ -6651,8 +6858,8 @@ packages:
       terser:
         optional: true
 
-  vite@5.4.7:
-    resolution: {integrity: sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==}
+  vite@5.4.11:
+    resolution: {integrity: sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -6689,8 +6896,8 @@ packages:
   vscode-uri@3.0.8:
     resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==}
 
-  vue-component-type-helpers@2.1.6:
-    resolution: {integrity: sha512-ng11B8B/ZADUMMOsRbqv0arc442q7lifSubD0v8oDXIFoMg/mXwAPUunrroIDkY+mcD0dHKccdaznSVp8EoX3w==}
+  vue-component-type-helpers@2.1.10:
+    resolution: {integrity: sha512-lfgdSLQKrUmADiSV6PbBvYgQ33KF3Ztv6gP85MfGaGaSGMTXORVaHT1EHfsqCgzRNBstPKYDmvAV9Do5CmJ07A==}
 
   vue-demi@0.14.10:
     resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
@@ -6726,8 +6933,8 @@ packages:
     peerDependencies:
       vue: '>=3.0.0'
 
-  vue-router@4.4.5:
-    resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==}
+  vue-router@4.3.3:
+    resolution: {integrity: sha512-8Q+u+WP4N2SXY38FDcF2H1dUEbYVHVPtPCPZj/GTZx8RCbiB8AtJP9+YIxn4Vs0svMTNQcLIzka4GH7Utkx9xQ==}
     peerDependencies:
       vue: ^3.2.0
 
@@ -6740,8 +6947,8 @@ packages:
     peerDependencies:
       typescript: '*'
 
-  vue-tsc@2.1.6:
-    resolution: {integrity: sha512-f98dyZp5FOukcYmbFpuSCJ4Z0vHSOSmxGttZJCsFeX0M4w/Rsq0s4uKXjcSRsZqsRgQa6z7SfuO+y0HVICE57Q==}
+  vue-tsc@2.1.10:
+    resolution: {integrity: sha512-RBNSfaaRHcN5uqVqJSZh++Gy/YUzryuv9u1aFWhsammDJXNtUiJMNoJ747lZcQ68wUQFx6E73y4FY3D8E7FGMA==}
     hasBin: true
     peerDependencies:
       typescript: '>=5.0.0'
@@ -6769,8 +6976,8 @@ packages:
       typescript:
         optional: true
 
-  vue@3.5.8:
-    resolution: {integrity: sha512-hvuvuCy51nP/1fSRvrrIqTLSvrSyz2Pq+KQ8S8SXCxTWVE0nMaOnSDnSOxV1eYmGfvK7mqiwvd1C59CEEz7dAQ==}
+  vue@3.5.13:
+    resolution: {integrity: sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
@@ -6782,11 +6989,11 @@ packages:
     peerDependencies:
       vue: ^3.0.1
 
-  vxe-pc-ui@4.2.2:
-    resolution: {integrity: sha512-1CfPqn3D595YiUHg6QTAEi20mJrRiP02fXrJaCzpApsRvnWEqJp7UMxkBj3Sth/XOrZ7uziguG1vGKqNaJ2zYg==}
+  vxe-pc-ui@4.3.23:
+    resolution: {integrity: sha512-gTNkgiBXadjGfKqP7NYfYYLizXaZCCHsqz9GYCoP2aB9QpPh6OXBW5NFNh1aA/YGPlsJW/lqYGxflZM+S0La4Q==}
 
-  vxe-table@4.7.81:
-    resolution: {integrity: sha512-RRBRa9gJzz+Ui8mtYDy8Qh+OTrEUiu2FXXveWqXqUkdmVqdqZNooizupAForNffztKJf8PfhD+JPVLSTWw/r2w==}
+  vxe-table@4.9.19:
+    resolution: {integrity: sha512-Uaa6H6l6WRKxH3lgh/i2GLkBXxGQDd9smG2TqdoAoCPudpXoFmqA8Vgpl1YAps7GTV4ThVNOIK8t3aL+u9ALsA==}
 
   warning@4.0.3:
     resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
@@ -6884,8 +7091,8 @@ packages:
       utf-8-validate:
         optional: true
 
-  xe-utils@3.5.30:
-    resolution: {integrity: sha512-5Ez6JUANpMakduiTLxrNObzqMebnM4697KvHW5okedkUjXvYgGvkbg0tABTkvwDW/Pb09v7vT68dzBOeAuOu0g==}
+  xe-utils@3.5.32:
+    resolution: {integrity: sha512-R8ZT2lRnRBQO3pchM1za/Aru+/29DVDWD/OmOFODWWGkiQYz0iVIr8Bq8uKXS6zMhEsSqVCrn46bXzfe/Agjcw==}
 
   xml-name-validator@4.0.0:
     resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
@@ -6949,6 +7156,10 @@ packages:
     resolution: {integrity: sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==}
     engines: {node: '>=12.20'}
 
+  yoctocolors@2.1.1:
+    resolution: {integrity: sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==}
+    engines: {node: '>=18'}
+
   z-schema@5.0.5:
     resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==}
     engines: {node: '>=8.0.0'}
@@ -6979,16 +7190,16 @@ snapshots:
 
   '@ant-design/icons-svg@4.4.2': {}
 
-  '@ant-design/icons-vue@7.0.1(vue@3.5.8(typescript@5.6.2))':
+  '@ant-design/icons-vue@7.0.1(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       '@ant-design/colors': 6.0.0
       '@ant-design/icons-svg': 4.4.2
-      vue: 3.5.8(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
 
   '@antfu/install-pkg@0.4.1':
     dependencies:
       package-manager-detector: 0.2.0
-      tinyexec: 0.3.0
+      tinyexec: 0.3.1
 
   '@antfu/utils@0.7.10': {}
 
@@ -6997,15 +7208,18 @@ snapshots:
       '@babel/highlight': 7.24.2
       picocolors: 1.0.0
 
-  '@babel/code-frame@7.24.7':
+  '@babel/code-frame@7.26.2':
     dependencies:
-      '@babel/highlight': 7.24.7
-      picocolors: 1.1.0
+      '@babel/helper-validator-identifier': 7.25.9
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
 
   '@babel/compat-data@7.24.4': {}
 
   '@babel/compat-data@7.25.4': {}
 
+  '@babel/compat-data@7.26.3': {}
+
   '@babel/core@7.24.4':
     dependencies:
       '@ampproject/remapping': 2.3.0
@@ -7014,12 +7228,12 @@ snapshots:
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.4)
       '@babel/helpers': 7.24.4
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.3
       '@babel/template': 7.24.0
       '@babel/traverse': 7.24.1
       '@babel/types': 7.24.0
       convert-source-map: 2.0.0
-      debug: 4.3.7
+      debug: 4.4.0
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -7029,17 +7243,37 @@ snapshots:
   '@babel/core@7.25.2':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@babel/code-frame': 7.24.7
+      '@babel/code-frame': 7.26.2
       '@babel/generator': 7.25.6
       '@babel/helper-compilation-targets': 7.25.2
       '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2)
       '@babel/helpers': 7.25.6
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.3
       '@babel/template': 7.25.0
       '@babel/traverse': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
       convert-source-map: 2.0.0
-      debug: 4.3.7
+      debug: 4.4.0
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/core@7.26.0':
+    dependencies:
+      '@ampproject/remapping': 2.3.0
+      '@babel/code-frame': 7.26.2
+      '@babel/generator': 7.26.3
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helpers': 7.26.0
+      '@babel/parser': 7.26.3
+      '@babel/template': 7.25.9
+      '@babel/traverse': 7.26.4
+      '@babel/types': 7.26.3
+      convert-source-map: 2.0.0
+      debug: 4.4.0
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -7055,18 +7289,26 @@ snapshots:
 
   '@babel/generator@7.25.6':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
 
+  '@babel/generator@7.26.3':
+    dependencies:
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
+      jsesc: 3.0.2
+
   '@babel/helper-annotate-as-pure@7.22.5':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
 
-  '@babel/helper-annotate-as-pure@7.24.7':
+  '@babel/helper-annotate-as-pure@7.25.9':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
 
   '@babel/helper-compilation-targets@7.23.6':
     dependencies:
@@ -7084,6 +7326,14 @@ snapshots:
       lru-cache: 5.1.1
       semver: 6.3.1
 
+  '@babel/helper-compilation-targets@7.25.9':
+    dependencies:
+      '@babel/compat-data': 7.26.3
+      '@babel/helper-validator-option': 7.25.9
+      browserslist: 4.24.2
+      lru-cache: 5.1.1
+      semver: 6.3.1
+
   '@babel/helper-create-class-features-plugin@7.24.4(@babel/core@7.24.4)':
     dependencies:
       '@babel/core': 7.24.4
@@ -7097,15 +7347,28 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.22.6
       semver: 6.3.1
 
-  '@babel/helper-create-class-features-plugin@7.25.4(@babel/core@7.25.2)':
+  '@babel/helper-create-class-features-plugin@7.25.9(@babel/core@7.25.2)':
     dependencies:
       '@babel/core': 7.25.2
-      '@babel/helper-annotate-as-pure': 7.24.7
-      '@babel/helper-member-expression-to-functions': 7.24.8
-      '@babel/helper-optimise-call-expression': 7.24.7
-      '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2)
-      '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
-      '@babel/traverse': 7.25.6
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.25.2)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/traverse': 7.26.4
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-create-class-features-plugin@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/traverse': 7.26.4
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
@@ -7114,8 +7377,8 @@ snapshots:
 
   '@babel/helper-function-name@7.23.0':
     dependencies:
-      '@babel/template': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/template': 7.25.9
+      '@babel/types': 7.26.3
 
   '@babel/helper-hoist-variables@7.22.5':
     dependencies:
@@ -7123,12 +7386,12 @@ snapshots:
 
   '@babel/helper-member-expression-to-functions@7.23.0':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
 
-  '@babel/helper-member-expression-to-functions@7.24.8':
+  '@babel/helper-member-expression-to-functions@7.25.9':
     dependencies:
-      '@babel/traverse': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/traverse': 7.26.4
+      '@babel/types': 7.26.3
     transitivePeerDependencies:
       - supports-color
 
@@ -7140,10 +7403,10 @@ snapshots:
     dependencies:
       '@babel/types': 7.24.0
 
-  '@babel/helper-module-imports@7.24.7':
+  '@babel/helper-module-imports@7.25.9':
     dependencies:
-      '@babel/traverse': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/traverse': 7.26.4
+      '@babel/types': 7.26.3
     transitivePeerDependencies:
       - supports-color
 
@@ -7159,25 +7422,45 @@ snapshots:
   '@babel/helper-module-transforms@7.25.2(@babel/core@7.25.2)':
     dependencies:
       '@babel/core': 7.25.2
-      '@babel/helper-module-imports': 7.24.7
+      '@babel/helper-module-imports': 7.25.9
       '@babel/helper-simple-access': 7.24.7
-      '@babel/helper-validator-identifier': 7.24.7
+      '@babel/helper-validator-identifier': 7.25.9
       '@babel/traverse': 7.25.6
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/helper-module-transforms@7.26.0(@babel/core@7.25.2)':
+    dependencies:
+      '@babel/core': 7.25.2
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/traverse': 7.26.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-transforms@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/traverse': 7.26.4
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helper-optimise-call-expression@7.22.5':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
 
-  '@babel/helper-optimise-call-expression@7.24.7':
+  '@babel/helper-optimise-call-expression@7.25.9':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
 
   '@babel/helper-plugin-utils@7.24.0': {}
 
   '@babel/helper-plugin-utils@7.24.8': {}
 
+  '@babel/helper-plugin-utils@7.25.9': {}
+
   '@babel/helper-replace-supers@7.24.1(@babel/core@7.24.4)':
     dependencies:
       '@babel/core': 7.24.4
@@ -7185,12 +7468,21 @@ snapshots:
       '@babel/helper-member-expression-to-functions': 7.23.0
       '@babel/helper-optimise-call-expression': 7.22.5
 
-  '@babel/helper-replace-supers@7.25.0(@babel/core@7.25.2)':
+  '@babel/helper-replace-supers@7.25.9(@babel/core@7.25.2)':
     dependencies:
       '@babel/core': 7.25.2
-      '@babel/helper-member-expression-to-functions': 7.24.8
-      '@babel/helper-optimise-call-expression': 7.24.7
-      '@babel/traverse': 7.25.6
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/traverse': 7.26.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-replace-supers@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/traverse': 7.26.4
     transitivePeerDependencies:
       - supports-color
 
@@ -7201,37 +7493,39 @@ snapshots:
   '@babel/helper-simple-access@7.24.7':
     dependencies:
       '@babel/traverse': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
     transitivePeerDependencies:
       - supports-color
 
   '@babel/helper-skip-transparent-expression-wrappers@7.22.5':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
 
-  '@babel/helper-skip-transparent-expression-wrappers@7.24.7':
+  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
     dependencies:
-      '@babel/traverse': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/traverse': 7.26.4
+      '@babel/types': 7.26.3
     transitivePeerDependencies:
       - supports-color
 
   '@babel/helper-split-export-declaration@7.22.6':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.26.3
 
   '@babel/helper-string-parser@7.24.1': {}
 
-  '@babel/helper-string-parser@7.24.8': {}
+  '@babel/helper-string-parser@7.25.9': {}
 
   '@babel/helper-validator-identifier@7.22.20': {}
 
-  '@babel/helper-validator-identifier@7.24.7': {}
+  '@babel/helper-validator-identifier@7.25.9': {}
 
   '@babel/helper-validator-option@7.23.5': {}
 
   '@babel/helper-validator-option@7.24.8': {}
 
+  '@babel/helper-validator-option@7.25.9': {}
+
   '@babel/helpers@7.24.4':
     dependencies:
       '@babel/template': 7.24.0
@@ -7243,49 +7537,47 @@ snapshots:
   '@babel/helpers@7.25.6':
     dependencies:
       '@babel/template': 7.25.0
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
 
-  '@babel/highlight@7.24.2':
+  '@babel/helpers@7.26.0':
     dependencies:
-      '@babel/helper-validator-identifier': 7.24.7
-      chalk: 2.4.2
-      js-tokens: 4.0.0
-      picocolors: 1.0.0
+      '@babel/template': 7.25.9
+      '@babel/types': 7.26.3
 
-  '@babel/highlight@7.24.7':
+  '@babel/highlight@7.24.2':
     dependencies:
-      '@babel/helper-validator-identifier': 7.24.7
+      '@babel/helper-validator-identifier': 7.25.9
       chalk: 2.4.2
       js-tokens: 4.0.0
-      picocolors: 1.1.0
+      picocolors: 1.0.0
 
-  '@babel/parser@7.25.6':
+  '@babel/parser@7.26.3':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
 
-  '@babel/plugin-proposal-decorators@7.24.7(@babel/core@7.25.2)':
+  '@babel/plugin-proposal-decorators@7.25.9(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.25.2
-      '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2)
-      '@babel/helper-plugin-utils': 7.24.8
-      '@babel/plugin-syntax-decorators': 7.24.7(@babel/core@7.25.2)
+      '@babel/core': 7.26.0
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/plugin-syntax-decorators': 7.25.9(@babel/core@7.26.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/plugin-syntax-decorators@7.24.7(@babel/core@7.25.2)':
+  '@babel/plugin-syntax-decorators@7.25.9(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.25.2
-      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-import-attributes@7.25.6(@babel/core@7.25.2)':
+  '@babel/plugin-syntax-import-attributes@7.26.0(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.25.2
-      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.25.2)':
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.25.2
-      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
   '@babel/plugin-syntax-jsx@7.24.1(@babel/core@7.24.4)':
     dependencies:
@@ -7297,20 +7589,30 @@ snapshots:
       '@babel/core': 7.25.2
       '@babel/helper-plugin-utils': 7.24.8
 
+  '@babel/plugin-syntax-jsx@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
   '@babel/plugin-syntax-typescript@7.24.1(@babel/core@7.24.4)':
     dependencies:
       '@babel/core': 7.24.4
       '@babel/helper-plugin-utils': 7.24.0
 
-  '@babel/plugin-syntax-typescript@7.25.4(@babel/core@7.25.2)':
+  '@babel/plugin-syntax-typescript@7.25.9(@babel/core@7.25.2)':
     dependencies:
       '@babel/core': 7.25.2
-      '@babel/helper-plugin-utils': 7.24.8
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-typescript@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
   '@babel/plugin-transform-modules-commonjs@7.24.8(@babel/core@7.25.2)':
     dependencies:
       '@babel/core': 7.25.2
-      '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2)
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.25.2)
       '@babel/helper-plugin-utils': 7.24.8
       '@babel/helper-simple-access': 7.24.7
     transitivePeerDependencies:
@@ -7324,14 +7626,25 @@ snapshots:
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-typescript': 7.24.1(@babel/core@7.24.4)
 
-  '@babel/plugin-transform-typescript@7.25.2(@babel/core@7.25.2)':
+  '@babel/plugin-transform-typescript@7.26.3(@babel/core@7.25.2)':
     dependencies:
       '@babel/core': 7.25.2
-      '@babel/helper-annotate-as-pure': 7.24.7
-      '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2)
-      '@babel/helper-plugin-utils': 7.24.8
-      '@babel/helper-skip-transparent-expression-wrappers': 7.24.7
-      '@babel/plugin-syntax-typescript': 7.25.4(@babel/core@7.25.2)
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.25.2)
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.25.2)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-typescript@7.26.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/plugin-syntax-typescript': 7.25.9(@babel/core@7.26.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -7342,7 +7655,7 @@ snapshots:
       '@babel/helper-validator-option': 7.24.8
       '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2)
       '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/core@7.25.2)
-      '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2)
+      '@babel/plugin-transform-typescript': 7.26.3(@babel/core@7.25.2)
     transitivePeerDependencies:
       - supports-color
 
@@ -7350,23 +7663,29 @@ snapshots:
     dependencies:
       regenerator-runtime: 0.14.1
 
-  '@babel/runtime@7.25.6':
+  '@babel/runtime@7.26.0':
     dependencies:
       regenerator-runtime: 0.14.1
 
-  '@babel/standalone@7.25.6': {}
+  '@babel/standalone@7.26.4': {}
 
   '@babel/template@7.24.0':
     dependencies:
       '@babel/code-frame': 7.24.2
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.3
       '@babel/types': 7.24.0
 
   '@babel/template@7.25.0':
     dependencies:
-      '@babel/code-frame': 7.24.7
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/code-frame': 7.26.2
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
+
+  '@babel/template@7.25.9':
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
 
   '@babel/traverse@7.24.1':
     dependencies:
@@ -7376,21 +7695,33 @@ snapshots:
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-hoist-variables': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.3
       '@babel/types': 7.24.0
-      debug: 4.3.7
+      debug: 4.4.0
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
 
   '@babel/traverse@7.25.6':
     dependencies:
-      '@babel/code-frame': 7.24.7
+      '@babel/code-frame': 7.26.2
       '@babel/generator': 7.25.6
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.3
       '@babel/template': 7.25.0
-      '@babel/types': 7.25.6
-      debug: 4.3.7
+      '@babel/types': 7.26.3
+      debug: 4.4.0
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/traverse@7.26.4':
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@babel/generator': 7.26.3
+      '@babel/parser': 7.26.3
+      '@babel/template': 7.25.9
+      '@babel/types': 7.26.3
+      debug: 4.4.0
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -7401,26 +7732,25 @@ snapshots:
       '@babel/helper-validator-identifier': 7.22.20
       to-fast-properties: 2.0.0
 
-  '@babel/types@7.25.6':
+  '@babel/types@7.26.3':
     dependencies:
-      '@babel/helper-string-parser': 7.24.8
-      '@babel/helper-validator-identifier': 7.24.7
-      to-fast-properties: 2.0.0
+      '@babel/helper-string-parser': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
 
-  '@commitlint/cli@19.5.0(@types/node@22.5.5)(typescript@5.6.2)':
+  '@commitlint/cli@19.6.0(@types/node@22.10.1)(typescript@5.7.2)':
     dependencies:
       '@commitlint/format': 19.5.0
-      '@commitlint/lint': 19.5.0
-      '@commitlint/load': 19.5.0(@types/node@22.5.5)(typescript@5.6.2)
+      '@commitlint/lint': 19.6.0
+      '@commitlint/load': 19.5.0(@types/node@22.10.1)(typescript@5.7.2)
       '@commitlint/read': 19.5.0
       '@commitlint/types': 19.5.0
-      tinyexec: 0.3.0
+      tinyexec: 0.3.1
       yargs: 17.7.2
     transitivePeerDependencies:
       - '@types/node'
       - typescript
 
-  '@commitlint/config-conventional@19.5.0':
+  '@commitlint/config-conventional@19.6.0':
     dependencies:
       '@commitlint/types': 19.5.0
       conventional-changelog-conventionalcommits: 7.0.2
@@ -7446,27 +7776,27 @@ snapshots:
       '@commitlint/types': 19.5.0
       chalk: 5.3.0
 
-  '@commitlint/is-ignored@19.5.0':
+  '@commitlint/is-ignored@19.6.0':
     dependencies:
       '@commitlint/types': 19.5.0
       semver: 7.6.3
 
-  '@commitlint/lint@19.5.0':
+  '@commitlint/lint@19.6.0':
     dependencies:
-      '@commitlint/is-ignored': 19.5.0
+      '@commitlint/is-ignored': 19.6.0
       '@commitlint/parse': 19.5.0
-      '@commitlint/rules': 19.5.0
+      '@commitlint/rules': 19.6.0
       '@commitlint/types': 19.5.0
 
-  '@commitlint/load@19.5.0(@types/node@22.5.5)(typescript@5.6.2)':
+  '@commitlint/load@19.5.0(@types/node@22.10.1)(typescript@5.7.2)':
     dependencies:
       '@commitlint/config-validator': 19.5.0
       '@commitlint/execute-rule': 19.5.0
       '@commitlint/resolve-extends': 19.5.0
       '@commitlint/types': 19.5.0
       chalk: 5.3.0
-      cosmiconfig: 9.0.0(typescript@5.6.2)
-      cosmiconfig-typescript-loader: 5.0.0(@types/node@22.5.5)(cosmiconfig@9.0.0(typescript@5.6.2))(typescript@5.6.2)
+      cosmiconfig: 9.0.0(typescript@5.7.2)
+      cosmiconfig-typescript-loader: 5.1.0(@types/node@22.10.1)(cosmiconfig@9.0.0(typescript@5.7.2))(typescript@5.7.2)
       lodash.isplainobject: 4.0.6
       lodash.merge: 4.6.2
       lodash.uniq: 4.5.0
@@ -7488,7 +7818,7 @@ snapshots:
       '@commitlint/types': 19.5.0
       git-raw-commits: 4.0.0
       minimist: 1.2.8
-      tinyexec: 0.3.0
+      tinyexec: 0.3.1
 
   '@commitlint/resolve-extends@19.5.0':
     dependencies:
@@ -7499,7 +7829,7 @@ snapshots:
       lodash.mergewith: 4.6.2
       resolve-from: 5.0.0
 
-  '@commitlint/rules@19.5.0':
+  '@commitlint/rules@19.6.0':
     dependencies:
       '@commitlint/ensure': 19.5.0
       '@commitlint/message': 19.5.0
@@ -7514,7 +7844,7 @@ snapshots:
 
   '@commitlint/types@19.5.0':
     dependencies:
-      '@types/conventional-commits-parser': 5.0.0
+      '@types/conventional-commits-parser': 5.0.1
       chalk: 5.3.0
 
   '@cspotcode/source-map-support@0.8.1':
@@ -7555,7 +7885,7 @@ snapshots:
   '@esbuild/aix-ppc64@0.21.5':
     optional: true
 
-  '@esbuild/aix-ppc64@0.23.1':
+  '@esbuild/aix-ppc64@0.24.0':
     optional: true
 
   '@esbuild/android-arm64@0.19.12':
@@ -7567,7 +7897,7 @@ snapshots:
   '@esbuild/android-arm64@0.21.5':
     optional: true
 
-  '@esbuild/android-arm64@0.23.1':
+  '@esbuild/android-arm64@0.24.0':
     optional: true
 
   '@esbuild/android-arm@0.19.12':
@@ -7579,7 +7909,7 @@ snapshots:
   '@esbuild/android-arm@0.21.5':
     optional: true
 
-  '@esbuild/android-arm@0.23.1':
+  '@esbuild/android-arm@0.24.0':
     optional: true
 
   '@esbuild/android-x64@0.19.12':
@@ -7591,7 +7921,7 @@ snapshots:
   '@esbuild/android-x64@0.21.5':
     optional: true
 
-  '@esbuild/android-x64@0.23.1':
+  '@esbuild/android-x64@0.24.0':
     optional: true
 
   '@esbuild/darwin-arm64@0.19.12':
@@ -7603,7 +7933,7 @@ snapshots:
   '@esbuild/darwin-arm64@0.21.5':
     optional: true
 
-  '@esbuild/darwin-arm64@0.23.1':
+  '@esbuild/darwin-arm64@0.24.0':
     optional: true
 
   '@esbuild/darwin-x64@0.19.12':
@@ -7615,7 +7945,7 @@ snapshots:
   '@esbuild/darwin-x64@0.21.5':
     optional: true
 
-  '@esbuild/darwin-x64@0.23.1':
+  '@esbuild/darwin-x64@0.24.0':
     optional: true
 
   '@esbuild/freebsd-arm64@0.19.12':
@@ -7627,7 +7957,7 @@ snapshots:
   '@esbuild/freebsd-arm64@0.21.5':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.23.1':
+  '@esbuild/freebsd-arm64@0.24.0':
     optional: true
 
   '@esbuild/freebsd-x64@0.19.12':
@@ -7639,7 +7969,7 @@ snapshots:
   '@esbuild/freebsd-x64@0.21.5':
     optional: true
 
-  '@esbuild/freebsd-x64@0.23.1':
+  '@esbuild/freebsd-x64@0.24.0':
     optional: true
 
   '@esbuild/linux-arm64@0.19.12':
@@ -7651,7 +7981,7 @@ snapshots:
   '@esbuild/linux-arm64@0.21.5':
     optional: true
 
-  '@esbuild/linux-arm64@0.23.1':
+  '@esbuild/linux-arm64@0.24.0':
     optional: true
 
   '@esbuild/linux-arm@0.19.12':
@@ -7663,7 +7993,7 @@ snapshots:
   '@esbuild/linux-arm@0.21.5':
     optional: true
 
-  '@esbuild/linux-arm@0.23.1':
+  '@esbuild/linux-arm@0.24.0':
     optional: true
 
   '@esbuild/linux-ia32@0.19.12':
@@ -7675,7 +8005,7 @@ snapshots:
   '@esbuild/linux-ia32@0.21.5':
     optional: true
 
-  '@esbuild/linux-ia32@0.23.1':
+  '@esbuild/linux-ia32@0.24.0':
     optional: true
 
   '@esbuild/linux-loong64@0.19.12':
@@ -7687,7 +8017,7 @@ snapshots:
   '@esbuild/linux-loong64@0.21.5':
     optional: true
 
-  '@esbuild/linux-loong64@0.23.1':
+  '@esbuild/linux-loong64@0.24.0':
     optional: true
 
   '@esbuild/linux-mips64el@0.19.12':
@@ -7699,7 +8029,7 @@ snapshots:
   '@esbuild/linux-mips64el@0.21.5':
     optional: true
 
-  '@esbuild/linux-mips64el@0.23.1':
+  '@esbuild/linux-mips64el@0.24.0':
     optional: true
 
   '@esbuild/linux-ppc64@0.19.12':
@@ -7711,7 +8041,7 @@ snapshots:
   '@esbuild/linux-ppc64@0.21.5':
     optional: true
 
-  '@esbuild/linux-ppc64@0.23.1':
+  '@esbuild/linux-ppc64@0.24.0':
     optional: true
 
   '@esbuild/linux-riscv64@0.19.12':
@@ -7723,7 +8053,7 @@ snapshots:
   '@esbuild/linux-riscv64@0.21.5':
     optional: true
 
-  '@esbuild/linux-riscv64@0.23.1':
+  '@esbuild/linux-riscv64@0.24.0':
     optional: true
 
   '@esbuild/linux-s390x@0.19.12':
@@ -7735,7 +8065,7 @@ snapshots:
   '@esbuild/linux-s390x@0.21.5':
     optional: true
 
-  '@esbuild/linux-s390x@0.23.1':
+  '@esbuild/linux-s390x@0.24.0':
     optional: true
 
   '@esbuild/linux-x64@0.19.12':
@@ -7747,7 +8077,7 @@ snapshots:
   '@esbuild/linux-x64@0.21.5':
     optional: true
 
-  '@esbuild/linux-x64@0.23.1':
+  '@esbuild/linux-x64@0.24.0':
     optional: true
 
   '@esbuild/netbsd-x64@0.19.12':
@@ -7759,10 +8089,10 @@ snapshots:
   '@esbuild/netbsd-x64@0.21.5':
     optional: true
 
-  '@esbuild/netbsd-x64@0.23.1':
+  '@esbuild/netbsd-x64@0.24.0':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.23.1':
+  '@esbuild/openbsd-arm64@0.24.0':
     optional: true
 
   '@esbuild/openbsd-x64@0.19.12':
@@ -7774,7 +8104,7 @@ snapshots:
   '@esbuild/openbsd-x64@0.21.5':
     optional: true
 
-  '@esbuild/openbsd-x64@0.23.1':
+  '@esbuild/openbsd-x64@0.24.0':
     optional: true
 
   '@esbuild/sunos-x64@0.19.12':
@@ -7786,7 +8116,7 @@ snapshots:
   '@esbuild/sunos-x64@0.21.5':
     optional: true
 
-  '@esbuild/sunos-x64@0.23.1':
+  '@esbuild/sunos-x64@0.24.0':
     optional: true
 
   '@esbuild/win32-arm64@0.19.12':
@@ -7798,7 +8128,7 @@ snapshots:
   '@esbuild/win32-arm64@0.21.5':
     optional: true
 
-  '@esbuild/win32-arm64@0.23.1':
+  '@esbuild/win32-arm64@0.24.0':
     optional: true
 
   '@esbuild/win32-ia32@0.19.12':
@@ -7810,7 +8140,7 @@ snapshots:
   '@esbuild/win32-ia32@0.21.5':
     optional: true
 
-  '@esbuild/win32-ia32@0.23.1':
+  '@esbuild/win32-ia32@0.24.0':
     optional: true
 
   '@esbuild/win32-x64@0.19.12':
@@ -7822,7 +8152,7 @@ snapshots:
   '@esbuild/win32-x64@0.21.5':
     optional: true
 
-  '@esbuild/win32-x64@0.23.1':
+  '@esbuild/win32-x64@0.24.0':
     optional: true
 
   '@eslint-community/eslint-utils@4.4.0(eslint@8.57.0)':
@@ -7835,7 +8165,7 @@ snapshots:
   '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.7
+      debug: 4.4.0
       espree: 9.6.1
       globals: 13.24.0
       ignore: 5.3.1
@@ -7851,7 +8181,7 @@ snapshots:
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.3
-      debug: 4.3.7
+      debug: 4.4.0
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -7872,7 +8202,7 @@ snapshots:
     dependencies:
       '@iconify/types': 2.0.0
 
-  '@iconify/json@2.2.252':
+  '@iconify/json@2.2.281':
     dependencies:
       '@iconify/types': 2.0.0
       pathe: 1.1.2
@@ -7884,10 +8214,10 @@ snapshots:
       '@antfu/install-pkg': 0.4.1
       '@antfu/utils': 0.7.10
       '@iconify/types': 2.0.0
-      debug: 4.3.7
+      debug: 4.4.0
       kolorist: 1.8.0
       local-pkg: 0.5.0
-      mlly: 1.7.1
+      mlly: 1.7.3
     transitivePeerDependencies:
       - supports-color
 
@@ -7929,23 +8259,23 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.0
 
-  '@microsoft/api-extractor-model@7.28.13(@types/node@22.5.5)':
+  '@microsoft/api-extractor-model@7.28.13(@types/node@22.10.1)':
     dependencies:
       '@microsoft/tsdoc': 0.14.2
       '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 4.0.2(@types/node@22.5.5)
+      '@rushstack/node-core-library': 4.0.2(@types/node@22.10.1)
     transitivePeerDependencies:
       - '@types/node'
 
-  '@microsoft/api-extractor@7.43.0(@types/node@22.5.5)':
+  '@microsoft/api-extractor@7.43.0(@types/node@22.10.1)':
     dependencies:
-      '@microsoft/api-extractor-model': 7.28.13(@types/node@22.5.5)
+      '@microsoft/api-extractor-model': 7.28.13(@types/node@22.10.1)
       '@microsoft/tsdoc': 0.14.2
       '@microsoft/tsdoc-config': 0.16.2
-      '@rushstack/node-core-library': 4.0.2(@types/node@22.5.5)
+      '@rushstack/node-core-library': 4.0.2(@types/node@22.10.1)
       '@rushstack/rig-package': 0.5.2
-      '@rushstack/terminal': 0.10.0(@types/node@22.5.5)
-      '@rushstack/ts-command-line': 4.19.1(@types/node@22.5.5)
+      '@rushstack/terminal': 0.10.0(@types/node@22.10.1)
+      '@rushstack/ts-command-line': 4.19.1(@types/node@22.10.1)
       lodash: 4.17.21
       minimatch: 3.0.8
       resolve: 1.22.8
@@ -8053,7 +8383,7 @@ snapshots:
 
   '@pm2/pm2-version-check@1.0.4':
     dependencies:
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
 
@@ -8062,8 +8392,8 @@ snapshots:
   '@purge-icons/core@0.10.0':
     dependencies:
       '@iconify/iconify': 2.1.2
-      axios: 0.26.1(debug@4.3.7)
-      debug: 4.3.7
+      axios: 0.26.1(debug@4.4.0)
+      debug: 4.4.0
       fast-glob: 3.3.2
       fs-extra: 10.1.0
     transitivePeerDependencies:
@@ -8080,24 +8410,24 @@ snapshots:
 
   '@rollup/plugin-commonjs@25.0.8(rollup@3.29.5)':
     dependencies:
-      '@rollup/pluginutils': 5.1.1(rollup@3.29.5)
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
       commondir: 1.0.1
       estree-walker: 2.0.2
       glob: 8.1.0
       is-reference: 1.2.1
-      magic-string: 0.30.11
+      magic-string: 0.30.14
     optionalDependencies:
       rollup: 3.29.5
 
   '@rollup/plugin-json@6.1.0(rollup@3.29.5)':
     dependencies:
-      '@rollup/pluginutils': 5.1.1(rollup@3.29.5)
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
     optionalDependencies:
       rollup: 3.29.5
 
-  '@rollup/plugin-node-resolve@15.2.4(rollup@3.29.5)':
+  '@rollup/plugin-node-resolve@15.3.0(rollup@3.29.5)':
     dependencies:
-      '@rollup/pluginutils': 5.1.1(rollup@3.29.5)
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
       '@types/resolve': 1.20.2
       deepmerge: 4.3.1
       is-module: 1.0.0
@@ -8107,8 +8437,8 @@ snapshots:
 
   '@rollup/plugin-replace@5.0.7(rollup@3.29.5)':
     dependencies:
-      '@rollup/pluginutils': 5.1.1(rollup@3.29.5)
-      magic-string: 0.30.11
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
+      magic-string: 0.30.14
     optionalDependencies:
       rollup: 3.29.5
 
@@ -8117,127 +8447,136 @@ snapshots:
       estree-walker: 2.0.2
       picomatch: 2.3.1
 
-  '@rollup/pluginutils@5.1.0(rollup@4.22.4)':
+  '@rollup/pluginutils@5.1.0(rollup@4.28.1)':
     dependencies:
       '@types/estree': 1.0.5
       estree-walker: 2.0.2
       picomatch: 2.3.1
     optionalDependencies:
-      rollup: 4.22.4
+      rollup: 4.28.1
 
-  '@rollup/pluginutils@5.1.1(rollup@3.29.5)':
+  '@rollup/pluginutils@5.1.3(rollup@3.29.5)':
     dependencies:
       '@types/estree': 1.0.6
       estree-walker: 2.0.2
-      picomatch: 2.3.1
+      picomatch: 4.0.2
     optionalDependencies:
       rollup: 3.29.5
 
-  '@rollup/pluginutils@5.1.1(rollup@4.22.4)':
+  '@rollup/pluginutils@5.1.3(rollup@4.28.1)':
     dependencies:
       '@types/estree': 1.0.6
       estree-walker: 2.0.2
-      picomatch: 2.3.1
+      picomatch: 4.0.2
     optionalDependencies:
-      rollup: 4.22.4
+      rollup: 4.28.1
 
   '@rollup/rollup-android-arm-eabi@4.14.3':
     optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.22.4':
+  '@rollup/rollup-android-arm-eabi@4.28.1':
     optional: true
 
   '@rollup/rollup-android-arm64@4.14.3':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.22.4':
+  '@rollup/rollup-android-arm64@4.28.1':
     optional: true
 
   '@rollup/rollup-darwin-arm64@4.14.3':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.22.4':
+  '@rollup/rollup-darwin-arm64@4.28.1':
     optional: true
 
   '@rollup/rollup-darwin-x64@4.14.3':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.22.4':
+  '@rollup/rollup-darwin-x64@4.28.1':
+    optional: true
+
+  '@rollup/rollup-freebsd-arm64@4.28.1':
+    optional: true
+
+  '@rollup/rollup-freebsd-x64@4.28.1':
     optional: true
 
   '@rollup/rollup-linux-arm-gnueabihf@4.14.3':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.22.4':
+  '@rollup/rollup-linux-arm-gnueabihf@4.28.1':
     optional: true
 
   '@rollup/rollup-linux-arm-musleabihf@4.14.3':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.22.4':
+  '@rollup/rollup-linux-arm-musleabihf@4.28.1':
     optional: true
 
   '@rollup/rollup-linux-arm64-gnu@4.14.3':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.22.4':
+  '@rollup/rollup-linux-arm64-gnu@4.28.1':
     optional: true
 
   '@rollup/rollup-linux-arm64-musl@4.14.3':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.22.4':
+  '@rollup/rollup-linux-arm64-musl@4.28.1':
+    optional: true
+
+  '@rollup/rollup-linux-loongarch64-gnu@4.28.1':
     optional: true
 
   '@rollup/rollup-linux-powerpc64le-gnu@4.14.3':
     optional: true
 
-  '@rollup/rollup-linux-powerpc64le-gnu@4.22.4':
+  '@rollup/rollup-linux-powerpc64le-gnu@4.28.1':
     optional: true
 
   '@rollup/rollup-linux-riscv64-gnu@4.14.3':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.22.4':
+  '@rollup/rollup-linux-riscv64-gnu@4.28.1':
     optional: true
 
   '@rollup/rollup-linux-s390x-gnu@4.14.3':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.22.4':
+  '@rollup/rollup-linux-s390x-gnu@4.28.1':
     optional: true
 
   '@rollup/rollup-linux-x64-gnu@4.14.3':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.22.4':
+  '@rollup/rollup-linux-x64-gnu@4.28.1':
     optional: true
 
   '@rollup/rollup-linux-x64-musl@4.14.3':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.22.4':
+  '@rollup/rollup-linux-x64-musl@4.28.1':
     optional: true
 
   '@rollup/rollup-win32-arm64-msvc@4.14.3':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.22.4':
+  '@rollup/rollup-win32-arm64-msvc@4.28.1':
     optional: true
 
   '@rollup/rollup-win32-ia32-msvc@4.14.3':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.22.4':
+  '@rollup/rollup-win32-ia32-msvc@4.28.1':
     optional: true
 
   '@rollup/rollup-win32-x64-msvc@4.14.3':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.22.4':
+  '@rollup/rollup-win32-x64-msvc@4.28.1':
     optional: true
 
-  '@rushstack/node-core-library@4.0.2(@types/node@22.5.5)':
+  '@rushstack/node-core-library@4.0.2(@types/node@22.10.1)':
     dependencies:
       fs-extra: 7.0.1
       import-lazy: 4.0.0
@@ -8246,34 +8585,38 @@ snapshots:
       semver: 7.5.4
       z-schema: 5.0.5
     optionalDependencies:
-      '@types/node': 22.5.5
+      '@types/node': 22.10.1
 
   '@rushstack/rig-package@0.5.2':
     dependencies:
       resolve: 1.22.8
       strip-json-comments: 3.1.1
 
-  '@rushstack/terminal@0.10.0(@types/node@22.5.5)':
+  '@rushstack/terminal@0.10.0(@types/node@22.10.1)':
     dependencies:
-      '@rushstack/node-core-library': 4.0.2(@types/node@22.5.5)
+      '@rushstack/node-core-library': 4.0.2(@types/node@22.10.1)
       supports-color: 8.1.1
     optionalDependencies:
-      '@types/node': 22.5.5
+      '@types/node': 22.10.1
 
-  '@rushstack/ts-command-line@4.19.1(@types/node@22.5.5)':
+  '@rushstack/ts-command-line@4.19.1(@types/node@22.10.1)':
     dependencies:
-      '@rushstack/terminal': 0.10.0(@types/node@22.5.5)
+      '@rushstack/terminal': 0.10.0(@types/node@22.10.1)
       '@types/argparse': 1.0.38
       argparse: 1.0.10
       string-argv: 0.3.2
     transitivePeerDependencies:
       - '@types/node'
 
+  '@sec-ant/readable-stream@0.4.1': {}
+
   '@simonwep/pickr@1.8.2':
     dependencies:
-      core-js: 3.38.1
+      core-js: 3.39.0
       nanopop: 2.4.2
 
+  '@sindresorhus/merge-streams@4.0.0': {}
+
   '@tootallnate/quickjs-emscripten@0.23.0': {}
 
   '@trysound/sax@0.2.0': {}
@@ -8300,7 +8643,7 @@ snapshots:
   '@types/co-body@6.1.3':
     dependencies:
       '@types/node': 20.12.7
-      '@types/qs': 6.9.16
+      '@types/qs': 6.9.17
 
   '@types/codemirror@5.60.15':
     dependencies:
@@ -8312,9 +8655,9 @@ snapshots:
 
   '@types/content-disposition@0.5.8': {}
 
-  '@types/conventional-commits-parser@5.0.0':
+  '@types/conventional-commits-parser@5.0.1':
     dependencies:
-      '@types/node': 22.5.5
+      '@types/node': 22.10.1
 
   '@types/cookies@0.9.0':
     dependencies:
@@ -8332,7 +8675,7 @@ snapshots:
   '@types/express-serve-static-core@4.19.0':
     dependencies:
       '@types/node': 20.12.7
-      '@types/qs': 6.9.16
+      '@types/qs': 6.9.17
       '@types/range-parser': 1.2.7
       '@types/send': 0.17.4
 
@@ -8340,7 +8683,7 @@ snapshots:
     dependencies:
       '@types/body-parser': 1.19.5
       '@types/express-serve-static-core': 4.19.0
-      '@types/qs': 6.9.16
+      '@types/qs': 6.9.17
       '@types/serve-static': 1.15.7
 
   '@types/formidable@2.0.6':
@@ -8391,9 +8734,9 @@ snapshots:
 
   '@types/lodash-es@4.17.12':
     dependencies:
-      '@types/lodash': 4.17.7
+      '@types/lodash': 4.17.13
 
-  '@types/lodash@4.17.7': {}
+  '@types/lodash@4.17.13': {}
 
   '@types/mime@1.3.5': {}
 
@@ -8401,9 +8744,9 @@ snapshots:
     dependencies:
       undici-types: 5.26.5
 
-  '@types/node@22.5.5':
+  '@types/node@22.10.1':
     dependencies:
-      undici-types: 6.19.8
+      undici-types: 6.20.0
 
   '@types/normalize-package-data@2.4.4': {}
 
@@ -8411,9 +8754,9 @@ snapshots:
 
   '@types/qrcode@1.5.5':
     dependencies:
-      '@types/node': 22.5.5
+      '@types/node': 22.10.1
 
-  '@types/qs@6.9.16': {}
+  '@types/qs@6.9.17': {}
 
   '@types/range-parser@1.2.7': {}
 
@@ -8438,7 +8781,7 @@ snapshots:
 
   '@types/svgo@2.6.4':
     dependencies:
-      '@types/node': 22.5.5
+      '@types/node': 22.10.1
 
   '@types/tern@0.23.9':
     dependencies:
@@ -8446,13 +8789,13 @@ snapshots:
 
   '@types/web-bluetooth@0.0.20': {}
 
-  '@typescript-eslint/eslint-plugin@7.7.0(@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0)(typescript@5.6.2)':
+  '@typescript-eslint/eslint-plugin@7.7.0(@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2)':
     dependencies:
       '@eslint-community/regexpp': 4.10.0
-      '@typescript-eslint/parser': 7.7.0(eslint@8.57.0)(typescript@5.6.2)
+      '@typescript-eslint/parser': 7.7.0(eslint@8.57.0)(typescript@5.7.2)
       '@typescript-eslint/scope-manager': 7.7.0
-      '@typescript-eslint/type-utils': 7.7.0(eslint@8.57.0)(typescript@5.6.2)
-      '@typescript-eslint/utils': 7.7.0(eslint@8.57.0)(typescript@5.6.2)
+      '@typescript-eslint/type-utils': 7.7.0(eslint@8.57.0)(typescript@5.7.2)
+      '@typescript-eslint/utils': 7.7.0(eslint@8.57.0)(typescript@5.7.2)
       '@typescript-eslint/visitor-keys': 7.7.0
       debug: 4.3.4
       eslint: 8.57.0
@@ -8460,22 +8803,22 @@ snapshots:
       ignore: 5.3.1
       natural-compare: 1.4.0
       semver: 7.6.0
-      ts-api-utils: 1.3.0(typescript@5.6.2)
+      ts-api-utils: 1.3.0(typescript@5.7.2)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.6.2)':
+  '@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.7.2)':
     dependencies:
       '@typescript-eslint/scope-manager': 7.7.0
       '@typescript-eslint/types': 7.7.0
-      '@typescript-eslint/typescript-estree': 7.7.0(typescript@5.6.2)
+      '@typescript-eslint/typescript-estree': 7.7.0(typescript@5.7.2)
       '@typescript-eslint/visitor-keys': 7.7.0
       debug: 4.3.4
       eslint: 8.57.0
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
 
@@ -8484,43 +8827,43 @@ snapshots:
       '@typescript-eslint/types': 7.7.0
       '@typescript-eslint/visitor-keys': 7.7.0
 
-  '@typescript-eslint/type-utils@7.7.0(eslint@8.57.0)(typescript@5.6.2)':
+  '@typescript-eslint/type-utils@7.7.0(eslint@8.57.0)(typescript@5.7.2)':
     dependencies:
-      '@typescript-eslint/typescript-estree': 7.7.0(typescript@5.6.2)
-      '@typescript-eslint/utils': 7.7.0(eslint@8.57.0)(typescript@5.6.2)
-      debug: 4.3.7
+      '@typescript-eslint/typescript-estree': 7.7.0(typescript@5.7.2)
+      '@typescript-eslint/utils': 7.7.0(eslint@8.57.0)(typescript@5.7.2)
+      debug: 4.4.0
       eslint: 8.57.0
-      ts-api-utils: 1.3.0(typescript@5.6.2)
+      ts-api-utils: 1.3.0(typescript@5.7.2)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
 
   '@typescript-eslint/types@7.7.0': {}
 
-  '@typescript-eslint/typescript-estree@7.7.0(typescript@5.6.2)':
+  '@typescript-eslint/typescript-estree@7.7.0(typescript@5.7.2)':
     dependencies:
       '@typescript-eslint/types': 7.7.0
       '@typescript-eslint/visitor-keys': 7.7.0
-      debug: 4.3.7
+      debug: 4.4.0
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.4
       semver: 7.6.3
-      ts-api-utils: 1.3.0(typescript@5.6.2)
+      ts-api-utils: 1.3.0(typescript@5.7.2)
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@7.7.0(eslint@8.57.0)(typescript@5.6.2)':
+  '@typescript-eslint/utils@7.7.0(eslint@8.57.0)(typescript@5.7.2)':
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
       '@types/json-schema': 7.0.15
       '@types/semver': 7.5.8
       '@typescript-eslint/scope-manager': 7.7.0
       '@typescript-eslint/types': 7.7.0
-      '@typescript-eslint/typescript-estree': 7.7.0(typescript@5.6.2)
+      '@typescript-eslint/typescript-estree': 7.7.0(typescript@5.7.2)
       eslint: 8.57.0
       semver: 7.6.0
     transitivePeerDependencies:
@@ -8534,30 +8877,30 @@ snapshots:
 
   '@ungap/structured-clone@1.2.0': {}
 
-  '@unocss/astro@0.59.4(rollup@3.29.5)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3))':
+  '@unocss/astro@0.59.4(rollup@3.29.5)(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3))':
     dependencies:
       '@unocss/core': 0.59.4
       '@unocss/reset': 0.59.4
-      '@unocss/vite': 0.59.4(rollup@3.29.5)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3))
+      '@unocss/vite': 0.59.4(rollup@3.29.5)(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3))
     optionalDependencies:
-      vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3)
+      vite: 5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3)
     transitivePeerDependencies:
       - rollup
 
-  '@unocss/astro@0.59.4(rollup@4.22.4)(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))':
+  '@unocss/astro@0.59.4(rollup@4.28.1)(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))':
     dependencies:
       '@unocss/core': 0.59.4
       '@unocss/reset': 0.59.4
-      '@unocss/vite': 0.59.4(rollup@4.22.4)(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
+      '@unocss/vite': 0.59.4(rollup@4.28.1)(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
     optionalDependencies:
-      vite: 5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
+      vite: 5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
     transitivePeerDependencies:
       - rollup
 
   '@unocss/cli@0.59.4(rollup@3.29.5)':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@rollup/pluginutils': 5.1.1(rollup@3.29.5)
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
       '@unocss/config': 0.59.4
       '@unocss/core': 0.59.4
       '@unocss/preset-uno': 0.59.4
@@ -8566,16 +8909,16 @@ snapshots:
       colorette: 2.0.20
       consola: 3.2.3
       fast-glob: 3.3.2
-      magic-string: 0.30.11
+      magic-string: 0.30.14
       pathe: 1.1.2
       perfect-debounce: 1.0.0
     transitivePeerDependencies:
       - rollup
 
-  '@unocss/cli@0.59.4(rollup@4.22.4)':
+  '@unocss/cli@0.59.4(rollup@4.28.1)':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@rollup/pluginutils': 5.1.1(rollup@4.22.4)
+      '@rollup/pluginutils': 5.1.3(rollup@4.28.1)
       '@unocss/config': 0.59.4
       '@unocss/core': 0.59.4
       '@unocss/preset-uno': 0.59.4
@@ -8584,7 +8927,7 @@ snapshots:
       colorette: 2.0.20
       consola: 3.2.3
       fast-glob: 3.3.2
-      magic-string: 0.30.11
+      magic-string: 0.30.14
       pathe: 1.1.2
       perfect-debounce: 1.0.0
     transitivePeerDependencies:
@@ -8615,18 +8958,18 @@ snapshots:
       '@unocss/rule-utils': 0.59.4
       css-tree: 2.3.1
       fast-glob: 3.3.2
-      magic-string: 0.30.11
+      magic-string: 0.30.14
       postcss: 5.2.18
 
-  '@unocss/postcss@0.59.4(postcss@8.4.47)':
+  '@unocss/postcss@0.59.4(postcss@8.4.49)':
     dependencies:
       '@unocss/config': 0.59.4
       '@unocss/core': 0.59.4
       '@unocss/rule-utils': 0.59.4
       css-tree: 2.3.1
       fast-glob: 3.3.2
-      magic-string: 0.30.11
-      postcss: 8.4.47
+      magic-string: 0.30.14
+      postcss: 8.4.49
 
   '@unocss/preset-attributify@0.59.4':
     dependencies:
@@ -8678,7 +9021,7 @@ snapshots:
   '@unocss/rule-utils@0.59.4':
     dependencies:
       '@unocss/core': 0.59.4
-      magic-string: 0.30.11
+      magic-string: 0.30.14
 
   '@unocss/scope@0.59.4': {}
 
@@ -8709,10 +9052,10 @@ snapshots:
     dependencies:
       '@unocss/core': 0.59.4
 
-  '@unocss/vite@0.59.4(rollup@3.29.5)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3))':
+  '@unocss/vite@0.59.4(rollup@3.29.5)(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3))':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@rollup/pluginutils': 5.1.1(rollup@3.29.5)
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
       '@unocss/config': 0.59.4
       '@unocss/core': 0.59.4
       '@unocss/inspector': 0.59.4
@@ -8720,15 +9063,15 @@ snapshots:
       '@unocss/transformer-directives': 0.59.4
       chokidar: 3.6.0
       fast-glob: 3.3.2
-      magic-string: 0.30.11
-      vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3)
+      magic-string: 0.30.14
+      vite: 5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3)
     transitivePeerDependencies:
       - rollup
 
-  '@unocss/vite@0.59.4(rollup@4.22.4)(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))':
+  '@unocss/vite@0.59.4(rollup@4.28.1)(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@rollup/pluginutils': 5.1.1(rollup@4.22.4)
+      '@rollup/pluginutils': 5.1.3(rollup@4.28.1)
       '@unocss/config': 0.59.4
       '@unocss/core': 0.59.4
       '@unocss/inspector': 0.59.4
@@ -8736,48 +9079,48 @@ snapshots:
       '@unocss/transformer-directives': 0.59.4
       chokidar: 3.6.0
       fast-glob: 3.3.2
-      magic-string: 0.30.11
-      vite: 5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
+      magic-string: 0.30.14
+      vite: 5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
     transitivePeerDependencies:
       - rollup
 
-  '@vitejs/plugin-vue-jsx@3.1.0(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))(vue@3.5.8(typescript@5.6.2))':
+  '@vitejs/plugin-vue-jsx@3.1.0(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       '@babel/core': 7.24.4
       '@babel/plugin-transform-typescript': 7.24.4(@babel/core@7.24.4)
       '@vue/babel-plugin-jsx': 1.2.2(@babel/core@7.24.4)
-      vite: 5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
-      vue: 3.5.8(typescript@5.6.2)
+      vite: 5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
+      vue: 3.5.13(typescript@5.7.2)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue@5.0.4(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))(vue@3.5.8(typescript@5.6.2))':
+  '@vitejs/plugin-vue@5.0.4(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      vite: 5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
-      vue: 3.5.8(typescript@5.6.2)
+      vite: 5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
+      vue: 3.5.13(typescript@5.7.2)
 
   '@volar/language-core@1.11.1':
     dependencies:
       '@volar/source-map': 1.11.1
 
-  '@volar/language-core@2.4.5':
+  '@volar/language-core@2.4.10':
     dependencies:
-      '@volar/source-map': 2.4.5
+      '@volar/source-map': 2.4.10
 
   '@volar/source-map@1.11.1':
     dependencies:
       muggle-string: 0.3.1
 
-  '@volar/source-map@2.4.5': {}
+  '@volar/source-map@2.4.10': {}
 
   '@volar/typescript@1.11.1':
     dependencies:
       '@volar/language-core': 1.11.1
       path-browserify: 1.0.1
 
-  '@volar/typescript@2.4.5':
+  '@volar/typescript@2.4.10':
     dependencies:
-      '@volar/language-core': 2.4.5
+      '@volar/language-core': 2.4.10
       path-browserify: 1.0.1
       vscode-uri: 3.0.8
 
@@ -8803,55 +9146,55 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@vue/babel-plugin-jsx@1.2.5(@babel/core@7.25.2)':
+  '@vue/babel-plugin-jsx@1.2.5(@babel/core@7.26.0)':
     dependencies:
-      '@babel/helper-module-imports': 7.24.7
-      '@babel/helper-plugin-utils': 7.24.8
-      '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2)
-      '@babel/template': 7.25.0
-      '@babel/traverse': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0)
+      '@babel/template': 7.25.9
+      '@babel/traverse': 7.26.4
+      '@babel/types': 7.26.3
       '@vue/babel-helper-vue-transform-on': 1.2.5
-      '@vue/babel-plugin-resolve-type': 1.2.5(@babel/core@7.25.2)
+      '@vue/babel-plugin-resolve-type': 1.2.5(@babel/core@7.26.0)
       html-tags: 3.3.1
       svg-tags: 1.0.0
     optionalDependencies:
-      '@babel/core': 7.25.2
+      '@babel/core': 7.26.0
     transitivePeerDependencies:
       - supports-color
 
   '@vue/babel-plugin-resolve-type@1.2.2(@babel/core@7.24.4)':
     dependencies:
-      '@babel/code-frame': 7.24.2
+      '@babel/code-frame': 7.26.2
       '@babel/core': 7.24.4
       '@babel/helper-module-imports': 7.22.15
       '@babel/helper-plugin-utils': 7.24.0
-      '@babel/parser': 7.25.6
-      '@vue/compiler-sfc': 3.5.8
+      '@babel/parser': 7.26.3
+      '@vue/compiler-sfc': 3.5.13
 
-  '@vue/babel-plugin-resolve-type@1.2.5(@babel/core@7.25.2)':
+  '@vue/babel-plugin-resolve-type@1.2.5(@babel/core@7.26.0)':
     dependencies:
-      '@babel/code-frame': 7.24.7
-      '@babel/core': 7.25.2
-      '@babel/helper-module-imports': 7.24.7
-      '@babel/helper-plugin-utils': 7.24.8
-      '@babel/parser': 7.25.6
-      '@vue/compiler-sfc': 3.5.8
+      '@babel/code-frame': 7.26.2
+      '@babel/core': 7.26.0
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/parser': 7.26.3
+      '@vue/compiler-sfc': 3.5.13
     transitivePeerDependencies:
       - supports-color
 
   '@vue/compiler-core@3.4.25':
     dependencies:
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.3
       '@vue/shared': 3.4.25
       entities: 4.5.0
       estree-walker: 2.0.2
       source-map-js: 1.2.1
 
-  '@vue/compiler-core@3.5.8':
+  '@vue/compiler-core@3.5.13':
     dependencies:
-      '@babel/parser': 7.25.6
-      '@vue/shared': 3.5.8
+      '@babel/parser': 7.26.3
+      '@vue/shared': 3.5.13
       entities: 4.5.0
       estree-walker: 2.0.2
       source-map-js: 1.2.1
@@ -8861,33 +9204,33 @@ snapshots:
       '@vue/compiler-core': 3.4.25
       '@vue/shared': 3.4.25
 
-  '@vue/compiler-dom@3.5.8':
+  '@vue/compiler-dom@3.5.13':
     dependencies:
-      '@vue/compiler-core': 3.5.8
-      '@vue/shared': 3.5.8
+      '@vue/compiler-core': 3.5.13
+      '@vue/shared': 3.5.13
 
   '@vue/compiler-sfc@3.4.25':
     dependencies:
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.3
       '@vue/compiler-core': 3.4.25
       '@vue/compiler-dom': 3.4.25
       '@vue/compiler-ssr': 3.4.25
       '@vue/shared': 3.4.25
       estree-walker: 2.0.2
-      magic-string: 0.30.11
-      postcss: 8.4.47
+      magic-string: 0.30.14
+      postcss: 8.4.49
       source-map-js: 1.2.1
 
-  '@vue/compiler-sfc@3.5.8':
+  '@vue/compiler-sfc@3.5.13':
     dependencies:
-      '@babel/parser': 7.25.6
-      '@vue/compiler-core': 3.5.8
-      '@vue/compiler-dom': 3.5.8
-      '@vue/compiler-ssr': 3.5.8
-      '@vue/shared': 3.5.8
+      '@babel/parser': 7.26.3
+      '@vue/compiler-core': 3.5.13
+      '@vue/compiler-dom': 3.5.13
+      '@vue/compiler-ssr': 3.5.13
+      '@vue/shared': 3.5.13
       estree-walker: 2.0.2
-      magic-string: 0.30.11
-      postcss: 8.4.47
+      magic-string: 0.30.14
+      postcss: 8.4.49
       source-map-js: 1.2.1
 
   '@vue/compiler-ssr@3.4.25':
@@ -8895,10 +9238,10 @@ snapshots:
       '@vue/compiler-dom': 3.4.25
       '@vue/shared': 3.4.25
 
-  '@vue/compiler-ssr@3.5.8':
+  '@vue/compiler-ssr@3.5.13':
     dependencies:
-      '@vue/compiler-dom': 3.5.8
-      '@vue/shared': 3.5.8
+      '@vue/compiler-dom': 3.5.13
+      '@vue/shared': 3.5.13
 
   '@vue/compiler-vue2@2.7.16':
     dependencies:
@@ -8907,76 +9250,76 @@ snapshots:
 
   '@vue/devtools-api@6.6.4': {}
 
-  '@vue/devtools-core@7.4.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3))(vue@3.5.8(typescript@5.6.2))':
+  '@vue/devtools-core@7.6.7(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue/devtools-kit': 7.4.5
-      '@vue/devtools-shared': 7.4.5
+      '@vue/devtools-kit': 7.6.7
+      '@vue/devtools-shared': 7.6.7
       mitt: 3.0.1
-      nanoid: 3.3.7
+      nanoid: 5.0.9
       pathe: 1.1.2
-      vite-hot-client: 0.2.3(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3))
-      vue: 3.5.8(typescript@5.6.2)
+      vite-hot-client: 0.2.4(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3))
+      vue: 3.5.13(typescript@5.7.2)
     transitivePeerDependencies:
       - vite
 
-  '@vue/devtools-kit@7.4.5':
+  '@vue/devtools-kit@7.6.7':
     dependencies:
-      '@vue/devtools-shared': 7.4.5
-      birpc: 0.2.17
+      '@vue/devtools-shared': 7.6.7
+      birpc: 0.2.19
       hookable: 5.5.3
       mitt: 3.0.1
       perfect-debounce: 1.0.0
       speakingurl: 14.0.1
-      superjson: 2.2.1
+      superjson: 2.2.2
 
-  '@vue/devtools-shared@7.4.5':
+  '@vue/devtools-shared@7.6.7':
     dependencies:
       rfdc: 1.4.1
 
-  '@vue/language-core@1.8.27(typescript@5.6.2)':
+  '@vue/language-core@1.8.27(typescript@5.7.2)':
     dependencies:
       '@volar/language-core': 1.11.1
       '@volar/source-map': 1.11.1
-      '@vue/compiler-dom': 3.5.8
-      '@vue/shared': 3.5.8
+      '@vue/compiler-dom': 3.5.13
+      '@vue/shared': 3.5.13
       computeds: 0.0.1
       minimatch: 9.0.4
       muggle-string: 0.3.1
       path-browserify: 1.0.1
       vue-template-compiler: 2.7.16
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
-  '@vue/language-core@2.1.6(typescript@5.6.2)':
+  '@vue/language-core@2.1.10(typescript@5.7.2)':
     dependencies:
-      '@volar/language-core': 2.4.5
-      '@vue/compiler-dom': 3.5.8
+      '@volar/language-core': 2.4.10
+      '@vue/compiler-dom': 3.5.13
       '@vue/compiler-vue2': 2.7.16
-      '@vue/shared': 3.5.8
-      computeds: 0.0.1
+      '@vue/shared': 3.5.13
+      alien-signals: 0.2.2
       minimatch: 9.0.5
       muggle-string: 0.4.1
       path-browserify: 1.0.1
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   '@vue/reactivity@3.4.25':
     dependencies:
       '@vue/shared': 3.4.25
 
-  '@vue/reactivity@3.5.8':
+  '@vue/reactivity@3.5.13':
     dependencies:
-      '@vue/shared': 3.5.8
+      '@vue/shared': 3.5.13
 
   '@vue/runtime-core@3.4.25':
     dependencies:
       '@vue/reactivity': 3.4.25
       '@vue/shared': 3.4.25
 
-  '@vue/runtime-core@3.5.8':
+  '@vue/runtime-core@3.5.13':
     dependencies:
-      '@vue/reactivity': 3.5.8
-      '@vue/shared': 3.5.8
+      '@vue/reactivity': 3.5.13
+      '@vue/shared': 3.5.13
 
   '@vue/runtime-dom@3.4.25':
     dependencies:
@@ -8984,50 +9327,50 @@ snapshots:
       '@vue/shared': 3.4.25
       csstype: 3.1.3
 
-  '@vue/runtime-dom@3.5.8':
+  '@vue/runtime-dom@3.5.13':
     dependencies:
-      '@vue/reactivity': 3.5.8
-      '@vue/runtime-core': 3.5.8
-      '@vue/shared': 3.5.8
+      '@vue/reactivity': 3.5.13
+      '@vue/runtime-core': 3.5.13
+      '@vue/shared': 3.5.13
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.4.25(vue@3.4.25(typescript@5.6.2))':
+  '@vue/server-renderer@3.4.25(vue@3.4.25(typescript@5.7.2))':
     dependencies:
       '@vue/compiler-ssr': 3.4.25
       '@vue/shared': 3.4.25
-      vue: 3.4.25(typescript@5.6.2)
+      vue: 3.4.25(typescript@5.7.2)
 
-  '@vue/server-renderer@3.5.8(vue@3.5.8(typescript@5.6.2))':
+  '@vue/server-renderer@3.5.13(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue/compiler-ssr': 3.5.8
-      '@vue/shared': 3.5.8
-      vue: 3.5.8(typescript@5.6.2)
+      '@vue/compiler-ssr': 3.5.13
+      '@vue/shared': 3.5.13
+      vue: 3.5.13(typescript@5.7.2)
 
   '@vue/shared@3.4.25': {}
 
-  '@vue/shared@3.5.8': {}
+  '@vue/shared@3.5.13': {}
 
   '@vue/test-utils@2.4.6':
     dependencies:
       js-beautify: 1.15.1
-      vue-component-type-helpers: 2.1.6
+      vue-component-type-helpers: 2.1.10
 
-  '@vueuse/core@10.11.1(vue@3.5.8(typescript@5.6.2))':
+  '@vueuse/core@10.11.1(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       '@types/web-bluetooth': 0.0.20
       '@vueuse/metadata': 10.11.1
-      '@vueuse/shared': 10.11.1(vue@3.5.8(typescript@5.6.2))
-      vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2))
+      '@vueuse/shared': 10.11.1(vue@3.5.13(typescript@5.7.2))
+      vue-demi: 0.14.10(vue@3.5.13(typescript@5.7.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/core@10.9.0(vue@3.4.25(typescript@5.6.2))':
+  '@vueuse/core@10.9.0(vue@3.4.25(typescript@5.7.2))':
     dependencies:
       '@types/web-bluetooth': 0.0.20
       '@vueuse/metadata': 10.9.0
-      '@vueuse/shared': 10.9.0(vue@3.4.25(typescript@5.6.2))
-      vue-demi: 0.14.7(vue@3.4.25(typescript@5.6.2))
+      '@vueuse/shared': 10.9.0(vue@3.4.25(typescript@5.7.2))
+      vue-demi: 0.14.7(vue@3.4.25(typescript@5.7.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -9036,24 +9379,25 @@ snapshots:
 
   '@vueuse/metadata@10.9.0': {}
 
-  '@vueuse/shared@10.11.1(vue@3.5.8(typescript@5.6.2))':
+  '@vueuse/shared@10.11.1(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2))
+      vue-demi: 0.14.10(vue@3.5.13(typescript@5.7.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/shared@10.9.0(vue@3.4.25(typescript@5.6.2))':
+  '@vueuse/shared@10.9.0(vue@3.4.25(typescript@5.7.2))':
     dependencies:
-      vue-demi: 0.14.10(vue@3.4.25(typescript@5.6.2))
+      vue-demi: 0.14.10(vue@3.4.25(typescript@5.7.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vxe-ui/core@4.0.12':
+  '@vxe-ui/core@4.0.20(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       dom-zindex: 1.0.6
-      xe-utils: 3.5.30
+      vue: 3.5.13(typescript@5.7.2)
+      xe-utils: 3.5.32
 
   '@zxcvbn-ts/core@3.0.4':
     dependencies:
@@ -9081,13 +9425,13 @@ snapshots:
 
   acorn@8.11.3: {}
 
-  acorn@8.12.1: {}
+  acorn@8.14.0: {}
 
   add-stream@1.0.0: {}
 
   agent-base@7.1.1:
     dependencies:
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
 
@@ -9108,10 +9452,12 @@ snapshots:
   ajv@8.17.1:
     dependencies:
       fast-deep-equal: 3.1.3
-      fast-uri: 3.0.1
+      fast-uri: 3.0.3
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
+  alien-signals@0.2.2: {}
+
   amp-message@0.1.2:
     dependencies:
       amp: 0.3.1
@@ -9142,10 +9488,10 @@ snapshots:
 
   ansi-styles@6.2.1: {}
 
-  ant-design-vue@4.2.1(vue@3.5.8(typescript@5.6.2)):
+  ant-design-vue@4.2.1(vue@3.5.13(typescript@5.7.2)):
     dependencies:
       '@ant-design/colors': 6.0.0
-      '@ant-design/icons-vue': 7.0.1(vue@3.5.8(typescript@5.6.2))
+      '@ant-design/icons-vue': 7.0.1(vue@3.5.13(typescript@5.7.2))
       '@babel/runtime': 7.24.4
       '@ctrl/tinycolor': 3.6.1
       '@emotion/hash': 0.9.1
@@ -9164,15 +9510,15 @@ snapshots:
       shallow-equal: 1.2.1
       stylis: 4.3.1
       throttle-debounce: 5.0.0
-      vue: 3.5.8(typescript@5.6.2)
-      vue-types: 3.0.2(vue@3.5.8(typescript@5.6.2))
+      vue: 3.5.13(typescript@5.7.2)
+      vue-types: 3.0.2(vue@3.5.13(typescript@5.7.2))
       warning: 4.0.3
 
-  ant-design-vue@4.2.5(vue@3.5.8(typescript@5.6.2)):
+  ant-design-vue@4.2.6(vue@3.5.13(typescript@5.7.2)):
     dependencies:
       '@ant-design/colors': 6.0.0
-      '@ant-design/icons-vue': 7.0.1(vue@3.5.8(typescript@5.6.2))
-      '@babel/runtime': 7.25.6
+      '@ant-design/icons-vue': 7.0.1(vue@3.5.13(typescript@5.7.2))
+      '@babel/runtime': 7.26.0
       '@ctrl/tinycolor': 3.6.1
       '@emotion/hash': 0.9.2
       '@emotion/unitless': 0.8.1
@@ -9190,8 +9536,8 @@ snapshots:
       shallow-equal: 1.2.1
       stylis: 4.3.4
       throttle-debounce: 5.0.2
-      vue: 3.5.8(typescript@5.6.2)
-      vue-types: 3.0.2(vue@3.5.8(typescript@5.6.2))
+      vue: 3.5.13(typescript@5.7.2)
+      vue-types: 3.0.2(vue@3.5.13(typescript@5.7.2))
       warning: 4.0.3
 
   any-promise@1.3.0: {}
@@ -9277,7 +9623,7 @@ snapshots:
 
   ast-types@0.13.4:
     dependencies:
-      tslib: 2.7.0
+      tslib: 2.8.1
 
   astral-regex@2.0.0: {}
 
@@ -9298,30 +9644,30 @@ snapshots:
 
   atob@2.1.2: {}
 
-  autoprefixer@10.4.20(postcss@8.4.47):
+  autoprefixer@10.4.20(postcss@8.4.49):
     dependencies:
-      browserslist: 4.23.3
-      caniuse-lite: 1.0.30001663
+      browserslist: 4.24.2
+      caniuse-lite: 1.0.30001687
       fraction.js: 4.3.7
       normalize-range: 0.1.2
-      picocolors: 1.1.0
-      postcss: 8.4.47
+      picocolors: 1.1.1
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
   available-typed-arrays@1.0.7:
     dependencies:
       possible-typed-array-names: 1.0.0
 
-  axios@0.26.1(debug@4.3.7):
+  axios@0.26.1(debug@4.4.0):
     dependencies:
-      follow-redirects: 1.15.9(debug@4.3.7)
+      follow-redirects: 1.15.9(debug@4.4.0)
     transitivePeerDependencies:
       - debug
 
-  axios@1.7.7:
+  axios@1.7.9:
     dependencies:
-      follow-redirects: 1.15.9(debug@4.3.7)
-      form-data: 4.0.0
+      follow-redirects: 1.15.9(debug@4.4.0)
+      form-data: 4.0.1
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
@@ -9346,7 +9692,7 @@ snapshots:
 
   binary-extensions@2.3.0: {}
 
-  birpc@0.2.17: {}
+  birpc@0.2.19: {}
 
   blessed@0.1.81: {}
 
@@ -9397,11 +9743,18 @@ snapshots:
 
   browserslist@4.23.3:
     dependencies:
-      caniuse-lite: 1.0.30001663
+      caniuse-lite: 1.0.30001687
       electron-to-chromium: 1.5.27
       node-releases: 2.0.18
       update-browserslist-db: 1.1.0(browserslist@4.23.3)
 
+  browserslist@4.24.2:
+    dependencies:
+      caniuse-lite: 1.0.30001687
+      electron-to-chromium: 1.5.71
+      node-releases: 2.0.18
+      update-browserslist-db: 1.1.1(browserslist@4.24.2)
+
   buffer-from@1.1.2: {}
 
   bundle-name@4.1.0:
@@ -9434,6 +9787,11 @@ snapshots:
       mime-types: 2.1.35
       ylru: 1.4.0
 
+  call-bind-apply-helpers@1.0.1:
+    dependencies:
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+
   call-bind@1.0.7:
     dependencies:
       es-define-property: 1.0.0
@@ -9442,12 +9800,19 @@ snapshots:
       get-intrinsic: 1.2.4
       set-function-length: 1.2.2
 
+  call-bind@1.0.8:
+    dependencies:
+      call-bind-apply-helpers: 1.0.1
+      es-define-property: 1.0.1
+      get-intrinsic: 1.2.5
+      set-function-length: 1.2.2
+
   callsites@3.1.0: {}
 
   camel-case@4.1.2:
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.7.0
+      tslib: 2.8.1
 
   camelcase@5.3.1: {}
 
@@ -9455,13 +9820,15 @@ snapshots:
 
   caniuse-api@3.0.0:
     dependencies:
-      browserslist: 4.23.3
-      caniuse-lite: 1.0.30001663
+      browserslist: 4.24.2
+      caniuse-lite: 1.0.30001687
       lodash.memoize: 4.1.2
       lodash.uniq: 4.5.0
 
   caniuse-lite@1.0.30001663: {}
 
+  caniuse-lite@1.0.30001687: {}
+
   chalk@1.1.3:
     dependencies:
       ansi-styles: 2.2.1
@@ -9547,7 +9914,7 @@ snapshots:
   co-body@6.1.0:
     dependencies:
       inflation: 2.1.0
-      qs: 6.13.0
+      qs: 6.13.1
       raw-body: 2.5.2
       type-is: 1.6.18
 
@@ -9613,6 +9980,8 @@ snapshots:
 
   confbox@0.1.7: {}
 
+  confbox@0.1.8: {}
+
   config-chain@1.1.13:
     dependencies:
       ini: 1.3.8
@@ -9732,28 +10101,28 @@ snapshots:
 
   copy-to@2.0.1: {}
 
-  core-js@3.38.1: {}
+  core-js@3.39.0: {}
 
   cors@2.8.5:
     dependencies:
       object-assign: 4.1.1
       vary: 1.1.2
 
-  cosmiconfig-typescript-loader@5.0.0(@types/node@22.5.5)(cosmiconfig@9.0.0(typescript@5.6.2))(typescript@5.6.2):
+  cosmiconfig-typescript-loader@5.1.0(@types/node@22.10.1)(cosmiconfig@9.0.0(typescript@5.7.2))(typescript@5.7.2):
     dependencies:
-      '@types/node': 22.5.5
-      cosmiconfig: 9.0.0(typescript@5.6.2)
+      '@types/node': 22.10.1
+      cosmiconfig: 9.0.0(typescript@5.7.2)
       jiti: 1.21.6
-      typescript: 5.6.2
+      typescript: 5.7.2
 
-  cosmiconfig@9.0.0(typescript@5.6.2):
+  cosmiconfig@9.0.0(typescript@5.7.2):
     dependencies:
       env-paths: 2.2.1
       import-fresh: 3.3.0
       js-yaml: 4.1.0
       parse-json: 5.2.0
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   create-require@1.1.1: {}
 
@@ -9763,7 +10132,7 @@ snapshots:
 
   cross-env@7.0.3:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
 
   cross-fetch@3.1.8:
     dependencies:
@@ -9777,11 +10146,17 @@ snapshots:
       shebang-command: 2.0.0
       which: 2.0.2
 
+  cross-spawn@7.0.6:
+    dependencies:
+      path-key: 3.1.1
+      shebang-command: 2.0.0
+      which: 2.0.2
+
   crypto-js@4.2.0: {}
 
-  css-declaration-sorter@7.2.0(postcss@8.4.47):
+  css-declaration-sorter@7.2.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
 
   css-functions-list@3.2.2: {}
 
@@ -9822,49 +10197,49 @@ snapshots:
 
   cssesc@3.0.0: {}
 
-  cssnano-preset-default@7.0.6(postcss@8.4.47):
-    dependencies:
-      browserslist: 4.23.3
-      css-declaration-sorter: 7.2.0(postcss@8.4.47)
-      cssnano-utils: 5.0.0(postcss@8.4.47)
-      postcss: 8.4.47
-      postcss-calc: 10.0.2(postcss@8.4.47)
-      postcss-colormin: 7.0.2(postcss@8.4.47)
-      postcss-convert-values: 7.0.4(postcss@8.4.47)
-      postcss-discard-comments: 7.0.3(postcss@8.4.47)
-      postcss-discard-duplicates: 7.0.1(postcss@8.4.47)
-      postcss-discard-empty: 7.0.0(postcss@8.4.47)
-      postcss-discard-overridden: 7.0.0(postcss@8.4.47)
-      postcss-merge-longhand: 7.0.4(postcss@8.4.47)
-      postcss-merge-rules: 7.0.4(postcss@8.4.47)
-      postcss-minify-font-values: 7.0.0(postcss@8.4.47)
-      postcss-minify-gradients: 7.0.0(postcss@8.4.47)
-      postcss-minify-params: 7.0.2(postcss@8.4.47)
-      postcss-minify-selectors: 7.0.4(postcss@8.4.47)
-      postcss-normalize-charset: 7.0.0(postcss@8.4.47)
-      postcss-normalize-display-values: 7.0.0(postcss@8.4.47)
-      postcss-normalize-positions: 7.0.0(postcss@8.4.47)
-      postcss-normalize-repeat-style: 7.0.0(postcss@8.4.47)
-      postcss-normalize-string: 7.0.0(postcss@8.4.47)
-      postcss-normalize-timing-functions: 7.0.0(postcss@8.4.47)
-      postcss-normalize-unicode: 7.0.2(postcss@8.4.47)
-      postcss-normalize-url: 7.0.0(postcss@8.4.47)
-      postcss-normalize-whitespace: 7.0.0(postcss@8.4.47)
-      postcss-ordered-values: 7.0.1(postcss@8.4.47)
-      postcss-reduce-initial: 7.0.2(postcss@8.4.47)
-      postcss-reduce-transforms: 7.0.0(postcss@8.4.47)
-      postcss-svgo: 7.0.1(postcss@8.4.47)
-      postcss-unique-selectors: 7.0.3(postcss@8.4.47)
-
-  cssnano-utils@5.0.0(postcss@8.4.47):
-    dependencies:
-      postcss: 8.4.47
-
-  cssnano@7.0.6(postcss@8.4.47):
-    dependencies:
-      cssnano-preset-default: 7.0.6(postcss@8.4.47)
-      lilconfig: 3.1.2
-      postcss: 8.4.47
+  cssnano-preset-default@7.0.6(postcss@8.4.49):
+    dependencies:
+      browserslist: 4.24.2
+      css-declaration-sorter: 7.2.0(postcss@8.4.49)
+      cssnano-utils: 5.0.0(postcss@8.4.49)
+      postcss: 8.4.49
+      postcss-calc: 10.0.2(postcss@8.4.49)
+      postcss-colormin: 7.0.2(postcss@8.4.49)
+      postcss-convert-values: 7.0.4(postcss@8.4.49)
+      postcss-discard-comments: 7.0.3(postcss@8.4.49)
+      postcss-discard-duplicates: 7.0.1(postcss@8.4.49)
+      postcss-discard-empty: 7.0.0(postcss@8.4.49)
+      postcss-discard-overridden: 7.0.0(postcss@8.4.49)
+      postcss-merge-longhand: 7.0.4(postcss@8.4.49)
+      postcss-merge-rules: 7.0.4(postcss@8.4.49)
+      postcss-minify-font-values: 7.0.0(postcss@8.4.49)
+      postcss-minify-gradients: 7.0.0(postcss@8.4.49)
+      postcss-minify-params: 7.0.2(postcss@8.4.49)
+      postcss-minify-selectors: 7.0.4(postcss@8.4.49)
+      postcss-normalize-charset: 7.0.0(postcss@8.4.49)
+      postcss-normalize-display-values: 7.0.0(postcss@8.4.49)
+      postcss-normalize-positions: 7.0.0(postcss@8.4.49)
+      postcss-normalize-repeat-style: 7.0.0(postcss@8.4.49)
+      postcss-normalize-string: 7.0.0(postcss@8.4.49)
+      postcss-normalize-timing-functions: 7.0.0(postcss@8.4.49)
+      postcss-normalize-unicode: 7.0.2(postcss@8.4.49)
+      postcss-normalize-url: 7.0.0(postcss@8.4.49)
+      postcss-normalize-whitespace: 7.0.0(postcss@8.4.49)
+      postcss-ordered-values: 7.0.1(postcss@8.4.49)
+      postcss-reduce-initial: 7.0.2(postcss@8.4.49)
+      postcss-reduce-transforms: 7.0.0(postcss@8.4.49)
+      postcss-svgo: 7.0.1(postcss@8.4.49)
+      postcss-unique-selectors: 7.0.3(postcss@8.4.49)
+
+  cssnano-utils@5.0.0(postcss@8.4.49):
+    dependencies:
+      postcss: 8.4.49
+
+  cssnano@7.0.6(postcss@8.4.49):
+    dependencies:
+      cssnano-preset-default: 7.0.6(postcss@8.4.49)
+      lilconfig: 3.1.3
+      postcss: 8.4.49
 
   csso@4.2.0:
     dependencies:
@@ -9878,9 +10253,9 @@ snapshots:
 
   culvert@0.1.2: {}
 
-  cz-git@1.9.4: {}
+  cz-git@1.11.0: {}
 
-  czg@1.9.4: {}
+  czg@1.11.0: {}
 
   dargs@8.1.0: {}
 
@@ -9926,7 +10301,7 @@ snapshots:
     dependencies:
       ms: 2.1.2
 
-  debug@4.3.7:
+  debug@4.4.0:
     dependencies:
       ms: 2.1.3
 
@@ -9949,9 +10324,9 @@ snapshots:
 
   define-data-property@1.1.4:
     dependencies:
-      es-define-property: 1.0.0
+      es-define-property: 1.0.1
       es-errors: 1.3.0
-      gopd: 1.0.1
+      gopd: 1.2.0
 
   define-lazy-prop@2.0.0: {}
 
@@ -10080,7 +10455,7 @@ snapshots:
   dot-case@3.0.4:
     dependencies:
       no-case: 3.0.4
-      tslib: 2.7.0
+      tslib: 2.8.1
 
   dot-prop@5.3.0:
     dependencies:
@@ -10090,6 +10465,12 @@ snapshots:
 
   dotenv@16.4.5: {}
 
+  dunder-proto@1.0.0:
+    dependencies:
+      call-bind-apply-helpers: 1.0.1
+      es-errors: 1.3.0
+      gopd: 1.2.0
+
   duplexer@0.1.2: {}
 
   eastasianwidth@0.2.0: {}
@@ -10116,6 +10497,8 @@ snapshots:
 
   electron-to-chromium@1.5.27: {}
 
+  electron-to-chromium@1.5.71: {}
+
   emitter-listener@1.1.2:
     dependencies:
       shimmer: 1.2.1
@@ -10188,7 +10571,7 @@ snapshots:
       is-string: 1.0.7
       is-typed-array: 1.1.13
       is-weakref: 1.0.2
-      object-inspect: 1.13.2
+      object-inspect: 1.13.3
       object-keys: 1.1.1
       object.assign: 4.1.5
       regexp.prototype.flags: 1.5.2
@@ -10208,6 +10591,8 @@ snapshots:
     dependencies:
       get-intrinsic: 1.2.4
 
+  es-define-property@1.0.1: {}
+
   es-errors@1.3.0: {}
 
   es-object-atoms@1.0.0:
@@ -10308,32 +10693,32 @@ snapshots:
       '@esbuild/win32-ia32': 0.21.5
       '@esbuild/win32-x64': 0.21.5
 
-  esbuild@0.23.1:
+  esbuild@0.24.0:
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.23.1
-      '@esbuild/android-arm': 0.23.1
-      '@esbuild/android-arm64': 0.23.1
-      '@esbuild/android-x64': 0.23.1
-      '@esbuild/darwin-arm64': 0.23.1
-      '@esbuild/darwin-x64': 0.23.1
-      '@esbuild/freebsd-arm64': 0.23.1
-      '@esbuild/freebsd-x64': 0.23.1
-      '@esbuild/linux-arm': 0.23.1
-      '@esbuild/linux-arm64': 0.23.1
-      '@esbuild/linux-ia32': 0.23.1
-      '@esbuild/linux-loong64': 0.23.1
-      '@esbuild/linux-mips64el': 0.23.1
-      '@esbuild/linux-ppc64': 0.23.1
-      '@esbuild/linux-riscv64': 0.23.1
-      '@esbuild/linux-s390x': 0.23.1
-      '@esbuild/linux-x64': 0.23.1
-      '@esbuild/netbsd-x64': 0.23.1
-      '@esbuild/openbsd-arm64': 0.23.1
-      '@esbuild/openbsd-x64': 0.23.1
-      '@esbuild/sunos-x64': 0.23.1
-      '@esbuild/win32-arm64': 0.23.1
-      '@esbuild/win32-ia32': 0.23.1
-      '@esbuild/win32-x64': 0.23.1
+      '@esbuild/aix-ppc64': 0.24.0
+      '@esbuild/android-arm': 0.24.0
+      '@esbuild/android-arm64': 0.24.0
+      '@esbuild/android-x64': 0.24.0
+      '@esbuild/darwin-arm64': 0.24.0
+      '@esbuild/darwin-x64': 0.24.0
+      '@esbuild/freebsd-arm64': 0.24.0
+      '@esbuild/freebsd-x64': 0.24.0
+      '@esbuild/linux-arm': 0.24.0
+      '@esbuild/linux-arm64': 0.24.0
+      '@esbuild/linux-ia32': 0.24.0
+      '@esbuild/linux-loong64': 0.24.0
+      '@esbuild/linux-mips64el': 0.24.0
+      '@esbuild/linux-ppc64': 0.24.0
+      '@esbuild/linux-riscv64': 0.24.0
+      '@esbuild/linux-s390x': 0.24.0
+      '@esbuild/linux-x64': 0.24.0
+      '@esbuild/netbsd-x64': 0.24.0
+      '@esbuild/openbsd-arm64': 0.24.0
+      '@esbuild/openbsd-x64': 0.24.0
+      '@esbuild/sunos-x64': 0.24.0
+      '@esbuild/win32-arm64': 0.24.0
+      '@esbuild/win32-ia32': 0.24.0
+      '@esbuild/win32-x64': 0.24.0
 
   escalade@3.2.0: {}
 
@@ -10363,17 +10748,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0):
+  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0):
     dependencies:
       debug: 3.2.7(supports-color@5.5.0)
     optionalDependencies:
-      '@typescript-eslint/parser': 7.7.0(eslint@8.57.0)(typescript@5.6.2)
+      '@typescript-eslint/parser': 7.7.0(eslint@8.57.0)(typescript@5.7.2)
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.6.2))(eslint@8.57.0):
+  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0):
     dependencies:
       array-includes: 3.1.8
       array.prototype.findlastindex: 1.2.5
@@ -10383,7 +10768,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0)
       hasown: 2.0.2
       is-core-module: 2.13.1
       is-glob: 4.0.3
@@ -10394,16 +10779,16 @@ snapshots:
       semver: 6.3.1
       tsconfig-paths: 3.15.0
     optionalDependencies:
-      '@typescript-eslint/parser': 7.7.0(eslint@8.57.0)(typescript@5.6.2)
+      '@typescript-eslint/parser': 7.7.0(eslint@8.57.0)(typescript@5.7.2)
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.3):
+  eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.4.2):
     dependencies:
       eslint: 8.57.0
-      prettier: 3.3.3
+      prettier: 3.4.2
       prettier-linter-helpers: 1.0.0
       synckit: 0.8.8
     optionalDependencies:
@@ -10511,7 +10896,7 @@ snapshots:
 
   execa@5.1.1:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       get-stream: 6.0.1
       human-signals: 2.1.0
       is-stream: 2.0.1
@@ -10523,7 +10908,7 @@ snapshots:
 
   execa@8.0.1:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       get-stream: 8.0.1
       human-signals: 5.0.0
       is-stream: 3.0.0
@@ -10533,6 +10918,21 @@ snapshots:
       signal-exit: 4.1.0
       strip-final-newline: 3.0.0
 
+  execa@9.5.2:
+    dependencies:
+      '@sindresorhus/merge-streams': 4.0.0
+      cross-spawn: 7.0.6
+      figures: 6.1.0
+      get-stream: 9.0.1
+      human-signals: 8.0.0
+      is-plain-obj: 4.1.0
+      is-stream: 4.0.1
+      npm-run-path: 6.0.0
+      pretty-ms: 9.2.0
+      signal-exit: 4.1.0
+      strip-final-newline: 4.0.0
+      yoctocolors: 2.1.1
+
   expand-brackets@2.1.4:
     dependencies:
       debug: 2.6.9
@@ -10591,7 +10991,7 @@ snapshots:
 
   fast-levenshtein@2.0.6: {}
 
-  fast-uri@3.0.1: {}
+  fast-uri@3.0.3: {}
 
   fastest-levenshtein@1.0.16: {}
 
@@ -10601,6 +11001,14 @@ snapshots:
 
   fclone@1.0.11: {}
 
+  fdir@6.4.2(picomatch@4.0.2):
+    optionalDependencies:
+      picomatch: 4.0.2
+
+  figures@6.1.0:
+    dependencies:
+      is-unicode-supported: 2.1.0
+
   file-entry-cache@6.0.1:
     dependencies:
       flat-cache: 3.2.0
@@ -10666,9 +11074,9 @@ snapshots:
     optionalDependencies:
       debug: 4.3.4
 
-  follow-redirects@1.15.9(debug@4.3.7):
+  follow-redirects@1.15.9(debug@4.4.0):
     optionalDependencies:
-      debug: 4.3.7
+      debug: 4.4.0
 
   for-each@0.3.3:
     dependencies:
@@ -10678,15 +11086,15 @@ snapshots:
 
   foreground-child@3.1.1:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       signal-exit: 4.1.0
 
   foreground-child@3.3.0:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       signal-exit: 4.1.0
 
-  form-data@4.0.0:
+  form-data@4.0.1:
     dependencies:
       asynckit: 0.4.0
       combined-stream: 1.0.8
@@ -10697,7 +11105,7 @@ snapshots:
       dezalgo: 1.0.4
       hexoid: 1.0.0
       once: 1.4.0
-      qs: 6.13.0
+      qs: 6.13.1
 
   fraction.js@4.3.7: {}
 
@@ -10745,7 +11153,7 @@ snapshots:
 
   get-caller-file@2.0.5: {}
 
-  get-east-asian-width@1.2.0: {}
+  get-east-asian-width@1.3.0: {}
 
   get-intrinsic@1.2.4:
     dependencies:
@@ -10755,12 +11163,28 @@ snapshots:
       has-symbols: 1.0.3
       hasown: 2.0.2
 
+  get-intrinsic@1.2.5:
+    dependencies:
+      call-bind-apply-helpers: 1.0.1
+      dunder-proto: 1.0.0
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      gopd: 1.2.0
+      has-symbols: 1.1.0
+      hasown: 2.0.2
+
   get-stdin@9.0.0: {}
 
   get-stream@6.0.1: {}
 
   get-stream@8.0.1: {}
 
+  get-stream@9.0.1:
+    dependencies:
+      '@sec-ant/readable-stream': 0.4.1
+      is-stream: 4.0.1
+
   get-symbol-description@1.0.2:
     dependencies:
       call-bind: 1.0.7
@@ -10771,7 +11195,7 @@ snapshots:
     dependencies:
       basic-ftp: 5.0.5
       data-uri-to-buffer: 6.0.2
-      debug: 4.3.7
+      debug: 4.4.0
       fs-extra: 11.2.0
     transitivePeerDependencies:
       - supports-color
@@ -10819,7 +11243,7 @@ snapshots:
       jackspeak: 3.4.3
       minimatch: 9.0.5
       minipass: 7.1.2
-      package-json-from-dist: 1.0.0
+      package-json-from-dist: 1.0.1
       path-scurry: 1.11.1
 
   glob@7.2.3:
@@ -10886,6 +11310,8 @@ snapshots:
     dependencies:
       get-intrinsic: 1.2.4
 
+  gopd@1.2.0: {}
+
   graceful-fs@4.2.11: {}
 
   graphemer@1.4.0: {}
@@ -10917,12 +11343,14 @@ snapshots:
 
   has-property-descriptors@1.0.2:
     dependencies:
-      es-define-property: 1.0.0
+      es-define-property: 1.0.1
 
   has-proto@1.0.3: {}
 
   has-symbols@1.0.3: {}
 
+  has-symbols@1.1.0: {}
+
   has-tostringtag@1.0.2:
     dependencies:
       has-symbols: 1.0.3
@@ -11019,14 +11447,14 @@ snapshots:
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.4:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
 
@@ -11034,6 +11462,8 @@ snapshots:
 
   human-signals@5.0.0: {}
 
+  human-signals@8.0.0: {}
+
   iconv-lite@0.4.24:
     dependencies:
       safer-buffer: 2.1.2
@@ -11166,7 +11596,7 @@ snapshots:
 
   is-fullwidth-code-point@5.0.0:
     dependencies:
-      get-east-asian-width: 1.2.0
+      get-east-asian-width: 1.3.0
 
   is-generator-function@1.0.10:
     dependencies:
@@ -11227,6 +11657,8 @@ snapshots:
 
   is-stream@3.0.0: {}
 
+  is-stream@4.0.1: {}
+
   is-string@1.0.7:
     dependencies:
       has-tostringtag: 1.0.2
@@ -11243,6 +11675,8 @@ snapshots:
     dependencies:
       which-typed-array: 1.1.15
 
+  is-unicode-supported@2.1.0: {}
+
   is-weakref@1.0.2:
     dependencies:
       call-bind: 1.0.7
@@ -11296,6 +11730,8 @@ snapshots:
 
   jiti@1.21.6: {}
 
+  jiti@2.4.1: {}
+
   jju@1.4.0: {}
 
   joycon@3.1.1: {}
@@ -11331,6 +11767,8 @@ snapshots:
 
   jsesc@2.5.2: {}
 
+  jsesc@3.0.2: {}
+
   json-buffer@3.0.1: {}
 
   json-parse-even-better-errors@2.3.1: {}
@@ -11510,7 +11948,7 @@ snapshots:
 
   lilconfig@3.1.1: {}
 
-  lilconfig@3.1.2: {}
+  lilconfig@3.1.3: {}
 
   lines-and-columns@1.2.4: {}
 
@@ -11550,8 +11988,8 @@ snapshots:
 
   local-pkg@0.5.0:
     dependencies:
-      mlly: 1.7.1
-      pkg-types: 1.2.0
+      mlly: 1.7.3
+      pkg-types: 1.1.0
 
   locate-path@5.0.0:
     dependencies:
@@ -11613,7 +12051,7 @@ snapshots:
 
   lower-case@2.0.2:
     dependencies:
-      tslib: 2.7.0
+      tslib: 2.8.1
 
   lru-cache@10.2.0: {}
 
@@ -11633,7 +12071,7 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
 
-  magic-string@0.30.11:
+  magic-string@0.30.14:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 
@@ -11752,24 +12190,24 @@ snapshots:
 
   mkdirp@1.0.4: {}
 
-  mkdist@1.5.9(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)):
+  mkdist@1.6.0(typescript@5.7.2)(vue-tsc@2.1.10(typescript@5.7.2)):
     dependencies:
-      autoprefixer: 10.4.20(postcss@8.4.47)
+      autoprefixer: 10.4.20(postcss@8.4.49)
       citty: 0.1.6
-      cssnano: 7.0.6(postcss@8.4.47)
+      cssnano: 7.0.6(postcss@8.4.49)
       defu: 6.1.4
-      esbuild: 0.23.1
-      fast-glob: 3.3.2
+      esbuild: 0.24.0
       jiti: 1.21.6
-      mlly: 1.7.1
+      mlly: 1.7.3
       pathe: 1.1.2
-      pkg-types: 1.2.0
-      postcss: 8.4.47
-      postcss-nested: 6.2.0(postcss@8.4.47)
+      pkg-types: 1.2.1
+      postcss: 8.4.49
+      postcss-nested: 6.2.0(postcss@8.4.49)
       semver: 7.6.3
+      tinyglobby: 0.2.10
     optionalDependencies:
-      typescript: 5.6.2
-      vue-tsc: 2.1.6(typescript@5.6.2)
+      typescript: 5.7.2
+      vue-tsc: 2.1.10(typescript@5.7.2)
 
   mlly@1.6.1:
     dependencies:
@@ -11778,11 +12216,11 @@ snapshots:
       pkg-types: 1.1.0
       ufo: 1.5.3
 
-  mlly@1.7.1:
+  mlly@1.7.3:
     dependencies:
-      acorn: 8.12.1
+      acorn: 8.14.0
       pathe: 1.1.2
-      pkg-types: 1.2.0
+      pkg-types: 1.2.1
       ufo: 1.5.4
 
   module-details-from-path@1.0.3: {}
@@ -11811,6 +12249,10 @@ snapshots:
 
   nanoid@3.3.7: {}
 
+  nanoid@3.3.8: {}
+
+  nanoid@5.0.9: {}
+
   nanomatch@1.2.13:
     dependencies:
       arr-diff: 4.0.0
@@ -11854,7 +12296,7 @@ snapshots:
   no-case@3.0.4:
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.7.0
+      tslib: 2.8.1
 
   node-fetch-native@1.6.4: {}
 
@@ -11910,6 +12352,11 @@ snapshots:
     dependencies:
       path-key: 4.0.0
 
+  npm-run-path@6.0.0:
+    dependencies:
+      path-key: 4.0.0
+      unicorn-magic: 0.3.0
+
   nprogress@0.2.0: {}
 
   nssocket@0.6.0:
@@ -11929,7 +12376,7 @@ snapshots:
       define-property: 0.2.5
       kind-of: 3.2.2
 
-  object-inspect@1.13.2: {}
+  object-inspect@1.13.3: {}
 
   object-keys@1.1.1: {}
 
@@ -12047,7 +12494,7 @@ snapshots:
     dependencies:
       '@tootallnate/quickjs-emscripten': 0.23.0
       agent-base: 7.1.1
-      debug: 4.3.7
+      debug: 4.4.0
       get-uri: 6.0.3
       http-proxy-agent: 7.0.2
       https-proxy-agent: 7.0.4
@@ -12061,7 +12508,7 @@ snapshots:
       degenerator: 5.0.1
       netmask: 2.0.2
 
-  package-json-from-dist@1.0.0: {}
+  package-json-from-dist@1.0.1: {}
 
   package-manager-detector@0.2.0: {}
 
@@ -12070,7 +12517,7 @@ snapshots:
   param-case@3.0.4:
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.7.0
+      tslib: 2.8.1
 
   parent-module@1.0.1:
     dependencies:
@@ -12078,19 +12525,21 @@ snapshots:
 
   parse-json@5.2.0:
     dependencies:
-      '@babel/code-frame': 7.24.2
+      '@babel/code-frame': 7.26.2
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
 
   parse-json@7.1.1:
     dependencies:
-      '@babel/code-frame': 7.24.7
+      '@babel/code-frame': 7.26.2
       error-ex: 1.3.2
       json-parse-even-better-errors: 3.0.2
       lines-and-columns: 2.0.4
       type-fest: 3.13.1
 
+  parse-ms@4.0.0: {}
+
   parse-node-version@1.0.1: {}
 
   parseurl@1.3.3: {}
@@ -12098,7 +12547,7 @@ snapshots:
   pascal-case@3.1.2:
     dependencies:
       no-case: 3.0.4
-      tslib: 2.7.0
+      tslib: 2.8.1
 
   pascalcase@0.1.1: {}
 
@@ -12142,10 +12591,12 @@ snapshots:
 
   picocolors@1.0.0: {}
 
-  picocolors@1.1.0: {}
+  picocolors@1.1.1: {}
 
   picomatch@2.3.1: {}
 
+  picomatch@4.0.2: {}
+
   pidtree@0.6.0: {}
 
   pidusage@2.0.21:
@@ -12160,17 +12611,17 @@ snapshots:
   pify@4.0.1:
     optional: true
 
-  pinia-plugin-persistedstate@3.2.3(pinia@2.1.7(typescript@5.6.2)(vue@3.5.8(typescript@5.6.2))):
+  pinia-plugin-persistedstate@3.2.3(pinia@2.1.7(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2))):
     dependencies:
-      pinia: 2.1.7(typescript@5.6.2)(vue@3.5.8(typescript@5.6.2))
+      pinia: 2.1.7(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2))
 
-  pinia@2.1.7(typescript@5.6.2)(vue@3.5.8(typescript@5.6.2)):
+  pinia@2.1.7(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.8(typescript@5.6.2)
-      vue-demi: 0.14.10(vue@3.5.8(typescript@5.6.2))
+      vue: 3.5.13(typescript@5.7.2)
+      vue-demi: 0.14.10(vue@3.5.13(typescript@5.7.2))
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   pirates@4.0.6: {}
 
@@ -12180,10 +12631,10 @@ snapshots:
       mlly: 1.6.1
       pathe: 1.1.2
 
-  pkg-types@1.2.0:
+  pkg-types@1.2.1:
     dependencies:
-      confbox: 0.1.7
-      mlly: 1.7.1
+      confbox: 0.1.8
+      mlly: 1.7.3
       pathe: 1.1.2
 
   pm2-axon-rpc@0.7.1:
@@ -12265,42 +12716,42 @@ snapshots:
 
   possible-typed-array-names@1.0.0: {}
 
-  postcss-calc@10.0.2(postcss@8.4.47):
+  postcss-calc@10.0.2(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-selector-parser: 6.1.2
       postcss-value-parser: 4.2.0
 
-  postcss-colormin@7.0.2(postcss@8.4.47):
+  postcss-colormin@7.0.2(postcss@8.4.49):
     dependencies:
-      browserslist: 4.23.3
+      browserslist: 4.24.2
       caniuse-api: 3.0.0
       colord: 2.9.3
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
-  postcss-convert-values@7.0.4(postcss@8.4.47):
+  postcss-convert-values@7.0.4(postcss@8.4.49):
     dependencies:
-      browserslist: 4.23.3
-      postcss: 8.4.47
+      browserslist: 4.24.2
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
-  postcss-discard-comments@7.0.3(postcss@8.4.47):
+  postcss-discard-comments@7.0.3(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-selector-parser: 6.1.2
 
-  postcss-discard-duplicates@7.0.1(postcss@8.4.47):
+  postcss-discard-duplicates@7.0.1(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
 
-  postcss-discard-empty@7.0.0(postcss@8.4.47):
+  postcss-discard-empty@7.0.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
 
-  postcss-discard-overridden@7.0.0(postcss@8.4.47):
+  postcss-discard-overridden@7.0.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
 
   postcss-html@1.6.0:
     dependencies:
@@ -12313,124 +12764,124 @@ snapshots:
     dependencies:
       postcss: 8.4.38
 
-  postcss-load-config@4.0.2(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5)):
+  postcss-load-config@4.0.2(postcss@8.4.49)(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5)):
     dependencies:
       lilconfig: 3.1.1
       yaml: 2.4.1
     optionalDependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       ts-node: 10.9.2(@types/node@20.12.7)(typescript@5.4.5)
 
   postcss-media-query-parser@0.2.3: {}
 
-  postcss-merge-longhand@7.0.4(postcss@8.4.47):
+  postcss-merge-longhand@7.0.4(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
-      stylehacks: 7.0.4(postcss@8.4.47)
+      stylehacks: 7.0.4(postcss@8.4.49)
 
-  postcss-merge-rules@7.0.4(postcss@8.4.47):
+  postcss-merge-rules@7.0.4(postcss@8.4.49):
     dependencies:
-      browserslist: 4.23.3
+      browserslist: 4.24.2
       caniuse-api: 3.0.0
-      cssnano-utils: 5.0.0(postcss@8.4.47)
-      postcss: 8.4.47
+      cssnano-utils: 5.0.0(postcss@8.4.49)
+      postcss: 8.4.49
       postcss-selector-parser: 6.1.2
 
-  postcss-minify-font-values@7.0.0(postcss@8.4.47):
+  postcss-minify-font-values@7.0.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
-  postcss-minify-gradients@7.0.0(postcss@8.4.47):
+  postcss-minify-gradients@7.0.0(postcss@8.4.49):
     dependencies:
       colord: 2.9.3
-      cssnano-utils: 5.0.0(postcss@8.4.47)
-      postcss: 8.4.47
+      cssnano-utils: 5.0.0(postcss@8.4.49)
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
-  postcss-minify-params@7.0.2(postcss@8.4.47):
+  postcss-minify-params@7.0.2(postcss@8.4.49):
     dependencies:
-      browserslist: 4.23.3
-      cssnano-utils: 5.0.0(postcss@8.4.47)
-      postcss: 8.4.47
+      browserslist: 4.24.2
+      cssnano-utils: 5.0.0(postcss@8.4.49)
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
-  postcss-minify-selectors@7.0.4(postcss@8.4.47):
+  postcss-minify-selectors@7.0.4(postcss@8.4.49):
     dependencies:
       cssesc: 3.0.0
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-selector-parser: 6.1.2
 
-  postcss-nested@6.2.0(postcss@8.4.47):
+  postcss-nested@6.2.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-selector-parser: 6.1.2
 
-  postcss-normalize-charset@7.0.0(postcss@8.4.47):
+  postcss-normalize-charset@7.0.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
 
-  postcss-normalize-display-values@7.0.0(postcss@8.4.47):
+  postcss-normalize-display-values@7.0.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-positions@7.0.0(postcss@8.4.47):
+  postcss-normalize-positions@7.0.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-repeat-style@7.0.0(postcss@8.4.47):
+  postcss-normalize-repeat-style@7.0.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-string@7.0.0(postcss@8.4.47):
+  postcss-normalize-string@7.0.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-timing-functions@7.0.0(postcss@8.4.47):
+  postcss-normalize-timing-functions@7.0.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-unicode@7.0.2(postcss@8.4.47):
+  postcss-normalize-unicode@7.0.2(postcss@8.4.49):
     dependencies:
-      browserslist: 4.23.3
-      postcss: 8.4.47
+      browserslist: 4.24.2
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-url@7.0.0(postcss@8.4.47):
+  postcss-normalize-url@7.0.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
-  postcss-normalize-whitespace@7.0.0(postcss@8.4.47):
+  postcss-normalize-whitespace@7.0.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
-  postcss-ordered-values@7.0.1(postcss@8.4.47):
+  postcss-ordered-values@7.0.1(postcss@8.4.49):
     dependencies:
-      cssnano-utils: 5.0.0(postcss@8.4.47)
-      postcss: 8.4.47
+      cssnano-utils: 5.0.0(postcss@8.4.49)
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
   postcss-prefix-selector@1.16.0(postcss@5.2.18):
     dependencies:
       postcss: 5.2.18
 
-  postcss-reduce-initial@7.0.2(postcss@8.4.47):
+  postcss-reduce-initial@7.0.2(postcss@8.4.49):
     dependencies:
-      browserslist: 4.23.3
+      browserslist: 4.24.2
       caniuse-api: 3.0.0
-      postcss: 8.4.47
+      postcss: 8.4.49
 
-  postcss-reduce-transforms@7.0.0(postcss@8.4.47):
+  postcss-reduce-transforms@7.0.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
   postcss-resolve-nested-selector@0.1.1: {}
@@ -12461,15 +12912,15 @@ snapshots:
     dependencies:
       postcss: 8.4.38
 
-  postcss-svgo@7.0.1(postcss@8.4.47):
+  postcss-svgo@7.0.1(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
       svgo: 3.3.2
 
-  postcss-unique-selectors@7.0.3(postcss@8.4.47):
+  postcss-unique-selectors@7.0.3(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       postcss-selector-parser: 6.1.2
 
   postcss-value-parser@4.2.0: {}
@@ -12487,10 +12938,10 @@ snapshots:
       picocolors: 1.0.0
       source-map-js: 1.2.0
 
-  postcss@8.4.47:
+  postcss@8.4.49:
     dependencies:
-      nanoid: 3.3.7
-      picocolors: 1.1.0
+      nanoid: 3.3.8
+      picocolors: 1.1.1
       source-map-js: 1.2.1
 
   posthtml-parser@0.2.1:
@@ -12522,19 +12973,23 @@ snapshots:
     dependencies:
       fast-diff: 1.3.0
 
-  prettier-plugin-packagejson@2.5.2(prettier@3.3.3):
+  prettier-plugin-packagejson@2.5.6(prettier@3.4.2):
     dependencies:
-      sort-package-json: 2.10.1
-      synckit: 0.9.1
+      sort-package-json: 2.12.0
+      synckit: 0.9.2
     optionalDependencies:
-      prettier: 3.3.3
+      prettier: 3.4.2
 
   prettier@3.2.5: {}
 
-  prettier@3.3.3: {}
+  prettier@3.4.2: {}
 
   pretty-bytes@6.1.1: {}
 
+  pretty-ms@9.2.0:
+    dependencies:
+      parse-ms: 4.0.0
+
   promptly@2.2.0:
     dependencies:
       read: 1.0.7
@@ -12544,7 +12999,7 @@ snapshots:
   proxy-agent@6.3.1:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.3.7
+      debug: 4.4.0
       http-proxy-agent: 7.0.2
       https-proxy-agent: 7.0.4
       lru-cache: 7.18.3
@@ -12569,7 +13024,7 @@ snapshots:
       pngjs: 5.0.0
       yargs: 15.4.1
 
-  qs@6.13.0:
+  qs@6.13.1:
     dependencies:
       side-channel: 1.0.6
 
@@ -12591,14 +13046,14 @@ snapshots:
     dependencies:
       find-up: 6.3.0
       read-pkg: 8.1.0
-      type-fest: 4.26.1
+      type-fest: 4.30.0
 
   read-pkg@8.1.0:
     dependencies:
       '@types/normalize-package-data': 2.4.4
       normalize-package-data: 6.0.2
       parse-json: 7.1.1
-      type-fest: 4.26.1
+      type-fest: 4.30.0
 
   read@1.0.7:
     dependencies:
@@ -12640,7 +13095,7 @@ snapshots:
 
   require-in-the-middle@5.2.0:
     dependencies:
-      debug: 4.3.7
+      debug: 4.4.0
       module-details-from-path: 1.0.3
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -12695,13 +13150,13 @@ snapshots:
     dependencies:
       glob: 10.3.12
 
-  rollup-plugin-dts@6.1.1(rollup@3.29.5)(typescript@5.6.2):
+  rollup-plugin-dts@6.1.1(rollup@3.29.5)(typescript@5.7.2):
     dependencies:
-      magic-string: 0.30.11
+      magic-string: 0.30.14
       rollup: 3.29.5
-      typescript: 5.6.2
+      typescript: 5.7.2
     optionalDependencies:
-      '@babel/code-frame': 7.24.7
+      '@babel/code-frame': 7.26.2
 
   rollup-plugin-purge-icons@0.10.0:
     dependencies:
@@ -12711,14 +13166,14 @@ snapshots:
       - encoding
       - supports-color
 
-  rollup-plugin-visualizer@5.12.0(rollup@4.22.4):
+  rollup-plugin-visualizer@5.12.0(rollup@4.28.1):
     dependencies:
       open: 8.4.2
       picomatch: 2.3.1
       source-map: 0.7.4
       yargs: 17.7.2
     optionalDependencies:
-      rollup: 4.22.4
+      rollup: 4.28.1
 
   rollup@3.29.5:
     optionalDependencies:
@@ -12746,26 +13201,29 @@ snapshots:
       '@rollup/rollup-win32-x64-msvc': 4.14.3
       fsevents: 2.3.3
 
-  rollup@4.22.4:
+  rollup@4.28.1:
     dependencies:
-      '@types/estree': 1.0.5
+      '@types/estree': 1.0.6
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.22.4
-      '@rollup/rollup-android-arm64': 4.22.4
-      '@rollup/rollup-darwin-arm64': 4.22.4
-      '@rollup/rollup-darwin-x64': 4.22.4
-      '@rollup/rollup-linux-arm-gnueabihf': 4.22.4
-      '@rollup/rollup-linux-arm-musleabihf': 4.22.4
-      '@rollup/rollup-linux-arm64-gnu': 4.22.4
-      '@rollup/rollup-linux-arm64-musl': 4.22.4
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.22.4
-      '@rollup/rollup-linux-riscv64-gnu': 4.22.4
-      '@rollup/rollup-linux-s390x-gnu': 4.22.4
-      '@rollup/rollup-linux-x64-gnu': 4.22.4
-      '@rollup/rollup-linux-x64-musl': 4.22.4
-      '@rollup/rollup-win32-arm64-msvc': 4.22.4
-      '@rollup/rollup-win32-ia32-msvc': 4.22.4
-      '@rollup/rollup-win32-x64-msvc': 4.22.4
+      '@rollup/rollup-android-arm-eabi': 4.28.1
+      '@rollup/rollup-android-arm64': 4.28.1
+      '@rollup/rollup-darwin-arm64': 4.28.1
+      '@rollup/rollup-darwin-x64': 4.28.1
+      '@rollup/rollup-freebsd-arm64': 4.28.1
+      '@rollup/rollup-freebsd-x64': 4.28.1
+      '@rollup/rollup-linux-arm-gnueabihf': 4.28.1
+      '@rollup/rollup-linux-arm-musleabihf': 4.28.1
+      '@rollup/rollup-linux-arm64-gnu': 4.28.1
+      '@rollup/rollup-linux-arm64-musl': 4.28.1
+      '@rollup/rollup-linux-loongarch64-gnu': 4.28.1
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.28.1
+      '@rollup/rollup-linux-riscv64-gnu': 4.28.1
+      '@rollup/rollup-linux-s390x-gnu': 4.28.1
+      '@rollup/rollup-linux-x64-gnu': 4.28.1
+      '@rollup/rollup-linux-x64-musl': 4.28.1
+      '@rollup/rollup-win32-arm64-msvc': 4.28.1
+      '@rollup/rollup-win32-ia32-msvc': 4.28.1
+      '@rollup/rollup-win32-x64-msvc': 4.28.1
       fsevents: 2.3.3
 
   run-applescript@7.0.0: {}
@@ -12834,8 +13292,8 @@ snapshots:
       define-data-property: 1.1.4
       es-errors: 1.3.0
       function-bind: 1.1.2
-      get-intrinsic: 1.2.4
-      gopd: 1.0.1
+      get-intrinsic: 1.2.5
+      gopd: 1.2.0
       has-property-descriptors: 1.0.2
 
   set-function-name@2.0.2:
@@ -12872,10 +13330,10 @@ snapshots:
 
   side-channel@1.0.6:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      object-inspect: 1.13.2
+      get-intrinsic: 1.2.5
+      object-inspect: 1.13.3
 
   signal-exit@3.0.7: {}
 
@@ -12891,6 +13349,12 @@ snapshots:
       mrmime: 2.0.0
       totalist: 3.0.1
 
+  sirv@3.0.0:
+    dependencies:
+      '@polka/url': 1.0.0-next.28
+      mrmime: 2.0.0
+      totalist: 3.0.1
+
   slash@3.0.0: {}
 
   slash@4.0.0: {}
@@ -12939,7 +13403,7 @@ snapshots:
   socks-proxy-agent@8.0.3:
     dependencies:
       agent-base: 7.1.1
-      debug: 4.3.7
+      debug: 4.4.0
       socks: 2.8.3
     transitivePeerDependencies:
       - supports-color
@@ -12951,20 +13415,20 @@ snapshots:
 
   sort-object-keys@1.1.3: {}
 
-  sort-package-json@2.10.1:
+  sort-package-json@2.12.0:
     dependencies:
       detect-indent: 7.0.1
       detect-newline: 4.0.1
       get-stdin: 9.0.0
       git-hooks-list: 3.1.0
-      globby: 13.2.2
       is-plain-obj: 4.1.0
       semver: 7.6.3
       sort-object-keys: 1.1.3
+      tinyglobby: 0.2.10
 
   sortablejs@1.14.0: {}
 
-  sortablejs@1.15.3: {}
+  sortablejs@1.15.6: {}
 
   source-map-js@1.2.0: {}
 
@@ -13053,7 +13517,7 @@ snapshots:
   string-width@7.2.0:
     dependencies:
       emoji-regex: 10.4.0
-      get-east-asian-width: 1.2.0
+      get-east-asian-width: 1.3.0
       strip-ansi: 7.1.0
 
   string.prototype.trim@1.2.9:
@@ -13097,81 +13561,83 @@ snapshots:
 
   strip-final-newline@3.0.0: {}
 
+  strip-final-newline@4.0.0: {}
+
   strip-json-comments@3.1.1: {}
 
-  stylehacks@7.0.4(postcss@8.4.47):
+  stylehacks@7.0.4(postcss@8.4.49):
     dependencies:
-      browserslist: 4.23.3
-      postcss: 8.4.47
+      browserslist: 4.24.2
+      postcss: 8.4.49
       postcss-selector-parser: 6.1.2
 
-  stylelint-config-html@1.1.0(postcss-html@1.6.0)(stylelint@16.4.0(typescript@5.6.2)):
+  stylelint-config-html@1.1.0(postcss-html@1.6.0)(stylelint@16.4.0(typescript@5.7.2)):
     dependencies:
       postcss-html: 1.6.0
-      stylelint: 16.4.0(typescript@5.6.2)
+      stylelint: 16.4.0(typescript@5.7.2)
 
-  stylelint-config-property-sort-order-smacss@10.0.0(stylelint@16.4.0(typescript@5.6.2)):
+  stylelint-config-property-sort-order-smacss@10.0.0(stylelint@16.4.0(typescript@5.7.2)):
     dependencies:
       css-property-sort-order-smacss: 2.2.0
-      stylelint: 16.4.0(typescript@5.6.2)
-      stylelint-order: 6.0.4(stylelint@16.4.0(typescript@5.6.2))
+      stylelint: 16.4.0(typescript@5.7.2)
+      stylelint-order: 6.0.4(stylelint@16.4.0(typescript@5.7.2))
 
-  stylelint-config-recommended-scss@14.0.0(postcss@8.4.38)(stylelint@16.4.0(typescript@5.6.2)):
+  stylelint-config-recommended-scss@14.0.0(postcss@8.4.38)(stylelint@16.4.0(typescript@5.7.2)):
     dependencies:
       postcss-scss: 4.0.9(postcss@8.4.38)
-      stylelint: 16.4.0(typescript@5.6.2)
-      stylelint-config-recommended: 14.0.0(stylelint@16.4.0(typescript@5.6.2))
-      stylelint-scss: 6.2.1(stylelint@16.4.0(typescript@5.6.2))
+      stylelint: 16.4.0(typescript@5.7.2)
+      stylelint-config-recommended: 14.0.0(stylelint@16.4.0(typescript@5.7.2))
+      stylelint-scss: 6.2.1(stylelint@16.4.0(typescript@5.7.2))
     optionalDependencies:
       postcss: 8.4.38
 
-  stylelint-config-recommended-vue@1.5.0(postcss-html@1.6.0)(stylelint@16.4.0(typescript@5.6.2)):
+  stylelint-config-recommended-vue@1.5.0(postcss-html@1.6.0)(stylelint@16.4.0(typescript@5.7.2)):
     dependencies:
       postcss-html: 1.6.0
       semver: 7.6.0
-      stylelint: 16.4.0(typescript@5.6.2)
-      stylelint-config-html: 1.1.0(postcss-html@1.6.0)(stylelint@16.4.0(typescript@5.6.2))
-      stylelint-config-recommended: 14.0.0(stylelint@16.4.0(typescript@5.6.2))
+      stylelint: 16.4.0(typescript@5.7.2)
+      stylelint-config-html: 1.1.0(postcss-html@1.6.0)(stylelint@16.4.0(typescript@5.7.2))
+      stylelint-config-recommended: 14.0.0(stylelint@16.4.0(typescript@5.7.2))
 
-  stylelint-config-recommended@14.0.0(stylelint@16.4.0(typescript@5.6.2)):
+  stylelint-config-recommended@14.0.0(stylelint@16.4.0(typescript@5.7.2)):
     dependencies:
-      stylelint: 16.4.0(typescript@5.6.2)
+      stylelint: 16.4.0(typescript@5.7.2)
 
-  stylelint-config-standard-scss@13.1.0(postcss@8.4.38)(stylelint@16.4.0(typescript@5.6.2)):
+  stylelint-config-standard-scss@13.1.0(postcss@8.4.38)(stylelint@16.4.0(typescript@5.7.2)):
     dependencies:
-      stylelint: 16.4.0(typescript@5.6.2)
-      stylelint-config-recommended-scss: 14.0.0(postcss@8.4.38)(stylelint@16.4.0(typescript@5.6.2))
-      stylelint-config-standard: 36.0.0(stylelint@16.4.0(typescript@5.6.2))
+      stylelint: 16.4.0(typescript@5.7.2)
+      stylelint-config-recommended-scss: 14.0.0(postcss@8.4.38)(stylelint@16.4.0(typescript@5.7.2))
+      stylelint-config-standard: 36.0.0(stylelint@16.4.0(typescript@5.7.2))
     optionalDependencies:
       postcss: 8.4.38
 
-  stylelint-config-standard@36.0.0(stylelint@16.4.0(typescript@5.6.2)):
+  stylelint-config-standard@36.0.0(stylelint@16.4.0(typescript@5.7.2)):
     dependencies:
-      stylelint: 16.4.0(typescript@5.6.2)
-      stylelint-config-recommended: 14.0.0(stylelint@16.4.0(typescript@5.6.2))
+      stylelint: 16.4.0(typescript@5.7.2)
+      stylelint-config-recommended: 14.0.0(stylelint@16.4.0(typescript@5.7.2))
 
-  stylelint-order@6.0.4(stylelint@16.4.0(typescript@5.6.2)):
+  stylelint-order@6.0.4(stylelint@16.4.0(typescript@5.7.2)):
     dependencies:
       postcss: 8.4.38
       postcss-sorting: 8.0.2(postcss@8.4.38)
-      stylelint: 16.4.0(typescript@5.6.2)
+      stylelint: 16.4.0(typescript@5.7.2)
 
-  stylelint-prettier@5.0.0(prettier@3.2.5)(stylelint@16.4.0(typescript@5.6.2)):
+  stylelint-prettier@5.0.0(prettier@3.2.5)(stylelint@16.4.0(typescript@5.7.2)):
     dependencies:
       prettier: 3.2.5
       prettier-linter-helpers: 1.0.0
-      stylelint: 16.4.0(typescript@5.6.2)
+      stylelint: 16.4.0(typescript@5.7.2)
 
-  stylelint-scss@6.2.1(stylelint@16.4.0(typescript@5.6.2)):
+  stylelint-scss@6.2.1(stylelint@16.4.0(typescript@5.7.2)):
     dependencies:
       known-css-properties: 0.29.0
       postcss-media-query-parser: 0.2.3
       postcss-resolve-nested-selector: 0.1.1
       postcss-selector-parser: 6.0.16
       postcss-value-parser: 4.2.0
-      stylelint: 16.4.0(typescript@5.6.2)
+      stylelint: 16.4.0(typescript@5.7.2)
 
-  stylelint@16.4.0(typescript@5.6.2):
+  stylelint@16.4.0(typescript@5.7.2):
     dependencies:
       '@csstools/css-parser-algorithms': 2.6.1(@csstools/css-tokenizer@2.2.4)
       '@csstools/css-tokenizer': 2.2.4
@@ -13180,7 +13646,7 @@ snapshots:
       '@dual-bundle/import-meta-resolve': 4.0.0
       balanced-match: 2.0.0
       colord: 2.9.3
-      cosmiconfig: 9.0.0(typescript@5.6.2)
+      cosmiconfig: 9.0.0(typescript@5.7.2)
       css-functions-list: 3.2.2
       css-tree: 2.3.1
       debug: 4.3.4
@@ -13230,7 +13696,7 @@ snapshots:
       pirates: 4.0.6
       ts-interface-checker: 0.1.13
 
-  superjson@2.2.1:
+  superjson@2.2.2:
     dependencies:
       copy-anything: 3.0.5
 
@@ -13297,17 +13763,17 @@ snapshots:
       css-tree: 2.3.1
       css-what: 6.1.0
       csso: 5.0.5
-      picocolors: 1.1.0
+      picocolors: 1.1.1
 
   synckit@0.8.8:
     dependencies:
       '@pkgr/core': 0.1.1
       tslib: 2.6.2
 
-  synckit@0.9.1:
+  synckit@0.9.2:
     dependencies:
       '@pkgr/core': 0.1.1
-      tslib: 2.7.0
+      tslib: 2.8.1
 
   systeminformation@5.22.7:
     optional: true
@@ -13329,7 +13795,7 @@ snapshots:
   terser@5.30.3:
     dependencies:
       '@jridgewell/source-map': 0.3.6
-      acorn: 8.12.1
+      acorn: 8.14.0
       commander: 2.20.3
       source-map-support: 0.5.21
 
@@ -13351,7 +13817,12 @@ snapshots:
 
   through@2.3.8: {}
 
-  tinyexec@0.3.0: {}
+  tinyexec@0.3.1: {}
+
+  tinyglobby@0.2.10:
+    dependencies:
+      fdir: 6.4.2(picomatch@4.0.2)
+      picomatch: 4.0.2
 
   to-fast-properties@2.0.0: {}
 
@@ -13397,9 +13868,9 @@ snapshots:
 
   tree-kill@1.2.2: {}
 
-  ts-api-utils@1.3.0(typescript@5.6.2):
+  ts-api-utils@1.3.0(typescript@5.7.2):
     dependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   ts-interface-checker@0.1.13: {}
 
@@ -13440,11 +13911,11 @@ snapshots:
 
   tslib@2.6.2: {}
 
-  tslib@2.7.0: {}
+  tslib@2.8.1: {}
 
   tsscmp@1.0.6: {}
 
-  tsup@7.3.0(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5):
+  tsup@7.3.0(postcss@8.4.49)(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))(typescript@5.4.5):
     dependencies:
       bundle-require: 4.0.2(esbuild@0.19.12)
       cac: 6.7.14
@@ -13454,14 +13925,14 @@ snapshots:
       execa: 5.1.1
       globby: 11.1.0
       joycon: 3.1.1
-      postcss-load-config: 4.0.2(postcss@8.4.47)(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))
+      postcss-load-config: 4.0.2(postcss@8.4.49)(ts-node@10.9.2(@types/node@20.12.7)(typescript@5.4.5))
       resolve-from: 5.0.0
       rollup: 4.14.3
       source-map: 0.8.0-beta.0
       sucrase: 3.35.0
       tree-kill: 1.2.2
     optionalDependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
       typescript: 5.4.5
     transitivePeerDependencies:
       - supports-color
@@ -13509,7 +13980,7 @@ snapshots:
 
   type-fest@3.13.1: {}
 
-  type-fest@4.26.1: {}
+  type-fest@4.30.0: {}
 
   type-is@1.6.18:
     dependencies:
@@ -13550,7 +14021,7 @@ snapshots:
 
   typedarray.prototype.slice@1.0.3:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
       es-abstract: 1.23.3
       es-errors: 1.3.0
@@ -13561,7 +14032,7 @@ snapshots:
 
   typescript@5.4.5: {}
 
-  typescript@5.6.2: {}
+  typescript@5.7.2: {}
 
   ufo@1.5.3: {}
 
@@ -13577,14 +14048,14 @@ snapshots:
       has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
 
-  unbuild@2.0.0(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2)):
+  unbuild@2.0.0(typescript@5.7.2)(vue-tsc@2.1.10(typescript@5.7.2)):
     dependencies:
       '@rollup/plugin-alias': 5.1.1(rollup@3.29.5)
       '@rollup/plugin-commonjs': 25.0.8(rollup@3.29.5)
       '@rollup/plugin-json': 6.1.0(rollup@3.29.5)
-      '@rollup/plugin-node-resolve': 15.2.4(rollup@3.29.5)
+      '@rollup/plugin-node-resolve': 15.3.0(rollup@3.29.5)
       '@rollup/plugin-replace': 5.0.7(rollup@3.29.5)
-      '@rollup/pluginutils': 5.1.1(rollup@3.29.5)
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
       chalk: 5.3.0
       citty: 0.1.6
       consola: 3.2.3
@@ -13593,18 +14064,18 @@ snapshots:
       globby: 13.2.2
       hookable: 5.5.3
       jiti: 1.21.6
-      magic-string: 0.30.11
-      mkdist: 1.5.9(typescript@5.6.2)(vue-tsc@2.1.6(typescript@5.6.2))
-      mlly: 1.7.1
+      magic-string: 0.30.14
+      mkdist: 1.6.0(typescript@5.7.2)(vue-tsc@2.1.10(typescript@5.7.2))
+      mlly: 1.7.3
       pathe: 1.1.2
-      pkg-types: 1.2.0
+      pkg-types: 1.2.1
       pretty-bytes: 6.1.1
       rollup: 3.29.5
-      rollup-plugin-dts: 6.1.1(rollup@3.29.5)(typescript@5.6.2)
+      rollup-plugin-dts: 6.1.1(rollup@3.29.5)(typescript@5.7.2)
       scule: 1.3.0
-      untyped: 1.4.2
+      untyped: 1.5.1
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - sass
       - supports-color
@@ -13620,10 +14091,12 @@ snapshots:
 
   undici-types@5.26.5: {}
 
-  undici-types@6.19.8: {}
+  undici-types@6.20.0: {}
 
   unicorn-magic@0.1.0: {}
 
+  unicorn-magic@0.3.0: {}
+
   union-value@1.0.1:
     dependencies:
       arr-union: 3.1.0
@@ -13635,10 +14108,10 @@ snapshots:
 
   universalify@2.0.1: {}
 
-  unocss@0.59.4(postcss@5.2.18)(rollup@4.22.4)(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)):
+  unocss@0.59.4(postcss@5.2.18)(rollup@4.28.1)(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)):
     dependencies:
-      '@unocss/astro': 0.59.4(rollup@4.22.4)(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
-      '@unocss/cli': 0.59.4(rollup@4.22.4)
+      '@unocss/astro': 0.59.4(rollup@4.28.1)(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
+      '@unocss/cli': 0.59.4(rollup@4.28.1)
       '@unocss/core': 0.59.4
       '@unocss/extractor-arbitrary-variants': 0.59.4
       '@unocss/postcss': 0.59.4(postcss@5.2.18)
@@ -13656,21 +14129,21 @@ snapshots:
       '@unocss/transformer-compile-class': 0.59.4
       '@unocss/transformer-directives': 0.59.4
       '@unocss/transformer-variant-group': 0.59.4
-      '@unocss/vite': 0.59.4(rollup@4.22.4)(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
+      '@unocss/vite': 0.59.4(rollup@4.28.1)(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3))
     optionalDependencies:
-      vite: 5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
+      vite: 5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
     transitivePeerDependencies:
       - postcss
       - rollup
       - supports-color
 
-  unocss@0.59.4(postcss@8.4.47)(rollup@3.29.5)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3)):
+  unocss@0.59.4(postcss@8.4.49)(rollup@3.29.5)(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3)):
     dependencies:
-      '@unocss/astro': 0.59.4(rollup@3.29.5)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3))
+      '@unocss/astro': 0.59.4(rollup@3.29.5)(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3))
       '@unocss/cli': 0.59.4(rollup@3.29.5)
       '@unocss/core': 0.59.4
       '@unocss/extractor-arbitrary-variants': 0.59.4
-      '@unocss/postcss': 0.59.4(postcss@8.4.47)
+      '@unocss/postcss': 0.59.4(postcss@8.4.49)
       '@unocss/preset-attributify': 0.59.4
       '@unocss/preset-icons': 0.59.4
       '@unocss/preset-mini': 0.59.4
@@ -13685,9 +14158,9 @@ snapshots:
       '@unocss/transformer-compile-class': 0.59.4
       '@unocss/transformer-directives': 0.59.4
       '@unocss/transformer-variant-group': 0.59.4
-      '@unocss/vite': 0.59.4(rollup@3.29.5)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3))
+      '@unocss/vite': 0.59.4(rollup@3.29.5)(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3))
     optionalDependencies:
-      vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3)
+      vite: 5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3)
     transitivePeerDependencies:
       - postcss
       - rollup
@@ -13700,13 +14173,13 @@ snapshots:
       has-value: 0.3.1
       isobject: 3.0.1
 
-  untyped@1.4.2:
+  untyped@1.5.1:
     dependencies:
-      '@babel/core': 7.25.2
-      '@babel/standalone': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/core': 7.26.0
+      '@babel/standalone': 7.26.4
+      '@babel/types': 7.26.3
       defu: 6.1.4
-      jiti: 1.21.6
+      jiti: 2.4.1
       mri: 1.2.0
       scule: 1.3.0
     transitivePeerDependencies:
@@ -13722,7 +14195,13 @@ snapshots:
     dependencies:
       browserslist: 4.23.3
       escalade: 3.2.0
-      picocolors: 1.1.0
+      picocolors: 1.1.1
+
+  update-browserslist-db@1.1.1(browserslist@4.24.2):
+    dependencies:
+      browserslist: 4.24.2
+      escalade: 3.2.0
+      picocolors: 1.1.1
 
   uri-js@4.4.1:
     dependencies:
@@ -13747,37 +14226,37 @@ snapshots:
 
   vary@1.1.2: {}
 
-  vite-hot-client@0.2.3(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3)):
+  vite-hot-client@0.2.4(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3)):
     dependencies:
-      vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3)
+      vite: 5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3)
 
-  vite-plugin-compression@0.5.1(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)):
+  vite-plugin-compression@0.5.1(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)):
     dependencies:
       chalk: 4.1.2
       debug: 4.3.4
       fs-extra: 10.1.0
-      vite: 5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
+      vite: 5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-dts@3.9.0(@types/node@22.5.5)(rollup@4.22.4)(typescript@5.6.2)(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)):
+  vite-plugin-dts@3.9.0(@types/node@22.10.1)(rollup@4.28.1)(typescript@5.7.2)(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)):
     dependencies:
-      '@microsoft/api-extractor': 7.43.0(@types/node@22.5.5)
-      '@rollup/pluginutils': 5.1.0(rollup@4.22.4)
-      '@vue/language-core': 1.8.27(typescript@5.6.2)
+      '@microsoft/api-extractor': 7.43.0(@types/node@22.10.1)
+      '@rollup/pluginutils': 5.1.0(rollup@4.28.1)
+      '@vue/language-core': 1.8.27(typescript@5.7.2)
       debug: 4.3.4
       kolorist: 1.8.0
       magic-string: 0.30.10
-      typescript: 5.6.2
-      vue-tsc: 1.8.27(typescript@5.6.2)
+      typescript: 5.7.2
+      vue-tsc: 1.8.27(typescript@5.7.2)
     optionalDependencies:
-      vite: 5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
+      vite: 5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
     transitivePeerDependencies:
       - '@types/node'
       - rollup
       - supports-color
 
-  vite-plugin-html@3.2.2(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)):
+  vite-plugin-html@3.2.2(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)):
     dependencies:
       '@rollup/pluginutils': 4.2.1
       colorette: 2.0.20
@@ -13791,35 +14270,35 @@ snapshots:
       html-minifier-terser: 6.1.0
       node-html-parser: 5.4.2
       pathe: 0.2.0
-      vite: 5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
+      vite: 5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
 
-  vite-plugin-inspect@0.8.7(rollup@3.29.5)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3)):
+  vite-plugin-inspect@0.8.8(rollup@3.29.5)(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3)):
     dependencies:
       '@antfu/utils': 0.7.10
-      '@rollup/pluginutils': 5.1.1(rollup@3.29.5)
-      debug: 4.3.7
+      '@rollup/pluginutils': 5.1.3(rollup@3.29.5)
+      debug: 4.4.0
       error-stack-parser-es: 0.1.5
       fs-extra: 11.2.0
       open: 10.1.0
       perfect-debounce: 1.0.0
-      picocolors: 1.1.0
-      sirv: 2.0.4
-      vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3)
+      picocolors: 1.1.1
+      sirv: 3.0.0
+      vite: 5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3)
     transitivePeerDependencies:
       - rollup
       - supports-color
 
-  vite-plugin-purge-icons@0.10.0(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)):
+  vite-plugin-purge-icons@0.10.0(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)):
     dependencies:
       '@purge-icons/core': 0.10.0
       '@purge-icons/generated': 0.10.0
       rollup-plugin-purge-icons: 0.10.0
-      vite: 5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
+      vite: 5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  vite-plugin-svg-icons@2.0.1(vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)):
+  vite-plugin-svg-icons@2.0.1(vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)):
     dependencies:
       '@types/svgo': 2.6.4
       cors: 2.8.5
@@ -13829,38 +14308,38 @@ snapshots:
       pathe: 0.2.0
       svg-baker: 1.7.0
       svgo: 2.8.0
-      vite: 5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
+      vite: 5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3)
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-devtools@7.4.5(rollup@3.29.5)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3))(vue@3.5.8(typescript@5.6.2)):
+  vite-plugin-vue-devtools@7.6.7(rollup@3.29.5)(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3))(vue@3.5.13(typescript@5.7.2)):
     dependencies:
-      '@vue/devtools-core': 7.4.5(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3))(vue@3.5.8(typescript@5.6.2))
-      '@vue/devtools-kit': 7.4.5
-      '@vue/devtools-shared': 7.4.5
-      execa: 8.0.1
-      sirv: 2.0.4
-      vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3)
-      vite-plugin-inspect: 0.8.7(rollup@3.29.5)(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3))
-      vite-plugin-vue-inspector: 5.2.0(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3))
+      '@vue/devtools-core': 7.6.7(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3))(vue@3.5.13(typescript@5.7.2))
+      '@vue/devtools-kit': 7.6.7
+      '@vue/devtools-shared': 7.6.7
+      execa: 9.5.2
+      sirv: 3.0.0
+      vite: 5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3)
+      vite-plugin-inspect: 0.8.8(rollup@3.29.5)(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3))
+      vite-plugin-vue-inspector: 5.3.1(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3))
     transitivePeerDependencies:
       - '@nuxt/kit'
       - rollup
       - supports-color
       - vue
 
-  vite-plugin-vue-inspector@5.2.0(vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3)):
+  vite-plugin-vue-inspector@5.3.1(vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3)):
     dependencies:
-      '@babel/core': 7.25.2
-      '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.25.2)
-      '@babel/plugin-syntax-import-attributes': 7.25.6(@babel/core@7.25.2)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.25.2)
-      '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2)
-      '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.25.2)
-      '@vue/compiler-dom': 3.5.8
+      '@babel/core': 7.26.0
+      '@babel/plugin-proposal-decorators': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-syntax-import-attributes': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.26.0)
+      '@babel/plugin-transform-typescript': 7.26.3(@babel/core@7.26.0)
+      '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.26.0)
+      '@vue/compiler-dom': 3.5.13
       kolorist: 1.8.0
-      magic-string: 0.30.11
-      vite: 5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3)
+      magic-string: 0.30.14
+      vite: 5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -13876,25 +14355,25 @@ snapshots:
       sass: 1.75.0
       terser: 5.30.3
 
-  vite@5.2.10(@types/node@22.5.5)(less@4.2.0)(sass@1.75.0)(terser@5.30.3):
+  vite@5.2.10(@types/node@22.10.1)(less@4.2.0)(sass@1.75.0)(terser@5.30.3):
     dependencies:
       esbuild: 0.20.2
       postcss: 8.4.38
       rollup: 4.14.3
     optionalDependencies:
-      '@types/node': 22.5.5
+      '@types/node': 22.10.1
       fsevents: 2.3.3
       less: 4.2.0
       sass: 1.75.0
       terser: 5.30.3
 
-  vite@5.4.7(@types/node@22.5.5)(less@4.2.0)(terser@5.30.3):
+  vite@5.4.11(@types/node@22.10.1)(less@4.2.0)(terser@5.30.3):
     dependencies:
       esbuild: 0.21.5
-      postcss: 8.4.47
-      rollup: 4.22.4
+      postcss: 8.4.49
+      rollup: 4.28.1
     optionalDependencies:
-      '@types/node': 22.5.5
+      '@types/node': 22.10.1
       fsevents: 2.3.3
       less: 4.2.0
       terser: 5.30.3
@@ -13908,19 +14387,19 @@ snapshots:
 
   vscode-uri@3.0.8: {}
 
-  vue-component-type-helpers@2.1.6: {}
+  vue-component-type-helpers@2.1.10: {}
 
-  vue-demi@0.14.10(vue@3.4.25(typescript@5.6.2)):
+  vue-demi@0.14.10(vue@3.4.25(typescript@5.7.2)):
     dependencies:
-      vue: 3.4.25(typescript@5.6.2)
+      vue: 3.4.25(typescript@5.7.2)
 
-  vue-demi@0.14.10(vue@3.5.8(typescript@5.6.2)):
+  vue-demi@0.14.10(vue@3.5.13(typescript@5.7.2)):
     dependencies:
-      vue: 3.5.8(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
 
-  vue-demi@0.14.7(vue@3.4.25(typescript@5.6.2)):
+  vue-demi@0.14.7(vue@3.4.25(typescript@5.7.2)):
     dependencies:
-      vue: 3.4.25(typescript@5.6.2)
+      vue: 3.4.25(typescript@5.7.2)
 
   vue-eslint-parser@9.4.2(eslint@8.57.0):
     dependencies:
@@ -13935,77 +14414,81 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vue-json-pretty@2.4.0(vue@3.5.8(typescript@5.6.2)):
+  vue-json-pretty@2.4.0(vue@3.5.13(typescript@5.7.2)):
     dependencies:
-      vue: 3.5.8(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
 
-  vue-router@4.4.5(vue@3.5.8(typescript@5.6.2)):
+  vue-router@4.3.3(vue@3.5.13(typescript@5.7.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.8(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
 
   vue-template-compiler@2.7.16:
     dependencies:
       de-indent: 1.0.2
       he: 1.2.0
 
-  vue-tsc@1.8.27(typescript@5.6.2):
+  vue-tsc@1.8.27(typescript@5.7.2):
     dependencies:
       '@volar/typescript': 1.11.1
-      '@vue/language-core': 1.8.27(typescript@5.6.2)
+      '@vue/language-core': 1.8.27(typescript@5.7.2)
       semver: 7.6.3
-      typescript: 5.6.2
+      typescript: 5.7.2
 
-  vue-tsc@2.1.6(typescript@5.6.2):
+  vue-tsc@2.1.10(typescript@5.7.2):
     dependencies:
-      '@volar/typescript': 2.4.5
-      '@vue/language-core': 2.1.6(typescript@5.6.2)
+      '@volar/typescript': 2.4.10
+      '@vue/language-core': 2.1.10(typescript@5.7.2)
       semver: 7.6.3
-      typescript: 5.6.2
+      typescript: 5.7.2
 
-  vue-types@3.0.2(vue@3.5.8(typescript@5.6.2)):
+  vue-types@3.0.2(vue@3.5.13(typescript@5.7.2)):
     dependencies:
       is-plain-object: 3.0.1
-      vue: 3.5.8(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
 
-  vue-types@5.1.3(vue@3.5.8(typescript@5.6.2)):
+  vue-types@5.1.3(vue@3.5.13(typescript@5.7.2)):
     dependencies:
       is-plain-object: 5.0.0
     optionalDependencies:
-      vue: 3.5.8(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
 
-  vue@3.4.25(typescript@5.6.2):
+  vue@3.4.25(typescript@5.7.2):
     dependencies:
       '@vue/compiler-dom': 3.4.25
       '@vue/compiler-sfc': 3.4.25
       '@vue/runtime-dom': 3.4.25
-      '@vue/server-renderer': 3.4.25(vue@3.4.25(typescript@5.6.2))
+      '@vue/server-renderer': 3.4.25(vue@3.4.25(typescript@5.7.2))
       '@vue/shared': 3.4.25
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
-  vue@3.5.8(typescript@5.6.2):
+  vue@3.5.13(typescript@5.7.2):
     dependencies:
-      '@vue/compiler-dom': 3.5.8
-      '@vue/compiler-sfc': 3.5.8
-      '@vue/runtime-dom': 3.5.8
-      '@vue/server-renderer': 3.5.8(vue@3.5.8(typescript@5.6.2))
-      '@vue/shared': 3.5.8
+      '@vue/compiler-dom': 3.5.13
+      '@vue/compiler-sfc': 3.5.13
+      '@vue/runtime-dom': 3.5.13
+      '@vue/server-renderer': 3.5.13(vue@3.5.13(typescript@5.7.2))
+      '@vue/shared': 3.5.13
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
-  vuedraggable@4.1.0(vue@3.5.8(typescript@5.6.2)):
+  vuedraggable@4.1.0(vue@3.5.13(typescript@5.7.2)):
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.5.8(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
 
-  vxe-pc-ui@4.2.2:
+  vxe-pc-ui@4.3.23(vue@3.5.13(typescript@5.7.2)):
     dependencies:
-      '@vxe-ui/core': 4.0.12
+      '@vxe-ui/core': 4.0.20(vue@3.5.13(typescript@5.7.2))
+    transitivePeerDependencies:
+      - vue
 
-  vxe-table@4.7.81:
+  vxe-table@4.9.19(vue@3.5.13(typescript@5.7.2)):
     dependencies:
-      vxe-pc-ui: 4.2.2
+      vxe-pc-ui: 4.3.23(vue@3.5.13(typescript@5.7.2))
+    transitivePeerDependencies:
+      - vue
 
   warning@4.0.3:
     dependencies:
@@ -14091,7 +14574,7 @@ snapshots:
 
   ws@8.16.0: {}
 
-  xe-utils@3.5.30: {}
+  xe-utils@3.5.32: {}
 
   xml-name-validator@4.0.0: {}
 
@@ -14151,6 +14634,8 @@ snapshots:
 
   yocto-queue@1.1.1: {}
 
+  yoctocolors@2.1.1: {}
+
   z-schema@5.0.5:
     dependencies:
       lodash.get: 4.4.2
diff --git a/src/views/daxpay/common/allocation/AllocationConfigModel.vue b/src/views/daxpay/common/allocation/AllocationConfigModel.vue
index 3040c2e6..7cf12580 100644
--- a/src/views/daxpay/common/allocation/AllocationConfigModel.vue
+++ b/src/views/daxpay/common/allocation/AllocationConfigModel.vue
@@ -1,18 +1,19 @@
 <template>
   <basic-drawer
+    destroyOnClose
     v-bind="$attrs"
     width="70%"
-    title="分账组配置"
+    title="分账配置"
     :mask-closable="true"
     :open="visible"
     @close="visible = false"
   >
     <a-tabs v-model:activeKey="activeKey" type="card">
       <a-tab-pane :key="1" tab="分账模式">
-        <AllocationConfig :appId="appId"/>
+        <AllocationConfig :appId="appId" />
       </a-tab-pane>
       <a-tab-pane :key="2" tab="分账接收方">
-        <AllocationReceiverList :appId="appId"/>
+        <AllocationReceiverList :appId="appId" />
       </a-tab-pane>
       <a-tab-pane :key="3" tab="分账组">
         <AllocationGroupList :appId="appId" />
@@ -26,10 +27,10 @@
   import AllocationGroupList from '@/views/daxpay/common/allocation/group/AllocationGroupList.vue'
   import { ref } from 'vue'
   import { BasicDrawer } from '@/components/Drawer'
-  import AllocationConfig from "@/views/daxpay/common/allocation/config/AllocationConfig.vue";
+  import AllocationConfig from '@/views/daxpay/common/allocation/config/AllocationConfig.vue'
 
   const visible = ref(false)
-  const activeKey = ref(2)
+  const activeKey = ref(1)
   const appId = ref('')
 
   /**
@@ -37,11 +38,11 @@
    * @param appid
    */
   function init(appid: string) {
+    activeKey.value = 1
     visible.value = true
     appId.value = appid
   }
 
-
   defineExpose({ init })
 </script>
 
diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts b/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
index e69de29b..a3d346b8 100644
--- a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
+++ b/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
@@ -0,0 +1,37 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+
+/**
+ * 保存
+ */
+export function saveConfig(data: AllocConfig) {
+  return defHttp.post<Result<void>>({ url: '/allocation/config/save', data })
+}
+
+/**
+ * 更新
+ */
+export function updateConfig(data: AllocConfig) {
+  return defHttp.post<Result<void>>({ url: '/allocation/config/update', data })
+}
+
+/**
+ * 根据应用ID查询
+ */
+export function getConfig(appId) {
+  return defHttp.get<Result<AllocConfig>>({
+    url: '/allocation/config/findByAppId',
+    params: { appId },
+  })
+}
+
+/**
+ * 分账配置参数
+ */
+export interface AllocConfig extends MchEntity {
+  /** 是否自动分账 */
+  autoAlloc?: boolean
+  /** 大于多少开启分账 */
+  minAmount?: number
+}
diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.vue b/src/views/daxpay/common/allocation/config/AllocationConfig.vue
index 0a8d203d..baddb0e6 100644
--- a/src/views/daxpay/common/allocation/config/AllocationConfig.vue
+++ b/src/views/daxpay/common/allocation/config/AllocationConfig.vue
@@ -1,11 +1,124 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-form
+      class="small-from-item"
+      :model="form"
+      ref="formRef"
+      :validate-trigger="['blur', 'change']"
+      :rules="rules"
+      :label-col="labelCol"
+      :wrapper-col="wrapperCol"
+    >
+      <a-form-item label="主键" name="id" :hidden="true">
+        <a-input v-model:value="form.id" :disabled="showable" />
+      </a-form-item>
+      <a-form-item label="自动分账" name="autoAlloc">
+        <template #label>
+          <basic-title
+            helpMessage="开启自动分账后，如果创建订单时设置为了自动分账，将会对订单自动分账"
+          >
+            开启自动分账
+          </basic-title>
+        </template>
+        <a-radio-group v-model:value="form.autoAlloc" :disabled="!edit" button-style="solid">
+          <a-radio-button :value="false">关闭</a-radio-button>
+          <a-radio-button :value="true">开启</a-radio-button>
+        </a-radio-group>
+      </a-form-item>
+      <a-form-item name="minAmount">
+        <template #label>
+          <basic-title helpMessage="只有大于或等于其实金额的订单才会进行分账">
+            自动分账起始金额(元)
+          </basic-title>
+        </template>
+        <a-input-number
+          v-model:value="form.minAmount"
+          class="w-300px"
+          :min="0.1"
+          :max="9999999"
+          :disabled="!edit"
+          placeholder="请输自动分账起始金额(元)"
+        />
+      </a-form-item>
+    </a-form>
+    <a-space :size="55" class="flex justify-center">
+      <a-button v-if="edit" @click="initData">取消</a-button>
+      <a-button v-if="edit" type="primary" @click="update">{{
+        form.id ? '更新' : '保存'
+      }}</a-button>
+      <a-button v-if="!edit" @click="edit = true">编辑信息</a-button>
+    </a-space>
+  </a-spin>
+</template>
+
 <script setup lang="ts">
+  import useFormEdit from '@/hooks/bootx/useFormEdit'
+  import { onMounted, ref } from 'vue'
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+  import { saveConfig, getConfig, updateConfig, AllocConfig } from './AllocationConfig.api'
+  import { useMessage } from '@/hooks/web/useMessage'
+  import BasicTitle from '@/components/Basic/src/BasicTitle.vue'
 
-</script>
+  const { labelCol, wrapperCol, confirmLoading, showable } = useFormEdit()
+  const { createMessage } = useMessage()
 
-<template>
+  const edit = ref<boolean>(false)
 
-</template>
+  const props = defineProps({
+    appId: String,
+  })
+
+  onMounted(() => {
+    initData()
+  })
+  // 表单
+  const formRef = ref<FormInstance>()
+  const form = ref<AllocConfig>({
+    autoAlloc: false,
+    minAmount: 1.0,
+  })
+
+  const rules = {
+    autoAlloc: [{ required: true, message: '' }],
+    minAmount: [{ required: true, message: '请输自动分账起始金额(元)' }],
+  } as Record<string, Rule[]>
 
-<style scoped lang="less">
+  /**
+   * 重置信息
+   */
+  function initData() {
+    confirmLoading.value = true
+    edit.value = false
+    getConfig(props.appId).then(({ data }) => {
+      form.value = data
+      confirmLoading.value = false
+      form.value.appId = props.appId
+    })
+  }
+
+  /**
+   * 更新配置
+   */
+  function update() {
+    formRef.value?.validate().then(async () => {
+      confirmLoading.value = true
+      if (form.value.id) {
+        updateConfig(form.value)
+          .then(() => {
+            edit.value = false
+            createMessage.success('更新成功')
+          })
+          .finally(() => (confirmLoading.value = false))
+      } else {
+        saveConfig(form.value)
+          .then(() => {
+            createMessage.success('保存成功')
+            initData()
+          })
+          .finally(() => (confirmLoading.value = false))
+      }
+    })
+  }
+</script>
 
-</style>
+<style scoped lang="less"></style>
-- 
Gitee


From e59bd34ba4731b90e103f08da931780d26a59711 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Tue, 10 Dec 2024 20:52:56 +0800
Subject: [PATCH 16/25] =?UTF-8?q?refactor(allocation):=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E5=88=86=E8=B4=A6=E6=A8=A1=E5=9D=97,=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=88=86=E8=B4=A6=E6=8E=A5=E6=94=B6=E6=96=B9=E5=92=8C?=
 =?UTF-8?q?=E5=88=86=E8=B4=A6=E7=BB=84=E6=93=8D=E4=BD=9C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocation/group/AllocationGroup.api.ts   |  6 ++-
 .../group/AllocationGroupConfig.vue           |  4 +-
 .../allocation/group/AllocationGroupEdit.vue  | 28 ++------------
 .../group/AllocationGroupSelect.vue           |  2 +
 .../AllocDetailList.vue                       |  8 ++--
 .../AllocOrderInfo.vue}                       |  0
 .../AllocOrderList.vue}                       | 12 +++---
 .../{transaction => order}/Allocation.api.ts  | 38 +++++++++----------
 .../receiver/AllocationReceiver.api.ts        | 26 ++-----------
 .../receiver/AllocationReceiverEdit.vue       | 38 +++++--------------
 .../receiver/AllocationReceiverList.vue       | 11 +++++-
 11 files changed, 64 insertions(+), 109 deletions(-)
 rename src/views/daxpay/common/allocation/{transaction => order}/AllocDetailList.vue (95%)
 rename src/views/daxpay/common/allocation/{transaction/AllocTransactionInfo.vue => order/AllocOrderInfo.vue} (100%)
 rename src/views/daxpay/common/allocation/{transaction/AllocTransactionList.vue => order/AllocOrderList.vue} (95%)
 rename src/views/daxpay/common/allocation/{transaction => order}/Allocation.api.ts (71%)

diff --git a/src/views/daxpay/common/allocation/group/AllocationGroup.api.ts b/src/views/daxpay/common/allocation/group/AllocationGroup.api.ts
index e8b49e2f..e1474db3 100644
--- a/src/views/daxpay/common/allocation/group/AllocationGroup.api.ts
+++ b/src/views/daxpay/common/allocation/group/AllocationGroup.api.ts
@@ -1,6 +1,6 @@
 import { defHttp } from '@/utils/http/axios'
 import { PageResult, Result } from '#/axios'
-import { BaseEntity, MchEntity } from "#/web";
+import { BaseEntity, MchEntity } from '#/web'
 
 /**
  * 分页查询
@@ -170,6 +170,10 @@ export interface AllocGroupReceiver extends BaseEntity {
    * 分账接收方ID
    */
   receiverId?: string
+  /**
+   * 名称
+   */
+  name?: string
   /**
    * 分账比例
    */
diff --git a/src/views/daxpay/common/allocation/group/AllocationGroupConfig.vue b/src/views/daxpay/common/allocation/group/AllocationGroupConfig.vue
index 56976f57..b22d2a32 100644
--- a/src/views/daxpay/common/allocation/group/AllocationGroupConfig.vue
+++ b/src/views/daxpay/common/allocation/group/AllocationGroupConfig.vue
@@ -26,7 +26,9 @@
       @edit-closed="editClosedEvent"
     >
       <vxe-column type="seq" width="60" />
-      <vxe-column field="receiverType" title="接收方类型" :min-width="100">
+      <vxe-column field="receiverNo" title="编号" :min-width="180" />
+      <vxe-column field="name" title="接收方名称" :min-width="100" />
+      <vxe-column field="receiverType" title="接收方类型" :min-width="120">
         <template #default="{ row }">
           <a-tag>{{ dictConvert('alloc_receiver_type', row.receiverType) }}</a-tag>
         </template>
diff --git a/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue b/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue
index 67343e23..09d31206 100644
--- a/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue
+++ b/src/views/daxpay/common/allocation/group/AllocationGroupEdit.vue
@@ -21,13 +21,6 @@
         <a-form-item label="主键" name="id" :hidden="true">
           <a-input v-model:value="form.id" :disabled="showable" />
         </a-form-item>
-        <a-form-item label="分账组编号" name="groupNo">
-          <a-input
-            v-model:value="form.groupNo"
-            :disabled="!addable"
-            placeholder="请输入分账组编号"
-          />
-        </a-form-item>
         <a-form-item label="所属通道" name="channel">
           <a-select
             style="width: 100%"
@@ -67,9 +60,9 @@
 
 <script setup lang="ts">
   import useFormEdit from '@/hooks/bootx/useFormEdit'
-  import { computed, nextTick, ref, unref } from "vue";
+  import { computed, nextTick, ref, unref } from 'vue'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
-  import { get, add, update, AllocGroup, existsByNo } from './AllocationGroup.api'
+  import { get, add, update, AllocGroup } from './AllocationGroup.api'
   import { FormEditType } from '@/enums/formTypeEnum'
   import { BasicModal } from '@/components/Modal'
   import { LabeledValue } from 'ant-design-vue/lib/select'
@@ -97,10 +90,7 @@
   // 校验
   const rules = computed(() => {
     return {
-      groupNo: [
-        { required: true, message: '请输入分账组编号' },
-        { trigger: 'blur', validator: validateCode },
-      ],
+      groupNo: [{ required: true, message: '请输入分账组编号' }],
       channel: [{ required: true, message: '请选择所属通道' }],
     } as Record<string, Rule[]>
   })
@@ -156,18 +146,6 @@
     })
   }
 
-  /**
-   * 校验编码重复
-   */
-  async function validateCode() {
-    const { groupNo, appId } = form.value
-    if (!addable.value) {
-      return Promise.resolve()
-    }
-    const res = await existsByNo(groupNo, appId)
-    return res.data ? Promise.reject('该分账组编号已经存在') : Promise.resolve()
-  }
-
   /**
    * 重置表单
    */
diff --git a/src/views/daxpay/common/allocation/group/AllocationGroupSelect.vue b/src/views/daxpay/common/allocation/group/AllocationGroupSelect.vue
index 39f4a476..e5ff0d62 100644
--- a/src/views/daxpay/common/allocation/group/AllocationGroupSelect.vue
+++ b/src/views/daxpay/common/allocation/group/AllocationGroupSelect.vue
@@ -28,6 +28,7 @@
     >
       <vxe-column type="checkbox" width="50" />
       <vxe-column field="receiverNo" title="接收方编号" :min-width="160" />
+      <vxe-column field="name" title="接收方名称" :min-width="100" />
       <vxe-column field="receiverType" title="分账接收方类型" :min-width="100">
         <template #default="{ row }">
           <a-tag>{{ dictConvert('alloc_receiver_type', row.receiverType) }}</a-tag>
@@ -86,6 +87,7 @@
   const fields = computed(() => {
     return [
       { field: 'receiverNo', type: STRING, name: '接收方编号', placeholder: '请输入接收方编号' },
+      { field: 'name', type: STRING, name: '接收方名称', placeholder: '请输入接收方名称' },
       {
         field: 'relationType',
         type: LIST,
diff --git a/src/views/daxpay/common/allocation/transaction/AllocDetailList.vue b/src/views/daxpay/common/allocation/order/AllocDetailList.vue
similarity index 95%
rename from src/views/daxpay/common/allocation/transaction/AllocDetailList.vue
rename to src/views/daxpay/common/allocation/order/AllocDetailList.vue
index c72283cf..1120a6ae 100644
--- a/src/views/daxpay/common/allocation/transaction/AllocDetailList.vue
+++ b/src/views/daxpay/common/allocation/order/AllocDetailList.vue
@@ -4,7 +4,7 @@
     v-bind="$attrs"
     title="分账订单明细"
     width="60%"
-    :visible="visible"
+    :open="visible"
     @close="visible = false"
   >
     <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
@@ -55,14 +55,14 @@
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import BasicDrawer from '@/components/Drawer/src/BasicDrawer.vue'
   import { useDict } from '@/hooks/bootx/useDict'
-  import { AllocationOrder, AllocationOrderDetail, detailList } from './Allocation.api'
+  import { AllocOrder, AllocDetail, detailList } from './Allocation.api'
   // 使用hooks
   const { loading } = useTablePage(queryPage)
   const { dictConvert } = useDict()
 
   let visible = ref(false)
-  let order = ref<AllocationOrder>({})
-  let records = ref<AllocationOrderDetail[]>([])
+  let order = ref<AllocOrder>({})
+  let records = ref<AllocDetail[]>([])
   const xTable = ref<VxeTableInstance>()
   const xToolbar = ref<VxeToolbarInstance>()
   const allocationOrderDetailInfo = ref<any>()
diff --git a/src/views/daxpay/common/allocation/transaction/AllocTransactionInfo.vue b/src/views/daxpay/common/allocation/order/AllocOrderInfo.vue
similarity index 100%
rename from src/views/daxpay/common/allocation/transaction/AllocTransactionInfo.vue
rename to src/views/daxpay/common/allocation/order/AllocOrderInfo.vue
diff --git a/src/views/daxpay/common/allocation/transaction/AllocTransactionList.vue b/src/views/daxpay/common/allocation/order/AllocOrderList.vue
similarity index 95%
rename from src/views/daxpay/common/allocation/transaction/AllocTransactionList.vue
rename to src/views/daxpay/common/allocation/order/AllocOrderList.vue
index 9c4adeff..83a4ade4 100644
--- a/src/views/daxpay/common/allocation/transaction/AllocTransactionList.vue
+++ b/src/views/daxpay/common/allocation/order/AllocOrderList.vue
@@ -36,9 +36,9 @@
           </template>
         </vxe-column>
 
-        <vxe-column field="channel" title="所属通道" :min-width="100">
+        <vxe-column field="channel" title="所属通道" align="center" :min-width="150">
           <template #default="{ row }">
-            <a-tag>{{ dictConvert('PayChannel', row.channel) }}</a-tag>
+            <a-tag>{{ dictConvert('channel', row.channel) }}</a-tag>
           </template>
         </vxe-column>
         <vxe-column field="amount" title="总分账金额(元)" :min-width="120">
@@ -48,12 +48,12 @@
         </vxe-column>
         <vxe-column field="status" title="状态" :min-width="120">
           <template #default="{ row }">
-            <a-tag>{{ dictConvert('AllocOrderStatus', row.status) }}</a-tag>
+            <a-tag>{{ dictConvert('allocation_status', row.status) }}</a-tag>
           </template>
         </vxe-column>
         <vxe-column field="result" title="分账结果" :min-width="100">
           <template #default="{ row }">
-            {{ dictConvert('AllocOrderResult', row.result) }}
+            {{ dictConvert('allocation_result', row.result) }}
           </template> </vxe-column
         ><vxe-column field="errorMsg" title="错误原因" :min-width="160" />
         <vxe-column field="createTime" title="创建时间" :min-width="160" />
@@ -139,7 +139,7 @@
   const allocDetailList = ref<any>()
   const allocationOrderInfo = ref<any>()
 
-  let payChannelList = ref<LabeledValue[]>([])
+  let channelList = ref<LabeledValue[]>([])
   const payOrderInfo = ref<any>()
 
   const fields = computed(() => {
@@ -149,7 +149,7 @@
         type: LIST,
         name: '分账通道',
         placeholder: '请选择分账通道',
-        selectList: payChannelList.value,
+        selectList: channelList.value,
       },
       { field: 'orderNo', type: STRING, name: '分账订单号', placeholder: '请输入分账订单号' },
       { field: 'paymentId', type: STRING, name: '支付订单ID', placeholder: '请输入支付订单ID' },
diff --git a/src/views/daxpay/common/allocation/transaction/Allocation.api.ts b/src/views/daxpay/common/allocation/order/Allocation.api.ts
similarity index 71%
rename from src/views/daxpay/common/allocation/transaction/Allocation.api.ts
rename to src/views/daxpay/common/allocation/order/Allocation.api.ts
index 04309527..41c1e5dd 100644
--- a/src/views/daxpay/common/allocation/transaction/Allocation.api.ts
+++ b/src/views/daxpay/common/allocation/order/Allocation.api.ts
@@ -6,8 +6,8 @@ import { MchEntity } from '#/web'
  * 分页
  */
 export function page(params) {
-  return defHttp.get<Result<PageResult<AllocationOrder>>>({
-    url: '/allocation/transaction/page',
+  return defHttp.get<Result<PageResult<AllocOrder>>>({
+    url: '/allocation/order/page',
     params,
   })
 }
@@ -16,8 +16,8 @@ export function page(params) {
  * 查询详情
  */
 export function get(id) {
-  return defHttp.get<Result<AllocationOrder>>({
-    url: '/allocation/transaction/findById',
+  return defHttp.get<Result<AllocOrder>>({
+    url: '/allocation/order/findById',
     params: { id },
   })
 }
@@ -27,7 +27,7 @@ export function get(id) {
  */
 export function getOrderByAllocNo(allocNo: string) {
   return defHttp.get<Result>({
-    url: '/allocation/transaction/findByAllocNo',
+    url: '/allocation/order/findByAllocNo',
     params: { allocNo },
   })
 }
@@ -36,8 +36,8 @@ export function getOrderByAllocNo(allocNo: string) {
  * 扩展信息
  */
 export function getExtra(id) {
-  return defHttp.get<Result<AllocationOrder>>({
-    url: '/allocation/transaction/findById',
+  return defHttp.get<Result<AllocOrder>>({
+    url: '/allocation/order/findById',
     params: { id },
   })
 }
@@ -46,8 +46,8 @@ export function getExtra(id) {
  * 明细列表
  */
 export function detailList(orderId) {
-  return defHttp.get<Result<AllocationOrderDetail[]>>({
-    url: '/allocation/transaction/detail/findAll',
+  return defHttp.get<Result<AllocDetail[]>>({
+    url: '/allocation/order/detail/findAll',
     params: { orderId },
   })
 }
@@ -56,8 +56,8 @@ export function detailList(orderId) {
  * 明细详情
  */
 export function detail(id) {
-  return defHttp.get<Result<AllocationOrderDetail>>({
-    url: '/allocation/transaction/detail/findById',
+  return defHttp.get<Result<AllocDetail>>({
+    url: '/allocation/order/detail/findById',
     params: { id },
   })
 }
@@ -66,8 +66,8 @@ export function detail(id) {
  * 分账完结
  */
 export function finish(allocNo) {
-  return defHttp.post<Result<AllocationOrder>>({
-    url: '/allocation/transaction/finish',
+  return defHttp.post<Result<AllocOrder>>({
+    url: '/allocation/order/finish',
     params: { allocNo },
   })
 }
@@ -76,8 +76,8 @@ export function finish(allocNo) {
  * 分账完结
  */
 export function retry(bizAllocNo) {
-  return defHttp.post<Result<AllocationOrder>>({
-    url: '/allocation/transaction/retry',
+  return defHttp.post<Result<AllocOrder>>({
+    url: '/allocation/order/retry',
     params: { bizAllocNo },
   })
 }
@@ -86,8 +86,8 @@ export function retry(bizAllocNo) {
  * 查询分账结果
  */
 export function sync(allocNo) {
-  return defHttp.post<Result<AllocationOrder>>({
-    url: '/allocation/transaction/sync',
+  return defHttp.post<Result<AllocOrder>>({
+    url: '/allocation/order/sync',
     params: { allocNo },
   })
 }
@@ -95,7 +95,7 @@ export function sync(allocNo) {
 /**
  * 分账订单
  */
-export interface AllocationOrder extends MchEntity {
+export interface AllocOrder extends MchEntity {
   // 分账单号
   allocNo?: string
   // 商户分账单号
@@ -143,7 +143,7 @@ export interface AllocationOrder extends MchEntity {
 /**
  * 分账订单明细
  */
-export interface AllocationOrderDetail extends MchEntity {
+export interface AllocDetail extends MchEntity {
   // 分账订单ID
   orderId?: string
   // 分账明细单号
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts b/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts
index 835a964a..c7de79f5 100644
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts
+++ b/src/views/daxpay/common/allocation/receiver/AllocationReceiver.api.ts
@@ -52,33 +52,13 @@ export function add(data: AllocReceiver) {
   })
 }
 
-/**
- * 编码是否存在
- */
-export function existsByNo(receiverNo, appId) {
-  return defHttp.get<Result<boolean>>({
-    url: '/allocation/receiver/existsByReceiverNo',
-    params: { receiverNo, appId },
-  })
-}
-
-/**
- * 修改
- */
-export function update(data: AllocReceiver) {
-  return defHttp.post<Result<void>>({
-    url: '/allocation/receiver/update',
-    data,
-  })
-}
-
 /**
  * 删除
  */
-export function del(receiverNo, appId) {
+export function del(data) {
   return defHttp.post<Result<void>>({
     url: '/allocation/receiver/delete',
-    data: { receiverNo, appId },
+    data,
   })
 }
 
@@ -88,6 +68,8 @@ export function del(receiverNo, appId) {
 export interface AllocReceiver extends MchEntity {
   // 分账接收方编号
   receiverNo?: string
+  // 名称
+  name?: string
   // 所属通道
   channel?: string
   // 分账接收方类型
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue b/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
index 98bf3d2a..cabd95d0 100644
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
+++ b/src/views/daxpay/common/allocation/receiver/AllocationReceiverEdit.vue
@@ -21,12 +21,11 @@
         <a-form-item label="主键" name="id" :hidden="true">
           <a-input v-model:value="form.id" :disabled="showable" />
         </a-form-item>
-        <a-form-item label="接收方编号" validate-first name="receiverNo">
-          <a-input
-            v-model:value="form.receiverNo"
-            :disabled="!addable"
-            placeholder="请输入接收方编号"
-          />
+        <a-form-item v-if="showable" label="接收方编号" name="receiverNo">
+          <a-input v-model:value="form.receiverNo" disabled/>
+        </a-form-item>
+        <a-form-item label="名称" name="name">
+          <a-input v-model:value="form.name" :disabled="!addable" placeholder="请输入名称" />
         </a-form-item>
         <a-form-item label="所属通道" name="channel">
           <a-select
@@ -100,23 +99,21 @@
         >
       </a-space>
     </template>
-    <open-id-qr-code ref="openIdQrCode" @close="pauseFun" />
+    <OpenIdQrCode ref="openIdQrCode" @close="pauseFun" />
   </basic-modal>
 </template>
 
 <script setup lang="ts">
   import useFormEdit from '@/hooks/bootx/useFormEdit'
   import { useMessage } from '@/hooks/web/useMessage'
-  import { computed, nextTick, ref, unref } from "vue";
+  import { computed, nextTick, ref, unref } from 'vue'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import {
     add,
     get,
     AllocReceiver,
-    update,
     findChannels,
     findReceiverTypeByChannel,
-    existsByNo,
   } from './AllocationReceiver.api'
   import { FormEditType } from '@/enums/formTypeEnum'
   import { BasicModal } from '@/components/Modal'
@@ -129,7 +126,6 @@
   const {
     initFormEditType,
     handleCancel,
-    diffForm,
     labelCol,
     wrapperCol,
     title,
@@ -156,10 +152,6 @@
   // 校验
   const rules = computed(() => {
     return {
-      receiverNo: [
-        { required: true, message: '请输入账号编号' },
-        { trigger: 'blur', validator: validateCode },
-      ],
       channel: [{ required: true, message: '请选择所属通道' }],
       receiverType: [{ required: true, message: '请选择分账接收方类型' }],
       receiverAccount: [{ required: true, message: '请输入接收方账号' }],
@@ -227,14 +219,11 @@
     formRef.value?.validate().then(async () => {
       confirmLoading.value = true
       try {
+        form.value.receiverNo = 'none'
         form.value.reqTime = XEUtils.toDateString(new Date(), 'yyyy-MM-dd HH:mm:ss')
         if (formEditType.value === FormEditType.Add) {
           await add(form.value)
-        } else if (formEditType.value === FormEditType.Edit) {
-          await update({
-            ...form.value,
-            ...diffForm(rawForm.value, form.value, 'receiverAccount', 'receiverName'),
-          })
+          createMessage.success('新增成功')
         }
       } finally {
         confirmLoading.value = false
@@ -249,15 +238,6 @@
    */
   function showQrCode() {}
 
-  /**
-   * 校验编码重复
-   */
-  async function validateCode() {
-    const { receiverNo, appId } = form.value
-    const res = await existsByNo(receiverNo, appId)
-    return res.data ? Promise.reject('该接收方编号已经存在') : Promise.resolve()
-  }
-
   /**
    * 重置表单
    */
diff --git a/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue b/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
index 071596fc..a3de1640 100644
--- a/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
+++ b/src/views/daxpay/common/allocation/receiver/AllocationReceiverList.vue
@@ -30,11 +30,12 @@
           @sort-change="sortChange"
         >
           <vxe-column type="seq" title="序号" width="60" />
-          <vxe-column field="receiverNo" title="接收方编号" :min-width="180">
+          <vxe-column field="receiverNo" title="编号" :min-width="180">
             <template #default="{ row }">
               <a-link @click="show(row)">{{ row.receiverNo }}</a-link>
             </template>
           </vxe-column>
+          <vxe-column field="name" title="名称" :min-width="180" />
           <vxe-column field="channel" title="所属通道" :min-width="150" align="center">
             <template #default="{ row }">
               <a-tag>{{ dictConvert('channel', row.channel) }}</a-tag>
@@ -87,6 +88,7 @@
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import AllocationReceiverEdit from './AllocationReceiverEdit.vue'
   import { FormEditType } from '@/enums/formTypeEnum'
+  import XEUtils from 'xe-utils'
 
   const props = defineProps({
     appId: String,
@@ -203,7 +205,12 @@
       content: '是否确认删除该条数据?',
       onOk: () => {
         loading.value = true
-        del(record.receiverNo, record.appId).then(() => {
+        const form = {
+          receiverNo: record.receiverNo,
+          appId: record.appId,
+          reqTime: XEUtils.toDateString(new Date(), 'yyyy-MM-dd HH:mm:ss'),
+        }
+        del(form).then(() => {
           createMessage.success('删除成功')
           queryPage()
         })
-- 
Gitee


From 8ed4700d6b432d474f3f91a0a337d045c8c33a8d Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Wed, 11 Dec 2024 18:14:32 +0800
Subject: [PATCH 17/25] =?UTF-8?q?refactor(daxpay):=20=E5=88=86=E8=B4=A6?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocation/order/AllocDetailList.vue      |  2 +-
 .../allocation/order/AllocOrderInfo.vue       | 76 +++++++++++++++++--
 .../allocation/order/AllocOrderList.vue       |  8 +-
 ...location.api.ts => AllocationOrder.api.ts} |  4 +-
 4 files changed, 77 insertions(+), 13 deletions(-)
 rename src/views/daxpay/common/allocation/order/{Allocation.api.ts => AllocationOrder.api.ts} (98%)

diff --git a/src/views/daxpay/common/allocation/order/AllocDetailList.vue b/src/views/daxpay/common/allocation/order/AllocDetailList.vue
index 1120a6ae..2a5bbe44 100644
--- a/src/views/daxpay/common/allocation/order/AllocDetailList.vue
+++ b/src/views/daxpay/common/allocation/order/AllocDetailList.vue
@@ -55,7 +55,7 @@
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import BasicDrawer from '@/components/Drawer/src/BasicDrawer.vue'
   import { useDict } from '@/hooks/bootx/useDict'
-  import { AllocOrder, AllocDetail, detailList } from './Allocation.api'
+  import { AllocOrder, AllocDetail, detailList } from './AllocationOrder.api'
   // 使用hooks
   const { loading } = useTablePage(queryPage)
   const { dictConvert } = useDict()
diff --git a/src/views/daxpay/common/allocation/order/AllocOrderInfo.vue b/src/views/daxpay/common/allocation/order/AllocOrderInfo.vue
index 0a8d203d..e2b5b721 100644
--- a/src/views/daxpay/common/allocation/order/AllocOrderInfo.vue
+++ b/src/views/daxpay/common/allocation/order/AllocOrderInfo.vue
@@ -1,11 +1,73 @@
-<script setup lang="ts">
-
-</script>
-
 <template>
-
+  <basic-modal
+    title="查看分账单信息"
+    v-bind="$attrs"
+    :loading="confirmLoading"
+    :width="1000"
+    :open="visible"
+    :mask-closable="showable"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-descriptions title="" bordered :column="{ md: 2, sm: 1, xs: 1 }">
+        <a-descriptions-item label="接收方编号">
+          {{ order.receiverNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="接收方姓名">
+          {{ order.receiverName }}
+        </a-descriptions-item>
+        <a-descriptions-item label="分账接收方类型">
+          <a-tag>{{ dictConvert('allocation_status', order.receiverType) }}</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item label="分账比例"> {{ order.rate }}% </a-descriptions-item>
+        <a-descriptions-item label="分账金额(元)"> {{ order.amount }} </a-descriptions-item>
+        <a-descriptions-item label="分账结果">
+          <a-tag>{{ dictConvert('allocation_result', order.result) }}</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item label="完成时间">
+          {{ order.finishTime }}
+        </a-descriptions-item>
+        <a-descriptions-item label="错误代码" v-if="order.errorCode">
+          {{ order.errorCode }}
+        </a-descriptions-item>
+        <a-descriptions-item label="错误原因" v-if="order.errorMsg">
+          {{ order.errorMsg }}
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-spin>
+    <template #footer>
+      <a-space>
+        <a-button key="cancel" @click="handleCancel">取消</a-button>
+      </a-space>
+    </template>
+  </basic-modal>
 </template>
 
-<style scoped lang="less">
+<script lang="ts" setup>
+  import useFormEdit from '@/hooks/bootx/useFormEdit'
+  import { AllocDetail, get } from './AllocationOrder.api'
+  import { BasicModal } from '@/components/Modal'
+  import { useDict } from '@/hooks/bootx/useDict'
+  import { ref } from 'vue'
+
+  const { handleCancel, confirmLoading, visible, showable } = useFormEdit()
+  const { dictConvert } = useDict()
+
+  let order = ref<AllocDetail>({})
+  // 入口
+  async function init(record: AllocDetail) {
+    visible.value = true
+    order.value = record
+    confirmLoading.value = true
+    await get(record.id).then(({ data }) => {
+      order.value = data
+    })
+    confirmLoading.value = false
+  }
+  // 获取信息
+  defineExpose({
+    init,
+  })
+</script>
 
-</style>
+<style lang="less" scoped></style>
diff --git a/src/views/daxpay/common/allocation/order/AllocOrderList.vue b/src/views/daxpay/common/allocation/order/AllocOrderList.vue
index 83a4ade4..890b4313 100644
--- a/src/views/daxpay/common/allocation/order/AllocOrderList.vue
+++ b/src/views/daxpay/common/allocation/order/AllocOrderList.vue
@@ -101,12 +101,13 @@
       />
     </div>
     <AllocDetailList ref="allocDetailList" />
+    <AllocOrderInfo ref="allocOrderInfo" />
   </div>
 </template>
 
 <script setup lang="ts">
   import { computed, onMounted, ref } from 'vue'
-  import { page, sync, finish, retry } from './Allocation.api'
+  import { page, sync, finish, retry } from './AllocationOrder.api'
   import useTablePage from '@/hooks/bootx/useTablePage'
   import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
   import { useMessage } from '@/hooks/web/useMessage'
@@ -118,6 +119,7 @@
   import { FormEditType } from '@/enums/formTypeEnum'
   import AllocDetailList from './AllocDetailList.vue'
   import { Icon } from '@/components/Icon'
+  import AllocOrderInfo from "./AllocOrderInfo.vue";
 
   // 使用hooks
   const {
@@ -137,7 +139,7 @@
   const xTable = ref<VxeTableInstance>()
   const xToolbar = ref<VxeToolbarInstance>()
   const allocDetailList = ref<any>()
-  const allocationOrderInfo = ref<any>()
+  const allocOrderInfo = ref<any>()
 
   let channelList = ref<LabeledValue[]>([])
   const payOrderInfo = ref<any>()
@@ -181,7 +183,7 @@
    * 查看
    */
   function show(record) {
-    allocationOrderInfo.value.init(record.allocNo, FormEditType.Show)
+    allocOrderInfo.value.init(record)
   }
 
   /**
diff --git a/src/views/daxpay/common/allocation/order/Allocation.api.ts b/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
similarity index 98%
rename from src/views/daxpay/common/allocation/order/Allocation.api.ts
rename to src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
index 41c1e5dd..8978b1e2 100644
--- a/src/views/daxpay/common/allocation/order/Allocation.api.ts
+++ b/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
@@ -149,9 +149,9 @@ export interface AllocDetail extends MchEntity {
   // 分账明细单号
   receiverId?: string
   // 比例
-  rate: number
+  rate?: number
   // 金额
-  amount: number
+  amount?: number
   // 分账接收方类型
   receiverType?: string
   // 接收方账号
-- 
Gitee


From 81e308396275b5ec6128cd650766529bb3c03fc2 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Wed, 11 Dec 2024 23:16:41 +0800
Subject: [PATCH 18/25] =?UTF-8?q?feat:=20=E5=88=86=E8=B4=A6=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocation/order/AllocDetailInfo.vue      | 76 +++++++++++++++++++
 .../allocation/order/AllocDetailList.vue      | 15 ++--
 .../allocation/order/AllocOrderInfo.vue       | 36 ++++++---
 .../allocation/order/AllocOrderList.vue       |  3 +-
 .../allocation/order/AllocationOrder.api.ts   |  8 +-
 5 files changed, 117 insertions(+), 21 deletions(-)
 create mode 100644 src/views/daxpay/common/allocation/order/AllocDetailInfo.vue

diff --git a/src/views/daxpay/common/allocation/order/AllocDetailInfo.vue b/src/views/daxpay/common/allocation/order/AllocDetailInfo.vue
new file mode 100644
index 00000000..bcb44a2f
--- /dev/null
+++ b/src/views/daxpay/common/allocation/order/AllocDetailInfo.vue
@@ -0,0 +1,76 @@
+<template>
+  <basic-modal
+    title="查看分账单信息"
+    v-bind="$attrs"
+    :loading="confirmLoading"
+    :width="1000"
+    :open="visible"
+    :mask-closable="showable"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-descriptions title="" bordered :column="{ md: 2, sm: 1, xs: 1 }">
+        <a-descriptions-item label="接收方编号">
+          {{ order.receiverNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="接收方名称">
+          {{ order.name }}
+        </a-descriptions-item>
+        <a-descriptions-item label="接收方姓名">
+          {{ order.receiverName }}
+        </a-descriptions-item>
+        <a-descriptions-item label="分账接收方类型">
+          <a-tag>{{ dictConvert('alloc_receiver_type', order.receiverType) }}</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item label="分账比例"> {{ order.rate }}% </a-descriptions-item>
+        <a-descriptions-item label="分账金额(元)"> {{ order.amount }} </a-descriptions-item>
+        <a-descriptions-item label="分账结果">
+          <a-tag>{{ dictConvert('alloc_detail_result', order.result) }}</a-tag>
+        </a-descriptions-item>
+        <a-descriptions-item label="完成时间">
+          {{ order.finishTime }}
+        </a-descriptions-item>
+        <a-descriptions-item label="错误代码" v-if="order.errorCode">
+          {{ order.errorCode }}
+        </a-descriptions-item>
+        <a-descriptions-item label="错误原因" v-if="order.errorMsg">
+          {{ order.errorMsg }}
+        </a-descriptions-item>
+      </a-descriptions>
+    </a-spin>
+    <template #footer>
+      <a-space>
+        <a-button key="cancel" @click="handleCancel">取消</a-button>
+      </a-space>
+    </template>
+  </basic-modal>
+</template>
+
+<script lang="ts" setup>
+  import useFormEdit from '@/hooks/bootx/useFormEdit'
+  import { AllocDetail, detail } from './AllocationOrder.api'
+  import { BasicModal } from '@/components/Modal'
+  import { useDict } from '@/hooks/bootx/useDict'
+  import { ref } from 'vue'
+
+  const { handleCancel, confirmLoading, visible, showable } = useFormEdit()
+  const { dictConvert } = useDict()
+
+  let order = ref<AllocDetail>({})
+  // 入口
+  async function init(record: AllocDetail) {
+    visible.value = true
+    order.value = record
+    confirmLoading.value = true
+    await detail(record.id).then(({ data }) => {
+      order.value = data
+    })
+    confirmLoading.value = false
+  }
+  // 获取信息
+  defineExpose({
+    init,
+  })
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/daxpay/common/allocation/order/AllocDetailList.vue b/src/views/daxpay/common/allocation/order/AllocDetailList.vue
index 2a5bbe44..4e1c6596 100644
--- a/src/views/daxpay/common/allocation/order/AllocDetailList.vue
+++ b/src/views/daxpay/common/allocation/order/AllocDetailList.vue
@@ -17,20 +17,21 @@
     >
       <vxe-column type="seq" width="60" />
       <vxe-column field="receiverNo" title="接收方编号" :min-width="120" />
+      <vxe-column field="name" title="接收方名称" :min-width="120" />
       <vxe-column field="receiverName" title="接收方姓名" :min-width="100" />
       <vxe-column field="receiverType" title="接收方类型" :min-width="100">
         <template #default="{ row }">
-          {{ dictConvert('AllocReceiverType', row.receiverType) }}
+          {{ dictConvert('alloc_receiver_type', row.receiverType) }}
         </template>
       </vxe-column>
       <vxe-column field="rate" title="分账比例" :min-width="100">
-        <template #default="{ row }"> {{ row.rate / 100.0 }}% </template>
+        <template #default="{ row }"> {{ row.rate }}% </template>
       </vxe-column>
       <vxe-column field="amount" title="分账金额" :min-width="100">
-        <template #default="{ row }"> {{ row.amount / 100.0 }} 元 </template>
+        <template #default="{ row }"> {{ row.amount }} 元 </template>
       </vxe-column>
       <vxe-column field="result" title="分账结果" :min-width="130">
-        <template #default="{ row }"> {{ dictConvert('AllocDetailResult', row.result) }} </template>
+        <template #default="{ row }"> {{ dictConvert('alloc_detail_result', row.result) }} </template>
       </vxe-column>
       <vxe-column field="errorMsg" title="错误原因" :min-width="160">
         <template #default="{ row }"> {{ row.errorMsg }} </template>
@@ -46,6 +47,7 @@
         </template>
       </vxe-column>
     </vxe-table>
+    <alloc-detail-info ref="allocDetailInfo" />
   </basic-drawer>
 </template>
 
@@ -56,6 +58,7 @@
   import BasicDrawer from '@/components/Drawer/src/BasicDrawer.vue'
   import { useDict } from '@/hooks/bootx/useDict'
   import { AllocOrder, AllocDetail, detailList } from './AllocationOrder.api'
+  import AllocDetailInfo from "./AllocDetailInfo.vue";
   // 使用hooks
   const { loading } = useTablePage(queryPage)
   const { dictConvert } = useDict()
@@ -65,7 +68,7 @@
   let records = ref<AllocDetail[]>([])
   const xTable = ref<VxeTableInstance>()
   const xToolbar = ref<VxeToolbarInstance>()
-  const allocationOrderDetailInfo = ref<any>()
+  const allocDetailInfo = ref<any>()
 
   nextTick(() => {
     xTable.value?.connect(xToolbar.value as VxeToolbarInstance)
@@ -95,7 +98,7 @@
    * 查看
    */
   function show(record) {
-    allocationOrderDetailInfo.value.init(record)
+    allocDetailInfo.value.init(record)
   }
 
   function cellStyle({ row, column }) {
diff --git a/src/views/daxpay/common/allocation/order/AllocOrderInfo.vue b/src/views/daxpay/common/allocation/order/AllocOrderInfo.vue
index e2b5b721..50c8a001 100644
--- a/src/views/daxpay/common/allocation/order/AllocOrderInfo.vue
+++ b/src/views/daxpay/common/allocation/order/AllocOrderInfo.vue
@@ -10,24 +10,38 @@
   >
     <a-spin :spinning="confirmLoading">
       <a-descriptions title="" bordered :column="{ md: 2, sm: 1, xs: 1 }">
-        <a-descriptions-item label="接收方编号">
-          {{ order.receiverNo }}
+        <a-descriptions-item label="分账单号">
+          {{ order.allocNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="接收方姓名">
-          {{ order.receiverName }}
+        <a-descriptions-item label="支付订单号">
+          {{ order.orderNo }}
         </a-descriptions-item>
-        <a-descriptions-item label="分账接收方类型">
-          <a-tag>{{ dictConvert('allocation_status', order.receiverType) }}</a-tag>
+        <a-descriptions-item label="商户分账单号">
+          {{ order.bizAllocNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="商户支付订单号">
+          {{ order.bizOrderNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="通道分账号">
+          {{ order.outOrderNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="通道支付订单号">
+          {{ order.outOrderNo }}
+        </a-descriptions-item>
+        <a-descriptions-item label="分账通道">
+          <a-tag>{{ dictConvert('channel', order.channel) }}</a-tag>
         </a-descriptions-item>
-        <a-descriptions-item label="分账比例"> {{ order.rate }}% </a-descriptions-item>
         <a-descriptions-item label="分账金额(元)"> {{ order.amount }} </a-descriptions-item>
+        <a-descriptions-item label="分账状态">
+          <a-tag>{{ dictConvert('allocation_status', order.status) }}</a-tag>
+        </a-descriptions-item>
         <a-descriptions-item label="分账结果">
           <a-tag>{{ dictConvert('allocation_result', order.result) }}</a-tag>
         </a-descriptions-item>
         <a-descriptions-item label="完成时间">
           {{ order.finishTime }}
         </a-descriptions-item>
-        <a-descriptions-item label="错误代码" v-if="order.errorCode">
+        <a-descriptions-item label="错误码" v-if="order.errorCode">
           {{ order.errorCode }}
         </a-descriptions-item>
         <a-descriptions-item label="错误原因" v-if="order.errorMsg">
@@ -45,7 +59,7 @@
 
 <script lang="ts" setup>
   import useFormEdit from '@/hooks/bootx/useFormEdit'
-  import { AllocDetail, get } from './AllocationOrder.api'
+  import {AllocOrder, get} from './AllocationOrder.api'
   import { BasicModal } from '@/components/Modal'
   import { useDict } from '@/hooks/bootx/useDict'
   import { ref } from 'vue'
@@ -53,9 +67,9 @@
   const { handleCancel, confirmLoading, visible, showable } = useFormEdit()
   const { dictConvert } = useDict()
 
-  let order = ref<AllocDetail>({})
+  let order = ref<AllocOrder>({})
   // 入口
-  async function init(record: AllocDetail) {
+  async function init(record: AllocOrder) {
     visible.value = true
     order.value = record
     confirmLoading.value = true
diff --git a/src/views/daxpay/common/allocation/order/AllocOrderList.vue b/src/views/daxpay/common/allocation/order/AllocOrderList.vue
index 890b4313..52f050e5 100644
--- a/src/views/daxpay/common/allocation/order/AllocOrderList.vue
+++ b/src/views/daxpay/common/allocation/order/AllocOrderList.vue
@@ -100,6 +100,7 @@
         @page-change="handleTableChange"
       />
     </div>
+    <PayOrderInfo ref="payOrderInfo" />
     <AllocDetailList ref="allocDetailList" />
     <AllocOrderInfo ref="allocOrderInfo" />
   </div>
@@ -116,10 +117,10 @@
   import BQuery from '/@/components/Bootx/Query/BQuery.vue'
   import { LIST, QueryField, STRING } from '@/components/Bootx/Query/Query'
   import { LabeledValue } from 'ant-design-vue/lib/select'
-  import { FormEditType } from '@/enums/formTypeEnum'
   import AllocDetailList from './AllocDetailList.vue'
   import { Icon } from '@/components/Icon'
   import AllocOrderInfo from "./AllocOrderInfo.vue";
+  import PayOrderInfo from "@/views/daxpay/common/order/pay/PayOrderInfo.vue";
 
   // 使用hooks
   const {
diff --git a/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts b/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
index 8978b1e2..286f7a07 100644
--- a/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
+++ b/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
@@ -145,15 +145,17 @@ export interface AllocOrder extends MchEntity {
  */
 export interface AllocDetail extends MchEntity {
   // 分账订单ID
-  orderId?: string
-  // 分账明细单号
-  receiverId?: string
+  allocationId?: string
   // 比例
   rate?: number
   // 金额
   amount?: number
   // 分账接收方类型
   receiverType?: string
+  // 分账接收方Id
+  receiverId?: string
+  // 分账接收方名称
+  name?: string
   // 接收方账号
   receiverAccount?: string
   // 接收方姓名
-- 
Gitee


From 9ffbc1510502daed6b417145625acc6973971f75 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Wed, 11 Dec 2024 23:26:51 +0800
Subject: [PATCH 19/25] =?UTF-8?q?fix=20=E5=88=86=E8=B4=A6=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/daxpay/common/allocation/order/AllocOrderList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/daxpay/common/allocation/order/AllocOrderList.vue b/src/views/daxpay/common/allocation/order/AllocOrderList.vue
index 52f050e5..091f6e7a 100644
--- a/src/views/daxpay/common/allocation/order/AllocOrderList.vue
+++ b/src/views/daxpay/common/allocation/order/AllocOrderList.vue
@@ -43,7 +43,7 @@
         </vxe-column>
         <vxe-column field="amount" title="总分账金额(元)" :min-width="120">
           <template #default="{ row }">
-            {{ row.amount ? (row.amount / 100).toFixed(2) : 0 }}
+            {{ row.amount }}
           </template>
         </vxe-column>
         <vxe-column field="status" title="状态" :min-width="120">
-- 
Gitee


From eb4aec602c4f023a140e7677998b7c01d90535fc Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Mon, 16 Dec 2024 18:10:18 +0800
Subject: [PATCH 20/25] =?UTF-8?q?style:=20=E5=88=86=E8=B4=A6=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocation/config/AllocationConfig.api.ts |   4 +
 .../allocation/order/AllocDetailList.vue      |  87 +++++----
 .../allocation/order/AllocOrderList.vue       | 175 +++++++++---------
 .../allocation/order/AllocationOrder.api.ts   |  36 +---
 4 files changed, 147 insertions(+), 155 deletions(-)

diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts b/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
index a3d346b8..0fce5f7b 100644
--- a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
+++ b/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
@@ -32,6 +32,10 @@ export function getConfig(appId) {
 export interface AllocConfig extends MchEntity {
   /** 是否自动分账 */
   autoAlloc?: boolean
+  /** 自动完结 */
+  autoFinish?: boolean
   /** 大于多少开启分账 */
   minAmount?: number
+  /** 分账延迟时长(分钟) */
+  DelayTime?: number
 }
diff --git a/src/views/daxpay/common/allocation/order/AllocDetailList.vue b/src/views/daxpay/common/allocation/order/AllocDetailList.vue
index 4e1c6596..28280a20 100644
--- a/src/views/daxpay/common/allocation/order/AllocDetailList.vue
+++ b/src/views/daxpay/common/allocation/order/AllocDetailList.vue
@@ -8,46 +8,51 @@
     @close="visible = false"
   >
     <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-    <vxe-table
-      keyField="id"
-      ref="xTable"
-      :data="records"
-      :loading="loading"
-      :cell-style="cellStyle"
-    >
-      <vxe-column type="seq" width="60" />
-      <vxe-column field="receiverNo" title="接收方编号" :min-width="120" />
-      <vxe-column field="name" title="接收方名称" :min-width="120" />
-      <vxe-column field="receiverName" title="接收方姓名" :min-width="100" />
-      <vxe-column field="receiverType" title="接收方类型" :min-width="100">
-        <template #default="{ row }">
-          {{ dictConvert('alloc_receiver_type', row.receiverType) }}
-        </template>
-      </vxe-column>
-      <vxe-column field="rate" title="分账比例" :min-width="100">
-        <template #default="{ row }"> {{ row.rate }}% </template>
-      </vxe-column>
-      <vxe-column field="amount" title="分账金额" :min-width="100">
-        <template #default="{ row }"> {{ row.amount }} 元 </template>
-      </vxe-column>
-      <vxe-column field="result" title="分账结果" :min-width="130">
-        <template #default="{ row }"> {{ dictConvert('alloc_detail_result', row.result) }} </template>
-      </vxe-column>
-      <vxe-column field="errorMsg" title="错误原因" :min-width="160">
-        <template #default="{ row }"> {{ row.errorMsg }} </template>
-      </vxe-column>
-      <vxe-column field="finishTime" title="完成时间" :min-width="160">
-        <template #default="{ row }"> {{ row.finishTime }} </template>
-      </vxe-column>
-      <vxe-column fixed="right" :min-width="60" :showOverflow="false" title="操作">
-        <template #default="{ row }">
-          <span>
-            <a href="javascript:" @click="show(row)">查看</a>
-          </span>
-        </template>
-      </vxe-column>
-    </vxe-table>
-    <alloc-detail-info ref="allocDetailInfo" />
+    <div class="h-80vh">
+      <vxe-table
+        keyField="id"
+        height="auto"
+        ref="xTable"
+        :data="records"
+        :loading="loading"
+        :cell-style="cellStyle"
+      >
+        <vxe-column type="seq" width="60" />
+        <vxe-column field="receiverNo" title="接收方编号" :min-width="120" />
+        <vxe-column field="name" title="接收方名称" :min-width="120" />
+        <vxe-column field="receiverName" title="接收方姓名" :min-width="100" />
+        <vxe-column field="receiverType" title="接收方类型" :min-width="100">
+          <template #default="{ row }">
+            {{ dictConvert('alloc_receiver_type', row.receiverType) }}
+          </template>
+        </vxe-column>
+        <vxe-column field="rate" title="分账比例" :min-width="100">
+          <template #default="{ row }"> {{ row.rate }}% </template>
+        </vxe-column>
+        <vxe-column field="amount" title="分账金额" :min-width="100">
+          <template #default="{ row }"> {{ row.amount }} 元 </template>
+        </vxe-column>
+        <vxe-column field="result" title="分账结果" :min-width="130">
+          <template #default="{ row }">
+            {{ dictConvert('alloc_detail_result', row.result) }}
+          </template>
+        </vxe-column>
+        <vxe-column field="errorMsg" title="错误原因" :min-width="160">
+          <template #default="{ row }"> {{ row.errorMsg }} </template>
+        </vxe-column>
+        <vxe-column field="finishTime" title="完成时间" :min-width="160">
+          <template #default="{ row }"> {{ row.finishTime }} </template>
+        </vxe-column>
+        <vxe-column fixed="right" :min-width="60" :showOverflow="false" title="操作">
+          <template #default="{ row }">
+            <span>
+              <a href="javascript:" @click="show(row)">查看</a>
+            </span>
+          </template>
+        </vxe-column>
+      </vxe-table>
+    </div>
+    <AllocDetailInfo ref="allocDetailInfo" />
   </basic-drawer>
 </template>
 
@@ -58,7 +63,7 @@
   import BasicDrawer from '@/components/Drawer/src/BasicDrawer.vue'
   import { useDict } from '@/hooks/bootx/useDict'
   import { AllocOrder, AllocDetail, detailList } from './AllocationOrder.api'
-  import AllocDetailInfo from "./AllocDetailInfo.vue";
+  import AllocDetailInfo from './AllocDetailInfo.vue'
   // 使用hooks
   const { loading } = useTablePage(queryPage)
   const { dictConvert } = useDict()
diff --git a/src/views/daxpay/common/allocation/order/AllocOrderList.vue b/src/views/daxpay/common/allocation/order/AllocOrderList.vue
index 091f6e7a..f6a63d09 100644
--- a/src/views/daxpay/common/allocation/order/AllocOrderList.vue
+++ b/src/views/daxpay/common/allocation/order/AllocOrderList.vue
@@ -11,86 +11,89 @@
     </div>
     <div class="m-3 p-3 bg-white">
       <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
-      <vxe-table
-        keyField="id"
-        ref="xTable"
-        :data="pagination.records"
-        :loading="loading"
-        :sort-config="{ remote: true, trigger: 'cell' }"
-        @sort-change="sortChange"
-      >
-        <vxe-column type="seq" title="序号" width="60" />
-        <vxe-column field="allocNo" title="分账单号" :min-width="230">
-          <template #default="{ row }">
-            <a @click="show(row)">
-              {{ row.allocNo }}
-            </a>
-          </template>
-        </vxe-column>
-        <vxe-column field="title" title="订单标题" :min-width="150" />
-        <vxe-column field="orderNo" title="支付订单号" :min-width="230">
-          <template #default="{ row }">
-            <a @click="showPayOrder(row)">
-              {{ row.orderNo }}
-            </a>
-          </template>
-        </vxe-column>
-
-        <vxe-column field="channel" title="所属通道" align="center" :min-width="150">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('channel', row.channel) }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="amount" title="总分账金额(元)" :min-width="120">
-          <template #default="{ row }">
-            {{ row.amount }}
-          </template>
-        </vxe-column>
-        <vxe-column field="status" title="状态" :min-width="120">
-          <template #default="{ row }">
-            <a-tag>{{ dictConvert('allocation_status', row.status) }}</a-tag>
-          </template>
-        </vxe-column>
-        <vxe-column field="result" title="分账结果" :min-width="100">
-          <template #default="{ row }">
-            {{ dictConvert('allocation_result', row.result) }}
-          </template> </vxe-column
-        ><vxe-column field="errorMsg" title="错误原因" :min-width="160" />
-        <vxe-column field="createTime" title="创建时间" :min-width="160" />
-        <vxe-column fixed="right" :min-width="200" :showOverflow="false" title="操作">
-          <template #default="{ row }">
-            <a-link @click="show(row)">查看</a-link>
-            <a-divider type="vertical" />
-            <a-link @click="showDetail(row)">明细列表</a-link>
-            <a-divider type="vertical" />
-            <a-dropdown>
-              <a>
-                更多
-                <icon icon="ant-design:down-outlined" :size="12" />
+      <div class="h-60vh">
+        <vxe-table
+          keyField="id"
+          height="auto"
+          ref="xTable"
+          :data="pagination.records"
+          :loading="loading"
+          :sort-config="{ remote: true, trigger: 'cell' }"
+          @sort-change="sortChange"
+        >
+          <vxe-column type="seq" title="序号" width="60" />
+          <vxe-column field="allocNo" title="分账单号" :min-width="230">
+            <template #default="{ row }">
+              <a @click="show(row)">
+                {{ row.allocNo }}
               </a>
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item
-                    v-if="
-                      ['allocation_processing', 'allocation_end', 'allocation_failed'].includes(
-                        row.status,
-                      )
-                    "
-                  >
-                    <a-link @click="retryInfo(row)">重试</a-link>
-                  </a-menu-item>
-                  <a-menu-item>
-                    <a-link @click="syncInfo(row)">同步</a-link>
-                  </a-menu-item>
-                  <a-menu-item v-if="['allocation_end', 'finish_failed'].includes(row.status)">
-                    <a-link @click="finishInfo(row)">完结</a-link>
-                  </a-menu-item>
-                </a-menu>
-              </template>
-            </a-dropdown>
-          </template>
-        </vxe-column>
-      </vxe-table>
+            </template>
+          </vxe-column>
+          <vxe-column field="title" title="订单标题" :min-width="150" />
+          <vxe-column field="orderNo" title="支付订单号" :min-width="230">
+            <template #default="{ row }">
+              <a @click="showPayOrder(row)">
+                {{ row.orderNo }}
+              </a>
+            </template>
+          </vxe-column>
+
+          <vxe-column field="channel" title="所属通道" align="center" :min-width="150">
+            <template #default="{ row }">
+              <a-tag>{{ dictConvert('channel', row.channel) }}</a-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="amount" title="总分账金额(元)" :min-width="120">
+            <template #default="{ row }">
+              {{ row.amount }}
+            </template>
+          </vxe-column>
+          <vxe-column field="status" title="状态" :min-width="120">
+            <template #default="{ row }">
+              <a-tag>{{ dictConvert('allocation_status', row.status) }}</a-tag>
+            </template>
+          </vxe-column>
+          <vxe-column field="result" title="分账结果" :min-width="100">
+            <template #default="{ row }">
+              {{ dictConvert('allocation_result', row.result) }}
+            </template> </vxe-column
+          ><vxe-column field="errorMsg" title="错误原因" :min-width="160" />
+          <vxe-column field="createTime" title="创建时间" :min-width="160" />
+          <vxe-column fixed="right" :min-width="200" :showOverflow="false" title="操作">
+            <template #default="{ row }">
+              <a-link @click="show(row)">查看</a-link>
+              <a-divider type="vertical" />
+              <a-link @click="showDetail(row)">明细列表</a-link>
+              <a-divider type="vertical" />
+              <a-dropdown>
+                <a>
+                  更多
+                  <icon icon="ant-design:down-outlined" :size="12" />
+                </a>
+                <template #overlay>
+                  <a-menu>
+                    <a-menu-item
+                      v-if="
+                        ['allocation_processing', 'allocation_end', 'allocation_failed'].includes(
+                          row.status,
+                        )
+                      "
+                    >
+                      <a-link @click="retryInfo(row)">重试</a-link>
+                    </a-menu-item>
+                    <a-menu-item>
+                      <a-link @click="syncInfo(row)">同步</a-link>
+                    </a-menu-item>
+                    <a-menu-item v-if="['alloc_end', 'finish_failed'].includes(row.status)">
+                      <a-link @click="finishInfo(row)">完结</a-link>
+                    </a-menu-item>
+                  </a-menu>
+                </template>
+              </a-dropdown>
+            </template>
+          </vxe-column>
+        </vxe-table>
+      </div>
       <vxe-pager
         size="medium"
         :loading="loading"
@@ -119,8 +122,8 @@
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import AllocDetailList from './AllocDetailList.vue'
   import { Icon } from '@/components/Icon'
-  import AllocOrderInfo from "./AllocOrderInfo.vue";
-  import PayOrderInfo from "@/views/daxpay/common/order/pay/PayOrderInfo.vue";
+  import AllocOrderInfo from './AllocOrderInfo.vue'
+  import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
 
   // 使用hooks
   const {
@@ -212,7 +215,7 @@
       title: '同步分账状态',
       content: '确定同步分账状态吗？',
       onOk: () => {
-        sync(record.allocNo).then(() => {
+        sync(record.id).then(() => {
           createMessage.success('同步成功')
           queryPage()
         })
@@ -226,10 +229,10 @@
   function retryInfo(record) {
     createConfirm({
       iconType: 'info',
-      title: '分账重试',
-      content: '确定分账重试吗？',
+      title: '重试分账',
+      content: '确定重试分账吗？',
       onOk: () => {
-        retry(record.bizAllocNo).then(() => {
+        retry(record.id).then(() => {
           createMessage.success('分账重试请求发送成功')
           queryPage()
         })
@@ -246,7 +249,7 @@
       title: '完结分账',
       content: '确定完结分账吗？',
       onOk: () => {
-        finish(record.allocNo).then(() => {
+        finish(record.id).then(() => {
           createMessage.success('完结请求发送成功')
           queryPage()
         })
diff --git a/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts b/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
index 286f7a07..d6f4944a 100644
--- a/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
+++ b/src/views/daxpay/common/allocation/order/AllocationOrder.api.ts
@@ -22,26 +22,6 @@ export function get(id) {
   })
 }
 
-/**
- * 获取订单详细信息
- */
-export function getOrderByAllocNo(allocNo: string) {
-  return defHttp.get<Result>({
-    url: '/allocation/order/findByAllocNo',
-    params: { allocNo },
-  })
-}
-
-/**
- * 扩展信息
- */
-export function getExtra(id) {
-  return defHttp.get<Result<AllocOrder>>({
-    url: '/allocation/order/findById',
-    params: { id },
-  })
-}
-
 /**
  * 明细列表
  */
@@ -65,30 +45,30 @@ export function detail(id) {
 /**
  * 分账完结
  */
-export function finish(allocNo) {
+export function finish(id) {
   return defHttp.post<Result<AllocOrder>>({
     url: '/allocation/order/finish',
-    params: { allocNo },
+    params: { id },
   })
 }
 
 /**
- * 分账完结
+ * 分账重试
  */
-export function retry(bizAllocNo) {
+export function retry(id) {
   return defHttp.post<Result<AllocOrder>>({
     url: '/allocation/order/retry',
-    params: { bizAllocNo },
+    params: { id },
   })
 }
 
 /**
- * 查询分账结果
+ * 同步分账结果
  */
-export function sync(allocNo) {
+export function sync(id) {
   return defHttp.post<Result<AllocOrder>>({
     url: '/allocation/order/sync',
-    params: { allocNo },
+    params: { id },
   })
 }
 
-- 
Gitee


From 8042b3c5a9d5f20ea55f6eeb6674b8d30aad1586 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Tue, 17 Dec 2024 11:14:40 +0800
Subject: [PATCH 21/25] =?UTF-8?q?style:=20=E8=87=AA=E5=8A=A8=E5=88=86?=
 =?UTF-8?q?=E8=B4=A6=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocation/config/AllocationConfig.api.ts |  2 +-
 .../allocation/config/AllocationConfig.vue    | 58 ++++++++++++++++---
 .../daxpay/common/merchant/app/MchAppList.vue |  6 +-
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts b/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
index 0fce5f7b..72b685fc 100644
--- a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
+++ b/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
@@ -37,5 +37,5 @@ export interface AllocConfig extends MchEntity {
   /** 大于多少开启分账 */
   minAmount?: number
   /** 分账延迟时长(分钟) */
-  DelayTime?: number
+  delayTime?: number
 }
diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.vue b/src/views/daxpay/common/allocation/config/AllocationConfig.vue
index baddb0e6..0679b1ba 100644
--- a/src/views/daxpay/common/allocation/config/AllocationConfig.vue
+++ b/src/views/daxpay/common/allocation/config/AllocationConfig.vue
@@ -12,12 +12,12 @@
       <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
-      <a-form-item label="自动分账" name="autoAlloc">
+      <a-form-item name="autoAlloc">
         <template #label>
           <basic-title
             helpMessage="开启自动分账后，如果创建订单时设置为了自动分账，将会对订单自动分账"
           >
-            开启自动分账
+            自动分账
           </basic-title>
         </template>
         <a-radio-group v-model:value="form.autoAlloc" :disabled="!edit" button-style="solid">
@@ -25,7 +25,21 @@
           <a-radio-button :value="true">开启</a-radio-button>
         </a-radio-group>
       </a-form-item>
-      <a-form-item name="minAmount">
+      <a-form-item name="autoFinish" v-if="form.autoAlloc">
+        <template #label>
+          <basic-title
+            helpMessage="开启自动完结后，分账完成后，会自动对分账单进行完结，解冻剩余的资金"
+          >
+            自动完结
+          </basic-title>
+        </template>
+        <a-radio-group v-model:value="form.autoFinish" :disabled="!edit" button-style="solid">
+          <a-radio-button :value="false">关闭</a-radio-button>
+          <a-radio-button :value="true">开启</a-radio-button>
+        </a-radio-group>
+      </a-form-item>
+
+      <a-form-item name="minAmount" v-if="form.autoAlloc">
         <template #label>
           <basic-title helpMessage="只有大于或等于其实金额的订单才会进行分账">
             自动分账起始金额(元)
@@ -35,11 +49,28 @@
           v-model:value="form.minAmount"
           class="w-300px"
           :min="0.1"
+          :precision="1"
           :max="9999999"
           :disabled="!edit"
           placeholder="请输自动分账起始金额(元)"
         />
       </a-form-item>
+      <a-form-item name="delayTime" v-if="form.autoAlloc">
+        <template #label>
+          <basic-title helpMessage="支付订单完成后多久进行分账操作">
+            分账延迟时间(分钟)
+          </basic-title>
+        </template>
+        <a-input-number
+          v-model:value="form.delayTime"
+          class="w-300px"
+          :min="0"
+          :precision="0"
+          :max="99999"
+          :disabled="!edit"
+          placeholder="请输自动分账延迟时间(分钟)"
+        />
+      </a-form-item>
     </a-form>
     <a-space :size="55" class="flex justify-center">
       <a-button v-if="edit" @click="initData">取消</a-button>
@@ -53,7 +84,7 @@
 
 <script setup lang="ts">
   import useFormEdit from '@/hooks/bootx/useFormEdit'
-  import { onMounted, ref } from 'vue'
+  import { computed, onMounted, ref } from 'vue'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import { saveConfig, getConfig, updateConfig, AllocConfig } from './AllocationConfig.api'
   import { useMessage } from '@/hooks/web/useMessage'
@@ -76,12 +107,23 @@
   const form = ref<AllocConfig>({
     autoAlloc: false,
     minAmount: 1.0,
+    autoFinish: false,
+    delayTime: 1440,
   })
 
-  const rules = {
-    autoAlloc: [{ required: true, message: '' }],
-    minAmount: [{ required: true, message: '请输自动分账起始金额(元)' }],
-  } as Record<string, Rule[]>
+  const rules = computed(() => {
+    return {
+      autoAlloc: [{ required: true, message: '' }],
+      minAmount: [{ required: form.value.autoAlloc, message: '请输自动分账起始金额(元)' }],
+      autoFinish: [{ required: form.value.autoAlloc, message: '' }],
+      delayTime: [
+        {
+          required: form.value.autoAlloc,
+          message: '请输订单完成后多久进行自动分账(分钟)',
+        },
+      ],
+    } as Record<string, Rule[]>
+  })
 
   /**
    * 重置信息
diff --git a/src/views/daxpay/common/merchant/app/MchAppList.vue b/src/views/daxpay/common/merchant/app/MchAppList.vue
index f40be7a7..522fda92 100644
--- a/src/views/daxpay/common/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppList.vue
@@ -62,13 +62,13 @@
                       <a-link @click="showNotifyConfig(row)">订阅配置</a-link>
                     </a-menu-item>
                     <a-menu-item>
-                      <a-link @click="showCheckoutConfig(row)">收银台配置</a-link>
+                      <a-link @click="showAllocConfig(row)">分账配置</a-link>
                     </a-menu-item>
                     <a-menu-item>
-                      <a-link @click="showCashierCode(row)">码牌配置</a-link>
+                      <a-link @click="showCheckoutConfig(row)">收银台配置</a-link>
                     </a-menu-item>
                     <a-menu-item>
-                      <a-link @click="showAllocConfig(row)">分账配置</a-link>
+                      <a-link @click="showCashierCode(row)">码牌配置</a-link>
                     </a-menu-item>
                     <a-menu-item>
                       <a-link danger @click="remove(row)">删除应用</a-link>
-- 
Gitee


From f767f1ac7bf06de2cb9be878f8679dcb007a257c Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Tue, 17 Dec 2024 18:08:27 +0800
Subject: [PATCH 22/25] =?UTF-8?q?style:=20=E8=87=AA=E5=8A=A8=E5=88=86?=
 =?UTF-8?q?=E8=B4=A6=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/daxpay/common/allocation/AllocationConfigModel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/daxpay/common/allocation/AllocationConfigModel.vue b/src/views/daxpay/common/allocation/AllocationConfigModel.vue
index 7cf12580..edbae1dd 100644
--- a/src/views/daxpay/common/allocation/AllocationConfigModel.vue
+++ b/src/views/daxpay/common/allocation/AllocationConfigModel.vue
@@ -9,7 +9,7 @@
     @close="visible = false"
   >
     <a-tabs v-model:activeKey="activeKey" type="card">
-      <a-tab-pane :key="1" tab="分账模式">
+      <a-tab-pane :key="1" tab="分账配置">
         <AllocationConfig :appId="appId" />
       </a-tab-pane>
       <a-tab-pane :key="2" tab="分账接收方">
-- 
Gitee


From 599b0bf723f46e60575406b420dd2b909c00d697 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Tue, 17 Dec 2024 22:21:30 +0800
Subject: [PATCH 23/25] =?UTF-8?q?feat(develop):=20=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E9=A1=B5=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8=E5=88=86=E8=B4=A6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../daxpay/common/develop/trade/DevelopTradeCheck.vue      | 7 +++++++
 src/views/daxpay/common/develop/trade/DevelopTradePay.vue  | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/src/views/daxpay/common/develop/trade/DevelopTradeCheck.vue b/src/views/daxpay/common/develop/trade/DevelopTradeCheck.vue
index 4c68efa6..c46cd899 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradeCheck.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradeCheck.vue
@@ -54,6 +54,13 @@
             v-model:checked="form.allocation"
           />
         </a-form-item>
+        <a-form-item label="是否自动分账" name="autoAllocation">
+          <a-switch
+            checked-children="是"
+            un-checked-children="否"
+            v-model:checked="form.autoAllocation"
+          />
+        </a-form-item>
         <a-form-item label="支付描述" name="description">
           <a-input v-model:value="form.description" placeholder="请输入支付描述" />
         </a-form-item>
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
index 5b8cc339..deb4410e 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
@@ -62,6 +62,13 @@
             v-model:checked="form.allocation"
           />
         </a-form-item>
+        <a-form-item label="是否自动分账" name="autoAllocation">
+          <a-switch
+            checked-children="是"
+            un-checked-children="否"
+            v-model:checked="form.autoAllocation"
+          />
+        </a-form-item>
         <a-form-item label="支付描述" name="description">
           <a-input v-model:value="form.description" placeholder="请输入支付描述" />
         </a-form-item>
-- 
Gitee


From 13234b5fb89d37826af597ebfa43b5d45e6aee5a Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Sun, 29 Dec 2024 10:25:54 +0800
Subject: [PATCH 24/25] =?UTF-8?q?feat(order):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.build                                             | 10 +++++-----
 .../daxpay/common/order/refund/RefundOrder.api.ts      |  2 ++
 .../daxpay/common/order/refund/RefundOrderInfo.vue     |  8 +++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.env.build b/.env.build
index a92aaeaa..b5f25373 100644
--- a/.env.build
+++ b/.env.build
@@ -2,18 +2,18 @@
 VITE_GLOB_APP_TITLE=DaxPay服务端
 
 # 独立部署模式
-#VITE_PUBLIC_PATH=/
+VITE_PUBLIC_PATH=/
 # API 接口前缀
-#VITE_GLOB_API_URL_PREFIX=/server
+VITE_GLOB_API_URL_PREFIX=/server
 
 # 嵌入式模式 与后端部署在一起
-VITE_PUBLIC_PATH=/web
+#VITE_PUBLIC_PATH=/web
 # API 接口前缀
-VITE_GLOB_API_URL_PREFIX=
+#VITE_GLOB_API_URL_PREFIX=
 
 
 # 是否启用gzip压缩或brotli压缩, 可选: gzip | brotli | none, 如果你需要多种形式，你可以用','来分隔
-VITE_BUILD_COMPRESS='none'
+VITE_BUILD_COMPRESS='gzip'
 
 # 接口地址
 VITE_GLOB_API_URL=
diff --git a/src/views/daxpay/common/order/refund/RefundOrder.api.ts b/src/views/daxpay/common/order/refund/RefundOrder.api.ts
index 863fafa9..7344320e 100644
--- a/src/views/daxpay/common/order/refund/RefundOrder.api.ts
+++ b/src/views/daxpay/common/order/refund/RefundOrder.api.ts
@@ -119,6 +119,8 @@ export interface RefundOrder extends MchEntity {
   orderNo?: string
   // 商户支付订单号
   bizOrderNo?: string
+  // 通道支付订单号
+  outOrderNo?: string
   // 支付标题
   title?: string
   // 退款号
diff --git a/src/views/daxpay/common/order/refund/RefundOrderInfo.vue b/src/views/daxpay/common/order/refund/RefundOrderInfo.vue
index 6a76dd3e..6e6b3334 100644
--- a/src/views/daxpay/common/order/refund/RefundOrderInfo.vue
+++ b/src/views/daxpay/common/order/refund/RefundOrderInfo.vue
@@ -9,12 +9,15 @@
     @cancel="handleCancel"
   >
     <a-descriptions bordered>
-      <a-descriptions-item label="退款号" :column="{ lg: 2, md: 1 }">
+      <a-descriptions-item label="退款标题" :span="2">
         {{ order.refundNo }}
       </a-descriptions-item>
       <a-descriptions-item label="商户退款号" :span="2">
         {{ order.bizRefundNo }}
       </a-descriptions-item>
+      <a-descriptions-item label="通道退款号" :span="2">
+        {{ order.outRefundNo }}
+      </a-descriptions-item>
       <a-descriptions-item label="原支付标题" :span="2">
         {{ order.title }}
       </a-descriptions-item>
@@ -24,6 +27,9 @@
       <a-descriptions-item label="商户支付订单号" :span="2">
         {{ order.bizOrderNo }}
       </a-descriptions-item>
+      <a-descriptions-item label="通道支付订单号" :span="2">
+        {{ order.outOrderNo }}
+      </a-descriptions-item>
       <a-descriptions-item label="退款金额(元)" :span="2">
         {{ order.amount ? order.amount : 0 }}
       </a-descriptions-item>
-- 
Gitee


From 73ce82fa4e8248c32fceabbde0f3397fa48b259a Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Fri, 3 Jan 2025 10:25:37 +0800
Subject: [PATCH 25/25] =?UTF-8?q?feat(daxpay):=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E5=92=8C=E5=BE=AE=E4=BF=A1=E7=89=B9?=
 =?UTF-8?q?=E7=BA=A6=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增支付宝和微信特约商户相关的配置项和功能
- 更新了相应的API接口和UI界面以支持特约商户功能
-优化了部分现有功能，如支付限额和证书上传等
---
 src/enums/daxpay/channelEnum.ts               |   6 +-
 .../channel/alipay/config/AlipayConfig.api.ts |   4 +
 .../alipay/config/AlipayConfigEdit.vue        |  24 ++--
 .../wechat/config/WechatPayConfig.api.ts      |  34 +++++-
 .../wechat/config/WechatPayConfigEdit.vue     | 109 +++++++++++++-----
 .../common/develop/trade/DevelopTradePay.vue  |   2 +
 .../daxpay/common/merchant/app/MchAppEdit.vue |   7 ++
 .../daxpay/common/merchant/app/MchAppList.vue |   5 +
 .../merchant/channel/ChannelConfigEdit.vue    |  14 ++-
 .../merchant/channel/ChannelConfigList.vue    |   4 +
 .../order/transfer/TransferOrder.api.ts       |   2 +-
 .../order/transfer/TransferOrderList.vue      |   9 +-
 src/views/sys/login/LoginForm.vue             |   1 +
 types/store.d.ts                              |   1 -
 14 files changed, 166 insertions(+), 56 deletions(-)

diff --git a/src/enums/daxpay/channelEnum.ts b/src/enums/daxpay/channelEnum.ts
index 945c4e5a..09fec138 100644
--- a/src/enums/daxpay/channelEnum.ts
+++ b/src/enums/daxpay/channelEnum.ts
@@ -3,7 +3,9 @@
  */
 export enum ChannelEnum {
   ALI = 'ali_pay',
+  ALI_ISV = 'alipay_isv',
   WECHAT = 'wechat_pay',
+  WECHAT_ISV = 'wechat_pay_isv',
   UNION_PAY = 'union_pay',
 }
 
@@ -63,7 +65,6 @@ export enum ChannelAuthStatusEnum {
   NOT_EXIST = 'not_exist',
 }
 
-
 /**
  * 收银台类型
  */
@@ -78,7 +79,6 @@ export enum CheckoutTypeEnum {
  * 支付调起类型
  */
 export enum CheckoutCallTypeEnum {
-
   /** 扫码支付 */
   QR_CODE = 'qr_code',
   /** 条码支付 */
@@ -93,6 +93,4 @@ export enum CheckoutCallTypeEnum {
   JSAPI = 'jsapi',
   /** 表单方式 */
   FROM = 'from',
-
 }
-
diff --git a/src/views/daxpay/common/channel/alipay/config/AlipayConfig.api.ts b/src/views/daxpay/common/channel/alipay/config/AlipayConfig.api.ts
index 41b852eb..bc2c9ccb 100644
--- a/src/views/daxpay/common/channel/alipay/config/AlipayConfig.api.ts
+++ b/src/views/daxpay/common/channel/alipay/config/AlipayConfig.api.ts
@@ -33,6 +33,10 @@ export interface AlipayConfig extends MchEntity {
   enable: boolean
   // 支付限额
   limitAmount?: number
+  // 是否为特约商户
+  isv?: boolean
+  // 特约商户Token
+  appAuthToken?: string
   // 商户账号ID
   alipayUserId?: string
   // 授权回调地址
diff --git a/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue b/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue
index 71452ffe..16ee6070 100644
--- a/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue
+++ b/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue
@@ -34,7 +34,7 @@
         <a-form-item name="limitAmount">
           <template #label>
             <basic-title
-              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了应用支付限额，则以额度低的为准"
+              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了全局支付限额，则以额度低的为准"
             >
               支付限额(元)
             </basic-title>
@@ -55,6 +55,14 @@
           </template>
           <a-input v-model:value="form.alipayUserId" placeholder="请输入合作者身份ID" />
         </a-form-item>
+        <a-form-item name="appAuthToken" v-if="isIsv">
+          <template #label>
+            <basic-title helpMessage="商家授权给服务商的应用授权凭证, 用于代调用接口"
+              >应用授权Token
+            </basic-title>
+          </template>
+          <a-input v-model:value="form.appAuthToken" placeholder="请输入特约商户AppAuthToken" />
+        </a-form-item>
         <a-form-item label="沙箱环境" name="sandbox">
           <a-switch checked-children="是" un-checked-children="否" v-model:checked="form.sandbox" />
         </a-form-item>
@@ -195,7 +203,7 @@
   import { BasicDrawer } from '@/components/Drawer'
   import { Icon } from '@/components/Icon'
   import BasicTitle from '@/components/Basic/src/BasicTitle.vue'
-  import { ChannelConfig } from '@/views/daxpay/common/merchant/channel/ChannelConfig.api'
+  import { ChannelConfig } from "@/views/daxpay/common/merchant/channel/ChannelConfig.api";
 
   const { handleCancel, diffForm, labelCol, wrapperCol, confirmLoading, visible, showable } =
     useFormEdit()
@@ -205,8 +213,9 @@
 
   const formRef = ref<FormInstance>()
   const channelConfig = ref<ChannelConfig>({})
+  const isIsv = ref<boolean>(false)
 
-  const form = ref({
+  const form = ref<AlipayConfig>({
     aliAppId: '',
     enable: false,
     limitAmount: 20000,
@@ -220,8 +229,7 @@
     alipayRootCert: '',
     privateKey: '',
     sandbox: false,
-    remark: '',
-  } as AlipayConfig)
+  })
   let rawForm: any = {}
   // 校验
   const rules = computed(() => {
@@ -230,6 +238,7 @@
       enable: [{ required: true, message: '请选择是否启用' }],
       limitAmount: [{ required: true, message: '请输入单次支付限额' }],
       authType: [{ required: true, message: '请选择认证方式' }],
+      appAuthToken: [{ required: isIsv.value, message: '请输入特约商户AppAuthToken' }],
       signType: [{ required: true, message: '请选择加密类型' }],
       alipayPublicKey: [{ required: form.value.authType === 'key', message: '请输入支付宝公钥' }],
       privateKey: [{ required: true, message: '请输入应用私钥' }],
@@ -240,7 +249,6 @@
       ],
       sandbox: [{ required: true, message: '请选择是否为沙箱环境' }],
       expireTime: [{ required: true, message: '请输入默认超时配置' }],
-      payWays: [{ required: true, message: '请选择支持的支付类型' }],
     } as Record<string, Rule[]>
   })
   // 事件
@@ -248,8 +256,9 @@
   /**
    * 入口
    */
-  function init(config: ChannelConfig) {
+  function init(config: ChannelConfig, isv: boolean) {
     channelConfig.value = config
+    isIsv.value = isv
     resetForm()
     visible.value = true
     getInfo()
@@ -284,6 +293,7 @@
           'alipayRootCert',
           'privateKey',
         ),
+        isv: isIsv.value,
         appId: channelConfig.value.appId,
       })
         .then(() => {
diff --git a/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts b/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
index fcc946d6..cedb8b1d 100644
--- a/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
+++ b/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
@@ -30,6 +30,12 @@ export interface WechatPayConfig extends MchEntity {
   wxAppId?: string
   // 微信商户号
   wxMchId?: string
+  // 微信子应用AppId
+  subAppId?: string
+  // 微信子商户号
+  subMchId?: string
+  // 是否特约商户
+  isv?: boolean
   // 是否启用
   enable: boolean
   // 授权认证地址
@@ -44,13 +50,17 @@ export interface WechatPayConfig extends MchEntity {
   apiKeyV3?: string
   // APPID对应的接口密码，用于获取接口调用凭证access_token时使用
   appSecret?: string
-  // 私钥Key
-  privateKey?: string
-  // 私钥证书
+  // 支付公钥
+  publicKey?: string
+  // 支付公钥ID
+  publicKeyId?: string
+  // 商户API证书
   privateCert?: string
-  // 证书序列号
+  // 商户API证书私钥
+  privateKey?: string
+  // 商户API证书序列号
   certSerialNo?: string
-  // p12的文件id
+  // p12的文件
   p12?: string | null
   // 应用域名，回调中会使用此参数
   domain?: string
@@ -63,3 +73,17 @@ export interface WechatPayConfig extends MchEntity {
   // 备注
   remark?: string
 }
+
+/**
+ * 特约商户服务商配置
+ */
+export interface WechatPaySimpleConfig extends MchEntity {
+  // 服务商应用号
+  isvAppId?: string
+  // 子商户应用AppId
+  subAppId?: string
+  // 子商户商户号
+  subMchId?: string
+  // 是否启用
+  enable?: boolean
+}
diff --git a/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue b/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
index c3e5f920..b5faeebf 100644
--- a/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
+++ b/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
@@ -24,13 +24,27 @@
         <a-form-item label="商户号" name="wxMchId">
           <a-input v-model:value="form.wxMchId" :disabled="showable" placeholder="请输入商户号" />
         </a-form-item>
-        <a-form-item label="应用编号(AppId)" name="wxAppId">
+        <a-form-item label="应用号(AppId)" name="wxAppId">
           <a-input
             v-model:value="form.wxAppId"
             :disabled="showable"
             placeholder="请输入微信应用AppId"
           />
         </a-form-item>
+        <a-form-item label="子商户号" name="subMchId" v-if="isIsv">
+          <a-input
+            v-model:value="form.subMchId"
+            :disabled="showable"
+            placeholder="请输入子商户号"
+          />
+        </a-form-item>
+        <a-form-item label="子应用号(subAppId)" name="subAppId" v-if="isIsv">
+          <a-input
+            v-model:value="form.subAppId"
+            :disabled="showable"
+            placeholder="请输入微信子应用AppId"
+          />
+        </a-form-item>
         <a-form-item label="公众号AppSecret" name="appSecret">
           <a-input
             v-model:value="form.appSecret"
@@ -62,7 +76,7 @@
         <a-form-item name="limitAmount">
           <template #label>
             <basic-title
-              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了应用支付限额，则以额度低的为准"
+              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了全局支付限额，则以额度低的为准"
             >
               支付限额(元)
             </basic-title>
@@ -96,22 +110,41 @@
             placeholder="请输入APIv3密钥"
           />
         </a-form-item>
-        <a-form-item name="certSerialNo">
+        <a-form-item name="privateCert">
           <template #label>
-            <basic-title helpMessage="登录微信支付平台进入到账户中心 – API安全 – 查看证书, 查看证书序列号">
-              证书序列号
+            <basic-title helpMessage="微信平台中的商户API证书(apiclient_cert.pem)">
+              商户API证书
             </basic-title>
           </template>
-          <a-input
+          <a-upload
+            v-if="!form.privateCert"
             :disabled="showable"
-            v-model:value="form.certSerialNo"
-            placeholder="请输入证书序列号"
-          />
+            name="file"
+            :multiple="false"
+            :action="uploadAction"
+            :headers="tokenHeader"
+            :showUploadList="false"
+            @change="(info) => handleChange(info, 'privateCert')"
+          >
+            <a-button type="primary" preIcon="carbon:cloud-upload"> API证书上传 </a-button>
+          </a-upload>
+          <a-input v-else defaultValue="apiclient_cert.pem" disabled>
+            <template #addonAfter v-if="!showable">
+              <a-tooltip>
+                <template #title> 删除上传的商户API证书 </template>
+                <icon
+                  @click="form.privateCert = ''"
+                  icon="ant-design:close-circle-outlined"
+                  :size="20"
+                />
+              </a-tooltip>
+            </template>
+          </a-input>
         </a-form-item>
         <a-form-item name="privateKey">
           <template #label>
-            <basic-title helpMessage="微信商户平台Api接口中的apiclient_key.pem证书">
-              私钥Key
+            <basic-title helpMessage="微信平台中的商户API证书私钥(apiclient_key.pem)">
+              商户API证书私钥
             </basic-title>
           </template>
           <a-upload
@@ -124,12 +157,12 @@
             :showUploadList="false"
             @change="(info) => handleChange(info, 'privateKey')"
           >
-            <a-button type="primary" preIcon="carbon:cloud-upload"> 私钥Key上传 </a-button>
+            <a-button type="primary" preIcon="carbon:cloud-upload"> API证书私钥上传 </a-button>
           </a-upload>
           <a-input v-else defaultValue="apiclient_key.pem" disabled>
             <template #addonAfter v-if="!showable">
               <a-tooltip>
-                <template #title> 删除上传的证书文件 </template>
+                <template #title> 删除上传的API证书私钥 </template>
                 <icon
                   @click="form.privateKey = ''"
                   icon="ant-design:close-circle-outlined"
@@ -139,30 +172,35 @@
             </template>
           </a-input>
         </a-form-item>
-        <a-form-item name="privateCert">
+        <a-form-item label="商户API证书序列号" name="certSerialNo">
+          <a-input
+            :disabled="showable"
+            v-model:value="form.certSerialNo"
+            placeholder="请输入商户API证书序列号"
+          />
+        </a-form-item>
+        <a-form-item name="publicKey">
           <template #label>
-            <basic-title helpMessage="微信商户平台Api接口中的apiclient_cert.pem证书">
-              私钥证书
-            </basic-title>
+            <basic-title helpMessage="微信平台中的支付公钥(pub_key.pem)"> 支付公钥 </basic-title>
           </template>
           <a-upload
-            v-if="!form.privateCert"
+            v-if="!form.publicKey"
             :disabled="showable"
             name="file"
             :multiple="false"
             :action="uploadAction"
             :headers="tokenHeader"
             :showUploadList="false"
-            @change="(info) => handleChange(info, 'privateCert')"
+            @change="(info) => handleChange(info, 'publicKey')"
           >
-            <a-button type="primary" preIcon="carbon:cloud-upload"> 私钥Key上传 </a-button>
+            <a-button type="primary" preIcon="carbon:cloud-upload"> 支付公钥上传 </a-button>
           </a-upload>
-          <a-input v-else defaultValue="apiclient_cert.pem" disabled>
+          <a-input v-else defaultValue="pub_key.pem" disabled>
             <template #addonAfter v-if="!showable">
               <a-tooltip>
-                <template #title> 删除上传的证书文件 </template>
+                <template #title> 删除上传的支付公钥 </template>
                 <icon
-                  @click="form.privateCert = ''"
+                  @click="form.publicKey = ''"
                   icon="ant-design:close-circle-outlined"
                   :size="20"
                 />
@@ -170,6 +208,13 @@
             </template>
           </a-input>
         </a-form-item>
+        <a-form-item label="支付公钥ID" name="publicKeyId">
+          <a-input
+            :disabled="showable"
+            v-model:value="form.publicKeyId"
+            placeholder="请输入支付公钥ID"
+          />
+        </a-form-item>
         <a-form-item name="p12">
           <template #label>
             <basic-title helpMessage="V2版本中例如退款、转账时，必须要配置p12证书才可以执行">
@@ -225,13 +270,14 @@
   import { useUpload } from '@/hooks/bootx/useUpload'
   import { useMessage } from '@/hooks/web/useMessage'
   import BasicTitle from '@/components/Basic/src/BasicTitle.vue'
-  import { ChannelConfig } from '@/views/daxpay/common/merchant/channel/ChannelConfig.api'
+  import { ChannelConfig } from "@/views/daxpay/common/merchant/channel/ChannelConfig.api";
 
   const { handleCancel, diffForm, labelCol, wrapperCol, confirmLoading, visible, showable } =
     useFormEdit()
   // 文件上传
   const { tokenHeader, uploadAction } = useUpload('/readBase64')
   const { createMessage } = useMessage()
+  const isIsv = ref<boolean>(false)
 
   // 表单
   const formRef = ref<FormInstance>()
@@ -258,13 +304,12 @@
   const rules = computed(() => {
     return {
       wxMchId: [{ required: true, message: '请输入商户号' }],
-      limitAmount: [{ required: true, message: '请输入单次支付限额' }],
       wxAppId: [{ required: true, message: '请输入应用编号' }],
-      // appSecret: [{ required: true, message: '请输入AppSecret' }],
+      subMchId: [{ required: isIsv.value, message: '请输入子商户号' }],
+      limitAmount: [{ required: true, message: '请输入单次支付限额' }],
       enable: [{ required: true, message: '请选择是否启用' }],
       notifyUrl: [{ required: true, message: '请输入异步通知页面地址' }],
       returnUrl: [{ required: true, message: '请输入同步通知页面地址' }],
-      sandbox: [{ required: true, message: '请选择是否为沙箱环境' }],
       apiVersion: [{ required: true, message: '请选择支付API版本' }],
       apiKeyV2: [{ required: form.value.apiVersion === 'apiV2', message: '请输入V2秘钥' }],
       apiKeyV3: [{ required: form.value.apiVersion === 'apiV3', message: '请输入V3秘钥' }],
@@ -281,7 +326,6 @@
           message: '请上传私钥Key(apiclient_cert.pem)',
         },
       ],
-      payWays: [{ required: true, message: '请选择支持的支付类型' }],
     } as Record<string, Rule[]>
   })
 
@@ -290,8 +334,9 @@
   /**
    * 入口
    */
-  function init(config: ChannelConfig) {
+  function init(config: ChannelConfig, isv: boolean) {
     channelConfig.value = config
+    isIsv.value = isv
     visible.value = true
     resetForm()
     getInfo()
@@ -324,9 +369,13 @@
           'appSecret',
           'apiKeyV2',
           'apiKeyV3',
-          'privateKey',
           'privateCert',
+          'privateKey',
+          'certSerialNo',
+          'publicKey',
+          'publicKeyId',
         ),
+        isv: isIsv.value,
         appId: channelConfig.value.appId,
       })
         .then(() => {
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
index deb4410e..cf3d1696 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
@@ -156,6 +156,7 @@
     clientIp: '127.0.0.1',
     amount: 0.01,
     allocation: false,
+    autoAllocation: false,
   })
   const rules = computed(() => {
     return {
@@ -166,6 +167,7 @@
       amount: [{ required: true, message: '支付金额不可为空' }],
       method: [{ required: true, message: '支付方式不可为空' }],
       allocation: [{ required: true, message: '分账不可为空' }],
+      autoAllocation: [{ required: true, message: '自动分账不可为空' }],
       clientIp: [{ required: true, message: '终端IP不可为空' }],
       nonceStr: [{ required: true, message: '随机数不可为空' }],
       reqTime: [{ required: true, message: '请求时间不可为空' }],
diff --git a/src/views/daxpay/common/merchant/app/MchAppEdit.vue b/src/views/daxpay/common/merchant/app/MchAppEdit.vue
index ebe6501d..fef171b4 100644
--- a/src/views/daxpay/common/merchant/app/MchAppEdit.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppEdit.vue
@@ -27,6 +27,12 @@
         <a-form-item label="应用名称" name="appName">
           <a-input v-model:value="form.appName" :disabled="showable" placeholder="请输入应用名称" />
         </a-form-item>
+        <a-form-item label="应用状态" name="status">
+          <a-radio-group v-model:value="form.status" :disabled="showable" button-style="solid">
+            <a-radio-button value="disabled">禁用</a-radio-button>
+            <a-radio-button value="enable">启用</a-radio-button>
+          </a-radio-group>
+        </a-form-item>
         <a-form-item label="支付限额(元)" name="limitAmount">
           <a-input-number
             v-model:value="form.limitAmount"
@@ -145,6 +151,7 @@
   const rules = reactive({
     appName: [{ required: true, message: '请输入应用名称' }],
     signType: [{ required: true, message: '请选择签名方式' }],
+    status: [{ required: true, message: '请选择应用状态' }],
     signSecret: [{ required: true, message: '请输入签名秘钥' }],
     reqSign: [{ required: true, message: '请选择是否验签' }],
     limitAmount: [{ required: true, message: '请输入支付限额(元)' }],
diff --git a/src/views/daxpay/common/merchant/app/MchAppList.vue b/src/views/daxpay/common/merchant/app/MchAppList.vue
index 522fda92..2e01797c 100644
--- a/src/views/daxpay/common/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppList.vue
@@ -44,6 +44,11 @@
               <a-tag>{{ dictConvert('merchant_notify_type', row.notifyType) || '空' }}</a-tag>
             </template>
           </vxe-column>
+          <vxe-column field="status" title="应用状态" :min-width="100">
+            <template #default="{ row }">
+              <a-tag>{{ dictConvert('mch_app_status', row.status) || '空' }}</a-tag>
+            </template>
+          </vxe-column>
           <vxe-column field="notifyUrl" title="通知地址" :min-width="220" />
           <vxe-column field="createTime" title="创建时间" :min-width="120" />
           <vxe-column fixed="right" :width="220" :showOverflow="false" title="操作">
diff --git a/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue b/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
index e4bf0f57..8d2d324c 100644
--- a/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
+++ b/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
@@ -25,17 +25,25 @@
   function show(record: ChannelConfig) {
     switch (record.channel) {
       case ChannelEnum.ALI: {
-        alipay.value.init(record)
+        alipay.value.init(record, false)
         break
       }
-      case ChannelEnum.WECHAT: {
-        wechat.value.init(record)
+      case ChannelEnum.ALI_ISV: {
+        alipay.value.init(record, true)
         break
       }
       case ChannelEnum.UNION_PAY: {
         union.value.init(record)
         break
       }
+      case ChannelEnum.WECHAT: {
+        wechat.value.init(record)
+        break
+      }
+      case ChannelEnum.WECHAT_ISV: {
+        wechat.value.init(record, true)
+        break
+      }
       default: {
         createMessage.info('暂未支持, 请期待...')
       }
diff --git a/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue b/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
index 7fe9a8da..0071b53f 100644
--- a/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
+++ b/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
@@ -113,8 +113,12 @@
     switch (type) {
       case ChannelEnum.ALI:
         return alipay
+      case ChannelEnum.ALI_ISV:
+        return alipay
       case ChannelEnum.WECHAT:
         return wechat
+      case ChannelEnum.WECHAT_ISV:
+        return wechat
       case ChannelEnum.UNION_PAY:
         return unionPay
       default:
diff --git a/src/views/daxpay/common/order/transfer/TransferOrder.api.ts b/src/views/daxpay/common/order/transfer/TransferOrder.api.ts
index 2aa155d0..422cb883 100644
--- a/src/views/daxpay/common/order/transfer/TransferOrder.api.ts
+++ b/src/views/daxpay/common/order/transfer/TransferOrder.api.ts
@@ -46,7 +46,7 @@ export function transfer(params) {
 /**
  * 转账信息同步
  */
-export function syncByTransferNo(id) {
+export function syncByTransferId(id) {
   return defHttp.post<Result<void>>({
     url: '/order/transfer/sync',
     params: { id },
diff --git a/src/views/daxpay/common/order/transfer/TransferOrderList.vue b/src/views/daxpay/common/order/transfer/TransferOrderList.vue
index 2cafd091..1fec5b21 100644
--- a/src/views/daxpay/common/order/transfer/TransferOrderList.vue
+++ b/src/views/daxpay/common/order/transfer/TransferOrderList.vue
@@ -105,13 +105,13 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, onMounted, ref, watch } from 'vue'
+  import { computed, onMounted, ref } from 'vue'
   import {
     closeTransfer,
     getTotalAmount,
     page,
     retryTransfer,
-    syncByTransferNo,
+    syncByTransferId,
     cellStyle,
   } from './TransferOrder.api'
   import useTablePage from '@/hooks/bootx/useTablePage'
@@ -125,7 +125,6 @@
   import ALink from '/@/components/Link/Link.vue'
   import { TransferStatusEnum } from '@/enums/daxpay/tradeStatusEnum'
   import { Icon } from '@/components/Icon'
-  import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
   import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
@@ -233,10 +232,10 @@
     createConfirm({
       iconType: 'warning',
       title: '警告',
-      content: '是否同步退款信息',
+      content: '是否同步转账信息',
       onOk: () => {
         loading.value = true
-        syncByTransferNo(record.transferNo).then(() => {
+        syncByTransferId(record.id).then(() => {
           createMessage.success('同步成功')
           queryPage()
         })
diff --git a/src/views/sys/login/LoginForm.vue b/src/views/sys/login/LoginForm.vue
index f035bccb..1ade41a0 100644
--- a/src/views/sys/login/LoginForm.vue
+++ b/src/views/sys/login/LoginForm.vue
@@ -88,6 +88,7 @@
   import { Rule } from 'ant-design-vue/lib/form'
   import { getAppEnvConfig } from '@/utils/env'
   import { imgCaptcha } from '@/api/common/Captcha'
+  import { LoginType } from '@/api/common/LoginAssist'
 
   const { notification } = useMessage()
   // 用户信息存储
diff --git a/types/store.d.ts b/types/store.d.ts
index da33ca6f..d57828be 100644
--- a/types/store.d.ts
+++ b/types/store.d.ts
@@ -1,6 +1,5 @@
 import { ErrorTypeEnum } from '@/enums/exceptionEnum'
 import { MenuModeEnum, MenuTypeEnum } from '@/enums/menuEnum'
-import { RoleInfo } from '@/api/sys/model/userModel'
 
 export interface ApiAddress {
   key: string
-- 
Gitee