Browse Source

1.修复开关拖入时报错问题

2.关联选项设置弹窗样式修复
lwx_v27
liwenxuan 1 month ago
parent
commit
ea50469f21
  1. 4
      src/components/DesignForm/formControlPropertiNew.vue
  2. 44
      src/components/DesignForm/public/form/formItem.vue

4
src/components/DesignForm/formControlPropertiNew.vue

@ -6911,7 +6911,7 @@ const formatTooltip = (val: number) => {
width="50%" width="50%"
> >
<template v-if="controlData.type == 'switch'"> <template v-if="controlData.type == 'switch'">
<div style="display: flex; margin-bottom: 20px; margin-top: 20px"> <div style="display: flex; margin-bottom: 20px; margin-top: 20px;width: 100%;">
<span style="font-size: larger; margin-left: 35px; margin-right: 15px" <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
>当开关打开时显示</span >当开关打开时显示</span
> >
@ -6922,7 +6922,7 @@ const formatTooltip = (val: number) => {
multiple multiple
/> />
</div> </div>
<div style="display: flex"> <div style="display: flex;width: 100%;">
<span style="font-size: larger; margin-left: 35px; margin-right: 15px" <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
>当开关关闭时显示</span >当开关关闭时显示</span
> >

44
src/components/DesignForm/public/form/formItem.vue

@ -1426,10 +1426,9 @@ const diGuiJilian = (val: any, options: any[]) => {
" "
v-model="value" v-model="value"
/> />
<component <!-- <component
v-if=" v-if="
[ [
'switch',
'inputNumber', 'inputNumber',
].includes(data.type) ].includes(data.type)
" "
@ -1446,7 +1445,46 @@ const diGuiJilian = (val: any, options: any[]) => {
:rowIndex="rowIndex" :rowIndex="rowIndex"
@change="onValueChange(data.type)" @change="onValueChange(data.type)"
v-model="value" v-model="value"
/> /> -->
<div >
<!-- data^^^{{ data }}---------
currentComponent^^^{{ currentComponent }}---------
control^^^{{ control }}---------
type^^^{{ type }}---------
rowIndex^^^{{ rowIndex }}---------
value^^^{{ value }} -->
<el-switch
v-if="
[
'switch',
].includes(data.type)
"
v-model="value"
:active-value="data.control.activeValue"
:inactive-value="data.control.inactiveValue"
></el-switch>
</div>
<!-- <component
v-if="
[
'switch',
].includes(data.type)
"
:is="currentComponent"
v-bind="control"
:disabled="judgeIsDisabled(data.name)"
:placeholder="
data.control.placeholder
? data.control.placeholder
: '请选择' + getLabel(data.item)
"
:data="data"
:type="type"
:rowIndex="rowIndex"
@change="onValueChange(data.type)"
v-model="value"
/> -->
<component <component
v-if=" v-if="
[ [

Loading…
Cancel
Save