田强 / qx-common · Commits

Commit 2dfb3af10bfc05093c242fd7fdfe76df76ecb460

Authored by qiang.tian
2 parents 58523779 14d0aea0

Merge branch 'feature/dataflow' of http://gitlab.qgutech.com/tianqiang/qx-common… 

… into feature/dataflow
Inline Side-by-side
Showing 4 changed files with 24 additions and 6 deletions
1 { 1 {
2 "name": "@qx/common", 2 "name": "@qx/common",
3 - "version": "3.0.0-alpha.29", 3 + "version": "3.0.0-alpha.30",
4 "description": "A react library developed with dumi", 4 "description": "A react library developed with dumi",
5 "license": "MIT", 5 "license": "MIT",
6 "module": "dist/index.js", 6 "module": "dist/index.js",
@@ -361,6 +361,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -361,6 +361,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
361 > 361 >
362 <InputNumber 362 <InputNumber
363 draggable={true} 363 draggable={true}
  364 + disabled={record.disabled}
364 onDragStart={(event) => { 365 onDragStart={(event) => {
365 event.stopPropagation(); 366 event.stopPropagation();
366 event.preventDefault(); 367 event.preventDefault();
@@ -375,6 +376,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -375,6 +376,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
375 <div className='range-cell'>-</div> 376 <div className='range-cell'>-</div>
376 <InputNumber 377 <InputNumber
377 draggable={true} 378 draggable={true}
  379 + disabled={record.disabled}
378 onDragStart={(event) => { 380 onDragStart={(event) => {
379 event.stopPropagation(); 381 event.stopPropagation();
380 event.preventDefault(); 382 event.preventDefault();
@@ -396,6 +398,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -396,6 +398,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
396 > 398 >
397 <div className='range-cell'> 399 <div className='range-cell'>
398 <InputNumber 400 <InputNumber
  401 + disabled={record.disabled}
399 draggable={true} 402 draggable={true}
400 onDragStart={(event) => { 403 onDragStart={(event) => {
401 event.stopPropagation(); 404 event.stopPropagation();
@@ -411,6 +414,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -411,6 +414,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
411 /> 414 />
412 - 415 -
413 <InputNumber 416 <InputNumber
  417 + disabled={record.disabled}
414 draggable={true} 418 draggable={true}
415 onDragStart={(event) => { 419 onDragStart={(event) => {
416 event.stopPropagation(); 420 event.stopPropagation();
@@ -429,6 +433,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -429,6 +433,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
429 <div className='range-cell'> 433 <div className='range-cell'>
430 434
431 <InputNumber 435 <InputNumber
  436 + disabled={record.disabled}
432 draggable={true} 437 draggable={true}
433 onDragStart={(event) => { 438 onDragStart={(event) => {
434 event.stopPropagation(); 439 event.stopPropagation();
@@ -455,6 +460,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -455,6 +460,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
455 <div className='range-cell'> 460 <div className='range-cell'>
456 <DatePicker 461 <DatePicker
457 bordered={false} 462 bordered={false}
  463 + disabled={record.disabled}
458 size='small' 464 size='small'
459 defaultValue={ 465 defaultValue={
460 qxProps?.min 466 qxProps?.min
@@ -469,6 +475,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -469,6 +475,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
469 /> 475 />
470 - 476 -
471 <DatePicker 477 <DatePicker
  478 + disabled={record.disabled}
472 size='small' 479 size='small'
473 bordered={false} 480 bordered={false}
474 defaultValue={ 481 defaultValue={
@@ -486,6 +493,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -486,6 +493,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
486 </div> 493 </div>
487 <div className='range-cell'> 494 <div className='range-cell'>
488 <Select 495 <Select
  496 + disabled={record.disabled}
489 size='small' 497 size='small'
490 // style={{ width: '90px' }} 498 // style={{ width: '90px' }}
491 bordered={false} 499 bordered={false}
@@ -527,7 +535,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -527,7 +535,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
527 onChange={(val: any) => { 535 onChange={(val: any) => {
528 handleChange(val, record, 'qxProps'); 536 handleChange(val, record, 'qxProps');
529 }} 537 }}
530 - disabled={['USER', 'ORG'].includes(record.type)} 538 + disabled={['USER', 'ORG'].includes(record.type) || record.disabled}
531 request={props?.request} 539 request={props?.request}
532 /> 540 />
533 </div> 541 </div>
@@ -235,7 +235,17 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => { @@ -235,7 +235,17 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
235 const { qxProps } = data; 235 const { qxProps } = data;
236 value = moment(value).format(formatEnum[qxProps?.format] || 'YYYY-MM-DD'); 236 value = moment(value).format(formatEnum[qxProps?.format] || 'YYYY-MM-DD');
237 } 237 }
238 - 238 + else if (code == 'qxProps-min' || code == 'qxProps-max') {
  239 + if (value) {
  240 + value = Number(value)
  241 + if (isNaN(value)) {
  242 + value = null
  243 + }
  244 + } else {
  245 + value = null
  246 + }
  247 + console.log('value', value);
  248 + }
239 if (code == 'type') { 249 if (code == 'type') {
240 if (data.child && data.child.length > 0) { 250 if (data.child && data.child.length > 0) {
241 message.error('该节点含有子节点，无法更改类型，请重试！'); 251 message.error('该节点含有子节点，无法更改类型，请重试！');
@@ -161,12 +161,12 @@ @@ -161,12 +161,12 @@
161 align-items: center; 161 align-items: center;
162 } 162 }
163 163
164 - .ant-input-affix-wrapper, 164 + .ant-input-affix-wrapper,
165 .qx-field-setter { 165 .qx-field-setter {
166 border-width: 0; 166 border-width: 0;
167 } 167 }
168 168
169 - 169 +
170 } 170 }
171 171
172 .search-selected{ 172 .search-selected{
@@ -250,7 +250,7 @@ @@ -250,7 +250,7 @@
250 } 250 }
251 251
252 .qx-parameter-tree-list .ant-tree-list { 252 .qx-parameter-tree-list .ant-tree-list {
253 - .ant-tree-treenode { 253 + .ant-tree-treenode:not(.ant-tree-treenode-disabled) {
254 background-color: transparent !important; 254 background-color: transparent !important;
255 padding-top: 4px !important; 255 padding-top: 4px !important;
256 border-radius: 4px; 256 border-radius: 4px;