hy-app 0.5.5 → 0.5.6

package/components/hy-cell-item/props.ts

@@ -0,0 +1,66 @@
+import type { CSSProperties, PropType } from 'vue'
+import type { HyIconProps } from '../hy-icon/typing'
+
+const cellItemProps = {
+    /** 头部标题 */
+    title: String,
+    /** 标题下面小提示 */
+    sub: String,
+    /** 是否禁用cell */
+    disabled: {
+        type: Boolean,
+        default: false
+    },
+    /** 右侧的内容 */
+    value: String,
+    /** 图标，接收icon对象 */
+    icon: {
+        type: Object as PropType<HyIconProps>
+    },
+    /** 右边图标，默认是向左图标 */
+    rightIcon: {
+        type: Object as PropType<HyIconProps>
+    },
+    /**
+     * 右侧箭头的方向
+     * @values left,up,down
+     * */
+    arrowDirection: {
+        type: String,
+        default: 'right'
+    },
+    /**
+     * 点击后跳转的URL地址
+     * */
+    url: {
+        type: String,
+        default: ''
+    },
+    /**
+     * 链接跳转的方式，内部使用的是uview-plus封装的route方法，可能会进行拦截操作
+     * */
+    linkType: {
+        type: String,
+        default: 'navigateTo'
+    },
+    /**
+     * 点击cell是否阻止事件传播
+     * */
+    stop: {
+        type: Boolean,
+        default: true
+    },
+    /**
+     * 标识符，用于在click事件中进行返回
+     * */
+    name: {
+        type: [String, Number],
+        default: ''
+    },
+    /** 定义需要用到的外部样式 */
+    customStyle: Object as PropType<CSSProperties>,
+    /** 自定义外部类名 */
+    customClass: String
+}
+
+export default cellItemProps

package/components/hy-cell-item/typing.d.ts

@@ -0,0 +1,7 @@
+import type { ExtractPropTypes, ToRefs } from 'vue'
+import type cellProps from '../hy-cell/props'
+
+export interface ICellContext extends ToRefs<ExtractPropTypes<typeof cellProps>> {
+    /** 点击事件 */
+    onClick: (name: string | number) => void
+}

package/components/hy-checkbox-group/props.ts

@@ -75,6 +75,6 @@ const checkboxGroupProps = {
     customStyle: {
         type: Object as PropType<CSSProperties>
     }
-}
+} as const
 
 export default checkboxGroupProps

package/components/hy-checkbox-item/typing.d.ts

@@ -1,7 +1,7 @@
-import type HyCheckboxGroupProps from '../hy-checkbox-group/typing'
-import type { ToRefs } from 'vue'
+import type checkboxGroupProps from '../hy-checkbox-group/props'
+import type { ExtractPropTypes, ToRefs } from 'vue'
 
-export interface ICheckboxGroupContext extends ToRefs<HyCheckboxGroupProps> {
+export interface ICheckboxGroupContext extends ToRefs<ExtractPropTypes<typeof checkboxGroupProps>> {
     /** 设置check的状态 */
     setCheckedStatus: (name: string | number) => void
 }

package/components/hy-grid/props.ts

@@ -1,5 +1,5 @@
 import type { CSSProperties, PropType } from 'vue'
-import type HyIconProps from '../hy-icon/typing'
+import type { HyIconProps } from '../hy-icon/typing'
 import type { CustomKeysVo, GridItemVo } from './typing'
 
 const gridProps = {

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

@@ -1,5 +1,4 @@
-import { CSSProperties } from 'vue'
-import type HyIconProps from '../hy-icon/typing'
+import type { HyIconProps } from '../hy-icon/typing'
 
 export interface GridItemVo {
     /**

package/components/hy-icon/props.ts

@@ -74,6 +74,6 @@ const iconProps = {
     customStyle: Object as PropType<CSSProperties>,
     /** 自定义外部类名 */
     customClass: String
-}
+} as const
 
 export default iconProps

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

@@ -1,3 +1,8 @@
+import type { ExtractPropTypes } from 'vue'
+import iconProps from './props'
+
+export interface HyIconProps extends ExtractPropTypes<typeof iconProps> {}
+
 export interface IIconEmits {
     /** 点击图标触发 */
     (e: 'click', index: string, e: Event): void

package/components/hy-input/hy-input.vue

@@ -40,7 +40,7 @@
                     :type="type"
                     :focus="focus"
                     :cursor="cursor"
-                    :value="String(innerValue)"
+                    :value="innerValue"
                     :auto-blur="autoBlur"
                     :disabled="disabled || readonly"
                     :maxlength="maxlength"
@@ -148,13 +148,14 @@ const innerFormatter = (value: string) => value
 watch(
     () => props.modelValue,
     (newVal) => {
-        if (changeFromInner.value || innerValue.value === newVal) {
-            changeFromInner.value = false // 重要否则会出现双向绑定失效问题https://github.com/ijry/uview-plus/issues/419
+        if (changeFromInner.value || innerValue.value === newVal || newVal === undefined) {
+            changeFromInner.value = false
             return
         }
+        console.log(newVal, 'newVal')
         innerValue.value = newVal
         // 在H5中，外部value变化后，修改input中的值，不会触发@input事件，此时手动调用值变化方法
-        if (firstChange.value === false && changeFromInner.value === false) {
+        if (!firstChange.value && !changeFromInner.value) {
             valueChange(innerValue.value, true)
         }
         firstChange.value = false
@@ -165,14 +166,14 @@ watch(
 )
 
 /**
- * @description 是否显示清除控件
+ * 是否显示清除控件
  * */
 const isShowClear = computed(() => {
     const { clearable, readonly, disabled } = props
     return clearable && !readonly && !disabled && innerValue.value !== ''
 })
 /**
- * @description 组件的类名
+ * 组件的类名
  * */
 const inputClass = computed((): string => {
     let classes: string[] = [],
@@ -185,7 +186,7 @@ const inputClass = computed((): string => {
 })
 
 /**
- * @description 组件的样式
+ * 组件的样式
  * */
 const wrapperStyle = computed((): CSSProperties => {
     const style: CSSProperties = {}
@@ -200,9 +201,9 @@ const wrapperStyle = computed((): CSSProperties => {
     return Object.assign(style, props.customStyle)
 })
 /**
- * @description 输入框的样式
+ * 输入框的样式
  * */
-const inputStyle = computed((): CSSProperties => {
+const inputStyle = computed(() => {
     return {
         color: props.color,
         fontSize: addUnit(props.fontSize),
@@ -211,7 +212,7 @@ const inputStyle = computed((): CSSProperties => {
 })
 
 /**
- * @description 边框颜色
+ * 边框颜色
  * */
 const borderStyle = computed(() => {
     return (isFocus: boolean) => {
@@ -233,13 +234,10 @@ const borderStyle = computed(() => {
 })
 
 /**
- * @description 当键盘输入时，触发input事件
+ * 当键盘输入时，触发input事件
  */
 const onInput = (e: any) => {
     let { value = '' } = e.detail || {}
-    // 为了避免props的单向数据流特性，需要先将innerValue值设置为当前值，再在$nextTick中重新赋予设置后的值才有效
-    // console.log('onInput', value, this.innerValue)
-    innerValue.value = value
     nextTick(() => {
         let formatValue = innerFormatter(value)
         innerValue.value = formatValue
@@ -247,7 +245,7 @@ const onInput = (e: any) => {
     })
 }
 /**
- * @description 输入框失去焦点时触发
+ * 输入框失去焦点时触发
  * */
 const onBlur = async (event: InputOnBlurEvent) => {
     emit('blur', event, event.detail.value)
@@ -256,7 +254,7 @@ const onBlur = async (event: InputOnBlurEvent) => {
     focused.value = false
 }
 /**
- * @description 输入框聚焦时触发
+ * 输入框聚焦时触发
  * */
 const onFocus = (e: InputOnFocusEvent) => {
     focused.value = true
@@ -264,7 +262,7 @@ const onFocus = (e: InputOnFocusEvent) => {
 }
 
 /**
- * @description 点击完成按钮时触发
+ * 点击完成按钮时触发
  * */
 const onConfirm = (e: InputOnConfirmEvent) => {
     emit('confirm', e, innerValue.value)
@@ -288,15 +286,14 @@ const valueChange = (value: string | number, isOut = false) => {
         if (!isOut || clearInput.value) {
             // 标识value值的变化是由内部引起的
             changeFromInner.value = true
+            emit('update:modelValue', value)
             emit('change', value)
             if (formItem) formItem.handleChange(value)
-
-            emit('update:modelValue', value)
         }
     })
 }
 /**
- * @description 点击清除控件
+ * 点击清除控件
  */
 const onClear = () => {
     clearInput.value = true
@@ -319,13 +316,13 @@ const clickHandler = () => {
 }
 
 /**
- * @description 点击前缀
+ * 点击前缀
  * */
 const onPrefix = () => {
     emit('onPrefix')
 }
 /**
- * @description 点击后缀
+ * 点击后缀
  * */
 const onSuffix = () => {
     emit('onSuffix')

package/components/hy-input/props.ts

@@ -1,6 +1,6 @@
 import type { CSSProperties, PropType } from 'vue'
 import type { InputConfirmType } from '@uni-helper/uni-types'
-import type HyIconProps from '../hy-icon/typing'
+import type { HyIconProps } from '../hy-icon/typing'
 
 const inputProps = {
     /** 输入的值 */

package/components/hy-menu/props.ts

@@ -1,7 +1,7 @@
 import type { MenusType, ModelValueVo } from './typing'
 import type { CSSProperties, PropType } from 'vue'
-import type HyIconProps from '../hy-icon/typing'
-import type HyBadgeProps from '../hy-badge/typing'
+import type { HyIconProps } from '../hy-icon/typing'
+import type { HyBadgeProps } from '../hy-badge/typing'
 
 const menuProps = {
     /** 当前值 */

package/components/hy-number-step/props.ts

@@ -1,4 +1,4 @@
-import type HyIconProps from './typing'
+import type { HyIconProps } from '../hy-icon/typing'
 import type { PropType } from 'vue'
 
 const numberStepProps = {

package/components/hy-price/hy-price.vue

@@ -54,10 +54,17 @@ const priceOne = computed(() => {
     if (props.text === undefined || props.text === null) return error('text值不能为空')
 
     let value = typeof props.text === 'string' ? props.text : props.text.toString()
+
+    // 格式化整数部分为千分位
+    const formatValue = (val: string) => {
+        return val.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+    }
+
     if (/\./g.test(value)) {
-        return Number(value) ? value.split('.') : ['0', '000000']
+        const [integer, decimal] = value.split('.')
+        return [formatValue(integer), decimal]
     } else {
-        return [value, '000000']
+        return [formatValue(value), '000000']
     }
 })
 

package/components/hy-search/props.ts

@@ -1,7 +1,6 @@
 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'
+import type { HyIconProps } from '../hy-icon/typing'
 
 const searchProps = {
     /** 输入框初始值 */

package/components/hy-switch/props.ts

@@ -1,6 +1,6 @@
 import type { CSSProperties, PropType } from 'vue'
 import type { SwitchValue } from './typing'
-import type HyIconProps from '../hy-icon/typing'
+import type { HyIconProps } from '../hy-icon/typing'
 
 const switchProps = {
     /** 通过v-model双向绑定的值 */

package/components/hy-tabbar/props.ts

@@ -1,5 +1,5 @@
 import type { CSSProperties, PropType } from 'vue'
-import type HyBadgeProps from '../hy-badge/typing'
+import type { HyBadgeProps } from '../hy-badge/typing'
 
 const tabBarProps = {
     /** 选中项的索引值 */

package/components/hy-tabbar-group/props.ts

@@ -1,5 +1,5 @@
 import type { CSSProperties, PropType } from 'vue'
-import type HyBadgeProps from '../hy-badge/typing'
+import type { HyBadgeProps } from '../hy-badge/typing'
 
 const tabbarGroupProps = {
     /** 选中项的索引值 */

package/components/hy-tabs/props.ts

@@ -1,6 +1,6 @@
 import type { TabsItemVo } from './typing'
 import type { CSSProperties, PropType } from 'vue'
-import type HyBadgeProps from '../hy-badge/typing'
+import type { HyBadgeProps } from '../hy-badge/typing'
 
 const tabsProps = {
     /** 标签数组，元素为对象，如[{name: '推荐'}] */

package/components/hy-tag/props.ts

@@ -1,5 +1,5 @@
 import type { CSSProperties, PropType } from 'vue'
-import type HyIconProps from './typing'
+import type { HyIconProps } from '../hy-icon/typing'
 
 const tagProps = {
     /** 标签的文字内容 */

package/global.d.ts

@@ -10,6 +10,7 @@ declare module 'vue' {
         HyCalendar: (typeof import('./components/hy-calendar/hy-calendar.vue'))['default']
         HyCard: (typeof import('./components/hy-card/hy-card.vue'))['default']
         HyCell: (typeof import('./components/hy-cell/hy-cell.vue'))['default']
+        HyCellItem: (typeof import('./components/hy-cell-item/hy-cell-item.vue'))['default']
         HyCheckButton: (typeof import('./components/hy-check-button/hy-check-button.vue'))['default']
         HyCheckbox: (typeof import('./components/hy-checkbox/hy-checkbox.vue'))['default']
         HyCheckboxGroup: (typeof import('./components/hy-checkbox-group/hy-checkbox-group.vue'))['default']

package/libs/css/theme.scss

@@ -33,7 +33,7 @@ $hy-text-color--4: var(--hy-text-color--4, rgba(0, 0, 0, 0.1)) !default; // 一
 $hy-icon-color: var(--hy-icon-color, #606266) !default; // 一般用于icon
 $hy-text-color--grey: var(--hy-text-color--grey, #999) !default; // 辅助灰色，如加载更多的提示信息
 $hy-text-color--placeholder: var(--hy-text-color--placeholder, #909399) !default; // 输入框提示颜色
-$hy-text-color--disabled: var(--hy-text-color--disabled, #c0c0c0) !default; // 禁用文字颜色
+$hy-text-color--disabled: var(--hy-text-color--disabled, #FFFFFF3F) !default; // 禁用文字颜色
 $hy-border-color: var(--hy-border-color, #c0c0c0) !default; // 边框颜色
 $hy-text-color--hover: var(--hy-text-color--hover, #58595b)!default; // 点击状态文字颜色
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hy-app",
-  "version": "0.5.5",
-  "description": "fix: 表单修复",
+  "version": "0.5.6",
+  "description": "fix: 单元格拆分",
   "main": "./index.ts",
   "private": false,
   "scripts": {},