hy-app 0.1.1 → 0.1.2

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

@@ -50,15 +50,13 @@
         <slot name="toolbar-bottom"> </slot>
       </template>
     </HyPicker>
-
-    <HyList container-height="" list=""></HyList>
   </view>
 </template>
 
 <script setup lang="ts">
 import { onMounted, ref, toRefs } from "vue";
 import defaultProps from "./props";
-import IProps from "./typing";
+import type IProps from "./typing";
 import address from "../../utils/address.json";
 
 // 组件
@@ -73,7 +71,7 @@ const emit = defineEmits([
   "cancel",
   "confirm",
   "change",
-  "update:modelValue"
+  "update:modelValue",
 ]);
 
 // 原来的日期选择器不方便，这里增加一个hasInput选项支持类似element的自带输入框的功能。
@@ -111,16 +109,16 @@ const updateColumnValue = (value: string) => {
     const addressArr = value.split(separator.value);
     // 查出省索引
     provinceIndex = address.findIndex((item) =>
-      areCitiesEqual(item.name, addressArr[0])
+      areCitiesEqual(item.name, addressArr[0]),
     );
     // 查出市索引
     cityIndex = address[provinceIndex].areas.findIndex((item) =>
-      areCitiesEqual(item.name, addressArr[1])
+      areCitiesEqual(item.name, addressArr[1]),
     );
 
     // 查出县/区索引
     countyIndex = address[provinceIndex].areas[cityIndex].areas.findIndex(
-      (item) => areCitiesEqual(item.name, addressArr[2])
+      (item) => areCitiesEqual(item.name, addressArr[2]),
     );
   } else {
     provinceIndex = 0;
@@ -130,12 +128,12 @@ const updateColumnValue = (value: string) => {
   // 省级数组
   const provinceData = address.map((item) => ({
     name: item.name,
-    code: item.code
+    code: item.code,
   }));
   // 市级数组
   const cityData = address[provinceIndex].areas.map((item) => ({
     name: item.name,
-    code: item.code
+    code: item.code,
   }));
   // 县/区级数组
   const areaData = address[provinceIndex].areas[cityIndex].areas;
@@ -188,7 +186,7 @@ const confirm = ({ value }: { value: Record<string, any>[] }) => {
   showByClickInput.value = false;
   emit("update:modelValue", inputValue.value);
   emit("confirm", {
-    value: inputValue.value
+    value: inputValue.value,
   });
 };
 
@@ -205,7 +203,7 @@ const change = (e: any) => {
     uPickerRef.value?.setColumnValues(1, children1);
     //更换 第二列数据
     const children2 = address[index].areas[indexs[1]].areas.map((item) => ({
-      ...item
+      ...item,
     }));
     uPickerRef.value?.setColumnValues(2, children2);
     //更换 第三列数据
@@ -213,14 +211,14 @@ const change = (e: any) => {
   if (columnIndex === 1) {
     //如果改变的是第二列
     const children3 = address[indexs[0]].areas[indexs[1]].areas.map((item) => ({
-      ...item
+      ...item,
     }));
     uPickerRef.value?.setColumnValues(2, children3);
   }
 
   // 发出change时间，value为当前选中的时间戳
   emit("change", {
-    ...e
+    ...e,
   });
 };
 

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

@@ -1,5 +1,4 @@
-import IProps from "./typing";
-import { DateModeEnum } from "../../typing";
+import type IProps from "./typing";
 
 const defaultProps: IProps = {
   show: false,
@@ -21,7 +20,7 @@ const defaultProps: IProps = {
   hasInput: false,
   placeholder: "请选择地址",
   disabledColor: "#F5F5F5",
-  toolbarRightSlot: false
+  toolbarRightSlot: false,
 };
 
 export default defaultProps;

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

@@ -1,5 +1,4 @@
-import { DateModeEnum } from "../../typing";
-import { CSSProperties } from "vue";
+import type { CSSProperties } from "vue";
 
 export default interface IProps {
   /**

package/components/hy-avatar/hy-avatar.vue

@@ -13,8 +13,8 @@
         :style="[
           {
             width: addUnit(size),
-            height: addUnit(size)
-          }
+            height: addUnit(size),
+          },
         ]"
       />
       <!-- #endif -->
@@ -33,7 +33,7 @@
           justifyContent: 'center',
           textAlign: 'center',
           color: color,
-          fontSize: fontSize
+          fontSize: fontSize,
         }"
         >{{ text }}</text
       >
@@ -50,9 +50,9 @@
 </template>
 
 <script setup lang="ts">
-import { computed, CSSProperties, toRefs, ref, watch } from "vue";
+import { computed, type CSSProperties, toRefs, ref, watch } from "vue";
 import defaultProps from "./props";
-import IProps from "./typing";
+import type IProps from "./typing";
 import { addUnit, random } from "../../utils";
 
 // 组件
@@ -70,7 +70,7 @@ const {
   size,
   shape,
   name,
-  customStyle
+  customStyle,
 } = toRefs(props);
 const emit = defineEmits(["click"]);
 
@@ -97,7 +97,7 @@ const colors = ref<string[]>([
   "#86cefa",
   "#98d1ee",
   "#73d1f1",
-  "#80a7dc"
+  "#80a7dc",
 ]);
 const avatarUrl = ref(src.value);
 const allowMp = ref<boolean>(false);
@@ -111,7 +111,7 @@ watch(
       errorHandler();
     }
   },
-  { immediate: true }
+  { immediate: true },
 );
 
 const avatarStyle = computed<CSSProperties>(() => {
@@ -121,7 +121,7 @@ const avatarStyle = computed<CSSProperties>(() => {
         ? randomBgColor.value
           ? colors.value[colorIndex.value ? colorIndex.value : random(0, 19)]
           : bgColor.value
-        : "transparent"
+        : "transparent",
   };
   if (typeof size.value === "number") {
     style.width = addUnit(size.value);

package/components/hy-avatar/props.ts

@@ -1,4 +1,4 @@
-import IProps from "./typing";
+import type IProps from "./typing";
 
 const defaultProps: IProps = {
   src: "",
@@ -14,7 +14,7 @@ const defaultProps: IProps = {
   randomBgColor: false,
   defaultUrl: "",
   colorIndex: 0,
-  name: ""
+  name: "",
 };
 
 export default defaultProps;

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

@@ -1,4 +1,4 @@
-import { CSSProperties } from "vue";
+import type { CSSProperties } from "vue";
 
 export default interface IProps {
   /**

package/components/hy-badge/hy-badge.vue

@@ -6,7 +6,7 @@
       isDot ? 'hy-badge--dot' : 'hy-badge--not-dot',
       inverted && 'hy-badge--inverted',
       shape === 'horn' && 'hy-badge--horn',
-      `hy-badge--${type}${inverted ? '--inverted' : ''}`
+      `hy-badge--${type}${inverted ? '--inverted' : ''}`,
     ]"
     :style="[customStyle, badgeStyle]"
     >{{ isDot ? "" : showValue }}</text
@@ -14,9 +14,9 @@
 </template>
 
 <script setup lang="ts">
-import IProps from "./typing";
+import type IProps from "./typing";
 import defaultProps from "./props";
-import { computed, CSSProperties, toRefs } from "vue";
+import { computed, type CSSProperties, toRefs } from "vue";
 import { addUnit } from "../../utils";
 
 const props = withDefaults(defineProps<IProps>(), defaultProps);
@@ -29,7 +29,7 @@ const {
   offset,
   inverted,
   max,
-  customStyle
+  customStyle,
 } = toRefs(props);
 const emit = defineEmits(["click"]);
 
@@ -94,6 +94,7 @@ $hy-badge-text-font-size: 11px !default;
   text-align: center;
   font-size: $hy-badge-text-font-size;
   color: $hy-text-color-inverse;
+  z-index: 999;
 
   &--dot {
     height: $hy-badge-dot-size;

package/components/hy-badge/props.ts

@@ -1,4 +1,4 @@
-import IProps from "./typing";
+import type IProps from "./typing";
 
 const defaultProps: IProps = {
   isDot: false,
@@ -13,7 +13,7 @@ const defaultProps: IProps = {
   numberType: "overflow",
   offset: null,
   inverted: false,
-  absolute: false
+  absolute: false,
 };
 
 export default defaultProps;

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

@@ -1,4 +1,4 @@
-import { CSSProperties } from "vue";
+import type { CSSProperties } from "vue";
 
 export default interface IProps {
   /**
@@ -18,7 +18,7 @@ export default interface IProps {
    * */
   max?: number;
   /**
-   * @description 主题类型，error|warning|success|primary （默认 'error' ）
+   * @description 主题类型，error|warning|success|primary|info （默认 'error' ）
    * */
   type?: HyApp.ThemeType;
   /**

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

@@ -68,8 +68,8 @@
       !disabled && !loading && !color && (plain || type === 'info')
         ? 'hy-button--active--plain'
         : !disabled && !loading && !plain
-        ? 'hy-button--active'
-        : ''
+          ? 'hy-button--active'
+          : ''
     "
     @tap="clickHandler"
     :class="bemClass"
@@ -99,9 +99,9 @@
         class="hy-button__text"
         :style="[
           {
-            marginLeft: icon ? '2px' : 0
+            marginLeft: icon ? '2px' : 0,
           },
-          nvueTextStyle
+          nvueTextStyle,
         ]"
         :class="[plain && `hy-button__text--plain--${type}`]"
         >{{ text }}</text
@@ -112,12 +112,12 @@
 </template>
 
 <script setup lang="ts">
-import { computed, CSSProperties, toRefs } from "vue";
+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 IProps from "./typing";
+import type IProps from "./typing";
 
 const props = withDefaults(defineProps<IProps>(), defaultProps);
 const {
@@ -129,7 +129,7 @@ const {
   type,
   plain,
   color,
-  iconColor
+  iconColor,
 } = toRefs(props);
 const emit = defineEmits([
   "click",
@@ -138,7 +138,7 @@ const emit = defineEmits([
   "error",
   "opensetting",
   "launchapp",
-  "agreeprivacyauthorization"
+  "agreeprivacyauthorization",
 ]);
 
 const textColor = (ColorConfig as any)[type.value];
@@ -153,7 +153,7 @@ const bemClass = computed(() => {
       "button",
       props,
       ["type", "shape", "size"],
-      ["disabled", "plain", "hairline"]
+      ["disabled", "plain", "hairline"],
     );
   } else {
     // 由于nvue的原因，在有color参数时，不需要传入type，否则会生成type相关的类型，影响最终的样式
@@ -161,7 +161,7 @@ const bemClass = computed(() => {
       "button",
       props,
       ["shape", "size"],
-      ["disabled", "plain", "hairline"]
+      ["disabled", "plain", "hairline"],
     );
   }
 });
@@ -306,7 +306,7 @@ const agreeprivacyauthorization = (e: any) => {
     padding: 0 15px;
   }
 
-  &--normal {
+  &--medium {
     padding: 0 12px;
     font-size: 14px;
   }
@@ -315,7 +315,7 @@ const agreeprivacyauthorization = (e: any) => {
     /* #ifndef APP-NVUE */
     min-width: 60px;
     /* #endif */
-    height: 80px;
+    height: 30px;
     padding: 0 8px;
     font-size: 12px;
   }

package/components/hy-button/props.ts

@@ -1,10 +1,9 @@
-import IProps from "./typing";
-import type { CSSProperties } from "vue";
+import type IProps from "./typing";
 
 const defaultProps: IProps = {
   hairline: false,
-  type: "info",
-  size: "normal",
+  type: "primary",
+  size: "medium",
   shape: "square",
   plain: false,
   disabled: false,
@@ -30,7 +29,7 @@ const defaultProps: IProps = {
   icon: "",
   iconColor: "",
   color: "",
-  stop: true
+  stop: true,
 };
 
 export default defaultProps;

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

@@ -6,13 +6,13 @@ export default interface IProps {
    * */
   hairline?: boolean;
   /**
-   * @description 按钮的预置样式，info，primary，error，warning，success (默认 'info' )
+   * @description 按钮的预置样式，info，primary，error，warning，success (默认 'primary' )
    * */
   type?: HyApp.ThemeType;
   /**
-   * @description 按钮尺寸，large，normal，mini （默认 normal）
+   * @description 按钮尺寸，large，medium，mini （默认 medium）
    * */
-  size?: "normal" | "large" | "small" | "mini";
+  size?: HyApp.SizeType | "mini";
   /**
    * @description 按钮形状，circle（两边为半圆），square（带圆角） （默认 'square' ）
    * */

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

@@ -20,7 +20,7 @@
       <slot>
         <template v-for="(item, i) in list" :key="i">
           <view
-            class="hy-cell__body--container"
+            :class="ItemClass"
             :hover-class="containerClass(item)"
             :hover-stay-time="250"
             :style="{ borderBottom: border ? '1rpx solid #c8c7cc66' : '' }"
@@ -30,7 +30,7 @@
               <view class="hy-cell__body--container__content-icon">
                 <slot name="icon" :icon="item?.icon">
                   <HyIcon
-                    size="25"
+                    :size="iconSize"
                     :name="item?.icon"
                     :color="disabled || item?.disabled ? '#c0c0c0' : ''"
                   ></HyIcon>
@@ -42,7 +42,7 @@
                   <text
                     class="hy-cell__body--container__content-title--text"
                     :class="[
-                      (disabled || item?.disabled) && 'hy-cell--disabled'
+                      (disabled || item?.disabled) && 'hy-cell--disabled',
                     ]"
                     >{{ item?.title }}</text
                   >
@@ -63,8 +63,8 @@
                   arrange === 'left'
                     ? 'flex-start'
                     : arrange === 'right'
-                    ? 'flex-end'
-                    : 'center'
+                      ? 'flex-end'
+                      : 'center',
               }"
             >
               <slot name="value" :record="item">
@@ -81,7 +81,7 @@
               :class="[
                 `hy-cell__body--container__right-icon--${
                   item?.arrowDirection || arrowDirection
-                }`
+                }`,
               ]"
             >
               <slot name="right-icon" :icon="item?.rightIcon || rightIcon">
@@ -89,7 +89,7 @@
                   :name="item?.rightIcon || rightIcon"
                   :custom-style="rightIconStyle"
                   :color="disabled || item?.disabled ? '#c0c0c0' : 'info'"
-                  :size="size === 'large' ? 18 : 16"
+                  :size="iconSize"
                 ></HyIcon>
               </slot>
             </view>
@@ -104,13 +104,14 @@
 
 <script setup lang="ts">
 import defaultProps from "./props";
-import IProps, { CellContentVo } from "./typing";
+import type IProps from "./typing";
+import type { CellContentVo } from "./typing";
 
 import HyIcon from "../hy-icon/hy-icon.vue";
 import { computed, toRefs } from "vue";
 
 const props = withDefaults(defineProps<IProps>(), defaultProps);
-const { disabled, clickable } = toRefs(props);
+const { size, disabled, clickable } = toRefs(props);
 const emit = defineEmits(["click"]);
 
 /**
@@ -122,12 +123,29 @@ const containerClass = computed(() => {
       !disabled.value &&
         !temp?.disabled &&
         clickable.value &&
-        "hy-cell__body--container__clickable"
+        "hy-cell__body--container__clickable",
     ]
       .filter(Boolean)
       .join();
   };
 });
+const ItemClass = computed(() => {
+  return [
+    "hy-cell__body--container",
+    `hy-cell__body--container__${size.value}`,
+  ];
+});
+
+const iconSize = computed(() => {
+  switch (size.value) {
+    case "large":
+      return 25;
+    case "medium":
+      return 20;
+    case "small":
+      return 15;
+  }
+});
 
 /**
  * @description 点击cell
@@ -137,7 +155,7 @@ const clickHandler = (e: Event, temp: CellContentVo, index: number) => {
   emit("click", temp, index);
   if (temp?.url) {
     uni.navigateTo({
-      url: temp.url
+      url: temp.url,
     });
   }
   e.stopPropagation();
@@ -189,7 +207,27 @@ const clickHandler = (e: Event, temp: CellContentVo, index: number) => {
       align-items: center;
       justify-content: space-between;
       flex: 1;
-      padding: $hy-border-margin-padding-lg $hy-border-margin-padding-base;
+
+      /* 大 */
+      &__large {
+        font-size: $hy-font-size-lg;
+        padding: 35rpx;
+        line-height: 25px;
+      }
+
+      /* 默认 */
+      &__medium {
+        font-size: $hy-font-size-base;
+        padding: 30rpx;
+        line-height: 20px;
+      }
+
+      /* 小 */
+      &__small {
+        font-size: $hy-font-size-sm;
+        padding: 25rpx;
+        line-height: 15px;
+      }
 
       /*点击状态*/
       &__clickable {
@@ -202,29 +240,24 @@ const clickHandler = (e: Event, temp: CellContentVo, index: number) => {
         &-icon {
           @include flex();
           align-items: center;
-          font-size: 16px;
           margin-right: 10px;
         }
         /*行头部*/
         &-title {
+          margin-right: $hy-border-margin-padding-sm;
           flex: $hy-font-size-subtitle;
-          line-height: 25px;
           display: flex;
           flex-direction: column;
 
           /*标题*/
           &--text {
-            font-size: $hy-font-size-lg;
-            line-height: 22px;
             color: $hy-color-title;
           }
 
           /*sub值*/
           &--sub {
             margin-top: $hy-border-margin-padding-sm;
-            font-size: $hy-font-size-base;
             color: $hy-text-color-grey;
-            line-height: 18px;
           }
         }
       }
@@ -235,8 +268,6 @@ const clickHandler = (e: Event, temp: CellContentVo, index: number) => {
         max-width: 90%;
         flex: 1;
         &__value {
-          //text-align: right;
-          font-size: $hy-font-size-base;
           line-height: 24px;
           color: $hy-text-color-grey;
           margin-right: $hy-border-margin-padding-sm;
@@ -251,6 +282,10 @@ const clickHandler = (e: Event, temp: CellContentVo, index: number) => {
           transform: rotate(-90deg);
         }
 
+        &--left {
+          transform: rotate(180deg);
+        }
+
         &--down {
           transform: rotate(90deg);
         }

package/components/hy-cell/props.ts

@@ -1,4 +1,4 @@
-import IProps from "./typing";
+import type IProps from "./typing";
 import { ColorConfig, IconConfig } from "../../config";
 
 const defaultProps: IProps = {
@@ -14,7 +14,7 @@ const defaultProps: IProps = {
   value: "",
   arrange: "right",
   rightIcon: IconConfig.RIGHT,
-  arrowDirection: "left"
+  arrowDirection: "right",
 };
 
 export default defaultProps;

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

@@ -1,4 +1,5 @@
-import { CSSProperties } from "vue";
+import type { CSSProperties } from "vue";
+import { HyApp } from "@/package/typing/modules/common";
 
 export interface CellContentVo extends AnyObject {
   /**
@@ -32,7 +33,7 @@ export interface CellContentVo extends AnyObject {
   /**
    * @description 单元格右侧箭头的方向，可选值为：left，up，down
    * */
-  arrowDirection?: "left" | "up" | "down";
+  arrowDirection?: HyApp.RotateType;
 }
 export default interface IProps {
   /**
@@ -86,7 +87,7 @@ export default interface IProps {
   /**
    * @description 右侧箭头的方向，可选值为：left，up，down
    * */
-  arrowDirection?: "left" | "up" | "down";
+  arrowDirection?: "left" | "up" | "down" | "right";
   /**
    * @description 自定义右侧icon样式
    * */

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

@@ -18,7 +18,8 @@
 <script setup lang="ts">
 import { toRefs, watch, ref } from "vue";
 import defaultProps from "./props";
-import IProps, { CheckboxColumnsVo } from "./typing";
+import type IProps from "./typing";
+import type { CheckboxColumnsVo } from "./typing";
 import HyTag from "../hy-tag/hy-tag.vue";
 
 const props = withDefaults(defineProps<IProps>(), defaultProps);
@@ -32,16 +33,21 @@ const columns_1 = ref<CheckboxColumnsVo[]>();
 
 watch(
   () => modelValue.value,
-  (newValue: string | (string | number)[]) => {
+  (newValue: string | number | (string | number)[]) => {
     if (!columns.value.length) return;
     columns_1.value = columns.value.map((item) => {
-      item[fieldNames.value.checked] = newValue.includes(
-        item[fieldNames.value.value] as string
-      );
+      if (Array.isArray(newValue)) {
+        item[fieldNames.value.checked] = newValue.includes(
+          item[fieldNames.value.value] as string,
+        );
+      } else {
+        item[fieldNames.value.checked] =
+          newValue === item[fieldNames.value.value];
+      }
       return item;
     });
   },
-  { immediate: true }
+  { immediate: true },
 );
 
 const onCheckbox = ({ name }: { name: number }) => {
@@ -52,7 +58,7 @@ const onCheckbox = ({ name }: { name: number }) => {
       "update:modelValue",
       columns.value
         .filter((item) => item[fieldNames.value.checked])
-        .map((item) => item[fieldNames.value.value])
+        .map((item) => item[fieldNames.value.value]),
     );
   } else {
     emit("update:modelValue", columns.value[name][fieldNames.value.value]);