hy-app 0.1.3 → 0.1.5

package/components/hy-icon/hy-icon.vue

@@ -30,7 +30,6 @@
 
 <script setup lang="ts">
 import { computed, type CSSProperties, toRefs } from "vue";
-import { ColorConfig, IconConfig } from "../../config";
 import { addUnit } from "../../utils";
 import defaultProps from "./props";
 import type IProps from "./typing";
@@ -53,10 +52,11 @@ const {
 const emit = defineEmits(["click"]);
 
 const uClasses = computed(() => {
-  let classes = [];
-  classes.push(`${customPrefix.value}-${name.value}`);
-  classes.push("iconfont");
-  classes.push(customPrefix.value);
+  let classes: string | string[] = [
+    "iconfont",
+    `${customPrefix.value}-${name.value}`,
+    customPrefix.value,
+  ];
   if (isRotate.value) classes.push("hy-rotate");
   if (color.value)
     // 主题色，通过类配置
@@ -77,11 +77,7 @@ const iconStyle = computed<CSSProperties>(() => {
     // 某些特殊情况需要设置一个到顶部的距离，才能更好的垂直居中
     top: addUnit(top.value),
     borderRadius: addUnit(round.value),
-    color: color.value
-      ? color.value
-      : name.value === IconConfig.LOADING
-        ? ColorConfig.primary
-        : "#606266",
+    color: color.value ? color.value : "#606266",
   };
 
   return style;

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

@@ -1,6 +1,6 @@
 import { CSSProperties } from "vue";
 
-export default interface IProps {
+export default interface HyIconProps {
   /**
    * @description 图标名称，见示例图标集
    * */

package/components/hy-image/hy-image.vue

@@ -65,9 +65,13 @@ import {
 } from "vue";
 import defaultProps from "./props";
 import type IProps from "./typing";
-import HyTransition from "../hy-transition/hy-transition.vue";
 import { addUnit, getPx } from "../../utils";
 
+// 组件
+
+import HyTransition from "../hy-transition/hy-transition.vue";
+import HyIcon from "../hy-icon/hy-icon.vue";
+
 const props = withDefaults(defineProps<IProps>(), defaultProps);
 const {
   customStyle,

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

@@ -1,6 +1,6 @@
 import type { CSSProperties } from "vue";
 
-export default interface IProps {
+export default interface HyImageProps {
   /**
    * @description 图片地址
    * */

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,6 +1,6 @@
 import type { CSSProperties } from "vue";
 
-export default interface IProps {
+export default interface HyLoadingProps {
   /**
    * @description 是否显示组件 (默认 true)
    * */
@@ -20,7 +20,7 @@ export default interface IProps {
   /**
    * @description 模式选择，见官网说明（默认 'circle' ）
    * */
-  mode?: "spinner" | "circle" | "semicircle";
+  mode?: HyApp.LoadingMode;
   /**
    * @description 加载图标的大小，单位px （默认 24 ）
    * */

package/components/hy-login/TheUserLogin.vue

@@ -47,6 +47,8 @@
           :clearable="true"
           border="bottom"
           :password-icon="false"
+          @change="handleChange($event, record)"
+          @blur="handleBlur($event, record)"
         >
           <!-- #ifndef APP-PLUS-NVUE -->
           <template #prefix>
@@ -64,84 +66,13 @@
         </HyInput>
       </template>
     </HyForm>
-    <!--    <u-form-->
-    <!--      :model="userForm"-->
-    <!--      ref="form_1Ref"-->
-    <!--      :rules="userRules"-->
-    <!--      labelWidth="30"-->
-    <!--    >-->
-    <!--      &lt;!&ndash;账户输入&ndash;&gt;-->
-    <!--      <u-form-item prop="name">-->
-    <!--        <u-input-->
-    <!--          v-model="userForm.name"-->
-    <!--          :placeholder="userPlaceholder"-->
-    <!--          :clearable="true"-->
-    <!--          border="bottom"-->
-    <!--        >-->
-    <!--          &lt;!&ndash; #ifndef APP-PLUS-NVUE &ndash;&gt;-->
-    <!--          <template #prefix>-->
-    <!--            <u-icon name="account" :color="themeColor"></u-icon>-->
-    <!--          </template>-->
-    <!--          <template #suffix>-->
-    <!--            <u-icon-->
-    <!--              :name="!showChoice ? 'arrow-down-fill' : 'arrow-up-fill'"-->
-    <!--              @tap="showChoice = !showChoice"-->
-    <!--              :color="themeColor"-->
-    <!--            ></u-icon>-->
-    <!--            <view class="dialog-view" v-if="showChoice && choiceList.length">-->
-    <!--              <view-->
-    <!--                class="dialog-title"-->
-    <!--                v-for="(item, index) in choiceList"-->
-    <!--                :key="index"-->
-    <!--                @click="btnChoiceClick(index)"-->
-    <!--              >-->
-    <!--                {{ item.user }}-->
-    <!--              </view>-->
-    <!--            </view>-->
-    <!--          </template>-->
-    <!--          &lt;!&ndash; #endif &ndash;&gt;-->
-    <!--        </u-input>-->
-    <!--      </u-form-item>-->
 
-    <!--      &lt;!&ndash;密码输入&ndash;&gt;-->
-    <!--      <u-form-item prop="pwd">-->
-    <!--        <u-input-->
-    <!--          :type="showPwd ? 'input' : 'password'"-->
-    <!--          v-model="userForm.pwd"-->
-    <!--          :placeholder="pwdPlaceholder"-->
-    <!--          :clearable="true"-->
-    <!--          border="bottom"-->
-    <!--          :password-icon="false"-->
-    <!--        >-->
-    <!--          &lt;!&ndash; #ifndef APP-PLUS-NVUE &ndash;&gt;-->
-    <!--          <template #prefix>-->
-    <!--            <u-icon name="lock" :color="themeColor"></u-icon>-->
-    <!--          </template>-->
-    <!--          <template v-if="isShowPwd" #suffix>-->
-    <!--            <u-icon-->
-    <!--              size="16"-->
-    <!--              @click="showPasswordFn"-->
-    <!--              color="#c8c9cc"-->
-    <!--              :name="showPwd ? 'eye-fill' : 'eye-off'"-->
-    <!--            ></u-icon>-->
-    <!--          </template>-->
-    <!--          &lt;!&ndash; #endif &ndash;&gt;-->
-    <!--        </u-input>-->
-    <!--      </u-form-item>-->
-    <!--    </u-form>-->
     <!-- 记住密码 -->
     <view class="mui-input-row mui-checkbox">
-      <!--      <u-checkbox-group v-model="rememberPassword" @change="checkboxChange">-->
-      <!--        <u-checkbox-->
-      <!--          label="记住密码"-->
-      <!--          name="1"-->
-      <!--          :active-color="themeColor"-->
-      <!--        ></u-checkbox>-->
-      <!--      </u-checkbox-group>-->
-
       <HyCheckbox
         :columns="rememberList"
         shape="square"
+        :active-color="themeColor"
         v-model="rememberPassword"
         @change="checkboxChange"
       ></HyCheckbox>
@@ -155,7 +86,8 @@ import { onHide } from "@dcloudio/uni-app";
 import { storeToRefs } from "pinia";
 import { useUserInfo } from "../../store";
 import { decryptData, encryptData } from "../../utils";
-import type { FormColumnsType, FormTypeEnum } from "../../typing";
+import type { FormColumnsType } from "../../typing";
+import { FormTypeEnum } from "../../typing";
 import { IconConfig } from "../../config";
 
 // 组件