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

… into feature/dataflow

# Conflicts:
#	src/index.ts
#	src/qx-parameter-setting/ParameterModal.tsx
#	src/qx-parameter-setting/index.tsx

 {
   "name": "@qx/common",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@qx/common",
-      "version": "3.0.0-alpha.2",
+      "version": "3.0.0-alpha.5",
       "license": "MIT",
       "dependencies": {
         "@ant-design/icons": "^5.2.5",

 {
   "name": "@qx/common",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.5",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -45,13 +45,13 @@
   "dependencies": {
     "@ant-design/icons": "^5.2.5",
     "@qx/ui": "0.0.3-beta.1",
+    "ahooks": "^3.7.5",
+    "classnames": "^2.3.2",
     "codemirror": "5.65.8",
     "dayjs": "^1.11.9",
     "lodash-es": "^4.17.21",
     "rc-virtual-list": "^3.4.13",
-    "react-codemirror2": "^7.2.1",
-    "classnames": "^2.3.2",
-    "ahooks": "^3.7.5"
+    "react-codemirror2": "^7.2.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",
@@ -74,16 +74,16 @@
     "react": "^18.0.0",
     "react-cookies": ">=0.1.1",
     "react-dom": "^18.0.0",
-    "stylelint": "^14.9.1",
-    "react-router": ">=4.3.1"
+    "react-router": ">=4.3.1",
+    "stylelint": "^14.9.1"
   },
   "peerDependencies": {
+    "@qx/utils": "0.0.58",
+    "ahooks": "^3.7.5",
     "antd": ">=5.8.4",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0",
-    "ahooks": "^3.7.5",
-    "react-router": ">=4.3.1",
-    "@qx/utils": "0.0.58"
+    "react-router": ">=4.3.1"
   },
   "publishConfig": {
     "access": "public"

@@ -4,8 +4,11 @@ export * from './qx-sort-condition';
 export * from './qx-base-icon';
 export * from './qx-tags-input';
 export * from './qx-user-selector';
+export * from './qx-org-selector';
 export * from './qx-form-select';
 export * from './qx-app-selector';
 export * from './utils';
+export * from './qx-field';
 export * from './qx-field-setter';
-// export { default as FieldSetter } from './qx-field-setter';
+
+// export * from './qx-btn';

-@import '~@qx/ui/src/style/variable.less';
-
-.qx-fields-popover {
-  &.ant-popover {
-    padding-top: 0;
-    padding-bottom: 0;
-    overflow: hidden;
-    background: #fff;
-    border-radius: 8px;
-    box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.1);
-  }
-
-  .ant-popover-arrow {
-    display: none;
-  }
-
-  .ant-popover-inner {
-    padding: 0;
-  }
-
-  .ant-popover-inner-content {
-    padding: 0;
-    overflow: auto;
-  }
-
-  &__search {
-    height: 36px;
-
-    .ant-input-prefix {
-      color: @N7;
-      font-size: 16px;
-    }
-  }
-}
-
-.qx-popover-fields {
-  max-height: 260px;
-  margin: 0;
-  padding: 0;
-  overflow: auto;
-
-  > li {
-    padding: 5px 5px 5px 12px;
-    cursor: pointer;
-
-    &:hover {
-      background-color: @N3;
-    }
-  }
-}
-
-.qx-fields-pop-content {
-  width: 100%;
-  max-height: 260px;
-  overflow-x: hidden;
-
-  &.ant-menu-inline > .ant-menu-submenu > .ant-menu-submenu-title {
-    margin-top: 0;
-    margin-bottom: 1px;
-    background-color: @N2;
-  }
-
-  .ant-menu-sub.ant-menu-inline {
-    background-color: #fff;
-  }
-
-  &.ant-menu-inline > .ant-menu-item,
-  .ant-menu-sub.ant-menu-inline > .ant-menu-item {
-    height: 32px;
-    line-height: 32px;
-    border-radius: 4px;
-
-    &:hover {
-      color: inherit;
-      background-color: @N3;
-    }
-  }
-
-  .ant-menu-title-content {
-    .ant-typography + span {
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  }
-}
-.qx-field-pop__footer {
-  padding-top: 5px;
-  padding-bottom: 5px;
-  padding-left: 24px;
-  border-top: 1px solid @N4;
-}

-import { Divider, Input, Menu, Popover } from 'antd';
-
-import * as React from 'react';
-import type { ReactElement } from 'react';
-import { useEffect, useState } from 'react';
-import QxFieldItem from '../qx-field/src/item';
-import { useDebounceFn } from 'ahooks';
-import { isEmpty } from 'lodash-es';
-import { QxBaseIcon } from '@qx/common';
-import './index.less';
-
-export type OptionFieldExtract = {
-  fieldType?: string;
-  widget: string;
-  design?: any;
-  relId?: string;
-  //关联数据集的才有
-  optionsRef?: string;
-  //关联属性，真实的字段组件
-  refWidget?: string;
-  //关联属性，真实的字段类型
-  refType?: string;
-  required?: boolean;
-  // 是否是默认系统字段，值为true时是未配置的系统字段
-  $default?: boolean;
-  // 卡片设计 特殊字段配置 回显所用
-  renderData?: any;
-};
-
-export type OptionField = {
-  code: string;
-  name: string;
-  disabled?: boolean;
-  //当disabled=true的时候extract不存在
-  extract?: OptionFieldExtract;
-};
-
-interface QxFieldPopoverProp {
-  data: OptionField[];
-  widgets?: string[]; //需要展示的widgets
-  exclude?: string[]; //排除的字段
-  width?: string; //pop 宽度
-  trigger?: 'click' | 'hover' | undefined;
-  onSelect: (field: OptionField) => void;
-  disabled?: boolean;
-  hiddenAfterTrigger?: boolean;
-  popFooter?: ReactElement;
-  children?: any;
-}
-
-export const QxFieldPopover: React.FC<QxFieldPopoverProp> = (props) => {
-  // const [fieldFlatten, setFieldFlatten] = useState<any>({})
-  const [fields, setFields] = useState<any>([]);
-  const [filterFields, setFilterFields] = useState<any>([]);
-  const [visible, setVisible] = useState<boolean>(false);
-  //TODO 搜索
-  const [keyword, setKeyword] = useState<string>();
-
-  const getUsefulFieldProp = (field: any) => {
-    let mode = 'widget'; //TODO 接口废弃，后续要删掉
-    if (field?.extract) {
-      mode = 'option';
-    }
-    let widget = field?.propertyWidget || field.widget;
-    let code = field?.fieldName || field.code;
-    let name = field?.fieldComment || field.title;
-    let relFunId = field?.relFunId;
-    if (mode === 'option') {
-      widget = field?.extract.widget;
-      relFunId = field?.extract.relId;
-      code = field?.code;
-      name = field?.name;
-    }
-    return {
-      widget,
-      code,
-      name,
-      relFunId,
-    };
-  };
-  // @ts-ignore
-  const excludeFields = (list: OptionField[]) => {
-    // @ts-ignore
-    return list.filter((item: any) => {
-      if (item.children && item.children.length === 0) {
-        return false;
-      }
-
-      let allow = true;
-      const { widget, code } = getUsefulFieldProp(item);
-      if (props.widgets && props.widgets.length > 0 && props.widgets.indexOf(widget) === -1) {
-        return false;
-      }
-      if (!props.exclude || props.exclude.length === 0) {
-        allow = true;
-      } else {
-        allow = props.exclude.indexOf(code) === -1;
-      }
-      return allow;
-    });
-  };
-  useEffect(() => {
-    if (!isEmpty(props.data)) {
-      const _fields = excludeFields(props.data);
-      setFields(_fields);
-      setFilterFields(_fields);
-      // setFieldFlatten(flatFields(_fields))
-    }
-  }, [props.data]);
-
-  const handleClick = (item: any) => {
-    if (props.hiddenAfterTrigger) {
-      setVisible(false);
-    }
-    props.onSelect(item);
-  };
-
-  const { run } = useDebounceFn((field) => handleClick(field), {
-    wait: 300,
-    leading: true,
-    trailing: false,
-  });
-
-  useEffect(() => {
-    if (!keyword) {
-      setFilterFields([...fields]);
-    } else {
-      const _filterFields: any = [];
-
-      fields.forEach((item: any) => {
-        const _item = { ...item };
-        _item.children = [];
-        if (item?.children?.length) {
-          item?.children.forEach((children: any) => {
-            if (
-              children?.titleStr?.indexOf(keyword) > -1 ||
-              children?.name?.indexOf(keyword) > -1
-            ) {
-              _item.children.push(children);
-            }
-          });
-          if (_item.children?.length) {
-            _filterFields.push(_item);
-          }
-        } else {
-          if (item?.titleStr?.indexOf(keyword) > -1 || item?.name?.indexOf(keyword) > -1) {
-            _filterFields.push(item);
-          }
-        }
-      });
-      /*const _filterFields = fields.filter(
-        (item) => item?.titleStr?.indexOf(keyword) > -1 || item?.name?.indexOf(keyword) > -1,
-      );*/
-      setFilterFields(_filterFields);
-    }
-  }, [keyword, fields]);
-
-  const handleChange = (_keyword: string) => {
-    setKeyword(_keyword.trim());
-  };
-
-  const fieldsPopContent = () => {
-    return (
-      <div style={{ width: props.width || '192px' }}>
-        {!fields?.length ? (
-          <div
-            className={'ant-empty-normal'}
-            style={{
-              textAlign: 'center',
-              margin: '10px 0',
-            }}
-          >
-            没有可选字段
-          </div>
-        ) : (
-          <>
-            <div
-              onMouseDown={(e) => {
-                e.preventDefault();
-              }}
-            >
-              <Input
-                bordered={false}
-                value={keyword}
-                className={'qx-fields-popover__search'}
-                placeholder={'搜索'}
-                allowClear
-                prefix={<QxBaseIcon type={'icon-app-search-line'} />}
-                onChange={(e) => {
-                  handleChange(e.target.value);
-                }}
-              />
-            </div>
-            <Divider style={{ margin: 0 }} />
-            {!filterFields.length ? (
-              <div
-                className={'ant-empty-normal'}
-                style={{
-                  textAlign: 'center',
-                  margin: '10px 0',
-                }}
-              >
-                暂无相关字段
-              </div>
-            ) : (
-              <Menu
-                mode="inline"
-                className={'qx-fields-pop-content'}
-                selectedKeys={[]}
-                inlineIndent={12}
-              >
-                {filterFields.map((field: any) => {
-                  if (!!field?.children?.length) {
-                    return (
-                      <Menu.SubMenu
-                        key={field.code}
-                        title={
-                          field.title || (
-                            <QxFieldItem
-                              widget={field.extract && field.extract.widget}
-                              name={field.name}
-                            />
-                          )
-                        }
-                      >
-                        {field.children.map((item: any) => {
-                          if ((item.children || []).length) {
-                            return (
-                              <Menu.SubMenu
-                                key={item.code}
-                                title={
-                                  item.title || (
-                                    <QxFieldItem
-                                      widget={field.extract && field.extract.widget}
-                                      name={field.name}
-                                    />
-                                  )
-                                }
-                              >
-                                {(item.children || []).map((_it: any) => {
-                                  return (
-                                    <Menu.Item
-                                      key={_it.code}
-                                      onClick={() => {
-                                        handleClick(_it);
-                                      }}
-                                    >
-                                      {_it.title || (
-                                        <QxFieldItem
-                                          widget={field.extract && field.extract.widget}
-                                          name={field.name}
-                                        />
-                                      )}
-                                    </Menu.Item>
-                                  );
-                                })}
-                              </Menu.SubMenu>
-                            );
-                          } else {
-                            return (
-                              <Menu.Item
-                                key={item.code}
-                                onClick={() => {
-                                  handleClick(item);
-                                }}
-                              >
-                                {item.title || (
-                                  <QxFieldItem
-                                    widget={field.extract && field.extract.widget}
-                                    name={field.name}
-                                  />
-                                )}
-                              </Menu.Item>
-                            );
-                          }
-                        })}
-                      </Menu.SubMenu>
-                    );
-                  } else {
-                    return (
-                      <Menu.Item
-                        style={{
-                          display:
-                            keyword && field?.name?.indexOf(keyword) === -1 ? 'none' : 'block',
-                        }}
-                        onClick={() => {
-                          run(field);
-                        }}
-                        key={field.code}
-                      >
-                        {field.title || (
-                          <QxFieldItem
-                            widget={field.extract && field.extract.widget}
-                            name={field.name}
-                          />
-                        )}
-                      </Menu.Item>
-                    );
-                  }
-                })}
-              </Menu>
-            )}
-          </>
-        )}
-        {props.popFooter ? <div className="qx-field-pop__footer">{props.popFooter}</div> : null}
-      </div>
-    );
-  };
-
-  return (
-    <Popover
-      overlayClassName={'qx-fields-popover'}
-      // getPopupContainer={(triggerNode) => triggerNode}
-      content={fieldsPopContent()}
-      placement={'bottomRight'}
-      trigger={props.disabled ? undefined : props.trigger || 'click'}
-      open={visible}
-      onOpenChange={(v) => {
-        if (!v) {
-          setTimeout(() => {
-            setKeyword('');
-            setFilterFields([...fields]);
-          }, 0);
-        }
-        setVisible(v);
-      }}
-    >
-      {props.children}
-    </Popover>
-  );
-}

@@ -17,7 +17,7 @@ import { CloseOutlined, ControlOutlined, RightOutlined } from '@ant-design/icons
 import { cloneDeep, isEqual, isEmpty, findIndex, size } from 'lodash-es';
 import { RelTreeSetter } from './components/rel-tree-setter';
 import { AddressSetter } from './components/address-setter';
-import {QxFieldPopover} from '../qx-field-popover';
+import {QxFieldPopover} from '@qx/common';
 import { InputSetter } from './components/input-setter';
 import { OrgSetter } from './components/org-setter';
 import { RelSetter } from './components/rel-setter';
@@ -157,7 +157,7 @@ export interface paramColSelectProps extends ColSelectProps {
   allowClear?: boolean;
 }
 
-export const FieldSetter: React.FC<paramColSelectProps> = ({
+export const QxFieldSetter: React.FC<paramColSelectProps> = ({
   value,
   fieldGroupType,
   fieldType,

@@ -15,7 +15,7 @@ group:
 
 ```tsx
 import React from 'react';
-import { QxFieldItem } from './index';
+import { QxFieldItem } from '@qx/common';
 
 export default () => {
   return <QxFieldItem name={'标题'} widget={'qxInput'} />;

 import QxFieldItem from './src/item';
 import QxFieldSelect from './src/select';
+import QxFieldPopover from './src/popover';
+// import QxCheckboxFieldPopover from './src/popover/checkbox';
 
-export { QxFieldItem, QxFieldSelect };
+export { QxFieldItem, QxFieldSelect, QxFieldPopover };

@@ -4,7 +4,7 @@ import * as React from 'react';
 import { FC, ReactElement, useEffect, useState } from 'react';
 import type { OptionField } from '../type';
 import { getUsefulFieldProp } from '../util';
-import QxFieldItem from '../item';
+import { QxFieldItem } from '@qx/common';
 import './style.less';
 import Checkbox from 'antd/es/checkbox/Checkbox';
 import {QxBaseIcon} from '@qx/common';

@@ -6,7 +6,7 @@ import { useEffect, useState } from 'react';
 import type { OptionField } from '../type';
 import { getUsefulFieldProp } from '../util';
 // import {flatFields, getUsefulFieldProp} from '../util';
-import QxFieldItem from '../item';
+import { QxFieldItem } from '@qx/common';
 import {QxBaseIcon} from '@qx/common';
 import './style.less';
 import { useDebounceFn } from 'ahooks';
@@ -127,107 +127,131 @@ const QxFieldPopover: React.FC<QxFieldPopoverProp> = (props) => {
           </div>
         ) : (
           <>
-            <Input
-              className={'qx-selector-sub-search'}
-              placeholder={'搜索'}
-              allowClear
-              prefix={<QxBaseIcon type={'icon-app-search-line'} />}
-              style={{ paddingTop: '6px' }}
-              onChange={(e) => {
-                handleChange(e.target.value);
+            <div
+              onMouseDown={(e) => {
+                e.preventDefault();
               }}
-            />
+            >
+              <Input
+                bordered={false}
+                value={keyword}
+                className={'qx-fields-popover__search'}
+                placeholder={'搜索'}
+                allowClear
+                prefix={<QxBaseIcon type={'icon-app-search-line'} />}
+                onChange={(e) => {
+                  handleChange(e.target.value);
+                }}
+              />
+            </div>
             <Divider style={{ margin: 0 }} />
-            <Menu mode="inline" className={'qx-fields-pop-content'} selectedKeys={[]}>
-              {filterFields.map((field: any) => {
-                if (field.children) {
-                  return (
-                    <Menu.SubMenu
-                      key={field.code}
-                      title={
-                        field.title || (
-                          <QxFieldItem
-                            widget={field.extract && field.extract.widget}
-                            name={field.name}
-                          />
-                        )
-                      }
-                    >
-                      {field.children.map((item: any) => {
-                        if ((item.children || []).length) {
-                          return (
-                            <Menu.SubMenu
-                              key={item.code}
-                              title={
-                                item.title || (
+            {!filterFields.length ? (
+              <div
+                className={'ant-empty-normal'}
+                style={{
+                  textAlign: 'center',
+                  margin: '10px 0',
+                }}
+              >
+                暂无相关字段
+              </div>
+            ) : (
+              <Menu
+                mode="inline"
+                className={'qx-fields-pop-content'}
+                selectedKeys={[]}
+                inlineIndent={12}
+              >
+                {filterFields.map((field: any) => {
+                  if (!!field?.children?.length) {
+                    return (
+                      <Menu.SubMenu
+                        key={field.code}
+                        title={
+                          field.title || (
+                            <QxFieldItem
+                              widget={field.extract && field.extract.widget}
+                              name={field.name}
+                            />
+                          )
+                        }
+                      >
+                        {field.children.map((item: any) => {
+                          if ((item.children || []).length) {
+                            return (
+                              <Menu.SubMenu
+                                key={item.code}
+                                title={
+                                  item.title || (
+                                    <QxFieldItem
+                                      widget={field.extract && field.extract.widget}
+                                      name={field.name}
+                                    />
+                                  )
+                                }
+                              >
+                                {(item.children || []).map((_it: any) => {
+                                  return (
+                                    <Menu.Item
+                                      key={_it.code}
+                                      onClick={() => {
+                                        handleClick(_it);
+                                      }}
+                                    >
+                                      {_it.title || (
+                                        <QxFieldItem
+                                          widget={field.extract && field.extract.widget}
+                                          name={field.name}
+                                        />
+                                      )}
+                                    </Menu.Item>
+                                  );
+                                })}
+                              </Menu.SubMenu>
+                            );
+                          } else {
+                            return (
+                              <Menu.Item
+                                key={item.code}
+                                onClick={() => {
+                                  handleClick(item);
+                                }}
+                              >
+                                {item.title || (
                                   <QxFieldItem
                                     widget={field.extract && field.extract.widget}
                                     name={field.name}
                                   />
-                                )
-                              }
-                            >
-                              {(item.children || []).map((_it: any) => {
-                                return (
-                                  <Menu.Item
-                                    key={_it.code}
-                                    onClick={() => {
-                                      handleClick(_it);
-                                    }}
-                                  >
-                                    {_it.title || (
-                                      <QxFieldItem
-                                        widget={field.extract && field.extract.widget}
-                                        name={field.name}
-                                      />
-                                    )}
-                                  </Menu.Item>
-                                );
-                              })}
-                            </Menu.SubMenu>
-                          );
-                        } else {
-                          return (
-                            <Menu.Item
-                              key={item.code}
-                              onClick={() => {
-                                handleClick(item);
-                              }}
-                            >
-                              {item.title || (
-                                <QxFieldItem
-                                  widget={field.extract && field.extract.widget}
-                                  name={field.name}
-                                />
-                              )}
-                            </Menu.Item>
-                          );
-                        }
-                      })}
-                    </Menu.SubMenu>
-                  );
-                } else {
-                  return (
-                    <Menu.Item
-                      style={{
-                        display: keyword && field?.name?.indexOf(keyword) === -1 ? 'none' : 'block',
-                      }}
-                      onClick={() => {
-                        run(field);
-                      }}
-                      key={field.code}
-                    >
-                      {field.title || (
-                        <QxFieldItem
-                          widget={field.extract && field.extract.widget}
-                          name={field.name}
-                        />
-                      )}
-                    </Menu.Item>
-                  );
-                }
-              })}
-            </Menu>
+                                )}
+                              </Menu.Item>
+                            );
+                          }
+                        })}
+                      </Menu.SubMenu>
+                    );
+                  } else {
+                    return (
+                      <Menu.Item
+                        style={{
+                          display: keyword && field?.name?.indexOf(keyword) === -1 ? 'none' : 'block',
+                        }}
+                        onClick={() => {
+                          run(field);
+                        }}
+                        key={field.code}
+                      >
+                        {field.title || (
+                          <QxFieldItem
+                            widget={field.extract && field.extract.widget}
+                            name={field.name}
+                          />
+                        )}
+                      </Menu.Item>
+                    );
+                  }
+                })}
+              </Menu>
+            )}
           </>
         )}
         {props.popFooter ? <div className="qx-field-pop__footer">{props.popFooter}</div> : null}
@@ -244,6 +268,12 @@ const QxFieldPopover: React.FC<QxFieldPopoverProp> = (props) => {
       trigger={props.disabled ? undefined : props.trigger || 'hover'}
       open={visible}
       onOpenChange={(v) => {
+        if (!v) {
+          setTimeout(() => {
+            setKeyword('');
+            setFilterFields([...fields]);
+          }, 0);
+        }
         setVisible(v);
       }}
     >

 @import '~@qx/ui/src/style/variable.less';
 
 .qx-fields-popover {
-  padding-top: 0;
+  &.ant-popover {
+    padding-top: 0;
+    padding-bottom: 0;
+    overflow: hidden;
+    background: #fff;
+    border-radius: 8px;
+    border: 1px solid #e5e6eb;
+    box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.1);
+  }
+
+  .ant-popover-inner {
+    padding: 0;
+  }
 
   .ant-popover-arrow {
     display: none;
@@ -11,6 +23,15 @@
     padding: 0;
     overflow: auto;
   }
+
+  &__search {
+    height: 36px;
+
+    .ant-input-prefix {
+      color: @N7;
+      font-size: 16px;
+    }
+  }
 }
 
 .qx-popover-fields {
@@ -47,15 +68,23 @@
   &.ant-menu-inline > .ant-menu-item,
   .ant-menu-sub.ant-menu-inline > .ant-menu-item {
     height: 32px;
-    margin: 1px;
     line-height: 32px;
+    border-radius: 4px;
 
     &:hover {
       color: inherit;
       background-color: @N3;
     }
   }
+
+  .ant-menu-title-content {
+    .ant-typography + span {
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
 }
+
 .qx-field-pop__footer {
   padding-top: 5px;
   padding-bottom: 5px;

@@ -3,19 +3,14 @@ import * as React from 'react';
 import { useEffect, useState } from 'react';
 import type { OptionField, WidgetField } from '../type';
 import { getUsefulFieldProp } from '../util';
-import QxFieldItem from '../item';
-import { useLocation } from 'react-router';
+import { QxFieldItem } from '@qx/common';
 import { getFieldOptions } from '../../service';
 import './style.less';
 
 const QxFieldSelect: React.FC = (props: any) => {
+  const {appCode, funCode, schema} = props
   const [fields, setFields] = useState<WidgetField[] | OptionField[]>([]);
-  const schemaProps = props.schema.props;
-  // @ts-ignore
-  const {query} = useLocation();
-
-  const appCode = query?.appCode|| props?.appCode || '8yo7v';
-  const funCode = query?.funCode|| props?.funCode ||'2eg66';
+  const schemaProps = schema?.props;
   const includeFields = (list: WidgetField[] | OptionField[]) => {
     // console.log(list,schemaProps.viewable);
     // @ts-ignore

 import React, { useEffect, useState } from 'react';
-import type { ColsTreeProps } from '../qx-field-setter';
-import { FieldSetter } from '../qx-field-setter';
-import { QxFieldPopover } from '../qx-field-popover';
+import type { ColsTreeProps } from '@qx/common';
+import { QxFieldSetter } from '@qx/common';
+import {QxFieldPopover} from '@qx/common';
 import { QxBaseIcon } from '@qx/common';
 import { FunctionOutlined } from '@ant-design/icons';
 import {
@@ -625,7 +625,7 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({
         {Boolean(isUseValOption) ? (
           <div style={{position: 'relative'}}>
             <Button
-              disabled={!(paramMappings && paramMappings?.length < 20)}
+              disabled={(paramMappings && paramMappings?.length > 20)}
               size="small"
               type={'link'}
               onClick={() => setTreeSelectShow(!treeSelectShow)}
@@ -682,10 +682,10 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({
           <QxFieldPopover
             data={getFields(tableFields || [])}
             onSelect={(field) => onAddCondition(field.code)}
-            trigger={'click'}
+            trigger={(paramMappings && paramMappings?.length > 20) ? undefined : 'click'}
           >
             <Button
-              disabled={!(paramMappings && paramMappings?.length < 20)}
+              disabled={(paramMappings && paramMappings?.length > 20)}
               size="small"
               type={'link'}
             >
@@ -863,7 +863,7 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({
                     </span>
                   </div>
                   {/* 值选项 TODO field 在工作流那可能有问题 */}
-                  <FieldSetter
+                  <QxFieldSetter
                     value={item?.valuesObj}
                     params={props.params || fieldInfo?.params}
                     field={getResultField(

@@ -24,6 +24,8 @@ export const QxFormSelect: React.FC<FormSelectProps> = (props) => {
     appId,
     request,
     disabled,
+    placeholder,
+    title
   } = props;
 
   const [state, setState] = useSetState<FormSelectState>({
@@ -59,7 +61,7 @@ export const QxFormSelect: React.FC<FormSelectProps> = (props) => {
         ref={inputSelectRef}
         value={value?.name}
         defaultValue={value?.name}
-        placeholder="请选择数据源"
+        placeholder={placeholder || '请选择数据源'}
         prefix={<BlockOutlined style={{ color: '#52c41a' }} />}
         options={options}
         onChange={handleChange}
@@ -82,7 +84,7 @@ export const QxFormSelect: React.FC<FormSelectProps> = (props) => {
 
       {state.modalVisible ? (
         <QxAppSelector
-          title="选择数据源"
+          title={title || placeholder || "选择数据源"}
           item={{
             flag: 'SINGLE',
             currentId: '',
@@ -94,7 +96,7 @@ export const QxFormSelect: React.FC<FormSelectProps> = (props) => {
           modalProps={{
             width: 550,
             destroyOnClose: true,
-            visible: state.modalVisible,
+            open: state.modalVisible,
             onOk: () => setState({ modalVisible: false }),
             onCancel: () => setState({ modalVisible: false }),
           }}

@@ -2,6 +2,7 @@
 
 .qx-form-select {
   width: 100%;
+  border-radius: 4px;
 
   &__dropdown-bottom {
     width: 100% !important;
@@ -10,4 +11,13 @@
     background-color: #fff !important;
     border-top: 1px solid @N4 !important;
   }
+  .qx-input-select-dropdown__list-empty {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    overflow: hidden;
+    height: 100%;
+    margin: 0;
+  }
 }

+### 选部门组件
+
+```tsx
+/**
+ * debug: true
+ */
+import { QxOrgSelector, request } from '@qx/common';
+import React from 'react';
+
+export default () => {
+  return (
+    <div>
+      <QxOrgSelector request={request} />
+    </div>
+  );
+};
+```
+
+### 弹框
+
+```tsx
+import { QxOrgSelector, request } from '@qx/common';
+import React, { useState } from 'react';
+
+export default () => {
+  const [visible, setVisible] = useState(false);
+  return (
+    <div>
+      <div onClick={() => setVisible(true)}>点一下</div>
+      <QxOrgSelector.Dialog
+        request={request}
+        checkStrictly
+        title={'添加部门'}
+        visible={visible}
+        multiple={true}
+        onOk={(orgIds: any) => {
+          console.log(orgIds, 'lllll');
+        }}
+        onCancel={() => {
+          setVisible(false);
+        }}
+      />
+    </div>
+  );
+};
+```

@@ -30,7 +30,7 @@ import React, {
 } from 'react';
 import JSONEditor from './codeMirror';
 import './style.less';
-import { FieldSetter } from '@qx/common';
+import { QxFieldSetter } from '@qx/common';
 import { formatEnum } from './constant';
 import {
   typeTranslateFieIdtype,
@@ -705,7 +705,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
             ref={inputRef}
             onBlur={() => save('qxProps-default')}
           /> */}
-          <FieldSetter
+          <QxFieldSetter
             value={record.valuesObj || []}
             // value={[{
             //   type: typeTranslateItemtype(record.type) || '',

@@ -19,7 +19,7 @@ import {
 } from 'antd';
 import type { TreeProps } from 'antd/lib/tree';
 import ParameterModal from './ParameterModal';
-import { FieldSetter } from '@qx/common';
+import { QxFieldSetter } from '@qx/common';
 import { formatEnum } from './constant';
 // import type { InputRef } from 'antd';
 import {
@@ -29,7 +29,7 @@ import {
   typeTranslateItemtype,
 } from './constant';
 
-import { cloneDeep, debounce } from 'lodash-es';
+import { cloneDeep } from 'lodash-es';
 import moment from 'dayjs';
 import type { ParamDesignModel } from './constant';
 import { uidGen } from './stringUtil';
@@ -662,7 +662,7 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
         </div>
         {props?.isShowField && (
           <div className="opt-left-down">
-            <FieldSetter
+            <QxFieldSetter
               disabled={disabled}
               value={nodeData.valuesObj || []}
               // value={[

@@ -163,7 +163,10 @@ export const QxSortCondition: React.FC<QxSortConditionProps> = (props) => {
       style={{ width: '100%' }}
     >
       {(sorts || []).map((v: any, k: any) => (
-        <div style={{ marginBottom: '1em' }} key={v.key}>
+        <div
+          style={{ marginBottom: sorts?.length - 1 === k ? 0 : '1em' }}
+          key={v.key}
+        >
           {columns && (
             <Select
               defaultValue={v.key}

@@ -6,77 +6,26 @@
  */
 import { QxUserSelector } from '@qx/common';
 import React from 'react';
-import request from 'umi-request';
-
-request.interceptors.request.use((url, options) => {
-  if (url.startsWith('/api/')) {
-    return { url, options };
-  }
-  const headers = { Authorization: 'dev_session:ZGuqjkCF3GMzorijXw7' };
-  // headers['SERVER-IP'] = '192.168.181.112';
-
-  const fullUrl = url.startsWith('http')
-    ? url
-    : `http://10.9.1.180/qx-api${url}`;
-  return {
-    url: fullUrl,
-    options: {
-      ...options,
-      ...{
-        headers: { ...headers, ...(options.customHeaders || {}) },
-        isInternal: true,
-        timeout: 30000,
-      },
-    },
-  };
-});
-
-request.interceptors.response.use(async (response, options) => {
-  if (response.status !== 200) {
-    return Promise.reject(response);
-  }
-
-  if (!response.headers.get('content-type')?.includes('application/json')) {
-    return response.blob();
-  }
-
-  const body = await response.clone().json();
-
-  // 按正常逻辑处理"文件上传"系列接口
-  const fsUploadApis = ['/file/checkFile', '/file/uploadByExist', '/fss/file/'];
-  const isFsUploadApis = fsUploadApis.filter(
-    (api: string) => options.url.indexOf(api) !== -1,
-  );
-  if (isFsUploadApis.length > 0) {
-    return Promise.resolve(body || null);
-  }
-
-  if (body.success) {
-    return Promise.resolve(body.data || null);
-  }
-
-  console.error('网络请求出错：', body.msg);
-
-  return Promise.reject(body);
-});
+import { request } from '@qx/common';
 
 export default () => {
   return (
     <div>
-      <QxUserSelector
-        request={request}
-        params={{
-          org: [{ relType: 'APPOINT_ORG', relIds: [''] }],
-          pos: null,
-          range: [
-            'ORG:MubDrwZm8IMxuLDU9FM',
-            'ORG:a0WZVI96GAdoI5g9IwX',
-            'ORG:QPLEku2yJU8hmbpLTtg',
-          ],
-        }}
-      />
+        <QxUserSelector request={request} />
+      
       <br />
-      <QxUserSelector request={request} />
+        <QxUserSelector
+            request={request}
+            params={{
+                org: [{ relType: 'APPOINT_ORG', relIds: [''] }],
+                pos: null,
+                range: [
+                    'ORG:MubDrwZm8IMxuLDU9FM',
+                    'ORG:a0WZVI96GAdoI5g9IwX',
+                    'ORG:QPLEku2yJU8hmbpLTtg',
+                ],
+            }}
+        />
       <br />
       <QxUserSelector
         readOnly
@@ -89,6 +38,38 @@ export default () => {
 };
 ```
 
+### 弹框
+
+```tsx
+/**
+ * debug: true
+ */
+import {QxUserSelector} from '@qx/common';
+import React, {useState} from 'react';
+import {request} from '@qx/common';
+
+export default () => {
+    const [visible, setVisible] = useState(false)
+    return (
+        <div>
+            <div onClick={()=> setVisible(true)}>点一下</div>
+            <QxUserSelector.Dialog
+                request={request}
+                title={'添加人员'}
+                visible={visible}
+                multiple={true}
+                onOk={(userIds: any) => {
+                    console.log(userIds,'lllll')
+                }}
+                onCancel={() => {
+                    setVisible(false);
+                }}
+            />
+        </div>
+    );
+};
+```
+
 ## API
 
 | 参数         | 说明                     | 类型               | 默认值 |