hy-app 0.1.3 → 0.1.5

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

@@ -3,18 +3,27 @@
     <view
       v-if="hasInput"
       class="u-datetime-picker__has-input"
-      @click="onShowByClickInput"
+      @tap="onShowByClickInput"
     >
       <slot name="trigger" :value="inputValue">
         <HyInput
-          :placeholder="placeholder"
-          :readonly="true"
           v-model="inputValue"
-          :disabled="disabled"
-          :shape="shape"
-          :border="border"
-          :disabledColor="disabledColor"
-          :customStyle="customStyle"
+          :readonly="true"
+          :disabled="input?.disabled"
+          :disabledColor="input?.disabledColor"
+          :shape="input?.shape"
+          :border="input?.border"
+          :prefixIcon="input?.prefixIcon"
+          :suffixIcon="input?.suffixIcon"
+          :color="input?.color"
+          :fontSize="input?.fontSize"
+          :inputAlign="input?.inputAlign"
+          :placeholder="input?.placeholder || '请选择地址'"
+          :placeholderStyle="input?.placeholderStyle"
+          :placeholderClass="input?.placeholderClass"
+          :customStyle="
+            Object.assign({ 'pointer-events': 'none' }, input?.customStyle)
+          "
         ></HyInput>
         <view class="input-cover"></view>
       </slot>
@@ -64,7 +73,7 @@ import HyInput from "../hy-input/hy-input.vue";
 import HyPicker from "../hy-picker/hy-picker.vue";
 
 const props = withDefaults(defineProps<IProps>(), defaultProps);
-const { show, modelValue, hasInput, disabled, separator, closeOnClickOverlay } =
+const { show, modelValue, hasInput, input, separator, closeOnClickOverlay } =
   toRefs(props);
 const emit = defineEmits([
   "close",
@@ -223,7 +232,8 @@ const change = (e: any) => {
 };
 
 const onShowByClickInput = () => {
-  if (!disabled.value) {
+  console.log(input.value?.disabled);
+  if (!input.value?.disabled) {
     showByClickInput.value = !showByClickInput.value;
   }
 };

package/components/hy-address-picker/props.ts

@@ -16,10 +16,8 @@ const defaultProps: IProps = {
   visibleItemCount: 5,
   closeOnClickOverlay: false,
   defaultIndex: [],
-  disabled: false,
   hasInput: false,
-  placeholder: "请选择地址",
-  disabledColor: "#F5F5F5",
+  input: {},
   toolbarRightSlot: false,
 };
 

package/components/hy-address-picker/typing.d.ts

@@ -1,6 +1,7 @@
 import type { CSSProperties } from "vue";
+import type HyInputProps from "../hy-input/typing";
 
-export default interface IProps {
+export default interface HyAddressPickerProps {
   /**
    * @description 用于控制选择器的弹出和收起 ( 默认 false )
    * */
@@ -62,22 +63,14 @@ export default interface IProps {
    * @note 类型有问题,需要调整
    * */
   defaultIndex?: Array<any>;
-  /**
-   * @description 是否禁用输入框 ( 默认 false )
-   * */
-  disabled?: boolean;
   /**
    * @description 输入框是否显示边框 ( 默认 false )
    * */
   hasInput?: boolean;
   /**
-   * @description 输入框提示信息
-   * */
-  placeholder?: string;
-  /**
-   * @description 禁用时候输入框颜色
+   * @description 输入框集合属性
    * */
-  disabledColor?: string;
+  input?: Partial<HyInputProps>;
   /**
    * @description 右边插槽
    * */

package/components/hy-avatar/typing.d.ts

@@ -1,6 +1,6 @@
 import type { CSSProperties } from "vue";
 
-export default interface IProps {
+export default interface HyAvatarProps {
   /**
    * @description 头像路径，如加载失败，将会显示默认头像(不能为相对路径)
    * */

package/components/hy-back-top/hy-back-top.vue

@@ -2,7 +2,20 @@
   <HyTransition mode="fade" :customStyle="backTopStyle" :show="show">
     <slot>
       <view class="hy-back-top" :style="contentStyle" @click="backToTop">
-        <HyIcon :name="icon" :custom-style="iconStyle"></HyIcon>
+        <HyIcon
+          :name="icon?.name || IconConfig.DOWNLOAD"
+          :color="icon?.color"
+          :size="icon?.size"
+          :bold="icon?.bold"
+          :customPrefix="icon?.customPrefix"
+          :imgMode="icon?.imgMode"
+          :width="icon?.width"
+          :height="icon?.height"
+          :top="icon?.top"
+          :stop="icon?.stop"
+          :round="icon?.round"
+          :customStyle="icon?.customStyle"
+        ></HyIcon>
         <text v-if="text" class="hy-back-top__text">{{ text }}</text>
       </view>
     </slot>
@@ -17,6 +30,7 @@ import type IProps from "./typing";
 import HyTransition from "../hy-transition/hy-transition.vue";
 import HyIcon from "../hy-icon/hy-icon.vue";
 import { addUnit, getPx } from "../../utils";
+import { IconConfig } from "@/package";
 
 const props = withDefaults(defineProps<IProps>(), defaultProps);
 const { customStyle, duration, mode, bottom, right, top, scrollTop } =

package/components/hy-back-top/props.ts

@@ -1,9 +1,8 @@
 import type IProps from "./typing";
-import { IconConfig } from "../../config";
 
 const defaultProps: IProps = {
   mode: "circle",
-  icon: IconConfig.DOWNLOAD,
+  icon: {},
   text: "",
   duration: 500,
   scrollTop: 0,
@@ -11,10 +10,6 @@ const defaultProps: IProps = {
   bottom: 100,
   right: 20,
   zIndex: 888,
-  iconStyle: {
-    color: "#909399",
-    fontSize: "19px",
-  },
   customStyle: {
     transform: "rotate(180deg)",
   },

package/components/hy-back-top/typing.d.ts

@@ -1,14 +1,15 @@
 import type { CSSProperties } from "vue";
+import type HyIconProps from "../hy-icon/typing";
 
-export default interface IProps {
+export default interface HyBackTopProps {
   /**
    * @description 返回顶部的形状，circle-圆形，square-方形 （默认 'circle' ）
    * */
   mode?: HyApp.ShapeType;
   /**
-   * @description 自定义图标 （默认 'arrow-upward' ） 见官方文档示例
+   * @description 自定义图标属性集合
    * */
-  icon?: string;
+  icon?: Partial<HyIconProps>;
   /**
    * @description 提示文字
    * */
@@ -37,10 +38,6 @@ export default interface IProps {
    * @description 层级   （默认 888 ）
    * */
   zIndex?: number;
-  /**
-   * @description 图标的样式，对象形式   （默认 {color: '#909399',fontSize: '19px'}）
-   * */
-  iconStyle?: CSSProperties;
   /**
    * @description 定义需要用到的外部样式（默认{transform: "rotate(180deg)"}）
    * */

package/components/hy-badge/typing.d.ts

@@ -1,6 +1,6 @@
 import type { CSSProperties } from "vue";
 
-export default interface IProps {
+export default interface HyBadgeProps {
   /**
    * @description 是否显示圆点 （默认 false ）
    * */

package/components/hy-button/hy-button.vue

@@ -27,13 +27,11 @@
     :class="bemClass"
   >
     <template v-if="loading">
-      <HyIcon
+      <HyLoading
         :mode="loadingMode"
-        :is-rotate="true"
-        :name="IconConfig.LOADING"
         :size="loadingSize"
         :color="loadingColor"
-      ></HyIcon>
+      ></HyLoading>
       <text
         class="hy-button__loading-text"
         :style="[{ fontSize: textSize + 'px' }]"
@@ -42,11 +40,19 @@
     </template>
     <template v-else>
       <HyIcon
-        v-if="icon"
-        :name="icon"
+        v-if="icon?.name"
+        :name="icon?.name"
         :color="iconColorCom"
-        :size="textSize * 1.35"
-        :customStyle="{ marginRight: '2px' }"
+        :size="icon?.size || textSize * 1.35"
+        :bold="icon?.bold"
+        :customPrefix="icon?.customPrefix"
+        :imgMode="icon?.imgMode"
+        :width="icon?.width"
+        :height="icon?.height"
+        :top="icon?.top"
+        :stop="icon?.stop"
+        :round="icon?.round"
+        :customStyle="icon?.customStyle || { marginRight: '2px' }"
       ></HyIcon>
       <slot>
         <text
@@ -76,11 +82,11 @@
     :style="[baseColor, customStyle]"
   >
     <template v-if="loading">
-      <up-loading-icon
+      <HyLoading
         :mode="loadingMode"
-        :size="loadingSize * 1.15"
+        :size="loadingSize"
         :color="loadingColor"
-      ></up-loading-icon>
+      ></HyLoading>
       <text
         class="hy-button__loading-text"
         :style="[nvueTextStyle]"
@@ -90,10 +96,19 @@
     </template>
     <template v-else>
       <HyIcon
-        v-if="icon"
-        :name="icon"
+        v-if="icon?.name"
+        :name="icon?.name"
         :color="iconColorCom"
-        :size="textSize * 1.35"
+        :size="icon?.size || textSize * 1.35"
+        :bold="icon?.bold"
+        :customPrefix="icon?.customPrefix"
+        :imgMode="icon?.imgMode"
+        :width="icon?.width"
+        :height="icon?.height"
+        :top="icon?.top"
+        :stop="icon?.stop"
+        :round="icon?.round"
+        :customStyle="icon?.customStyle || { marginRight: '2px' }"
       ></HyIcon>
       <text
         class="hy-button__text"
@@ -115,10 +130,13 @@
 import { computed, type CSSProperties, toRefs } from "vue";
 import { bem, throttle } from "../../utils";
 import defaultProps from "./props";
-import { ColorConfig, IconConfig } from "../../config";
-import HyIcon from "../hy-icon/hy-icon.vue";
+import { ColorConfig } from "../../config";
 import type IProps from "./typing";
 
+// 组件
+import HyIcon from "../hy-icon/hy-icon.vue";
+import HyLoading from "../hy-loading/hy-loading.vue";
+
 const props = withDefaults(defineProps<IProps>(), defaultProps);
 const {
   disabled,
@@ -129,7 +147,7 @@ const {
   type,
   plain,
   color,
-  iconColor,
+  icon,
 } = toRefs(props);
 const emit = defineEmits([
   "click",
@@ -180,7 +198,7 @@ const loadingColor = computed(() => {
 const iconColorCom = computed((): string => {
   // 如果是镂空状态，设置了color就用color值，否则使用主题颜色，
   // u-icon的color能接受一个主题颜色的值
-  if (iconColor.value) return iconColor.value;
+  if (icon.value?.color) return icon.value?.color;
   if (plain.value) {
     return color.value ? color.value : textColor;
   } else {

package/components/hy-button/props.ts

@@ -26,8 +26,7 @@ const defaultProps: IProps = {
   hoverStartTime: 0,
   hoverStayTime: 200,
   text: "",
-  icon: "",
-  iconColor: "",
+  icon: {},
   color: "",
   stop: true,
 };

package/components/hy-button/typing.d.ts

@@ -1,6 +1,7 @@
 import type { CSSProperties } from "vue";
+import type HyIconProps from "../hy-icon/typing";
 
-export default interface IProps {
+export default interface HyButtonProps {
   /**
    * @description 是否显示按钮的细边框 (默认 true )
    * */
@@ -36,7 +37,7 @@ export default interface IProps {
   /**
    * @description 加载状态图标类型 （默认 'spinner' ）
    * */
-  loadingMode?: "spinner" | "text";
+  loadingMode?: HyApp.LoadingMode;
   /**
    * @description 加载图标大小 （默认 13 ）
    * */
@@ -102,13 +103,9 @@ export default interface IProps {
    * */
   text?: string;
   /**
-   * @description 按钮图标
+   * @description 按钮图标api集合
    * */
-  icon?: string | HyIconConfig;
-  /**
-   * @description 按钮图标颜色
-   * */
-  iconColor?: string;
+  icon?: Partial<HyIconProps>;
   /**
    * @description 按钮颜色，支持传入linear-gradient渐变色
    * */

package/components/hy-calendar/typing.d.ts

@@ -1,4 +1,4 @@
-export default interface IProps {
+export default interface HyCalendarProps {
   /**
    * @description 是否显示日历弹窗 (默认 false )
    * */

package/components/hy-card/typing.d.ts

@@ -1,6 +1,6 @@
 import type { CSSProperties } from "vue";
 
-export default interface IProps {
+export default interface HyCardProps {
   /**
    * @description 卡片与屏幕两侧是否留空隙（默认false）
    * */

package/components/hy-cell/hy-cell.vue

@@ -31,8 +31,19 @@
                 <slot name="icon" :icon="item?.icon">
                   <HyIcon
                     :size="iconSize"
-                    :name="item?.icon"
-                    :color="disabled || item?.disabled ? '#c0c0c0' : ''"
+                    :name="item?.icon?.name"
+                    :color="
+                      disabled || item?.disabled ? '#c0c0c0' : item?.icon?.color
+                    "
+                    :bold="item?.icon?.bold"
+                    :customPrefix="item?.icon?.customPrefix"
+                    :imgMode="item?.icon?.imgMode"
+                    :width="item?.icon?.width"
+                    :height="item?.icon?.height"
+                    :top="item?.icon?.top"
+                    :stop="item?.icon?.stop"
+                    :round="item?.icon?.round"
+                    :customStyle="item?.icon?.customStyle"
                   ></HyIcon>
                 </slot>
               </view>
@@ -86,10 +97,27 @@
             >
               <slot name="right-icon" :icon="item?.rightIcon || rightIcon">
                 <HyIcon
-                  :name="item?.rightIcon || rightIcon"
-                  :custom-style="rightIconStyle"
-                  :color="disabled || item?.disabled ? '#c0c0c0' : 'info'"
-                  :size="iconSize"
+                  :name="
+                    item?.rightIcon?.name || rightIcon?.name || IconConfig.RIGHT
+                  "
+                  :color="
+                    disabled || item?.disabled
+                      ? '#c0c0c0'
+                      : item?.rightIcon?.color || rightIcon?.color
+                  "
+                  :bold="item?.rightIcon?.bold || rightIcon?.bold"
+                  :customPrefix="
+                    item?.rightIcon?.customPrefix || rightIcon?.customPrefix
+                  "
+                  :imgMode="item?.rightIcon?.imgMode || rightIcon?.imgMode"
+                  :width="item?.rightIcon?.width || rightIcon?.width"
+                  :height="item?.rightIcon?.height || rightIcon?.height"
+                  :top="item?.rightIcon?.top || rightIcon?.name"
+                  :stop="item?.rightIcon?.stop || rightIcon?.stop"
+                  :round="item?.rightIcon?.round || rightIcon?.round"
+                  :customStyle="
+                    item?.rightIcon?.customStyle || rightIcon?.customStyle
+                  "
                 ></HyIcon>
               </slot>
             </view>
@@ -106,6 +134,7 @@
 import defaultProps from "./props";
 import type IProps from "./typing";
 import type { CellContentVo } from "./typing";
+import { IconConfig } from "../../config";
 
 import HyIcon from "../hy-icon/hy-icon.vue";
 import { computed, toRefs } from "vue";

package/components/hy-cell/props.ts

@@ -1,5 +1,5 @@
 import type IProps from "./typing";
-import { ColorConfig, IconConfig } from "../../config";
+import { ColorConfig } from "../../config";
 
 const defaultProps: IProps = {
   list: [],
@@ -13,7 +13,7 @@ const defaultProps: IProps = {
   size: "medium",
   value: "",
   arrange: "right",
-  rightIcon: IconConfig.RIGHT,
+  rightIcon: {},
   arrowDirection: "right",
 };
 

package/components/hy-cell/typing.d.ts

@@ -1,11 +1,12 @@
 import type { CSSProperties } from "vue";
 import { HyApp } from "@/package/typing/modules/common";
+import type HyIconProps from "../hy-icon/typing";
 
 export interface CellContentVo extends AnyObject {
   /**
    * @description 单元格左图标
    * */
-  icon?: string;
+  icon?: Partial<HyIconProps>;
   /**
    * @description 单元格标题
    * */
@@ -19,9 +20,9 @@ export interface CellContentVo extends AnyObject {
    * */
   disabled?: boolean;
   /**
-   * @description 单元格右图标
+   * @description 单元格右图标集合
    * */
-  rightIcon?: string;
+  rightIcon?: Partial<HyIconProps>;
   /**
    * @description 单元格值
    * */
@@ -31,11 +32,11 @@ export interface CellContentVo extends AnyObject {
    * */
   url?: string;
   /**
-   * @description 单元格右侧箭头的方向，可选值为：left，up，down
+   * @description 单元格右侧箭头的方向，可选值为：left，up，down,right
    * */
   arrowDirection?: HyApp.RotateType;
 }
-export default interface IProps {
+export default interface HyCellProps {
   /**
    * @description cell列表数据
    * */
@@ -81,17 +82,13 @@ export default interface IProps {
    * */
   arrange?: HyApp.LeftRightType | "center";
   /**
-   * @description 右侧的图标箭头 （默认 'right'）
+   * @description 右侧的图标箭头icon集合
    * */
-  rightIcon?: string;
+  rightIcon?: Partial<HyIconProps>;
   /**
    * @description 右侧箭头的方向，可选值为：left，up，down
    * */
   arrowDirection?: "left" | "up" | "down" | "right";
-  /**
-   * @description 自定义右侧icon样式
-   * */
-  rightIconStyle?: CSSProperties;
   /**
    * @description 定义需要用到的外部样式
    * */

package/components/hy-check-button/typing.d.ts

@@ -35,7 +35,7 @@ export type FieldNamesType = {
   [key in keyof IFieldNames as IFieldNames[key]]?: string | number | boolean;
 };
 
-export default interface IProps {
+export default interface HyCheckButtonProps {
   /**
    * @description 选中得值，radio是字符串，checkbox是数组
    * */

package/components/hy-checkbox/hy-checkbox.vue

@@ -72,6 +72,7 @@ const {
   customStyle,
   borderBottom,
   placement,
+  labelDisabled,
 } = toRefs(props);
 const emit = defineEmits(["change", "update:modelValue"]);
 
@@ -172,7 +173,7 @@ const iconClickHandler = (e: Event, temp: CheckboxColumnsVo) => {
  * */
 const wrapperClickHandler = (e: Event, temp: CheckboxColumnsVo) => {
   e.stopPropagation();
-  if (!isDisabled(temp?.disabled)) {
+  if (!isDisabled(temp?.disabled) || !labelDisabled.value) {
     setRadioCheckedStatus(temp);
   }
 };
@@ -181,7 +182,7 @@ const wrapperClickHandler = (e: Event, temp: CheckboxColumnsVo) => {
  * */
 const labelClickHandler = (e: Event, temp: CheckboxColumnsVo) => {
   e.stopPropagation();
-  if (!isDisabled(temp?.disabled)) {
+  if (!isDisabled(temp?.disabled) || !labelDisabled.value) {
     setRadioCheckedStatus(temp);
   }
 };

package/components/hy-checkbox/props.ts

@@ -20,7 +20,7 @@ const defaultProps: IProps = {
   borderBottom: false,
   labelSize: "",
   labelColor: "",
-  labelDisabled: "",
+  labelDisabled: false,
   placement: "row",
 };
 

package/components/hy-checkbox/typing.d.ts

@@ -1,7 +1,7 @@
 import type { CSSProperties } from "vue";
 import type { CheckboxColumnsVo, IFieldNames } from "../hy-check-button/typing";
 
-export default interface IProps {
+export default interface HyCheckboxProps {
   /**
    * @description 双向绑定值，数组类型
    * */
@@ -61,7 +61,7 @@ export default interface IProps {
   /**
    * @description 是否禁止点击提示语选中复选框
    * */
-  labelDisabled?: string;
+  labelDisabled?: boolean;
   /**
    * @description 定义需要用到的外部样式
    * */

package/components/hy-count-down/typing.d.ts

@@ -1,6 +1,6 @@
 import type { CSSProperties } from "vue";
 
-export default interface IProps {
+export default interface HyCountDownProps {
   /**
    * @description 倒计时时长，单位ms （默认 0 ）
    * */

package/components/hy-count-to/typing.d.ts

@@ -1,6 +1,4 @@
-import type { CSSProperties } from "vue";
-
-export default interface IProps {
+export default interface HyCountToProps {
   /**
    * @description 开始的数值，默认从0增长到某一个数（默认 0 ）
    * */

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

@@ -7,14 +7,23 @@
     >
       <slot name="trigger" :value="inputValue">
         <HyInput
-          :placeholder="placeholder"
-          :readonly="true"
           v-model="inputValue"
-          :disabled="disabled"
-          :disabledColor="disabledColor"
-          :shape="shape"
-          :border="border"
-          :customStyle="customStyle"
+          :readonly="true"
+          :disabled="input?.disabled"
+          :disabledColor="input?.disabledColor"
+          :shape="input?.shape"
+          :border="input?.border"
+          :prefixIcon="input?.prefixIcon"
+          :suffixIcon="input?.suffixIcon"
+          :color="input?.color"
+          :fontSize="input?.fontSize"
+          :inputAlign="input?.inputAlign"
+          :placeholder="input?.placeholder || '请选择时间'"
+          :placeholderStyle="input?.placeholderStyle"
+          :placeholderClass="input?.placeholderClass"
+          :customStyle="
+            Object.assign({ 'pointer-events': 'none' }, input?.customStyle)
+          "
         ></HyInput>
         <view class="input-cover"></view>
       </slot>
@@ -68,7 +77,7 @@ const {
   show,
   modelValue,
   hasInput,
-  disabled,
+  input,
   formatter,
   filter,
   format,
@@ -416,11 +425,6 @@ const getOriginColumns = () => {
     if (filter.value) {
       values = filter.value(type, values);
       if (!values || (values && values.length == 0)) {
-        // uni.showToast({
-        // 	title: '日期filter结果不能为空',
-        // 	icon: 'error',
-        // 	mask: true
-        // })
         error("日期filter结果不能为空");
       }
     }
@@ -547,7 +551,7 @@ const getBoundary = (type: string, innerVal: string | number) => {
   };
 };
 const onShowByClickInput = () => {
-  if (!disabled.value) {
+  if (!input.value.disabled) {
     showByClickInput.value = !showByClickInput.value;
   }
 };

package/components/hy-datetime-picker/props.ts

@@ -25,11 +25,9 @@ const defaultProps: IProps = {
   visibleItemCount: 5,
   closeOnClickOverlay: false,
   defaultIndex: [],
-  disabled: false,
   hasInput: false,
+  input: {},
   format: "",
-  placeholder: "请选择日期",
-  disabledColor: "#F5F5F5",
   toolbarRightSlot: false,
 };