fix: close #6, console log version

docs/quick-start/README.md

@@ -64,7 +64,7 @@ storage
 
 * host: `https://example-base.com/foo/bar/`
 * prefix: `something`
-* pathList: `[ 'create', 'modify', 'delete ]`
+* pathList: `[ 'create', 'modify', 'delete' ]`
 
 ### 文件结构
 `api/` 一般是这样的文件结构：

package.json

@@ -1,6 +1,6 @@
 {
     "name": "tua-api",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "main": "dist/umd.js",
     "module": "dist/es.js",
     "jsnext:main": "dist/es.js",

rollup.web.config.js

@@ -12,6 +12,10 @@ export default {
         name: 'TuaApi',
         format: 'umd',
         exports: 'named',
+        globals: {
+            axios: 'axios',
+            'fetch-jsonp': 'fetchJsonp',
+        },
     }, {
         file: 'dist/es.js',
         format: 'es',
@@ -28,9 +32,5 @@ export default {
             'process.env.NODE_ENV': JSON.stringify('prod'),
         }),
     ],
-    globals: {
-        axios: 'axios',
-        'fetch-jsonp': 'fetchJsonp',
-    },
     external: ['axios', 'fetch-jsonp'],
 }

src/TuaApiCore.js

@@ -1,7 +1,9 @@
 import koaCompose from 'koa-compose'
 
+import { version } from '../package.json'
 import {
     map,
+    log,
     pipe,
     error,
     mergeAll,
@@ -17,6 +19,8 @@ import {
     formatReqParamsMiddleware,
 } from './middlewareFns'
 
+log(`Version: ${version}`)
+
 class TuaApiCore {
     /**
      * @param {String} host 服务器基础地址，例如 https://example.com/

src/TuaApiMp.js

@@ -1,9 +1,6 @@
 import TuaApiCore from './TuaApiCore'
 import { log, promisifyWxApi } from './utils'
-import {
-    MIN_LOADING_TIME,
-    WX_VALID_METHODS,
-} from './constants'
+import { WX_VALID_METHODS } from './constants'
 
 class TuaApi extends TuaApiCore {
     constructor (options) {
@@ -21,8 +18,7 @@ class TuaApi extends TuaApiCore {
         reqParams: data,
         isShowLoading = true,
         showLoadingFn = () => wx.showLoading({ title: '加载中' }),
-        hideLoadingFn = wx.hideLoading,
-        minLoadingTime = MIN_LOADING_TIME,
+        hideLoadingFn = wx.hideLoading.bind(wx),
         ...rest
     }) {
         method = method.toUpperCase()
@@ -31,8 +27,6 @@ class TuaApi extends TuaApiCore {
             ? log(`Req Url: ${fullUrl}`)
             : log(`Req Url: ${url} \nReq Data:`, data)
 
-        const lastLoadingTime = Date.now()
-
         // 展示 loading
         isShowLoading && showLoadingFn()
 
@@ -47,11 +41,8 @@ class TuaApi extends TuaApiCore {
             header,
             method,
             complete: () => {
-                if (!isShowLoading) return
-
-                // 设置最小 loading 时间优化体验
-                const loadingTime = minLoadingTime - (Date.now() - lastLoadingTime)
-                setTimeout(hideLoadingFn, loadingTime)
+                // 同步隐藏 loading
+                isShowLoading && hideLoadingFn()
             },
         })
     }

src/constants.js

@@ -1,9 +1,6 @@
 // 支持的请求类型
 const VALID_REQ_TYPES = ['axios', 'jsonp']
 
-// 最小 loading 显示时间
-const MIN_LOADING_TIME = 500
-
 // 小程序中合法的请求方法
 const WX_VALID_METHODS = ['OPTIONS', 'GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'TRACE', 'CONNECT']
 
@@ -12,6 +9,5 @@ const DEFAULT_HEADER = { 'Content-Type': 'application/x-www-form-urlencoded' }
 export {
     DEFAULT_HEADER,
     VALID_REQ_TYPES,
-    MIN_LOADING_TIME,
     WX_VALID_METHODS,
 }