Commit eb8e8940 authored by 皮倩雯's avatar 皮倩雯

fix: '修复表字段形态搜索选择器多选bug'

parent 7e78c5df
Pipeline #62144 passed with stages
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1666249005370" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2857" data-spm-anchor-id="a313x.7781069.0.i17" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M517.4 486.4c39.3-80.9 17.5-181.1-56.9-237.9-84.9-64.7-206.2-48.4-270.9 36.5s-48.4 206.3 36.5 271c74.4 56.7 176.8 51.2 244.4-8.1l341.2 260.2c17.2 13.1 41.1 9.9 54.2-7.3s9.9-41.1-7.3-54.2l-30.7-23.4 37.5-49.2c13.1-17.2 9.9-41.1-7.3-54.2-17.2-13.1-41.1-9.9-54.2 7.3l-14.1 18.4-36.8-28 14-18.5c13.1-17.2 9.9-41.1-7.3-54.2-17.2-13.1-41.1-9.9-54.2 7.3L668 601.3 517.4 486.4zM413.6 310.1c51 38.9 60.8 111.5 21.9 162.6S324 533.4 273 494.5 212.1 383 251.1 332c38.9-51.1 111.5-60.8 162.5-21.9z" p-id="2858" fill="#EDAC32"></path></svg>
\ No newline at end of file
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1666248846700" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2358" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M843.5 737.4c-12.4-75.2-79.2-129.1-155.3-125.4S550.9 676 546 752c-153.5-4.8-208-40.7-199.1-113.7 3.3-27.3 19.8-41.9 50.1-49 18.4-4.3 38.8-4.9 57.3-3.2 1.7 0.2 3.5 0.3 5.2 0.5 11.3 2.7 22.8 5 34.3 6.8 34.1 5.6 68.8 8.4 101.8 6.6 92.8-5 156-45.9 159.2-132.7 3.1-84.1-54.7-143.7-147.9-183.6-29.9-12.8-61.6-22.7-93.3-30.2-14.3-3.4-26.3-5.7-35.2-7.2-7.9-75.9-71.5-133.8-147.8-134.4-76.3-0.6-140.9 56.1-150.1 131.9s40 146.3 114.2 163.9c74.2 17.6 149.9-23.3 175.7-95.1 9.4 1.7 18.7 3.6 28 5.8 28.2 6.6 56.4 15.4 82.4 26.6 70.7 30.2 109.3 70.1 107.5 119.9-1.6 44.6-33.6 65.2-96.2 68.6-27.5 1.5-57.6-0.9-87.3-5.8-8.3-1.4-15.9-2.8-22.6-4.3-3.9-0.8-6.6-1.5-7.8-1.8l-3.1-0.6c-2.2-0.3-5.9-0.8-10.7-1.3-25-2.3-52.1-1.5-78.5 4.6-55.2 12.9-93.9 47.2-101.1 105.8-15.7 126.2 78.6 184.7 276 188.9 29.1 70.4 106.4 107.9 179.6 87 73.3-20.9 119.3-93.4 106.9-168.6zM329.1 345.2c-46 0-83.3-37.3-83.3-83.3s37.3-83.3 83.3-83.3 83.3 37.3 83.3 83.3-37.3 83.3-83.3 83.3zM695.6 845c-46 0-83.3-37.3-83.3-83.3s37.3-83.3 83.3-83.3 83.3 37.3 83.3 83.3-37.3 83.3-83.3 83.3z" p-id="2359" fill="#0b988f"></path></svg>
\ No newline at end of file
......@@ -27,6 +27,8 @@ import {
KeyOutlined,
} from '@ant-design/icons';
import styles from './TableView.less';
import primaryKey from '../../../../../assets/images/icons/主键.svg';
import index from '../../../../../assets/images/icons/索引.svg';
// import { defaultFields } from './defaultFields';
const EditableContext = React.createContext(null);
......@@ -523,7 +525,10 @@ const TableView = props => {
{console.log(record)}
<span>{text}</span>
{record.IsIndex && (
<KeyOutlined style={{ color: '#d0d328', fontSize: '20px', marginLeft: '15px' }} />
<img src={index} style={{ height: '25px', marginLeft: '5px' }} alt="" />
)}
{record.IsPrimaryKey && (
<img src={primaryKey} style={{ height: '25px', marginLeft: '5px' }} alt="" />
)}
</>
),
......
......@@ -267,12 +267,10 @@ const AddModal = props => {
if (obj.Config.endsWith('.n')) {
data[0].Config = obj.Config;
} else {
if(radiostyle==1){
// 平铺值选择器
data[0].Config = radio == 0 ? `${obj.Config}` : `${obj.Config}.n`;
}else{
data[0].Config=obj.Config
}
}
break;
case '部门选择器':
......@@ -2138,12 +2136,9 @@ const AddModal = props => {
if (obj.Config.endsWith('.n')) {
data[0].Config = obj.Config;
} else {
if(radiostyle==1){
// 平铺值选择器
data[0].Config = radio == 0 ? `${obj.Config}` : `${obj.Config}.n`;
}else{
data[0].Config=obj.Config
}
}
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment