Commit fb8e2feb authored by 田翔's avatar 田翔

fix: 补充提交

parent ca0f3eb9
{ {
"name": "panda-xform", "name": "panda-xform",
"version": "6.0.14", "version": "6.0.16",
"description": "6.0.14 搜索地址改为回车搜素", "description": "6.0.16 补充提交",
"keywords": [ "keywords": [
"panda-xform" "panda-xform"
], ],
......
...@@ -56,7 +56,6 @@ const TablePack = (props, ref) => { ...@@ -56,7 +56,6 @@ const TablePack = (props, ref) => {
const { fieldName, columnWidth, isSort, accurateSearch, alignment } = v const { fieldName, columnWidth, isSort, accurateSearch, alignment } = v
const { widget, sourceType, options, addonAfter } = json?.[fieldName] || {} const { widget, sourceType, options, addonAfter } = json?.[fieldName] || {}
let searchProps = {} let searchProps = {}
// console.log('json?.[fieldName]', json?.[fieldName])
if (accurateSearch) { if (accurateSearch) {
if (['CheckBox', 'ComboBox', 'RadioButton'].includes(widget)) { if (['CheckBox', 'ComboBox', 'RadioButton'].includes(widget)) {
if (sourceType === '手动输入') { if (sourceType === '手动输入') {
...@@ -152,7 +151,7 @@ const TablePack = (props, ref) => { ...@@ -152,7 +151,7 @@ const TablePack = (props, ref) => {
if (['Coordinate', 'Device', 'DrawPath', 'DrawArea'].includes(widget)) { if (['Coordinate', 'Device', 'DrawPath', 'DrawArea'].includes(widget)) {
return <CoordView {...props} /> return <CoordView {...props} />
} }
if (['RadioButton', 'CheckBox'].includes(widget)) { if (['RadioButton', 'CheckBox', 'ComboBox'].includes(widget)) {
return <SelectView {...props} /> return <SelectView {...props} />
} }
if (['DateTime'].includes(widget)) { if (['DateTime'].includes(widget)) {
...@@ -273,7 +272,7 @@ const TablePack = (props, ref) => { ...@@ -273,7 +272,7 @@ const TablePack = (props, ref) => {
if (['Coordinate', 'Device', 'DrawPath', 'DrawArea'].includes(widget)) { if (['Coordinate', 'Device', 'DrawPath', 'DrawArea'].includes(widget)) {
return <CoordView {...props} /> return <CoordView {...props} />
} }
if (['RadioButton', 'CheckBox'].includes(widget)) { if (['RadioButton', 'CheckBox', 'ComboBox'].includes(widget)) {
return <SelectView {...props} /> return <SelectView {...props} />
} }
if (['DateTime'].includes(widget)) { if (['DateTime'].includes(widget)) {
......
...@@ -171,15 +171,7 @@ const ComboBox = (props) => { ...@@ -171,15 +171,7 @@ const ComboBox = (props) => {
const { label, value, closable, onClose } = props const { label, value, closable, onClose } = props
const color = useMemo(() => { let color = options?.find(v => v.value === value)?.color || ''
let color = ''
options.forEach(v => {
if (v.value === value) {
color = v.color
}
})
return color
}, [options, value])
const onPreventMouseDown = (event) => { const onPreventMouseDown = (event) => {
event.preventDefault() event.preventDefault()
......
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