优化增加第三方【每日推送】原始数据记录日志.log

web/src/views/backend/mall/address/index.vue

@@ -50,6 +50,17 @@ const formatRegion = (raw: string) => {
     return s.replace(/[,，\s]+/g, ',')
 }
 
+const normalizeRegionInput = (raw: unknown) => {
+    const s = String(raw ?? '').trim()
+    if (!s) return ''
+    return s
+        .replace(/，/g, ',')
+        .split(',')
+        .map((part) => part.trim())
+        .filter(Boolean)
+        .join(',')
+}
+
 /**
  * baTable 内包含了表格的所有数据且数据具备响应性，然后通过 provide 注入给了后代组件
  */
@@ -145,6 +156,15 @@ const baTable = new baTableClass(
     },
     {
         defaultItems: {},
+    },
+    {
+        onSubmit: () => {
+            const items = baTable.form.items
+            if (items && items.region !== undefined && items.region !== null) {
+                items.region = normalizeRegionInput(items.region)
+            }
+            return true
+        },
     }
 )
 

web/src/views/backend/mall/address/popupForm.vue

@@ -53,10 +53,10 @@
                     />
                     <FormItem
                         :label="t('mall.address.region')"
-                        type="city"
+                        type="string"
                         v-model="baTable.form.items!.region"
                         prop="region"
-                        :placeholder="t('Please select field', { field: t('mall.address.region') })"
+                        :placeholder="t('mall.address.region_tip')"
                     />
                     <FormItem
                         :label="t('mall.address.detail_address')"

web/src/views/backend/mall/dailyPush/exportDialog.vue

@@ -32,7 +32,7 @@
         <div class="export-section">
             <div class="section-title">{{ t('mall.dailyPush.export_limit') }}</div>
             <div class="limit-row">
-                <el-input-number v-model="form.exportLimit" :min="1" :max="maxLimit" :step="1000" controls-position="right" />
+                <el-input-number v-model="form.exportLimit" :min="0" :max="matchedCount || undefined" :step="1000" controls-position="right" />
                 <div class="limit-presets">
                     <el-button
                         v-for="preset in limitPresets"
@@ -43,19 +43,19 @@
                     >
                         {{ preset }}
                     </el-button>
-                    <el-button size="small" :type="form.exportLimit === matchedCount ? 'primary' : 'default'" @click="useMatchedCount">
+                    <el-button size="small" :type="form.exportLimit === 0 ? 'primary' : 'default'" @click="useMatchedCount">
                         {{ t('mall.dailyPush.export_all_matched') }}
                     </el-button>
                 </div>
             </div>
             <div class="count-info" v-loading="countLoading">
                 {{ t('mall.dailyPush.export_matched_count', { count: matchedCount }) }}
-                <span v-if="actualExportCount < form.exportLimit">
+                <span v-if="actualExportCount > 0">
                     ，{{ t('mall.dailyPush.export_actual_count', { count: actualExportCount }) }}
                 </span>
             </div>
-            <el-alert v-if="form.exportLimit > 10000" type="warning" :closable="false" class="large-export-warning">
-                {{ t('mall.dailyPush.export_large_warning', { max: maxLimit }) }}
+            <el-alert v-if="actualExportCount > 10000" type="warning" :closable="false" class="large-export-warning">
+                {{ t('mall.dailyPush.export_large_warning') }}
             </el-alert>
         </div>
 
@@ -84,7 +84,6 @@ const visible = defineModel<boolean>({ default: false })
 const exporting = ref(false)
 const countLoading = ref(false)
 const matchedCount = ref(0)
-const maxLimit = ref(100000)
 const limitPresets = [1000, 5000, 10000, 50000]
 
 const fieldOptions = computed(() => [
@@ -101,10 +100,15 @@ const fieldOptions = computed(() => [
 
 const form = reactive({
     fields: fieldOptions.value.map((item) => item.value),
-    exportLimit: 10000,
+    exportLimit: 0,
 })
 
-const actualExportCount = computed(() => Math.min(form.exportLimit, matchedCount.value, maxLimit.value))
+const actualExportCount = computed(() => {
+    if (form.exportLimit <= 0) {
+        return matchedCount.value
+    }
+    return Math.min(form.exportLimit, matchedCount.value)
+})
 
 const selectAllFields = () => {
     form.fields = fieldOptions.value.map((item) => item.value)
@@ -115,7 +119,7 @@ const clearFields = () => {
 }
 
 const useMatchedCount = () => {
-    form.exportLimit = Math.min(matchedCount.value || 1, maxLimit.value)
+    form.exportLimit = 0
 }
 
 const buildExportParams = () => {
@@ -123,7 +127,7 @@ const buildExportParams = () => {
     return {
         ...filter,
         fields: form.fields,
-        export_limit: actualExportCount.value,
+        export_limit: form.exportLimit <= 0 ? 0 : form.exportLimit,
     }
 }
 
@@ -136,7 +140,6 @@ const loadMatchedCount = async () => {
             params: baTable.table.filter || {},
         })
         matchedCount.value = res.data.count
-        maxLimit.value = res.data.max_limit
     } catch {
         matchedCount.value = baTable.table.total || 0
     } finally {
@@ -197,7 +200,7 @@ const submitExport = async () => {
 
         const disposition = String(response.headers['content-disposition'] || '')
         const filenameMatch = disposition.match(/filename="?([^";]+)"?/i)
-        const filename = filenameMatch?.[1] || `daily_push_${Date.now()}.csv`
+        const filename = filenameMatch?.[1] || `daily_push_${Date.now()}.xlsx`
         downloadBlob(blob, filename)
 
         ElNotification({