sard-uniapp 1.23.4 → 1.23.5

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [1.23.5](https://github.com/sutras/sard-uniapp/compare/v1.23.4...v1.23.5) (2025-08-12)
+
+
+### Features
+
+* **input:** 添加 enableNative 属性以支持支付宝小程序 ([5c8b616](https://github.com/sutras/sard-uniapp/commit/5c8b61624b35a543e87d030266f706eeda819447))
+* **update:** 允许同时选择图片和视频 ([d478208](https://github.com/sutras/sard-uniapp/commit/d4782089767950340448c87bd1bccb43759ede77))
+
+
+
 ## [1.23.4](https://github.com/sutras/sard-uniapp/compare/v1.23.3...v1.23.4) (2025-08-11)
 
 

package/components/config/index.d.ts

@@ -231,6 +231,7 @@ export declare const defaultConfig: {
         hintDuration: number;
     };
     input: {
+        enableNative: boolean;
         maxlength: number;
         adjustPosition: boolean;
         ignoreCompositionEvent: boolean;

package/components/config/index.js

@@ -185,6 +185,7 @@ export const defaultConfig = {
         hintDuration: 300,
     },
     input: {
+        enableNative: false,
         maxlength: 140,
         adjustPosition: true,
         ignoreCompositionEvent: true,

package/components/input/common.d.ts

@@ -1,5 +1,6 @@
 import { type StyleValue } from 'vue';
 export interface InputProps {
+    enableNative?: boolean;
     placeholder?: string;
     placeholderStyle?: string;
     placeholderClass?: string;
@@ -49,6 +50,7 @@ export interface InputProps {
     internalPrepend?: number;
 }
 export declare const defaultInputProps: {
+    enableNative: boolean;
     maxlength: number;
     adjustPosition: boolean;
     ignoreCompositionEvent: boolean;

package/components/input/input.d.ts

@@ -11,6 +11,7 @@ declare const __VLS_component: import("vue").DefineComponent<InputProps, {}, {},
     confirmType: "send" | "search" | "next" | "go" | "done";
     inputmode: "none" | "text" | "decimal" | "numeric" | "tel" | "search" | "email" | "url";
     validateEvent: boolean;
+    enableNative: boolean;
     maxlength: number;
     cursorSpacing: number;
     cursor: number;

package/components/input/input.vue

@@ -16,10 +16,11 @@
             bem.em('control', 'input-min-height', inputMinHeight),
           )
         "
+        :enableNative="enableNative"
+        :value="innerValue"
         :placeholder="placeholder"
         :placeholder-style="mergedPlaceholderStyle"
         :placeholder-class="placeholderClass"
-        :value="innerValue"
         :disabled="isDisabled || isReadonly"
         :maxlength="maxlength"
         :focus="focus"
@@ -51,6 +52,7 @@
       <input
         v-if="type !== 'textarea' && showPassword"
         :class="classNames(bem.e('control'), bem.em('control', 'input'))"
+        :enableNative="enableNative"
         :value="innerValue"
         :placeholder="placeholder"
         :placeholder-style="mergedPlaceholderStyle"
@@ -91,6 +93,7 @@
       <input
         v-if="type !== 'textarea' && !showPassword"
         :class="classNames(bem.e('control'), bem.em('control', 'input'))"
+        :enableNative="enableNative"
         :value="innerValue"
         :placeholder="placeholder"
         :placeholder-style="mergedPlaceholderStyle"
@@ -236,6 +239,7 @@ export default  _defineComponent({
   },
   __name: "input",
   props:  _mergeDefaults({
+    enableNative: { type: Boolean, required: false },
     placeholder: { type: String, required: false },
     placeholderStyle: { type: String, required: false },
     placeholderClass: { type: String, required: false },
@@ -386,10 +390,10 @@ export default  _defineComponent({
     const showPassword = computed(() => {
       return props.type === "password" && isPlainText.value === false;
     });
-    const mergedShowEye = computed(() => props.type === "password" && props.showEye);
     const mergedType = computed(() => {
       return showPassword.value ? "password" : props.type === "password" ? "text" : props.type;
     });
+    const mergedShowEye = computed(() => props.type === "password" && props.showEye);
     const inputClass = computed(() => {
       return classNames(
         bem.b(),
@@ -428,7 +432,7 @@ export default  _defineComponent({
       return oldValue;
     }, set oldValue(v) {
       oldValue = v;
-    }, onFocus, onBlur, clearVisible, holdupClear, onClearTouchStart, onClearTouchEnd, onClearMouseDown, onClearClick, onLinechange, onConfirm, onKeyboardheightchange, onClick, isPlainText, eyeIcon, onEyeClick, showPassword, mergedShowEye, mergedType, inputClass, inputStyle, controlStyle, mergedPlaceholderStyle, get classNames() {
+    }, onFocus, onBlur, clearVisible, holdupClear, onClearTouchStart, onClearTouchEnd, onClearMouseDown, onClearClick, onLinechange, onConfirm, onKeyboardheightchange, onClick, isPlainText, eyeIcon, onEyeClick, showPassword, mergedType, mergedShowEye, inputClass, inputStyle, controlStyle, mergedPlaceholderStyle, get classNames() {
       return classNames;
     }, SarIcon };
     return __returned__;

package/components/upload/README.md

@@ -29,6 +29,20 @@ import Upload from 'sard-uniapp/components/upload/upload.vue'
 
 @code('${DEMO_PATH}/upload/demo/Video.vue')
 
+### 同时上传图片和视频 <sup>1.23.5+</sup>
+
+@info
+
+仅 app 和微信支持。
+
+不支持的端，默认回退为选择图片。
+
+@endinfo
+
+设置 `:accept="['image', 'video']"` 允许同时选择图片和视频。
+
+@code('${DEMO_PATH}/upload/demo/Mix.vue')
+
 ### 限定上传数量
 
 通过 `maxCount` 属性可以限制上传文件的数量，上传数量达到限制后，会自动隐藏选择区域。
@@ -99,7 +113,7 @@ import Upload from 'sard-uniapp/components/upload/upload.vue'
 | -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | -------------------------- |
 | root-class                       | 组件根元素类名                                                                                                                                    | string                                                                                        | -                          |
 | root-style                       | 组件根元素样式                                                                                                                                    | StyleValue                                                                                    | -                          |
-| accept                           | 允许上传的文件类型                                                                                                                                | 'image' \| 'video'                                                                            | 'image'                    |
+| accept                           | 允许上传的文件类型                                                                                                                                | 'image' \| 'video' \| ('image' \| 'video' )[]                                                 | 'image'                    |
 | multiple                         | 是否开启图片多选                                                                                                                                  | boolean                                                                                       | false                      |
 | source-type                      | 文件选择来源                                                                                                                                      | ('album' \| 'camera')[]                                                                       | ['album', 'camera']        |
 | size-type                        | 所选的图片的尺寸                                                                                                                                  | ('original' \| 'compressed')[]                                                                | ['original', 'compressed'] |

package/components/upload/common.d.ts

@@ -26,7 +26,7 @@ export interface UploadSelectOptions {
 export interface UploadProps {
     rootStyle?: StyleValue;
     rootClass?: string;
-    accept?: 'image' | 'video';
+    accept?: 'image' | 'video' | ('image' | 'video')[];
     multiple?: boolean;
     sourceType?: ('album' | 'camera')[];
     sizeType?: ('original' | 'compressed')[];
@@ -45,7 +45,7 @@ export interface UploadProps {
     beforeRemove?: (index: number, fileItem: UploadFileItem) => boolean | Promise<void>;
     validateEvent?: boolean;
 }
-export declare const defaultUploadProps: Omit<typeof defaultConfig.upload, "sourceType" | "sizeType">;
+export declare const defaultUploadProps: Omit<typeof defaultConfig.upload, "sourceType" | "sizeType" | "accept">;
 export interface UploadSlots {
     default?(props: {
         list: UploadFileItem[];

package/components/upload/upload.d.ts

@@ -11,7 +11,6 @@ declare const __VLS_component: import("vue").DefineComponent<UploadProps, {}, {}
     onRemove?: ((index: number, item: UploadFileItem) => any) | undefined;
     "onItem-click"?: ((item: UploadFileItem, index: number) => any) | undefined;
 }>, {
-    accept: "image" | "video";
     validateEvent: boolean;
     maxDuration: number;
     maxCount: number;

package/components/upload/upload.vue

@@ -64,7 +64,7 @@ import { useFormContext, useFormItemContext } from "../form/common";
 /**
  * @property {string} rootClass 组件根元素类名，默认值：-。
  * @property {StyleValue} rootStyle 组件根元素样式，默认值：-。
- * @property {'image' | 'video'} accept 允许上传的文件类型，默认值：'image'。
+ * @property {'image' | 'video' | ('image' | 'video' )[]} accept 允许上传的文件类型，默认值：'image'。
  * @property {boolean} multiple 是否开启图片多选，默认值：false。
  * @property {('album' | 'camera')[]} sourceType 文件选择来源，默认值：['album', 'camera']。
  * @property {('original' | 'compressed')[]} sizeType 所选的图片的尺寸，默认值：['original', 'compressed']。
@@ -102,7 +102,7 @@ export default  _defineComponent({
   props:  _mergeDefaults({
     rootStyle: { type: [Boolean, null, String, Object, Array], required: false, skipCheck: true },
     rootClass: { type: String, required: false },
-    accept: { type: String, required: false },
+    accept: { type: [String, Array], required: false },
     multiple: { type: Boolean, required: false },
     sourceType: { type: Array, required: false },
     sizeType: { type: Array, required: false },

package/components/upload/utils.d.ts

@@ -1,6 +1,6 @@
 interface chooseMediaOptions {
     count?: number;
-    mediaType?: 'image' | 'video';
+    mediaType?: 'image' | 'video' | ('image' | 'video')[];
     sourceType?: ('album' | 'camera')[];
     maxDuration?: number;
     sizeType?: ('original' | 'compressed')[];
@@ -19,7 +19,7 @@ interface chooseMediaResult {
         fileType: 'image' | 'video';
         name: string;
     }[];
-    type: 'image' | 'video';
+    type: 'image' | 'video' | 'mix';
 }
 export declare function chooseMedia(options: chooseMediaOptions): void;
 export {};

package/components/upload/utils.js

@@ -1,7 +1,38 @@
 import { toArray } from '../../utils';
 export function chooseMedia(options) {
     const { count = 9, mediaType = 'image', sourceType = ['album', 'camera'], maxDuration = 10, sizeType = ['original', 'compressed'], camera = 'back', success, fail, complete, } = options;
-    if (mediaType === 'image') {
+    const arrayMediaType = toArray(mediaType);
+    const hasImage = arrayMediaType.includes('image');
+    const hasVideo = arrayMediaType.includes('video');
+    if (hasImage && hasVideo && uni.chooseMedia) {
+        return uni.chooseMedia({
+            count,
+            mediaType: ['image', 'video'],
+            sourceType,
+            maxDuration,
+            sizeType,
+            camera,
+            success(res) {
+                success?.({
+                    type: res.type,
+                    tempFiles: toArray(res.tempFiles).map((file) => {
+                        return {
+                            tempFilePath: file.tempFilePath,
+                            size: file.size,
+                            duration: file.duration,
+                            height: file.height,
+                            width: file.width,
+                            name: '',
+                            fileType: file.fileType,
+                        };
+                    }),
+                });
+            },
+            fail,
+            complete,
+        });
+    }
+    else if (hasImage) {
         return uni.chooseImage({
             count,
             sizeType,
@@ -26,7 +57,7 @@ export function chooseMedia(options) {
             complete,
         });
     }
-    else {
+    else if (hasVideo) {
         return uni.chooseVideo({
             sourceType,
             compressed: sizeType.includes('compressed'),

package/package.json

@@ -2,7 +2,7 @@
   "id": "sard-uniapp",
   "name": "sard-uniapp",
   "displayName": "sard-uniapp",
-  "version": "1.23.4",
+  "version": "1.23.5",
   "description": "sard-uniapp 是一套基于 Uniapp + Vue3 框架开发的兼容多端的 UI 组件库",
   "main": "index.js",
   "scripts": {

package/utils/array.d.ts

@@ -3,7 +3,7 @@
  * @param {any} target
  * @return {array}
  */
-export declare function toArray(target: any): any[];
+export declare function toArray<T>(target: T | T[]): T[];
 /**
  * @description: 扩散性遍历
  * @param {any[]} array 要遍历的数组

package/utils/object.d.ts

@@ -19,14 +19,14 @@ export declare function treeToMap(tree: AnyObject[], keyName: string, childrenNa
  * @param object
  * @param chain 通过点分割的字符串或者字符串数组
  */
-export declare function chainGet(object: any, chain?: string | string[]): any;
+export declare function chainGet(object: any, chain?: string | number | (string | number)[]): any;
 /**
  * @description: 链式设置对象值
  * @param object
  * @param chain 通过点分割的字符串或者字符串数组
  * @param value 要设置的值
  */
-export declare function chainSet(object: any, chain: string | string[], value: any): void;
+export declare function chainSet(object: any, chain: string | number | (string | number)[], value: any): void;
 export declare function nestedToMulti(nested: any[], values: (number | string)[], fieldKeys: {
     value: string;
     children: string;

package/utils/object.js

@@ -89,8 +89,8 @@ export function treeToMap(tree, keyName, childrenName, parentName) {
  */
 export function chainGet(object, chain) {
     let target = object;
-    if (chain) {
-        chain = typeof chain === 'string' ? chain.split('.') : chain;
+    if (chain || chain === 0) {
+        chain = Array.isArray(chain) ? chain : String(chain).split('.');
         for (const key of chain) {
             if (target && typeof target === 'object') {
                 target = target[key];
@@ -110,7 +110,7 @@ export function chainGet(object, chain) {
  */
 export function chainSet(object, chain, value) {
     let target = object;
-    chain = typeof chain === 'string' ? chain.split('.') : chain;
+    chain = Array.isArray(chain) ? chain : String(chain).split('.');
     if (chain.length === 0) {
         return;
     }