@zat-design/sisyphus-react 3.3.1-beta.9 → 3.3.2

package/dist/index.esm.css

@@ -2259,6 +2259,15 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
           align-items: center;
   width: 100%;
 }
+.pro-group .ant-space-compact > .ant-input-number:first-child {
+  border-end-end-radius: 0;
+  border-start-end-radius: 0;
+}
+.pro-group .ant-space-compact > .ant-input-number:last-child {
+  border-start-start-radius: 0;
+  border-end-start-radius: 0;
+  margin-left: -1px;
+}
 .pro-group .ant-space-compact .ant-form-item {
   margin-bottom: 0 !important;
 }

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

@@ -52,6 +52,18 @@
     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;
     }

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

@@ -33,7 +33,7 @@ import tipSvg from '../../../assets/tip.svg';
 import useRules from '../../utils/useRules';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _classNames, _otherProps$names2;
+  var _ref2, _classNames, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -163,8 +163,8 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
-  // 优先取formDisabled（全局），其次取disabled函数返回值，最后取fieldProps函数返回的disabled
-  var lastDisabled = componentProps.disabledStrictly ? formDisabled || _disabled || (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) : false;
+  // 优先取组件上的disabled, 最后取formDisabled（全局
+  var lastDisabled = componentProps.disabledStrictly ? (_ref2 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled : false;
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -192,8 +192,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = _toConsumableArray(args);
-    var _ref2 = otherProps || {},
-      valueType = _ref2.valueType;
+    var _ref3 = otherProps || {},
+      valueType = _ref3.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -269,7 +269,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len2,
         args,
         _key2,
@@ -296,7 +296,7 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
@@ -404,7 +404,12 @@ var Render = function Render(props) {
         shouldUpdate: _otherFormItemProps.shouldUpdate,
         noStyle: true,
         children: function children() {
-          return orgFormItem;
+          return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+            // @ts-ignore
+            _internalItemRender: internalItemRender,
+            className: _className,
+            children: child
+          }));
         }
       });
     }

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

@@ -44,6 +44,7 @@ var RenderFields = function RenderFields(props) {
     });
   }
   var comList = columns.flatMap(function (column, index) {
+    var _ref, _formItemProps$disabl;
     if (!!expand && !openState) {
       // expand为Number时 过滤掉大于expand 且 非fixed的column
       if (typeof expand === 'number') {
@@ -122,7 +123,7 @@ var RenderFields = function RenderFields(props) {
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
-    var comDisabled = formItemChildProps.disabled || fieldProps.disabled || disabled;
+    var comDisabled = (_ref = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled) !== null && _ref !== void 0 ? _ref : disabled;
     var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
     // 当前组件是不是一个选择组件
     var _isSelect = isSelect({

package/es/ProForm/utils/useShouldUpdate.js

@@ -13,7 +13,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
     required = props.required,
     fieldProps = props.fieldProps,
     component = props.component,
-    originComponent = props.originComponent;
+    originComponent = props.originComponent,
+    type = props.type;
   var _shouldUpdate = formItemProps.shouldUpdate,
     name = formItemProps.name,
     clearNotShow = formItemProps.clearNotShow,
@@ -60,11 +61,24 @@ var useShouldUpdate = function useShouldUpdate(props) {
     showRef.current = show;
   }
   if (isFunction(disabled)) {
-    disabledRef.current = Boolean(disabled(values, {
+    // RangePicker返回数组时，特殊处理
+    if (type === 'RangePicker' && Array.isArray(disabled(values, {
       form: form,
       index: index,
       namePath: namePath
-    }));
+    }))) {
+      disabledRef.current = disabled(values, {
+        form: form,
+        index: index,
+        namePath: namePath
+      });
+    } else {
+      disabledRef.current = Boolean(disabled(values, {
+        form: form,
+        index: index,
+        namePath: namePath
+      }));
+    }
   } else {
     disabledRef.current = disabled;
   }

package/es/ProTooltip/index.js

@@ -6,7 +6,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["text", "mode", "width", "line", "isResponsiveWidth", "className", "style", "lineHeight"];
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useSize, useSetState, useDebounce } from 'ahooks';
+import { useSize, useSetState, useDebounce, useDebounceEffect } from 'ahooks';
 import { useEffect, useRef } from 'react';
 import classnames from 'classnames';
 import './style/index.less';
@@ -135,25 +135,12 @@ var ProTooltip = function ProTooltip(props) {
     }
     return line > 1 ? _jsx(AutoMixinMulti, {}) : _jsx(AutoMixinSingle, {});
   };
-  useEffect(function () {
+  useDebounceEffect(function () {
     if (isResponsiveWidth && parentElement) {
-      var _contentDom$style$wid;
       var cWidth = parentElement.clientWidth - 32;
       var contentDom = childRef.current;
-      var flag = false;
-      var styleWidth = Number((_contentDom$style$wid = contentDom.style.width) === null || _contentDom$style$wid === void 0 ? void 0 : _contentDom$style$wid.replace('px', ''));
-      if (contentDom.offsetWidth < styleWidth) {
-        flag = contentDom.scrollWidth > styleWidth;
-      } else if (contentDom.offsetWidth === styleWidth && contentDom.scrollWidth === styleWidth && contentDom.clientWidth === styleWidth) {
-        flag = false;
-      } else {
-        flag = contentDom.scrollWidth > contentDom.clientWidth;
-      }
-      if (parentElement.scrollWidth > parentElement.clientWidth) {
-        flag = true;
-      }
       setState({
-        isShowToolTip: flag,
+        isShowToolTip: contentDom.scrollWidth > contentDom.offsetWidth,
         localWidth: cWidth
       });
     }
@@ -162,7 +149,9 @@ var ProTooltip = function ProTooltip(props) {
         localWidth: _width
       });
     }
-  }, [isResponsiveWidth, size]);
+  }, [isResponsiveWidth, size], {
+    wait: 300
+  });
   useEffect(function () {
     if (mode === 'auto' && line === 1) {
       var localDom = ref.current;

package/es/ProUpload/components/ImageRender.js

@@ -17,12 +17,12 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
  * @Author: wangshengqiang
  * @Date: 2023-07-27 20:13:07
  * @LastEditors: wangshengqiang
- * @LastEditTime: 2023-11-21 15:24:56
+ * @LastEditTime: 2023-11-29 19:33:04
  * @Description: 图片类型
  *
  */
 
-import { useState } from 'react';
+import { useRef, useState } from 'react';
 import { DndContext } from '@dnd-kit/core';
 import { SortableContext, rectSortingStrategy } from '@dnd-kit/sortable';
 import { ReactSVG } from 'react-svg';
@@ -34,6 +34,9 @@ import lookSvg from '../../assets/look.svg';
 import deleteSvg from '../../assets/delete.svg';
 import downloadSvg from '../../assets/download.svg';
 import locale from '../../locale';
+var isImgage = function isImgage(_fileExt) {
+  return ['.PNG', '.JPG', '.JPEG', '.GIF', '.BMP', '.JPE'].includes(_fileExt.toLocaleUpperCase());
+};
 /* 按钮类型 */
 var ImageRender = function ImageRender(props) {
   var _locale$ProUpload4;
@@ -41,6 +44,7 @@ var ImageRender = function ImageRender(props) {
     _useState2 = _slicedToArray(_useState, 2),
     previewImg = _useState2[0],
     setPreviewImg = _useState2[1];
+  var proViewerRef = useRef(null);
   var isView = props.isView,
     disabled = props.disabled,
     headerRender = props.headerRender,
@@ -67,7 +71,13 @@ var ImageRender = function ImageRender(props) {
     if (onPreview) {
       onPreview(file);
     } else {
-      setPreviewImg(file);
+      var _file$url;
+      var _fileExt = getFileExt(file.name || (file === null || file === void 0 ? void 0 : (_file$url = file.url) === null || _file$url === void 0 ? void 0 : _file$url.split('?')[0]));
+      if (isImgage(_fileExt)) {
+        setPreviewImg(file);
+      } else {
+        window.open(file.url, '_blank');
+      }
     }
   };
   /**
@@ -96,12 +106,12 @@ var ImageRender = function ImageRender(props) {
     openFileDialogOnClick: !showDraggerSingleRender,
     disabled: disabled || isView,
     itemRender: function itemRender(originNode, file, fileList, actions) {
-      var _file$url, _locale$ProUpload, _locale$ProUpload2, _locale$ProUpload3;
+      var _file$url2, _locale$ProUpload, _locale$ProUpload2, _locale$ProUpload3;
       var _isShowDownload = !!onDownload && file.status === 'done';
-      var _fileExt = getFileExt(file.name || (file === null || file === void 0 ? void 0 : (_file$url = file.url) === null || _file$url === void 0 ? void 0 : _file$url.split('?')[0]));
+      var _fileExt = getFileExt(file.name || (file === null || file === void 0 ? void 0 : (_file$url2 = file.url) === null || _file$url2 === void 0 ? void 0 : _file$url2.split('?')[0]));
       var _fileIcon = getFileIcon(_fileExt);
-      var isImg = ['.PNG', '.JPG', '.JPEG', '.GIF', '.BMP', '.JPE'].includes(_fileExt.toLocaleUpperCase());
-      var _showPreview = isImg;
+      var isImg = isImgage(_fileExt);
+      var _showPreview = isImg || file.status === 'done';
       return _jsx(DraggableUploadListItem, {
         file: file,
         children: _jsxs("div", {

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

@@ -52,6 +52,18 @@
     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;
     }

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

@@ -31,7 +31,7 @@ var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className",
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _classNames, _otherProps$names2;
+  var _ref2, _classNames, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -161,8 +161,8 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = (0, _lodash.omit)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
-  // 优先取formDisabled（全局），其次取disabled函数返回值，最后取fieldProps函数返回的disabled
-  var lastDisabled = componentProps.disabledStrictly ? formDisabled || _disabled || (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) : false;
+  // 优先取组件上的disabled, 最后取formDisabled（全局
+  var lastDisabled = componentProps.disabledStrictly ? (_ref2 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled : false;
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -190,8 +190,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = (0, _toConsumableArray2.default)(args);
-    var _ref2 = otherProps || {},
-      valueType = _ref2.valueType;
+    var _ref3 = otherProps || {},
+      valueType = _ref3.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -267,7 +267,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _len2,
         args,
         _key2,
@@ -294,7 +294,7 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
@@ -402,7 +402,12 @@ var Render = function Render(props) {
         shouldUpdate: _otherFormItemProps.shouldUpdate,
         noStyle: true,
         children: function children() {
-          return orgFormItem;
+          return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+            // @ts-ignore
+            _internalItemRender: internalItemRender,
+            className: _className,
+            children: child
+          }));
         }
       });
     }

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

@@ -52,6 +52,7 @@ var RenderFields = function RenderFields(props) {
     });
   }
   var comList = columns.flatMap(function (column, index) {
+    var _ref, _formItemProps$disabl;
     if (!!expand && !openState) {
       // expand为Number时 过滤掉大于expand 且 非fixed的column
       if (typeof expand === 'number') {
@@ -130,7 +131,7 @@ var RenderFields = function RenderFields(props) {
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
-    var comDisabled = formItemChildProps.disabled || fieldProps.disabled || disabled;
+    var comDisabled = (_ref = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled) !== null && _ref !== void 0 ? _ref : disabled;
     var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
     // 当前组件是不是一个选择组件
     var _isSelect = (0, _utils.isSelect)({

package/lib/ProForm/utils/useShouldUpdate.js

@@ -20,7 +20,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
     required = props.required,
     fieldProps = props.fieldProps,
     component = props.component,
-    originComponent = props.originComponent;
+    originComponent = props.originComponent,
+    type = props.type;
   var _shouldUpdate = formItemProps.shouldUpdate,
     name = formItemProps.name,
     clearNotShow = formItemProps.clearNotShow,
@@ -67,11 +68,24 @@ var useShouldUpdate = function useShouldUpdate(props) {
     showRef.current = show;
   }
   if ((0, _lodash.isFunction)(disabled)) {
-    disabledRef.current = Boolean(disabled(values, {
+    // RangePicker返回数组时，特殊处理
+    if (type === 'RangePicker' && Array.isArray(disabled(values, {
       form: form,
       index: index,
       namePath: namePath
-    }));
+    }))) {
+      disabledRef.current = disabled(values, {
+        form: form,
+        index: index,
+        namePath: namePath
+      });
+    } else {
+      disabledRef.current = Boolean(disabled(values, {
+        form: form,
+        index: index,
+        namePath: namePath
+      }));
+    }
   } else {
     disabledRef.current = disabled;
   }

package/lib/ProTooltip/index.js

@@ -141,25 +141,12 @@ var ProTooltip = function ProTooltip(props) {
     }
     return line > 1 ? (0, _jsxRuntime.jsx)(AutoMixinMulti, {}) : (0, _jsxRuntime.jsx)(AutoMixinSingle, {});
   };
-  (0, _react.useEffect)(function () {
+  (0, _ahooks.useDebounceEffect)(function () {
     if (isResponsiveWidth && parentElement) {
-      var _contentDom$style$wid;
       var cWidth = parentElement.clientWidth - 32;
       var contentDom = childRef.current;
-      var flag = false;
-      var styleWidth = Number((_contentDom$style$wid = contentDom.style.width) === null || _contentDom$style$wid === void 0 ? void 0 : _contentDom$style$wid.replace('px', ''));
-      if (contentDom.offsetWidth < styleWidth) {
-        flag = contentDom.scrollWidth > styleWidth;
-      } else if (contentDom.offsetWidth === styleWidth && contentDom.scrollWidth === styleWidth && contentDom.clientWidth === styleWidth) {
-        flag = false;
-      } else {
-        flag = contentDom.scrollWidth > contentDom.clientWidth;
-      }
-      if (parentElement.scrollWidth > parentElement.clientWidth) {
-        flag = true;
-      }
       setState({
-        isShowToolTip: flag,
+        isShowToolTip: contentDom.scrollWidth > contentDom.offsetWidth,
         localWidth: cWidth
       });
     }
@@ -168,7 +155,9 @@ var ProTooltip = function ProTooltip(props) {
         localWidth: _width
       });
     }
-  }, [isResponsiveWidth, size]);
+  }, [isResponsiveWidth, size], {
+    wait: 300
+  });
   (0, _react.useEffect)(function () {
     if (mode === 'auto' && line === 1) {
       var localDom = ref.current;

package/lib/ProUpload/components/ImageRender.js

@@ -27,11 +27,14 @@ var _locale = _interopRequireDefault(require("../../locale"));
  * @Author: wangshengqiang
  * @Date: 2023-07-27 20:13:07
  * @LastEditors: wangshengqiang
- * @LastEditTime: 2023-11-21 15:24:56
+ * @LastEditTime: 2023-11-29 19:33:04
  * @Description: 图片类型
  *
  */
 
+var isImgage = function isImgage(_fileExt) {
+  return ['.PNG', '.JPG', '.JPEG', '.GIF', '.BMP', '.JPE'].includes(_fileExt.toLocaleUpperCase());
+};
 /* 按钮类型 */
 var ImageRender = function ImageRender(props) {
   var _locale$ProUpload4;
@@ -39,6 +42,7 @@ var ImageRender = function ImageRender(props) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     previewImg = _useState2[0],
     setPreviewImg = _useState2[1];
+  var proViewerRef = (0, _react.useRef)(null);
   var isView = props.isView,
     disabled = props.disabled,
     headerRender = props.headerRender,
@@ -65,7 +69,13 @@ var ImageRender = function ImageRender(props) {
     if (onPreview) {
       onPreview(file);
     } else {
-      setPreviewImg(file);
+      var _file$url;
+      var _fileExt = (0, _FileItem.getFileExt)(file.name || (file === null || file === void 0 ? void 0 : (_file$url = file.url) === null || _file$url === void 0 ? void 0 : _file$url.split('?')[0]));
+      if (isImgage(_fileExt)) {
+        setPreviewImg(file);
+      } else {
+        window.open(file.url, '_blank');
+      }
     }
   };
   /**
@@ -94,12 +104,12 @@ var ImageRender = function ImageRender(props) {
     openFileDialogOnClick: !showDraggerSingleRender,
     disabled: disabled || isView,
     itemRender: function itemRender(originNode, file, fileList, actions) {
-      var _file$url, _locale$ProUpload, _locale$ProUpload2, _locale$ProUpload3;
+      var _file$url2, _locale$ProUpload, _locale$ProUpload2, _locale$ProUpload3;
       var _isShowDownload = !!onDownload && file.status === 'done';
-      var _fileExt = (0, _FileItem.getFileExt)(file.name || (file === null || file === void 0 ? void 0 : (_file$url = file.url) === null || _file$url === void 0 ? void 0 : _file$url.split('?')[0]));
+      var _fileExt = (0, _FileItem.getFileExt)(file.name || (file === null || file === void 0 ? void 0 : (_file$url2 = file.url) === null || _file$url2 === void 0 ? void 0 : _file$url2.split('?')[0]));
       var _fileIcon = (0, _FileItem.getFileIcon)(_fileExt);
-      var isImg = ['.PNG', '.JPG', '.JPEG', '.GIF', '.BMP', '.JPE'].includes(_fileExt.toLocaleUpperCase());
-      var _showPreview = isImg;
+      var isImg = isImgage(_fileExt);
+      var _showPreview = isImg || file.status === 'done';
       return (0, _jsxRuntime.jsx)(_DraggableUploadListItem.DraggableUploadListItem, {
         file: file,
         children: (0, _jsxRuntime.jsxs)("div", {

package/package.json

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