hy-app 0.4.15 → 0.5.1

package/components/hy-slider/props.ts

@@ -1,21 +1,77 @@
-import type IProps from "./typing";
-import { ColorConfig } from "../../libs/config";
+import type { CSSProperties, PropType } from 'vue'
 
-const defaultProps: IProps = {
-  modelValue: 0,
-  blockSize: 18,
-  min: 0,
-  max: 100,
-  step: 1,
-  activeColor: "",
-  inactiveColor: "",
-  blockColor: "",
-  showValue: false,
-  disabled: false,
-  useNative: false,
-  height: "2px",
-  rangeValue: [0, 0],
-  isRange: false,
-};
+const sliderProps = {
+    /** 滑块默认值 */
+    modelValue: {
+        type: Number,
+        default: 0
+    },
+    /** 滑块的大小，取值范围为 12 - 28 */
+    blockSize: {
+        type: [String, Number],
+        default: 18
+    },
+    /** 最小值 */
+    min: {
+        type: Number,
+        default: 0
+    },
+    /** 最大值 */
+    max: {
+        type: Number,
+        default: 100
+    },
+    /** 步长 */
+    step: {
+        type: Number,
+        default: 1
+    },
+    /** 底部选择部分的背景颜色 */
+    activeColor: String,
+    /** 底部条背景颜色 */
+    inactiveColor: String,
+    /** 滑块颜色 */
+    blockColor: String,
+    /** 是否显示当前的选择值 */
+    showValue: {
+        type: Boolean,
+        default: false
+    },
+    /** 是否禁用滑块 */
+    disabled: {
+        type: Boolean,
+        default: false
+    },
+    /** 是否渲染uni-app框架内置组件 */
+    useNative: {
+        type: Boolean,
+        default: false
+    },
+    /** 滑块条高度，单位rpx */
+    height: {
+        type: [String, Number],
+        default: 2
+    },
+    /** 双滑块时值 */
+    rangeValue: {
+        type: Array as PropType<number[]>,
+        default: [0, 0]
+    },
+    /** 是否区间的模式 */
+    isRange: {
+        type: Boolean,
+        default: false
+    },
+    /** 给滑块自定义样式，对象形式 */
+    blockStyle: {
+        type: Object as PropType<CSSProperties>
+    },
+    /** 定义需要用到的外部样式 */
+    customStyle: {
+        type: Object as PropType<CSSProperties>
+    },
+    /** 自定义外部类名 */
+    customClass: String
+}
 
-export default defaultProps;
+export default sliderProps

package/components/hy-steps/hy-steps.vue

@@ -1,334 +1,267 @@
 <template>
-  <view :class="[`hy-steps--${direction}`, 'hy-steps']">
-    <template v-for="(item, i) in list" :key="i">
-      <view
-        ref="hy-steps-item"
-        :class="[`hy-steps-item--${direction}`, 'hy-steps-item']"
-      >
-        <!--	线条	-->
-        <view
-          v-if="i > 0"
-          :class="[
-            `hy-steps-item__line--${direction}`,
-            'hy-steps-item__line',
-            statusClass(i, item.error),
-          ]"
-          :style="lineStyle(item, i)"
-        ></view>
-        <!--	线条	-->
+    <view :class="[`hy-steps--${direction}`, 'hy-steps']">
+        <template v-for="(item, i) in list" :key="i">
+            <view ref="hy-steps-item" :class="[`hy-steps-item--${direction}`, 'hy-steps-item']">
+                <!--	线条	-->
+                <view
+                    v-if="i > 0"
+                    :class="[
+                        `hy-steps-item__line--${direction}`,
+                        'hy-steps-item__line',
+                        statusClass(i, item.error)
+                    ]"
+                    :style="lineStyle(item, i)"
+                ></view>
+                <!--	线条	-->
 
-        <!-- 步骤状态 -->
-        <view
-          :class="[
-            `hy-steps-item__wrapper--${direction}`,
-            dot ? `hy-steps-item__wrapper--dot` : statusClass(i, item.error),
-            'hy-steps-item__wrapper',
-          ]"
-          :style="itemStyleInner"
-        >
-          <slot
-            v-if="$slots.icon"
-            name="icon"
-            :error="item?.error"
-            :index="i"
-          ></slot>
-          <template v-else>
-            <view
-              :class="[
-                'hy-steps-item__wrapper--dot__item',
-                `hy-steps-item__wrapper--dot__${statusClass(i, item.error)}`,
-              ]"
-              v-if="dot"
-              :style="{
-                backgroundColor: statusColor(i, item?.error),
-              }"
-            ></view>
-            <view
-              class="hy-steps-item__wrapper__icon"
-              v-else-if="activeIcon || inactiveIcon"
-            >
-              <HyIcon
-                :name="i <= current ? activeIcon : inactiveIcon"
-                :size="iconSize"
-                :color="i <= current ? activeColor : inactiveColor"
-              ></HyIcon>
-            </view>
-            <view
-              v-else
-              :style="{
-                backgroundColor:
-                  statusClass(i, item.error) === 'process'
-                    ? activeColor
-                    : 'transparent',
-                borderColor: statusColor(i, item?.error),
-              }"
-              class="hy-steps-item__wrapper__circle"
-            >
-              <text
-                v-if="
-                  statusClass(i, item.error) === 'process' ||
-                  statusClass(i, item.error) === 'wait'
-                "
-                class="hy-steps-item__wrapper__circle__text"
-                :style="{
-                  color: textColor(i),
-                }"
-              >
-                {{ i + 1 }}
-              </text>
-              <HyIcon
-                v-else
-                :color="
-                  statusClass(i, item.error) === 'error' ? 'error' : activeColor
-                "
-                :size="iconSize"
-                :name="
-                  statusClass(i, item.error) === 'error'
-                    ? IconConfig.CLOSE
-                    : IconConfig.CHECK_MASK
-                "
-              ></HyIcon>
-            </view>
-          </template>
-        </view>
-        <!-- 步骤状态 -->
+                <!-- 步骤状态 -->
+                <view
+                    :class="[
+                        `hy-steps-item__wrapper--${direction}`,
+                        dot ? `hy-steps-item__wrapper--dot` : statusClass(i, item.error),
+                        'hy-steps-item__wrapper'
+                    ]"
+                    :style="itemStyleInner"
+                >
+                    <slot v-if="$slots.icon" name="icon" :error="item?.error" :index="i"></slot>
+                    <template v-else>
+                        <view
+                            :class="[
+                                'hy-steps-item__wrapper--dot__item',
+                                `hy-steps-item__wrapper--dot__${statusClass(i, item.error)}`
+                            ]"
+                            v-if="dot"
+                            :style="{
+                                backgroundColor: statusColor(i, item?.error)
+                            }"
+                        ></view>
+                        <view
+                            class="hy-steps-item__wrapper__icon"
+                            v-else-if="activeIcon || inactiveIcon"
+                        >
+                            <hy-icon
+                                :name="i <= current ? activeIcon : inactiveIcon"
+                                :size="iconSize"
+                                :color="i <= current ? activeColor : inactiveColor"
+                            ></hy-icon>
+                        </view>
+                        <view
+                            v-else
+                            :style="{
+                                backgroundColor:
+                                    statusClass(i, item.error) === 'process'
+                                        ? activeColor
+                                        : 'transparent',
+                                borderColor: statusColor(i, item?.error)
+                            }"
+                            class="hy-steps-item__wrapper__circle"
+                        >
+                            <text
+                                v-if="
+                                    statusClass(i, item.error) === 'process' ||
+                                    statusClass(i, item.error) === 'wait'
+                                "
+                                class="hy-steps-item__wrapper__circle__text"
+                                :style="{
+                                    color: textColor(i)
+                                }"
+                            >
+                                {{ i + 1 }}
+                            </text>
+                            <hy-icon
+                                v-else
+                                :color="
+                                    statusClass(i, item.error) === 'error' ? 'error' : activeColor
+                                "
+                                :size="iconSize"
+                                :name="
+                                    statusClass(i, item.error) === 'error'
+                                        ? IconConfig.CLOSE
+                                        : IconConfig.CHECK_MASK
+                                "
+                            ></hy-icon>
+                        </view>
+                    </template>
+                </view>
+                <!-- 步骤状态 -->
 
-        <!-- 内容区域 -->
-        <view
-          class="hy-steps-item__content"
-          :class="[`hy-steps-item__content--${direction}`]"
-          :style="[contentStyle]"
-        >
-          <slot
-            v-if="$slots.content"
-            name="content"
-            :record="item"
-            :index="i"
-          ></slot>
-          <template v-else>
-            <slot
-              v-if="$slots.title"
-              name="title"
-              :title="item.title"
-              :index="i"
-            ></slot>
-            <text v-else :class="titleClass(i, item.error)">
-              {{ item.title }}
-            </text>
-            <slot
-              v-if="$slots.desc"
-              name="desc"
-              :desc="item.desc"
-              :index="i"
-            ></slot>
-            <text v-else :style="{ fontSize: '12px', color: '#999' }">{{
-              item.desc
-            }}</text>
-          </template>
-        </view>
-        <!-- 内容区域 -->
-      </view>
-    </template>
-  </view>
+                <!-- 内容区域 -->
+                <view
+                    class="hy-steps-item__content"
+                    :class="[`hy-steps-item__content--${direction}`]"
+                    :style="[contentStyle]"
+                >
+                    <slot v-if="$slots.content" name="content" :record="item" :index="i"></slot>
+                    <template v-else>
+                        <slot
+                            v-if="$slots.title"
+                            name="title"
+                            :title="item.title"
+                            :index="i"
+                        ></slot>
+                        <text v-else :class="titleClass(i, item.error)">
+                            {{ item.title }}
+                        </text>
+                        <slot v-if="$slots.desc" name="desc" :desc="item.desc" :index="i"></slot>
+                        <text v-else :style="{ fontSize: '12px', color: '#999' }">{{
+                            item.desc
+                        }}</text>
+                    </template>
+                </view>
+                <!-- 内容区域 -->
+            </view>
+        </template>
+    </view>
 </template>
 
 <script lang="ts">
 export default {
-  name: "hy-steps",
-  options: {
-    addGlobalClass: true,
-    virtualHost: true,
-    styleIsolation: "shared",
-  },
-};
+    name: 'hy-steps',
+    options: {
+        addGlobalClass: true,
+        virtualHost: true,
+        styleIsolation: 'shared'
+    }
+}
 </script>
 
 <script setup lang="ts">
-import { computed, ref, onMounted, getCurrentInstance, watch } from "vue";
-import type { CSSProperties, PropType } from "vue";
-import type { IStepsEmits } from "./typing";
-import type { StepListVo } from "./typing";
-import { addUnit, getRect, ColorConfig, IconConfig } from "../../libs";
+import { computed, ref, onMounted, getCurrentInstance, watch } from 'vue'
+import type { CSSProperties } from 'vue'
+import type { IStepsEmits } from './typing'
+import type { StepListVo } from './typing'
+import { addUnit, getRect, ColorConfig, IconConfig } from '../../libs'
+import stepsProps from './props'
+// 组件
+import HyIcon from '../hy-icon/hy-icon.vue'
 
 /**
  * 一般用于完成一个任务要分几个步骤，标识目前处于第几步的场景。
  * @displayName hy-steps
  */
-defineOptions({});
-
-// 组件
-import HyIcon from "../hy-icon/hy-icon.vue";
+defineOptions({})
 
-// const props = withDefaults(defineProps<IProps>(), defaultProps)
-const props = defineProps({
-  /** 设置当前处于第几步 */
-  current: {
-    type: Number,
-    default: 0,
-  },
-  /** 步骤条的数据集 */
-  list: {
-    type: Array as PropType<StepListVo[]>,
-    default: [],
-  },
-  /**
-   * 方向
-   * @values row,column
-   * */
-  direction: {
-    type: String,
-    default: "row",
-  },
-  /** 激活状态颜色 */
-  activeColor: {
-    type: String,
-    default: "",
-  },
-  /** 未激活状态颜色 */
-  inactiveColor: {
-    type: String,
-    default: "",
-  },
-  /** 激活状态的图标 */
-  activeIcon: String,
-  /** 未激活状态图标 */
-  inactiveIcon: String,
-  /** 是否显示点类型 */
-  dot: {
-    type: Boolean,
-    default: false,
-  },
-  /** 图标大小 */
-  iconSize: {
-    type: [String, Number],
-    default: 17,
-  },
-});
-const emit = defineEmits<IStepsEmits>();
+const props = defineProps(stepsProps)
+const emit = defineEmits<IStepsEmits>()
 
 const size = ref<UniApp.NodeInfo>({
-  height: 0,
-  width: 0,
-});
-const instance = getCurrentInstance();
+    height: 0,
+    width: 0
+})
+const instance = getCurrentInstance()
 
 watch(
-  () => props.current,
-  (newVal: number) => {
-    if (props.list[newVal - 1]?.error) {
-      const index = props.list.findIndex((item) => item.error);
-      emit("update:current", index);
-      emit("change", index);
+    () => props.current,
+    (newVal: number) => {
+        if (props.list[newVal - 1]?.error) {
+            const index = props.list.findIndex((item) => item.error)
+            emit('update:current', index)
+            emit('change', index)
+        }
     }
-  },
-);
+)
 
 // 字体标题类名
 const titleClass = computed(() => {
-  return (index: number, error: boolean) => {
-    const classes = ["hy-steps-item__content__title"];
-    if (props.current === index) {
-      classes.push("hy-steps-item__content__title--active");
+    return (index: number, error: boolean) => {
+        const classes = ['hy-steps-item__content__title']
+        if (props.current === index) {
+            classes.push('hy-steps-item__content__title--active')
 
-      if (error) {
-        classes.push("hy-steps-item__content__title--error");
-      }
-    }
+            if (error) {
+                classes.push('hy-steps-item__content__title--error')
+            }
+        }
 
-    return classes;
-  };
-});
+        return classes
+    }
+})
 // 字体颜色
 const textColor = computed(() => {
-  return (index: number) =>
-    index === props.current ? "#ffffff" : props.inactiveColor;
-});
+    return (index: number) => (index === props.current ? '#ffffff' : props.inactiveColor)
+})
 
 /**
  * @description 线条样式
  * */
 const lineStyle = computed(() => {
-  return (temp: StepListVo, index: number): CSSProperties => {
-    const style: CSSProperties = {};
-    if (props.direction === "row") {
-      style.width = addUnit(size.value.width! - 25);
-      style.left = addUnit(-size.value.width! / 2 + 12);
-    } else {
-      style.height = addUnit(size.value.height! - 30);
-      style.top = addUnit(25);
+    return (temp: StepListVo, index: number): CSSProperties => {
+        const style: CSSProperties = {}
+        if (props.direction === 'row') {
+            style.width = addUnit(size.value.width! - 25)
+            style.left = addUnit(-size.value.width! / 2 + 12)
+        } else {
+            style.height = addUnit(size.value.height! - 30)
+            style.top = addUnit(25)
+        }
+        style.backgroundColor = temp.error ? '' : index < props.current ? '' : props.inactiveColor
+        return style
     }
-    style.backgroundColor = temp.error
-      ? ""
-      : index < props.current
-        ? ""
-        : props.inactiveColor;
-    return style;
-  };
-});
+})
 
 const itemStyleInner = computed(() => {
-  return {};
-});
+    return {}
+})
 /**
  * @description 状态类名
  * */
 const statusClass = computed(() => {
-  return (index: number, error: boolean = false) => {
-    if (props.current == index) {
-      return error ? "error" : "process";
-    } else if (props.current > index) {
-      return "finish";
-    } else {
-      return "wait";
+    return (index: number, error: boolean = false) => {
+        if (props.current == index) {
+            return error ? 'error' : 'process'
+        } else if (props.current > index) {
+            return 'finish'
+        } else {
+            return 'wait'
+        }
     }
-  };
-});
+})
 const statusColor = computed(() => {
-  return (index: number, error?: boolean) => {
-    let colorTmp: string | number;
-    switch (statusClass.value(index, error)) {
-      case "finish":
-        colorTmp = props.activeColor;
-        break;
-      case "error":
-        colorTmp = ColorConfig.error;
-        break;
-      case "process":
-        colorTmp = props.dot ? props.current : "transparent";
-        break;
-      default:
-        colorTmp = props.inactiveColor;
-        break;
+    return (index: number, error?: boolean) => {
+        let colorTmp: string | number
+        switch (statusClass.value(index, error)) {
+            case 'finish':
+                colorTmp = props.activeColor
+                break
+            case 'error':
+                colorTmp = ColorConfig.error
+                break
+            case 'process':
+                colorTmp = props.dot ? props.current : 'transparent'
+                break
+            default:
+                colorTmp = props.inactiveColor
+                break
+        }
+        return colorTmp
     }
-    return colorTmp;
-  };
-});
+})
 
 const contentStyle = computed<CSSProperties>(() => {
-  const style: CSSProperties = {};
-  if (props.direction === "column") {
-    style.marginLeft = props.dot ? "2px" : "6px";
-    style.marginTop = props.dot ? "0px" : "6px";
-  } else {
-    style.marginTop = props.dot ? "2px" : "6px";
-    style.marginLeft = props.dot ? "2px" : "6px";
-  }
+    const style: CSSProperties = {}
+    if (props.direction === 'column') {
+        style.marginLeft = props.dot ? '2px' : '6px'
+        style.marginTop = props.dot ? '0px' : '6px'
+    } else {
+        style.marginTop = props.dot ? '2px' : '6px'
+        style.marginLeft = props.dot ? '2px' : '6px'
+    }
 
-  return style;
-});
+    return style
+})
 
 onMounted(() => {
-  getStepsItemRect();
-});
+    getStepsItemRect()
+})
 
 // 获取组件的尺寸，用于设置横线的位置
 const getStepsItemRect = () => {
-  getRect(".hy-steps-item", false, instance).then((rect) => {
-    size.value = rect as UniApp.NodeInfo;
-  });
-};
+    getRect('.hy-steps-item', false, instance).then((rect) => {
+        size.value = rect as UniApp.NodeInfo
+    })
+}
 </script>
 
 <style lang="scss" scoped>
-@import "./index.scss";
+@import './index.scss';
 </style>