OMC/fe.ems.vue3
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 参数配置array显示枚举值

Browse Source
This commit is contained in:
TsMask
2023-11-21 15:54:36 +08:00
parent 129c9085d5
commit 5e8049c3b3
4 changed files with 63 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/configManage/configParam/index.vue
View File

@@ -1434,7 +1434,12 @@ onMounted(() => {
</span> </span>
</template> </template>
<div v-else class="editable-cell__text-wrapper"> <div v-else class="editable-cell__text-wrapper">
{{ `${text.value}` || '&nbsp;' }} <template v-if="text['type'] === 'enum'">
{{ JSON.parse(text['filter'])[text.value] }}
</template>
<template v-else>
{{ `${text.value}` || '&nbsp;' }}
</template>
</div> </div>
</div> </div>
</a-tooltip> </a-tooltip>
@@ -1622,7 +1627,12 @@ onMounted(() => {
{{ t('common.viewText') }} {{ t('common.viewText') }}
</a-button> </a-button>
<div v-else class="editable-cell__text-wrapper"> <div v-else class="editable-cell__text-wrapper">
{{ `${text.value}` || '&nbsp;' }} <template v-if="text['type'] === 'enum'">
{{ JSON.parse(text['filter'])[text.value] }}
</template>
<template v-else>
{{ `${text.value}` || '&nbsp;' }}
</template>
</div> </div>
</div> </div>
</a-tooltip> </a-tooltip>

24
src/views/configManage/configParamForm/index.vue
View File

@@ -888,7 +888,9 @@ function ruleVerification(row: Record<string, any>): (string | boolean)[] {
if (!rule.test(value)) { if (!rule.test(value)) {
return [ return [
false, false,
t('views.configManage.configParamForm.requireString', { display }), t('views.configManage.configParamForm.requireString', {
display,
}),
]; ];
} }
} catch (error) { } catch (error) {
@@ -904,7 +906,9 @@ function ruleVerification(row: Record<string, any>): (string | boolean)[] {
if (!regex.test(value)) { if (!regex.test(value)) {
return [ return [
false, false,
t('views.configManage.configParamForm.requireString', { display }), t('views.configManage.configParamForm.requireString', {
display,
}),
]; ];
} }
} catch (error) { } catch (error) {
@@ -1357,7 +1361,12 @@ onMounted(() => {
</a-button> </a-button>
<div v-else> <div v-else>
{{ `${item.value}` || '&nbsp;' }} <template v-if="item['type'] === 'enum'">
{{ JSON.parse(item['filter'])[item.value] }}
</template>
<template v-else>
{{ `${item.value}` || '&nbsp;' }}
</template>
</div> </div>
</div> </div>
</a-tooltip> </a-tooltip>
@@ -1581,7 +1590,14 @@ onMounted(() => {
</a-button> </a-button>
<div v-else> <div v-else>
{{ `${item.value || '&nbsp;'}` }} <template v-if="item['type'] === 'enum'">
{{
JSON.parse(item['filter'])[item.value]
}}
</template>
<template v-else>
{{ `${item.value}` || '&nbsp;' }}
</template>
</div> </div>
</div> </div>
</a-tooltip> </a-tooltip>

24
src/views/configManage/configParamTree/index.vue
View File

@@ -1399,7 +1399,12 @@ onMounted(() => {
</template> </template>
<div v-else> <div v-else>
{{ `${item.value}` || '&nbsp;' }} <template v-if="item['type'] === 'enum'">
{{ JSON.parse(item['filter'])[item.value] }}
</template>
<template v-else>
{{ `${item.value}` || '&nbsp;' }}
</template>
</div> </div>
</div> </div>
</a-tooltip> </a-tooltip>
@@ -1608,9 +1613,11 @@ onMounted(() => {
</div> </div>
<template v-else-if="item.array"> <template v-else-if="item.array">
<span v-if="arrayChildState.newIndex === -1"> <span
v-if="arrayChildState.newIndex === -1"
>
- -
</span> </span>
<a-button <a-button
type="default" type="default"
size="small" size="small"
@@ -1618,7 +1625,7 @@ onMounted(() => {
> >
<template #icon> <template #icon>
<BarsOutlined /> <BarsOutlined />
</template> </template>
{{ {{
t( t(
'views.configManage.configParamForm.arrayMore' 'views.configManage.configParamForm.arrayMore'
@@ -1628,7 +1635,14 @@ onMounted(() => {
</template> </template>
<div v-else> <div v-else>
{{ `${item.value || '&nbsp;'}` }} <template v-if="item['type'] === 'enum'">
{{
JSON.parse(item['filter'])[item.value]
}}
</template>
<template v-else>
{{ `${item.value}` || '&nbsp;' }}
</template>
</div> </div>
</div> </div>
</a-tooltip> </a-tooltip>

14
src/views/configManage/configParamTreeTable/index.vue
View File

@@ -1345,7 +1345,12 @@ onMounted(() => {
</template> </template>
<div v-else class="editable-cell__text-wrapper"> <div v-else class="editable-cell__text-wrapper">
{{ `${text.value}` || '&nbsp;' }} <template v-if="text['type'] === 'enum'">
{{ JSON.parse(text['filter'])[text.value] }}
</template>
<template v-else>
{{ `${text.value}` || '&nbsp;' }}
</template>
</div> </div>
</div> </div>
</a-tooltip> </a-tooltip>
@@ -1420,7 +1425,12 @@ onMounted(() => {
</template> </template>
<div v-else> <div v-else>
{{ `${text.value || '&nbsp;'}` }} <template v-if="text['type'] === 'enum'">
{{ JSON.parse(text['filter'])[text.value] }}
</template>
<template v-else>
{{ `${text.value}` || '&nbsp;' }}
</template>
</div> </div>
</div> </div>
</a-tooltip> </a-tooltip>