shineout 3.6.0-beta.21 → 3.6.0-beta.23

package/cjs/image/image.type.d.ts

@@ -1,6 +1,7 @@
-import { ImageProps as UnStyledImageProps } from '@sheinx/base';
+import { ImageProps as UnStyledImageProps, CustomRenderHoverMaskOptions } from '@sheinx/base';
 /**
  * @title Image
  * @sort 1
  */
 export type ImageProps = Omit<UnStyledImageProps, 'jssStyle' | 'renderImage' | 'renderError' | 'renderWrapper' | 'renderPlaceholder' | 'renderInnerWrapper' | 'componentRef' | 'imageRef'>;
+export type ImageCustomRenderHoverMaskOptions = CustomRenderHoverMaskOptions;

package/cjs/index.js

@@ -514,5 +514,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.6.0-beta.21'
+  version: '3.6.0-beta.23'
 };

package/dist/shineout.js

@@ -12136,7 +12136,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.6.0-beta.21');
+/* harmony default export */ var version = ('3.6.0-beta.23');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -34848,9 +34848,12 @@ var Input = function Input(props) {
     className: classnames_default()(inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.input),
     onKeyUp: onKeyUp
   });
+  var inputElProps = removeProps(inputProps, {
+    formName: undefined
+  });
   var inputEl = /*#__PURE__*/(0,jsx_runtime.jsx)("input", objectSpread2_default()({
     type: "text"
-  }, inputProps));
+  }, inputElProps));
   if (typeof renderInput === 'function') {
     inputEl = renderInput(inputEl);
   }
@@ -35543,7 +35546,6 @@ var useInputCommon = function useInputCommon(props0) {
     inputAbleProps.forceDelayChange();
   });
   return objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({}, rest), {}, {
-    formName: undefined,
     value: inputAbleProps.value,
     className: classnames_default()(props.className, innerTitle && (inputStyle === null || inputStyle === void 0 ? void 0 : inputStyle.wrapperInnerTitle)),
     onChange: inputAbleProps.onChange,
@@ -51511,7 +51513,7 @@ var ImageGroup = function ImageGroup(props) {
 
 
 
-var image_excluded = ["fit", "alt", "src", "href", "lazy", "title", "style", "error", "target", "jssStyle", "className", "placeholder", "width", "height", "shape", "autoSSL", "noImgDrag", "onClick", "componentRef"];
+var image_excluded = ["fit", "alt", "src", "href", "lazy", "title", "style", "error", "target", "jssStyle", "className", "placeholder", "width", "height", "shape", "autoSSL", "noImgDrag", "onClick", "componentRef", "customRenderHoverMask"];
 
 
 
@@ -51551,6 +51553,7 @@ var Image = function Image(props) {
     noImgDrag = props.noImgDrag,
     onClick = props.onClick,
     componentRef = props.componentRef,
+    customRenderHoverMask = props.customRenderHoverMask,
     rest = objectWithoutProperties_default()(props, image_excluded);
   var _useImage = use_image(objectSpread2_default()({
       container: getDefaultContainer(),
@@ -51703,6 +51706,14 @@ var Image = function Image(props) {
 
   // 遮罩层
   var renderMask = function renderMask() {
+    if (customRenderHoverMask) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        className: maskClass,
+        children: customRenderHoverMask({
+          preview: preview
+        })
+      });
+    }
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
       className: maskClass,
       onClick: handleOpenGallery,
@@ -52328,8 +52339,13 @@ var usePaginationList = function usePaginationList(props) {
     var _props$total;
     if (!shouldPage) return {};
     var total = (_props$total = props.total) !== null && _props$total !== void 0 ? _props$total : Array.isArray(data) ? data.length : 0;
+    var finalCurrent = props.current || current;
+    var maxCurrent = Math.ceil(total / (props.pageSize || pageSize));
+    if (current > maxCurrent) {
+      finalCurrent = 1;
+    }
     return {
-      current: props.current || current,
+      current: finalCurrent,
       pageSize: props.pageSize || pageSize,
       total: total,
       disabled: !!props.loading,
@@ -60337,6 +60353,7 @@ var useTableFilter = function useTableFilter(props) {
     });
   }, [activeFilters, props.data]);
   var onFilterChange = use_persist_fn(function (columnKey, value) {
+    // TODO: 暂未开放reset全部筛选条件
     if (columnKey === '__reset__') {
       setFilterInfo(function (prev) {
         var next = new Map(prev);
@@ -66596,7 +66613,9 @@ var Upload = function Upload(props0) {
     } : _props$renderResult,
     _props$listType = props.listType,
     listType = _props$listType === void 0 ? 'text' : _props$listType,
-    leftHandler = props.leftHandler;
+    leftHandler = props.leftHandler,
+    _props$hideHandler = props.hideHandler,
+    hideHandler = _props$hideHandler === void 0 ? false : _props$hideHandler;
   var _useConfig = useConfig(),
     locale = _useConfig.locale;
   var uploadClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$uploa = _props$jssStyle.upload) === null || _props$jssStyle$uploa === void 0 ? void 0 : _props$jssStyle$uploa.call(_props$jssStyle);
@@ -66762,7 +66781,7 @@ var Upload = function Upload(props0) {
       }));
     });
   };
-  var CustomResult = props.customResult;
+  var renderCustomResult = props.customResult;
   var shouldRenderLeft = listType !== 'image' || leftHandler;
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(FormFieldContext),
     fieldId = _useContext.fieldId;
@@ -66770,17 +66789,19 @@ var Upload = function Upload(props0) {
     id: fieldId,
     style: props.style,
     className: classnames_default()(uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.rootClass, uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.wrapper, isImage && (uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.wrapperImage), drop && (uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.wrapperDrop), props.disabled && (uploadClasses === null || uploadClasses === void 0 ? void 0 : uploadClasses.wrapperDisabled), props.className),
-    children: CustomResult ? /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
-      children: [shouldRenderLeft && renderHandler(), /*#__PURE__*/(0,jsx_runtime.jsx)(CustomResult, {
+    children: renderCustomResult ? /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+      children: [shouldRenderLeft && renderHandler(), renderCustomResult({
         value: value,
         files: files,
+        filesInstances: renderFile(),
         onFileRemove: func.removeFile,
         onValueRemove: func.removeValue,
         recoverValue: recycleValues,
+        handler: renderHandler(),
         onValueRecover: func.recoverValue
-      }), !shouldRenderLeft && renderHandler()]
+      }), !shouldRenderLeft && !hideHandler && renderHandler()]
     }) : /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
-      children: [shouldRenderLeft && renderHandler(), renderValue(), renderFile(), !shouldRenderLeft && renderHandler(), renderRecover()]
+      children: [shouldRenderLeft && !hideHandler && renderHandler(), renderValue(), renderFile(), !shouldRenderLeft && !hideHandler && renderHandler(), renderRecover()]
     })
   });
 };
@@ -69352,7 +69373,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.0-beta.21'
+  version: '3.6.0-beta.23'
 });
 }();
 /******/ 	return __webpack_exports__;