@xtdev/xt-miniprogram-ui 1.0.15 → 1.0.16

package/libs/xt-dialog/README.md

@@ -73,7 +73,7 @@
 <img src="https://img.tanjiu.cn/home/X2bAjz2FQc6mNewfhbNBQfHm6zTmfYzd.png" alt="输入样式" style="zoom:50%;" />
 
 ```html
-<xt-dialog type="inputText" show="{{showInputDialog}}" title="标题标题标题" message="" placeholder="请输入内容" confirmButtonText="确定" showCancelButton="{{true}}" cancelButtonText="取消" bind:inputConfirm="onInputConfirm" bind:cancel="onInputCancel"></xt-dialog>
+<xt-dialog type="inputText" show="{{showInputDialog}}" title="标题标题标题" message="" placeholder="请输入内容" confirmButtonText="确定" showCancelButton="{{true}}" cancelButtonText="取消" bind:confirm="onInputConfirm" bind:cancel="onInputCancel"></xt-dialog>
 ```
 
 ### 5 选择器样式
@@ -81,7 +81,7 @@
 <img src="https://img.tanjiu.cn/home/yKrCY5MnGFS3FcjJ6pJRz5fXmJEHrSay.png" alt="选择器样式" style="zoom:50%;" />
 
 ```html
-<xt-dialog type="choose" show="{{true}}" title="标题标题标题" chooiceItems="{{chooiceItems}}" confirmButtonText="确定" showCancelButton="{{true}}" cancelButtonText="取消" bind:chooseConfirm="onChooseConfirm" bind:cancel="onChooseCancel"></xt-dialog>
+<xt-dialog type="choose" show="{{true}}" title="标题标题标题" chooiceItems="{{chooiceItems}}" confirmButtonText="确定" showCancelButton="{{true}}" cancelButtonText="取消" bind:confirm="onChooseConfirm" bind:cancel="onChooseCancel"></xt-dialog>
 ```
 
 #### 1）常规情况下的 chooiceItems 参数
@@ -142,7 +142,12 @@ chooiceItems:[
 | label  | 选项的文本描述 | String                  |
 | remark | 选项的辅助信息 | String                  |
 
+### Events
 
+| 事件         | 说明               | 回调参数     |
+| ------------ | ------------------ | ------------ |
+| bind:confirm | 点击确认按钮时触发 | event.detail |
+| bind:ccancel | 点击取消按钮时触发 | -            |
 
 
 

package/libs/xt-dialog/index.js

@@ -103,7 +103,7 @@ Component({
         }
         // 输入样式
         if(confirmtype == 'inputDialog'){
-          this.triggerEvent('inputConfirm', this.data.inpVal)
+          this.triggerEvent('confirm', this.data.inpVal)
         }
         // 选择样式
         if(confirmtype == 'chooseDialog'){
@@ -115,7 +115,7 @@ Component({
             })
             return
           }
-          this.triggerEvent('chooseConfirm', this.data.curChoosedItemVal)
+          this.triggerEvent('confirm', this.data.curChoosedItemVal)
         }
       },
       // 点击取消按钮

package/libs/xt-uploader/README.md

@@ -26,15 +26,15 @@
 
 ####xt-uploader props
 
-| 参数      | 说明 |  类型 |
-| ----------- | ----------- | ---------- |
-| fileList      | 图片列表，必传，受控组件 | `Array<String>` |
-| title      | 表单标题 | `String` |
-| max      | 上传最大值，默认为9 | `Number` |
+| 参数        | 说明         |  类型      |  默认值
+| ----------- | ----------- | ---------- |  --------  |
+| fileList      | 图片列表，必传，受控组件 | Array<String> | `[]`
+| title      | 表单标题 | string |
+| max      | 上传最大值，每次可选照片数，默认为9 | number | 9
 | upload-desc      | 上传文案说明 | `String` |
-| custom-upload      | 是否自定义上传,true 点击盒子触发upload | `Boolean` |
-| disabled   | 是否禁用，禁用时不能删除和上传,可预览  | `Boolean` |
-| sourceType   | 照片来源  | ["album", "camera"] |
+| custom-upload      | 是否自定义上传,true 点击盒子触发upload | boolean | `false`
+| disabled   | 是否禁用，禁用时不能删除和上传,可预览  | boolean |  `false`
+| sourceType   | 照片来源  | `Array<String>` | ["album", "camera"]
 | upload-api   | 组件库放公网，上传接口api，必传  | {url: 'https://...',fileDir: 'microComponents'} |
 
 ####Events

package/libs/xt-uploader/index.js

@@ -24,7 +24,7 @@ Component({
 		// ["album", "camera"]
 		sourceType: {
 			type: Array,
-			value: ["camera"],
+			value: ["album", "camera"],
 		},
 		customUpload: {
 			type: Boolean,
@@ -70,8 +70,8 @@ Component({
 			});
 		},
 		// 上传成功
-		onUploadSuccess(url) {
-			this.triggerEvent("upload", { fileList: this.properties.fileList, url });
+		onUploadSuccess(files, url) {
+			this.triggerEvent("upload", { fileList: files, url });
 		},
 		// 上传失败
 		onUploadError(errMsg) {
@@ -80,11 +80,12 @@ Component({
 		// 点击上传
 		startTakePhoto() {
 			const _this = this;
-			if (this.properties.customUpload) {
+			const { customUpload, uploadApi, max, sourceType, fileList } =
+				this.properties;
+			if (customUpload) {
 				this.triggerEvent("upload", {});
 				return;
 			}
-			const uploadApi = this.properties.uploadApi;
 			if (!uploadApi || !uploadApi.url) {
 				wx.showToast({
 					title: "请传入上传接口",
@@ -93,15 +94,39 @@ Component({
 				return;
 			}
 			wx.chooseMedia({
-				count: 1,
+				count: max - fileList.length,
 				mediaType: ["image"],
 				sizeType: ["compressed"],
-				sourceType: this.properties.sourceType,
+				sourceType,
 				success(res) {
 					console.log(res, "0000");
 					// tempFilePath可以作为img标签的src属性显示图片
-					const tempFilePaths = res.tempFiles[0].tempFilePath;
-					_this.uploadImage_v(tempFilePaths);
+					const tempFilePaths = res.tempFiles;
+					if (Array.isArray(tempFilePaths) && tempFilePaths.length) {
+						Promise.allSettled(
+							tempFilePaths.map((temp) =>
+								_this.uploadImage_v(temp.tempFilePath)
+							)
+						).then((uploadRes) => {
+							wx.hideLoading();
+							console.log("----uploadRes", uploadRes);
+							// 上传成功
+							const successUrls = uploadRes
+								.filter((result) => result.status == "fulfilled")
+								.map((result) => result.value);
+							if (successUrls.length) {
+								const files = fileList.concat(successUrls);
+								_this.onUploadSuccess(files, successUrls);
+							}
+							// 上传失败
+							const errorList = uploadRes.filter(
+								(result) => result.status == "rejected"
+							);
+							if (errorList.length) {
+								_this.onUploadError(errorList[0].value);
+							}
+						});
+					}
 				},
 				fail(error) {
 					_this.onUploadError(error && error.errMsg);
@@ -111,20 +136,19 @@ Component({
 		},
 		// 上传文件
 		uploadImage_v(filePaths) {
-			const { url, fileDir, ...header } = this.properties.uploadApi;
-			let _this = this;
-			const { fileList } = _this.properties;
-			wx.showLoading("图片上传中");
-			utils.newHttp(
-				url,
-				"GET",
-				{
-					dir: fileDir || "microComponents",
-				},
-				header,
-				(res) => {
-					const { host, signature, accessKeyId, policy, dir } = res.data;
-					if (host) {
+			return new Promise((resolve, reject) => {
+				const { url, fileDir, ...header } = this.properties.uploadApi;
+				wx.showLoading("上传中");
+				utils.newHttp(
+					url,
+					"GET",
+					{
+						dir: fileDir || "microComponents",
+					},
+					header,
+					(res) => {
+						const { host, signature, accessKeyId, policy, dir } = res.data;
+						if (host) {
 							let path = filePaths;
 							let name = utils.random_string(32) + utils.get_suffix(path);
 							wx.uploadFile({
@@ -144,27 +168,31 @@ Component({
 								success: (res) => {
 									if (res.statusCode == 200) {
 										let url = host + dir + "/" + name;
-										fileList.push(url);
-										_this.onUploadSuccess(url);
-										wx.showToast({
-											icon: "success",
-											title: "上传成功",
-										});
+										resolve(url);
+										// fileList.push(url);
+										// _this.onUploadSuccess(url);
+										// wx.showToast({
+										// 	icon: "success",
+										// 	title: "上传成功",
+										// });
 									}
 								},
 								fail: (err) => {
-									_this.onUploadError(err.errMsg || "网络错误，请重试");
-									wx.showToast({
-										icon: "error",
-										title: err.errMsg || "网络错误，请重试",
-									});
+									reject(err.errMsg || "网络错误，请重试");
+									// _this.onUploadError(err.errMsg || "网络错误，请重试");
+									// wx.showToast({
+									// 	icon: "error",
+									// 	title: err.errMsg || "网络错误，请重试",
+									// });
 								},
 							});
-					} else {
-						_this.onUploadError(res.message);
+						} else {
+							reject(res.message);
+							// _this.onUploadError(res.message);
+						}
 					}
-				}
-			);
+				);
+			});
 		},
 	},
 });

package/libs/xt-uploader/index.wxss

@@ -31,11 +31,12 @@
   justify-content : center;
   align-items     : center;
   background-color: #F5F5F5;
-  margin-bottom   : 32rpx;
+  margin-bottom   : 16rpx;
+  flex-shrink: 0;
 }
 
 .file_item:not(:last-child) {
-  margin-right: 32rpx;
+  margin-right: 16rpx;
 }
 
 .camera_icon {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtdev/xt-miniprogram-ui",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "",
   "miniprogram": "libs",
   "publishConfig": {