uview-pro 0.2.1 → 0.2.2

package/components/u-collapse-item/u-collapse-item.vue

@@ -1,201 +1,213 @@
-<template>
-    <view class="u-collapse-item" :style="`${$u.toStyle(itemStyle)}${$u.toStyle(customStyle)}`" :class="customClass">
-        <view :hover-stay-time="200" class="u-collapse-head" @tap.stop="headClick" :hover-class="hoverClass" :style="headStyle">
-            <template v-if="!slots['title-all']">
-                <view v-if="!slots['title']" class="u-collapse-title u-line-1" :style="[{ textAlign: align ? align : 'left' }, isShow && activeStyle && !arrow ? activeStyle : '']">
-                    {{ title }}
-                </view>
-                <slot v-else name="title" />
-                <view class="u-icon-wrap">
-                    <u-icon v-if="arrow" :color="arrowColor" :class="{ 'u-arrow-down-icon-active': isShow }" class="u-arrow-down-icon" name="arrow-down" />
-                </view>
-            </template>
-            <slot v-else name="title-all" />
-        </view>
-
-        <view class="u-collapse-body" :style="{ height: isShow ? height : '0' }">
-            <view class="u-collapse-content" :id="elId" :style="bodyStyle">
-                <slot></slot>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script lang="ts">
-export default {
-    name: 'u-collapse-item',
-    options: {
-        addGlobalClass: true,
-        virtualHost: true,
-        styleIsolation: 'shared'
-    }
-};
-</script>
-
-<script setup lang="ts">
-import { ref, watch, onMounted, useSlots, getCurrentInstance, nextTick, inject } from 'vue';
-import { $u, toStyle } from '../..';
-import { CollapseItemProps } from './types';
-import { useParent } from '../../libs/hooks/useParent';
-
-/**
- * collapseItem 手风琴Item
- * @description 通过折叠面板收纳内容区域（搭配u-collapse使用）
- * @tutorial https://uviewpro.cn/zh/components/collapse.html
- * @property {String} title 面板标题
- * @property {String Number} index 主要用于事件的回调，标识那个Item被点击
- * @property {Boolean} disabled 面板是否可以打开或收起（默认false）
- * @property {Boolean} open 设置某个面板的初始状态是否打开（默认false）
- * @property {String Number} name 唯一标识符，如不设置，默认用当前collapse-item的索引值
- * @property {String} align 标题的对齐方式（默认left）
- * @property {Object} active-style 不显示箭头时，可以添加当前选择的collapse-item活动样式，对象形式
- * @event {Function} change 某个item被打开或者收起时触发
- * @example <u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index">{{item.body}}</u-collapse-item>
- */
-const props = defineProps(CollapseItemProps);
-const emit = defineEmits(['change']);
-const slots = useSlots();
-const instance = getCurrentInstance();
-
-const isShow = ref(false);
-const elId = ref('');
-const height = ref('0'); // body内容的高度
-const headStyle = ref<Record<string, any>>({}); // 头部样式，对象形式
-const bodyStyle = ref<Record<string, any>>({}); // 主体部分样式
-const itemStyle = ref<Record<string, any>>({}); // 每个item的整体样式
-const arrowColor = ref(''); // 箭头的颜色
-const hoverClass = ref(''); // 头部按下时的效果样式类
-const accordion = ref(true); // 是否显示右侧箭头
-const arrow = ref(true);
-
-const { parent, parentExposed } = useParent('u-collapse');
-
-watch(
-    () => props.open,
-    val => {
-        isShow.value = val;
-    },
-    { immediate: true }
-);
-
-/**
- * 异步获取内容，或者动态修改了内容时，需要重新初始化
- */
-function init() {
-    if (parent) {
-        headStyle.value = parentExposed.props.headStyle;
-        bodyStyle.value = parentExposed.props.bodyStyle;
-        arrowColor.value = parentExposed.props.arrowColor;
-        hoverClass.value = parentExposed.props.hoverClass;
-        arrow.value = parentExposed.props.arrow;
-        itemStyle.value = parentExposed.props.itemStyle;
-        accordion.value = parentExposed.props.accordion;
-    }
-    elId.value = $u.guid();
-    nextTick(() => {
-        queryRect();
-    });
-}
-
-/**
- * 点击collapse head头部
- */
-function headClick() {
-    if (props.disabled) return;
-    if (accordion.value && parent) {
-        parent.children.forEach((vm: any) => {
-            if (vm.exposed.elId.value !== elId.value) {
-                vm.exposed.isShow.value = false;
-            } else {
-                vm.exposed.isShow.value = !vm.exposed.isShow.value;
-                emit('change', {
-                    index: props.index,
-                    show: vm.exposed.isShow.value
-                });
-            }
-        });
-    } else {
-        isShow.value = !isShow.value;
-        emit('change', {
-            index: props.index,
-            show: isShow.value
-        });
-    }
-    if (isShow.value) parentExposed && parentExposed.onChange && parentExposed.onChange(props.index);
-}
-
-/**
- * 查询内容高度
- */
-function queryRect() {
-    // getRect为uView自带的节点查询简化方法，详见文档介绍：https://uviewpro.cn/zh/tools/getRect.html
-    // 组件内部一般用this.$uGetRect，对外的为this.$u.getRect，二者功能一致，名称不同
-    $u.getRect('#' + elId.value, instance).then((res: any) => {
-        height.value = res.height + 'px';
-        // #ifdef MP-TOUTIAO
-        height.value = 'auto';
-        // #endif
-    });
-}
-
-onMounted(() => {
-    init();
-});
-
-defineExpose({
-    init,
-    isShow,
-    elId,
-    height,
-    headStyle,
-    bodyStyle,
-    itemStyle,
-    arrowColor,
-    hoverClass,
-    arrow
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../libs/css/style.components.scss';
-
-.u-collapse-head {
-    position: relative;
-    @include vue-flex;
-    justify-content: space-between;
-    align-items: center;
-    color: $u-main-color;
-    font-size: 30rpx;
-    line-height: 1;
-    padding: 24rpx 0;
-    text-align: left;
-}
-
-.u-collapse-title {
-    flex: 1;
-    overflow: hidden;
-}
-
-.u-arrow-down-icon {
-    transition: all 0.3s;
-    margin-right: 20rpx;
-    margin-left: 14rpx;
-}
-
-.u-arrow-down-icon-active {
-    transform: rotate(180deg);
-    transform-origin: center center;
-}
-
-.u-collapse-body {
-    overflow: hidden;
-    transition: all 0.3s;
-}
-
-.u-collapse-content {
-    overflow: hidden;
-    font-size: 28rpx;
-    color: $u-tips-color;
-    text-align: left;
-}
-</style>
+<template>
+    <view class="u-collapse-item" :style="`${$u.toStyle(itemStyle)}${$u.toStyle(customStyle)}`" :class="customClass">
+        <view :hover-stay-time="200" class="u-collapse-head" @tap.stop="headClick" :hover-class="hoverClass" :style="headStyle">
+            <template v-if="!slots['title-all']">
+                <view v-if="!slots['title']" class="u-collapse-title u-line-1" :style="titleStyle">
+                    {{ title }}
+                </view>
+                <slot v-else name="title" />
+                <view class="u-icon-wrap">
+                    <u-icon v-if="arrow" :color="arrowColor" :name="isShow ? 'arrow-up' : 'arrow-down'" />
+                </view>
+            </template>
+            <slot v-else name="title-all" />
+        </view>
+
+        <view class="u-collapse-body" :style="{ height: isShow ? height : '0' }">
+            <view class="u-collapse-content" :id="elId" :style="bodyStyle">
+                <slot></slot>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script lang="ts">
+export default {
+    name: 'u-collapse-item',
+    options: {
+        addGlobalClass: true,
+        virtualHost: true,
+        styleIsolation: 'shared'
+    }
+};
+</script>
+
+<script setup lang="ts">
+import { ref, watch, onMounted, useSlots, getCurrentInstance, nextTick, computed } from 'vue';
+import { $u } from '../..';
+import { CollapseItemProps } from './types';
+import { useParent } from '../../libs/hooks/useParent';
+
+/**
+ * collapseItem 手风琴Item
+ * @description 通过折叠面板收纳内容区域（搭配u-collapse使用）
+ * @tutorial https://uviewpro.cn/zh/components/collapse.html
+ * @property {String} title 面板标题
+ * @property {String Number} index 主要用于事件的回调，标识那个Item被点击
+ * @property {Boolean} disabled 面板是否可以打开或收起（默认false）
+ * @property {Boolean} open 设置某个面板的初始状态是否打开（默认false）
+ * @property {String Number} name 唯一标识符，如不设置，默认用当前collapse-item的索引值
+ * @property {String} align 标题的对齐方式（默认left）
+ * @property {Object} active-style 不显示箭头时，可以添加当前选择的collapse-item活动样式，对象形式
+ * @event {Function} change 某个item被打开或者收起时触发
+ * @example <u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index">{{item.body}}</u-collapse-item>
+ */
+const props = defineProps(CollapseItemProps);
+const emit = defineEmits(['change']);
+const slots = useSlots();
+const instance = getCurrentInstance();
+
+const isShow = ref(false);
+const elId = ref('');
+const height = ref('0'); // body内容的高度
+const headStyle = ref<Record<string, any>>({}); // 头部样式，对象形式
+const bodyStyle = ref<Record<string, any>>({}); // 主体部分样式
+const itemStyle = ref<Record<string, any>>({}); // 每个item的整体样式
+const arrowColor = ref(''); // 箭头的颜色
+const hoverClass = ref(''); // 头部按下时的效果样式类
+const accordion = ref(true); // 是否显示右侧箭头
+const arrow = ref(true);
+
+const { parent, parentExposed } = useParent('u-collapse');
+
+watch(
+    () => props.open,
+    val => {
+        isShow.value = val;
+    },
+    { immediate: true }
+);
+
+/**
+ * 获取父组件的配置项
+ */
+const titleStyle = computed(() => {
+    let style = { textAlign: props.align ? props.align : 'left' };
+
+    if (isShow.value && props.activeStyle && !arrow.value) {
+        style = $u.deepMerge(style, props.activeStyle);
+    }
+    return $u.toStyle(style);
+});
+
+/**
+ * 异步获取内容，或者动态修改了内容时，需要重新初始化
+ */
+function init() {
+    if (parent) {
+        headStyle.value = parentExposed.props.headStyle;
+        bodyStyle.value = parentExposed.props.bodyStyle;
+        arrowColor.value = parentExposed.props.arrowColor;
+        hoverClass.value = parentExposed.props.hoverClass;
+        arrow.value = parentExposed.props.arrow;
+        itemStyle.value = parentExposed.props.itemStyle;
+        accordion.value = parentExposed.props.accordion;
+    }
+    elId.value = $u.guid();
+    nextTick(() => {
+        queryRect();
+    });
+}
+
+/**
+ * 点击collapse head头部
+ */
+function headClick() {
+    if (props.disabled) return;
+    if (accordion.value && parent) {
+        parent.children.forEach((vm: any) => {
+            if (vm.exposed.elId.value !== elId.value) {
+                vm.exposed.isShow.value = false;
+            } else {
+                vm.exposed.isShow.value = !vm.exposed.isShow.value;
+                emit('change', {
+                    index: props.index,
+                    show: vm.exposed.isShow.value
+                });
+            }
+        });
+    } else {
+        isShow.value = !isShow.value;
+        emit('change', {
+            index: props.index,
+            show: isShow.value
+        });
+    }
+    if (isShow.value) parentExposed && parentExposed.onChange && parentExposed.onChange(props.index);
+}
+
+/**
+ * 查询内容高度
+ */
+function queryRect() {
+    // getRect为uView自带的节点查询简化方法，详见文档介绍：https://uviewpro.cn/zh/tools/getRect.html
+    // 组件内部一般用this.$uGetRect，对外的为this.$u.getRect，二者功能一致，名称不同
+    $u.getRect('#' + elId.value, instance).then((res: any) => {
+        height.value = res.height + 'px';
+        // #ifdef MP-TOUTIAO
+        height.value = 'auto';
+        // #endif
+    });
+}
+
+onMounted(() => {
+    init();
+});
+
+defineExpose({
+    init,
+    isShow,
+    elId,
+    height,
+    headStyle,
+    bodyStyle,
+    itemStyle,
+    arrowColor,
+    hoverClass,
+    arrow
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../libs/css/style.components.scss';
+
+.u-collapse-head {
+    position: relative;
+    @include vue-flex;
+    justify-content: space-between;
+    align-items: center;
+    color: $u-main-color;
+    font-size: 30rpx;
+    line-height: 1;
+    padding: 24rpx 0;
+    text-align: left;
+}
+
+.u-collapse-title {
+    flex: 1;
+    overflow: hidden;
+}
+
+.u-arrow-down-icon {
+    transition: all 0.3s;
+    margin-right: 20rpx;
+    margin-left: 14rpx;
+}
+
+.u-arrow-down-icon-active {
+    transform: rotate(180deg);
+    transform-origin: center center;
+}
+
+.u-collapse-body {
+    overflow: hidden;
+    transition: all 0.3s;
+}
+
+.u-collapse-content {
+    overflow: hidden;
+    font-size: 28rpx;
+    color: $u-tips-color;
+    text-align: left;
+}
+</style>

package/components/u-column-notice/types.ts

@@ -1,48 +1,48 @@
-import type { ExtractPropTypes, PropType } from 'vue';
-import type { Direction, PlayState, ScrollDirection, ThemeType } from '../../types/global';
-
-/**
- * u-column-notice 通告栏 Props
- */
-export const ColumnNoticeProps = {
-    /** 显示的内容，数组 */
-    list: { type: Array as PropType<string[]>, default: () => [] },
-    /** 显示的主题，success|error|primary|info|warning */
-    type: { type: String as PropType<ThemeType | 'none'>, default: 'warning' },
-    /** 是否显示左侧的音量图标 */
-    volumeIcon: { type: Boolean, default: true },
-    /** 是否显示右侧的右箭头图标 */
-    moreIcon: { type: Boolean, default: false },
-    /** 是否显示右侧的关闭图标 */
-    closeIcon: { type: Boolean, default: false },
-    /** 是否自动播放 */
-    autoplay: { type: Boolean, default: true },
-    /** 文字颜色，各图标也会使用文字颜色 */
-    color: { type: String, default: '' },
-    /** 背景颜色 */
-    bgColor: { type: String, default: '' },
-    /** 滚动方向，row-水平滚动，column-垂直滚动 */
-    direction: { type: String as PropType<ScrollDirection>, default: 'row' },
-    /** 是否显示 */
-    show: { type: Boolean, default: true },
-    /** 字体大小，单位rpx */
-    fontSize: { type: [Number, String] as PropType<number | string>, default: 26 },
-    /** 滚动一个周期的时间长，单位ms */
-    duration: { type: [Number, String] as PropType<number | string>, default: 2000 },
-    /** 音量喇叭的大小 */
-    volumeSize: { type: [Number, String] as PropType<number | string>, default: 34 },
-    /** 水平滚动时的滚动速度，即每秒滚动多少rpx，这有利于控制文字无论多少时，都能有一个恒定的速度 */
-    speed: { type: Number, default: 160 },
-    /** 水平滚动时，是否采用衔接形式滚动 */
-    isCircular: { type: Boolean, default: true },
-    /** 滚动方向，horizontal-水平滚动，vertical-垂直滚动 */
-    mode: { type: String as PropType<Direction>, default: 'horizontal' },
-    /** 播放状态，play-播放，paused-暂停 */
-    playState: { type: String as PropType<PlayState>, default: 'play' },
-    /** 是否禁止用手滑动切换 */
-    disableTouch: { type: Boolean, default: true },
-    /** 通知的边距 */
-    padding: { type: [Number, String] as PropType<number | string>, default: '18rpx 24rpx' }
-};
-
-export type ColumnNoticeProps = ExtractPropTypes<typeof ColumnNoticeProps>;
+import type { ExtractPropTypes, PropType } from 'vue';
+import type { Direction, PlayState, ScrollDirection, ThemeType } from '../../types/global';
+
+/**
+ * u-column-notice 通告栏 Props
+ */
+export const ColumnNoticeProps = {
+    /** 显示的内容，数组 */
+    list: { type: Array as PropType<string[]>, default: () => [] },
+    /** 显示的主题，success|error|primary|info|warning */
+    type: { type: String as PropType<ThemeType | 'none'>, default: 'warning' },
+    /** 是否显示左侧的音量图标 */
+    volumeIcon: { type: Boolean, default: true },
+    /** 是否显示右侧的右箭头图标 */
+    moreIcon: { type: Boolean, default: false },
+    /** 是否显示右侧的关闭图标 */
+    closeIcon: { type: Boolean, default: false },
+    /** 是否自动播放 */
+    autoplay: { type: Boolean, default: true },
+    /** 文字颜色，各图标也会使用文字颜色 */
+    color: { type: String, default: '' },
+    /** 背景颜色 */
+    bgColor: { type: String, default: '' },
+    /** 滚动方向，row-水平滚动，column-垂直滚动 */
+    direction: { type: String as PropType<ScrollDirection>, default: 'row' },
+    /** 是否显示 */
+    show: { type: Boolean, default: true },
+    /** 字体大小，单位rpx */
+    fontSize: { type: [Number, String] as PropType<number | string>, default: 26 },
+    /** 滚动一个周期的时间长，单位ms */
+    duration: { type: [Number, String] as PropType<number | string>, default: 2000 },
+    /** 音量喇叭的大小 */
+    volumeSize: { type: [Number, String] as PropType<number | string>, default: 34 },
+    /** 水平滚动时的滚动速度，即每秒滚动多少rpx，这有利于控制文字无论多少时，都能有一个恒定的速度 */
+    speed: { type: Number, default: 160 },
+    /** 水平滚动时，是否采用衔接形式滚动 */
+    isCircular: { type: Boolean, default: true },
+    /** 滚动方向，horizontal-水平滚动，vertical-垂直滚动 */
+    mode: { type: String as PropType<Direction>, default: 'horizontal' },
+    /** 播放状态，play-播放，paused-暂停 */
+    playState: { type: String as PropType<PlayState>, default: 'play' },
+    /** 是否禁止用手滑动切换 */
+    disableTouch: { type: Boolean, default: true },
+    /** 通知的边距 */
+    padding: { type: [Number, String] as PropType<number | string>, default: '18rpx 24rpx' }
+};
+
+export type ColumnNoticeProps = ExtractPropTypes<typeof ColumnNoticeProps>;