hy-app 0.5.1 → 0.5.3

package/components/hy-rate/hy-rate.vue

@@ -167,7 +167,6 @@ const clickHandler = (e: TouchEvent) => {
     //   return;
     // }
     e.stopPropagation()
-    console.log(e, '微信')
     let x = 0
     // #ifndef APP-NVUE || MP-ALIPAY
     x = e.detail.x

package/components/hy-read-more/hy-read-more.vue

@@ -62,7 +62,7 @@ export default {
 import { computed, ref, onMounted, getCurrentInstance } from 'vue'
 import type { CSSProperties } from 'vue'
 import type { IReadMoreEmits } from './typing'
-import { getRect, guid, sleep, IconConfig } from '../../libs'
+import { getRect, guid, sleep, addUnit, IconConfig } from '../../libs'
 import readMoreProps from './props'
 // 组件
 import HyIcon from '../hy-icon/hy-icon.vue'

package/components/hy-textarea/hy-textarea.vue

@@ -4,7 +4,7 @@
         :style="[textareaStyle, borderStyle(isFocus)]"
     >
         <textarea
-            class="hy-textarea__field"
+            :class="['hy-textarea__field', disabled && 'hy-textarea__disabled-text']"
             :value="innerValue"
             :style="`height: ${autoHeight ? 'auto' : addUnit(height)}`"
             :placeholder="placeholder || ''"

package/components/hy-textarea/index.scss

@@ -8,12 +8,6 @@
   flex: 1;
   padding: $hy-border-margin-padding-sm;
 
-  @include e(field) {
-    min-height: 50rpx;
-    max-height: 200rpx;
-    color: $hy-text-color;
-  }
-
   @include e(radius) {
     border-radius: $hy-border-radius-sm;
   }
@@ -24,10 +18,17 @@
 
   @include e(disabled) {
     background-color: $hy-background--disabled;
-    color: $hy-text-color--disabled;
+    color: $hy-text-color--disabled !important;
+
+    &-text {
+      color: $hy-text-color--disabled !important;
+    }
   }
 
   @include e(field) {
+    min-height: 50rpx;
+    max-height: 200rpx;
+    color: $hy-text-color;
     flex: 1;
     font-size: 15px;
     width: 100%;

package/components/hy-toast/index.scss

@@ -20,8 +20,8 @@
     }
 
     @include m(icon) {
-      width: 32px;
-      height: 32px;
+      width: 60rpx;
+      height: 60rpx;
       border-radius: $hy-border-radius-semicircle;
       box-sizing: border-box;
       margin-right: $hy-border-margin-padding-base;
@@ -31,27 +31,22 @@
 
       @include e(info) {
         background: $hy-info;
-        border: 6rpx solid $hy-info-dark;
       }
 
       @include e(primary) {
         background: $hy-primary;
-        border: 6rpx solid $hy-primary-dark;
       }
 
       @include e(success) {
         background: $hy-success;
-        border: 6rpx solid $hy-success-dark;
       }
 
       @include e(error) {
         background: $hy-error;
-        border: 6rpx solid $hy-error-dark;
       }
 
       @include e(warning) {
         background: $hy-warning;
-        border: 6rpx solid $hy-warning-dark;
       }
     }
 

package/libs/css/common.scss

@@ -49,8 +49,3 @@
   color: transparent;
   display:none;
 }
-
-/* 去除原生按钮边框 */
-button:after {
-  border: none;
-}

package/libs/typing/modules/form.ts

@@ -1,176 +1,172 @@
-import type { DateModeEnum } from "./enum";
-import type { CheckboxColumnsVo } from "../../../components/hy-check-button/typing";
-import type HyInputProps from "../../../components/hy-input/typing";
-import type HyTextareaProps from "../../../components/hy-textarea/typing";
-import type HySwitchProps from "../../../components/hy-switch/typing";
-import type HyPickerProps from "../../../components/hy-picker/typing";
-import type HyRadioProps from "../../../components/hy-radio/typing";
-import type HyCheckButtonProps from "../../../components/hy-check-button/typing";
+import type { DateModeEnum } from './enum'
+import type { CheckboxColumnsVo } from '../../../components/hy-check-button/typing'
+import type HyInputProps from '../../../components/hy-input/typing'
+import type HyTextareaProps from '../../../components/hy-textarea/typing'
+import type HySwitchProps from '../../../components/hy-switch/typing'
+import type HyPickerProps from '../../../components/hy-picker/typing'
+import type HyRadioProps from '../../../components/hy-radio/typing'
+import type HyCheckButtonProps from '../../../components/hy-check-button/typing'
 
 /**
  * 类型
  * */
 export enum FormTypeEnum {
-  /**
-   * 上传文件
-   * */
-  UPLOAD = "upload",
-  /**
-   * 普通输入框
-   * */
-  TEXT = "text",
-  /**
-   * 数字输入框
-   * */
-  NUMBER = "number",
-  /**
-   * 密码输入框
-   * */
-  PASSWORD = "password",
-  /**
-   * 身份证id输入框
-   * */
-  ID_CARD = "idcard",
-  /**
-   * 单选
-   * */
-  RADIO = "radio",
-  /**
-   * 选择按钮（单选/多选）
-   * */
-  CHECK_BUTTON = "checkButton",
-  /**
-   * 时间选择器
-   * */
-  DATE = "date",
-  /**
-   * 选择器
-   * */
-  SELECT = "select",
-  /**
-   * 地址选择器
-   * */
-  ADDRESS = "address",
-  /**
-   * 开关
-   * */
-  SWITCH = "switch",
-  /**
-   * 详情
-   * */
-  DETAIL = "detail",
-  /**
-   * 文本域
-   * */
-  TEXTAREA = "textarea",
-  /**
-   * 自定义
-   * */
-  CUSTOM = "custom",
+    /**
+     * 上传文件
+     * */
+    UPLOAD = 'upload',
+    /**
+     * 普通输入框
+     * */
+    TEXT = 'text',
+    /**
+     * 数字输入框
+     * */
+    NUMBER = 'number',
+    /**
+     * 密码输入框
+     * */
+    PASSWORD = 'password',
+    /**
+     * 身份证id输入框
+     * */
+    ID_CARD = 'idcard',
+    /**
+     * 单选
+     * */
+    RADIO = 'radio',
+    /**
+     * 选择按钮（单选/多选）
+     * */
+    CHECK_BUTTON = 'checkButton',
+    /**
+     * 时间选择器
+     * */
+    DATE = 'date',
+    /**
+     * 选择器
+     * */
+    SELECT = 'select',
+    /**
+     * 地址选择器
+     * */
+    ADDRESS = 'address',
+    /**
+     * 开关
+     * */
+    SWITCH = 'switch',
+    /**
+     * 详情
+     * */
+    DETAIL = 'detail',
+    /**
+     * 文本域
+     * */
+    TEXTAREA = 'textarea',
+    /**
+     * 自定义
+     * */
+    CUSTOM = 'custom'
 }
 
 export interface FormColumnsType {
-  /**
-   * 标题
-   * */
-  label: string;
-  /**
-   * 字段
-   * */
-  field: string;
-  /**
-   * 是否需要校验
-   * */
-  required?: boolean;
-  /**
-   * 右固定
-   * */
-  right?: boolean;
-  /**
-   * @description 表单类型
-   * */
-  type: FormTypeEnum;
-  /**
-   * @description 文件最大上传数据
-   * */
-  maxCount?: number;
-  /**
-   * @description 是否禁用
-   * */
-  disabled?: boolean;
+    /**
+     * 标题
+     * */
+    label: string
+    /**
+     * 字段
+     * */
+    field: string
+    /**
+     * 右固定
+     * */
+    right?: boolean
+    /**
+     * @description 表单类型
+     * */
+    type: FormTypeEnum
+    /**
+     * @description 文件最大上传数据
+     * */
+    maxCount?: number
+    /**
+     * @description 是否禁用
+     * */
+    disabled?: boolean
 
-  /**
-   * @description type = select时候必填
-   * */
-  select?: string[][] | { text: string; id: string }[][];
-  /**
-   * @description type = radio时候必填
-   * */
-  actions?: CheckboxColumnsVo[];
-  /**
-   * @description 输入框属性api集合
-   * */
-  input?: Partial<HyInputProps>;
-  /**
-   * @description 文本域属性api集合
-   * */
-  textarea?: Partial<HyTextareaProps>;
-  /**
-   * @description 开关属性api集合
-   * */
-  switchItem?: Partial<HySwitchProps>;
-  /**
-   * @description 选择器属性api集合
-   * */
-  picker?: Partial<HyPickerProps>;
-  /**
-   * @description 单选属性api集合
-   * */
-  radio?: Partial<HyRadioProps>;
-  /**
-   * @description 选择按钮属性api集合
-   * */
-  checkButton?: Partial<HyCheckButtonProps>;
-  /**
-   * @description 输入框边框
-   * */
-  mode?: DateModeEnum;
-  /**
-   * @description 规则校验
-   * */
-  rules?: RulesVo | RulesVo[];
+    /**
+     * @description type = select时候必填
+     * */
+    select?: string[][] | { text: string; id: string }[][]
+    /**
+     * @description type = radio时候必填
+     * */
+    actions?: CheckboxColumnsVo[]
+    /**
+     * @description 输入框属性api集合
+     * */
+    input?: Partial<HyInputProps>
+    /**
+     * @description 文本域属性api集合
+     * */
+    textarea?: Partial<HyTextareaProps>
+    /**
+     * @description 开关属性api集合
+     * */
+    switchItem?: Partial<HySwitchProps>
+    /**
+     * @description 选择器属性api集合
+     * */
+    picker?: Partial<HyPickerProps>
+    /**
+     * @description 单选属性api集合
+     * */
+    radio?: Partial<HyRadioProps>
+    /**
+     * @description 选择按钮属性api集合
+     * */
+    checkButton?: Partial<HyCheckButtonProps>
+    /**
+     * @description 日期展示的格式
+     * */
+    mode?: DateModeEnum
+    /**
+     * @description 规则校验
+     * */
+    rules?: RulesVo | RulesVo[]
 }
 
 export interface RulesVo {
-  /**
-   * @description 是否必填
-   * */
-  required?: boolean;
-  /**
-   * @description 校验不通过时的提示信息
-   * */
-  message?: string;
-  /**
-   * @description 表单事件校验
-   * */
-  trigger?: ("blur" | "change")[];
-  /**
-   * @description 最小值
-   * */
-  min?: number;
-  /**
-   * @description 最大值
-   * */
-  max?: number;
-  /**
-   * @description 基础正则校验
-   * phone - 手机号校验
-   * email - 邮箱校验
-   * password - 复杂密码校验
-   * */
-  type?: "phone" | "email" | "password";
-  /**
-   * @description 自定义校验规则
-   * */
-  validator?: (rule: any, value: string, callback?: Function) => boolean;
+    /**
+     * @description 是否必填
+     * */
+    required?: boolean
+    /**
+     * @description 校验不通过时的提示信息
+     * */
+    message?: string
+    /**
+     * @description 表单事件校验
+     * */
+    trigger?: ('blur' | 'change')[]
+    /**
+     * @description 最小值
+     * */
+    min?: number
+    /**
+     * @description 最大值
+     * */
+    max?: number
+    /**
+     * @description 基础正则校验
+     * phone - 手机号校验
+     * email - 邮箱校验
+     * password - 复杂密码校验
+     * */
+    type?: 'phone' | 'email' | 'password'
+    /**
+     * @description 自定义校验规则
+     * */
+    validator?: (rule: any, value: string, callback?: Function) => boolean
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hy-app",
-  "version": "0.5.1",
-  "description": "去掉枚举后面的PropType",
+  "version": "0.5.3",
+  "description": "fix: 新增优惠券",
   "main": "./index.ts",
   "private": false,
   "scripts": {},