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

… into feature/dataflow

 {
   "name": "@qx/common",
-  "version": "3.0.0-alpha.29",
+  "version": "3.0.0-alpha.30",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",

@@ -361,6 +361,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
             >
               <InputNumber
                 draggable={true}
+                disabled={record.disabled}
                 onDragStart={(event) => {
                   event.stopPropagation();
                   event.preventDefault();
@@ -375,6 +376,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
               <div className='range-cell'>-</div>
               <InputNumber
                 draggable={true}
+                disabled={record.disabled}
                 onDragStart={(event) => {
                   event.stopPropagation();
                   event.preventDefault();
@@ -396,6 +398,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
             >
               <div className='range-cell'>
                 <InputNumber
+                  disabled={record.disabled}
                   draggable={true}
                   onDragStart={(event) => {
                     event.stopPropagation();
@@ -411,6 +414,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
                 />
                 -
                 <InputNumber
+                  disabled={record.disabled}
                   draggable={true}
                   onDragStart={(event) => {
                     event.stopPropagation();
@@ -429,6 +433,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
               <div className='range-cell'>
 
                 <InputNumber
+                  disabled={record.disabled}
                   draggable={true}
                   onDragStart={(event) => {
                     event.stopPropagation();
@@ -455,6 +460,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
               <div className='range-cell'>
                 <DatePicker
                   bordered={false}
+                  disabled={record.disabled}
                   size='small'
                   defaultValue={
                     qxProps?.min
@@ -469,6 +475,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
                 />
                 -
                 <DatePicker
+                  disabled={record.disabled}
                   size='small'
                   bordered={false}
                   defaultValue={
@@ -486,6 +493,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
               </div>
               <div className='range-cell'>
                 <Select
+                  disabled={record.disabled}
                   size='small'
                   // style={{ width: '90px' }}
                   bordered={false}
@@ -527,7 +535,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
                 onChange={(val: any) => {
                   handleChange(val, record, 'qxProps');
                 }}
-                disabled={['USER', 'ORG'].includes(record.type)}
+                disabled={['USER', 'ORG'].includes(record.type) || record.disabled}
                 request={props?.request}
               />
             </div>

@@ -235,7 +235,17 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
       const { qxProps } = data;
       value = moment(value).format(formatEnum[qxProps?.format] || 'YYYY-MM-DD');
     }
-
+    else if (code == 'qxProps-min' || code == 'qxProps-max') {
+      if (value) {
+        value = Number(value)
+        if (isNaN(value)) {
+          value = null
+        }
+      } else {
+        value = null
+      }
+      console.log('value', value);
+    }
     if (code == 'type') {
       if (data.child && data.child.length > 0) {
         message.error('该节点含有子节点，无法更改类型，请重试！');

@@ -161,12 +161,12 @@
     align-items: center;
   }
 
-  .ant-input-affix-wrapper, 
+  .ant-input-affix-wrapper,
   .qx-field-setter  {
     border-width: 0;
   }
 
- 
+
 }
 
 .search-selected{
@@ -250,7 +250,7 @@
 }
 
 .qx-parameter-tree-list .ant-tree-list {
-  .ant-tree-treenode {
+  .ant-tree-treenode:not(.ant-tree-treenode-disabled) {
     background-color: transparent !important;
     padding-top: 4px !important;
     border-radius: 4px;