papayaui 0.2.9 → 0.2.11

package/components/cell/cell.scss

@@ -10,9 +10,11 @@
   font-size: _var(cell-font-size, 14px);
   line-height: _var(cell-line-height, 24px);
   overflow: hidden;
-  &__title,
+  &__title {
+    flex: _var(cell-title-flex, 1);
+  }
   &__value {
-    flex: 1;
+    flex: _var(cell-value-flex, 1);
   }
 
   &__icon,
@@ -34,7 +36,7 @@
   &__value {
     position: relative;
     overflow: hidden;
-    text-align: right;
+    text-align: _var(cell-value-text-align, right);
     vertical-align: middle;
     word-wrap: break-word;
     @include _setVar(textarea-padding, 0);
@@ -51,7 +53,8 @@
     transform: rotate(_var(cell-icon-right-rotate, 0));
   }
 
-  &__icon, &__icon-right {
+  &__icon,
+  &__icon-right {
     font-size: _var(cell-icon-size, 16px);
   }
 

package/components/cell/cell.vue

@@ -14,7 +14,7 @@
     <view
       v-if="!!title || $slots.title"
       :class="[ns.e('title'), titleClass]"
-      :style="{ flex: titleWidth ? `0 ${getUnitValue(titleWidth)}` : '1' }"
+      :style="ns.style({ flex: titleWidth ? `0 ${getUnitValue(titleWidth)}` : undefined })"
     >
       <slot v-if="$slots.title" name="title" />
       <template v-else>
@@ -22,7 +22,14 @@
         <view v-if="label" :class="ns.e('label')">{{ label }}</view>
       </template>
     </view>
-    <view :class="[ns.e('value'), valueClass]" :style="{ textAlign: valueAlign }">
+    <view
+      :class="[ns.e('value'), valueClass]"
+      :style="
+        ns.style({
+          textAlign: valueAlign !== cellProps.valueAlign.default ? valueAlign : undefined,
+        })
+      "
+    >
       <slot v-if="$slots.default" />
       <text v-else :selectable="selectable" :user-select="selectable">{{ value }}</text>
 

package/components/input/input.scss

@@ -14,6 +14,10 @@
     line-height: $height;
   }
 
+  &__input {
+    text-align: _var(input-text-align, right);
+  }
+
   &__placeholder {
     color: _var(input-placeholder-color, _var(color-disabled));
   }

package/components/input/input.vue

@@ -5,12 +5,7 @@
   >
     <slot name="prefix" />
 
-    <view
-      v-if="showMask"
-      :class="[ns.e('mask')]"
-      :style="{ textAlign: inputAlign }"
-      @tap.stop="onFocus"
-    >
+    <view v-if="showMask" :class="[ns.e('mask')]" :style="customStyle" @tap.stop="onFocus">
       {{ inputValue }}
     </view>
 
@@ -22,7 +17,7 @@
       :disabled="readonly || disabled"
       :placeholder="placeholder"
       :placeholder-class="ns.e('placeholder')"
-      :style="{ textAlign: inputAlign }"
+      :style="customStyle"
       :maxlength="maxLength"
       :focus="inputSelection.focus"
       :selection-start="inputSelection.start"
@@ -50,7 +45,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref } from 'vue'
+import { computed, ref, type CSSProperties } from 'vue'
 import { formatNumericTypeString, minAndMax, useNamespace } from '../../core'
 import type { EventDetail } from '../../types'
 import IconComponent from '../icon/icon.vue'
@@ -72,6 +67,14 @@ const inputValue = computed<string>({
   },
 })
 
+const customStyle = computed(() => {
+  const style: CSSProperties = {}
+  if (props.inputAlign !== inputProps.inputAlign.default) {
+    style.textAlign = props.inputAlign
+  }
+  return style
+})
+
 const inputSelection = ref({ focus: false, start: -1, end: -1 })
 
 const showMask = computed(() => {

package/components/input/props.ts

@@ -1,5 +1,6 @@
 import type { ExtractPropTypes, PropType } from 'vue'
 import { isString } from '../../utils'
+import { cellProps } from '../cell'
 
 export type InputType = 'text' | 'number'
 export type InputValue = string | number
@@ -52,10 +53,7 @@ export const inputProps = {
   /**
    * 内容对齐方式
    */
-  inputAlign: {
-    type: String as PropType<'left' | 'center' | 'right'>,
-    default: 'right',
-  },
+  inputAlign: cellProps.valueAlign,
   /**
    * 是否禁用
    */

package/components/picker-popup/picker-popup.vue

@@ -227,6 +227,7 @@ const onCreate = async () => {
 }
 
 const onSelect = async (value: OptionValue) => {
+  emit('select', value)
   if (_onSelect(value) && !showView.value.confirm) {
     onOk()
   }

package/components/picker-popup/props.ts

@@ -118,6 +118,7 @@ export const pickerPopupEmits = {
   ...bottomPopupEmits,
   'update:modelValue': (value: OptionValue | OptionValue[]) =>
     isString(value) || isNumber(value) || isArray(value),
+  select: (item: Option) => isObject(item),
   change: (item: Option | Option[]) => isObject(item) || isArray(item),
   /**
    * 新增选项

package/components/textarea/textarea.scss

@@ -18,6 +18,7 @@
     color: inherit;
     line-height: inherit;
     height: _var(textarea-height, $line-height * 3);
+    text-align: _var(textarea-text-align, left);
   }
 
   &__placeholder {

package/components/textarea/textarea.vue

@@ -50,7 +50,9 @@ const customStyle = computed(() => {
   if (props.height && !props.autoHeight) {
     style.height = getUnitValue(props.height)
   }
-  style.textAlign = props.inputAlign
+  if (props.inputAlign !== textareaProps.inputAlign.default) {
+    style.textAlign = props.inputAlign
+  }
   return style
 })
 

package/components/uploader/props.ts

@@ -7,6 +7,7 @@ export type FileItem = {
   type?: 'image' | 'video'
   status?: 'ready' | 'uploading' | 'success' | 'error'
   deletable?: boolean
+  thumbUrl?: string
 }
 
 export const uploaderProps = {

package/components/uploader/uploader.vue

@@ -6,7 +6,7 @@
         <view v-for="(file, index) in fileList" :key="index" :class="ns.e('preview')">
           <view :class="ns.e('preview-image')" :style="sizeStyle">
             <ImageComponent
-              :src="file.url"
+              :src="file.thumbUrl ?? file.url"
               width="100%"
               height="100%"
               mode="aspectFill"
@@ -133,6 +133,13 @@ const onPreview = (file: FileItem, index: number) => {
   uni.previewMedia({
     sources: props.fileList,
     current: index,
+    fail: () => {
+      // 前面的API可能存在兼容问题，失败时使用降级方法
+      uni.previewImage({
+        urls: props.fileList.map((file) => file.url),
+        current: index,
+      })
+    },
   })
   // #endif
   // #ifndef MP

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "papayaui",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "适用于uniapp的ui扩展库",
   "packageManager": "pnpm@8.6.0",
   "dependencies": {

package/utils/cos.ts

@@ -230,7 +230,7 @@ export class PaCOS {
   }
 
   async getAuthorization(options: any) {
-    if (this.cosAuthorization && this.cosAuthorization.expiredTime < Date.now() / 1000) {
+    if (this.cosAuthorization && this.cosAuthorization.expiredTime > Date.now() / 1000) {
       return this.cosAuthorization
     }
     const authorization = await this.config.getAuthorization(options)
@@ -249,13 +249,6 @@ export class PaCOS {
     const cosConfig = await this.getConfig()
     const Key = `${cosConfig.prefix}/${params?.Key ?? filePath.replace(/^.+\/(.+)$/, '$1')}`
     return new Promise<UploadFileResult>((resolve, reject) => {
-      console.log('uploadFile params', {
-        Bucket: cosConfig.bucket,
-        Region: cosConfig.region,
-        FilePath: filePath,
-        ...params,
-        Key,
-      })
       this.cos.uploadFile(
         {
           Bucket: cosConfig.bucket,

package/components/dialog/dialog.ts

@@ -1,14 +0,0 @@
-import { defaultNamespace } from '../../core'
-
-const Dialog = () => {
-  const node = uni
-    .createSelectorQuery()
-    .select(`#${defaultNamespace}-dialog`)
-    .node((result) => {
-      console.log('result', result)
-    })
-    .exec()
-  console.log(node)
-}
-
-export default Dialog