ht-components-taro-v3 1.0.4 → 1.0.6

package/README.md

@@ -0,0 +1,22 @@
+h5使用esm，小程序使用cjs
+
+# HTScrollView
+
+## 参数
+
+| 参数 | 类型 | 含义 | 必填 | 默认值 |
+| :------: | :-------: | :-------: | :------: | :------: |
+| ajaxFn  | function | 请求函数 |  是  |  -  |
+| api  | string | 请求接口 - h5环境下使用 |  是  |  -  |
+| method  | string | 请求方法，默认GET |  是  |  'GET'  |
+| resListKey  | string |  返回数据列表的key  |  是  |  -  |
+| renderItemFn  | function |  列表项渲染函数，函数参数为item和index  |  是  |  -  |
+| className  | string   |  组件内层View的自定义类名  |  -  |  -  |
+| scrollClassName  | string   |  最外层scrollView的自定义类名  |  -  |  -  |
+| isShowNoMoreDataTips  | boolean |  是否显示没有更多数据的提示，默认显示  |  -  |  true  |
+| noMoreDataTipsText  | string |  没有更多数据的提示内容  |  -  |  '没有更多数据了'  |
+| ajaxData  | object |  额外的请求参数  |  -  |  {}  |
+| limit  | number |  每次请求的数据条数，默认10  |  -  |  10  |
+| dealReqDataFn  | function |  请求回来的数据处理函数  |  -  |  -  |
+| onReqErrorFn  | function |  请求失败回调函数  |  -  |  -  |
+

package/dist/cjs/index.css

@@ -1 +1 @@
-.ht-scroll-component-view{display:flex;flex-wrap:wrap;height:100%;width:100%}.ht-scroll-component-view .request-loading-view{align-items:center;color:#9a9b9c;display:flex;font-family:PingFangSC-Regular,PingFang SC;font-size:40px;font-weight:400;justify-content:center;width:100%}@keyframes rotate{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.ht-scroll-component-view .request-loading-view .request-loading-icon{animation:rotate 3s linear infinite;display:block;height:40px;margin-right:8px;width:40px}.ht-scroll-component-view .no-more-data-tip{color:#9a9b9c;font-family:PingFangSC-Regular,PingFang SC;font-size:40px;font-weight:400;line-height:58px;text-align:center;width:100%}
+.ht-scroll-component-view{height:100%;width:100%}.ht-scroll-component-view .ht-scroll-component-inner{box-sizing:border-box;display:flex;flex-wrap:wrap;width:100%}.ht-scroll-component-view .ht-scroll-component-inner .request-loading-view{align-items:center;color:#9a9b9c;display:flex;font-family:PingFangSC-Regular,PingFang SC;font-size:40px;font-weight:400;justify-content:center;width:100%}@keyframes rotate{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.ht-scroll-component-view .ht-scroll-component-inner .request-loading-view .request-loading-icon{animation:rotate 3s linear infinite;display:block;height:40px;margin-right:8px;width:40px}.ht-scroll-component-view .ht-scroll-component-inner .no-more-data-tip{color:#9a9b9c;font-family:PingFangSC-Regular,PingFang SC;font-size:40px;font-weight:400;line-height:58px;text-align:center;width:100%}

package/dist/cjs/index.js

@@ -2413,11 +2413,13 @@ if (!TO_STRING_TAG_SUPPORT) {
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 
-// className 组件的自定义类名
+// className 组件内层View的自定义类名
+// scrollClassName 最外层scrollView的自定义类名
 // isShowNoMoreDataTips 是否显示没有更多数据的提示，默认显示
+// noMoreDataTipsText 没有更多提示的内容
 // ajaxFn 请求函数
-// api 请求接口 - h5环境下使用
-// method 请求方法，默认GET - h5环境下使用
+// api 请求接口
+// method 请求方法，默认GET
 // ajaxData = {} 额外的请求参数
 // limit 每次请求的数据条数，默认10
 // resListKey 返回数据列表的key
@@ -2426,8 +2428,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 // renderItemFn  Fn  列表项渲染函数，必传，函数参数为item和index
 var HTScrollView = function HTScrollView(props) {
   var className = props.className,
+    scrollClassName = props.scrollClassName,
     _props$isShowNoMoreDa = props.isShowNoMoreDataTips,
-    isShowNoMoreDataTips = _props$isShowNoMoreDa === void 0 ? true : _props$isShowNoMoreDa;
+    isShowNoMoreDataTips = _props$isShowNoMoreDa === void 0 ? true : _props$isShowNoMoreDa,
+    _props$noMoreDataTips = props.noMoreDataTipsText,
+    noMoreDataTipsText = _props$noMoreDataTips === void 0 ? '没有更多数据了' : _props$noMoreDataTips;
 
   // 是否正在请求
   var _useState = React.useState(true),
@@ -2441,8 +2446,7 @@ var HTScrollView = function HTScrollView(props) {
     setIsCompleteAllData = _useState4[1];
   // 分页数据
   var _useState5 = React.useState({
-      pageNum: 1,
-      total: 0
+      pageNum: 1
     }),
     _useState6 = _slicedToArray(_useState5, 2),
     pageData = _useState6[0],
@@ -2477,19 +2481,20 @@ var HTScrollView = function HTScrollView(props) {
     var ajaxFn = props.ajaxFn,
       api = props.api,
       _props$method = props.method,
-      method = _props$method === void 0 ? "GET" : _props$method,
+      method = _props$method === void 0 ? 'GET' : _props$method,
       _props$ajaxData = props.ajaxData,
       ajaxData = _props$ajaxData === void 0 ? {} : _props$ajaxData,
       _props$limit = props.limit,
       limit = _props$limit === void 0 ? 10 : _props$limit;
     var env = (_Taro$getEnv = Taro__default["default"].getEnv()) === null || _Taro$getEnv === void 0 ? void 0 : _Taro$getEnv.toLowerCase();
-    console.log("env", env);
+    // console.log("env", env);
+
     setIsRequesting(true);
     var ajaxParams = _objectSpread(_objectSpread({}, ajaxData), {}, {
       page: pageData.pageNum,
       limit: limit
     });
-    if (env === "web") {
+    if (env === 'web') {
       ajaxFn({
         method: method,
         url: api,
@@ -2499,8 +2504,8 @@ var HTScrollView = function HTScrollView(props) {
       }).catch(function () {
         onAjaxError();
       });
-    } else if (env === "weapp") {
-      ajaxFn(ajaxParams).then(function (res) {
+    } else if (env === 'weapp') {
+      ajaxFn(method, api, ajaxParams).then(function (res) {
         dealAjaxData(res);
       }).catch(function (err) {
         onAjaxError(err);
@@ -2524,7 +2529,7 @@ var HTScrollView = function HTScrollView(props) {
       setIsCompleteAllData(!newDataList.length);
       setIsRequesting(false);
     } else {
-      onAjaxError("ajax fail");
+      onAjaxError(new Error('ajax fail'));
     }
   };
   // 请求失败时
@@ -2534,10 +2539,12 @@ var HTScrollView = function HTScrollView(props) {
     setIsRequesting(false);
   };
   return /*#__PURE__*/React__default["default"].createElement(components.ScrollView, {
-    className: "ht-scroll-component-view ".concat(className || ""),
+    className: "ht-scroll-component-view ".concat(scrollClassName || ''),
     scrollY: true,
     scrollWithAnimation: true,
     onScrollToLower: scrollToLower
+  }, /*#__PURE__*/React__default["default"].createElement(components.View, {
+    className: "ht-scroll-component-inner ".concat(className || '')
   }, dataList.map(function (item, index) {
     return props.renderItemFn(item, index);
   }), isRequesting && /*#__PURE__*/React__default["default"].createElement(components.View, {
@@ -2547,7 +2554,7 @@ var HTScrollView = function HTScrollView(props) {
     src: "https://xiaobangkj.oss-cn-hangzhou.aliyuncs.com/mini-live/taroComponentsV3/scroll-bottom-loading-icon.png"
   }), "\u6B63\u5728\u52A0\u8F7D\u4E2D..."), isCompleteAllData && !!isShowNoMoreDataTips && /*#__PURE__*/React__default["default"].createElement(components.View, {
     className: "no-more-data-tip"
-  }, "\u6CA1\u6709\u66F4\u591A\u6570\u636E\u4E86"));
+  }, noMoreDataTipsText)));
 };
 
 exports.HTScrollView = HTScrollView;

package/dist/esm/index.css

@@ -1 +1 @@
-.ht-scroll-component-view{display:flex;flex-wrap:wrap;height:100%;width:100%}.ht-scroll-component-view .request-loading-view{align-items:center;color:#9a9b9c;display:flex;font-family:PingFangSC-Regular,PingFang SC;font-size:40px;font-weight:400;justify-content:center;width:100%}@keyframes rotate{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.ht-scroll-component-view .request-loading-view .request-loading-icon{animation:rotate 3s linear infinite;display:block;height:40px;margin-right:8px;width:40px}.ht-scroll-component-view .no-more-data-tip{color:#9a9b9c;font-family:PingFangSC-Regular,PingFang SC;font-size:40px;font-weight:400;line-height:58px;text-align:center;width:100%}
+.ht-scroll-component-view{height:100%;width:100%}.ht-scroll-component-view .ht-scroll-component-inner{box-sizing:border-box;display:flex;flex-wrap:wrap;width:100%}.ht-scroll-component-view .ht-scroll-component-inner .request-loading-view{align-items:center;color:#9a9b9c;display:flex;font-family:PingFangSC-Regular,PingFang SC;font-size:40px;font-weight:400;justify-content:center;width:100%}@keyframes rotate{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.ht-scroll-component-view .ht-scroll-component-inner .request-loading-view .request-loading-icon{animation:rotate 3s linear infinite;display:block;height:40px;margin-right:8px;width:40px}.ht-scroll-component-view .ht-scroll-component-inner .no-more-data-tip{color:#9a9b9c;font-family:PingFangSC-Regular,PingFang SC;font-size:40px;font-weight:400;line-height:58px;text-align:center;width:100%}

package/dist/esm/index.js

@@ -2404,11 +2404,13 @@ if (!TO_STRING_TAG_SUPPORT) {
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 
-// className 组件的自定义类名
+// className 组件内层View的自定义类名
+// scrollClassName 最外层scrollView的自定义类名
 // isShowNoMoreDataTips 是否显示没有更多数据的提示，默认显示
+// noMoreDataTipsText 没有更多提示的内容
 // ajaxFn 请求函数
-// api 请求接口 - h5环境下使用
-// method 请求方法，默认GET - h5环境下使用
+// api 请求接口
+// method 请求方法，默认GET
 // ajaxData = {} 额外的请求参数
 // limit 每次请求的数据条数，默认10
 // resListKey 返回数据列表的key
@@ -2417,8 +2419,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 // renderItemFn  Fn  列表项渲染函数，必传，函数参数为item和index
 var HTScrollView = function HTScrollView(props) {
   var className = props.className,
+    scrollClassName = props.scrollClassName,
     _props$isShowNoMoreDa = props.isShowNoMoreDataTips,
-    isShowNoMoreDataTips = _props$isShowNoMoreDa === void 0 ? true : _props$isShowNoMoreDa;
+    isShowNoMoreDataTips = _props$isShowNoMoreDa === void 0 ? true : _props$isShowNoMoreDa,
+    _props$noMoreDataTips = props.noMoreDataTipsText,
+    noMoreDataTipsText = _props$noMoreDataTips === void 0 ? '没有更多数据了' : _props$noMoreDataTips;
 
   // 是否正在请求
   var _useState = useState(true),
@@ -2432,8 +2437,7 @@ var HTScrollView = function HTScrollView(props) {
     setIsCompleteAllData = _useState4[1];
   // 分页数据
   var _useState5 = useState({
-      pageNum: 1,
-      total: 0
+      pageNum: 1
     }),
     _useState6 = _slicedToArray(_useState5, 2),
     pageData = _useState6[0],
@@ -2468,19 +2472,20 @@ var HTScrollView = function HTScrollView(props) {
     var ajaxFn = props.ajaxFn,
       api = props.api,
       _props$method = props.method,
-      method = _props$method === void 0 ? "GET" : _props$method,
+      method = _props$method === void 0 ? 'GET' : _props$method,
       _props$ajaxData = props.ajaxData,
       ajaxData = _props$ajaxData === void 0 ? {} : _props$ajaxData,
       _props$limit = props.limit,
       limit = _props$limit === void 0 ? 10 : _props$limit;
     var env = (_Taro$getEnv = Taro.getEnv()) === null || _Taro$getEnv === void 0 ? void 0 : _Taro$getEnv.toLowerCase();
-    console.log("env", env);
+    // console.log("env", env);
+
     setIsRequesting(true);
     var ajaxParams = _objectSpread(_objectSpread({}, ajaxData), {}, {
       page: pageData.pageNum,
       limit: limit
     });
-    if (env === "web") {
+    if (env === 'web') {
       ajaxFn({
         method: method,
         url: api,
@@ -2490,8 +2495,8 @@ var HTScrollView = function HTScrollView(props) {
       }).catch(function () {
         onAjaxError();
       });
-    } else if (env === "weapp") {
-      ajaxFn(ajaxParams).then(function (res) {
+    } else if (env === 'weapp') {
+      ajaxFn(method, api, ajaxParams).then(function (res) {
         dealAjaxData(res);
       }).catch(function (err) {
         onAjaxError(err);
@@ -2515,7 +2520,7 @@ var HTScrollView = function HTScrollView(props) {
       setIsCompleteAllData(!newDataList.length);
       setIsRequesting(false);
     } else {
-      onAjaxError("ajax fail");
+      onAjaxError(new Error('ajax fail'));
     }
   };
   // 请求失败时
@@ -2525,10 +2530,12 @@ var HTScrollView = function HTScrollView(props) {
     setIsRequesting(false);
   };
   return /*#__PURE__*/React.createElement(ScrollView, {
-    className: "ht-scroll-component-view ".concat(className || ""),
+    className: "ht-scroll-component-view ".concat(scrollClassName || ''),
     scrollY: true,
     scrollWithAnimation: true,
     onScrollToLower: scrollToLower
+  }, /*#__PURE__*/React.createElement(View, {
+    className: "ht-scroll-component-inner ".concat(className || '')
   }, dataList.map(function (item, index) {
     return props.renderItemFn(item, index);
   }), isRequesting && /*#__PURE__*/React.createElement(View, {
@@ -2538,7 +2545,7 @@ var HTScrollView = function HTScrollView(props) {
     src: "https://xiaobangkj.oss-cn-hangzhou.aliyuncs.com/mini-live/taroComponentsV3/scroll-bottom-loading-icon.png"
   }), "\u6B63\u5728\u52A0\u8F7D\u4E2D..."), isCompleteAllData && !!isShowNoMoreDataTips && /*#__PURE__*/React.createElement(View, {
     className: "no-more-data-tip"
-  }, "\u6CA1\u6709\u66F4\u591A\u6570\u636E\u4E86"));
+  }, noMoreDataTipsText)));
 };
 
 export { HTScrollView };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ht-components-taro-v3",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "基于 Rollup 构建的 Taro 多端组件库",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",