Merge remote-tracking branch 'origin/feature/feature-20250331-h5' into feature/feature-20250331-h5

This commit is contained in:
陈昱达
2025-03-22 15:00:58 +08:00

View File

@@ -1,7 +1,7 @@
<template>
<van-cell title="文件数量" :border="false" label-align="left"> </van-cell>
<van-field
v-model="actionQuestion.config.min_number"
:model-value="displayValue(actionQuestion.config.min_number)"
label="最少"
type="digit"
:border="false"
@@ -9,10 +9,10 @@
input-align="right"
class="action-field"
placeholder="不限"
@blur="minMax"
@blur="handleMinNumberBlur"
@update:model-value="
(value) => {
actionQuestion.config.min_number = value;
actionQuestion.config.min_number = value === '' ? 0 : value;
}
"
>
@@ -21,17 +21,17 @@
</template>
</van-field>
<van-field
v-model="actionQuestion.config.max_number"
:model-value="displayValue(actionQuestion.config.max_number)"
label="最多"
type="digit"
:border="false"
placeholder="不限"
input-align="right"
class="action-field"
@blur="emit('saveOption')"
@blur="handleMaxNumberBlur"
@update:model-value="
(value) => {
actionQuestion.config.max_number = value;
actionQuestion.config.max_number = value === '' ? 0 : value;
}
"
>
@@ -42,7 +42,7 @@
<van-divider></van-divider>
<van-cell title="文件大小" :border="false" label-align="left"> </van-cell>
<van-field
v-model="actionQuestion.config.min_size"
:model-value="displayValue(actionQuestion.config.min_size)"
label="最少"
type="number"
:border="false"
@@ -50,10 +50,10 @@
input-align="right"
class="action-field"
placeholder="不限"
@blur="emit('saveOption')"
@blur="handleMinSizeBlur"
@update:model-value="
(value) => {
actionQuestion.config.min_size = value;
actionQuestion.config.min_size = value === '' ? 0 : value;
}
"
>
@@ -62,17 +62,17 @@
</template>
</van-field>
<van-field
v-model="actionQuestion.config.max_size"
:model-value="displayValue(actionQuestion.config.max_size)"
label="最多"
type="number"
:border="false"
placeholder="不限"
input-align="right"
class="action-field"
@blur="emit('saveOption')"
@blur="handleMaxSizeBlur"
@update:model-value="
(value) => {
actionQuestion.config.max_size = value;
actionQuestion.config.max_size = value === '' ? 0 : value;
}
"
>
@@ -115,13 +115,56 @@ const actionQuestion = computed({
return props.modelValue;
},
set(newValue) {
console.log(`newValue`, newValue);
emit('update:modelValue', newValue);
}
});
// 处理显示值如果值为0则返回空字符串以显示placeholder
const displayValue = (value) => {
return value == 0 ? '' : value;
};
// 处理最小数量失焦事件
const handleMinNumberBlur = (e) => {
// 如果输入为空设置为0
if (e.target.value === '') {
actionQuestion.value.config.min_number = 0;
}
minMax(e);
};
// 处理最大数量失焦事件
const handleMaxNumberBlur = (e) => {
// 如果输入为空设置为0
if (e.target.value === '') {
actionQuestion.value.config.max_number = 0;
}
emit('saveOption');
};
// 处理最小大小失焦事件
const handleMinSizeBlur = (e) => {
// 如果输入为空设置为0
if (e.target.value === '') {
actionQuestion.value.config.min_size = 0;
}
emit('saveOption');
};
// 处理最大大小失焦事件
const handleMaxSizeBlur = (e) => {
// 如果输入为空设置为0
if (e.target.value === '') {
actionQuestion.value.config.max_size = 0;
}
emit('saveOption');
};
// 最小大于最大 同步到最大
const minMax = (e) => {
if (Number(e.target.value) > Number(actionQuestion.value.config.max_number)) {
const minValue = e.target.value === '' ? 0 : Number(e.target.value);
if (minValue > Number(actionQuestion.value.config.max_number)) {
actionQuestion.value.config.min_number = actionQuestion.value.config.max_number;
}
emit('saveOption');
@@ -181,9 +224,9 @@ onMounted(() => {
watch(
() => actionQuestion.value.config.min_number,
(minVal) => {
console.log(minVal);
// console.log(minVal);
minVal = Number(minVal);
console.log(typeof minVal);
// console.log(typeof minVal);
let max_number = Number(actionQuestion.value.config.max_number);
if (minVal > 1000) {
actionQuestion.value.config.max_number = 9999;
@@ -220,9 +263,9 @@ watch(
watch(
() => actionQuestion.value.config.min_size,
(minVal) => {
console.log(minVal);
// console.log(minVal);
minVal = Number(minVal);
console.log(typeof minVal);
// console.log(typeof minVal);
let max_number = Number(actionQuestion.value.config.max_size);
if (minVal > 1024) {
actionQuestion.value.config.max_size = 1024;