@zat-design/sisyphus-react 3.13.4-beta.2 → 3.13.4-beta.3

package/dist/index.esm.css

@@ -2943,6 +2943,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
       -ms-flex-align: normal;
           align-items: normal;
 }
+.pro-form .pro-modal-select-parent-open .ant-tooltip {
+  display: none !important;
+}
 .pro-form .ant-form-item-control-input {
   -webkit-box-flex: 1;
   -webkit-flex-grow: 1;

package/dist/less.esm.css

@@ -2943,6 +2943,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
       -ms-flex-align: normal;
           align-items: normal;
 }
+.pro-form .pro-modal-select-parent-open .ant-tooltip {
+  display: none !important;
+}
 .pro-form .ant-form-item-control-input {
   -webkit-box-flex: 1;
   -webkit-flex-grow: 1;

package/es/ProEditTable/utils/useEditTableError.js

@@ -27,7 +27,6 @@ var useEditTableError = function useEditTableError(_ref) {
           if (target.classList.contains(className)) {
             // 查找所有包含 className 的节点
             var errorNodes = containerNode.querySelectorAll(".".concat(className));
-            // debugger;
             // 过滤这些节点，只保留那些类名完全为 `ant-form-item-explain-error` 的节点
             var validErrorNodes = Array.from(errorNodes).filter(function (node) {
               return node.classList.length === 1 && node.classList.contains('ant-form-item-explain-error');

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

@@ -49,7 +49,7 @@ var Input = function Input(props) {
     allowClear: true,
     autoComplete: "off",
     placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder)
-  }, omit(initialConfig, ['trim'])), rest));
+  }, omit(initialConfig, ['trim', 'upperCase'])), rest));
   // 仅查看模式下进行数据脱敏
   if ((desensitization === null || desensitization === void 0 ? void 0 : desensitization.length) && (props === null || props === void 0 ? void 0 : props.disabled)) {
     var _isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
@@ -62,7 +62,7 @@ var Input = function Input(props) {
         allowClear: true,
         autoComplete: 'off',
         placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder)
-      }, omit(initialConfig, ['trim'])), rest), {}, {
+      }, omit(initialConfig, ['trim', 'upperCase'])), rest), {}, {
         value: maskStringRangeWithRegex(rest.value, desensitization)
       }));
     }

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

@@ -44,7 +44,7 @@ var TextAreaDef = function TextAreaDef(props) {
     autoComplete: "off",
     placeholder: placeholder || "".concat(locale.ProForm.inputPlaceholder).concat(label || ''),
     autoSize: !(props === null || props === void 0 ? void 0 : (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.height)
-  }, omit(initialConfig, ['trim'])), rest), {}, {
+  }, omit(initialConfig, ['trim', 'upperCase'])), rest), {}, {
     className: _className
   }));
 };

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

@@ -26,6 +26,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { SearchOutlined } from '@ant-design/icons';
 import { useDebounceEffect, useDeepCompareEffect, useMount, useSetState } from 'ahooks';
 import { debounce, isArray, isEqual, isFunction } from 'lodash';
+import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { ProForm, ProDrawerForm, ProTable, useProConfig, ProSelect } from '../../../../index';
@@ -33,6 +34,7 @@ import Container from '../../Container';
 import viewSvg from '../../../../assets/view.svg';
 import useRequestList from './hooks/useRequestList';
 import locale from '../../../../locale';
+import { hideTooltipIfOpen } from './utils';
 var ProModalSelect = function ProModalSelect(props, ref) {
   var _useRequest$options, _useRequest$options2, _useRequest$options2$, _useRequest$options3, _formColumns$;
   var value = props.value,
@@ -107,6 +109,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     rowSelection = _ref4.rowSelection,
     restTableProps = _objectWithoutProperties(_ref4, _excluded3);
   var preValue = useRef(value);
+  // 表单项的ref
+  var fieldRef = useRef(null);
   var defaultParams = Array.isArray(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams) ? useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : (_useRequest$options2$ = _useRequest$options2.defaultParams) === null || _useRequest$options2$ === void 0 ? void 0 : _useRequest$options2$[0] : (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams) || {};
   var defaultParamsRef = useRef(defaultParams); // 缓存 defaultParams 的引用
   var _useSetState = useSetState({
@@ -652,6 +656,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       setState(nextState);
     }
   }, [onOff, visible, JSON.stringify(value)]);
+  useEffect(function () {
+    hideTooltipIfOpen(fieldRef.current, visible);
+  }, [visible]);
   useEffect(function () {
     if (value && !visible && isInit && !readOnly) {
       getInitValues();
@@ -851,11 +858,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       children: "".concat(viewText)
     });
   }
+  var _className = classNames(_defineProperty(_defineProperty({
+    'pro-modal-select': true
+  }, props.className, props.className), 'pro-modal-select-open', visible));
   return _jsxs(_Fragment, {
     children: [_jsx("div", {
       id: uuid,
-      className: "pro-modal-select ".concat(className !== null && className !== void 0 ? className : ''),
+      className: _className,
       style: style,
+      ref: fieldRef,
       children: isTooltip && viewText ? _jsx(_Tooltip, {
         placement: "topLeft",
         open: open,
@@ -868,7 +879,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onOk: handleFinish,
       // @ts-ignore
       onCancel: handleClose,
-      visible: visible
+      open: visible
     }, restModalProps), {}, {
       children: [_jsx(ProForm, {
         submitOnEnter: true,

package/es/ProForm/components/combination/ProModalSelect/utils/index.d.ts

@@ -0,0 +1 @@
+export declare const hideTooltipIfOpen: (dom: HTMLElement, open: boolean) => void;

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

@@ -0,0 +1,21 @@
+/* eslint-disable no-restricted-syntax */
+export var hideTooltipIfOpen = function hideTooltipIfOpen(dom, open) {
+  if (!open && document.querySelector('.pro-modal-select-parent-open') && dom) {
+    var _parent = dom.closest('.pro-form-item-changed');
+    var _grandParent = _parent.parentElement;
+    _parent.className = 'pro-form-item-changed';
+    _grandParent === null || _grandParent === void 0 ? void 0 : _grandParent.classList.remove('pro-modal-select-parent-open');
+    var tooltip = _grandParent.querySelector('.ant-tooltip');
+    if (tooltip) {
+      tooltip.classList.add('ant-tooltip-hidden');
+    }
+  }
+  if (!dom) return;
+  var modal = dom.className.includes('pro-modal-select-open');
+  if (!modal) return;
+  var parent = dom.closest('.pro-form-item-changed');
+  var grandParent = parent.parentElement;
+  if (open) {
+    grandParent.classList.add('pro-modal-select-parent-open');
+  }
+};

package/es/ProForm/style/index.less

@@ -31,6 +31,12 @@
     }
   }
 
+  .pro-modal-select-parent-open  .@{ant-prefix}-tooltip {
+    display: none !important;
+  }
+
+
+
   .@{ant-prefix}-form-item-control-input {
     flex-grow: 1;
     max-width: 100%;

package/es/ProForm/utils/index.js

@@ -57,7 +57,7 @@ export var isTrim = function isTrim(type, trim, configData) {
     _ref$state = _ref.state,
     state = _ref$state === void 0 ? {} : _ref$state;
   var _trim = trim || (state === null || state === void 0 ? void 0 : (_state$type = state[type]) === null || _state$type === void 0 ? void 0 : _state$type.trim);
-  if (['Input', 'TextArea', 'ProCombination'].includes(type) && _trim) {
+  if (['Input', 'ProCombination'].includes(type) && _trim) {
     result.getValueFromEvent = function (event) {
       var _event$target$value;
       if (Array.isArray(event)) {
@@ -78,7 +78,7 @@ export var isTrim = function isTrim(type, trim, configData) {
  */
 export var isUpperCase = function isUpperCase(type, upperCase) {
   var result = {};
-  if (['Input', 'TextArea', 'ProCombination'].includes(type) && upperCase) {
+  if (['Input', 'ProCombination'].includes(type) && upperCase) {
     result.getValueFromEvent = function (event) {
       var _event$target, _event$target$value2;
       if (Array.isArray(event)) {

package/es/ProTable/components/FormatColumn/index.js

@@ -125,7 +125,7 @@ export var formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       var _isAddCell = isAddCell;
       otherProps.isChanged = isChanged;
-      if (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource) {
+      if (Array.isArray(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
         // 存在比对
         if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
           var _originalObj$record$r;

package/lib/ProEditTable/utils/useEditTableError.js

@@ -34,7 +34,6 @@ var useEditTableError = function useEditTableError(_ref) {
           if (target.classList.contains(className)) {
             // 查找所有包含 className 的节点
             var errorNodes = containerNode.querySelectorAll(".".concat(className));
-            // debugger;
             // 过滤这些节点，只保留那些类名完全为 `ant-form-item-explain-error` 的节点
             var validErrorNodes = Array.from(errorNodes).filter(function (node) {
               return node.classList.length === 1 && node.classList.contains('ant-form-item-explain-error');

package/lib/ProForm/components/base/Input/index.js

@@ -55,7 +55,7 @@ var Input = function Input(props) {
     allowClear: true,
     autoComplete: "off",
     placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder)
-  }, (0, _lodash.omit)(initialConfig, ['trim'])), rest));
+  }, (0, _lodash.omit)(initialConfig, ['trim', 'upperCase'])), rest));
   // 仅查看模式下进行数据脱敏
   if ((desensitization === null || desensitization === void 0 ? void 0 : desensitization.length) && (props === null || props === void 0 ? void 0 : props.disabled)) {
     var _isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
@@ -68,7 +68,7 @@ var Input = function Input(props) {
         allowClear: true,
         autoComplete: 'off',
         placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder)
-      }, (0, _lodash.omit)(initialConfig, ['trim'])), rest), {}, {
+      }, (0, _lodash.omit)(initialConfig, ['trim', 'upperCase'])), rest), {}, {
         value: (0, _valueType.maskStringRangeWithRegex)(rest.value, desensitization)
       }));
     }

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

@@ -50,7 +50,7 @@ var TextAreaDef = function TextAreaDef(props) {
     autoComplete: "off",
     placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder).concat(label || ''),
     autoSize: !(props === null || props === void 0 ? void 0 : (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.height)
-  }, (0, _lodash.omit)(initialConfig, ['trim'])), rest), {}, {
+  }, (0, _lodash.omit)(initialConfig, ['trim', 'upperCase'])), rest), {}, {
     className: _className
   }));
 };

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

@@ -18,6 +18,7 @@ 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");
 var _react = _interopRequireWildcard(require("react"));
 var _index = require("../../../../index");
@@ -25,6 +26,7 @@ var _Container = _interopRequireDefault(require("../../Container"));
 var _view = _interopRequireDefault(require("../../../../assets/view.svg"));
 var _useRequestList3 = _interopRequireDefault(require("./hooks/useRequestList"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _utils = require("./utils");
 var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
@@ -102,6 +104,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     rowSelection = _ref4.rowSelection,
     restTableProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded3);
   var preValue = (0, _react.useRef)(value);
+  // 表单项的ref
+  var fieldRef = (0, _react.useRef)(null);
   var defaultParams = Array.isArray(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams) ? useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : (_useRequest$options2$ = _useRequest$options2.defaultParams) === null || _useRequest$options2$ === void 0 ? void 0 : _useRequest$options2$[0] : (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams) || {};
   var defaultParamsRef = (0, _react.useRef)(defaultParams); // 缓存 defaultParams 的引用
   var _useSetState = (0, _ahooks.useSetState)({
@@ -647,6 +651,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       setState(nextState);
     }
   }, [onOff, visible, JSON.stringify(value)]);
+  (0, _react.useEffect)(function () {
+    (0, _utils.hideTooltipIfOpen)(fieldRef.current, visible);
+  }, [visible]);
   (0, _react.useEffect)(function () {
     if (value && !visible && isInit && !readOnly) {
       getInitValues();
@@ -846,11 +853,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       children: "".concat(viewText)
     });
   }
+  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
+    'pro-modal-select': true
+  }, props.className, props.className), 'pro-modal-select-open', visible));
   return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [(0, _jsxRuntime.jsx)("div", {
       id: uuid,
-      className: "pro-modal-select ".concat(className !== null && className !== void 0 ? className : ''),
+      className: _className,
       style: style,
+      ref: fieldRef,
       children: isTooltip && viewText ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
         placement: "topLeft",
         open: open,
@@ -863,7 +874,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onOk: handleFinish,
       // @ts-ignore
       onCancel: handleClose,
-      visible: visible
+      open: visible
     }, restModalProps), {}, {
       children: [(0, _jsxRuntime.jsx)(_index.ProForm, {
         submitOnEnter: true,

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

@@ -0,0 +1 @@
+export declare const hideTooltipIfOpen: (dom: HTMLElement, open: boolean) => void;

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

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hideTooltipIfOpen = void 0;
+/* eslint-disable no-restricted-syntax */
+var hideTooltipIfOpen = exports.hideTooltipIfOpen = function hideTooltipIfOpen(dom, open) {
+  if (!open && document.querySelector('.pro-modal-select-parent-open') && dom) {
+    var _parent = dom.closest('.pro-form-item-changed');
+    var _grandParent = _parent.parentElement;
+    _parent.className = 'pro-form-item-changed';
+    _grandParent === null || _grandParent === void 0 ? void 0 : _grandParent.classList.remove('pro-modal-select-parent-open');
+    var tooltip = _grandParent.querySelector('.ant-tooltip');
+    if (tooltip) {
+      tooltip.classList.add('ant-tooltip-hidden');
+    }
+  }
+  if (!dom) return;
+  var modal = dom.className.includes('pro-modal-select-open');
+  if (!modal) return;
+  var parent = dom.closest('.pro-form-item-changed');
+  var grandParent = parent.parentElement;
+  if (open) {
+    grandParent.classList.add('pro-modal-select-parent-open');
+  }
+};

package/lib/ProForm/style/index.less

@@ -31,6 +31,12 @@
     }
   }
 
+  .pro-modal-select-parent-open  .@{ant-prefix}-tooltip {
+    display: none !important;
+  }
+
+
+
   .@{ant-prefix}-form-item-control-input {
     flex-grow: 1;
     max-width: 100%;

package/lib/ProForm/utils/index.js

@@ -73,7 +73,7 @@ var isTrim = exports.isTrim = function isTrim(type, trim, configData) {
     _ref$state = _ref.state,
     state = _ref$state === void 0 ? {} : _ref$state;
   var _trim = trim || (state === null || state === void 0 ? void 0 : (_state$type = state[type]) === null || _state$type === void 0 ? void 0 : _state$type.trim);
-  if (['Input', 'TextArea', 'ProCombination'].includes(type) && _trim) {
+  if (['Input', 'ProCombination'].includes(type) && _trim) {
     result.getValueFromEvent = function (event) {
       var _event$target$value;
       if (Array.isArray(event)) {
@@ -94,7 +94,7 @@ var isTrim = exports.isTrim = function isTrim(type, trim, configData) {
  */
 var isUpperCase = exports.isUpperCase = function isUpperCase(type, upperCase) {
   var result = {};
-  if (['Input', 'TextArea', 'ProCombination'].includes(type) && upperCase) {
+  if (['Input', 'ProCombination'].includes(type) && upperCase) {
     result.getValueFromEvent = function (event) {
       var _event$target, _event$target$value2;
       if (Array.isArray(event)) {

package/lib/ProTable/components/FormatColumn/index.js

@@ -131,7 +131,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var isInNewRowFlag = isInNewRow(record);
       var _isAddCell = isAddCell;
       otherProps.isChanged = isChanged;
-      if (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource) {
+      if (Array.isArray(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
         // 存在比对
         if ((0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
           var _originalObj$record$r;

package/package.json

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