hy-app 0.4.3 → 0.4.5

package/components/index.ts

@@ -1,127 +1,126 @@
-import HyTabBr from './hy-tabBar/hy-tabBar.vue'
-import Dialog from './dialog'
+import HyTabBr from "./hy-tabBar/hy-tabBar.vue";
 // 组件库
-import HyAddressPicker from './hy-address-picker/hy-address-picker.vue'
-import HyAvatar from './hy-avatar/hy-avatar.vue'
-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 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'
-import HyCountDown from './hy-count-down/hy-count-down.vue'
-import HyCountTo from './hy-count-to/hy-count-to.vue'
-import HyDatetimePicker from './hy-datetime-picker/hy-datetime-picker.vue'
-import HyDivider from './hy-divider/hy-divider.vue'
-import HyDropdown from './hy-dropdown/hy-dropdown.vue'
-import HyDropdownItem from './hy-dropdown-item/hy-dropdown-item.vue'
-import YkEmpty from './hy-empty/hy-empty.vue'
-import YkFloatButton from './hy-float-button/hy-float-button.vue'
-import HyFoldingPanel from '@/package/components/hy-folding-panel/hy-folding-panel.vue'
-import HyForm from '@/package/components/hy-form-group/hy-form.vue'
-import HyFormSimple from '@/package/components/hy-form/hy-form-simple.vue'
-import HyFormItem from './hy-form-item/hy-form-item.vue'
-import HyGrid from './hy-grid/hy-grid.vue'
-import HyIcon from './hy-icon/hy-icon.vue'
-import HyImage from './hy-image/hy-image.vue'
-import HyInput from './hy-input/hy-input.vue'
-import HyLine from './hy-line/hy-line.vue'
-import HyLineProgress from './hy-line-progress/hy-line-progress.vue'
-import HyList from './hy-list/hy-list.vue'
-import HyLoading from './hy-loading/hy-loading.vue'
-import YkLogin from './hy-login/hy-login.vue'
-import HyModal from './hy-modal/hy-modal.vue'
-import HyNavbar from './hy-navbar/hy-navbar.vue'
-import HyNoticeBar from './hy-notice-bar/hy-notice-bar.vue'
-import HyNumberStep from './hy-number-step/hy-number-step.vue'
-import HyOverlay from './hy-overlay/hy-overlay.vue'
-import YkPrice from './hy-price/hy-price.vue'
-import HyPicker from './hy-picker/hy-picker.vue'
-import HyPopup from './hy-popup/hy-popup.vue'
-import HyQrcode from './hy-qrcode/hy-qrcode.vue'
-import HyRadio from './hy-radio/hy-radio.vue'
-import HyRate from './hy-rate/hy-rate.vue'
-import HyReadMore from './hy-read-more/hy-read-more.vue'
+import HyAddressPicker from "./hy-address-picker/hy-address-picker.vue";
+import HyAvatar from "./hy-avatar/hy-avatar.vue";
+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 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";
+import HyCountDown from "./hy-count-down/hy-count-down.vue";
+import HyCountTo from "./hy-count-to/hy-count-to.vue";
+import HyDatetimePicker from "./hy-datetime-picker/hy-datetime-picker.vue";
+import HyDivider from "./hy-divider/hy-divider.vue";
+import HyDropdown from "./hy-dropdown/hy-dropdown.vue";
+import HyDropdownItem from "./hy-dropdown-item/hy-dropdown-item.vue";
+import YkEmpty from "./hy-empty/hy-empty.vue";
+import YkFloatButton from "./hy-float-button/hy-float-button.vue";
+import HyFoldingPanel from "@/package/components/hy-folding-panel/hy-folding-panel.vue";
+import HyForm from "@/package/components/hy-form-group/hy-form.vue";
+import HyFormSimple from "@/package/components/hy-form/hy-form-simple.vue";
+import HyFormItem from "./hy-form-item/hy-form-item.vue";
+import HyGrid from "./hy-grid/hy-grid.vue";
+import HyIcon from "./hy-icon/hy-icon.vue";
+import HyImage from "./hy-image/hy-image.vue";
+import HyInput from "./hy-input/hy-input.vue";
+import HyLine from "./hy-line/hy-line.vue";
+import HyLineProgress from "./hy-line-progress/hy-line-progress.vue";
+import HyList from "./hy-list/hy-list.vue";
+import HyLoading from "./hy-loading/hy-loading.vue";
+import YkLogin from "./hy-login/hy-login.vue";
+import HyModal from "./hy-modal/hy-modal.vue";
+import HyNavbar from "./hy-navbar/hy-navbar.vue";
+import HyNoticeBar from "./hy-notice-bar/hy-notice-bar.vue";
+import HyNumberStep from "./hy-number-step/hy-number-step.vue";
+import HyOverlay from "./hy-overlay/hy-overlay.vue";
+import YkPrice from "./hy-price/hy-price.vue";
+import HyPicker from "./hy-picker/hy-picker.vue";
+import HyPopup from "./hy-popup/hy-popup.vue";
+import HyQrcode from "./hy-qrcode/hy-qrcode.vue";
+import HyRadio from "./hy-radio/hy-radio.vue";
+import HyRate from "./hy-rate/hy-rate.vue";
+import HyReadMore from "./hy-read-more/hy-read-more.vue";
 // import HySafeBottom from "./hy-safe-bottom/hy-safe-bottom.vue";
-import HyScrollList from './hy-scroll-list/hy-scroll-list.vue'
-import HySearch from './hy-search/hy-search.vue'
-import HySlider from './hy-slider/hy-slider.vue'
-import HyStatusBar from './hy-status-bar/hy-status-bar.vue'
-import HySteps from './hy-steps/hy-steps.vue'
-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 HyTag from './hy-tag/hy-tag.vue'
-import HyTextarea from './hy-textarea/hy-textarea.vue'
-import HyTooltip from './hy-tooltip/hy-tooltip.vue'
-import HyTransition from './hy-transition/hy-transition.vue'
-import HyUpload from './hy-upload/hy-upload.vue'
-import HyWarn from './hy-warn/hy-warn.vue'
+import HyScrollList from "./hy-scroll-list/hy-scroll-list.vue";
+import HySearch from "./hy-search/hy-search.vue";
+import HySlider from "./hy-slider/hy-slider.vue";
+import HyStatusBar from "./hy-status-bar/hy-status-bar.vue";
+import HySteps from "./hy-steps/hy-steps.vue";
+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 HyTag from "./hy-tag/hy-tag.vue";
+import HyTextarea from "./hy-textarea/hy-textarea.vue";
+import HyTooltip from "./hy-tooltip/hy-tooltip.vue";
+import HyTransition from "./hy-transition/hy-transition.vue";
+import HyUpload from "./hy-upload/hy-upload.vue";
+import HyWarn from "./hy-warn/hy-warn.vue";
 
 const install = (Vue: any) => {
-  Vue.component('hy-tabBar', HyTabBr)
+  Vue.component("hy-tabBar", HyTabBr);
 
-  Vue.component('HyAddressPicker', HyAddressPicker)
-  Vue.component('HyAvatar', HyAvatar)
-  Vue.component('HyBackTop', HyBackTop)
-  Vue.component('HyBadge', HyBadge)
-  Vue.component('HyButton', HyButton)
-  Vue.component('HyCard', HyCard)
-  Vue.component('HyCell', HyCell)
-  Vue.component('HyCheckButton', HyCheckButton)
-  Vue.component('HyCheckbox', HyCheckbox)
-  Vue.component('HyCountDown', HyCountDown)
-  Vue.component('HyCountTo', HyCountTo)
-  Vue.component('HyDatetimePicker', HyDatetimePicker)
-  Vue.component('HyDivider', HyDivider)
-  Vue.component('HyDropdown', HyDropdown)
-  Vue.component('HyDropdownItem', HyDropdownItem)
-  Vue.component('YkEmpty', YkEmpty)
-  Vue.component('YkFloatButton', YkFloatButton)
-  Vue.component('HyFoldingPanel', HyFoldingPanel)
-  Vue.component('HyForm', HyForm)
-  Vue.component('HyFormSimple', HyFormSimple)
-  Vue.component('HyFormItem', HyFormItem)
-  Vue.component('HyGrid', HyGrid)
-  Vue.component('HyIcon', HyIcon)
-  Vue.component('HyImage', HyImage)
-  Vue.component('HyInput', HyInput)
-  Vue.component('HyLine', HyLine)
-  Vue.component('HyLineProgress', HyLineProgress)
-  Vue.component('HyList', HyList)
-  Vue.component('HyLoading', HyLoading)
+  Vue.component("HyAddressPicker", HyAddressPicker);
+  Vue.component("HyAvatar", HyAvatar);
+  Vue.component("HyBackTop", HyBackTop);
+  Vue.component("HyBadge", HyBadge);
+  Vue.component("HyButton", HyButton);
+  Vue.component("HyCard", HyCard);
+  Vue.component("HyCell", HyCell);
+  Vue.component("HyCheckButton", HyCheckButton);
+  Vue.component("HyCheckbox", HyCheckbox);
+  Vue.component("HyCountDown", HyCountDown);
+  Vue.component("HyCountTo", HyCountTo);
+  Vue.component("HyDatetimePicker", HyDatetimePicker);
+  Vue.component("HyDivider", HyDivider);
+  Vue.component("HyDropdown", HyDropdown);
+  Vue.component("HyDropdownItem", HyDropdownItem);
+  Vue.component("YkEmpty", YkEmpty);
+  Vue.component("YkFloatButton", YkFloatButton);
+  Vue.component("HyFoldingPanel", HyFoldingPanel);
+  Vue.component("HyForm", HyForm);
+  Vue.component("HyFormSimple", HyFormSimple);
+  Vue.component("HyFormItem", HyFormItem);
+  Vue.component("HyGrid", HyGrid);
+  Vue.component("HyIcon", HyIcon);
+  Vue.component("HyImage", HyImage);
+  Vue.component("HyInput", HyInput);
+  Vue.component("HyLine", HyLine);
+  Vue.component("HyLineProgress", HyLineProgress);
+  Vue.component("HyList", HyList);
+  Vue.component("HyLoading", HyLoading);
   // Vue.component("YkLogin", YkLogin);
-  Vue.component('HyModal', HyModal)
-  Vue.component('HyNavbar', HyNavbar)
-  Vue.component('HyNoticeBar', HyNoticeBar)
-  Vue.component('HyNumberStep', HyNumberStep)
-  Vue.component('HyOverlay', HyOverlay)
-  Vue.component('YkPrice', YkPrice)
-  Vue.component('HyPicker', HyPicker)
-  Vue.component('HyPopup', HyPopup)
-  Vue.component('HyQrcode', HyQrcode)
-  Vue.component('HyRadio', HyRadio)
-  Vue.component('HyRate', HyRate)
-  Vue.component('HyReadMore', HyReadMore)
-  Vue.component('HyScrollList', HyScrollList)
-  Vue.component('HySearch', HySearch)
-  Vue.component('HySlider', HySlider)
-  Vue.component('HyStatusBar', HyStatusBar)
-  Vue.component('HySteps', HySteps)
-  Vue.component('HySubsection', HySubsection)
-  Vue.component('HySwiper', HySwiper)
-  Vue.component('HySwitch', HySwitch)
-  Vue.component('HyTabs', HyTabs)
-  Vue.component('HyTag', HyTag)
-  Vue.component('HyTextarea', HyTextarea)
-  Vue.component('HyTooltip', HyTooltip)
-  Vue.component('HyTransition', HyTransition)
-  Vue.component('HyUpload', HyUpload)
-  Vue.component('HyWarn', HyWarn)
+  Vue.component("HyModal", HyModal);
+  Vue.component("HyNavbar", HyNavbar);
+  Vue.component("HyNoticeBar", HyNoticeBar);
+  Vue.component("HyNumberStep", HyNumberStep);
+  Vue.component("HyOverlay", HyOverlay);
+  Vue.component("YkPrice", YkPrice);
+  Vue.component("HyPicker", HyPicker);
+  Vue.component("HyPopup", HyPopup);
+  Vue.component("HyQrcode", HyQrcode);
+  Vue.component("HyRadio", HyRadio);
+  Vue.component("HyRate", HyRate);
+  Vue.component("HyReadMore", HyReadMore);
+  Vue.component("HyScrollList", HyScrollList);
+  Vue.component("HySearch", HySearch);
+  Vue.component("HySlider", HySlider);
+  Vue.component("HyStatusBar", HyStatusBar);
+  Vue.component("HySteps", HySteps);
+  Vue.component("HySubsection", HySubsection);
+  Vue.component("HySwiper", HySwiper);
+  Vue.component("HySwitch", HySwitch);
+  Vue.component("HyTabs", HyTabs);
+  Vue.component("HyTag", HyTag);
+  Vue.component("HyTextarea", HyTextarea);
+  Vue.component("HyTooltip", HyTooltip);
+  Vue.component("HyTransition", HyTransition);
+  Vue.component("HyUpload", HyUpload);
+  Vue.component("HyWarn", HyWarn);
   // Vue.config.globalProperties.$dialog = myDialog;
-}
+};
 export {
   install,
   HyAddressPicker,
@@ -181,4 +180,4 @@ export {
   HyTransition,
   HyUpload,
   HyWarn,
-}
+};

package/index.ts

@@ -1,7 +1 @@
-export * from "./common";
-export * from "./utils";
-export * from "./global";
-export * from "./typing";
-export * from "./api";
-export * from "./config";
-export * from "./composables";
+export * from "./libs";

package/{api → libs/api}/http.ts

@@ -1,5 +1,5 @@
-import type { HttpRequestConfig } from "../typing";
-import { objectToUrlParams } from "../utils";
+import type { HttpRequestConfig } from "../../libs/typing";
+import { objectToUrlParams } from "../../libs";
 
 export default class Http {
   /**

package/libs/common/index.ts

@@ -0,0 +1,2 @@
+export * from "./versionControl";
+export * from "./queue";

package/libs/common/queue.ts

@@ -0,0 +1,28 @@
+/**
+ * 互相关闭
+ * */
+let queue: any[] = [];
+
+export function pushToQueue(comp: any) {
+  queue.push(comp);
+}
+
+export function removeFromQueue(comp: any) {
+  queue = queue.filter((item) => {
+    return item.$.uid !== comp.$.uid;
+  });
+}
+
+export function closeOther(comp: any) {
+  queue.forEach((item) => {
+    if (item.$.uid !== comp.$.uid) {
+      item.$.exposed.close();
+    }
+  });
+}
+
+export function closeOutside() {
+  queue.forEach((item) => {
+    item.$.exposed.close();
+  });
+}

package/{composables → libs/composables}/index.ts

@@ -3,3 +3,4 @@ export * from "./useTouch";
 export * from "./usePopover";
 export * from "./useQueue";
 export * from "./useToast";
+export * from "./useShakeService";

package/{composables → libs/composables}/usePopover.ts

@@ -1,7 +1,11 @@
+/**
+ * 气泡组件hooks
+ * */
+
 import { getCurrentInstance, ref } from "vue";
 import type { CSSProperties } from "vue";
-import { getRect, isObject } from "../utils";
-import type { IOffset, IPlacementVo } from "../components/hy-popover/typing";
+import { getRect, isObject } from "../../libs";
+import type { IOffset, IPlacementVo } from "../../components/hy-popover/typing";
 
 export function usePopover(visibleArrow = true) {
   const instance = getCurrentInstance();
@@ -89,6 +93,7 @@ export function usePopover(visibleArrow = true) {
         (horizontalY - 17 > 0 ? 0 : horizontalY - 25) +
         (offset[1] ? offset[1] : offset[0]);
     } else if (isObject(offset)) {
+      offset = offset as Record<"x" | "y", number>;
       offsetX = (verticalX - 17 > 0 ? 0 : verticalX - 25) + offset.x;
       offsetY = (horizontalY - 17 > 0 ? 0 : horizontalY - 25) + offset.y;
     } else {

package/{common/shakeService.ts → libs/composables/useShakeService.ts}

@@ -1,7 +1,9 @@
-// src/composables/useShakeService.ts
+/**
+ * 摇一摇传感器hooks
+ * */
 import { ref } from "vue";
 import type { Ref } from "vue";
-import { debounce } from "../utils";
+import { debounce } from "../../libs";
 
 interface Acceleration {
   x: number;

package/{composables → libs/composables}/useShare.ts

@@ -1,3 +1,6 @@
+/**
+ * 全局分享hooks
+ * */
 interface ShareConfig {
   title?: string;
   path?: string;

package/libs/composables/useToast.ts

@@ -0,0 +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, ...opt });
+  const info = (msg: string, opt?: ToastOptions) =>
+    openToast({ message: msg, type: "info", ...opt });
+  const success = (msg: string, opt?: ToastOptions) =>
+    openToast({ message: msg, type: "success", ...opt });
+  const error = (msg: string, opt?: ToastOptions) =>
+    openToast({ message: msg, type: "error", ...opt });
+  const warning = (msg: string, opt?: ToastOptions) =>
+    openToast({ message: msg, type: "warning", ...opt });
+  const primary = (msg: string, opt?: ToastOptions) =>
+    openToast({ message: msg, type: "primary", ...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__");
+};

package/{composables → libs/composables}/useTouch.ts

@@ -1,3 +1,6 @@
+/**
+ * 滑动hooks
+ * */
 import { ref } from "vue";
 
 export function useTouch() {

package/{global → libs/global}/register-properties.ts

@@ -1,5 +1,5 @@
 import type { App } from "vue";
-import { addUnit, bytesToSize, formatTime, random } from "../utils";
+import { addUnit, bytesToSize, formatTime, random } from "../../libs";
 export default function registerProperties(app: App) {
   app.config.globalProperties.$hy = {
     /**

package/libs/index.ts

@@ -0,0 +1,7 @@
+export * from "./common";
+export * from "./utils";
+export * from "./global";
+export * from "./typing";
+export * from "./api";
+export * from "./config";
+export * from "./composables";

package/{typing → libs/typing}/index.ts

@@ -1,5 +1,4 @@
 export * from "./modules/form";
-export * from "./modules/dialog";
 export * from "./modules/http";
 export * from "./modules/enum";
 export * from "./modules/rect";

package/{typing → libs/typing}/modules/form.ts

@@ -1,11 +1,11 @@
 import type { DateModeEnum } from "./enum";
-import type { CheckboxColumnsVo } from "../../components/hy-check-button/typing";
-import type HyInputProps from "../../components/hy-input/typing";
-import type HyTextareaProps from "../../components/hy-textarea/typing";
-import type HySwitchProps from "../../components/hy-switch/typing";
-import type HyPickerProps from "../../components/hy-picker/typing";
-import type HyRadioProps from "../../components/hy-radio/typing";
-import type HyCheckButtonProps from "../../components/hy-check-button/typing";
+import type { CheckboxColumnsVo } from "../../../components/hy-check-button/typing";
+import type HyInputProps from "../../../components/hy-input/typing";
+import type HyTextareaProps from "../../../components/hy-textarea/typing";
+import type HySwitchProps from "../../../components/hy-switch/typing";
+import type HyPickerProps from "../../../components/hy-picker/typing";
+import type HyRadioProps from "../../../components/hy-radio/typing";
+import type HyCheckButtonProps from "../../../components/hy-check-button/typing";
 
 /**
  * 类型

package/{utils → libs/utils}/utils.ts

@@ -74,6 +74,7 @@ const padZero = (value: string | number): string => {
  * @returns {String}
  */
 const addZero = (value: string | number, length: number): string => {
+  if (value === undefined || value === null) return "";
   let val = value.toString();
   if (length > val.length) {
     val += "0".repeat(length - val.length);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hy-app",
-  "version": "0.4.3",
-  "description": "fix: 使用hooks触发toast显示提示消息",
+  "version": "0.4.5",
+  "description": "fix: 修复toast在支付小程序获取不到ref问题",
   "main": "./index.ts",
   "private": false,
   "scripts": {},

package/common/index.ts

@@ -1,3 +0,0 @@
-export * from './versionControl'
-export * from './shakeService'
-export * from './queue'

package/common/queue.ts

@@ -1,34 +0,0 @@
-/*
- * @Author: weisheng
- * @Date: 2023-07-02 22:51:06
- * @LastEditTime: 2024-03-16 19:59:07
- * @LastEditors: weisheng
- * @Description:
- * @FilePath: /wot-design-uni/src/uni_modules/wot-design-uni/components/common/clickoutside.ts
- * 记得注释
- */
-let queue: any[] = []
-
-export function pushToQueue(comp: any) {
-  queue.push(comp)
-}
-
-export function removeFromQueue(comp: any) {
-  queue = queue.filter((item) => {
-    return item.$.uid !== comp.$.uid
-  })
-}
-
-export function closeOther(comp: any) {
-  queue.forEach((item) => {
-    if (item.$.uid !== comp.$.uid) {
-      item.$.exposed.close()
-    }
-  })
-}
-
-export function closeOutside() {
-  queue.forEach((item) => {
-    item.$.exposed.close()
-  })
-}