@zat-design/sisyphus-react 3.13.18-beta.6 → 3.13.18-beta.8

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

@@ -1,9 +1,9 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
 import "antd/es/space/style";
@@ -785,16 +785,21 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }) : null,
       onFocus: handleSelectFocus,
       onSearch: handleSelectSearch,
+      tooltip: _tooltip,
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : _jsx(_Input, _objectSpread({
-      value: viewText,
-      onChange: handleChangeValue,
-      disabled: disabled,
-      autoComplete: "off",
-      allowClear: true
-    }, restProps)), isView || disabled ? null : _jsx(_Button, {
+    }, restProps)) : _jsx(_Tooltip, {
+      title: _tooltip ? viewText : null,
+      placement: "topLeft",
+      children: _jsx(_Input, _objectSpread({
+        value: viewText,
+        onChange: handleChangeValue,
+        disabled: disabled,
+        autoComplete: "off",
+        allowClear: true
+      }, restProps))
+    }), isView || disabled ? null : _jsx(_Button, {
       icon: _jsx(ReactSVG, {
         className: "viewSvg",
         src: viewSvg,
@@ -809,45 +814,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       children: customRender
     });
   }
-  useDeepCompareEffect(function () {
-    var dom = document.getElementById(uuid);
-    if (_tooltip && value && dom) {
-      dom.addEventListener('mouseover', function (e) {
-        var _e$target, _e$target$className, _e$target$className$i;
-        if (value && (e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : (_e$target$className = _e$target.className) === null || _e$target$className === void 0 ? void 0 : (_e$target$className$i = _e$target$className.includes) === null || _e$target$className$i === void 0 ? void 0 : _e$target$className$i.call(_e$target$className, 'select'))) {
-          setState({
-            open: true
-          });
-        }
-      });
-      dom.addEventListener('mouseout', function (e) {
-        var _e$target2, _e$target2$className, _e$target2$className$;
-        if (e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : (_e$target2$className = _e$target2.className) === null || _e$target2$className === void 0 ? void 0 : (_e$target2$className$ = _e$target2$className.includes) === null || _e$target2$className$ === void 0 ? void 0 : _e$target2$className$.call(_e$target2$className, 'select')) {
-          setState({
-            open: false
-          });
-        }
-      });
-      return function () {
-        dom.removeEventListener('mouseover', function (e) {
-          var _e$target3, _e$target3$className, _e$target3$className$;
-          if (value && (e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : (_e$target3$className = _e$target3.className) === null || _e$target3$className === void 0 ? void 0 : (_e$target3$className$ = _e$target3$className.includes) === null || _e$target3$className$ === void 0 ? void 0 : _e$target3$className$.call(_e$target3$className, 'select'))) {
-            setState({
-              open: true
-            });
-          }
-        });
-        dom.removeEventListener('mouseout', function (e) {
-          var _e$target4, _e$target4$className, _e$target4$className$;
-          if (e === null || e === void 0 ? void 0 : (_e$target4 = e.target) === null || _e$target4 === void 0 ? void 0 : (_e$target4$className = _e$target4.className) === null || _e$target4$className === void 0 ? void 0 : (_e$target4$className$ = _e$target4$className.includes) === null || _e$target4$className$ === void 0 ? void 0 : _e$target4$className$.call(_e$target4$className, 'select')) {
-            setState({
-              open: false
-            });
-          }
-        });
-      };
-    }
-  }, [value, _tooltip, document.getElementById(uuid)]);
   useDeepCompareEffect(function () {
     setState({
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
@@ -885,12 +851,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       className: _className,
       style: style,
       ref: fieldRef,
-      children: _tooltip && viewText ? _jsx(_Tooltip, {
-        placement: "topLeft",
-        open: open,
-        title: viewText,
-        children: initRender
-      }) : initRender
+      children: initRender
     }), _jsxs(ProDrawerForm, _objectSpread(_objectSpread({
       mode: "Modal",
       title: title,

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

@@ -94,7 +94,7 @@ interface ProModalPropsType {
     mode?: 'input' | 'select';
 }
 /** 模态框选择器属性类型（结合Select和Input属性） */
-export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
+export declare type ProModalSelectPropsType = Omit<SelectProps & InputProps, 'mode'> & ProModalPropsType;
 /** 配置选项类型 */
 export type ProModalSelectConfigType = ConfigOption;
 /** 模态框属性类型 */
@@ -102,5 +102,5 @@ export type ProModalType = Omit<ProModalPropsType, 'configOption'> & {
     configOption: ProModalSelectConfigType;
 };
 /** 模态框选择器类型（结合Select和Input属性） */
-export type ProModalSelectType = SelectProps & InputProps & ProModalType;
+export type ProModalSelectType = Omit<SelectProps & InputProps, 'mode'> & ProModalType;
 export {};

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

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/tooltip/style");
-var _tooltip2 = _interopRequireDefault(require("antd/es/tooltip"));
 require("antd/es/button/style");
 var _button = _interopRequireDefault(require("antd/es/button"));
 require("antd/es/input/style");
 var _input = _interopRequireDefault(require("antd/es/input"));
+require("antd/es/tooltip/style");
+var _tooltip2 = _interopRequireDefault(require("antd/es/tooltip"));
 require("antd/es/spin/style");
 var _spin = _interopRequireDefault(require("antd/es/spin"));
 require("antd/es/space/style");
@@ -793,16 +793,21 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }) : null,
       onFocus: handleSelectFocus,
       onSearch: handleSelectSearch,
+      tooltip: _tooltip,
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : (0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread5.default)({
-      value: viewText,
-      onChange: handleChangeValue,
-      disabled: disabled,
-      autoComplete: "off",
-      allowClear: true
-    }, restProps)), isView || disabled ? null : (0, _jsxRuntime.jsx)(_button.default, {
+    }, restProps)) : (0, _jsxRuntime.jsx)(_tooltip2.default, {
+      title: _tooltip ? viewText : null,
+      placement: "topLeft",
+      children: (0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread5.default)({
+        value: viewText,
+        onChange: handleChangeValue,
+        disabled: disabled,
+        autoComplete: "off",
+        allowClear: true
+      }, restProps))
+    }), isView || disabled ? null : (0, _jsxRuntime.jsx)(_button.default, {
       icon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
         className: "viewSvg",
         src: _view.default,
@@ -817,45 +822,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       children: customRender
     });
   }
-  (0, _ahooks.useDeepCompareEffect)(function () {
-    var dom = document.getElementById(uuid);
-    if (_tooltip && value && dom) {
-      dom.addEventListener('mouseover', function (e) {
-        var _e$target, _e$target$className, _e$target$className$i;
-        if (value && (e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : (_e$target$className = _e$target.className) === null || _e$target$className === void 0 ? void 0 : (_e$target$className$i = _e$target$className.includes) === null || _e$target$className$i === void 0 ? void 0 : _e$target$className$i.call(_e$target$className, 'select'))) {
-          setState({
-            open: true
-          });
-        }
-      });
-      dom.addEventListener('mouseout', function (e) {
-        var _e$target2, _e$target2$className, _e$target2$className$;
-        if (e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : (_e$target2$className = _e$target2.className) === null || _e$target2$className === void 0 ? void 0 : (_e$target2$className$ = _e$target2$className.includes) === null || _e$target2$className$ === void 0 ? void 0 : _e$target2$className$.call(_e$target2$className, 'select')) {
-          setState({
-            open: false
-          });
-        }
-      });
-      return function () {
-        dom.removeEventListener('mouseover', function (e) {
-          var _e$target3, _e$target3$className, _e$target3$className$;
-          if (value && (e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : (_e$target3$className = _e$target3.className) === null || _e$target3$className === void 0 ? void 0 : (_e$target3$className$ = _e$target3$className.includes) === null || _e$target3$className$ === void 0 ? void 0 : _e$target3$className$.call(_e$target3$className, 'select'))) {
-            setState({
-              open: true
-            });
-          }
-        });
-        dom.removeEventListener('mouseout', function (e) {
-          var _e$target4, _e$target4$className, _e$target4$className$;
-          if (e === null || e === void 0 ? void 0 : (_e$target4 = e.target) === null || _e$target4 === void 0 ? void 0 : (_e$target4$className = _e$target4.className) === null || _e$target4$className === void 0 ? void 0 : (_e$target4$className$ = _e$target4$className.includes) === null || _e$target4$className$ === void 0 ? void 0 : _e$target4$className$.call(_e$target4$className, 'select')) {
-            setState({
-              open: false
-            });
-          }
-        });
-      };
-    }
-  }, [value, _tooltip, document.getElementById(uuid)]);
   (0, _ahooks.useDeepCompareEffect)(function () {
     setState({
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
@@ -893,12 +859,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       className: _className,
       style: style,
       ref: fieldRef,
-      children: _tooltip && viewText ? (0, _jsxRuntime.jsx)(_tooltip2.default, {
-        placement: "topLeft",
-        open: open,
-        title: viewText,
-        children: initRender
-      }) : initRender
+      children: initRender
     }), (0, _jsxRuntime.jsxs)(_index.ProDrawerForm, (0, _objectSpread5.default)((0, _objectSpread5.default)({
       mode: "Modal",
       title: title,

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

@@ -94,7 +94,7 @@ interface ProModalPropsType {
     mode?: 'input' | 'select';
 }
 /** 模态框选择器属性类型（结合Select和Input属性） */
-export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
+export declare type ProModalSelectPropsType = Omit<SelectProps & InputProps, 'mode'> & ProModalPropsType;
 /** 配置选项类型 */
 export type ProModalSelectConfigType = ConfigOption;
 /** 模态框属性类型 */
@@ -102,5 +102,5 @@ export type ProModalType = Omit<ProModalPropsType, 'configOption'> & {
     configOption: ProModalSelectConfigType;
 };
 /** 模态框选择器类型（结合Select和Input属性） */
-export type ProModalSelectType = SelectProps & InputProps & ProModalType;
+export type ProModalSelectType = Omit<SelectProps & InputProps, 'mode'> & ProModalType;
 export {};

package/package.json

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