hy-app 0.1.3 → 0.1.4

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' }]"
@@ -115,10 +113,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,

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

@@ -36,7 +36,7 @@ export default interface IProps {
   /**
    * @description 加载状态图标类型 （默认 'spinner' ）
    * */
-  loadingMode?: "spinner" | "text";
+  loadingMode?: HyApp.LoadingMode;
   /**
    * @description 加载图标大小 （默认 13 ）
    * */

package/components/hy-divider/index.scss

@@ -6,6 +6,7 @@
   flex-direction: row;
   justify-content: center;
   align-items: center;
+  min-height: 35px;
 
   &__line {
     /* #ifndef APP-NVUE */

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

@@ -58,7 +58,14 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, type CSSProperties, onMounted, ref, toRefs } from "vue";
+import {
+  computed,
+  type CSSProperties,
+  getCurrentInstance,
+  onMounted,
+  ref,
+  toRefs,
+} from "vue";
 import type IProps from "./typing";
 import type { MenusType } from "./typing";
 import defaultProps from "./props";
@@ -81,10 +88,10 @@ const {
   size,
   fixed,
   direction,
-  opacity,
 } = toRefs(props);
 const emit = defineEmits(["click", "clickItem"]);
 
+const instance = getCurrentInstance();
 const btnSize: AnyObject = {
   small: "50px",
   medium: "60px",
@@ -168,7 +175,7 @@ const menusStyle = computed(() => {
 
 onMounted(() => {
   const { windowWidth } = getWindowInfo();
-  getRect(`#${soleId}`).then((rect) => {
+  getRect(`#${soleId}`, false, instance).then((rect) => {
     const { left } = rect as UniApp.NodeInfo;
     if (left && left > windowWidth / 2) showLeft.value = true;
   });
@@ -198,4 +205,13 @@ const handleMenuItemClick = (temp: MenusType, index: number) => {
 
 <style scoped lang="scss">
 @import "./index.scss";
+.hy-float-button {
+  &__container {
+    rotate: v-bind(rotate);
+  }
+  &__menus {
+    display: flex;
+    flex-direction: v-bind(direction);
+  }
+}
 </style>

package/components/hy-float-button/index.scss

@@ -37,7 +37,6 @@
     @include flex(column);
     justify-content: center;
     align-items: center;
-    rotate: v-bind(rotate);
     transition: 0.4s ease;
   }
 
@@ -45,7 +44,6 @@
     position: absolute;
     z-index: -1;
     overflow: hidden;
-    @include flex(v-bind(direction));
     max-height: 250px;
     box-sizing: border-box;
     &--item {

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

@@ -23,7 +23,7 @@ export default interface IProps {
    * center - 中间对齐
    * right - 右对齐
    * */
-  labelAlign?: HyApp.CenterType;
+  labelAlign?: HyApp.RowCenterType;
   /**
    * @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-loading/typing.d.ts

@@ -1,4 +1,5 @@
 import type { CSSProperties } from "vue";
+import type { LoadingMode } from "@/package/typing/modules/common";
 
 export default interface IProps {
   /**
@@ -20,7 +21,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";
 
 // 组件

package/components/hy-notice-bar/hy-row-notice.vue

@@ -41,7 +41,14 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch, toRefs, computed, type CSSProperties } from "vue";
+import {
+  ref,
+  watch,
+  toRefs,
+  computed,
+  type CSSProperties,
+  getCurrentInstance,
+} from "vue";
 import type IProps from "./typing";
 import defaultProps from "./props";
 import { addUnit, getRect, sleep } from "../../utils";
@@ -53,6 +60,7 @@ const props = withDefaults(defineProps<IProps>(), defaultProps);
 const { text, speed, fontSize, color } = toRefs(props);
 const emit = defineEmits(["click", "close"]);
 
+const instance = getCurrentInstance();
 const animationDuration = ref<string>("0"); // 动画执行时间
 const animationPlayState = ref<string>("paused"); // 动画的开始和结束执行
 const initValue = ref<string>("");
@@ -66,8 +74,9 @@ watch(
     // 进行一定的延时
     await sleep();
     // 查询盒子和文字的宽度
-    textWidth = (await getRect(".hy-notice__content__text")).width;
-    boxWidth = (await getRect(".hy-notice__content")).width;
+    textWidth = (await getRect(".hy-notice__content__text", false, instance))
+      .width;
+    boxWidth = (await getRect(".hy-notice__content", false, instance)).width;
     // 根据t=s/v(时间=路程/速度)，这里为何不需要加上#u-notice-box的宽度，因为中设置了.u-notice-content样式中设置了padding-left: 100%
     // 恰巧计算出来的结果中已经包含了#u-notice-box的宽度
     animationDuration.value = `${textWidth / speed.value}s`;