hy-app 0.6.2 → 0.6.3

package/components/hy-datetime-picker/hy-datetime-picker.vue

@@ -2,7 +2,7 @@
     <view :class="['hy-datetime-picker', customClass]" :style="customStyle">
         <view v-if="hasInput" class="hy-datetime-picker__has-input" @click="onShowByClickInput">
             <slot name="trigger" :value="inputValue">
-                <HyInput
+                <hy-input
                     v-model="inputValue"
                     :disabled="input?.disabled"
                     :disabledColor="input?.disabledColor"
@@ -17,11 +17,11 @@
                     :placeholderStyle="input?.placeholderStyle"
                     :placeholderClass="input?.placeholderClass"
                     :customStyle="Object.assign({ 'pointer-events': 'none' }, input?.customStyle)"
-                ></HyInput>
+                ></hy-input>
                 <view class="input-cover"></view>
             </slot>
         </view>
-        <HyPicker
+        <hy-picker
             :show="show || (hasInput && showByClickInput)"
             :popupMode="popupMode"
             :closeOnClickOverlay="closeOnClickOverlay"
@@ -49,7 +49,7 @@
             <template #toolbar-bottom>
                 <slot name="toolbar-bottom"></slot>
             </template>
-        </HyPicker>
+        </hy-picker>
     </view>
 </template>
 
@@ -99,7 +99,7 @@ const validModes = new Set([
 ])
 
 /**
- * @description 更新各列的值
+ * 更新各列的值
  * */
 const updateColumns = () => {
     const formatterFn = props.formatter || innerFormatter
@@ -110,7 +110,7 @@ const updateColumns = () => {
 }
 
 /**
- * @description 更新各列的值，进行补0、格式化等操作
+ * 更新各列的值，进行补0、格式化等操作
  * */
 const updateColumnValue = (value: string | number) => {
     innerValue.value = value
@@ -215,7 +215,7 @@ const times = (n: number, iteratee: Function) => {
 }
 
 /**
- * @description 关闭选择器
+ * 关闭选择器
  * */
 const close = () => {
     if (props.closeOnClickOverlay) {
@@ -227,7 +227,7 @@ const close = () => {
 }
 
 /**
- * @description 点击工具栏的取消按钮
+ * 点击工具栏的取消按钮
  * */
 const cancel = () => {
     if (props.hasInput) {
@@ -237,9 +237,25 @@ const cancel = () => {
 }
 
 /**
- * @description 点击工具栏的确定按钮
+ * 点击工具栏的确定按钮
  * */
 const confirm = () => {
+    //如果用户还没有触发过change
+    if (!innerValue.value) {
+        let arr = [0]
+        //如果有默认值&&默认值的数组长度是正确的，就用默认值
+        if (
+            Array.isArray(props.defaultIndex) &&
+            props.defaultIndex.length === columns.value.length
+        ) {
+            arr = [...props.defaultIndex]
+        } else {
+            //否则默认都选中第一个
+            arr = Array(columns.value.length).fill(0)
+        }
+        console.log(arr)
+        getInputValue(arr)
+    }
     emit('update:modelValue', innerValue.value)
     if (props.hasInput) {
         getInputValue(innerValue.value)
@@ -252,7 +268,7 @@ const confirm = () => {
 }
 
 /**
- * @description 用正则截取输出值,当出现多组数字时,抛出错误
+ * 用正则截取输出值,当出现多组数字时,抛出错误
  * */
 const intercept = (e: any, type?: string) => {
     let judge = e.match(/\d+/g)
@@ -272,7 +288,7 @@ const intercept = (e: any, type?: string) => {
 }
 
 /**
- * @description 列发生变化时触发
+ * 列发生变化时触发
  * */
 const change = (e: any) => {
     const { indexs, values } = e
@@ -315,7 +331,7 @@ const change = (e: any) => {
 }
 
 /**
- * @description 更新索引
+ * 更新索引
  * */
 const updateIndexes = (value: number | string) => {
     let values: string[] = []
@@ -375,7 +391,7 @@ const updateIndexes = (value: number | string) => {
 }
 
 /**
- * @description 获取每列数据
+ * 获取每列数据
  * */
 const getOriginColumns = () => {
     // 生成各列的值
@@ -397,7 +413,7 @@ const getOriginColumns = () => {
 }
 
 /**
- * @description 得出合法的时间
+ * 得出合法的时间
  * */
 const correctValue = (value: number | string | Date): string | number => {
     const isDateMode = props.mode !== DateModeEnum.TIME
@@ -417,7 +433,7 @@ const correctValue = (value: number | string | Date): string | number => {
     }
 }
 /**
- * @description 获取每列的最大和最小值
+ * 获取每列的最大和最小值
  * */
 const getRanges = () => {
     if (props.mode === DateModeEnum.TIME) {
@@ -470,7 +486,7 @@ const getRanges = () => {
     return arr
 }
 /**
- * @description 根据minDate、maxDate、minHour、maxHour等边界值，判断各列的开始和结束边界值
+ * 根据minDate、maxDate、minHour、maxHour等边界值，判断各列的开始和结束边界值
  * */
 const getBoundary = (type: string, innerVal: string | number) => {
     const value = new Date(innerVal)

package/components/hy-icon/hy-icon.vue

@@ -7,7 +7,7 @@
             :mode="imgMode"
             :style="[imgStyle, customStyle]"
         ></image>
-        <text v-else :class="uClasses" :style="[iconStyle, customStyle]"></text>
+        <text v-else :class="iconClass" :style="[iconStyle, customStyle]"></text>
         <!-- 这里进行空字符串判断，如果仅仅是v-if="label"，可能会出现传递0的时候，结果也无法显示 -->
         <text
             v-if="label"
@@ -41,7 +41,6 @@ import type { CSSProperties } from 'vue'
 import { addUnit } from '../../libs'
 import type { IIconEmits } from './typing'
 import iconProps from './props'
-import { onPageScroll } from '@dcloudio/uni-app'
 
 /**
  * 基于字体的图标集，包含了大多数常见场景的图标，使用简单，开箱即用，无需自己再写每个图标的样式，直接简单配置即可。支持自定义图标。
@@ -52,10 +51,10 @@ defineOptions({})
 const props = defineProps(iconProps)
 const emit = defineEmits<IIconEmits>()
 
-const uClasses = computed(() => {
+const iconClass = computed(() => {
     let classes: string | string[] = [
         'hy-icon__icon',
-        'iconfont',
+        props.customPrefix,
         `${props.customPrefix}-${props.name}`
     ]
     if (props.isRotate) classes.push('hy-rotate')
@@ -84,7 +83,7 @@ const iconStyle = computed<CSSProperties>(() => {
 })
 
 /**
- * @description 判断传入的name属性，是否图片路径，只要带有"/"均认为是图片形式
+ * 判断传入的name属性，是否图片路径，只要带有"/"均认为是图片形式
  * */
 const isImg = computed(() => {
     return props.name?.indexOf('/') !== -1
@@ -99,7 +98,7 @@ const imgStyle = computed((): CSSProperties => {
 })
 
 /**
- * @description 点击
+ * 点击icon图标执行
  * */
 const clickHandler = (e: Event) => {
     emit('click', props.index, e)

package/components/hy-toast/hy-toast.vue

@@ -18,7 +18,9 @@
             <text
                 :class="[
                     'hy-toast__content--test',
-                    !tmpConfig.icon ? `hy-toast__content--text__${tmpConfig.type}` : ''
+                    !tmpConfig.icon && !tmpConfig.loading
+                        ? `hy-toast__content--text__${tmpConfig.type}`
+                        : ''
                 ]"
             >
                 {{ tmpConfig.message }}
@@ -42,7 +44,7 @@ export default {
 import { computed, onMounted, onUnmounted, reactive, ref } from 'vue'
 import type { CSSProperties } from 'vue'
 import type ToastOptions from './typing'
-import { ColorConfig, iconName, getWindowInfo, hexToRgb } from '../../libs'
+import { ColorConfig, iconName, getWindowInfo, hexToRgb, deepMerge } from '../../libs'
 // 组件
 import HyOverlay from '../hy-overlay/hy-overlay.vue'
 import HyIcon from '../hy-icon/hy-icon.vue'
@@ -99,7 +101,7 @@ const iconNameCom = computed(() => {
 })
 
 /**
- * @description 内容盒子的样式
+ * 内容盒子的样式
  * */
 const contentStyle = computed(() => {
     const windowHeight = getWindowInfo().windowHeight,
@@ -145,13 +147,12 @@ onUnmounted(() => {
 })
 
 /**
- * @description 显示toast组件，由父组件通过xxx.show(options)形式调用
+ * 显示toast组件，由父组件通过xxx.show(options)形式调用
  * */
 const show = (options: ToastOptions) => {
-    // 不将结果合并到this.config变量，避免多次调用u-toast，前后的配置造成混乱
-    tmpConfig.value = Object.assign(config, options)
     // 清除定时器
     clearTimer()
+    tmpConfig.value = { ...config, ...options }
     isShow.value = true
     // -1时不自动关闭
     if (tmpConfig.value.duration !== -1 && !tmpConfig.value.loading) {
@@ -164,19 +165,22 @@ const show = (options: ToastOptions) => {
     }
 }
 
-// 隐藏toast组件，由父组件通过this.$refs.xxx.hide()形式调用
+/**
+ * 隐藏toast组件，由父组件通过ref形式调用
+ * */
 const hide = () => {
-    config.loading = false
     clearTimer()
 }
 /**
- * @description 清除定时任务
+ * 清除定时任务
  * */
 const clearTimer = () => {
     isShow.value = false
     // 清除定时器
     clearTimeout(timer)
     timer = null
+    // 防止后面请求还是loading状态
+    // config.loading = false
 }
 
 defineExpose({

package/libs/composables/useToast.ts

@@ -1,45 +1,45 @@
-/**
- * 消息提示hooks
- * */
-
-import type ToastOptions from "../../components/hy-toast/typing";
-import { error } from "../../libs";
-
-// 用于缓存全局唯一实例
-let toastInstance: any = null;
-
-/**
- * useToast 适用于任意页面直接调用 toast
- * 兼容 H5 + 微信小程序 + App
- */
-export const useToast = () => {
-  const show = (msg: string, opt?: ToastOptions) =>
-    openToast({ message: msg, icon: false, type: "", ...opt });
-  const info = (msg: string, opt?: ToastOptions) =>
-    openToast({ message: msg, type: "info", icon: true, ...opt });
-  const success = (msg: string, opt?: ToastOptions) =>
-    openToast({ message: msg, type: "success", icon: true, ...opt });
-  const error = (msg: string, opt?: ToastOptions) =>
-    openToast({ message: msg, type: "error", icon: true, ...opt });
-  const warning = (msg: string, opt?: ToastOptions) =>
-    openToast({ message: msg, type: "warning", icon: true, ...opt });
-  const primary = (msg: string, opt?: ToastOptions) =>
-    openToast({ message: msg, type: "primary", icon: true, ...opt });
-  const loading = (msg: string = "加载中...", opt?: ToastOptions) =>
-    openToast({ message: msg, loading: true, ...opt });
-  const close = (all?: boolean) => closeToast();
-
-  return { show, info, success, error, warning, primary, loading, close };
-};
-
-/**
- * ✅ 实现
- * 页面创建总事件，调用方法实现
- */
-const openToast = (opt: ToastOptions) => {
-  uni.$emit("__hy_toast_open__", opt);
-};
-
-const closeToast = () => {
-  uni.$emit("__hy_toast_close__");
-};
+/**
+ * 消息提示hooks
+ * */
+
+import type ToastOptions from '../../components/hy-toast/typing'
+import { error } from '../../libs'
+
+// 用于缓存全局唯一实例
+let toastInstance: any = null
+
+/**
+ * useToast 适用于任意页面直接调用 toast
+ * 兼容 H5 + 微信小程序 + App
+ */
+export const useToast = () => {
+    const show = (msg: string, opt?: ToastOptions) =>
+        openToast({ message: msg, icon: false, type: '', ...opt })
+    const info = (msg: string, opt?: ToastOptions) =>
+        openToast({ message: msg, type: 'info', icon: true, ...opt })
+    const success = (msg: string, opt?: ToastOptions) =>
+        openToast({ message: msg, type: 'success', icon: true, ...opt })
+    const error = (msg: string, opt?: ToastOptions) =>
+        openToast({ message: msg, type: 'error', icon: true, ...opt })
+    const warning = (msg: string, opt?: ToastOptions) =>
+        openToast({ message: msg, type: 'warning', icon: true, ...opt })
+    const primary = (msg: string, opt?: ToastOptions) =>
+        openToast({ message: msg, type: 'primary', icon: true, ...opt })
+    const loading = (msg: string = '加载中...', opt?: ToastOptions) =>
+        openToast({ message: msg, type: 'primary', loading: true, ...opt })
+    const close = (all?: boolean) => closeToast()
+
+    return { show, info, success, error, warning, primary, loading, close }
+}
+
+/**
+ * ✅ 实现
+ * 页面创建总事件，调用方法实现
+ */
+const openToast = (opt: ToastOptions) => {
+    uni.$emit('__hy_toast_open__', opt)
+}
+
+const closeToast = () => {
+    uni.$emit('__hy_toast_close__')
+}

package/libs/css/iconfont.css

@@ -7,8 +7,8 @@
     font-style: normal;
 }
 
-.iconfont {
-  font-family: "hy-icon" !important;
+.hy-icon {
+  font-family: "hy-icon";
   font-size: 16px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;

package/package.json

@@ -1,81 +1,81 @@
-{
-    "name": "hy-app",
-    "version": "0.6.2",
-    "description": "📱一个基于vue3+ts构建的uni-app组件库,拥有八十多个精美组件，适配多端，支持自定义主题",
-    "main": "./index.ts",
-    "private": false,
-    "scripts": {},
-    "keywords": [
-        "华玥组件库",
-        "精美ui库",
-        "移动端组件库",
-        "适配多端小程序",
-        "暗黑模式"
-    ],
-    "vetur":{
-        "tags":"./tags.json",
-        "attributes":"./attributes.json"
-    },
-    "web-types": "./web-types.json",
-    "author": "华玥作者",
-    "license": "MIT",
-    "uni_modules": {
-        "dependencies": [],
-        "encrypt": [],
-        "platforms": {
-            "cloud": {
-                "tcb": "√",
-                "aliyun": "√",
-                "alipay": "√"
-            },
-            "client": {
-                "uni-app": {
-                    "vue": {
-                        "vue2": "x",
-                        "vue3": "√"
-                    },
-                    "web": {
-                        "safari": "√",
-                        "chrome": "√"
-                    },
-                    "app": {
-                        "vue": "√",
-                        "nvue": "-",
-                        "android": "√",
-                        "ios": "√",
-                        "harmony": "√"
-                    },
-                    "mp": {
-                        "weixin": "√",
-                        "alipay": "√",
-                        "toutiao": "√",
-                        "baidu": "-",
-                        "kuaishou": "-",
-                        "jd": "-",
-                        "harmony": "√",
-                        "qq": "√",
-                        "lark": "-"
-                    },
-                    "quickapp": {
-                        "huawei": "-",
-                        "union": "-"
-                    }
-                },
-                "uni-app-x": {
-                    "web": {
-                        "safari": "-",
-                        "chrome": "-"
-                    },
-                    "app": {
-                        "android": "-",
-                        "ios": "-",
-                        "harmony": "-"
-                    },
-                    "mp": {
-                        "weixin": "-"
-                    }
-                }
-            }
-        }
-    }
-}
+{
+    "name": "hy-app",
+    "version": "0.6.3",
+    "description": "📱一个基于vue3+ts构建的uni-app组件库,拥有八十多个精美组件，适配多端，支持自定义主题",
+    "main": "./index.ts",
+    "private": false,
+    "scripts": {},
+    "keywords": [
+        "华玥组件库",
+        "精美ui库",
+        "移动端组件库",
+        "适配多端小程序",
+        "暗黑模式"
+    ],
+    "vetur": {
+        "tags": "./tags.json",
+        "attributes": "./attributes.json"
+    },
+    "web-types": "./web-types.json",
+    "author": "华玥作者",
+    "license": "MIT",
+    "uni_modules": {
+        "dependencies": [],
+        "encrypt": [],
+        "platforms": {
+            "cloud": {
+                "tcb": "√",
+                "aliyun": "√",
+                "alipay": "√"
+            },
+            "client": {
+                "uni-app": {
+                    "vue": {
+                        "vue2": "x",
+                        "vue3": "√"
+                    },
+                    "web": {
+                        "safari": "√",
+                        "chrome": "√"
+                    },
+                    "app": {
+                        "vue": "√",
+                        "nvue": "-",
+                        "android": "√",
+                        "ios": "√",
+                        "harmony": "√"
+                    },
+                    "mp": {
+                        "weixin": "√",
+                        "alipay": "√",
+                        "toutiao": "√",
+                        "baidu": "-",
+                        "kuaishou": "-",
+                        "jd": "-",
+                        "harmony": "√",
+                        "qq": "√",
+                        "lark": "-"
+                    },
+                    "quickapp": {
+                        "huawei": "-",
+                        "union": "-"
+                    }
+                },
+                "uni-app-x": {
+                    "web": {
+                        "safari": "-",
+                        "chrome": "-"
+                    },
+                    "app": {
+                        "android": "-",
+                        "ios": "-",
+                        "harmony": "-"
+                    },
+                    "mp": {
+                        "weixin": "-"
+                    }
+                }
+            }
+        }
+    }
+}