hy-app 0.6.9 → 0.7.1

package/components/index.ts

@@ -6,6 +6,7 @@ import HyBackTop from './hy-back-top/hy-back-top.vue'
 import HyBadge from './hy-badge/hy-badge.vue'
 import HyButton from './hy-button/hy-button.vue'
 import HyCard from './hy-card/hy-card.vue'
+import HyCascader from './hy-cascader/hy-cascader.vue'
 import HyCell from './hy-cell/hy-cell.vue'
 import HyCheckButton from './hy-check-button/hy-check-button.vue'
 import HyCheckbox from './hy-checkbox/hy-checkbox.vue'
@@ -52,6 +53,7 @@ import HySubsection from './hy-subsection/hy-subsection.vue'
 import HySwiper from './hy-swiper/hy-swiper.vue'
 import HySwitch from './hy-switch/hy-switch.vue'
 import HyTabs from './hy-tabs/hy-tabs.vue'
+import HyKeyboard from './hy-keyboard/hy-keyboard.vue'
 import HyTag from './hy-tag/hy-tag.vue'
 import HyTextarea from './hy-textarea/hy-textarea.vue'
 import HyTooltip from './hy-tooltip/hy-tooltip.vue'
@@ -68,6 +70,7 @@ const install = (Vue: any) => {
     Vue.component('HyBadge', HyBadge)
     Vue.component('HyButton', HyButton)
     Vue.component('HyCard', HyCard)
+    Vue.component('HyCascader', HyCascader)
     Vue.component('HyCell', HyCell)
     Vue.component('HyCheckButton', HyCheckButton)
     Vue.component('HyCheckbox', HyCheckbox)
@@ -113,6 +116,7 @@ const install = (Vue: any) => {
     Vue.component('HySwiper', HySwiper)
     Vue.component('HySwitch', HySwitch)
     Vue.component('HyTabs', HyTabs)
+    Vue.component('HyKeyboard', HyKeyboard)
     Vue.component('HyTag', HyTag)
     Vue.component('HyTextarea', HyTextarea)
     Vue.component('HyTooltip', HyTooltip)
@@ -129,6 +133,7 @@ export {
     HyBadge,
     HyButton,
     HyCard,
+    HyCascader,
     HyCell,
     HyCheckButton,
     HyCheckbox,
@@ -174,6 +179,7 @@ export {
     HySwiper,
     HySwitch,
     HyTabs,
+    HyKeyboard,
     HyTag,
     HyTextarea,
     HyTooltip,

package/global.d.ts

@@ -9,6 +9,7 @@ declare module 'vue' {
         HyButton: (typeof import('./components/hy-button/hy-button.vue'))['default']
         HyCalendar: (typeof import('./components/hy-calendar/hy-calendar.vue'))['default']
         HyCard: (typeof import('./components/hy-card/hy-card.vue'))['default']
+        HyCascader: (typeof import('./components/hy-cascader/hy-cascader.vue'))['default']
         HyCell: (typeof import('./components/hy-cell/hy-cell.vue'))['default']
         HyCellItem: (typeof import('./components/hy-cell-item/hy-cell-item.vue'))['default']
         HyCheckButton: (typeof import('./components/hy-check-button/hy-check-button.vue'))['default']
@@ -38,6 +39,7 @@ declare module 'vue' {
         HyImage: (typeof import('./components/hy-image/hy-image.vue'))['default']
         HyIndexBar: (typeof import('./components/hy-index-bar/hy-index-bar.vue'))['default']
         HyInput: (typeof import('./components/hy-input/hy-input.vue'))['default']
+        HyKeyboard: (typeof import('./components/hy-keyboard/hy-keyboard.vue'))['default']
         HyLine: (typeof import('./components/hy-line/hy-line.vue'))['default']
         HyLineProgress: (typeof import('./components/hy-line-progress/hy-line-progress.vue'))['default']
         HyList: (typeof import('./components/hy-list/hy-list.vue'))['default']

package/libs/api/http.ts

@@ -1,119 +1,122 @@
-import { objectToUrlParams } from '../../libs'
-
-export class Http {
-    /**
-     * 默认请求配置
-     */
-    config: HyHttps.HttpRequestConfig = {
-        baseURL: '',
-        url: '',
-        data: {},
-        dataType: 'json',
-        header: {},
-        method: 'POST',
-        responseType: 'text',
-        timeout: 10000
-    }
-
-    /* 私有回调槽 */
-    private _requestHook?: (conf: UniNamespace.RequestOptions) => UniNamespace.RequestOptions
-    private _responseSuccessHook?: (res: UniNamespace.RequestSuccessCallbackResult) => any
-    private _responseFailHook?: (err: UniNamespace.GeneralCallbackResult) => any
-
-    /**
-     * @description 拦截器
-     */
-    interceptor = {
-        /**
-         * @description 请求拦截 请求配置
-         * @param hook
-         */
-        request: (hook: (conf: UniNamespace.RequestOptions) => UniNamespace.RequestOptions) => {
-            this._requestHook = hook
-        },
-        /**
-         * @description 响应拦截
-         * @param success 成功响应
-         * @param fail 失败响应
-         */
-        response: (
-            success?: (response: UniNamespace.RequestSuccessCallbackResult) => any,
-            fail?: (error: UniNamespace.GeneralCallbackResult) => any
-        ) => {
-            if (success) {
-                this._responseSuccessHook = success
-            }
-            if (fail) {
-                this._responseFailHook = fail
-            }
-        }
-    }
-
-    /**
-     * @description 请求拦截
-     * @param conf 请求配置
-     */
-    private requestBefore(conf: UniNamespace.RequestOptions): UniNamespace.RequestOptions {
-        return this._requestHook ? this._requestHook(conf) : conf
-    }
-
-    /**
-     * @description uni异步请求
-     * @param options 请求配置
-     */
-    async request<T = any>(options: UniNamespace.RequestOptions): Promise<T> {
-        options.url = this.config.baseURL + options.url || this.config.url
-        options.data = options.data || this.config.data
-        options.header = options.header || this.config.header
-        options.method = options.method || this.config.method
-        options.responseType = options.responseType || this.config.responseType
-        options.timeout = options.timeout || this.config.timeout
-        /* 合并默认配置 ... */
-        return new Promise((resolve, reject) => {
-            options = this.requestBefore(options) // ⭐这里会调用钩子
-            uni.request({
-                ...options,
-                success: (res: UniNamespace.RequestSuccessCallbackResult) => {
-                    const after = this._responseSuccessHook ? this._responseSuccessHook(res) : res
-                    resolve(after)
-                },
-                fail: (err: UniNamespace.GeneralCallbackResult) => {
-                    const after = this._responseFailHook ? this._responseFailHook(err) : err
-                    reject(after)
-                }
-            })
-        })
-    }
-
-    /**
-     * post请求
-     * @param url 请求地址
-     * @param params 请求JSON参数
-     * @param options 请求配置
-     */
-    post<T = any>(url: string, params?: any, options?: HyHttps.HttpRequestConfig): Promise<T> {
-        return this.request({
-            url: url,
-            method: 'POST',
-            data: params,
-            ...options
-        })
-    }
-
-    /**
-     * get请求
-     * @param url 请求地址
-     * @param params URL查询参数
-     * @param options 请求配置
-     */
-    get<T = any>(url: string, params?: any, options?: HyHttps.HttpRequestConfig): Promise<T> {
-        if (params) {
-            url += '?' + objectToUrlParams(params)
-        }
-        return this.request({
-            url: url,
-            method: 'GET',
-            ...options
-        })
-    }
-}
+import { objectToUrlParams } from '../../libs'
+
+export class Http {
+    /**
+     * 默认请求配置
+     */
+    config: HyHttps.HttpRequestConfig = {
+        baseURL: '',
+        url: '',
+        data: {},
+        dataType: 'json',
+        header: {},
+        method: 'POST',
+        responseType: 'text',
+        timeout: 10000
+    }
+
+    /* 私有回调槽 */
+    private _requestHook?: (conf: UniNamespace.RequestOptions) => UniNamespace.RequestOptions
+    private _responseSuccessHook?: (res: UniNamespace.RequestSuccessCallbackResult) => any
+    private _responseFailHook?: (err: UniNamespace.GeneralCallbackResult) => any
+
+    /**
+     * @description 拦截器
+     */
+    interceptor = {
+        /**
+         * @description 请求拦截 请求配置
+         * @param hook
+         */
+        request: (hook: (conf: UniNamespace.RequestOptions) => UniNamespace.RequestOptions) => {
+            this._requestHook = hook
+        },
+        /**
+         * @description 响应拦截
+         * @param success 成功响应
+         * @param fail 失败响应
+         */
+        response: (
+            success?: (response: UniNamespace.RequestSuccessCallbackResult) => any,
+            fail?: (error: UniNamespace.GeneralCallbackResult) => any
+        ) => {
+            if (success) {
+                this._responseSuccessHook = success
+            }
+            if (fail) {
+                this._responseFailHook = fail
+            }
+        }
+    }
+
+    /**
+     * @description 请求拦截
+     * @param conf 请求配置
+     */
+    private requestBefore(conf: UniNamespace.RequestOptions): UniNamespace.RequestOptions {
+        return this._requestHook ? this._requestHook(conf) : conf
+    }
+
+    /**
+     * @description uni异步请求
+     * @param options 请求配置
+     */
+    async request<T = any>(options: UniNamespace.RequestOptions): Promise<T> {
+        options.url =
+            options.url && /^https?:\/\//.test(options.url)
+                ? options.url
+                : this.config.baseURL + options.url
+        options.data = options.data || this.config.data
+        options.header = options.header || this.config.header
+        options.method = options.method || this.config.method
+        options.responseType = options.responseType || this.config.responseType
+        options.timeout = options.timeout || this.config.timeout
+        /* 合并默认配置 ... */
+        return new Promise((resolve, reject) => {
+            options = this.requestBefore(options) // ⭐这里会调用钩子
+            uni.request({
+                ...options,
+                success: (res: UniNamespace.RequestSuccessCallbackResult) => {
+                    const after = this._responseSuccessHook ? this._responseSuccessHook(res) : res
+                    resolve(after)
+                },
+                fail: (err: UniNamespace.GeneralCallbackResult) => {
+                    const after = this._responseFailHook ? this._responseFailHook(err) : err
+                    reject(after)
+                }
+            })
+        })
+    }
+
+    /**
+     * post请求
+     * @param url 请求地址
+     * @param params 请求JSON参数
+     * @param options 请求配置
+     */
+    post<T = any>(url: string, params?: any, options?: HyHttps.HttpRequestConfig): Promise<T> {
+        return this.request({
+            url: url,
+            method: 'POST',
+            data: params,
+            ...options
+        })
+    }
+
+    /**
+     * get请求
+     * @param url 请求地址
+     * @param params URL查询参数
+     * @param options 请求配置
+     */
+    get<T = any>(url: string, params?: any, options?: HyHttps.HttpRequestConfig): Promise<T> {
+        if (params) {
+            url += '?' + objectToUrlParams(params)
+        }
+        return this.request({
+            url: url,
+            method: 'GET',
+            ...options
+        })
+    }
+}