hy-app 0.5.11 → 0.5.12

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

@@ -1,275 +1,289 @@
-<template>
-    <!-- #ifndef APP-NVUE -->
-    <button
-        :hover-start-time="Number(hoverStartTime)"
-        :hover-stay-time="Number(hoverStayTime)"
-        :form-type="formType"
-        :open-type="openType"
-        :app-parameter="appParameter"
-        :hover-stop-propagation="hoverStopPropagation"
-        :send-message-title="sendMessageTitle"
-        :send-message-path="sendMessagePath"
-        :lang="lang"
-        :data-name="dataName"
-        :session-from="sessionFrom"
-        :send-message-img="sendMessageImg"
-        :show-message-card="showMessageCard"
-        @getphonenumber="getphonenumber"
-        @getuserinfo="getuserinfo"
-        @error="error"
-        @opensetting="opensetting"
-        @launchapp="launchapp"
-        @agreeprivacyauthorization="agreeprivacyauthorization"
-        :hover-class="!disabled && !loading ? 'hy-button--active' : ''"
-        :style="[baseColor, customStyle]"
-        @click="clickHandler"
-        :class="['hy-button', border ? '' : 'hy-button__no-border', bemClass, customClass]"
-    >
-        <template v-if="loading">
-            <HyLoading :mode="loadingMode" :size="loadingSize" :color="loadingColor"></HyLoading>
-            <text class="hy-button__loading-text" :style="[{ fontSize: textSize + 'px' }]">
-                {{ loadingText || text }}
-            </text>
-        </template>
-        <template v-else>
-            <hy-icon
-                v-if="icon?.name"
-                :name="icon?.name"
-                :color="iconColorCom"
-                :size="icon?.size || textSize * 1.35"
-                :bold="icon?.bold"
-                :customPrefix="icon?.customPrefix"
-                :imgMode="icon?.imgMode"
-                :width="icon?.width"
-                :height="icon?.height"
-                :top="icon?.top"
-                :stop="icon?.stop"
-                :round="icon?.round"
-                :customStyle="icon?.customStyle || { marginRight: '2px' }"
-            ></hy-icon>
-            <!-- @slot 插入默认的值 -->
-            <slot v-if="$slots.default"></slot>
-            <text v-else class="hy-button__text" :style="[{ fontSize: textSize + 'px' }]">{{
-                text
-            }}</text>
-        </template>
-    </button>
-    <!-- #endif -->
-
-    <!-- #ifdef APP-NVUE -->
-    <view
-        :hover-start-time="Number(hoverStartTime)"
-        :hover-stay-time="Number(hoverStayTime)"
-        class="hy-button"
-        :hover-class="
-            !disabled && !loading && !color && (plain || type === 'info')
-                ? 'hy-button--active--plain'
-                : !disabled && !loading && !plain
-                  ? 'hy-button--active'
-                  : ''
-        "
-        @click="clickHandler"
-        :class="bemClass"
-        :style="[baseColor, customStyle]"
-    >
-        <template v-if="loading">
-            <HyLoading :mode="loadingMode" :size="loadingSize" :color="loadingColor"></HyLoading>
-            <text
-                class="hy-button__loading-text"
-                :style="[nvueTextStyle]"
-                :class="[plain && `hy-button__text--plain--${type}`]"
-            >
-                {{ loadingText || text }}
-            </text>
-        </template>
-        <template v-else>
-            <hy-icon
-                v-if="icon?.name"
-                :name="icon?.name"
-                :color="iconColorCom"
-                :size="icon?.size || textSize * 1.35"
-                :bold="icon?.bold"
-                :customPrefix="icon?.customPrefix"
-                :imgMode="icon?.imgMode"
-                :width="icon?.width"
-                :height="icon?.height"
-                :top="icon?.top"
-                :stop="icon?.stop"
-                :round="icon?.round"
-                :customStyle="icon?.customStyle || { marginRight: '2px' }"
-            ></hy-icon>
-            <text
-                class="hy-button__text"
-                :style="[
-                    {
-                        marginLeft: icon ? '2px' : 0
-                    },
-                    nvueTextStyle
-                ]"
-                :class="[plain && `hy-button__text--plain--${type}`]"
-            >
-                {{ text }}
-            </text>
-        </template>
-    </view>
-    <!-- #endif -->
-</template>
-
-<script lang="ts">
-export default {
-    name: 'hy-button',
-    options: {
-        addGlobalClass: true,
-        virtualHost: true,
-        styleIsolation: 'shared'
-    }
-}
-</script>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-import type { CSSProperties } from 'vue'
-import { ColorConfig, bem, throttle } from '../../libs'
-import type { IButtonEmits } from './typing'
-import buttonProps from '../hy-button/props'
-// 组件
-import HyIcon from '../hy-icon/hy-icon.vue'
-import HyLoading from '../hy-loading/hy-loading.vue'
-
-/**
- * 该组件内部实现以uni-app的基础button组件为基础，进行二次封装
- * @displayName hy-button
- */
-defineOptions({})
-
-const props = defineProps(buttonProps)
-const emit = defineEmits<IButtonEmits>()
-
-const textColor = (ColorConfig as any)[props.type]
-
-/**
- * @description 生成bem风格的类名
- */
-const bemClass = computed(() => {
-    // this.bem为一个computed变量，在mixin中
-    if (!props.color) {
-        return bem('button', props, ['type', 'shape', 'size'], ['disabled', 'plain', 'hairline'])
-    } else {
-        // 由于nvue的原因，在有color参数时，不需要传入type，否则会生成type相关的类型，影响最终的样式
-        return bem('button', props, ['shape', 'size'], ['disabled', 'plain', 'hairline'])
-    }
-})
-
-const loadingColor = computed(() => {
-    if (props.plain) {
-        // 如果有设置color值，则用color值，否则使用type主题颜色
-        return props.color ? props.color : ''
-    }
-    if (props.type === 'info') {
-        return '#c9c9c9'
-    }
-    return '#fff'
-})
-
-const iconColorCom = computed((): string => {
-    // 如果是镂空状态，设置了color就用color值，否则使用主题颜色，
-    if (props.icon?.color) return props.icon?.color
-    if (props.plain) {
-        return props.color ? props.color : ''
-    } else {
-        return '#ffffff'
-    }
-})
-const baseColor = computed((): CSSProperties => {
-    let style: CSSProperties = {}
-    if (props.color) {
-        // 针对自定义了color颜色的情况，镂空状态下，就是用自定义的颜色
-        style.color = props.plain ? props.color : 'white'
-        if (!props.plain) {
-            // 非镂空，背景色使用自定义的颜色
-            style['background'] = props.color
-        }
-        if (props.color.indexOf('gradient') !== -1) {
-            // 如果自定义的颜色为渐变色，不显示边框，以及通过backgroundImage设置渐变色
-            // weex文档说明可以写borderWidth的形式，为什么这里需要分开写？
-            // 因为weex是阿里巴巴为了部门业绩考核而做的你懂的东西，所以需要这么写才有效
-            style.borderTopWidth = 0
-            style.borderRightWidth = 0
-            style.borderBottomWidth = 0
-            style.borderLeftWidth = 0
-            if (!props.plain) {
-                style.backgroundImage = props.color
-            }
-        } else {
-            // 非渐变色，则设置边框相关的属性
-            style.borderColor = props.color
-            style.borderWidth = '1px'
-            style.borderStyle = 'solid'
-        }
-    } else {
-        // 针对自定义了color颜色的情况，镂空状态下，就是用自定义的颜色
-        // style.color = props.plain ? textColor : "";
-    }
-    return style
-})
-
-// nvue版本按钮的字体不会继承父组件的颜色，需要对每一个text组件进行单独的设置
-const nvueTextStyle = computed((): CSSProperties => {
-    let style: CSSProperties = {}
-    // 针对自定义了color颜色的情况，镂空状态下，就是用自定义的颜色
-    if (props.type === 'info') {
-        style.color = '#323233'
-    }
-    if (props.color) {
-        style.color = props.plain ? props.color : 'white'
-    }
-    style.fontSize = textSize.value + 'px'
-    return style
-})
-/**
- * @description 字体大小
- * */
-const textSize = computed((): number => {
-    let fontSize = 14
-    if (props.size === 'large') fontSize = 16
-    if (props.size === 'medium') fontSize = 14
-    if (props.size === 'small') fontSize = 12
-    if (props.size === 'mini') fontSize = 10
-    return fontSize
-})
-
-const clickHandler = (e: any) => {
-    // 非禁止并且非加载中，才能点击
-    if (!props.disabled && !props.loading) {
-        // 进行节流控制，每this.throttle毫秒内，只在开始处执行
-        throttle(() => {
-            emit('click', e)
-        }, props.throttleTime)
-    }
-    // 是否阻止事件传播
-    props.stop && e.stopPropagation()
-}
-
-const getphonenumber = (e: any) => {
-    emit('getphonenumber', e)
-}
-const getuserinfo = (e: any) => {
-    emit('getuserinfo', e)
-}
-const error = (e: any) => {
-    emit('error', e)
-}
-const opensetting = (e: any) => {
-    emit('opensetting', e)
-}
-const launchapp = (e: any) => {
-    emit('launchapp', e)
-}
-const agreeprivacyauthorization = (e: any) => {
-    emit('agreeprivacyauthorization', e)
-}
-</script>
-
-<style lang="scss" scoped>
-@import './index.scss';
-</style>
+<template>
+    <!-- #ifndef APP-NVUE -->
+    <button
+        :hover-start-time="Number(hoverStartTime)"
+        :hover-stay-time="Number(hoverStayTime)"
+        :form-type="formType"
+        :open-type="openType"
+        :lang="lang"
+        :scope="scope"
+        :data-name="dataName"
+        :app-parameter="appParameter"
+        :hover-stop-propagation="hoverStopPropagation"
+        :send-message-title="sendMessageTitle"
+        :send-message-path="sendMessagePath"
+        :session-from="sessionFrom"
+        :send-message-img="sendMessageImg"
+        :show-message-card="showMessageCard"
+        @getphonenumber="getphonenumber"
+        @getuserinfo="getuserinfo"
+        @getAuthorize="getAuthorize"
+        @error="error"
+        @opensetting="opensetting"
+        @launchapp="launchapp"
+        @agreeprivacyauthorization="agreeprivacyauthorization"
+        :hover-class="!disabled && !loading ? 'hy-button--active' : ''"
+        :style="[baseColor, customStyle]"
+        @click="clickHandler"
+        :class="['hy-button', border ? '' : 'hy-button__no-border', bemClass, customClass]"
+    >
+        <template v-if="loading">
+            <HyLoading :mode="loadingMode" :size="loadingSize" :color="loadingColor"></HyLoading>
+            <text class="hy-button__loading-text" :style="[{ fontSize: textSize + 'px' }]">
+                {{ loadingText || text }}
+            </text>
+        </template>
+        <template v-else>
+            <hy-icon
+                v-if="icon?.name"
+                :name="icon?.name"
+                :color="iconColorCom"
+                :size="icon?.size || textSize * 1.35"
+                :bold="icon?.bold"
+                :customPrefix="icon?.customPrefix"
+                :imgMode="icon?.imgMode"
+                :width="icon?.width"
+                :height="icon?.height"
+                :top="icon?.top"
+                :stop="icon?.stop"
+                :round="icon?.round"
+                :customStyle="icon?.customStyle || { marginRight: '2px' }"
+            ></hy-icon>
+            <!-- @slot 插入默认的值 -->
+            <slot v-if="$slots.default"></slot>
+            <text v-else class="hy-button__text" :style="[{ fontSize: textSize + 'px' }]">{{
+                text
+            }}</text>
+        </template>
+    </button>
+    <!-- #endif -->
+
+    <!-- #ifdef APP-NVUE -->
+    <view
+        :hover-start-time="Number(hoverStartTime)"
+        :hover-stay-time="Number(hoverStayTime)"
+        class="hy-button"
+        :hover-class="
+            !disabled && !loading && !color && (plain || type === 'info')
+                ? 'hy-button--active--plain'
+                : !disabled && !loading && !plain
+                  ? 'hy-button--active'
+                  : ''
+        "
+        @click="clickHandler"
+        :class="bemClass"
+        :style="[baseColor, customStyle]"
+    >
+        <template v-if="loading">
+            <HyLoading :mode="loadingMode" :size="loadingSize" :color="loadingColor"></HyLoading>
+            <text
+                class="hy-button__loading-text"
+                :style="[nvueTextStyle]"
+                :class="[plain && `hy-button__text--plain--${type}`]"
+            >
+                {{ loadingText || text }}
+            </text>
+        </template>
+        <template v-else>
+            <hy-icon
+                v-if="icon?.name"
+                :name="icon?.name"
+                :color="iconColorCom"
+                :size="icon?.size || textSize * 1.35"
+                :bold="icon?.bold"
+                :customPrefix="icon?.customPrefix"
+                :imgMode="icon?.imgMode"
+                :width="icon?.width"
+                :height="icon?.height"
+                :top="icon?.top"
+                :stop="icon?.stop"
+                :round="icon?.round"
+                :customStyle="icon?.customStyle || { marginRight: '2px' }"
+            ></hy-icon>
+            <text
+                class="hy-button__text"
+                :style="[
+                    {
+                        marginLeft: icon ? '2px' : 0
+                    },
+                    nvueTextStyle
+                ]"
+                :class="[plain && `hy-button__text--plain--${type}`]"
+            >
+                {{ text }}
+            </text>
+        </template>
+    </view>
+    <!-- #endif -->
+</template>
+
+<script lang="ts">
+export default {
+    name: 'hy-button',
+    options: {
+        addGlobalClass: true,
+        virtualHost: true,
+        styleIsolation: 'shared'
+    }
+}
+</script>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import type { CSSProperties } from 'vue'
+import { ColorConfig, bem, throttle } from '../../libs'
+import type { IButtonEmits } from './typing'
+import buttonProps from '../hy-button/props'
+// 组件
+import HyIcon from '../hy-icon/hy-icon.vue'
+import HyLoading from '../hy-loading/hy-loading.vue'
+
+/**
+ * 该组件内部实现以uni-app的基础button组件为基础，进行二次封装
+ * @displayName hy-button
+ */
+defineOptions({})
+
+const props = defineProps(buttonProps)
+const emit = defineEmits<IButtonEmits>()
+
+const textColor = (ColorConfig as any)[props.type]
+
+/**
+ * @description 生成bem风格的类名
+ */
+const bemClass = computed(() => {
+    // this.bem为一个computed变量，在mixin中
+    if (!props.color) {
+        return bem('button', props, ['type', 'shape', 'size'], ['disabled', 'plain', 'hairline'])
+    } else {
+        // 由于nvue的原因，在有color参数时，不需要传入type，否则会生成type相关的类型，影响最终的样式
+        return bem('button', props, ['shape', 'size'], ['disabled', 'plain', 'hairline'])
+    }
+})
+
+const loadingColor = computed(() => {
+    if (props.plain) {
+        // 如果有设置color值，则用color值，否则使用type主题颜色
+        return props.color ? props.color : ''
+    }
+    if (props.type === 'info') {
+        return '#c9c9c9'
+    }
+    return '#fff'
+})
+
+const iconColorCom = computed((): string => {
+    // 如果是镂空状态，设置了color就用color值，否则使用主题颜色，
+    if (props.icon?.color) return props.icon?.color
+    if (props.plain) {
+        return props.color ? props.color : ''
+    } else {
+        return '#ffffff'
+    }
+})
+const baseColor = computed((): CSSProperties => {
+    let style: CSSProperties = {}
+    if (props.color) {
+        // 针对自定义了color颜色的情况，镂空状态下，就是用自定义的颜色
+        style.color = props.plain ? props.color : 'white'
+        if (!props.plain) {
+            // 非镂空，背景色使用自定义的颜色
+            style['background'] = props.color
+        }
+        if (props.color.indexOf('gradient') !== -1) {
+            // 如果自定义的颜色为渐变色，不显示边框，以及通过backgroundImage设置渐变色
+            // weex文档说明可以写borderWidth的形式，为什么这里需要分开写？
+            // 因为weex是阿里巴巴为了部门业绩考核而做的你懂的东西，所以需要这么写才有效
+            style.borderTopWidth = 0
+            style.borderRightWidth = 0
+            style.borderBottomWidth = 0
+            style.borderLeftWidth = 0
+            if (!props.plain) {
+                style.backgroundImage = props.color
+            }
+        } else {
+            // 非渐变色，则设置边框相关的属性
+            style.borderColor = props.color
+            style.borderWidth = '1px'
+            style.borderStyle = 'solid'
+        }
+    } else {
+        // 针对自定义了color颜色的情况，镂空状态下，就是用自定义的颜色
+        // style.color = props.plain ? textColor : "";
+    }
+    return style
+})
+
+// nvue版本按钮的字体不会继承父组件的颜色，需要对每一个text组件进行单独的设置
+const nvueTextStyle = computed((): CSSProperties => {
+    let style: CSSProperties = {}
+    // 针对自定义了color颜色的情况，镂空状态下，就是用自定义的颜色
+    if (props.type === 'info') {
+        style.color = '#323233'
+    }
+    if (props.color) {
+        style.color = props.plain ? props.color : 'white'
+    }
+    style.fontSize = textSize.value + 'px'
+    return style
+})
+/**
+ * 字体大小
+ * */
+const textSize = computed((): number => {
+    let fontSize = 14
+    if (props.size === 'large') fontSize = 16
+    if (props.size === 'medium') fontSize = 14
+    if (props.size === 'small') fontSize = 12
+    if (props.size === 'mini') fontSize = 10
+    return fontSize
+})
+
+const clickHandler = (e: any) => {
+    // 非禁止并且非加载中，才能点击
+    if (!props.disabled && !props.loading) {
+        // 进行节流控制，每this.throttle毫秒内，只在开始处执行
+        throttle(() => {
+            emit('click', e)
+        }, props.throttleTime)
+    }
+    // 是否阻止事件传播
+    props.stop && e.stopPropagation()
+}
+
+/**
+ * 支付宝小程序授权
+ * @param e
+ */
+function getAuthorize(e: any) {
+    if (props.scope === 'phoneNumber') {
+        getphonenumber(e)
+    } else if (props.scope === 'userInfo') {
+        getuserinfo(e)
+    }
+}
+
+const getphonenumber = (e: any) => {
+    emit('getphonenumber', e)
+}
+const getuserinfo = (e: any) => {
+    emit('getuserinfo', e)
+}
+const error = (e: any) => {
+    emit('error', e)
+}
+const opensetting = (e: any) => {
+    emit('opensetting', e)
+}
+const launchapp = (e: any) => {
+    emit('launchapp', e)
+}
+const agreeprivacyauthorization = (e: any) => {
+    emit('agreeprivacyauthorization', e)
+}
+</script>
+
+<style lang="scss" scoped>
+@import './index.scss';
+</style>

package/components/hy-button/index.scss

@@ -15,8 +15,31 @@
   /* #endif */
   flex-direction: row;
 
+  /* 亮光效果 */
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -100%;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(
+                    90deg,
+                    transparent,
+                    rgba(255, 255, 255, 0.4),
+                    transparent
+    );
+    transition: left 0.7s;
+    z-index: 1;
+  }
+  &:active::before {
+    left: 100%;
+    transition: left 0.2s;
+  }
+
+
   /* 去除原生按钮边框 */
-  &:after {
+  &::after {
     border: none !important;
   }