hy-app 0.1.4 → 0.1.5

package/components/hy-input/hy-input.vue

@@ -6,13 +6,22 @@
     <view class="hy-input__content">
       <view
         class="hy-input__content__prefix-icon"
-        v-if="prefixIcon || $slots.prefix"
+        v-if="prefixIcon?.name || $slots.prefix"
       >
         <slot name="prefix">
           <HyIcon
-            :name="prefixIcon"
-            size="18"
-            :customStyle="prefixIconStyle"
+            :name="prefixIcon?.name"
+            :size="prefixIcon?.size"
+            :color="prefixIcon?.color"
+            :bold="prefixIcon?.bold"
+            :customPrefix="prefixIcon?.customPrefix"
+            :imgMode="prefixIcon?.imgMode"
+            :width="prefixIcon?.width"
+            :height="prefixIcon?.height"
+            :top="prefixIcon?.top"
+            :stop="prefixIcon?.stop"
+            :round="prefixIcon?.round"
+            :customStyle="prefixIcon?.customStyle"
           ></HyIcon>
         </slot>
       </view>
@@ -65,13 +74,22 @@
       </view>
       <view
         class="hy-input__content__subfix-icon"
-        v-if="suffixIcon || $slots.suffix"
+        v-if="suffixIcon?.name || $slots.suffix"
       >
         <slot name="suffix">
           <HyIcon
-            :name="suffixIcon"
-            size="18"
-            :customStyle="suffixIconStyle"
+            :name="suffixIcon?.name"
+            :size="suffixIcon?.size"
+            :color="suffixIcon?.color"
+            :bold="suffixIcon?.bold"
+            :customPrefix="suffixIcon?.customPrefix"
+            :imgMode="suffixIcon?.imgMode"
+            :width="suffixIcon?.width"
+            :height="suffixIcon?.height"
+            :top="suffixIcon?.top"
+            :stop="suffixIcon?.stop"
+            :round="suffixIcon?.round"
+            :customStyle="suffixIcon?.customStyle"
           ></HyIcon>
         </slot>
       </view>
@@ -312,17 +330,10 @@ const onClear = () => {
  * 无法触发u-form-item的点击事件，这里通过手动调用u-form-item的方法进行触发
  */
 const clickHandler = () => {
+  // 隐藏键盘
   if (disabled.value || readonly.value) {
     uni.hideKeyboard();
   }
-  // #ifdef APP-NVUE
-  if (os() === "android") {
-    const formItem = $parent.call(this, "u-form-item");
-    if (formItem) {
-      formItem.clickHandler();
-    }
-  }
-  // #endif
 };
 </script>
 

package/components/hy-input/props.ts

@@ -27,10 +27,8 @@ const defaultProps: IProps = {
   inputAlign: "left",
   fontSize: "15px",
   color: "#303133",
-  prefixIcon: "",
-  prefixIconStyle: {},
-  suffixIcon: "",
-  suffixIconStyle: {},
+  prefixIcon: {},
+  suffixIcon: {},
   border: "surround",
   readonly: false,
   shape: "square",

package/components/hy-input/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 HyInputProps {
   /**
    * @description 输入的值
    * */
@@ -96,7 +97,7 @@ export default interface IProps {
   /**
    * @description 输入框内容对齐方式（ 默认 'left' ）
    * */
-  inputAlign?: "center" | HyApp.LeftRightType;
+  inputAlign?: HyApp.RowCenterType;
   /**
    * @description 输入框字体的大小 （ 默认 '15px' ）
    * */
@@ -108,19 +109,11 @@ export default interface IProps {
   /**
    * @description 输入框前置图标
    * */
-  prefixIcon?: string;
-  /**
-   * @description 前置图标样式，对象或字符串
-   * */
-  prefixIconStyle?: CSSProperties;
+  prefixIcon?: Partial<HyIconProps>;
   /**
    * @description 输入框后置图标
    * */
-  suffixIcon?: string;
-  /**
-   * @description 后置图标样式，对象或字符串
-   * */
-  suffixIconStyle?: CSSProperties;
+  suffixIcon?: Partial<HyIconProps>;
   /**
    * @description 边框类型，surround-四周边框，bottom-底部边框，none-无边框 （ 默认 'surround' ）
    * */

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

@@ -1,6 +1,6 @@
 import type { CSSProperties } from "vue";
 
-export default interface IProps {
+export default interface HyLineProps {
   /**
    * @description 线条的颜色 ( 默认 '#d6d7d9' )
    * */

package/components/hy-line-progress/typing.d.ts

@@ -1,6 +1,6 @@
 import type { CSSProperties } from "vue";
 
-export default interface IProps {
+export default interface HyLineProgressProps {
   /**
    * @description 激活部分的颜色 ( 默认 '#19be6b' )
    * */

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

@@ -1,4 +1,4 @@
-export default interface IProps {
+export default interface HyListProps {
   /**
    * @description 数据列表
    * */

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

@@ -1,7 +1,6 @@
 import type { CSSProperties } from "vue";
-import type { LoadingMode } from "@/package/typing/modules/common";
 
-export default interface IProps {
+export default interface HyLoadingProps {
   /**
    * @description 是否显示组件 (默认 true)
    * */