hy-app 0.4.15 → 0.5.0

package/components/hy-search/hy-search.vue

@@ -1,350 +1,221 @@
 <template>
-  <view
-    :class="['hy-search', customStyle]"
-    @tap="clickHandler"
-    :style="[
-      {
-        margin: margin,
-      },
-      customStyle,
-    ]"
-  >
     <view
-      class="hy-search__content"
-      :style="{
-        backgroundColor: bgColor,
-        borderRadius: shape == 'circle' ? '100px' : '4px',
-        borderColor: borderColor,
-      }"
-    >
-      <template>
-        <slot v-if="$slots.label" name="label"></slot>
-        <text v-else-if="label" class="hy-search__content__label">{{
-          label
-        }}</text>
-      </template>
-      <view class="hy-search__content__icon" v-if="searchIcon">
-        <HyIcon
-          :name="searchIcon?.name || IconConfig.SEARCH"
-          :size="searchIcon?.size"
-          :color="searchIcon?.color || color"
-          :bold="searchIcon?.bold"
-          :customPrefix="searchIcon?.customPrefix"
-          :imgMode="searchIcon?.imgMode"
-          :width="searchIcon?.width"
-          :height="searchIcon?.height"
-          :top="searchIcon?.top"
-          :stop="searchIcon?.stop"
-          :round="searchIcon?.round"
-          :customStyle="searchIcon?.customStyle"
-          @tap="clickIcon"
-        ></HyIcon>
-      </view>
-      <input
-        :confirm-type="confirmType"
-        :value="keyword"
-        :disabled="disabled"
-        :maxlength="maxlength"
-        :adjust-position="adjustPosition"
-        :focus="autoFocus"
-        :auto-blur="autoBlur"
-        placeholder-class="hy-search__content__input--placeholder"
-        :placeholder="placeholder"
-        :placeholder-style="`color: ${placeholderColor}`"
-        :class="[
-          'hy-search__content__input',
-          disabled && 'hy-search__content__input--disabled',
-        ]"
-        type="text"
-        :always-embed="true"
+        :class="['hy-search', customStyle]"
+        @tap="clickHandler"
         :style="[
-          {
-            pointerEvents: disabled ? 'none' : 'auto',
-            textAlign: inputAlign,
-            color: color,
-            backgroundColor: bgColor,
-            height: addUnit(height),
-          },
-          inputStyle,
+            {
+                margin: margin
+            },
+            customStyle
         ]"
-        @blur="onBlur"
-        @focus="onFocus"
-        @confirm="onSearch"
-        @input="inputChange"
-      />
-      <view
-        class="hy-search__content__icon hy-search__content__close"
-        v-if="showClear"
-        @click="onClear"
-      >
-        <HyIcon :name="IconConfig.CLOSE"></HyIcon>
-      </view>
-    </view>
-    <text
-      :style="[actionStyle]"
-      class="hy-search__action"
-      :class="[(showActionBtn || show) && 'hy-search__action--active']"
-      @tap.stop.prevent="onConfirm"
     >
-      {{ actionText }}
-    </text>
-  </view>
+        <view
+            class="hy-search__content"
+            :style="{
+                backgroundColor: bgColor,
+                borderRadius: shape == 'circle' ? '100px' : '4px',
+                borderColor: borderColor
+            }"
+        >
+            <template>
+                <slot v-if="$slots.label" name="label"></slot>
+                <text v-else-if="label" class="hy-search__content__label">{{ label }}</text>
+            </template>
+            <view class="hy-search__content__icon" v-if="searchIcon">
+                <hy-icon
+                    :name="searchIcon?.name || IconConfig.SEARCH"
+                    :size="searchIcon?.size"
+                    :color="searchIcon?.color || color"
+                    :bold="searchIcon?.bold"
+                    :customPrefix="searchIcon?.customPrefix"
+                    :imgMode="searchIcon?.imgMode"
+                    :width="searchIcon?.width"
+                    :height="searchIcon?.height"
+                    :top="searchIcon?.top"
+                    :stop="searchIcon?.stop"
+                    :round="searchIcon?.round"
+                    :customStyle="searchIcon?.customStyle"
+                    @tap="clickIcon"
+                ></hy-icon>
+            </view>
+            <input
+                :confirm-type="confirmType"
+                :value="keyword"
+                :disabled="disabled"
+                :maxlength="maxlength"
+                :adjust-position="adjustPosition"
+                :focus="autoFocus"
+                :auto-blur="autoBlur"
+                placeholder-class="hy-search__content__input--placeholder"
+                :placeholder="placeholder"
+                :placeholder-style="`color: ${placeholderColor}`"
+                :class="[
+                    'hy-search__content__input',
+                    disabled && 'hy-search__content__input--disabled'
+                ]"
+                type="text"
+                :always-embed="true"
+                :style="[
+                    {
+                        pointerEvents: disabled ? 'none' : 'auto',
+                        textAlign: inputAlign,
+                        color: color,
+                        backgroundColor: bgColor,
+                        height: addUnit(height)
+                    },
+                    inputStyle
+                ]"
+                @blur="onBlur"
+                @focus="onFocus"
+                @confirm="onSearch"
+                @input="inputChange"
+            />
+            <view
+                class="hy-search__content__icon hy-search__content__close"
+                v-if="showClear"
+                @click="onClear"
+            >
+                <hy-icon :name="IconConfig.CLOSE"></hy-icon>
+            </view>
+        </view>
+        <text
+            :style="[actionStyle]"
+            class="hy-search__action"
+            :class="[(showActionBtn || show) && 'hy-search__action--active']"
+            @tap.stop.prevent="onConfirm"
+        >
+            {{ actionText }}
+        </text>
+    </view>
 </template>
 
 <script lang="ts">
 export default {
-  name: "hy-search",
-  options: {
-    addGlobalClass: true,
-    virtualHost: true,
-    styleIsolation: "shared",
-  },
-};
+    name: 'hy-search',
+    options: {
+        addGlobalClass: true,
+        virtualHost: true,
+        styleIsolation: 'shared'
+    }
+}
 </script>
 
 <script setup lang="ts">
-import { computed, nextTick, ref, watch } from "vue";
-import type { PropType, CSSProperties } from "vue";
-import type { ISearchEmits } from "./typing";
-import { addUnit, IconConfig } from "../../libs";
-import type HyIconProps from "../hy-icon/typing";
+import { computed, nextTick, ref, watch } from 'vue'
+import type { ISearchEmits } from './typing'
+import { addUnit, IconConfig } from '../../libs'
 import type {
-  InputOnBlurEvent,
-  InputOnConfirmEvent,
-  InputOnFocusEvent,
-  InputOnInputEvent,
-  InputConfirmType,
-} from "@uni-helper/uni-types";
+    InputOnBlurEvent,
+    InputOnConfirmEvent,
+    InputOnFocusEvent,
+    InputOnInputEvent
+} from '@uni-helper/uni-types'
+import searchProps from './props'
 // 组件
-import HyIcon from "../hy-icon/hy-icon.vue";
+import HyIcon from '../hy-icon/hy-icon.vue'
 
 /**
  * 搜索组件，集成了常见搜索框所需功能，用户可以一键引入，开箱即用。
  * @displayName hy-search
  */
-defineOptions({});
+defineOptions({})
 
-// const props = withDefaults(defineProps<IProps>(), defaultProps)
-const props = defineProps({
-  /** 输入框初始值 */
-  modelValue: {
-    type: String,
-    default: "",
-  },
-  /**
-   * 搜索框形状
-   * @values circle,square
-   * */
-  shape: {
-    type: String,
-    default: "circle",
-  },
-  /** 搜索框背景颜色 */
-  bgColor: String,
-  /** 占位文字内容 */
-  placeholder: {
-    type: String,
-    default: "请输入关键字",
-  },
-  /**
-   * 设置右下角按钮的文字，兼容性详见uni-app文档
-   * @valuse send,search,next,go,done
-   * */
-  confirmType: {
-    type: String as PropType<InputConfirmType>,
-    default: "search",
-  },
-  /** 是否启用清除控件 */
-  clearable: {
-    type: Boolean,
-    default: true,
-  },
-  /** 是否自动获得焦点 */
-  autoFocus: {
-    type: Boolean,
-    default: false,
-  },
-  /** 键盘收起时，是否自动失去焦点 */
-  autoBlur: {
-    type: Boolean,
-    default: true,
-  },
-  /** 键盘弹起时，是否自动上推页面 */
-  adjustPosition: {
-    type: Boolean,
-    default: true,
-  },
-  /** 是否显示右侧控件 */
-  showAction: {
-    type: Boolean,
-    default: true,
-  },
-  /** 右侧控件文字 */
-  actionText: {
-    type: String,
-    default: "搜索",
-  },
-  /** 右侧控件的样式，对象形式 */
-  actionStyle: {
-    type: Object as PropType<CSSProperties>,
-    default: {},
-  },
-  /** 输入框内容水平对齐方式 */
-  inputAlign: {
-    type: String,
-    default: "left",
-  },
-  /** 自定义输入框样式，对象形式 */
-  inputStyle: {
-    type: Object as PropType<CSSProperties>,
-    default: {},
-  },
-  /** 是否启用输入框 */
-  disabled: {
-    type: Boolean,
-    default: false,
-  },
-  /** 边框颜色，配置了颜色，才会有边框 */
-  borderColor: {
-    type: String,
-    default: "transparent",
-  },
-  /** 输入框字体颜色 */
-  color: String,
-  /** placeholder的颜色 */
-  placeholderColor: {
-    type: String,
-    default: "",
-  },
-  /** 输入框左边的图标属性集合，可以为图标名称或图片路径 */
-  searchIcon: {
-    type: [Boolean, Object] as PropType<HyIconProps | boolean>,
-    default: { name: IconConfig.SEARCH },
-  },
-  /** 组件与其他上下左右之间的距离，带单位的字符串形式，如"30px" */
-  margin: {
-    type: [String, Number],
-    default: 0,
-  },
-  /** 是否开启动画，见上方说明 */
-  animation: {
-    type: Boolean,
-    default: false,
-  },
-  /** 输入框最大能输入的长度，-1为不限制长度 */
-  maxlength: {
-    type: Number,
-    default: -1,
-  },
-  /** 输入框高度，单位px */
-  height: {
-    type: Number,
-    default: 30,
-  },
-  /** 搜索框左边显示内容 */
-  label: String,
-  /** 定义需要用到的外部样式 */
-  customStyle: {
-    type: Object as PropType<CSSProperties>,
-  },
-  /** 自定义外部类名 */
-  customClass: String,
-});
-const emit = defineEmits<ISearchEmits>();
+const props = defineProps(searchProps)
+const emit = defineEmits<ISearchEmits>()
 
-const keyword = ref<string>(props.modelValue);
+const keyword = ref<string>(props.modelValue)
 // 显示右边搜索按钮
-const show = ref<boolean>(false);
+const show = ref<boolean>(false)
 // 标记input当前状态是否处于聚焦中，如果是，才会显示右侧的清除控件
-const focused = ref(false);
+const focused = ref(false)
 
 watch(
-  () => keyword.value,
-  (newValue: string) => {
-    emit("update:modelValue", newValue);
-    emit("change", newValue);
-  },
-);
+    () => keyword.value,
+    (newValue: string) => {
+        emit('update:modelValue', newValue)
+        emit('change', newValue)
+    }
+)
 
 // 是否显示右边控件
 const showActionBtn = computed<boolean>(() => {
-  return !props.animation && props.showAction;
-});
+    return !props.animation && props.showAction
+})
 // 是否显示清除控件
 const showClear = computed(() => {
-  const { clearable, disabled } = props;
-  return clearable && !disabled && !!focused.value && keyword.value !== "";
-});
+    const { clearable, disabled } = props
+    return clearable && !disabled && !!focused.value && keyword.value !== ''
+})
 
 /**
  * 值改变触发
  * */
 const inputChange = (e: InputOnInputEvent) => {
-  keyword.value = e.detail.value;
-};
+    keyword.value = e.detail.value
+}
 /**
  * @description 清空输入
  * */
 const onClear = () => {
-  keyword.value = "";
-  // 延后发出事件，避免在父组件监听clear事件时，value为更新前的值(不为空)
-  nextTick(() => {
-    emit("clear");
-  });
-};
+    keyword.value = ''
+    // 延后发出事件，避免在父组件监听clear事件时，value为更新前的值(不为空)
+    nextTick(() => {
+        emit('clear')
+    })
+}
 /**
  * @description 确定搜索
  * */
 const onSearch = (e: InputOnConfirmEvent) => {
-  emit("search", e, e.detail.value);
-  try {
-    // 收起键盘
-    uni.hideKeyboard();
-  } catch (e) {}
-};
+    emit('search', e, e.detail.value)
+    try {
+        // 收起键盘
+        uni.hideKeyboard()
+    } catch (e) {}
+}
 /**
  * @description 点击右边自定义按钮的事件
  */
 const onConfirm = () => {
-  emit("confirm", keyword.value);
-  try {
-    // 收起键盘
-    uni.hideKeyboard();
-  } catch (e) {}
-};
+    emit('confirm', keyword.value)
+    try {
+        // 收起键盘
+        uni.hideKeyboard()
+    } catch (e) {}
+}
 /**
  * @description 获取焦点
  * */
 const onFocus = (e: InputOnFocusEvent) => {
-  focused.value = true;
-  // 开启右侧搜索按钮展开的动画效果
-  if (props.animation && props.showAction) show.value = true;
-  emit("focus", e, keyword.value);
-};
+    focused.value = true
+    // 开启右侧搜索按钮展开的动画效果
+    if (props.animation && props.showAction) show.value = true
+    emit('focus', e, keyword.value)
+}
 
 // 失去焦点
 const onBlur = (e: InputOnBlurEvent) => {
-  show.value = false;
-  emit("blur", e, keyword.value);
-};
+    show.value = false
+    emit('blur', e, keyword.value)
+}
 /**
  * @description 点击搜索框，只有disabled=true时才发出事件，因为禁止了输入，意味着是想跳转真正的搜索页
  * */
 const clickHandler = () => {
-  if (props.disabled) emit("click");
-};
+    if (props.disabled) emit('click')
+}
 /**
  * @description 点击左边图标
  * */
 const clickIcon = () => {
-  emit("clickIcon", keyword.value);
-  try {
-    // 收起键盘
-    uni.hideKeyboard();
-  } catch (e) {}
-};
+    emit('clickIcon', keyword.value)
+    try {
+        // 收起键盘
+        uni.hideKeyboard()
+    } catch (e) {}
+}
 </script>
 
 <style lang="scss" scoped>
-@import "./index.scss";
+@import './index.scss';
 </style>

package/components/hy-search/props.ts

@@ -1,27 +1,132 @@
-import type IProps from "./typing";
+import type { CSSProperties, PropType } from 'vue'
+import type { InputConfirmType } from '@uni-helper/uni-types'
+import { IconConfig } from '../../libs'
+import type HyIconProps from '../hy-icon/typing'
 
-const defaultProps: IProps = {
-  modelValue: "",
-  shape: "circle",
-  bgColor: "",
-  placeholder: "请输入关键字",
-  clear: true,
-  focus: false,
-  showAction: true,
-  actionText: "搜索",
-  inputAlign: "left",
-  disabled: false,
-  borderColor: "transparent",
-  color: "",
-  placeholderColor: "#909399",
-  searchIcon: {},
-  margin: "0",
-  animation: false,
-  maxlength: "-1",
-  height: 32,
-  label: null,
-  adjustPosition: true,
-  autoBlur: true,
-};
+const searchProps = {
+    /** 输入框初始值 */
+    modelValue: {
+        type: String,
+        default: ''
+    },
+    /**
+     * 搜索框形状
+     * @values circle,square
+     * */
+    shape: {
+        type: String,
+        default: 'circle'
+    },
+    /** 搜索框背景颜色 */
+    bgColor: String,
+    /** 占位文字内容 */
+    placeholder: {
+        type: String,
+        default: '请输入关键字'
+    },
+    /**
+     * 设置右下角按钮的文字，兼容性详见uni-app文档
+     * @valuse send,search,next,go,done
+     * */
+    confirmType: {
+        type: String as PropType<InputConfirmType>,
+        default: 'search'
+    },
+    /** 是否启用清除控件 */
+    clearable: {
+        type: Boolean,
+        default: true
+    },
+    /** 是否自动获得焦点 */
+    autoFocus: {
+        type: Boolean,
+        default: false
+    },
+    /** 键盘收起时，是否自动失去焦点 */
+    autoBlur: {
+        type: Boolean,
+        default: true
+    },
+    /** 键盘弹起时，是否自动上推页面 */
+    adjustPosition: {
+        type: Boolean,
+        default: true
+    },
+    /** 是否显示右侧控件 */
+    showAction: {
+        type: Boolean,
+        default: true
+    },
+    /** 右侧控件文字 */
+    actionText: {
+        type: String,
+        default: '搜索'
+    },
+    /** 右侧控件的样式，对象形式 */
+    actionStyle: {
+        type: Object as PropType<CSSProperties>,
+        default: {}
+    },
+    /** 输入框内容水平对齐方式 */
+    inputAlign: {
+        type: String,
+        default: 'left'
+    },
+    /** 自定义输入框样式，对象形式 */
+    inputStyle: {
+        type: Object as PropType<CSSProperties>,
+        default: {}
+    },
+    /** 是否启用输入框 */
+    disabled: {
+        type: Boolean,
+        default: false
+    },
+    /** 边框颜色，配置了颜色，才会有边框 */
+    borderColor: {
+        type: String,
+        default: 'transparent'
+    },
+    /** 输入框字体颜色 */
+    color: String,
+    /** placeholder的颜色 */
+    placeholderColor: {
+        type: String,
+        default: ''
+    },
+    /** 输入框左边的图标属性集合，可以为图标名称或图片路径 */
+    searchIcon: {
+        type: [Boolean, Object] as PropType<HyIconProps | boolean>,
+        default: { name: IconConfig.SEARCH }
+    },
+    /** 组件与其他上下左右之间的距离，带单位的字符串形式，如"30px" */
+    margin: {
+        type: [String, Number],
+        default: 0
+    },
+    /** 是否开启动画，见上方说明 */
+    animation: {
+        type: Boolean,
+        default: false
+    },
+    /** 输入框最大能输入的长度，-1为不限制长度 */
+    maxlength: {
+        type: Number,
+        default: -1
+    },
+    /** 输入框高度，单位px */
+    height: {
+        type: Number,
+        default: 30
+    },
+    /** 搜索框左边显示内容 */
+    label: String,
+    /** 定义需要用到的外部样式 */
+    customStyle: {
+        type: Object as PropType<CSSProperties>
+    },
+    /** 自定义外部类名 */
+    customClass: String
+}
 
-export default defaultProps;
+export default searchProps