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

… into feature/dataflow

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

@@ -88,29 +88,6 @@ interface ParameterSettingProps {
   appId?: string; // 当前应用ID
 }
 
-const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-  console.log('onChange', e);
-  e.persist();
-  const { value } = e.target;
-  console.log('onChange value', value);
-  // if (!value) {
-  //   setExpandedKeys(undefined);
-  //   setAutoExpandParent(false);
-  //   setSearchValue(value);
-  //   return;
-  // }
-  // const newExpandedKeys = (list || [])
-  //   .map((item) => {
-  //     if (item.title.indexOf(value) > -1 || item.code.indexOf(value) > -1) {
-  //       return getParentKey(item.id, treeData);
-  //     }
-  //     return null;
-  //   })
-  //   .filter((item, i, self) => item && self.indexOf(item) === i);
-  // setExpandedKeys(newExpandedKeys as React.Key[]);
-  // setSearchValue(value);
-  // setAutoExpandParent(true);
-};
 
 
 
@@ -129,6 +106,8 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
     inputKey,
     nodeType,
   } = props;
+  const [searchValue, setSearchValue] = useState('');
+
   // const [form] = Form.useForm()
   //判断数组是否只有一个子节点
   const checkShowAdd = (_data: any) => {
@@ -144,6 +123,15 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
     return true;
   };
 
+  const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    e.persist();
+    const { value } = e.target;
+    // if (!value) {
+    //   setExpandedKeys(undefined);
+    //   setAutoExpandParent(false);
+    setSearchValue(value);
+  };
+
   const getValueOptions = (item: any): ValueOptionProps[] | undefined => {
     const widget = typeTranslateWidget(item.type);
     if (widget === 'userSelector') {
@@ -180,23 +168,28 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
       dataIndex: 'code',
       width: '150px',
       key: 'code',
-      render: (text, record) => (
-        < Form.Item
-          name={'code' + record.id}
-          style={{ margin: 0 }}
-        // initialValue={record.code}
-        >
-          <Input
-            draggable={true}
-            onDragStart={(event) => {
-              event.stopPropagation();
-              event.preventDefault();
-            }}
-            defaultValue={record.code}
-            bordered={false}
-            disabled={record.disabled} onBlur={(e) => handleChange(e, record, 'code')} />
-        </Form.Item >
-      ),
+      render: (text, record) => {
+        const strTitle = (text as string) || '';
+        const index = strTitle.indexOf(searchValue);
+        return (
+          < Form.Item
+            name={'code' + record.id}
+            style={{ margin: 0 }}
+          // initialValue={record.code}
+          >
+            <Input
+              style={{ color: index > -1 && searchValue ? '#1890ff' : '' }}
+              draggable={true}
+              onDragStart={(event) => {
+                event.stopPropagation();
+                event.preventDefault();
+              }}
+              defaultValue={record.code}
+              bordered={false}
+              disabled={record.disabled} onBlur={(e) => handleChange(e, record, 'code')} />
+          </Form.Item >
+        )
+      },
     },
     {
       title: (
@@ -208,23 +201,28 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
       dataIndex: 'title',
       width: '112px',
       key: 'title',
-      render: (text, record) => (
-        <Form.Item
-          name={'title' + record.id}
-          style={{ margin: 0 }}
-        // initialValue={record.title}
-        >
-          <Input
-            draggable={true}
-            onDragStart={(event) => {
-              event.stopPropagation();
-              event.preventDefault();
-            }}
-            defaultValue={record.title}
-            bordered={false}
-            disabled={record.disabled} onBlur={(e) => handleChange(e, record, 'title')} />
-        </Form.Item>
-      ),
+      render: (text, record) => {
+        const strTitle = (record.title as string) || '';
+        const index = strTitle.indexOf(searchValue);
+        return (
+          <Form.Item
+            name={'title' + record.id}
+            style={{ margin: 0 }}
+          // initialValue={record.title}
+          >
+            <Input
+              style={{ color: index > -1 && searchValue ? '#1890ff' : '' }}
+              draggable={true}
+              onDragStart={(event) => {
+                event.stopPropagation();
+                event.preventDefault();
+              }}
+              defaultValue={record.title}
+              bordered={false}
+              disabled={record.disabled} onBlur={(e) => handleChange(e, record, 'title')} />
+          </Form.Item>
+        )
+      },
     },
     {
       title: (
@@ -275,7 +273,6 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
             isMultiple={false}
             colsTree={props.nodeItem}
             showFieldOpt={!(nodeType === 'START')}
-            // onChange={debounce((val) => handleField(val), 700)}
             onChange={(val) => handleChangeField(val, record)}
             popupOnBody={true}
             inputDis={true}
@@ -464,7 +461,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
                       ? moment(qxProps.min)
                       : undefined
                   }
-                  format={formatEnum[qxProps?.format]}
+                  format={formatEnum[qxProps?.format] || 'YYYY-MM-DD'}
                   // style={{ width: '110px' }}
                   showTime
                   onChange={(e) => handleChange(e, record, 'qxProps-min')}
@@ -475,11 +472,11 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
                   size='small'
                   bordered={false}
                   defaultValue={
-                    qxProps?.min
+                    qxProps?.max
                       ? moment(qxProps.max)
                       : undefined
                   }
-                  format={formatEnum[qxProps?.format]}
+                  format={formatEnum[qxProps?.format] || 'YYYY-MM-DD'}
                   // style={{ width: '110px' }}
                   showTime
                   onChange={(e) => handleChange(e, record, 'qxProps-max')}
@@ -494,7 +491,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
                   bordered={false}
                   placeholder="格式"
                   popupMatchSelectWidth={false}
-                  defaultValue={qxProps.format || undefined}
+                  defaultValue={qxProps?.format || 'YEAR_DATE'}
                   onSelect={(e) =>
                     handleChange(e, record, 'qxProps-format')
                   }
@@ -698,8 +695,6 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
         _newTreeData.splice(dropIndex, 0, todoData[0]); // 插入
       }
       const _newData = generateTreeData(_newTreeData, '');
-      console.log('_newData', _newData)
-      console.log('_newTreeData', _newTreeData)
       handleDrop(_newData);
       dropCol.childNodes.forEach((item: any) => (item.style.borderTop = ''));
       dropCol.parentNode.childNodes.forEach(
@@ -828,14 +823,12 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
             </>
           ) : (
             <Table
-              // components={components}
               expandable={{
                 defaultExpandAllRows: true,
-                childrenColumnName: 'child'
+                childrenColumnName: 'child',
               }}
               onRow={() => onRow()}
               scroll={{ x: 960, y: 432 }}
-              // rowClassName={() => 'editable-row'}
               bordered
               pagination={false}
               size={'small'}

@@ -614,18 +614,13 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
 
   // 渲染节点
   const renderTitle = (nodeData: any) => {
-    // const strTitle = (nodeData.title as string) || '';
-    // const strCode = nodeData.code as string;
-    // const valuesObj = [{
-    //   type: typeTranslateItemtype(nodeData.type),
-    //   value: nodeData.mappingValues || [],
-    // }]
-    // nodeData.valuesObj = !nodeData.valuesObj ? valuesObj : nodeData.valuesObj
-    // const index = strTitle.indexOf(searchValue);
+    const strTitle = (nodeData.title as string) || '';
+    const index = strTitle.indexOf(searchValue);
     const isShowTree = checkShowTree(nodeData);
     const disabled = nodeData.disabled;
     return (
-      <div onBlur={(e) => onBlur(e)} tabIndex={0} onFocus={(e) => onFocus(e)}>
+      <div
+        onBlur={(e) => onBlur(e)} tabIndex={0} onFocus={(e) => onFocus(e)}>
         <div
           style={{
             // padding: '2px',
@@ -674,12 +669,12 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
           </div>
           <div className="opt-left">
             <Input
+              className={index > -1 && searchValue ? 'search-selected' : ''}
               draggable={true}
               onDragStart={(event) => {
                 event.stopPropagation();
                 event.preventDefault();
               }}
-              // ref={inputRef}
               key={inputKey}
               style={{ width: '100%' }}
               maxLength={50}

@@ -169,6 +169,12 @@
  
 }
 
+.search-selected{
+  .ant-input {
+    color: #1890ff;
+  }
+}
+
 .editable-cell-value-wrap {
   min-height: 30px;
   padding: 5px 12px;