@zat-design/sisyphus-react 3.4.2-beta.1 → 3.4.2

package/dist/index.esm.css

@@ -3087,6 +3087,93 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .proupload-modal-preview .ant-modal {
   width: 600px;
 }
+.pro-tree-select .ant-select-selector .check-mark-icon {
+  display: none;
+}
+.pro-tree-select .ant-select.ant-select-single.ant-select-show-arrow:not(.ant-select-show-search).ant-select-open .ant-select-arrow {
+  -webkit-transition: -webkit-transform 300ms ease-in-out;
+  transition: -webkit-transform 300ms ease-in-out;
+  transition: transform 300ms ease-in-out;
+  transition: transform 300ms ease-in-out, -webkit-transform 300ms ease-in-out;
+  -webkit-transform: rotate(180deg);
+          transform: rotate(180deg);
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown .highlight-search-text {
+  color: var(--zaui-brand, #006aff);
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown .ant-select-tree-list-holder-inner {
+  position: relative!important;
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.ant-tree-select-dropdown {
+  width: auto!important;
+  padding: 0px;
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.singal-tree .ant-select-tree .ant-select-tree-treenode,
+.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-treenode {
+  padding-top: var(--zaui-space-size-xs);
+  padding-bottom: var(--zaui-space-size-xs);
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.singal-tree .highlight,
+.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .highlight {
+  color: red;
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-treenode {
+  position: relative;
+  padding-right: 50px;
+  padding-left: 7px;
+  z-index: 0;
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-treenode:after {
+  content: '';
+  display: none;
+  position: absolute;
+  z-index: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: var(--zaui-brand, #006aff);
+  opacity: 0.1;
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-treenode.ant-select-tree-treenode-selected:after {
+  display: block;
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-node-content-wrapper {
+  background-color: transparent;
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-node-content-wrapper.ant-select-tree-node-selected .check-mark-icon {
+  display: block;
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-treenode:hover {
+  background-color: #f5f5f5;
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .check-option-text .check-mark-icon {
+  position: absolute;
+  right: -34px;
+  top: 2px;
+  display: none;
+  color: var(--zaui-list-item-selected-bg);
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-treenode {
+  padding-left: 7px;
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-treenode:hover {
+  background-color: #f5f5f5;
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-node-content-wrapper {
+  padding-right: var(--zaui-space-size-md);
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-node-content-wrapper:hover {
+  background-color: transparent;
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-checkbox {
+  margin-top: var(--zaui-space-size-xs);
+  -webkit-align-self: stretch;
+      -ms-flex-item-align: stretch;
+          align-self: stretch;
+}
+.pro-tree-select-drop-down-container.ant-select-dropdown.ten-count-tree-node .ant-select-tree-switcher-noop {
+  width: var(--zaui-space-size-xs);
+}
 .pro-tree-modal-container .ant-modal-content .ant-modal-body {
   max-height: 498px;
 }

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

@@ -24,6 +24,7 @@ export { default as Container } from './combination/Container';
 export { default as ProEnum } from '../../ProEnum';
 export { default as ProSelect } from '../../ProSelect';
 export { default as ProUpload } from '../../ProUpload';
+export { default as ProTreeSelect } from '../../ProTreeSelect';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 export { default as FormFooter } from './FormFooter';

package/es/ProForm/components/index.js

@@ -26,7 +26,7 @@ export { default as Container } from './combination/Container';
 export { default as ProEnum } from '../../ProEnum';
 export { default as ProSelect } from '../../ProSelect';
 export { default as ProUpload } from '../../ProUpload';
-// export { default as ProTreeSelect } from '../../ProTreeSelect';
+export { default as ProTreeSelect } from '../../ProTreeSelect';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 // footer组件

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

@@ -34,7 +34,7 @@ import useRules from '../../utils/useRules';
 import ConfirmWrapper from './ConfirmWrapper';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
+  var _ref2, _ref3, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -53,8 +53,7 @@ var Render = function Render(props) {
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
     originalTip = props.originalTip,
-    confirm = props.confirm,
-    globalControl = props.globalControl;
+    confirm = props.confirm;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -170,12 +169,8 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
-  /**
-   * globalControl 全局控制优先
-   * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
-   * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
-   */
-  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
+  // 优先级 formitem上【column.disabled】 > 组件上【fieldProps.disabled】 > 全局【formDisabled】
+  var lastDisabled = (_ref2 = (_ref3 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled;
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -203,8 +198,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = _toConsumableArray(args);
-    var _ref6 = otherProps || {},
-      valueType = _ref6.valueType;
+    var _ref4 = otherProps || {},
+      valueType = _ref4.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -271,7 +266,7 @@ var Render = function Render(props) {
       }, 60);
     }
     // ProTreeSelect返回option
-    if (['ProTree'].includes(type)) {
+    if (['ProTreeSelect', '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]);
     }
@@ -281,7 +276,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len2,
         args,
         _key2,
@@ -308,7 +303,7 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref7.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
@@ -385,7 +380,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';

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

@@ -18,7 +18,6 @@ interface Props<T = any> {
     requiredOnView?: boolean;
     required?: boolean | (() => boolean);
     originalTip?: boolean;
-    globalControl?: boolean;
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;

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

@@ -25,8 +25,7 @@ var RenderFields = function RenderFields(props) {
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
     required = props.required,
-    originalTip = props.originalTip,
-    globalControl = props.globalControl;
+    originalTip = props.originalTip;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
     return Array.isArray(item.hiddenNames);
@@ -205,8 +204,7 @@ var RenderFields = function RenderFields(props) {
         originalValues: originalValues,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        originalTip: originalTip,
-        globalControl: globalControl
+        originalTip: originalTip
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

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

@@ -26,6 +26,7 @@ import { Props as ProRangeLimitProps } from '../combination/ProRangeLimit';
 import { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
 import { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
 import { ProEditTableProps } from '../../../ProEditTable/propsType';
+import { PropTreeSelectProps } from '../../../ProTreeSelect/propsType';
 import { ProTreeModalProps } from '../../../ProTreeModal/propsType';
 import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
@@ -149,6 +150,9 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProEditTable';
     fieldProps?: FieldProps<ProEditTableProps, Values, T>;
+} | {
+    type?: 'ProTreeSelect';
+    fieldProps?: FieldProps<PropTreeSelectProps, Values, T>;
 } | {
     type?: 'ProTreeModal';
     fieldProps?: FieldProps<ProTreeModalProps, Values, T>;
@@ -266,7 +270,6 @@ export interface RenderProps<Values = any> {
     originalValues?: Values;
     requiredOnView?: boolean;
     confirm?: ProFormColumnProps['confirm'];
-    globalControl?: boolean;
     [name: string]: any;
 }
 export {};

package/es/ProForm/index.js

@@ -12,13 +12,13 @@ import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip", "formKey", "globalControl"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip", "formKey"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
 import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { isObject, isString, merge } from 'lodash';
-import { FormFooter, InputRange, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
+import { FormFooter, InputRange, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeSelect, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
 import { useProConfig, useContextForms } from '../ProConfigProvider';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './utils/index';
@@ -66,7 +66,6 @@ var ProForm = function ProForm(props, ref) {
     _props$originalTip = props.originalTip,
     originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
     formKey = props.formKey,
-    globalControl = props.globalControl,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useProConfig = useProConfig(),
     state = _useProConfig.state,
@@ -254,8 +253,7 @@ var ProForm = function ProForm(props, ref) {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalTip: originalTip,
-        globalControl: globalControl
+        originalTip: originalTip
       }), children, footerRender()]
     }))
   }));
@@ -320,7 +318,7 @@ ProFormForward.ProNumberRange = ProNumberRange;
 ProFormForward.ProModalSelect = ProModalSelect;
 ProFormForward.ProTimeLimit = ProTimeLimit;
 ProFormForward.ProUpload = ProUpload;
-// ProFormForward.ProTreeSelect = ProTreeSelect;
+ProFormForward.ProTreeSelect = ProTreeSelect;
 ProFormForward.ProTreeModal = ProTreeModal;
 ProFormForward.ProTree = ProTree;
 // 待废弃

package/es/ProForm/propsType.d.ts

@@ -42,8 +42,6 @@ export interface ProFormOtherProps {
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
-    /** 全局控制优先 */
-    globalControl?: boolean;
     mode?: ModeEnum;
     formKey?: string;
     /** 是否查看 */

package/es/ProIcon/index.js

@@ -73,10 +73,6 @@ var ProIcon = function ProIcon(props) {
     'pro-icon-btn': disabled
   });
   var _mode = mode || 'icon';
-  // 特殊情况，如果指定了type，并且没有接收到组件内的mode，那模式就是icon
-  if (type && !props.mode) {
-    _mode = 'icon';
-  }
   var isIconMode = _mode === 'icon';
   var isExtendButtonMode = !isIconMode || isIconMode && disabled;
   var mergedMapList = uniqBy(mapList.concat(iconMap), 'text');

package/es/ProTree/index.js

@@ -8,7 +8,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  *@Description: ProTree组件，集成了tree和treeSelect
 */
 import ProTree from './components/ProTree';
-import ProTreeSelect from './components/ProTreeSelect';
+import ProTreeSelect from '../ProTreeSelect';
 var ProTreeHandle = function ProTreeHandle(props) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'tree' : _props$mode;

package/es/{ProTree/components/ProTreeSelect → ProTreeSelect}/index.js

@@ -15,8 +15,8 @@ import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from
 import classnames from 'classnames';
 import { useImperativeHandle, forwardRef } from 'react';
 import { cloneDeep } from 'lodash';
-import { useProConfig } from '../../../ProConfigProvider';
-import Container from '../../../ProForm/components/Container';
+import { useProConfig } from '../ProConfigProvider';
+import Container from '../ProForm/components/Container';
 var SHOW_PARENT = _TreeSelect.SHOW_PARENT;
 export var ProTreeSelect = function ProTreeSelect(props, ref) {
   // 全局属性配置在ConfigProvider

package/{lib/ProTree/components → es}/ProTreeSelect/propsType.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { TreeSelectProps } from 'antd';
 import { Service, Options, Result } from 'ahooks/lib/useRequest/src/types';
-import { ProFormOtherProps } from '../../../ProForm/propsType';
+import { ProFormOtherProps } from '../ProForm/propsType';
 export interface DataProps {
     label: string;
     value?: string;

package/es/style/components.less

@@ -11,7 +11,7 @@
 // 表单
 @import '../ProForm/style/index';
 @import '../ProUpload/style/index';
-// @import '../ProTreeSelect/style/index';
+@import '../ProTreeSelect/style/index';
 @import '../ProTreeModal/style/index';
 @import '../ProTree/style/index';
 

package/lib/ProForm/components/index.d.ts

@@ -24,6 +24,7 @@ export { default as Container } from './combination/Container';
 export { default as ProEnum } from '../../ProEnum';
 export { default as ProSelect } from '../../ProSelect';
 export { default as ProUpload } from '../../ProUpload';
+export { default as ProTreeSelect } from '../../ProTreeSelect';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 export { default as FormFooter } from './FormFooter';

package/lib/ProForm/components/index.js

@@ -167,6 +167,12 @@ Object.defineProperty(exports, "ProTreeModal", {
     return _ProTreeModal.default;
   }
 });
+Object.defineProperty(exports, "ProTreeSelect", {
+  enumerable: true,
+  get: function get() {
+    return _ProTreeSelect.default;
+  }
+});
 Object.defineProperty(exports, "ProUpload", {
   enumerable: true,
   get: function get() {
@@ -246,6 +252,7 @@ var _Container = _interopRequireDefault(require("./combination/Container"));
 var _ProEnum = _interopRequireDefault(require("../../ProEnum"));
 var _ProSelect = _interopRequireDefault(require("../../ProSelect"));
 var _ProUpload = _interopRequireDefault(require("../../ProUpload"));
+var _ProTreeSelect = _interopRequireDefault(require("../../ProTreeSelect"));
 var _ProTreeModal = _interopRequireDefault(require("../../ProTreeModal"));
 var _ProTree = _interopRequireDefault(require("../../ProTree"));
 var _FormFooter = _interopRequireDefault(require("./FormFooter"));

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

@@ -32,7 +32,7 @@ var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className",
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
+  var _ref2, _ref3, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -51,8 +51,7 @@ var Render = function Render(props) {
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
     originalTip = props.originalTip,
-    confirm = props.confirm,
-    globalControl = props.globalControl;
+    confirm = props.confirm;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -168,12 +167,8 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = (0, _lodash.omit)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
-  /**
-   * globalControl 全局控制优先
-   * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
-   * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
-   */
-  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
+  // 优先级 formitem上【column.disabled】 > 组件上【fieldProps.disabled】 > 全局【formDisabled】
+  var lastDisabled = (_ref2 = (_ref3 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled;
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -201,8 +196,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = (0, _toConsumableArray2.default)(args);
-    var _ref6 = otherProps || {},
-      valueType = _ref6.valueType;
+    var _ref4 = otherProps || {},
+      valueType = _ref4.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -269,7 +264,7 @@ var Render = function Render(props) {
       }, 60);
     }
     // ProTreeSelect返回option
-    if (['ProTree'].includes(type)) {
+    if (['ProTreeSelect', '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]);
     }
@@ -279,7 +274,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _len2,
         args,
         _key2,
@@ -306,7 +301,7 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref7.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
@@ -383,7 +378,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';

package/lib/ProForm/components/render/RenderFields.d.ts

@@ -18,7 +18,6 @@ interface Props<T = any> {
     requiredOnView?: boolean;
     required?: boolean | (() => boolean);
     originalTip?: boolean;
-    globalControl?: boolean;
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;

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

@@ -33,8 +33,7 @@ var RenderFields = function RenderFields(props) {
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
     required = props.required,
-    originalTip = props.originalTip,
-    globalControl = props.globalControl;
+    originalTip = props.originalTip;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
     return Array.isArray(item.hiddenNames);
@@ -213,8 +212,7 @@ var RenderFields = function RenderFields(props) {
         originalValues: originalValues,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        originalTip: originalTip,
-        globalControl: globalControl
+        originalTip: originalTip
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

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

@@ -26,6 +26,7 @@ import { Props as ProRangeLimitProps } from '../combination/ProRangeLimit';
 import { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
 import { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
 import { ProEditTableProps } from '../../../ProEditTable/propsType';
+import { PropTreeSelectProps } from '../../../ProTreeSelect/propsType';
 import { ProTreeModalProps } from '../../../ProTreeModal/propsType';
 import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
@@ -149,6 +150,9 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProEditTable';
     fieldProps?: FieldProps<ProEditTableProps, Values, T>;
+} | {
+    type?: 'ProTreeSelect';
+    fieldProps?: FieldProps<PropTreeSelectProps, Values, T>;
 } | {
     type?: 'ProTreeModal';
     fieldProps?: FieldProps<ProTreeModalProps, Values, T>;
@@ -266,7 +270,6 @@ export interface RenderProps<Values = any> {
     originalValues?: Values;
     requiredOnView?: boolean;
     confirm?: ProFormColumnProps['confirm'];
-    globalControl?: boolean;
     [name: string]: any;
 }
 export {};

package/lib/ProForm/index.js

@@ -25,7 +25,7 @@ var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip", "formKey", "globalControl"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip", "formKey"];
 var ProForm = function ProForm(props, ref) {
   var _forms$formKey, _localStorage;
   var _props$mode = props.mode,
@@ -67,7 +67,6 @@ var ProForm = function ProForm(props, ref) {
     _props$originalTip = props.originalTip,
     originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
     formKey = props.formKey,
-    globalControl = props.globalControl,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
     state = _useProConfig.state,
@@ -255,8 +254,7 @@ var ProForm = function ProForm(props, ref) {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalTip: originalTip,
-        globalControl: globalControl
+        originalTip: originalTip
       }), children, footerRender()]
     }))
   }));
@@ -321,7 +319,7 @@ ProFormForward.ProNumberRange = _components.ProNumberRange;
 ProFormForward.ProModalSelect = _components.ProModalSelect;
 ProFormForward.ProTimeLimit = _components.ProTimeLimit;
 ProFormForward.ProUpload = _components.ProUpload;
-// ProFormForward.ProTreeSelect = ProTreeSelect;
+ProFormForward.ProTreeSelect = _components.ProTreeSelect;
 ProFormForward.ProTreeModal = _components.ProTreeModal;
 ProFormForward.ProTree = _components.ProTree;
 // 待废弃

package/lib/ProForm/propsType.d.ts

@@ -42,8 +42,6 @@ export interface ProFormOtherProps {
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
-    /** 全局控制优先 */
-    globalControl?: boolean;
     mode?: ModeEnum;
     formKey?: string;
     /** 是否查看 */

package/lib/ProIcon/index.js

@@ -80,10 +80,6 @@ var ProIcon = function ProIcon(props) {
     'pro-icon-btn': disabled
   });
   var _mode = mode || 'icon';
-  // 特殊情况，如果指定了type，并且没有接收到组件内的mode，那模式就是icon
-  if (type && !props.mode) {
-    _mode = 'icon';
-  }
   var isIconMode = _mode === 'icon';
   var isExtendButtonMode = !isIconMode || isIconMode && disabled;
   var mergedMapList = (0, _lodash.uniqBy)(mapList.concat(_config2.iconMap), 'text');

package/lib/ProTree/index.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _ProTree = _interopRequireDefault(require("./components/ProTree"));
-var _ProTreeSelect = _interopRequireDefault(require("./components/ProTreeSelect"));
+var _ProTreeSelect = _interopRequireDefault(require("../ProTreeSelect"));
 /* eslint-disable jsx-a11y/anchor-is-valid */
 /*
  *@Date: 2023-07-11 16:07:12

package/lib/{ProTree/components/ProTreeSelect → ProTreeSelect}/index.js

@@ -15,8 +15,8 @@ var _antd = require("antd");
 var _classnames3 = _interopRequireDefault(require("classnames"));
 var _react = require("react");
 var _lodash = require("lodash");
-var _ProConfigProvider = require("../../../ProConfigProvider");
-var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
+var _ProConfigProvider = require("../ProConfigProvider");
+var _Container = _interopRequireDefault(require("../ProForm/components/Container"));
 var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className"],
   _excluded2 = ["children"];
 var SHOW_PARENT = _antd.TreeSelect.SHOW_PARENT;

package/{es/ProTree/components → lib}/ProTreeSelect/propsType.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { TreeSelectProps } from 'antd';
 import { Service, Options, Result } from 'ahooks/lib/useRequest/src/types';
-import { ProFormOtherProps } from '../../../ProForm/propsType';
+import { ProFormOtherProps } from '../ProForm/propsType';
 export interface DataProps {
     label: string;
     value?: string;

package/lib/style/components.less

@@ -11,7 +11,7 @@
 // 表单
 @import '../ProForm/style/index';
 @import '../ProUpload/style/index';
-// @import '../ProTreeSelect/style/index';
+@import '../ProTreeSelect/style/index';
 @import '../ProTreeModal/style/index';
 @import '../ProTree/style/index';
 

package/package.json

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