Commit 26a41644 authored by 田翔's avatar 田翔

fix: 参数修复

parent 9554e66f
{ {
"name": "panda-xform", "name": "panda-xform",
"version": "4.6.8", "version": "4.6.9",
"description": "4.6.8 细节修改", "description": "4.6.9 参数修复",
"keywords": [ "keywords": [
"panda-xform" "panda-xform"
], ],
......
...@@ -18,7 +18,7 @@ const SearchGroup = forwardRef((props, ref) => { ...@@ -18,7 +18,7 @@ const SearchGroup = forwardRef((props, ref) => {
})) }))
const { accountName, config, notUse, checkName, btnsClick } = props const { accountName, config, notUse, checkName, btnsClick } = props
const { enableBatchOperation, enableImportExport, enablePrint, enableQuickSearch, enableTimeFilter } = config const { enableBatchOperation, enableImportExport, enablePrint, enableQuickSearch, enableTimeFilter, parent } = config
const [form] = Form.useForm() const [form] = Form.useForm()
const [dateArray, setDateArray] = useState([]) const [dateArray, setDateArray] = useState([])
const [formatterStr, setFormatterStr] = useState('YYYY-MM-DD HH:mm:ss') const [formatterStr, setFormatterStr] = useState('YYYY-MM-DD HH:mm:ss')
...@@ -335,6 +335,8 @@ const SearchGroup = forwardRef((props, ref) => { ...@@ -335,6 +335,8 @@ const SearchGroup = forwardRef((props, ref) => {
</Form> </Form>
{/* 按钮区域 */} {/* 按钮区域 */}
<div className={styles.controlRowRight}> <div className={styles.controlRowRight}>
{
parent !== '台账选择器' ? (
<div className={styles.controlBtns}> <div className={styles.controlBtns}>
{ {
enableImportExport ? ( enableImportExport ? (
...@@ -372,6 +374,8 @@ const SearchGroup = forwardRef((props, ref) => { ...@@ -372,6 +374,8 @@ const SearchGroup = forwardRef((props, ref) => {
) : null ) : null
} }
</div> </div>
) : null
}
</div> </div>
</Row> </Row>
) )
......
...@@ -19,8 +19,8 @@ const TablePack = (props, ref) => { ...@@ -19,8 +19,8 @@ const TablePack = (props, ref) => {
fileColumns, fileColumns,
})) }))
const { parent, notUse, config, fieldList, loading, dataSource, rowSelection, onRow, tableChange, btnsClick } = props const { notUse, config, fieldList, loading, dataSource, rowSelection, onRow, tableChange, btnsClick } = props
const { accountFieids, webShowFieldGroup, formJson } = config const { accountFieids, webShowFieldGroup, formJson, parent } = config
const [fieldResize, setFieldResize] = useState({}) const [fieldResize, setFieldResize] = useState({})
const [filteredInfo, setFilteredInfo] = useState({}) const [filteredInfo, setFilteredInfo] = useState({})
const [sortedInfo, setSortedInfo] = useState({}) const [sortedInfo, setSortedInfo] = useState({})
...@@ -42,10 +42,10 @@ const TablePack = (props, ref) => { ...@@ -42,10 +42,10 @@ const TablePack = (props, ref) => {
//台账列表、台账选择器表头 //台账列表、台账选择器表头
const getColumnProps = (json, v) => { const getColumnProps = (json, v) => {
const { fieldName, columnWidth, isSort, likeSearch } = v const { fieldName, columnWidth, isSort, accurateSearch } = v
const { widget, sourceType, options } = json?.[fieldName] || {} const { widget, sourceType, options } = json?.[fieldName] || {}
let searchProps = {} let searchProps = {}
if (likeSearch) { if (accurateSearch) {
if (['CheckBox', 'ComboBox', 'RadioButton'].includes(widget)) { if (['CheckBox', 'ComboBox', 'RadioButton'].includes(widget)) {
if (sourceType === '手动输入') { if (sourceType === '手动输入') {
searchProps = { searchProps = {
...@@ -144,10 +144,10 @@ const TablePack = (props, ref) => { ...@@ -144,10 +144,10 @@ const TablePack = (props, ref) => {
//关联表单表头 //关联表单表头
const getRelevanceColumnProps = (json, field) => { const getRelevanceColumnProps = (json, field) => {
const { fieldName, columnWidth, isSort, likeSearch } = field const { fieldName, columnWidth, isSort, accurateSearch } = field
const { widget } = json?.[fieldName] || {} const { widget } = json?.[fieldName] || {}
let searchProps = {} let searchProps = {}
if (likeSearch) { if (accurateSearch) {
searchProps = { searchProps = {
filterDropdown: ({ setSelectedKeys, selectedKeys, confirm, clearFilters, close }) => ( filterDropdown: ({ setSelectedKeys, selectedKeys, confirm, clearFilters, close }) => (
<div <div
......
...@@ -310,10 +310,9 @@ const RelationForm = (props) => { ...@@ -310,10 +310,9 @@ const RelationForm = (props) => {
{disabled ? null : <Button className={styles.headerBtn} type='primary' size='middle' icon={<PlusOutlined />} onClick={addClick}>添加</Button>} {disabled ? null : <Button className={styles.headerBtn} type='primary' size='middle' icon={<PlusOutlined />} onClick={addClick}>添加</Button>}
</div> </div>
<TablePack <TablePack
parent='关联表单'
loading={loading} loading={loading}
notUse={disabled ? 'edit,add,del' : ''} notUse={disabled ? 'edit,add,del' : ''}
config={config} config={{ ...config, parent: '关联表单' }}
dataSource={dataSource} dataSource={dataSource}
btnsClick={btnsClick} btnsClick={btnsClick}
/> />
......
...@@ -192,7 +192,7 @@ const AccountSelector = (props) => { ...@@ -192,7 +192,7 @@ const AccountSelector = (props) => {
onChange={search} onChange={search}
notUse={'edit,add,del'} notUse={'edit,add,del'}
btnsClick={btnsClick} btnsClick={btnsClick}
config={config} config={{ ...config, parent: '台账选择器' }}
/> />
</div> </div>
<div className={styles.bottom}> <div className={styles.bottom}>
...@@ -200,12 +200,11 @@ const AccountSelector = (props) => { ...@@ -200,12 +200,11 @@ const AccountSelector = (props) => {
ref={tablePackRef} ref={tablePackRef}
loading={loading} loading={loading}
notUse={'edit,add,del'} notUse={'edit,add,del'}
config={config} config={{ ...config, parent: '台账选择器' }}
dataSource={dataSource} dataSource={dataSource}
btnsClick={btnsClick} btnsClick={btnsClick}
fieldList={fieldList} fieldList={fieldList}
tableChange={tableChange} tableChange={tableChange}
parent='台账选择器'
rowSelection={{ rowSelection={{
type: isMultiple && fieldshine.length === 1 ? 'checkbox' : 'radio', type: isMultiple && fieldshine.length === 1 ? 'checkbox' : 'radio',
selectedRowKeys: keys, selectedRowKeys: keys,
......
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