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

… into feature/dataflow

@@ -59,6 +59,13 @@ const FormSelectMain: React.FC<FormSelectProps>= (props)=> {
 
   useEffect(() => {
     if (!value || !Object.keys(value || {})?.length || !value?.formId) {
+      setItem({
+        flag: 'SINGLE',
+        code: '',
+        appId: appId || '',
+        name: '',
+        appName: ''
+      });
       return;
     }
 

@@ -99,6 +99,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
     type,
   } = props;
   const [searchValue, setSearchValue] = useState('');
+  const [defaultExpandedKeys, setDefaultExpandedKeys] = useState<React.Key[]>(); //树节点的id 有了则展开
 
   // const [form] = Form.useForm()
   //判断数组是否只有一个子节点
@@ -600,6 +601,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
   // const isDeveloper = window.sessionStorage.getItem('DEVELOPER_MODE') === '1';
   const [isShowJson, setIsShowJson] = useState<any>(false);
   const [midData, setMidData] = useState<any>([]);
+
   useEffect(() => {
     if (visible) {
       if (data.length == 0) {
@@ -608,6 +610,15 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
     }
   }, [visible]);
 
+  useEffect(() => {
+    const value = cloneDeep(data);
+    const expandedArray: any = [];
+    (value || []).map((_item: ParamDesignModel) => {
+      expandedArray.push(_item.id);
+    });
+    setDefaultExpandedKeys(expandedArray);
+  }, [inputKey]);
+
   //展开 所有子节点
   const generateTreeData = useCallback(
     (_data: any[], _keywords?: string): any[] => {
@@ -865,10 +876,11 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
             expandable={{
               defaultExpandAllRows: true,
               childrenColumnName: 'child',
+              expandedRowKeys: defaultExpandedKeys,
               expandIcon: ({ expanded, onExpand, record }) =>
                 record.child && record.child.length > 0 && expanded ? (
                   <>
-                    <Icon component={SubDropIcon} className="drop-icon" />
+                    <Icon component={SubDropIcon} className="drop-icon1" />
                     <QxBaseIcon
                       className={'table-expanded'}
                       type={'qx-caret-down'}
@@ -877,7 +889,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
                   </>
                 ) : record.child && record.child.length > 0 && !expanded ? (
                   <>
-                    <Icon component={SubDropIcon} className="drop-icon" />
+                    <Icon component={SubDropIcon} className="drop-icon1" />
                     <QxBaseIcon
                       className={'table-expanded-change'}
                       type={'qx-caret-down'}
@@ -885,12 +897,12 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
                     />
                   </>
                 ) : (
-                  <Icon component={SubDropIcon} className="drop-icon" />
+                  <Icon component={SubDropIcon} className="drop-icon1" />
                 ),
             }}
             className="parameter-setting-table"
             onRow={onRow}
-            scroll={{ x: 1000, y: 432 }}
+            scroll={{ x: 1000 }}
             bordered
             pagination={false}
             size={'small'}

@@ -528,6 +528,7 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
     }
     const _treeData = JSON.parse(JSON.stringify(treeData));
     const _treeDataNew = addNode(key, _treeData);
+    setInputKey(inputKey + 1);
     setTreeData(_treeDataNew);
     props?.onChange(_treeDataNew);
   };
@@ -802,6 +803,7 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
                 draggable={{ icon: false }}
                 // draggable={!props.type}
                 blockNode
+                defaultExpandAll
                 expandedKeys={expandedKeys ? expandedKeys : defaultExpandedKeys}
                 autoExpandParent={autoExpandParent}
                 onExpand={onExpand}

@@ -20,7 +20,6 @@
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-    text-overflow: ellipsis;
   }
 }
 
@@ -268,6 +267,14 @@
   }
 }
 
+.drop-icon {
+  position: absolute;
+  top: 10px;
+  left: -46px;
+  opacity: 1;
+  display: block;
+}
+
 .qx-parameter-tree-list .ant-tree-list {
   .ant-tree-treenode:not(.ant-tree-treenode-disabled) {
     background-color: transparent !important;
@@ -317,18 +324,6 @@
     display: flex;
   }
 
-  .ant-table-tbody .ant-table-row {
-    // .drop-icon{
-    //   opacity: 0.01;
-    // }
-
-    // &:hover {
-    //   .drop-icon{
-    //     opacity: 1;
-    //   }
-    // }
-  }
-
   .table-expanded {
     color: #7c7e86;
     margin-left: 8px;

@@ -89,7 +89,7 @@
 
   .ant-modal-body {
     max-height: 464px;
-    padding: 16px 18px 8px 24px;
+    padding: 16px 18px 24px 24px;
     overflow-y: hidden;
     scrollbar-gutter: stable;