hy-app 0.4.13 → 0.5.0

package/components/hy-form-item/typing.d.ts

@@ -1,46 +1,49 @@
-import HyFormSimpleProps from "../hy-form/typing";
-import type { ToRefs } from "vue";
+import HyFormSimpleProps, { type FormRule } from '../hy-form/typing'
+import type { ToRefs } from 'vue'
 
 export interface IFormContext extends ToRefs<HyFormSimpleProps> {
-  formData: AnyObject;
-  errors: Record<string, string>;
-  addFormItem: (item: any) => void;
-  removeFormItem: (item: any) => void;
-  validateField: (
-    field: string,
-    value: any,
-    trigger?: "blur" | "change",
-  ) => boolean;
-  setFieldValue: (field: string, value: any) => void;
-  getFieldValue: (field: string) => any;
+    formData: AnyObject
+    errors: Record<string, string>
+    addFormItem: (item: any) => void
+    removeFormItem: (item: any) => void
+    validateField: (field: string, value: any, trigger?: 'blur' | 'change') => boolean
+    setFieldValue: (field: string, value: any) => void
+    getFieldValue: (field: string) => any
 }
 
 export interface FormItemContext {
-  /**
-   * 失去焦点触发表单校验
-   * */
-  handleBlur: (value: string | number) => void;
-  /**
-   * 值改变触发表单校验
-   * */
-  handleChange: (value: string | number) => void;
+    /**
+     * 失去焦点触发表单校验
+     * */
+    handleBlur: (value: string | number) => void
+    /**
+     * 值改变触发表单校验
+     * */
+    handleChange: (value: string | number) => void
 }
 
 export default interface HyFormItemProps {
-  /**
-   * 标签文本
-   */
-  label?: string;
-  /**
-   * 表单字段名
-   */
-  prop?: string;
-  /**
-   * 是否必填
-   */
-  required?: boolean;
-  /**
-   * 验证规则
-   */
-  rules?: any;
+    /**
+     * 标签文本
+     */
+    label?: string
+    /**
+     * 表单字段名
+     */
+    prop?: string
+    /**
+     * 是否必填
+     */
+    required?: boolean
+    /**
+     * 验证规则
+     */
+    rules?: any
+}
+
+export interface IFormItemEmits {
+    /** 提交表单 */
+    (e: 'change', value: any): void
+    /** 表单校验 */
+    (e: 'blur', value: any): void
 }

package/components/hy-grid/hy-grid.vue

@@ -1,165 +1,109 @@
 <template>
-  <view class="hy-grid" ref="hy-grid" :style="gridStyle">
-    <template v-for="(item, i) in list" :key="i">
-      <view
-        class="hy-grid__item"
-        hover-class="hy-grid__item--hover-class"
-        :hover-stay-time="200"
-        @tap="childClick(item)"
-        :style="itemStyle"
-      >
-        <slot v-if="$slots.default" :record="item"></slot>
-        <HyIcon
-          v-else
-          :name="item[customKeys?.icon]"
-          label-pos="bottom"
-          :label="item[customKeys?.name]"
-          :space="item?.iconConfig?.space || iconConfig?.space || 8"
-          :color="item?.iconConfig?.color || iconConfig?.color"
-          :size="item?.iconConfig?.size || iconConfig?.size || 30"
-          :bold="item?.iconConfig?.bold || iconConfig?.bold"
-          :customPrefix="item?.iconConfig?.customPrefix"
-          :imgMode="item?.iconConfig?.imgMode || iconConfig?.imgMode"
-          :width="item?.iconConfig?.width || iconConfig?.width"
-          :height="item?.iconConfig?.height || iconConfig?.height"
-          :top="item?.iconConfig?.top || iconConfig?.top"
-          :stop="item?.iconConfig?.stop || iconConfig?.stop"
-          :round="item?.iconConfig?.round || iconConfig?.round || 6"
-          :customStyle="
-            item?.iconConfig?.customStyle || iconConfig?.customStyle
-          "
-        ></HyIcon>
-      </view>
-    </template>
-  </view>
+    <view class="hy-grid" ref="hy-grid" :style="gridStyle">
+        <template v-for="(item, i) in list" :key="i">
+            <view
+                class="hy-grid__item"
+                hover-class="hy-grid__item--hover-class"
+                :hover-stay-time="200"
+                @tap="childClick(item)"
+                :style="itemStyle"
+            >
+                <slot v-if="$slots.default" :record="item"></slot>
+                <hy-icon
+                    v-else
+                    :name="item[customKeys?.icon]"
+                    label-pos="bottom"
+                    :label="item[customKeys?.name]"
+                    :space="item?.iconConfig?.space || iconConfig?.space || 8"
+                    :color="item?.iconConfig?.color || iconConfig?.color"
+                    :size="item?.iconConfig?.size || iconConfig?.size || 30"
+                    :bold="item?.iconConfig?.bold || iconConfig?.bold"
+                    :customPrefix="item?.iconConfig?.customPrefix"
+                    :imgMode="item?.iconConfig?.imgMode || iconConfig?.imgMode"
+                    :width="item?.iconConfig?.width || iconConfig?.width"
+                    :height="item?.iconConfig?.height || iconConfig?.height"
+                    :top="item?.iconConfig?.top || iconConfig?.top"
+                    :stop="item?.iconConfig?.stop || iconConfig?.stop"
+                    :round="item?.iconConfig?.round || iconConfig?.round || 6"
+                    :customStyle="item?.iconConfig?.customStyle || iconConfig?.customStyle"
+                ></hy-icon>
+            </view>
+        </template>
+    </view>
 </template>
 
 <script lang="ts">
 export default {
-  name: "hy-grid",
-  options: {
-    addGlobalClass: true,
-    virtualHost: true,
-    styleIsolation: "shared",
-  },
-};
+    name: 'hy-grid',
+    options: {
+        addGlobalClass: true,
+        virtualHost: true,
+        styleIsolation: 'shared'
+    }
+}
 </script>
 
 <script setup lang="ts">
-import { computed } from "vue";
-import type { CSSProperties, PropType } from "vue";
-import type { CustomKeysVo, GridItemVo, IGridEmits } from "./typing";
-import { addUnit } from "../../libs";
-import type HyIconProps from "../hy-icon/typing";
+import { computed } from 'vue'
+import type { CSSProperties } from 'vue'
+import type { IGridEmits } from './typing'
+import { addUnit } from '../../libs'
+import gridProps from './props'
 // 组件
-import HyIcon from "../hy-icon/hy-icon.vue";
+import HyIcon from '../hy-icon/hy-icon.vue'
 
 /**
  * 宫格组件一般用于同时展示多个同类项目的场景，可以给宫格的项目设置徽标组件(badge)，或者图标等，也可以扩展为左右滑动的轮播形式
  * @displayName hy-grid
  */
-defineOptions({});
+defineOptions({})
 
-// const props = withDefaults(defineProps<IProps>(), defaultProps);
-const props = defineProps({
-  /** 数据列表 */
-  list: {
-    type: Array as PropType<(GridItemVo | string)[]>,
-    default: () => [],
-  },
-  /** 自定义键值 */
-  customKeys: {
-    type: Object as PropType<CustomKeysVo>,
-    default: () => ({
-      name: "name",
-      icon: "icon",
-    }),
-  },
-  /** 宫格的列数 */
-  col: {
-    type: Number,
-    default: 5,
-  },
-  /** 是否显示宫格的边框 */
-  border: {
-    type: Boolean,
-    default: false,
-  },
-  /** 单个宫格高度 */
-  itemHeight: {
-    type: [Number, String],
-    default: "80px",
-  },
-  /**
-   * 宫格对齐方式，表现为数量少的时候，靠左，居中，还是靠右
-   * @values left,center,right
-   * */
-  align: {
-    type: String,
-    default: "left",
-  },
-  /** 间隔 */
-  gap: {
-    type: [Number, String],
-    default: 0,
-  },
-  /** 宫格的背景颜色 */
-  bgColor: {
-    type: String,
-    default: "transparent",
-  },
-  /** 图标属性api配置集合 */
-  iconConfig: Object as PropType<HyIconProps>,
-  /** 定义需要用到的外部样式 */
-  customStyle: Object as PropType<CSSProperties>,
-  /** 自定义外部类名 */
-  customClass: String,
-});
-const emit = defineEmits<IGridEmits>();
+const props = defineProps(gridProps)
+const emit = defineEmits<IGridEmits>()
 
 /**
  * @description 宫格对齐方式
  * */
 const gridStyle = computed<CSSProperties>(() => {
-  let style: CSSProperties = {};
-  switch (props.align) {
-    case "left":
-      style.justifyContent = "flex-start";
-      break;
-    case "center":
-      style.justifyContent = "center";
-      break;
-    case "right":
-      style.justifyContent = "flex-end";
-      break;
-    default:
-      style.justifyContent = "flex-start";
-  }
-  return Object.assign(style, props.customStyle);
-});
+    let style: CSSProperties = {}
+    switch (props.align) {
+        case 'left':
+            style.justifyContent = 'flex-start'
+            break
+        case 'center':
+            style.justifyContent = 'center'
+            break
+        case 'right':
+            style.justifyContent = 'flex-end'
+            break
+        default:
+            style.justifyContent = 'flex-start'
+    }
+    return Object.assign(style, props.customStyle)
+})
 
 const itemStyle = computed<CSSProperties>(() => {
-  const style: CSSProperties = {
-    background: props.bgColor,
-    height: addUnit(props.itemHeight),
-    width: "100%",
-    border: props.border ? "0.5px solid #c8c7cc66" : "",
-  };
-  return style;
-});
+    const style: CSSProperties = {
+        background: props.bgColor,
+        height: addUnit(props.itemHeight),
+        width: '100%',
+        border: props.border ? '0.5px solid #c8c7cc66' : ''
+    }
+    return style
+})
 
 /**
  * @description 点击事件
  * */
 const childClick = (temp: string | Record<string, any>) => {
-  emit("click", temp);
-};
+    emit('click', temp)
+}
 </script>
 
 <style lang="scss" scoped>
 .hy-grid {
-  grid-gap: v-bind(gap);
-  grid-template-columns: repeat(v-bind(col), 1fr);
+    grid-gap: v-bind(gap);
+    grid-template-columns: repeat(v-bind(col), 1fr);
 }
-@import "./index.scss";
+@import './index.scss';
 </style>

package/components/hy-grid/props.ts

@@ -1,18 +1,60 @@
-import type IProps from "./typing";
+import type { CSSProperties, PropType } from 'vue'
+import type HyIconProps from '../hy-icon/typing'
+import type { CustomKeysVo, GridItemVo } from './typing'
 
-const defaultProps: IProps = {
-  list: [],
-  customKeys: {
-    name: "name",
-    icon: "icon",
-  },
-  col: 5,
-  border: false,
-  itemHeight: "80px",
-  align: "left",
-  gap: "0px",
-  bgColor: "transparent",
-  iconConfig: {},
-};
+const gridProps = {
+    /** 数据列表 */
+    list: {
+        type: Array as PropType<(GridItemVo | string)[]>,
+        default: () => []
+    },
+    /** 自定义键值 */
+    customKeys: {
+        type: Object as PropType<CustomKeysVo>,
+        default: () => ({
+            name: 'name',
+            icon: 'icon'
+        })
+    },
+    /** 宫格的列数 */
+    col: {
+        type: Number,
+        default: 5
+    },
+    /** 是否显示宫格的边框 */
+    border: {
+        type: Boolean,
+        default: false
+    },
+    /** 单个宫格高度 */
+    itemHeight: {
+        type: [Number, String],
+        default: '80px'
+    },
+    /**
+     * 宫格对齐方式，表现为数量少的时候，靠左，居中，还是靠右
+     * @values left,center,right
+     * */
+    align: {
+        type: String,
+        default: 'left'
+    },
+    /** 间隔 */
+    gap: {
+        type: [Number, String],
+        default: 0
+    },
+    /** 宫格的背景颜色 */
+    bgColor: {
+        type: String,
+        default: 'transparent'
+    },
+    /** 图标属性api配置集合 */
+    iconConfig: Object as PropType<HyIconProps>,
+    /** 定义需要用到的外部样式 */
+    customStyle: Object as PropType<CSSProperties>,
+    /** 自定义外部类名 */
+    customClass: String
+}
 
-export default defaultProps;
+export default gridProps

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

@@ -2,78 +2,78 @@ import { CSSProperties } from 'vue'
 import type HyIconProps from '../hy-icon/typing'
 
 export interface GridItemVo {
-  /**
-   * @description 图标名称或图片地址
-   * */
-  icon?: string
-  /**
-   * @description 名称
-   * */
-  name?: string
-  /**
-   * @description 图标属性api配置
-   * */
-  iconConfig?: Partial<HyIconProps>
-  /**
-   * @description 自定义内容键值对
-   * */
-  [key: string]: any
+    /**
+     * @description 图标名称或图片地址
+     * */
+    icon?: string
+    /**
+     * @description 名称
+     * */
+    name?: string
+    /**
+     * @description 图标属性api配置
+     * */
+    iconConfig?: Partial<HyIconProps>
+    /**
+     * @description 自定义内容键值对
+     * */
+    [key: string]: any
 }
 export interface CustomKeysVo {
-  /**
-   * @description 自定义标题键名
-   * */
-  name: string
-  /**
-   * @description 自定义icon键名
-   * */
-  icon: string
+    /**
+     * @description 自定义标题键名
+     * */
+    name: string
+    /**
+     * @description 自定义icon键名
+     * */
+    icon: string
 }
 
 export default interface HyGridProps {
-  /**
-   * @description 数据集
-   * */
-  list: GridItemVo[]
-  /**
-   * @description 自定义键值
-   * */
-  customKeys?: CustomKeysVo
-  /**
-   * @description 宫格的列数（默认 3 ）
-   * */
-  col?: number
-  /**
-   * @description 是否显示宫格的边框（默认 false ）
-   * */
-  border?: boolean
-  /**
-   * @description 单个宫格高度（默认 60px ）
-   * */
-  itemHeight?: number | string
-  /**
-   * @description 宫格对齐方式，表现为数量少的时候，靠左，居中，还是靠右 （默认 'left' ）
-   * */
-  align?: 'center' | HyApp.LeftRightType
-  /**
-   * @description 间隔（默认 0px）
-   * */
-  gap?: number | string
-  /**
-   * @description 宫格的背景颜色 （默认 'transparent' ）
-   * */
-  bgColor?: string
-  /**
-   * @description 图标属性api配置集合
-   * */
-  iconConfig?: Partial<HyIconProps>
-  /**
-   * @description 定义需要用到的外部样式
-   * */
-  customStyle?: CSSProperties
+    /**
+     * @description 数据集
+     * */
+    list: GridItemVo[]
+    /**
+     * @description 自定义键值
+     * */
+    customKeys?: CustomKeysVo
+    /**
+     * @description 宫格的列数（默认 3 ）
+     * */
+    col?: number
+    /**
+     * @description 是否显示宫格的边框（默认 false ）
+     * */
+    border?: boolean
+    /**
+     * @description 单个宫格高度（默认 60px ）
+     * */
+    itemHeight?: number | string
+    /**
+     * @description 宫格对齐方式，表现为数量少的时候，靠左，居中，还是靠右 （默认 'left' ）
+     * */
+    align?: 'center' | HyApp.LeftRightType
+    /**
+     * @description 间隔（默认 0px）
+     * */
+    gap?: number | string
+    /**
+     * @description 宫格的背景颜色 （默认 'transparent' ）
+     * */
+    bgColor?: string
+    /**
+     * @description 图标属性api配置集合
+     * */
+    iconConfig?: Partial<HyIconProps>
+    /**
+     * @description 定义需要用到的外部样式
+     * */
+    customStyle?: CSSProperties
 }
 
 export interface IGridEmits {
-  /** 点击小菜单触发 */
-  (e: 'click', name: string | Record<string, any>): void
+    /** 点击小菜单触发 */
+    (e: 'click', name: string | Record<string, any>): void
 }