@zat-design/sisyphus-react 3.4.6-beta.1 → 3.4.6-beta.11

package/dist/index.esm.css

@@ -3983,6 +3983,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox * {
   height: 16px !important;
 }
+.pro-tree-select .ant-select-selector .check-mark-icon,
+.pro-tree-select-drop-down-container .ant-select-selector .check-mark-icon {
+  display: none;
+}
+.pro-tree-select.ant-select-dropdown .ant-select-tree-node-content-wrapper .check-mark-icon,
+.pro-tree-select-drop-down-container.ant-select-dropdown .ant-select-tree-node-content-wrapper .check-mark-icon {
+  display: none;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;
@@ -4138,6 +4146,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   -webkit-box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
           box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
 }
+.pro-edit-table td[rowspan] {
+  vertical-align: middle !important;
+}
 .pro-edit-table .pro-edit-table-tooltip {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -4204,7 +4215,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   display: -ms-flexbox;
   display: flex;
 }
-.pro-edit-table .drag-wrapper .drag-icon {
+.pro-edit-table .drag-wrapper .anticon {
   margin-right: var(--zaui-space-size-md, 16px);
   margin-left: var(--zaui-space-size-xs, 4px);
   cursor: pointer;

package/dist/less.esm.css

@@ -3983,6 +3983,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox * {
   height: 16px !important;
 }
+.pro-tree-select .ant-select-selector .check-mark-icon,
+.pro-tree-select-drop-down-container .ant-select-selector .check-mark-icon {
+  display: none;
+}
+.pro-tree-select.ant-select-dropdown .ant-select-tree-node-content-wrapper .check-mark-icon,
+.pro-tree-select-drop-down-container.ant-select-dropdown .ant-select-tree-node-content-wrapper .check-mark-icon {
+  display: none;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;
@@ -4138,6 +4146,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   -webkit-box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
           box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
 }
+.pro-edit-table td[rowspan] {
+  vertical-align: middle !important;
+}
 .pro-edit-table .pro-edit-table-tooltip {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -4204,7 +4215,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   display: -ms-flexbox;
   display: flex;
 }
-.pro-edit-table .drag-wrapper .drag-icon {
+.pro-edit-table .drag-wrapper .anticon {
   margin-right: var(--zaui-space-size-md, 16px);
   margin-left: var(--zaui-space-size-xs, 4px);
   cursor: pointer;

package/es/ProEditTable/components/RenderField/index.js

@@ -491,6 +491,7 @@ var RenderField = function RenderField(_ref) {
       form: form,
       names: names,
       name: cellName,
+      listName: cellName,
       viewEmpty: viewEmpty,
       valueType: valueType,
       isView: isView

package/es/ProEditTable/style/index.less

@@ -2,6 +2,9 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-edit-table {
+  td[rowspan]{
+    vertical-align: middle !important;
+  }
   .pro-edit-table-tooltip {
     display    : inline-flex;
     align-items: center;
@@ -62,7 +65,7 @@
 
   .drag-wrapper {
     display: flex;
-    .drag-icon {
+    .anticon {
       margin-right: var(--zaui-space-size-md, 16px);
       margin-left: var(--zaui-space-size-xs, 4px);
       cursor: pointer;
@@ -137,7 +140,7 @@
         .@{ant-prefix}-table-cell-fix-left,
         .@{ant-prefix}-table-cell-fix-right {
           background-color: var(--zaui-table-header-bg, #f2f3f5);
-          
+
         }
       }
 

package/es/ProForm/components/base/TextArea/index.d.ts

@@ -5,6 +5,7 @@ import './index.less';
 export interface Props extends TextAreaProps {
     otherProps?: ProFormOtherProps;
     isView?: boolean;
+    tooltip?: boolean;
 }
 declare const TextAreaDef: React.FC<Props>;
 export default TextAreaDef;

package/es/ProForm/components/base/TextArea/index.js

@@ -3,7 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
-var _excluded = ["placeholder", "otherProps", "className"];
+var _excluded = ["placeholder", "otherProps", "className", "tooltip"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { omit } from 'lodash';
 import classnames from 'classnames';
@@ -17,6 +17,8 @@ var TextAreaDef = function TextAreaDef(props) {
   var placeholder = props.placeholder,
     otherProps = props.otherProps,
     className = props.className,
+    _props$tooltip = props.tooltip,
+    tooltip = _props$tooltip === void 0 ? true : _props$tooltip,
     rest = _objectWithoutProperties(props, _excluded);
   var _ref = ProForm.useFieldProps() || {},
     label = _ref.label,
@@ -27,7 +29,7 @@ var TextAreaDef = function TextAreaDef(props) {
   if (isView) {
     return _jsx(Container, {
       nowrap: false,
-      tooltip: true,
+      tooltip: tooltip,
       viewEmpty: viewEmpty,
       children: rest.value
     });

package/es/ProForm/components/combination/FormList/components/BlockFields.d.ts

@@ -1,7 +1,7 @@
 import { ColProps, FormListFieldData } from 'antd';
 import React from 'react';
 import { InternalNamePath } from 'antd/es/form/interface';
-import type { levelType } from '@/ProLayout/components/ProCollapse/PropTypes';
+import type { levelType } from '../../../../../ProLayout/components/ProCollapse/PropTypes';
 import type { FormListProps } from '../propsType';
 interface Props extends Omit<FormListProps, 'toolbarProps'> {
     index: number;

package/es/ProForm/components/combination/FormList/index.js

@@ -52,6 +52,7 @@ var FormList = function FormList(props, ref) {
         }) : item.names,
         index: fieldName,
         namePath: namePath,
+        listName: [].concat(_toConsumableArray(namePath), [item.name]),
         label: mode === 'less' ? undefined : item.label
       });
       return column;

package/es/ProForm/components/combination/FormList/propsType.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import type { FormInstance } from 'antd/es/form/Form';
 import type { ButtonProps, FormListFieldData, FormListOperation, PopconfirmProps } from 'antd';
 import type { InternalNamePath } from 'antd/es/form/interface';
-import type { levelType } from '@/ProLayout/components/ProCollapse/PropTypes';
+import type { levelType } from '../../../../ProLayout/components/ProCollapse/PropTypes';
 import type { ProColumnProps, ProFormOtherProps } from '../../../propsType';
 export type TitleRender = (record: Record<string, any>, index: number, form: FormInstance) => any;
 export type TitleType = string | React.ReactNode | TitleRender;

package/es/ProForm/components/combination/GroupCopy/component/ComRender.js

@@ -3,8 +3,8 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
-import ConfirmWrapper from '@/ProForm/components/render/ConfirmWrapper';
-import { FieldProvider } from '@/ProForm/utils/useFieldProps';
+import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
+import { FieldProvider } from '../../../../utils/useFieldProps';
 import * as componentMap from '../../../../../index';
 /** 渲染组件 */
 var ComRender = function ComRender(props) {

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -295,58 +295,64 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleFinish = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _data, flag, res;
+      var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            if (selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) {
+            if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
               _context2.next = 4;
               break;
             }
             _message.error(locale.ProModalSelect.checkMsg);
             return _context2.abrupt("return", false);
           case 4:
-            _data = isMultiple ? selectedRows : selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows[0];
+            nextSelectedRows = selectedRows;
+            if (!((_nextSelectedRows = nextSelectedRows) === null || _nextSelectedRows === void 0 ? void 0 : _nextSelectedRows[0])) {
+              nextSelectedRows = data.filter(function (item) {
+                return selectedRowKeys.includes(item[valueKey]);
+              });
+            }
+            record = isMultiple ? nextSelectedRows : (_nextSelectedRows2 = nextSelectedRows) === null || _nextSelectedRows2 === void 0 ? void 0 : _nextSelectedRows2[0];
             if (!isMultiple) {
               // @ts-ignore
-              _data.value = _data[valueKey];
+              record.value = record[valueKey];
               // @ts-ignore
-              _data.label = _data[labelKey];
+              record.label = record[labelKey];
             }
             flag = true;
             if (!onOk) {
-              _context2.next = 12;
+              _context2.next = 14;
               break;
             }
-            _context2.next = 10;
-            return onOk(_data);
-          case 10:
+            _context2.next = 12;
+            return onOk(record);
+          case 12:
             res = _context2.sent;
             if (res !== null && res !== undefined) {
               // @ts-ignore
               flag = res;
             }
-          case 12:
+          case 14:
             if (flag) {
-              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? _data : getNextValues(_data), _data);
+              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
               // 更新内部展示值
               setState({
-                _value: _data,
-                options: isArray(_data) ? _data : [_data]
+                _value: record,
+                options: isArray(record) ? record : [record]
               });
               handleClose();
             }
             return _context2.abrupt("return", flag);
-          case 16:
-            _context2.prev = 16;
+          case 18:
+            _context2.prev = 18;
             _context2.t0 = _context2["catch"](0);
             console.warn('error', _context2.t0);
-          case 19:
+          case 21:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 16]]);
+      }, _callee2, null, [[0, 18]]);
     }));
     return function handleFinish() {
       return _ref7.apply(this, arguments);
@@ -427,7 +433,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data2, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -458,15 +464,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
-              if (_data2) {
+              _data = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
+              if (_data) {
                 nextSelectRowKeys = isMultiple ? value : [value];
                 if (labelInValue) {
-                  onChange(_data2);
+                  onChange(_data);
                 }
                 // 更新内部展示值
                 setState({
-                  _value: _data2,
+                  _value: _data,
                   isInit: false,
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
@@ -493,7 +499,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
-      var queryBean, page, params, res, _list2, list, _res$data3, _data3, nextSelectRowKeys;
+      var queryBean, page, params, res, _list2, list, _res$data3, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -517,18 +523,18 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
+              _data2 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
               nextSelectRowKeys = isMultiple ? value : [value];
               if (labelInValue) {
-                onChange(_data3);
+                onChange(_data2);
               } else {
-                onChange(isMultiple ? _data3.map(function (item) {
+                onChange(isMultiple ? _data2.map(function (item) {
                   return item[valueKey];
-                }) : _data3[valueKey]);
+                }) : _data2[valueKey]);
               }
               // 更新内部展示值
               setState({
-                _value: _data3,
+                _value: _data2,
                 isInit: false,
                 selectedRows: list,
                 selectedRowKeys: nextSelectRowKeys
@@ -597,8 +603,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
+        console.log('value', value);
         nextState.selectedRowKeys = [value];
-        nextState.selectedRows = [_defineProperty({}, valueKey, value[valueKey])];
       }
       setState(nextState);
     }

package/es/ProForm/components/render/Render.js

@@ -242,7 +242,7 @@ var Render = function Render(props) {
    * onChange参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleChange = function handleChange() {
-    var _otherFormItemProps$n3, _lastComponentProps$c2;
+    var _lastComponentProps$c2;
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
@@ -260,11 +260,11 @@ var Render = function Render(props) {
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat(_toConsumableArray(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat(_toConsumableArray(_args))));
       return false;
     }
-    var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
-    // FormList 和 Group场景 对比值改变的话, 回显到表单上
-    if (inList) {
-      form.setFieldsValue(_args[1]);
-    }
+    // const inList = _otherFormItemProps?.namePath?.length;
+    // // FormList 和 Group场景 对比值改变的话, 回显到表单上
+    // if (inList) {
+    //   form.setFieldsValue(_args[1]);
+    // }
     // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
       setTimeout(function () {
@@ -276,7 +276,7 @@ var Render = function Render(props) {
     // ProTreeSelect返回option
     if (['ProTree'].includes(type)) {
       var _args2, _args2$;
-      _args[2].option = findOptionByValue(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0]);
+      _args[2].option = findOptionByValue(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }
     (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat(_toConsumableArray(_args)));
   };

package/es/ProForm/components/render/RenderFields.js

@@ -179,6 +179,7 @@ var RenderFields = function RenderFields(props) {
       colProps: _colProps,
       mode: componentProps.mode,
       namePath: column.namePath,
+      listName: column.listName,
       globalControl: globalControl,
       formDisabled: formDisabled
     };

package/es/ProForm/components/render/propsType.d.ts

@@ -208,6 +208,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     clearNotShow?: boolean;
     index?: number;
     namePath?: NamePath;
+    listName?: NamePath;
     /** 表单前缀信息 */
     before?: string | React.ReactNode;
     /** 表单后缀信息 */
@@ -216,7 +217,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
     fixed?: boolean;
-    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
 }
 export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
 /**

package/es/ProForm/propsType.d.ts

@@ -41,6 +41,7 @@ export interface ProFormOtherProps {
     required?: boolean | boolean[] | (() => boolean | boolean[]);
     mode?: string;
     namePath?: any[] | string | number;
+    listName?: any[] | string | number;
     globalControl?: boolean;
     formDisabled?: boolean;
 }

package/es/ProForm/utils/index.d.ts

@@ -83,7 +83,12 @@ export declare const deleteForPath: (values: any, namePath: string | number | (s
  * @param value 选中值
  * @returns {}
  */
-export declare const findOptionByValue: (treeData: any[], value: string | number) => any;
+export declare const findOptionByValue: (treeData: any[], value: string | number, fieldNames: {
+    [key: string]: any;
+    label?: string;
+    value?: string;
+    children?: string;
+}) => any;
 /**
  * 对比依赖列表中的 值是否变更
  */

package/es/ProForm/utils/index.js

@@ -392,19 +392,19 @@ export var deleteForPath = function deleteForPath(values, namePath) {
  * @param value 选中值
  * @returns {}
  */
-export var findOptionByValue = function findOptionByValue(treeData, value) {
+export var findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if (isObject(value)) {
     return value;
   }
   for (var i = 0; i < (treeData === null || treeData === void 0 ? void 0 : treeData.length); i++) {
     var node = treeData[i];
-    if (node.value === value) {
-      return omit(node, ['children']);
+    if (node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value'] === value) {
+      return omit(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = findOptionByValue(node.children, value);
+      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
-        return omit(foundNode, ['children']);
+        return omit(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
     }
   }

package/es/ProForm/utils/useForm.js

@@ -57,7 +57,8 @@ export var useForm = function useForm(originForm) {
                 behavior: 'smooth'
               });
             }
-          case 14:
+            throw _context.t0;
+          case 15:
           case "end":
             return _context.stop();
         }

package/es/ProSelect/index.js

@@ -9,7 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import React, { useImperativeHandle, useState, forwardRef } from 'react';
@@ -19,6 +19,7 @@ import Container from '../ProForm/components/Container';
 import AdaptiveTooltip from './components/AdaptiveTooltip';
 import { ProForm } from '..';
 import locale from '../locale';
+import { getSelectList } from './utils';
 import './index.less';
 var Option = _Select.Option;
 export var ProSelect = function ProSelect(props, ref) {
@@ -41,6 +42,8 @@ export var ProSelect = function ProSelect(props, ref) {
     tooltip = _props$tooltip === void 0 ? false : _props$tooltip,
     otherProps = props.otherProps,
     labelInValue = props.labelInValue,
+    _props$filterInList = props.filterInList,
+    filterInList = _props$filterInList === void 0 ? false : _props$filterInList,
     _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa,
     defaultOne = props.defaultOne,
@@ -265,6 +268,15 @@ export var ProSelect = function ProSelect(props, ref) {
     }
     return value;
   };
+  var newSelectList = selectList;
+  if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
+    newSelectList = getSelectList({
+      otherProps: otherProps,
+      value: props.value,
+      dataSource: selectList,
+      labelInValue: labelInValue
+    });
+  }
   return _jsx(_Select, _objectSpread(_objectSpread({
     placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProSelect = locale.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
     allowClear: true,
@@ -287,7 +299,7 @@ export var ProSelect = function ProSelect(props, ref) {
     }
   }, omit(cloneDeep(selectProps), ['isView', 'showCodeName', 'form', 'name'])), {}, {
     value: transformValue(),
-    children: Array.isArray(selectList) && selectList.map(function (item) {
+    children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
       return _jsx(Option, {
         value: item[code],
         record: item,

package/es/ProSelect/propsType.d.ts

@@ -14,6 +14,8 @@ export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {
     defaultOne?: boolean;
     /** 数据源 */
     dataSource?: DataOption[];
+    /** list场景中过滤掉已选择的值 */
+    filterInList?: boolean;
     /** @deprecated  兼容 2.0 版本、3.0 使用view 模式 */
     defaultDisableValue?: string;
     /** 是否展示 tooltip、当 label 特别长的时候使用 */

package/es/ProSelect/utils/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 返回当前组件可以显示的数据源
+ */
+export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, }: {
+    otherProps: any;
+    value: any;
+    dataSource: any;
+    labelInValue: any;
+}) => any;

package/es/ProSelect/utils/index.js

@@ -0,0 +1,60 @@
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+/* eslint-disable no-restricted-syntax */
+import _ from 'lodash';
+var findSelectNameValues = function findSelectNameValues(_ref) {
+  var list = _ref.list,
+    selectName = _ref.selectName,
+    value = _ref.value,
+    dataSource = _ref.dataSource,
+    labelInValue = _ref.labelInValue;
+  var selectValues = [];
+  list.forEach(function (item) {
+    var result = item;
+    if (!item || !Object.keys(item).length || Object.keys(item).length === 1 && 'rowKey' in item) {
+      return false;
+    }
+    var _iterator = _createForOfIteratorHelper(selectName),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var key = _step.value;
+        result = result[key];
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    selectValues.push(result);
+  });
+  var diffList = _.difference(selectValues, [value]);
+  return dataSource.filter(function (item) {
+    return !diffList.includes(labelInValue ? item : item.value);
+  });
+};
+/**
+ * 返回当前组件可以显示的数据源
+ */
+export var getSelectList = function getSelectList(_ref2) {
+  var otherProps = _ref2.otherProps,
+    value = _ref2.value,
+    dataSource = _ref2.dataSource,
+    labelInValue = _ref2.labelInValue;
+  if (!otherProps) {
+    return null;
+  }
+  var listName = otherProps.listName,
+    form = otherProps.form;
+  var firstNumberIndex = listName.findIndex(function (item) {
+    return typeof item === 'number';
+  });
+  var fatherName = listName.slice(0, firstNumberIndex);
+  var selectName = listName.slice(firstNumberIndex + 1);
+  return findSelectNameValues({
+    list: form.getFieldValue(fatherName),
+    selectName: selectName,
+    value: value,
+    dataSource: dataSource,
+    labelInValue: labelInValue
+  });
+};

package/es/ProTree/components/ProTreeSelect/index.js

@@ -407,13 +407,13 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     }
     return result;
   }
-  var handleChange = function handleChange(newVal) {
+  var handleChange = function handleChange(newVal, label, extra) {
     // newVal回来得一定是label、value
     var result = newVal;
     if (props === null || props === void 0 ? void 0 : props.labelInValue) {
       result = getLabelByValue(selectList, newVal);
     }
-    onChange && onChange(result, selectList, null);
+    onChange && onChange(result, label, extra);
     // 重置搜索
     showSearch && searchTreeEvent('');
   };
@@ -486,7 +486,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     allowClear: allowClear || true,
     showArrow: true,
     treeNodeFilterProp: treeNodeFilterProp,
-    virtual: false
+    virtual: true
   }, selectProps);
   if (value === null) {
     delete treeProps.value;

package/es/ProTree/components/ProTreeSelect/style/index.less

@@ -40,6 +40,12 @@
                 color: red;
             }
         }
+        // 隐藏单选下拉树后面勾号
+        .@{ant-prefix}-select-tree-node-content-wrapper{
+            .check-mark-icon{
+                display: none;
+            }
+        }
         // 单选
         &.signal-tree{
             .@{ant-prefix}-select-tree{
@@ -63,14 +69,6 @@
                         display: block;
                     }
                 }
-                .@{ant-prefix}-select-tree-node-content-wrapper{
-                    background-color: transparent;
-                    &.@{ant-prefix}-select-tree-node-selected{
-                        .check-mark-icon{
-                            display: block;
-                        }
-                    }
-                }
                 .@{ant-prefix}-select-tree-treenode:hover{
                     background-color: #f5f5f5;
                 }