@zat-design/sisyphus-react 3.14.0-beta.2 → 4.0.0-beta.10

package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -6,14 +6,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _lodash = require("lodash");
 var _react = _interopRequireWildcard(require("react"));
@@ -139,7 +136,7 @@ var ToolbarButton = props => {
       index: 0
     });
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
     align: "start",
     className: "pro-form-list-toolbar",
     children: toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.map((item, index) => {
@@ -166,13 +163,13 @@ var ToolbarButton = props => {
         if (max && max <= fields.length && type === 'add') {
           return false;
         }
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[type]), (0, _lodash.omit)(rest, filterKeys)), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[type]), (0, _lodash.omit)(rest, filterKeys)), {}, {
           type: "link",
           onClick: () => handleClick(internalOnClick, _onClick, item),
           children: label || defaultLabel
         }), `${type}${index}`);
       }
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
         type: "link",
         onClick: () => customClick(_onClick2, item),
         children: label

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

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _core = require("@dnd-kit/core");
 var _lodash = require("lodash");
 var _sortable = require("@dnd-kit/sortable");
@@ -142,7 +141,7 @@ var FormList = (props, ref) => {
           form: form,
           namePath: _namePath,
           emptyBtnText: emptyBtnText
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.ErrorList, {
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.ErrorList, {
           errors: errors
         }), toolbarProps !== false && _fields.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ToolbarButton.default, {
           disabled: disabled,

package/lib/ProForm/components/combination/FormList/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-form-list-block-title {
   height: 14px;
@@ -69,6 +67,42 @@
   .@{ant-prefix}-btn-text:hover {
     background: transparent;
   }
+  .pro-form-list-tool-btn {
+    .@{ant-prefix}-btn-icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+
+  .pro-form-list-tool-btn-less{
+    &:hover{
+      background: transparent !important;
+    }
+  }
+}
+
+.pro-form-list-empty {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+
+  .pro-form-list-empty-img {
+    width: 80px;
+    height: 80px;
+  }
+
+  .pro-form-list-empty-content {
+    display: flex;
+    justify-content: center;
+    margin-top: var(--zaui-space-size-md, 16px);
+    color: @zaui-aide-text;
+
+    .@{ant-prefix}-btn-link {
+      padding: 0;
+    }
+  }
 }
 
 .pro-form-list-empty {

package/lib/ProForm/components/combination/Group/component/AddonWrapper/index.d.ts

@@ -3,6 +3,7 @@ import './index.less';
 interface Props {
     before?: React.ReactNode;
     after?: React.ReactNode;
+    children?: React.ReactNode;
 }
 declare const AddonWrapper: React.FC<Props>;
 export default AddonWrapper;

package/lib/ProForm/components/combination/Group/component/ComRender.js

@@ -30,7 +30,6 @@ var getComRender = (component, props, componentProps) => {
   wrappers.forEach(item => {
     if (item in props) {
       var Wrapper = wrapperMap[item];
-      // console.log(props[item]);
       renderComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(Wrapper, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
         [item]: props[item],
         children: renderComponent

package/lib/ProForm/components/combination/Group/index.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -84,7 +83,7 @@ var _jsxRuntime = require("react/jsx-runtime");
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: nextClassName,
     id: id,
-    children: (space.compact || space !== null && space !== void 0 && space.separator) && !nextIsView ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default.Compact, {
+    children: (space.compact || space !== null && space !== void 0 && space.separator) && !nextIsView ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space.Compact, {
       children: columns.map((column, index) => {
         column.otherProps = otherProps;
         // 自定义间隔移除对应参数
@@ -97,7 +96,7 @@ var _jsxRuntime = require("react/jsx-runtime");
           isView: nextIsView
         }, column), column.name || index);
       })
-    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       align: "start"
     }, (0, _lodash.omit)(space, ['separator', 'compact'])), {}, {
       split: nextIsView ? split : null,

package/lib/ProForm/components/combination/Group/style/index.less

@@ -1,26 +1,6 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
-
-.border-radius(@start-end: 0, @end-end: 0, @start-start: 0, @end-start: 0) {
-  border-start-end-radius: @start-end;
-  border-end-end-radius: @end-end;
-  border-start-start-radius: @start-start;
-  border-end-start-radius: @end-start;
-}
-
-.start-radius() {
-  border-start-start-radius: 4px;
-  border-end-start-radius: 4px;
-}
-
-.end-radius() {
-  border-start-end-radius: 4px;
-  border-end-end-radius: 4px;
-}
-
 .pro-group {
-  width: unset !important;
   display: flex;
+  width: unset !important;
   &.pro-group-view {
     .@{ant-prefix}-space {
       .@{ant-prefix}-space-item {
@@ -29,7 +9,8 @@
     }
   }
 
-  &.pro-group-diy-width, &.pro-group-width-auto {
+  &.pro-group-diy-width,
+  &.pro-group-width-auto {
     .@{ant-prefix}-space .@{ant-prefix}-space-item {
       width: auto;
 
@@ -60,94 +41,33 @@
     align-items: center;
     width: 100%;
 
-    &>.@{ant-prefix}-input-number{
-      &:first-child{
-        border-end-end-radius: 0;
-        border-start-end-radius: 0;
-      }
-      &:last-child{
-        border-start-start-radius: 0;
-        border-end-start-radius: 0;
-        margin-left: -1px;
-      }
-    }
-
     .@{ant-prefix}-form-item {
       margin-bottom: 0 !important;
     }
 
     .group-separator {
-      margin-inline-end: -2px;
-      margin-inline-start: -1px;
-      border-start-start-radius: 0;
-      border-end-start-radius: 0;
       padding: 0 12px;
       background-color: #fff;
       cursor: default;
+      margin-inline-end: -2px;
+      margin-inline-start: -1px;
     }
     .pro-modal-select {
       margin-left: -1px;
-      .@{ant-prefix}-input{
-        border-start-start-radius: 0;
-        border-end-start-radius: 0;
-      }
     }
 
     // 定制内敛合并样式
     .@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select {
-      .border-radius(0, 0, 0, 0);
-
       &:nth-child(n + 2) {
         margin-inline-start: -1px;
       }
-
-      &:first-child {
-        .start-radius();
-      }
-
-      &:last-child {
-        .end-radius();
-      }
-    }
-
-    .pro-select {
-      .@{ant-prefix}-select .@{ant-prefix}-select-selector{
-        border-radius: 0 !important;
-      }
-      &:first-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
-        border-start-start-radius: 4px !important;
-        border-end-start-radius: 4px !important;
-      }
-
-      &:last-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
-        border-start-end-radius: 4px  !important;
-        border-end-end-radius: 4px!important;
-      }
-    }
-
-    .@{ant-prefix}-select {
-      .@{ant-prefix}-select-selector {
-        .border-radius(0, 0, 0, 0);
-      }
-
-      &:first-child {
-        .@{ant-prefix}-select-selector {
-          .start-radius();
-        }
-      }
-
-      &:last-child {
-        .@{ant-prefix}-select-selector {
-          .end-radius();
-        }
-      }
     }
 
     // 报错样式定制
     .@{ant-prefix}-input-affix-wrapper-status-error ~ .group-separator {
-      color: var(--ant-error-color);
-      border-color: var(--ant-error-color);
+      color: #ff4d4f;
+      border-color: #ff4d4f;
     }
   }
 }

package/lib/ProForm/components/combination/Group/utils.d.ts

@@ -37,7 +37,7 @@ interface Params {
 export declare const getReactiveProps: (params: Params) => {
     disabled: boolean;
     show: boolean;
-    component: any;
+    component: import("react").ReactNode;
     fieldProps: boolean;
     desensitization: [number, number];
 };

package/lib/ProForm/components/combination/Group/utils.js

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.defaultGetValueFromEvent = defaultGetValueFromEvent;
 exports.valueFromEventWrapper = exports.transformNamesString = exports.isUpperCase = exports.insertSeparator = exports.getValueTypeTrans = exports.getValueMiddleware = exports.getReactiveProps = void 0;
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
+var _antd = require("antd");
 var _valueType = _interopRequireDefault(require("../../../utils/valueType"));
 var _jsxRuntime = require("react/jsx-runtime");
 /* eslint-disable no-lonely-if */
@@ -46,7 +45,7 @@ var insertSeparator = (columns, space) => {
         if (index === separatorIndex) {
           result.push({
             separator: true,
-            component: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+            component: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
               className: "group-separator",
               children: space.separator
             }),
@@ -61,7 +60,7 @@ var insertSeparator = (columns, space) => {
       if (index < array.length - 1) {
         result.push({
           separator: true,
-          component: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+          component: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
             className: "group-separator",
             children: space.separator
           }),
@@ -105,7 +104,7 @@ var transformNamesString = arr => {
 exports.transformNamesString = transformNamesString;
 var isUpperCase = (type, upperCase) => {
   var result = {};
-  if (['Input', 'TextArea', 'ProCombination'].includes(type) && upperCase) {
+  if (['Input', 'TextArea'].includes(type) && upperCase) {
     result.getValueFromEvent = event => {
       var _event$target;
       if (Array.isArray(event)) {

package/lib/ProForm/components/combination/ProCascader/index.js

@@ -5,18 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
-require("antd/es/cascader/style");
-var _cascader = _interopRequireDefault(require("antd/es/cascader"));
-require("antd/es/message/style");
-var _message2 = _interopRequireDefault(require("antd/es/message"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/typography/style");
-var _typography = _interopRequireDefault(require("antd/es/typography"));
 var _react = require("react");
+var _antd = require("antd");
 var _lodash = require("lodash");
 var _ahooks = require("ahooks");
 var _index = require("./utils/index");
@@ -28,7 +21,6 @@ var _ = _interopRequireDefault(require("../../.."));
 var _Container = _interopRequireDefault(require("../../Container"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent", "desensitization", "otherProps"];
-var Text = _typography.default.Text;
 var defaultFieldNames = {
   label: 'name',
   value: 'code',
@@ -139,7 +131,7 @@ var ProCascader = props => {
       msg = _ref4.message,
       data = _ref4.data;
     if (status !== 200) {
-      _message2.default.error(msg);
+      _antd.message.error(msg);
       return;
     }
     var newData = data;
@@ -166,7 +158,7 @@ var ProCascader = props => {
       msg = _ref5.message,
       data = _ref5.data;
     if (status !== 200) {
-      _message2.default.error(msg);
+      _antd.message.error(msg);
       return;
     }
     return data;
@@ -322,7 +314,7 @@ var ProCascader = props => {
     children: viewValue
   }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: `pro-address ${className}`,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_cascader.default, (0, _objectSpread2.default)({
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Cascader, (0, _objectSpread2.default)({
       className: hasDetail ? '' : 'no-detail',
       placeholder: _locale.default === null || _locale.default === void 0 || (_locale$ProAddressBar = _locale.default.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
       value: addressValue,
@@ -338,7 +330,7 @@ var ProCascader = props => {
       getPopupContainer: trigger => {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, (0, _lodash.omit)(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
+    }, (0, _lodash.omit)(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: detail,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
         className: "pro-address-detail",
@@ -362,4 +354,10 @@ var ProCascader = props => {
     }))]
   });
 };
-var _default = exports.default = /*#__PURE__*/(0, _react.memo)(ProCascader);
+var _default = exports.default = /*#__PURE__*/(0, _react.memo)(ProCascader, (prevProps, nextProps) => {
+  // 基本props比较, 只比较关键的
+  if (!(0, _lodash.isEqual)(prevProps === null || prevProps === void 0 ? void 0 : prevProps.value, nextProps === null || nextProps === void 0 ? void 0 : nextProps.value) || (prevProps === null || prevProps === void 0 ? void 0 : prevProps.disabled) !== (nextProps === null || nextProps === void 0 ? void 0 : nextProps.disabled) || !(0, _lodash.isEqual)(prevProps === null || prevProps === void 0 ? void 0 : prevProps.dataSource, nextProps === null || nextProps === void 0 ? void 0 : nextProps.dataSource)) {
+    return false;
+  }
+  return true;
+});

package/lib/ProForm/components/combination/ProCascader/propsType.d.ts

@@ -36,7 +36,7 @@ export interface ProCascaderType {
     transformResponse?: (data: any[]) => any[];
     level?: number;
     enumCode?: string;
-    code?: string;
+    code?: string | string[];
     otherProps?: any;
     /** 查看分隔符 */
     separator?: string;

package/lib/ProForm/components/combination/ProCascader/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-address {
   display: flex;

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

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { ProModalSelectType } from './propsType';
-declare const _default: React.ForwardRefExoticComponent<Omit<ProModalSelectType, "ref"> & React.RefAttributes<unknown>>;
+declare const _default: React.ForwardRefExoticComponent<Omit<React.PropsWithChildren<ProModalSelectType>, "ref"> & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -6,27 +6,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
-require("antd/es/tooltip/style");
-var _tooltip2 = _interopRequireDefault(require("antd/es/tooltip"));
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
-require("antd/es/spin/style");
-var _spin = _interopRequireDefault(require("antd/es/spin"));
-require("antd/es/message/style");
-var _message2 = _interopRequireDefault(require("antd/es/message"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _icons = require("@ant-design/icons");
 var _ahooks = require("ahooks");
+var _antd = require("antd");
 var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactSvg = require("react-svg");
@@ -78,7 +65,7 @@ var ProModalSelect = (props, ref) => {
     }
     return mode;
   }, [mode, readOnly]);
-  var contentForm = _form.default.useFormInstance();
+  var contentForm = _antd.Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
     throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
   }
@@ -138,7 +125,6 @@ var ProModalSelect = (props, ref) => {
       _value: value,
       isInit: true,
       onOff: false,
-      visible: false,
       open: false,
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || [],
       selectedRows: [],
@@ -149,13 +135,12 @@ var ProModalSelect = (props, ref) => {
     _value = _useSetState2$._value,
     isInit = _useSetState2$.isInit,
     onOff = _useSetState2$.onOff,
-    visible = _useSetState2$.visible,
     open = _useSetState2$.open,
     options = _useSetState2$.options,
     _selectedRows = _useSetState2$.selectedRows,
     _selectedRowKeys = _useSetState2$.selectedRowKeys,
     setState = _useSetState2[1];
-  var _Form$useForm = _form.default.useForm(searchForm),
+  var _Form$useForm = _antd.Form.useForm(searchForm),
     _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var selectedRows = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || _selectedRows;
@@ -189,7 +174,7 @@ var ProModalSelect = (props, ref) => {
       transformParams,
       transformResponse
     }, (0, _objectSpread2.default)({
-      ready: (initParams || defaultOne) && nextMode === 'input' || visible
+      ready: (initParams || defaultOne) && nextMode === 'input' || open
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList2.data,
     loading = _useRequestList2.loading,
@@ -343,7 +328,7 @@ var ProModalSelect = (props, ref) => {
     form.resetFields();
     setState({
       onOff: false,
-      visible: false,
+      open: false,
       isInit: false
     });
 
@@ -363,7 +348,7 @@ var ProModalSelect = (props, ref) => {
               _context2.next = 4;
               break;
             }
-            _message2.default.error(_locale.default.ProModalSelect.checkMsg);
+            _antd.message.error(_locale.default.ProModalSelect.checkMsg);
             return _context2.abrupt("return", false);
           case 4:
             nextSelectedRows = selectedRows;
@@ -629,13 +614,13 @@ var ProModalSelect = (props, ref) => {
     }
   });
   (0, _react.useEffect)(() => {
-    if (onOff && !visible) {
+    if (onOff && !open) {
       var _useRequest$options7;
       if ((useRequest === null || useRequest === void 0 || (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.manual) !== true) {
         onReset();
       }
       var nextState = {
-        visible: true
+        open: true
       };
       if (labelInValue) {
         if (!value) {
@@ -661,17 +646,17 @@ var ProModalSelect = (props, ref) => {
       }
       setState(nextState);
     }
-  }, [onOff, visible, JSON.stringify(value)]);
+  }, [onOff, open, JSON.stringify(value)]);
   (0, _react.useEffect)(() => {
-    (0, _utils.hideTooltipIfOpen)(fieldRef.current, visible);
-  }, [visible]);
+    (0, _utils.hideTooltipIfOpen)(fieldRef.current, open);
+  }, [open]);
   (0, _react.useEffect)(() => {
-    if (value && !visible && isInit && nextMode === 'input') {
+    if (value && !open && isInit && nextMode === 'input') {
       getInitValues();
     }
-  }, [JSON.stringify(value), visible, isInit]);
+  }, [JSON.stringify(value), open, isInit]);
   (0, _ahooks.useDebounceEffect)(() => {
-    if (value && !visible && nextMode === 'select' && (!(0, _lodash.isEqual)(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
+    if (value && !open && nextMode === 'select' && (!(0, _lodash.isEqual)(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
       var _options$some;
       preValue.current = value;
       var _data3 = labelInValue ? value[valueKey] : value;
@@ -696,7 +681,7 @@ var ProModalSelect = (props, ref) => {
         }, 300);
       }
     }
-  }, [JSON.stringify(value), visible, JSON.stringify(defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
+  }, [JSON.stringify(value), open, JSON.stringify(defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
   var handleSelectFocus = () => {
     if (useRequest) {
       var queryBean = defaultParams || {};
@@ -761,7 +746,7 @@ var ProModalSelect = (props, ref) => {
   }, [value, _value]);
 
   // 加个中间状态Input
-  var initRender = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default.Compact, {
+  var initRender = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
     style: {
       width: '100%'
     },
@@ -777,7 +762,7 @@ var ProModalSelect = (props, ref) => {
       optionRender: optionRender,
       scrollFollowParent: false,
       mode: isMultiple ? 'multiple' : undefined,
-      notFoundContent: selectLoading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_spin.default, {
+      notFoundContent: selectLoading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Spin, {
         size: "small"
       }) : null,
       onFocus: handleSelectFocus,
@@ -786,21 +771,21 @@ var ProModalSelect = (props, ref) => {
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip2.default, {
+    }, restProps)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: _tooltip ? viewText : null,
       placement: "topLeft",
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread2.default)({
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread2.default)({
         value: viewText,
         onChange: handleChangeValue,
         disabled: disabled,
         autoComplete: "off",
         allowClear: true
       }, restProps))
-    }), isView || disabled ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, {
+    }), isView || disabled ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
+      onClick: handleClick,
       icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
         className: "viewSvg",
-        src: _view.default,
-        onClick: handleClick
+        src: _view.default
       })
     })]
   });
@@ -843,7 +828,7 @@ var ProModalSelect = (props, ref) => {
   var _className = (0, _classnames.default)({
     'pro-modal-select': true,
     [props.className]: props.className,
-    'pro-modal-select-open': visible
+    'pro-modal-select-open': open
   });
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -859,7 +844,7 @@ var ProModalSelect = (props, ref) => {
       // @ts-ignore
       ,
       onCancel: handleClose,
-      open: visible
+      open: open
     }, restModalProps), {}, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.ProForm, {
         submitOnEnter: true,