shineout 3.7.0-beta.34 → 3.7.0-beta.35

package/cjs/index.js

@@ -522,5 +522,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.7.0-beta.34'
+  version: '3.7.0-beta.35'
 };

package/dist/shineout.js

@@ -7318,7 +7318,7 @@ var Alert = function Alert(props) {
   };
   var type = getType();
   var alertStyle = (jssStyle === null || jssStyle === void 0 || (_jssStyle$alert = jssStyle.alert) === null || _jssStyle$alert === void 0 ? void 0 : _jssStyle$alert.call(jssStyle)) || {};
-  var rootClass = classnames_default()(className, alertStyle.rootClass, alertStyle.alert, defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({}, alertStyle[type], true), alertStyle.withTitle, title), alertStyle.pending, dismiss === PENDING), alertStyle.noBordered, bordered === false));
+  var rootClass = classnames_default()(className, alertStyle.rootClass, alertStyle.alert, defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({}, alertStyle[type], true), alertStyle.withTitle, title), alertStyle.pending, dismiss === PENDING), alertStyle.noBordered, bordered === false), alertStyle.noChildren, !children));
   var getRootProps = function getRootProps() {
     return rest;
   };
@@ -12227,7 +12227,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.7.0-beta.34');
+/* harmony default export */ var version = ('3.7.0-beta.35');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -15622,6 +15622,11 @@ var alertStyle = {
   noBordered: {
     borderColor: 'transparent'
   },
+  noChildren: {
+    '&&$confirmwarning': {
+      marginBottom: 0
+    }
+  },
   icon: {
     width: src.alertIconSize,
     display: 'inline-flex',
@@ -20814,6 +20819,9 @@ var listStyle = {
     alignItems: 'center',
     justifyContent: 'center'
   },
+  loadingBottom: {
+    padding: 16
+  },
   empty: {
     display: 'flex',
     justifyContent: 'center',
@@ -57303,10 +57311,10 @@ var list_list_List = function List(props) {
         return renderItem(item, index);
       })
     }, columnIndex);
-    return;
   });
-  var renderLoading = function renderLoading() {
-    if (!props.loading) return null;
+  var loadingPosition = props.loadingPosition || 'center';
+  var renderCenterLoading = function renderCenterLoading() {
+    if (!props.loading || loadingPosition !== 'center') return null;
     var Loading = props.loading === true ? /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
       size: 16,
       jssStyle: props.jssStyle
@@ -57316,6 +57324,17 @@ var list_list_List = function List(props) {
       children: Loading
     });
   };
+  var renderBottomLoading = function renderBottomLoading() {
+    if (!props.loading || loadingPosition !== 'bottom') return null;
+    var Loading = props.loading === true ? /*#__PURE__*/(0,jsx_runtime.jsx)(src_spin_spin, {
+      size: 16,
+      jssStyle: props.jssStyle
+    }) : props.loading;
+    return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      className: listClasses === null || listClasses === void 0 ? void 0 : listClasses.loadingBottom,
+      children: Loading
+    });
+  };
   var renderEmpty = function renderEmpty() {
     if ((data === null || data === void 0 ? void 0 : data.length) > 0) return null;
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -57377,7 +57396,7 @@ var list_list_List = function List(props) {
       onScroll: handleListScroll,
       children: [columnData.map(function (column, colIndex) {
         return renderColumn(column, colIndex);
-      }), renderFooter()]
+      }), renderBottomLoading(), renderFooter()]
     });
   };
   var wrapperClass = classnames_default()(props.className, listClasses === null || listClasses === void 0 ? void 0 : listClasses.rootClass, listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapper, isEmpty && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperEmpty), props.bordered && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperBordered), props.size === 'small' && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperSmall), props.size === 'large' && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperLarge), props.striped && (listClasses === null || listClasses === void 0 ? void 0 : listClasses.wrapperStriped));
@@ -57388,7 +57407,7 @@ var list_list_List = function List(props) {
     children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: wrapperClass,
       style: wrapperStyle,
-      children: [renderList(), renderLoading(), renderEmpty()]
+      children: [renderList(), renderCenterLoading(), renderEmpty()]
     }), props.pagination && /*#__PURE__*/(0,jsx_runtime.jsx)(src_pagination_pagination, objectSpread2_default()(objectSpread2_default()({
       className: listClasses === null || listClasses === void 0 ? void 0 : listClasses.pagination,
       jssStyle: props.jssStyle
@@ -71192,7 +71211,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.0-beta.34'
+  version: '3.7.0-beta.35'
 });
 }();
 /******/ 	return __webpack_exports__;