xydata-tools 1.0.49 → 1.0.51

package/dist/components/downloadFile/index.js

@@ -22,19 +22,21 @@ import DownloadFileTool from "../../utils/downloadFile";
  * @preserve
  * @param {Object} props 组件的属性
  * @param {string|React.ReactNode} [props.text] 按钮内容，可传入 string 或 ReactNode
- * @param {Object} [props.queryOption] 下载参数对象
- * @param {string} [props.queryOption.url] 下载地址
- * @param {string} [props.queryOption.methods] 请求方法 (GET/POST)
- * @param {string} [props.queryOption.fileName] 文件名
- * @param {Object} [props.queryOption.params] 请求参数
- * @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.onError] 接口异常回调函数
  * @param {React.ReactNode} [props.icon] 按钮的图标
  * @param {boolean} [props.disabled] 是否禁用按钮
  * @param {boolean} [props.danger] 是否为危险按钮
  * @param {"default"|"primary"|"ghost"|"dashed"|"link"|"text"} [props.type] 按钮类型
+ * @param {Object} [props.queryOption] 下载参数对象
+ * @param {string} [props.queryOption.url] 下载接口地址
+ * @param {string} [props.queryOption.methods] 请求方法 (GET/POST)
+ * @param {string} [props.queryOption.downloadType] 下载类型，值为 'pure' 时表示下载外链文件(通过网页地址栏打开就可以下载的链接)
+ * @param {string} [props.queryOption.fileName] 默认下载的文件名，需要后缀，如接口中返回了fileName，以接口返回的为准
+ * @param {Object} [props.queryOption.params] 默认请求参数
+ * @param {(params: Object) => Object} [props.queryOption.onBeforeDownload] 请求前调用，用于获取或修改请求参数
+ * @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] 接口异常回调函数 
  */
 var DownloadFile = function DownloadFile(props) {
   var _useState = useState(false),
@@ -46,23 +48,31 @@ var DownloadFile = function DownloadFile(props) {
     onClick: function () {
       var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var _props$queryOption;
+        var mergedParams, dynamicParams;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               if (!((_props$queryOption = props.queryOption) !== null && _props$queryOption !== void 0 && _props$queryOption.url)) {
-                _context.next = 7;
+                _context.next = 9;
                 break;
               }
               setLoading(true);
-              _context.next = 4;
-              return DownloadFileTool(props.queryOption || {});
-            case 4:
+              mergedParams = props.queryOption.params || {};
+              if (typeof props.queryOption.onBeforeDownload === "function") {
+                dynamicParams = props.queryOption.onBeforeDownload(mergedParams) || {};
+                mergedParams = _objectSpread(_objectSpread({}, mergedParams), dynamicParams);
+              }
+              _context.next = 6;
+              return DownloadFileTool(_objectSpread(_objectSpread({}, props.queryOption || {}), {}, {
+                params: mergedParams
+              }));
+            case 6:
               setLoading(false);
-              _context.next = 8;
+              _context.next = 10;
               break;
-            case 7:
+            case 9:
               console.error("请传入下载参数");
-            case 8:
+            case 10:
             case "end":
               return _context.stop();
           }

package/dist/components/tools/version.js

@@ -6,7 +6,7 @@ import React from "react";
 var ButtonBox = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  color: #999;\n  position: absolute;\n  z-index: 3;\n  bottom: 20px;\n  width: 100%;\n  text-align: center;\n  font-size: 12px;\n"])));
 
 /**
- * 导出Excel
+ * 版本注释
  * @preserve
  * @param {Object} props 组件的属性
  * @param {Object} [props.envData] 环境变量数据，默认为从 sessionStorage 中获取的 env_data

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

@@ -8,7 +8,7 @@
 				<view v-if="enableImage && showFileList" class="media-section">
 					<shmily-drag-media v-if="imageFileList.length > 0" v-model="imageUrls" :number="imageLimit"
 						:cols="cols" :imageWidth="itemWidth" :padding="10" :borderRadius="itemBorderRadius"
-						:draggable="draggable" moveType="image" @update:modelValue="handleImageDragChange">
+						:draggable="draggable" moveType="image" @input="handleImageDragChange">
 					</shmily-drag-media>
 				</view>
 
@@ -17,7 +17,7 @@
 					:style="{ marginTop: enableImage && videoFileList.length > 0 ? '20rpx' : '0' }">
 					<shmily-drag-media v-if="videoFileList.length > 0" v-model="videoUrls" :number="videoLimit"
 						:cols="cols" :imageWidth="itemWidth" :padding="10" :borderRadius="itemBorderRadius"
-						:draggable="draggable" moveType="video" @update:modelValue="handleVideoDragChange"
+						:draggable="draggable" moveType="video" @input="handleVideoDragChange"
 						@videoClick="handleVideoItemClick">
 					</shmily-drag-media>
 				</view>
@@ -56,7 +56,7 @@
 				<shmily-drag-media v-if="enableImage && !enableVideo && showFileList" v-model="imageUrls"
 					:number="imageLimit" :cols="cols" :imageWidth="itemWidth" :padding="10"
 					:borderRadius="itemBorderRadius" :align="align" :draggable="draggable" :enableAddButton="true"
-					moveType="image" @update:modelValue="handleImageDragChange">
+					moveType="image" @input="handleImageDragChange">
 					<template #add-button="{ childWidth }">
 						<slot name="image-upload-button" :select="selectAndUploadImage" :limit="imageLimit"
 							:count="imageFileList.length">
@@ -74,7 +74,7 @@
 				<shmily-drag-media v-else-if="enableVideo && !enableImage && showFileList" v-model="videoUrls"
 					:number="videoLimit" :cols="cols" :imageWidth="itemWidth" :padding="10"
 					:borderRadius="itemBorderRadius" :align="align" :draggable="draggable" :enableAddButton="true"
-					moveType="video" @update:modelValue="handleVideoDragChange" @videoClick="handleVideoItemClick">
+					moveType="video" @input="handleVideoDragChange" @videoClick="handleVideoItemClick">
 					<template #add-button="{ childWidth }">
 						<slot name="video-upload-button" :select="selectAndUploadVideo" :limit="videoLimit"
 							:count="videoFileList.length">
@@ -857,7 +857,7 @@ export default {
 		/**
 		 * 处理图片拖拽排序变化
 		 */
-		handleImageDragChange(newUrls) {
+		handleImageDragChange(newUrls) { 
 			const newFileList = newUrls.map(url => {
 				return this.imageFileList.find(file => file.url === url)
 			}).filter(Boolean)

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

@@ -28,9 +28,8 @@
                         <view class="media-loading-overlay" v-if="item.loading">
                             <view class="loading-spinner"></view>
                         </view>
-                        <view class="del-con" @click="delImages(item, index)"
-                            @touchstart.stop="delImageMp(item, index)" @touchend.stop="nothing()"
-                            @mousedown.stop="nothing()" @mouseup.stop="nothing()">
+                        <view class="del-con" @click="delImages(item, index)" @touchstart.stop="delImageMp(item, index)"
+                            @touchend.stop="nothing()" @mousedown.stop="nothing()" @mouseup.stop="nothing()">
                             <view class="del-wrap">
                                 <image class="del-image"
                                     src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAhCAYAAABX5MJvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAhdEVYdENyZWF0aW9uIFRpbWUAMjAyMDowNzoyNSAyMTo1NDoyOU4TkJAAAADcSURBVFhH7ZfRCoMwDEXLvkjwwVf/bH/emmAyN6glTW9WBjsgwm28OeCLpj81Sil7zvlJ90UiONS/yY5VogsO6XrBg3IEQ5a/s8vRSWUAKmLqp2w5jz5BiNQEGMo3GbloDLtFXJ1IkaEuhAiiY6gEIqB4yqACSk9piIBiKQ8VUFpLviKg3C2rESKgWERCBZSWiEfgIfffYvrrsAgoISJ3Apy3zuTxcSxLQkV6ykNEPKVQkZEyiAiiZKgDIaC4upACSlcn5fM/+WuDCAHF1E/Z/N9AhkMZnPNDPI+UDjPIXgAQIGjNAAAAAElFTkSuQmCC">
@@ -508,7 +507,7 @@ export default {
             }
             //#endif
         },
-        delImages(item, index) { 
+        delImages(item, index) {
             if (typeof this.delImage === 'function') {
                 this.delImage.bind(this.$parent)(() => {
                     this.delImageHandle(item, index)
@@ -517,10 +516,15 @@ export default {
                 this.delImageHandle(item, index)
             }
         },
+        delImageMp(item, index) {
+            //#ifdef MP
+            this.delImages(item, index)
+            //#endif
+        },
         delImageHandle(item, index) {
             // 设置标志,防止 watch 触发重新初始化
             this.changeStatus = false
-            
+
             // 删除指定图片
             this.imageList.splice(index, 1)
 
@@ -550,17 +554,12 @@ export default {
 
             this.updateAddButtonPosition()
             this.sortList()
-            
+
             // 恢复标志
             this.$nextTick(() => {
                 this.changeStatus = true
             })
         },
-        delImageMp(item, index) {
-            //#ifdef MP
-            this.delImages(item, index)
-            //#endif
-        },
         sortList() {
             const result = []
             let list = this.imageList.slice()

package/dist/types/components/downloadFile/index.d.ts

@@ -4,35 +4,39 @@ export default DownloadFile;
  * @preserve
  * @param {Object} props 组件的属性
  * @param {string|React.ReactNode} [props.text] 按钮内容，可传入 string 或 ReactNode
- * @param {Object} [props.queryOption] 下载参数对象
- * @param {string} [props.queryOption.url] 下载地址
- * @param {string} [props.queryOption.methods] 请求方法 (GET/POST)
- * @param {string} [props.queryOption.fileName] 文件名
- * @param {Object} [props.queryOption.params] 请求参数
- * @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.onError] 接口异常回调函数
  * @param {React.ReactNode} [props.icon] 按钮的图标
  * @param {boolean} [props.disabled] 是否禁用按钮
  * @param {boolean} [props.danger] 是否为危险按钮
  * @param {"default"|"primary"|"ghost"|"dashed"|"link"|"text"} [props.type] 按钮类型
+ * @param {Object} [props.queryOption] 下载参数对象
+ * @param {string} [props.queryOption.url] 下载接口地址
+ * @param {string} [props.queryOption.methods] 请求方法 (GET/POST)
+ * @param {string} [props.queryOption.downloadType] 下载类型，值为 'pure' 时表示下载外链文件(通过网页地址栏打开就可以下载的链接)
+ * @param {string} [props.queryOption.fileName] 默认下载的文件名，需要后缀，如接口中返回了fileName，以接口返回的为准
+ * @param {Object} [props.queryOption.params] 默认请求参数
+ * @param {(params: Object) => Object} [props.queryOption.onBeforeDownload] 请求前调用，用于获取或修改请求参数
+ * @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] 接口异常回调函数
  */
 declare function DownloadFile(props: {
     text?: string | React.ReactNode;
+    icon?: React.ReactNode;
+    disabled?: boolean;
+    danger?: boolean;
+    type?: "default" | "primary" | "ghost" | "dashed" | "link" | "text";
     queryOption?: {
         url?: string;
         methods?: string;
+        downloadType?: string;
         fileName?: string;
         params?: any;
+        onBeforeDownload?: (params: any) => any;
         customField?: {
             url?: string;
             fileName?: string;
         };
+        onError?: (error: Error) => void;
     };
-    onError?: (error: Error) => void;
-    icon?: React.ReactNode;
-    disabled?: boolean;
-    danger?: boolean;
-    type?: "default" | "primary" | "ghost" | "dashed" | "link" | "text";
 }): JSX.Element;

package/dist/types/components/tools/version.d.ts

@@ -1,6 +1,6 @@
 export default Version;
 /**
- * 导出Excel
+ * 版本注释
  * @preserve
  * @param {Object} props 组件的属性
  * @param {Object} [props.envData] 环境变量数据，默认为从 sessionStorage 中获取的 env_data

package/dist/types/components/uploadFile/index.d.ts

@@ -51,7 +51,3 @@ declare function UploadFile(props: {
     uploadOptions: UploadProps;
     buttonOptions: ButtonProps;
 }): JSX.Element;
-import { FormProps } from "antd";
-import { FormItemProps } from "antd";
-import { UploadProps } from "antd";
-import { ButtonProps } from "antd";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xydata-tools",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "description": "xydata tools",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -27,7 +27,12 @@
   },
   "peerDependencies": {
     "react": "^17.0.0",
-    "react-dom": "^17.0.0"
+    "react-dom": "^17.0.0",
+    "moment": "^2.30.1",
+    "antd": "^4.24.16",
+    "@ant-design/icons": "^4.5.0",
+    "@ant-design/pro-form": "^1.69.4",
+    "@ant-design/pro-table": "^2.80.8"
   },
   "devDependencies": {
     "@babel/core": "7.24.9",
@@ -41,12 +46,7 @@
     "vue-template-compiler": "2.7.16"
   },
   "dependencies": {
-    "@ant-design/icons": "4.5.0",
-    "@ant-design/pro-form": "1.69.4",
-    "@ant-design/pro-table": "2.80.8",
     "@zhengxs/js.tree": "0.5.0",
-    "antd": "4.24.16",
-    "moment": "2.30.1",
     "querystring": "0.2.1",
     "stringify": "5.2.0",
     "styled-components": "4.4.1",