hy-app 0.5.9 → 0.5.10

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

@@ -1,8 +1,8 @@
 <template>
     <view class="hy-check-button">
         <template v-for="(item, i) in columns_1" :key="i">
-            <HyTag
-                :text="item?.[fieldNames.label] as string"
+            <hy-tag
+                :text="item?.[fieldNames.label]"
                 :name="i"
                 :type="type"
                 :size="size"
@@ -10,7 +10,7 @@
                 :disabled="isDisabled(item.disabled)"
                 :plain="!item?.[fieldNames.checked]"
                 @click="onCheckbox"
-            ></HyTag>
+            ></hy-tag>
         </template>
     </view>
 </template>

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

@@ -177,7 +177,7 @@ const isShowClear = computed(() => {
 const inputClass = computed((): string => {
     let classes: string[] = [],
         { border, shape } = props
-    border === 'surround' && (classes = classes.concat(['hy-border', 'hy-input__radius']))
+    border === 'surround' && (classes = classes.concat(['hy-input__border', 'hy-input__radius']))
     classes.push(`hy-input__${shape}`)
     border === 'bottom' && (classes = classes.concat(['hy-border__bottom', 'hy-input__no-radius']))
     props.disabled && classes.push('hy-input__disabled')

package/components/hy-input/index.scss

@@ -7,6 +7,11 @@
   justify-content: space-between;
   flex: 1;
   color: $hy-text-color;
+  
+  @include e(border) {
+	/* TODO: 先这样写，因为在某些pda中写$hy-border-line，边框不显示，后续排除问题 */
+  	border: 1px solid #e8e8e8;
+  }
 
   @include e(radius, square) {
     border-radius: 4px;

package/components/hy-line-progress/index.scss

@@ -6,6 +6,7 @@
   position: relative;
   @include flex(row);
   flex: 1;
+  width: 100%;
   overflow: hidden;
   border-radius: $hy-border-radius-semicircle;
 

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

@@ -111,7 +111,7 @@ watch(
 // 组件的类名
 const textareaClass = computed(() => {
     let classes: string[] = []
-    props.border === 'surround' && (classes = classes.concat(['hy-border', 'hy-textarea__radius']))
+    props.border === 'surround' && (classes = classes.concat(['hy-textarea__border', 'hy-textarea__radius']))
     props.border === 'bottom' &&
         (classes = classes.concat(['hy-border__bottom', 'hy-textarea__no-radius']))
     props.disabled && classes.push('hy-textarea__disabled')

package/components/hy-textarea/index.scss

@@ -7,6 +7,11 @@
   @include flex;
   flex: 1;
   padding: $hy-border-margin-padding-sm;
+  
+  @include e(border) {
+  	/* TODO: 先这样写，因为在某些pda中写$hy-border-line，边框不显示，后续排除问题 */
+  	border: 1px solid #e8e8e8;
+  }
 
   @include e(radius) {
     border-radius: $hy-border-radius-sm;

package/libs/css/theme.scss

@@ -93,4 +93,4 @@ $hy-border-margin-padding-sm: var(--hy-border-margin-padding-sm, 10rpx) !default
 $hy-border-margin-padding-base: var(--hy-border-margin-padding-base, 20rpx) !default;
 $hy-border-margin-padding-lg: var(--hy-border-margin-padding-lg, 30rpx) !default;
 /* 底部线条 */
-$hy-border-line: var(--hy-border-line, 1rpx solid #e8e8e8) !default;
+$hy-border-line: var(--hy-border-line, 1px solid #e8e8e8) !default;

package/libs/utils/inside.ts

@@ -1,5 +1,5 @@
 // 内部使用方法
-import { inject } from "vue";
+import { inject } from 'vue'
 
 /**
  * 生成bem规则类名
@@ -12,39 +12,37 @@ import { inject } from "vue";
  * @returns {Array|string}
  */
 export const bem = (
-  name: string,
-  props: Record<string, any>,
-  fixed: string[],
-  change?: string[],
+    name: string,
+    props: Record<string, any>,
+    fixed: string[],
+    change?: string[]
 ): string | string[] => {
-  // 类名前缀
-  const prefix = `hy-${name}--`;
-  const classes: Record<string, string | boolean> = {};
-  if (fixed) {
-    fixed.map((item: string) => {
-      // 这里的类名，会一直存在
-      classes[prefix + props[item]] = true;
-      if (item === "type" && props["plain"]) {
-        classes[prefix + props[item] + "__plain"] = true;
-      }
-    });
-  }
-  if (change) {
-    change.map((item: string) => {
-      // 这里的类名，会根据this[item]的值为true或者false，而进行添加或者移除某一个类
-      props[item]
-        ? (classes[prefix + item] = props[item])
-        : delete classes[prefix + item];
-    });
-  }
-  return (
-    Object.keys(classes)
-      // 支付宝，头条小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
-      // #ifdef MP-ALIPAY || MP-TOUTIAO || MP-LARK
-      .join(" ")
-    // #endif
-  );
-};
+    // 类名前缀
+    const prefix = `hy-${name}--`
+    const classes: Record<string, string | boolean> = {}
+    if (fixed) {
+        fixed.map((item: string) => {
+            // 这里的类名，会一直存在
+            classes[prefix + props[item]] = true
+            if (item === 'type' && props['plain']) {
+                classes[prefix + props[item] + '__plain'] = true
+            }
+        })
+    }
+    if (change) {
+        change.map((item: string) => {
+            // 这里的类名，会根据this[item]的值为true或者false，而进行添加或者移除某一个类
+            props[item] ? (classes[prefix + item] = props[item]) : delete classes[prefix + item]
+        })
+    }
+    return (
+        Object.keys(classes)
+            // 支付宝，头条小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
+            // #ifdef MP-ALIPAY || MP-TOUTIAO || MP-LARK
+            .join(' ')
+        // #endif
+    )
+}
 
 /**
  * @description 在u-form的子组件内容发生变化，或者失去焦点时，尝试通知u-form执行校验方法
@@ -52,13 +50,13 @@ export const bem = (
  * @param {*} event
  */
 export function formValidate(event) {
-  // const formItem = $parent.call(instance, "u-form-item");
-  const form = inject("uForm");
-  // 如果发生变化的input或者textarea等，其父组件中有u-form-item或者u-form等，就执行form的validate方法
-  // 同时将form-item的pros传递给form，让其进行精确对象验证
-  // if (formItem && form) {
-  //   form.validateField(formItem.prop, () => {}, event);
-  // }
+    // const formItem = $parent.call(instance, "u-form-item");
+    const form = inject('uForm')
+    // 如果发生变化的input或者textarea等，其父组件中有u-form-item或者u-form等，就执行form的validate方法
+    // 同时将form-item的pros传递给form，让其进行精确对象验证
+    // if (formItem && form) {
+    //   form.validateField(formItem.prop, () => {}, event);
+    // }
 }
 
 /**
@@ -66,19 +64,19 @@ export function formValidate(event) {
  * @param {*} err 错误内容
  */
 export function error(err: string) {
-  // 开发环境才提示，生产环境不会提示
-  if (process.env.NODE_ENV === "development") {
-    console.error(`华玥组件提示：${err}`);
-  }
+    // 开发环境才提示，生产环境不会提示
+    if (process.env.NODE_ENV === 'development') {
+        console.error(`华玥组件提示：${err}`)
+    }
 }
 
 export const sleep = (value = 100) => {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve();
-    }, value);
-  });
-};
+    return new Promise((resolve) => {
+        setTimeout(() => {
+            resolve(null)
+        }, value)
+    })
+}
 
 /**
  * @param {Number} len uuid的长度
@@ -86,219 +84,214 @@ export const sleep = (value = 100) => {
  * @param {Nubmer} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制
  */
 export function guid(len = 32, firstU = true, radix = null) {
-  const chars =
-    "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".split("");
-  const uuid = [];
-  radix = radix || chars.length;
+    const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
+    const uuid = []
+    radix = radix || chars.length
 
-  if (len) {
-    // 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
-    for (let i = 0; i < len; i++) uuid[i] = chars[0 | (Math.random() * radix)];
-  } else {
-    let r;
-    // rfc4122标准要求返回的uuid中,某些位为固定的字符
-    uuid[8] = uuid[13] = uuid[18] = uuid[23] = "-";
-    uuid[14] = "4";
+    if (len) {
+        // 如果指定uuid长度,只是取随机的字符,0|x为位运算,能去掉x的小数位,返回整数位
+        for (let i = 0; i < len; i++) uuid[i] = chars[0 | (Math.random() * radix)]
+    } else {
+        let r
+        // rfc4122标准要求返回的uuid中,某些位为固定的字符
+        uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-'
+        uuid[14] = '4'
 
-    for (let i = 0; i < 36; i++) {
-      if (!uuid[i]) {
-        r = 0 | (Math.random() * 16);
-        uuid[i] = chars[i == 19 ? (r & 0x3) | 0x8 : r];
-      }
+        for (let i = 0; i < 36; i++) {
+            if (!uuid[i]) {
+                r = 0 | (Math.random() * 16)
+                uuid[i] = chars[i == 19 ? (r & 0x3) | 0x8 : r]
+            }
+        }
     }
-  }
-  // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
-  if (firstU) {
-    uuid.shift();
-    return `hy${uuid.join("")}`;
-  }
-  return uuid.join("");
+    // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class
+    if (firstU) {
+        uuid.shift()
+        return `hy${uuid.join('')}`
+    }
+    return uuid.join('')
 }
 
 /**
  * @description 获取设备信息
  * */
 export const getWindowInfo = (): UniNamespace.GetWindowInfoResult => {
-  let ret: UniNamespace.GetWindowInfoResult;
-  // #ifdef APP || H5
-  ret = uni.getWindowInfo();
-  // #endif
-  // #ifndef APP || H5
-  ret = uni.getSystemInfoSync();
-  // #endif
-  return ret;
-};
+    let ret: UniNamespace.GetWindowInfoResult
+    // #ifdef APP || H5
+    ret = uni.getWindowInfo()
+    // #endif
+    // #ifndef APP || H5
+    ret = uni.getSystemInfoSync()
+    // #endif
+    return ret
+}
 
 function pickExclude(obj, keys) {
-  // 某些情况下，type可能会为
-  if (
-    !["[object Object]", "[object File]"].includes(
-      Object.prototype.toString.call(obj),
-    )
-  ) {
-    return {};
-  }
-  return Object.keys(obj).reduce((prev, key) => {
-    if (!keys.includes(key)) {
-      prev[key] = obj[key];
+    // 某些情况下，type可能会为
+    if (!['[object Object]', '[object File]'].includes(Object.prototype.toString.call(obj))) {
+        return {}
     }
-    return prev;
-  }, {});
+    return Object.keys(obj).reduce((prev, key) => {
+        if (!keys.includes(key)) {
+            prev[key] = obj[key]
+        }
+        return prev
+    }, {})
 }
 
 function formatImage(res) {
-  return res.tempFiles.map((item) => ({
-    ...pickExclude(item, ["path"]),
-    type: "image",
-    url: item.path,
-    thumb: item.path,
-    size: item.size,
-    // #ifdef H5
-    name: item.name,
-    file: item,
-    // #endif
-  }));
+    return res.tempFiles.map((item) => ({
+        ...pickExclude(item, ['path']),
+        type: 'image',
+        url: item.path,
+        thumb: item.path,
+        size: item.size,
+        // #ifdef H5
+        name: item.name,
+        file: item
+        // #endif
+    }))
 }
 
 function formatVideo(res) {
-  return [
-    {
-      ...pickExclude(res, ["tempFilePath", "thumbTempFilePath", "errMsg"]),
-      type: "video",
-      url: res.tempFilePath,
-      thumb: res.thumbTempFilePath,
-      size: res.size,
-      // #ifdef H5
-      name: res.name,
-      file: res,
-      // #endif
-    },
-  ];
+    return [
+        {
+            ...pickExclude(res, ['tempFilePath', 'thumbTempFilePath', 'errMsg']),
+            type: 'video',
+            url: res.tempFilePath,
+            thumb: res.thumbTempFilePath,
+            size: res.size,
+            // #ifdef H5
+            name: res.name,
+            file: res
+            // #endif
+        }
+    ]
 }
 
 function formatMedia(res) {
-  return res.tempFiles.map((item) => ({
-    ...pickExclude(item, ["fileType", "thumbTempFilePath", "tempFilePath"]),
-    type: res.type,
-    url: item.tempFilePath,
-    thumb: res.type === "video" ? item.thumbTempFilePath : item.tempFilePath,
-    size: item.size,
-    // #ifdef H5
-    file: item,
-    // #endif
-  }));
+    return res.tempFiles.map((item) => ({
+        ...pickExclude(item, ['fileType', 'thumbTempFilePath', 'tempFilePath']),
+        type: res.type,
+        url: item.tempFilePath,
+        thumb: res.type === 'video' ? item.thumbTempFilePath : item.tempFilePath,
+        size: item.size,
+        // #ifdef H5
+        file: item
+        // #endif
+    }))
 }
 
 function formatFile(res) {
-  return res.tempFiles.map((item) => ({
-    ...pickExclude(item, ["path"]),
-    url: item.path,
-    size: item.size,
-    // #ifdef H5
-    name: item.name,
-    type: item.type,
-    file: item,
-    // #endif
-  }));
+    return res.tempFiles.map((item) => ({
+        ...pickExclude(item, ['path']),
+        url: item.path,
+        size: item.size,
+        // #ifdef H5
+        name: item.name,
+        type: item.type,
+        file: item
+        // #endif
+    }))
 }
 
 export function chooseFile({
-  accept,
-  multiple,
-  capture,
-  compressed,
-  maxDuration,
-  sizeType,
-  camera,
-  maxCount,
-  extension,
+    accept,
+    multiple,
+    capture,
+    compressed,
+    maxDuration,
+    sizeType,
+    camera,
+    maxCount,
+    extension
 }: any) {
-  return new Promise((resolve, reject) => {
-    switch (accept) {
-      case "image":
-        uni.chooseImage({
-          count: multiple ? Math.min(maxCount, 9) : 1,
-          sourceType: capture,
-          sizeType,
-          success: (res) => resolve(formatImage(res)),
-          fail: reject,
-        });
-        break;
-      // #ifdef MP-WEIXIN
-      // 只有微信小程序才支持chooseMedia接口
-      case "media":
-        wx.chooseMedia({
-          count: multiple ? Math.min(maxCount, 9) : 1,
-          sourceType: capture,
-          maxDuration,
-          sizeType,
-          camera,
-          success: (res) => resolve(formatMedia(res)),
-          fail: reject,
-        });
-        break;
-      // #endif
-      case "video":
-        uni.chooseVideo({
-          sourceType: capture,
-          compressed,
-          maxDuration,
-          camera,
-          success: (res) => resolve(formatVideo(res)),
-          fail: reject,
-        });
-        break;
-      // #ifdef MP-WEIXIN || H5
-      // 只有微信小程序才支持chooseMessageFile接口
-      case "file":
-        // #ifdef MP-WEIXIN
-        wx.chooseMessageFile({
-          count: multiple ? maxCount : 1,
-          type: accept,
-          success: (res) => resolve(formatFile(res)),
-          fail: reject,
-        });
-        // #endif
-        // #ifdef H5
-        // 需要hx2.9.9以上才支持uni.chooseFile
-        let params = {
-          count: multiple ? maxCount : 1,
-          type: accept,
-          success: (res) => resolve(formatFile(res)),
-          fail: reject,
-        };
-        if (extension.length && extension.length > 0) {
-          params.extension = extension;
+    return new Promise((resolve, reject) => {
+        switch (accept) {
+            case 'image':
+                uni.chooseImage({
+                    count: multiple ? Math.min(maxCount, 9) : 1,
+                    sourceType: capture,
+                    sizeType,
+                    success: (res) => resolve(formatImage(res)),
+                    fail: reject
+                })
+                break
+            // #ifdef MP-WEIXIN
+            // 只有微信小程序才支持chooseMedia接口
+            case 'media':
+                wx.chooseMedia({
+                    count: multiple ? Math.min(maxCount, 9) : 1,
+                    sourceType: capture,
+                    maxDuration,
+                    sizeType,
+                    camera,
+                    success: (res) => resolve(formatMedia(res)),
+                    fail: reject
+                })
+                break
+            // #endif
+            case 'video':
+                uni.chooseVideo({
+                    sourceType: capture,
+                    compressed,
+                    maxDuration,
+                    camera,
+                    success: (res) => resolve(formatVideo(res)),
+                    fail: reject
+                })
+                break
+            // #ifdef MP-WEIXIN || H5
+            // 只有微信小程序才支持chooseMessageFile接口
+            case 'file':
+                // #ifdef MP-WEIXIN
+                wx.chooseMessageFile({
+                    count: multiple ? maxCount : 1,
+                    type: accept,
+                    success: (res) => resolve(formatFile(res)),
+                    fail: reject
+                })
+                // #endif
+                // #ifdef H5
+                // 需要hx2.9.9以上才支持uni.chooseFile
+                let params = {
+                    count: multiple ? maxCount : 1,
+                    type: accept,
+                    success: (res) => resolve(formatFile(res)),
+                    fail: reject
+                }
+                if (extension.length && extension.length > 0) {
+                    params.extension = extension
+                }
+                uni.chooseFile(params)
+                // #endif
+                break
+            // #endif
+            default:
+                // 此为保底选项，在accept不为上面任意一项的时候选取全部文件
+                // #ifdef MP-WEIXIN
+                wx.chooseMessageFile({
+                    count: multiple ? maxCount : 1,
+                    type: 'all',
+                    success: (res) => resolve(formatFile(res)),
+                    fail: reject
+                })
+                // #endif
+                // #ifdef H5
+                // 需要hx2.9.9以上才支持uni.chooseFile
+                let paramsFile = {
+                    count: multiple ? maxCount : 1,
+                    type: 'all',
+                    success: (res) => resolve(formatFile(res)),
+                    fail: reject
+                }
+                if (extension.length && extension.length > 0) {
+                    paramsFile.extension = extension
+                }
+                uni.chooseFile(paramsFile)
+            // #endif
         }
-        uni.chooseFile(params);
-        // #endif
-        break;
-      // #endif
-      default:
-        // 此为保底选项，在accept不为上面任意一项的时候选取全部文件
-        // #ifdef MP-WEIXIN
-        wx.chooseMessageFile({
-          count: multiple ? maxCount : 1,
-          type: "all",
-          success: (res) => resolve(formatFile(res)),
-          fail: reject,
-        });
-        // #endif
-        // #ifdef H5
-        // 需要hx2.9.9以上才支持uni.chooseFile
-        let paramsFile = {
-          count: multiple ? maxCount : 1,
-          type: "all",
-          success: (res) => resolve(formatFile(res)),
-          fail: reject,
-        };
-        if (extension.length && extension.length > 0) {
-          paramsFile.extension = extension;
-        }
-        uni.chooseFile(paramsFile);
-      // #endif
-    }
-  });
+    })
 }
 
 /**
@@ -310,30 +303,29 @@ export function chooseFile({
  * @returns {string} 格式化后的数字
  */
 export function priceFormat(
-  number: string | number,
-  decimals = 0,
-  decimalPoint = ".",
-  thousandsSeparator = ",",
+    number: string | number,
+    decimals = 0,
+    decimalPoint = '.',
+    thousandsSeparator = ','
 ) {
-  number = `${number}`.replace(/[^0-9+-Ee.]/g, "");
-  const n = !isFinite(+number) ? 0 : +number;
-  const prec = !isFinite(+decimals) ? 0 : Math.abs(decimals);
-  const sep =
-    typeof thousandsSeparator === "undefined" ? "," : thousandsSeparator;
-  const dec = typeof decimalPoint === "undefined" ? "." : decimalPoint;
-  let s = "";
+    number = `${number}`.replace(/[^0-9+-Ee.]/g, '')
+    const n = !isFinite(+number) ? 0 : +number
+    const prec = !isFinite(+decimals) ? 0 : Math.abs(decimals)
+    const sep = typeof thousandsSeparator === 'undefined' ? ',' : thousandsSeparator
+    const dec = typeof decimalPoint === 'undefined' ? '.' : decimalPoint
+    let s = ''
 
-  s = (prec ? n + "" : `${Math.round(n)}`).split(".");
-  const re = /(-?\d+)(\d{3})/;
-  while (re.test(s[0])) {
-    s[0] = s[0].replace(re, `$1${sep}$2`);
-  }
+    s = (prec ? n + '' : `${Math.round(n)}`).split('.')
+    const re = /(-?\d+)(\d{3})/
+    while (re.test(s[0])) {
+        s[0] = s[0].replace(re, `$1${sep}$2`)
+    }
 
-  if ((s[1] || "").length < prec) {
-    s[1] = s[1] || "";
-    s[1] += new Array(prec - s[1].length + 1).join("0");
-  }
-  return s.join(dec);
+    if ((s[1] || '').length < prec) {
+        s[1] = s[1] || ''
+        s[1] += new Array(prec - s[1].length + 1).join('0')
+    }
+    return s.join(dec)
 }
 
 /**
@@ -342,20 +334,17 @@ export function priceFormat(
  * @return {string}
  * */
 export const formatName = (name: string): string => {
-  let value = "";
-  if (name.length === 2) {
-    value = name.substring(0, 1) + "*";
-  } else if (name.length > 2) {
-    let char = "";
-    for (let i = 0, len = name.length - 2; i < len; i++) {
-      char += "*";
+    let value = ''
+    if (name.length === 2) {
+        value = name.substring(0, 1) + '*'
+    } else if (name.length > 2) {
+        let char = ''
+        for (let i = 0, len = name.length - 2; i < len; i++) {
+            char += '*'
+        }
+        value = name.substring(0, 1) + char + name.substring(name.length - 1, name.length)
+    } else {
+        value = name
     }
-    value =
-      name.substring(0, 1) +
-      char +
-      name.substring(name.length - 1, name.length);
-  } else {
-    value = name;
-  }
-  return value;
-};
+    return value
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hy-app",
-  "version": "0.5.9",
-  "description": "feat: 新增表格组件组件",
+  "version": "0.5.10",
+  "description": "fix: 修复输入框组件边框在pda不显示的问题",
   "main": "./index.ts",
   "private": false,
   "scripts": {},