shineout 3.6.0-beta.22 → 3.6.0-beta.24

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.22'
+  version: '3.6.0-beta.24'
 };

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.22');
+/* harmony default export */ var version = ('3.6.0-beta.24');
 ;// 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,
@@ -52337,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,
@@ -60346,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);
@@ -66773,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;
@@ -66781,10 +66789,12 @@ 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(),
+        valueInstances: renderValue(),
         onFileRemove: func.removeFile,
         onValueRemove: func.removeValue,
         recoverValue: recycleValues,
@@ -69364,7 +69374,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.0-beta.22'
+  version: '3.6.0-beta.24'
 });
 }();
 /******/ 	return __webpack_exports__;