@zat-design/sisyphus-react 3.4.6 → 3.4.7

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;

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;

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;
@@ -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/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/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;
                 }

package/es/ProTree/style/index.less

@@ -348,3 +348,18 @@
   height: 16px !important;
 }
 
+.pro-tree-select, .pro-tree-select-drop-down-container{
+  .@{ant-prefix}-select-selector{
+    .check-mark-icon{
+      display: none;
+  }
+  }
+  &.@{ant-prefix}-select-dropdown{
+  // 隐藏单选下拉树后面勾号
+    .@{ant-prefix}-select-tree-node-content-wrapper{
+        .check-mark-icon{
+            display: none;
+        }
+    }
+  }
+}

package/es/ProUpload/index.js

@@ -175,10 +175,6 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
    * @return {*}
    */
   var handleBeforeUpload = function handleBeforeUpload(file, fileList) {
-    if (!isFunction(beforeUpload)) {
-      return false;
-    }
-    // TODO
     if (!validateFileExt(extExt, file)) {
       var _locale$ProUpload2;
       _message.error("".concat(locale === null || locale === void 0 ? void 0 : (_locale$ProUpload2 = locale.ProUpload) === null || _locale$ProUpload2 === void 0 ? void 0 : _locale$ProUpload2.errorInfoExt, "\u3010").concat(extExt.join('、'), "\u3011"));
@@ -189,7 +185,9 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
       _message.error("".concat(locale === null || locale === void 0 ? void 0 : (_locale$ProUpload3 = locale.ProUpload) === null || _locale$ProUpload3 === void 0 ? void 0 : _locale$ProUpload3.errorInfoSize).concat(size, "M"));
       return false;
     }
-    return beforeUpload(file, fileList);
+    if (beforeUpload) {
+      return beforeUpload(file, fileList);
+    }
   };
   var handleRemove = function handleRemove(file) {
     var nextList = _fileList.slice();
@@ -244,7 +242,8 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
     showUploadList: showUploadList,
     method: method,
     accept: accept,
-    data: _objectSpread({}, dataParams)
+    data: _objectSpread({}, dataParams),
+    name: name
   }, residueProps);
   var baseProps = {
     isView: isView,

package/es/ProUpload/propsType.d.ts

@@ -18,7 +18,7 @@ export interface fieldNamesProps {
 }
 export interface ProUploadProps {
     /**
-   * @description       拖拽框顶部的内容
+   * @description       顶部的内容(button类型的上传不适用)
    * @default           -
    */
     headerRender?: React.ReactNode | (() => React.ReactNode);

package/es/global.less

@@ -5,37 +5,33 @@ pre {
 }
 
 * {
-  // 火狐浏览器
-  scrollbar-width: thin;
-  scrollbar-color: #d2d3d7 transparent;
   // ie浏览器
   scrollbar-face-color: #d2d3d7;
   scrollbar-highlight-color: #979797;
   scrollbar-3dlight-color: #979797;
-}
+  ::-webkit-scrollbar  {
+    width: 16px;
+  }
 
-::-webkit-scrollbar  {
-  width: 16px;
-}
+  // // 滑块
+  ::-webkit-scrollbar-thumb {
+    background-color: #d2d3d7;
+    background-clip: padding-box;
+    border-color: transparent;
+    border-style: dashed;
+    border-width: 4px;
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+  }
 
-// // 滑块
-::-webkit-scrollbar-thumb {
-  background-color: #d2d3d7;
-  background-clip: padding-box;
-  border-color: transparent;
-  border-style: dashed;
-  border-width: 4px;
-  border-radius: 10px;
-  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
-}
-
-// 轨道
-::-webkit-scrollbar-track {
-  background-color: transparent;
-  border-radius: 10px;
-}
+  // 轨道
+  ::-webkit-scrollbar-track {
+    background-color: transparent;
+    border-radius: 10px;
+  }
 
-// 悬浮轨道
-::-webkit-scrollbar-thumb:hover {
-  background-color: #979797;
+  // 悬浮轨道
+  ::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
+  }
 }

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

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

package/lib/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;
@@ -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/lib/ProForm/components/combination/FormList/index.js

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

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

@@ -240,7 +240,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];
     }
@@ -258,11 +258,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((0, _toConsumableArray2.default)(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat((0, _toConsumableArray2.default)(_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 () {
@@ -274,7 +274,7 @@ var Render = function Render(props) {
     // ProTreeSelect返回option
     if (['ProTree'].includes(type)) {
       var _args2, _args2$;
-      _args[2].option = (0, _index.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 = (0, _index.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((0, _toConsumableArray2.default)(_args)));
   };

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

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

package/lib/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/lib/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/lib/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/lib/ProForm/utils/index.js

@@ -408,19 +408,19 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
  * @param value 选中值
  * @returns {}
  */
-var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value) {
+var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if ((0, _lodash.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 (0, _lodash.omit)(node, ['children']);
+    if (node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value'] === value) {
+      return (0, _lodash.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 (0, _lodash.omit)(foundNode, ['children']);
+        return (0, _lodash.omit)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
     }
   }

package/lib/ProForm/utils/useForm.js

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

package/lib/ProSelect/index.js

@@ -19,8 +19,9 @@ var _Container = _interopRequireDefault(require("../ProForm/components/Container
 var _AdaptiveTooltip = _interopRequireDefault(require("./components/AdaptiveTooltip"));
 var _ = require("..");
 var _locale = _interopRequireDefault(require("../locale"));
+var _utils = require("./utils");
 require("./index.less");
-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"];
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   var _locale$ProSelect;
@@ -42,6 +43,8 @@ var ProSelect = exports.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,
@@ -266,6 +269,15 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     }
     return value;
   };
+  var newSelectList = selectList;
+  if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
+    newSelectList = (0, _utils.getSelectList)({
+      otherProps: otherProps,
+      value: props.value,
+      dataSource: selectList,
+      labelInValue: labelInValue
+    });
+  }
   return (0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProSelect = _locale.default.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
     allowClear: true,
@@ -288,7 +300,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     }
   }, (0, _lodash.omit)((0, _lodash.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 (0, _jsxRuntime.jsx)(Option, {
         value: item[code],
         record: item,

package/lib/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/lib/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/lib/ProSelect/utils/index.js

@@ -0,0 +1,68 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSelectList = void 0;
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+var _lodash = _interopRequireDefault(require("lodash"));
+/* eslint-disable no-restricted-syntax */
+
+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 = (0, _createForOfIteratorHelper2.default)(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 = _lodash.default.difference(selectValues, [value]);
+  return dataSource.filter(function (item) {
+    return !diffList.includes(labelInValue ? item : item.value);
+  });
+};
+/**
+ * 返回当前组件可以显示的数据源
+ */
+var getSelectList = exports.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/lib/ProTree/components/ProTreeSelect/index.js

@@ -409,13 +409,13 @@ var ProTreeSelect = exports.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('');
   };
@@ -488,7 +488,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     allowClear: allowClear || true,
     showArrow: true,
     treeNodeFilterProp: treeNodeFilterProp,
-    virtual: false
+    virtual: true
   }, selectProps);
   if (value === null) {
     delete treeProps.value;

package/lib/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;
                 }

package/lib/ProTree/style/index.less

@@ -348,3 +348,18 @@
   height: 16px !important;
 }
 
+.pro-tree-select, .pro-tree-select-drop-down-container{
+  .@{ant-prefix}-select-selector{
+    .check-mark-icon{
+      display: none;
+  }
+  }
+  &.@{ant-prefix}-select-dropdown{
+  // 隐藏单选下拉树后面勾号
+    .@{ant-prefix}-select-tree-node-content-wrapper{
+        .check-mark-icon{
+            display: none;
+        }
+    }
+  }
+}

package/lib/ProUpload/index.js

@@ -182,10 +182,6 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
    * @return {*}
    */
   var handleBeforeUpload = function handleBeforeUpload(file, fileList) {
-    if (!(0, _lodash.isFunction)(beforeUpload)) {
-      return false;
-    }
-    // TODO
     if (!(0, _uitls.validateFileExt)(extExt, file)) {
       var _locale$ProUpload2;
       _antd.message.error("".concat(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProUpload2 = _locale.default.ProUpload) === null || _locale$ProUpload2 === void 0 ? void 0 : _locale$ProUpload2.errorInfoExt, "\u3010").concat(extExt.join('、'), "\u3011"));
@@ -196,7 +192,9 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       _antd.message.error("".concat(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProUpload3 = _locale.default.ProUpload) === null || _locale$ProUpload3 === void 0 ? void 0 : _locale$ProUpload3.errorInfoSize).concat(size, "M"));
       return false;
     }
-    return beforeUpload(file, fileList);
+    if (beforeUpload) {
+      return beforeUpload(file, fileList);
+    }
   };
   var handleRemove = function handleRemove(file) {
     var nextList = _fileList.slice();
@@ -251,7 +249,8 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     showUploadList: showUploadList,
     method: method,
     accept: accept,
-    data: (0, _objectSpread2.default)({}, dataParams)
+    data: (0, _objectSpread2.default)({}, dataParams),
+    name: name
   }, residueProps);
   var baseProps = {
     isView: isView,

package/lib/ProUpload/propsType.d.ts

@@ -18,7 +18,7 @@ export interface fieldNamesProps {
 }
 export interface ProUploadProps {
     /**
-   * @description       拖拽框顶部的内容
+   * @description       顶部的内容(button类型的上传不适用)
    * @default           -
    */
     headerRender?: React.ReactNode | (() => React.ReactNode);

package/lib/global.less

@@ -5,37 +5,33 @@ pre {
 }
 
 * {
-  // 火狐浏览器
-  scrollbar-width: thin;
-  scrollbar-color: #d2d3d7 transparent;
   // ie浏览器
   scrollbar-face-color: #d2d3d7;
   scrollbar-highlight-color: #979797;
   scrollbar-3dlight-color: #979797;
-}
+  ::-webkit-scrollbar  {
+    width: 16px;
+  }
 
-::-webkit-scrollbar  {
-  width: 16px;
-}
+  // // 滑块
+  ::-webkit-scrollbar-thumb {
+    background-color: #d2d3d7;
+    background-clip: padding-box;
+    border-color: transparent;
+    border-style: dashed;
+    border-width: 4px;
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+  }
 
-// // 滑块
-::-webkit-scrollbar-thumb {
-  background-color: #d2d3d7;
-  background-clip: padding-box;
-  border-color: transparent;
-  border-style: dashed;
-  border-width: 4px;
-  border-radius: 10px;
-  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
-}
-
-// 轨道
-::-webkit-scrollbar-track {
-  background-color: transparent;
-  border-radius: 10px;
-}
+  // 轨道
+  ::-webkit-scrollbar-track {
+    background-color: transparent;
+    border-radius: 10px;
+  }
 
-// 悬浮轨道
-::-webkit-scrollbar-thumb:hover {
-  background-color: #979797;
+  // 悬浮轨道
+  ::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.6",
+  "version": "3.4.7",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",