收口(时间控件): 后管 8 对起止加 min/max 禁选 + 倒挂交换,并落全项目尺子
指令是"项目所有的前端时间控件 开始日期不能晚于结束日期"。普查(ops 仓 scripts/_census_time_controls.py)数出 55 个控件实例、21 个成对区间,裸奔的是 后管 8 对与麦象控制台 2 对:起止能选到倒挂,查询恒定返回空表且页面没有任何提示。 - utils/datetime.ts 新增 orderedPair;8 页两头各绑 :max/:min,并在 @change 把 倒挂的两端交换回状态——min/max 只灰掉日历面板里的非法日,手输、粘贴仍能越界。 - tests/date-range-order.test.ts(10 例):分母硬钉 19/2/30/4 实例与 8/0/11/2 对, 含真文件反例自证(裸对、只一头、只有 min/max、换成没登记的写法都要露出来); 同时钉住财务系统与麦象的分母,那两面回归也会在这支判红。 - tests/mount/date-range-order.mount.test.ts(3 例):真组件填倒挂值 → 两头落回 有序,且发出去的 startDate/endDate 同一条。 - 摘掉 DedupeRegistryPage 导出与 DuplicateCheckPage 查询里的两条 "开始日期不能晚于结束日期"拦截(交换接管后够不着,属死分支), task-254 那条"导出需做日期区间校验"的钉子改指 min/max + clampDatePair。 验证:npm test 1792 passed / 0 failed、vitest mount 10 passed、vue-tsc rc=0。
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
import { computed, onMounted, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { todayDateInput } from '@/utils/datetime'
|
||||
import { orderedPair, todayDateInput } from '@/utils/datetime'
|
||||
import {
|
||||
fetchUserSecretUsage,
|
||||
type AdminUserSecretUsageRow,
|
||||
@@ -24,6 +24,13 @@ const pageSize = ref(15)
|
||||
const keyword = ref('')
|
||||
const startDate = ref(todayDateInput())
|
||||
const endDate = ref(todayDateInput())
|
||||
/** min/max 挡不住手输,落值后把倒挂的起止交换回来。 */
|
||||
function clampDatePair(): void {
|
||||
const [s, e] = orderedPair(startDate.value, endDate.value)
|
||||
startDate.value = s
|
||||
endDate.value = e
|
||||
}
|
||||
|
||||
const groupFilter = ref<number | null>(null)
|
||||
const groupOptions = ref<GroupOption[]>([])
|
||||
|
||||
@@ -127,11 +134,11 @@ onMounted(load)
|
||||
<div class="form-row usage-filter-row">
|
||||
<div class="form-group" style="min-width: 160px">
|
||||
<label>开始日期</label>
|
||||
<input v-model="startDate" type="date" />
|
||||
<input v-model="startDate" type="date" :max="endDate" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 160px">
|
||||
<label>结束日期</label>
|
||||
<input v-model="endDate" type="date" />
|
||||
<input v-model="endDate" type="date" :min="startDate" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 200px">
|
||||
<label>用户名</label>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script setup lang="ts">
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import { formatDateTime, orderedPair } from '@/utils/datetime'
|
||||
/** 数据去重总数据(registry) · 像素复刻旧版 admin.html panel-dedupe-total-data(自绘:分组摘要 + 双行筛选 + 旧式表格/分页 + 编辑/导入弹窗 + 导出等待遮罩)。
|
||||
* script 逻辑沿用现有 Vue 实现(查询/编辑/删除/导入轮询/导出秒表)。 */
|
||||
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||
@@ -39,6 +39,13 @@ const page = ref(1)
|
||||
const pageSize = ref(10)
|
||||
/** 本页是累计台账,日期初值故意留空(默认当天会让首屏只剩今天新增的 ASIN);见 date-filter-default-today 护栏的 EXEMPT。 */
|
||||
const filter = reactive(createDedupeTotalFilterState())
|
||||
/** min/max 挡不住手输,落值后把倒挂的起止交换回来。 */
|
||||
function clampDatePair(): void {
|
||||
const [s, e] = orderedPair(filter.startDate, filter.endDate)
|
||||
filter.startDate = s
|
||||
filter.endDate = e
|
||||
}
|
||||
|
||||
const groups = ref<DedupeGroupOption[]>([])
|
||||
/** 非超管仅有一个可访问分组时,编辑/导入弹窗分组选择锁定为该组(保留展示、不可改)。 */
|
||||
const lockedGroupId = computed<number | null>(() => {
|
||||
@@ -271,11 +278,6 @@ async function submitImport(): Promise<void> {
|
||||
}
|
||||
|
||||
async function doExport(): Promise<void> {
|
||||
const { startDate, endDate } = filter
|
||||
if (startDate && endDate && startDate > endDate) {
|
||||
ElMessage.warning('开始日期不能晚于结束日期')
|
||||
return
|
||||
}
|
||||
if (exporting.value) return
|
||||
exporting.value = true
|
||||
startExportWait()
|
||||
@@ -368,11 +370,11 @@ onMounted(() => {
|
||||
<div class="dedupe-filter-date-row">
|
||||
<div class="form-group">
|
||||
<label>开始日期</label>
|
||||
<input v-model="filter.startDate" type="date" />
|
||||
<input v-model="filter.startDate" type="date" :max="filter.endDate" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>结束日期</label>
|
||||
<input v-model="filter.endDate" type="date" />
|
||||
<input v-model="filter.endDate" type="date" :min="filter.startDate" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="dedupe-filter-actions">
|
||||
<button class="btn btn-secondary" type="button" :disabled="exporting" @click="doExport">
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import { computed, nextTick, onMounted, ref, watch } from 'vue'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { formatDateTime, todayDateInput } from '@/utils/datetime'
|
||||
import { formatDateTime, orderedPair, todayDateInput } from '@/utils/datetime'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { fetchHistoryUserOptions } from './history-api.ts'
|
||||
import type { HistoryUserOption } from './history-user-option.ts'
|
||||
@@ -63,6 +63,13 @@ const userOptions = ref<HistoryUserOption[]>([])
|
||||
const usersLoading = ref(false)
|
||||
const startDate = ref(todayDateInput())
|
||||
const endDate = ref(todayDateInput())
|
||||
/** min/max 挡不住手输,落值后把倒挂的起止交换回来。 */
|
||||
function clampDatePair(): void {
|
||||
const [s, e] = orderedPair(startDate.value, endDate.value)
|
||||
startDate.value = s
|
||||
endDate.value = e
|
||||
}
|
||||
|
||||
const retentionDays = ref(7)
|
||||
|
||||
const totalPages = computed(() => Math.max(1, Math.ceil(total.value / pageSize.value)))
|
||||
@@ -294,11 +301,11 @@ onMounted(() => {
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 150px">
|
||||
<label>日志日期(起)</label>
|
||||
<input v-model="startDate" type="date" />
|
||||
<input v-model="startDate" type="date" :max="endDate" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 150px">
|
||||
<label>日志日期(止)</label>
|
||||
<input v-model="endDate" type="date" />
|
||||
<input v-model="endDate" type="date" :min="startDate" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label> </label>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
/** 生成记录页 · 像素复刻旧版 admin.html panel-history(自绘:form-box 筛选 + panel-box 表格 + 旧式分页 + thumb 缩略图)。
|
||||
* script 逻辑沿用现有 Vue 实现(查询/翻页/跳页/点击缩略图放大预览)。 */
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import { formatDateTime, orderedPair } from '@/utils/datetime'
|
||||
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||
import { fetchHistoryList, fetchHistoryUserOptions } from './history-api.ts'
|
||||
import type { HistoryUserOption } from './history-user-option.ts'
|
||||
@@ -23,6 +23,13 @@ const userOptions = ref<HistoryUserOption[]>([])
|
||||
const errorText = ref('')
|
||||
/** 起止时间初值故意留空:默认锁当天会让首屏只剩今天的生成记录(用户 2026-10-04 定案),见 date-filter-default-today 护栏的 EXEMPT。 */
|
||||
const filter = reactive({ userId: '', timeStart: '', timeEnd: '' })
|
||||
/** min/max 挡不住手输,落值后把倒挂的起止交换回来。 */
|
||||
function clampDatePair(): void {
|
||||
const [s, e] = orderedPair(filter.timeStart, filter.timeEnd)
|
||||
filter.timeStart = s
|
||||
filter.timeEnd = e
|
||||
}
|
||||
|
||||
|
||||
const previewVisible = ref(false)
|
||||
const previewItem = ref<HistoryRecordItem | null>(null)
|
||||
@@ -146,11 +153,11 @@ onMounted(() => {
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 176px">
|
||||
<label>开始时间</label>
|
||||
<input v-model="filter.timeStart" type="datetime-local" />
|
||||
<input v-model="filter.timeStart" type="datetime-local" :max="filter.timeEnd" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 176px">
|
||||
<label>结束时间</label>
|
||||
<input v-model="filter.timeEnd" type="datetime-local" />
|
||||
<input v-model="filter.timeEnd" type="datetime-local" :min="filter.timeStart" @change="clampDatePair" />
|
||||
</div>
|
||||
<button class="btn" type="button" @click="apply">查询</button>
|
||||
</div>
|
||||
|
||||
@@ -8,7 +8,7 @@ import { userNotice } from '@/api/user-notice'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import OldPagination from '@/components/OldPagination.vue'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import { formatDateTime, orderedPair } from '@/utils/datetime'
|
||||
import {
|
||||
fetchTaskCenterOverview,
|
||||
fetchTaskCenterShopOptions,
|
||||
@@ -65,6 +65,13 @@ function defaultTaskFilter(): TaskCenterTaskFilter {
|
||||
}
|
||||
|
||||
const filter = reactive<TaskCenterTaskFilter>(defaultTaskFilter())
|
||||
/** min/max 挡不住手输,落值后把倒挂的起止交换回来。 */
|
||||
function clampDatePair(): void {
|
||||
const [s, e] = orderedPair(filter.startTime, filter.endTime)
|
||||
filter.startTime = s
|
||||
filter.endTime = e
|
||||
}
|
||||
|
||||
const tasks = ref<TaskCenterTaskRow[]>([])
|
||||
const taskTotal = ref(0)
|
||||
const taskPage = ref(1)
|
||||
@@ -385,11 +392,11 @@ onUnmounted(() => {
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 190px">
|
||||
<label>创建时间(起)</label>
|
||||
<input v-model="filter.startTime" type="datetime-local" />
|
||||
<input v-model="filter.startTime" type="datetime-local" :max="filter.endTime" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 190px">
|
||||
<label>创建时间(止)</label>
|
||||
<input v-model="filter.endTime" type="datetime-local" />
|
||||
<input v-model="filter.endTime" type="datetime-local" :min="filter.startTime" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label> </label>
|
||||
|
||||
@@ -12,6 +12,7 @@ import { fetchDuplicateConsole, fetchDuplicateLedger, requestDuplicateExportBlob
|
||||
import { aggregateDrawerRows, drawerSummaryOf, dupWithinGroup, indexShopGroups, type DrawerAggRow, type DrawerSummary, type ShopGroups } from './duplicate-console-logic.ts'
|
||||
import type { DuplicateConsole, LedgerRow } from './duplicate-console-model.ts'
|
||||
import { ASIN_COUNTRY_CODES, asinCountryLabel } from '../asin/asin-country.ts'
|
||||
import { orderedPair } from '@/utils/datetime'
|
||||
|
||||
type Tab = 'dup' | 'ledger'
|
||||
type Scope = 'global' | 'group'
|
||||
@@ -22,6 +23,13 @@ const loadError = ref('')
|
||||
const reanalyzing = ref(false)
|
||||
|
||||
const filter = reactive({ asin: '', shop: '', group: '', country: '', dateFrom: '', dateTo: '' })
|
||||
/** min/max 挡不住手输,落值后把倒挂的起止交换回来。 */
|
||||
function clampDatePair(): void {
|
||||
const [s, e] = orderedPair(filter.dateFrom, filter.dateTo)
|
||||
filter.dateFrom = s
|
||||
filter.dateTo = e
|
||||
}
|
||||
|
||||
|
||||
/** 角色范围:超管可看全部分组店铺并可跨分组筛选;管理员数据已由后端裁剪到自己分组,无需分组筛选。 */
|
||||
const session = useAdminSessionStore()
|
||||
@@ -248,10 +256,6 @@ async function loadLedger(page: number, resetSort = false) {
|
||||
}
|
||||
|
||||
function applyQuery() {
|
||||
if (filter.dateFrom && filter.dateTo && filter.dateFrom > filter.dateTo) {
|
||||
toast('开始日期不能晚于结束日期')
|
||||
return
|
||||
}
|
||||
loadConsole()
|
||||
if (activeTab.value === 'ledger') loadLedger(1)
|
||||
}
|
||||
@@ -462,11 +466,11 @@ onMounted(() => {
|
||||
</div>
|
||||
<div class="f-group">
|
||||
<label>上架时间开始</label>
|
||||
<input type="date" v-model="filter.dateFrom" />
|
||||
<input type="date" v-model="filter.dateFrom" :max="filter.dateTo" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="f-group">
|
||||
<label>上架时间结束</label>
|
||||
<input type="date" v-model="filter.dateTo" />
|
||||
<input type="date" v-model="filter.dateTo" :min="filter.dateFrom" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="f-group">
|
||||
<label> </label>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script setup lang="ts">
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import { formatDateTime, orderedPair } from '@/utils/datetime'
|
||||
import { userNotice } from '@/api/user-notice'
|
||||
/** 视频任务记录页 · 像素复刻旧版 admin.html panel-image-video-tasks(自绘:form-box 筛选[用户名/提交起止+查询/重置] + panel-box toolbar[全选/批量下载/权限配置/汇总] + 任务卡片网格 + 旧式分页)。
|
||||
* script 逻辑沿用现有 Vue 实现(批量打包/明细抽屉/权限授权)。 */
|
||||
@@ -32,6 +32,12 @@ const pageSize = ref(10)
|
||||
const jumpPage = ref('')
|
||||
const totalPages = computed(() => Math.max(1, Math.ceil(totalTasks.value / pageSize.value)))
|
||||
|
||||
/** min/max 挡不住手输,落值后把倒挂的起止交换回来。 */
|
||||
function clampDatePair(): void {
|
||||
const [s, e] = orderedPair(filter.dateRange[0], filter.dateRange[1])
|
||||
filter.dateRange = [s, e]
|
||||
}
|
||||
|
||||
/** 提交时间初值故意留空:默认锁当天会让首屏只剩今天提交的任务(用户 2026-10-04 定案),见 date-filter-default-today 护栏的 EXEMPT。 */
|
||||
const filter = reactive<ImageVideoFilter & { dateRange: string[] }>({
|
||||
...createImageVideoFilter(),
|
||||
@@ -310,11 +316,11 @@ onMounted(load)
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 176px">
|
||||
<label>提交开始</label>
|
||||
<input v-model="filter.dateRange[0]" type="datetime-local" />
|
||||
<input v-model="filter.dateRange[0]" type="datetime-local" :max="filter.dateRange[1]" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 176px">
|
||||
<label>提交结束</label>
|
||||
<input v-model="filter.dateRange[1]" type="datetime-local" />
|
||||
<input v-model="filter.dateRange[1]" type="datetime-local" :min="filter.dateRange[0]" @change="clampDatePair" />
|
||||
</div>
|
||||
<button class="btn" type="button" @click="apply">查询</button>
|
||||
<button class="btn btn-secondary" type="button" @click="reset">重置</button>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script setup lang="ts">
|
||||
import { formatDateTime } from '@/utils/datetime'
|
||||
import { formatDateTime, orderedPair } from '@/utils/datetime'
|
||||
/** 店铺数据记录页 · 像素复刻旧版 admin.html panel-shop-data-crawl-tasks(自绘:form-box 筛选[h4 筛选条件] + panel-box toolbar[全选/批量下载/权限配置/汇总] + 每店卡片网格 + 旧式分页(店铺级+卡片级 9/页))。
|
||||
* script 逻辑沿用现有 Vue 实现(批量打包/删除结果文件[保留]/权限授权)。 */
|
||||
import { computed, onMounted, reactive, ref, watch } from 'vue'
|
||||
@@ -42,6 +42,12 @@ const cardPageSize = ref(10)
|
||||
const cardJump = ref('')
|
||||
const cardTotalPages = computed(() => Math.max(1, Math.ceil(allResultRows.value.length / cardPageSize.value)))
|
||||
|
||||
/** min/max 挡不住手输,落值后把倒挂的起止交换回来。 */
|
||||
function clampDatePair(): void {
|
||||
const [s, e] = orderedPair(filter.dateRange[0], filter.dateRange[1])
|
||||
filter.dateRange = [s, e]
|
||||
}
|
||||
|
||||
/** 创建时间初值故意留空:默认锁当天会让首屏只剩今天新建的任务(用户 2026-10-04 定案),见 date-filter-default-today 护栏的 EXEMPT。 */
|
||||
const filter = reactive<ShopDataFilter & { dateRange: string[] }>({
|
||||
...createShopDataFilter(),
|
||||
@@ -329,11 +335,11 @@ onMounted(load)
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 176px">
|
||||
<label>创建开始</label>
|
||||
<input v-model="filter.dateRange[0]" type="datetime-local" />
|
||||
<input v-model="filter.dateRange[0]" type="datetime-local" :max="filter.dateRange[1]" @change="clampDatePair" />
|
||||
</div>
|
||||
<div class="form-group" style="min-width: 176px">
|
||||
<label>创建结束</label>
|
||||
<input v-model="filter.dateRange[1]" type="datetime-local" />
|
||||
<input v-model="filter.dateRange[1]" type="datetime-local" :min="filter.dateRange[0]" @change="clampDatePair" />
|
||||
</div>
|
||||
<button class="btn" type="button" @click="apply">查询</button>
|
||||
<button class="btn btn-secondary" type="button" @click="reset">重置</button>
|
||||
|
||||
@@ -45,6 +45,15 @@ export function todayDateTimeRange(now: Date = new Date()): [string, string] {
|
||||
return [`${day}T00:00`, `${day}T23:59`]
|
||||
}
|
||||
|
||||
/**
|
||||
* 起止成对筛选的统一钳制:input 上的 min/max 只灰掉日历面板里的非法日,
|
||||
* 手输、粘贴、清空再填仍能越界,所以落值后把倒挂的两端交换——
|
||||
* 输入框显示与发出去的查询区间始终是同一条。
|
||||
*/
|
||||
export function orderedPair(start: string, end: string): [string, string] {
|
||||
return start && end && start > end ? [end, start] : [start, end]
|
||||
}
|
||||
|
||||
function padDate(d: Date): string {
|
||||
const y = d.getFullYear()
|
||||
const mo = pad(d.getMonth() + 1)
|
||||
|
||||
Reference in New Issue
Block a user