style: 高级筛选-时间显示&视图下拉交互

--bug=1046458 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001046458
--bug=1046495 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001046495
--bug=1046413 --user=吕梦园
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001046413
This commit is contained in:
teukkk 2024-09-18 15:18:40 +08:00 committed by Craftsman
parent 3aeccbb4eb
commit ace829f19b
4 changed files with 19 additions and 30 deletions

View File

@ -57,14 +57,14 @@
</div> </div>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item :field="`list[${listIndex}].operator`" class="w-[120px]" hide-asterisk> <a-form-item :field="`list[${listIndex}].operator`" class="w-[105px]" hide-asterisk>
<a-select v-model="item.operator" :disabled="!item.dataIndex" @change="operatorChange(item, listIndex)"> <a-select v-model="item.operator" :disabled="!item.dataIndex" @change="operatorChange(item, listIndex)">
<a-option v-for="option in operatorOptionsMap[item.type]" :key="option.value" :value="option.value"> <a-option v-for="option in operatorOptionsMap[item.type]" :key="option.value" :value="option.value">
{{ t(option.label as string) }} {{ t(option.label as string) }}
</a-option> </a-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item class="flex-1 overflow-hidden" :field="`list[${listIndex}].value`" hide-asterisk> <a-form-item class="flex-[1.5] overflow-hidden" :field="`list[${listIndex}].value`" hide-asterisk>
<a-textarea <a-textarea
v-if="item.type === FilterType.TEXTAREA" v-if="item.type === FilterType.TEXTAREA"
v-model:model-value="item.value" v-model:model-value="item.value"
@ -126,6 +126,7 @@
v-model:model-value="item.value" v-model:model-value="item.value"
:data="item.treeSelectData" :data="item.treeSelectData"
:disabled="isValueDisabled(item)" :disabled="isValueDisabled(item)"
allow-clear
allow-search allow-search
:placeholder="t('common.pleaseSelect')" :placeholder="t('common.pleaseSelect')"
:filter-tree-node="filterTreeNode" :filter-tree-node="filterTreeNode"
@ -137,6 +138,9 @@
}" }"
v-bind="item.treeSelectProps" v-bind="item.treeSelectProps"
> >
<template #label="{ data }">
<div class="one-line-text">{{ data.label }}</div>
</template>
<template #tree-slot-title="node"> <template #tree-slot-title="node">
<a-tooltip :content="`${node.name}`" position="tr"> <a-tooltip :content="`${node.name}`" position="tr">
<div class="one-line-text max-w-[170px]">{{ node.name }}</div> <div class="one-line-text max-w-[170px]">{{ node.name }}</div>
@ -147,7 +151,7 @@
v-else-if="item.type === FilterType.DATE_PICKER && item.operator !== OperatorEnum.BETWEEN" v-else-if="item.type === FilterType.DATE_PICKER && item.operator !== OperatorEnum.BETWEEN"
v-model:model-value="item.value" v-model:model-value="item.value"
show-time show-time
format="YYYY-MM-DD hh:mm" format="YYYY-MM-DD HH:mm"
:disabled="isValueDisabled(item)" :disabled="isValueDisabled(item)"
/> />
<a-range-picker <a-range-picker
@ -564,13 +568,6 @@
.arco-form-item-message { .arco-form-item-message {
margin-bottom: 0; margin-bottom: 0;
} }
.arco-select-view {
height: 32px;
.arco-select-view-inner {
@apply overflow-y-auto overflow-x-hidden;
.ms-scroll-bar();
}
}
} }
</style> </style>

View File

@ -118,7 +118,7 @@
> >
<template #icon> <template #icon>
<MsIcon <MsIcon
type="icon-icon_copy_outlined" type="icon-icon_filter"
:class="`${isAdvancedSearchMode ? 'text-[rgb(var(--primary-5))]' : 'text-[var(--color-text-4)]'}`" :class="`${isAdvancedSearchMode ? 'text-[rgb(var(--primary-5))]' : 'text-[var(--color-text-4)]'}`"
/> />
</template> </template>
@ -241,6 +241,17 @@
viewSelectOptionVisible.value = false; viewSelectOptionVisible.value = false;
} }
watch(
() => viewSelectOptionVisible.value,
(val) => {
if (!val) {
customViews.value.forEach((item) => {
item.isShowNameInput = false;
});
}
}
);
async function changeViewToFirstCustom() { async function changeViewToFirstCustom() {
await getUserViewList(); await getUserViewList();
currentView.value = customViews.value[0].id; currentView.value = customViews.value[0].id;

View File

@ -281,12 +281,4 @@
height: 100vh !important; height: 100vh !important;
border: 1px solid red; border: 1px solid red;
} }
//
:deep(.arco-select-view) {
height: 32px;
.arco-select-view-inner {
@apply overflow-y-auto overflow-x-hidden;
.ms-scroll-bar();
}
}
</style> </style>

View File

@ -304,14 +304,3 @@
} }
); );
</script> </script>
<style lang="less" scoped>
//
:deep(.arco-select-view) {
height: 32px;
.arco-select-view-inner {
@apply overflow-y-auto overflow-x-hidden;
.ms-scroll-bar();
}
}
</style>