xydata-tools 1.1.23 → 1.1.24

package/dist/components/downloadFile/index.js

@@ -13,8 +13,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState } from "react";
-import { Button, ButtonProps } from "antd";
+import React, { useState } from 'react';
+import { Button, ButtonProps } from 'antd';
 import DownloadFileTool from "../../utils/downloadFile";
 
 /**
@@ -36,7 +36,7 @@ import DownloadFileTool from "../../utils/downloadFile";
  * @param {Object} [props.queryOption.customField] 自定义接口取值字段
  * @param {string} [props.queryOption.customField.url] 自定义文件地址字段（表示取值res.data.[传入的参数]）
  * @param {string} [props.queryOption.customField.fileName] 自定义文件名字段（表示取值res.data.[传入的参数]）
- * @param {(error: Error) => void} [props.queryOption.onError] 接口异常回调函数 
+ * @param {(error: Error) => void} [props.queryOption.onError] 接口异常回调函数
  */
 var DownloadFile = function DownloadFile(props) {
   var _useState = useState(false),
@@ -53,26 +53,39 @@ var DownloadFile = function DownloadFile(props) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!((_props$queryOption = props.queryOption) !== null && _props$queryOption !== void 0 && _props$queryOption.url)) {
-                _context.next = 9;
+                _context.next = 16;
                 break;
               }
               setLoading(true);
               mergedParams = props.queryOption.params || {};
-              if (typeof props.queryOption.onBeforeDownload === "function") {
-                dynamicParams = props.queryOption.onBeforeDownload(mergedParams) || {};
-                mergedParams = _objectSpread(_objectSpread({}, mergedParams), dynamicParams);
+              if (!(typeof props.queryOption.onBeforeDownload === 'function')) {
+                _context.next = 11;
+                break;
               }
               _context.next = 6;
+              return props.queryOption.onBeforeDownload(mergedParams);
+            case 6:
+              dynamicParams = _context.sent;
+              if (dynamicParams) {
+                _context.next = 10;
+                break;
+              }
+              setLoading(false);
+              return _context.abrupt("return");
+            case 10:
+              mergedParams = _objectSpread(_objectSpread({}, mergedParams), dynamicParams);
+            case 11:
+              _context.next = 13;
               return DownloadFileTool(_objectSpread(_objectSpread({}, props.queryOption || {}), {}, {
                 params: mergedParams
               }));
-            case 6:
+            case 13:
               setLoading(false);
-              _context.next = 10;
+              _context.next = 17;
               break;
-            case 9:
-              console.error("请传入下载参数");
-            case 10:
+            case 16:
+              console.error('请传入下载参数');
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -84,6 +97,6 @@ var DownloadFile = function DownloadFile(props) {
       return onClick;
     }()
   }, props);
-  return /*#__PURE__*/React.createElement(Button, defaultProps, props.text || "下载按钮");
+  return /*#__PURE__*/React.createElement(Button, defaultProps, props.text ? props.text : props.icon ? null : '下载');
 };
 export default DownloadFile;

package/dist/components/uni-app/media-picker/media-picker.vue

@@ -796,7 +796,6 @@ export default {
 				file,
 				name: 'file',
 				success: (uploadFileRes) => {
-					// 1. 先检查 HTTP 状态码
 					if (uploadFileRes.statusCode !== 200) {
 						console.error('HTTP状态码错误：', uploadFileRes.statusCode);
 						uni.showToast({ title: `服务器响应异常(${uploadFileRes.statusCode})`, icon: 'none' });
@@ -804,10 +803,8 @@ export default {
 					}
 
 					try {
-						// 2. 尝试解析 JSON
 						const result = JSON.parse(uploadFileRes.data);
 
-						// 3. 检查后端定义的业务 Code (假设 200 为成功)
 						if (result.rspCode === '000000') {
 							const fileInfo = {
 								fileName: result.data.fileName,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xydata-tools",
-	"version": "1.1.23",
+	"version": "1.1.24",
 	"description": "xydata tools",
 	"main": "dist/index.js",
 	"module": "dist/index.js",