Commit 4c991340f3a3922635b751cac31b9249775eac3c

Authored by 邱嘉伟
1 parent e04419fa

fix:参数选择表单问题修复

@@ -257,18 +257,18 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -257,18 +257,18 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
257 </> : <> 257 </> : <>
258 <div key={record.id}> 258 <div key={record.id}>
259 <span>{record.type == 'TIME' ? moment(text?.min).format( 259 <span>{record.type == 'TIME' ? moment(text?.min).format(
260 - formatEnum[text?.format] || 'YYYY-MM-DD',) : text?.min} 260 + formatEnum[text?.format] || 'YYYY-MM-DD') : text?.min}
261 </span> 261 </span>
262 {text?.min && ( 262 {text?.min && (
263 - <Space style={{marginLeft: 5, marginRight: 5}}>-</Space> 263 + <Space style={{ marginLeft: 5, marginRight: 5 }}>-</Space>
264 )} 264 )}
265 <span>{record.type == 'TIME' ? moment(text?.max).format( 265 <span>{record.type == 'TIME' ? moment(text?.max).format(
266 - formatEnum[text?.format] || 'YYYY-MM-DD',) : text?.max} 266 + formatEnum[text?.format] || 'YYYY-MM-DD') : text?.max}
267 </span> 267 </span>
268 </div> 268 </div>
269 </>} 269 </>}
270 </> 270 </>
271 - ) 271 + )
272 }, 272 },
273 }, 273 },
274 { 274 {
@@ -343,7 +343,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -343,7 +343,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
343 size={'small'} 343 size={'small'}
344 type="link" 344 type="link"
345 disabled={record.disabled} 345 disabled={record.disabled}
346 - icon={<QxBaseIcon style={{fontSize: 16}} type={'qx-icon-plus'} />} 346 + icon={<QxBaseIcon style={{ fontSize: 16 }} type={'qx-icon-plus'} />}
347 onClick={() => handleAdd(record.pid)} 347 onClick={() => handleAdd(record.pid)}
348 /> 348 />
349 )} 349 )}
@@ -353,7 +353,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -353,7 +353,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
353 size={'small'} 353 size={'small'}
354 type="link" 354 type="link"
355 disabled={record.disabled} 355 disabled={record.disabled}
356 - icon={<Icon style={{fontSize: 16}} component={SubNodeIcon} />} 356 + icon={<Icon style={{ fontSize: 16 }} component={SubNodeIcon} />}
357 onClick={() => handleAddTree(record.id)} 357 onClick={() => handleAddTree(record.id)}
358 /> 358 />
359 )} 359 )}
@@ -362,7 +362,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -362,7 +362,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
362 type="link" 362 type="link"
363 className="btn-high-del" 363 className="btn-high-del"
364 disabled={record.disabled} 364 disabled={record.disabled}
365 - icon={<QxBaseIcon style={{fontSize: 16}} className={'title-btn-del-btn'} type={'qx-icon-delete'} />} 365 + icon={<QxBaseIcon style={{ fontSize: 16 }} className={'title-btn-del-btn'} type={'qx-icon-delete'} />}
366 onClick={() => handleDelete(record)} 366 onClick={() => handleDelete(record)}
367 /> 367 />
368 </Space> 368 </Space>
@@ -434,6 +434,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -434,6 +434,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
434 const toggleEdit1 = (e) => { 434 const toggleEdit1 = (e) => {
435 const values = form.getFieldsValue(); 435 const values = form.getFieldsValue();
436 e.persist(); 436 e.persist();
  437 + // console.log('vae.target.tagNamelues', e.target.tagName)
437 if (e.target.tagName == 'DIV') { 438 if (e.target.tagName == 'DIV') {
438 setCurrentNode(e.target) 439 setCurrentNode(e.target)
439 // console.log('values', values) 440 // console.log('values', values)
@@ -452,11 +453,11 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -452,11 +453,11 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
452 // form.setFieldsValue({ [dataIndex]: record[dataIndex] }); 453 // form.setFieldsValue({ [dataIndex]: record[dataIndex] });
453 }; 454 };
454 455
455 - // const onQxpropsChangen = (value) => { 456 + // const test = (value) => {
456 // console.log('value', value) 457 // console.log('value', value)
457 - // form.setFieldsValue({  
458 - // ['qxProps']: { value: value }  
459 - // }) 458 + // // form.setFieldsValue({
  459 + // // ['qxProps']: { value: value }
  460 + // // })
460 // } 461 // }
461 // const toggleEdit2 = (e) => { 462 // const toggleEdit2 = (e) => {
462 // e.persist(); 463 // e.persist();
@@ -654,9 +655,10 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -654,9 +655,10 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
654 key={record.id} 655 key={record.id}
655 ref={inputRef} 656 ref={inputRef}
656 className="editable-around-cell" 657 className="editable-around-cell"
657 - onBlur={(e) => toggleEdit1(e)} tabIndex={  
658 - 0  
659 - } 658 + // onBlur={(e) => toggleEdit1(e)}
  659 + tabIndex={
  660 + 0
  661 + }
660 > 662 >
661 <QxFormSelect 663 <QxFormSelect
662 value={qxProps} 664 value={qxProps}
@@ -1063,7 +1065,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -1063,7 +1065,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
1063 ) : ( 1065 ) : (
1064 <Row> 1066 <Row>
1065 <Col span={12}> 1067 <Col span={12}>
1066 - <Button type="link" icon={<QxBaseIcon style={{fontSize: 16}} type={'qx-icon-flow-code'} />} onClick={() => onOpen()}> 1068 + <Button type="link" icon={<QxBaseIcon style={{ fontSize: 16 }} type={'qx-icon-flow-code'} />} onClick={() => onOpen()}>
1067 JSON参数设置 1069 JSON参数设置
1068 </Button> 1070 </Button>
1069 </Col> 1071 </Col>