@fmdeui/fmui 1.0.129 → 1.0.131

package/es/index.mjs

@@ -30,7 +30,7 @@ export { feature, useSysApi } from './packages/api/sys/index.mjs';
 export { flowLoading } from './packages/utils/flowLoading.mjs';
 export { formatAxis, formatDate, formatPast, getBdate, getEdate, getWeek } from './packages/utils/formatTime.mjs';
 export { gcj02ToBd09, wgs84ToBd09, wgs84ToGcj02 } from './packages/utils/gpsConvertor.mjs';
-export { getFileUrl, showFileUrl, showFileUrlByType } from './packages/utils/uploadfileurl.mjs';
+export { getFileDownloadUrl, getFileUrl, showFileUrl, showFileUrlByType } from './packages/utils/uploadfileurl.mjs';
 export { getFormItemLabel, getFormItemProp, getRules, getShowColumn, getShowColumnWidth, getSubFormFields, getlimit, showTabelColumn } from './packages/hooks/limitsFunction.mjs';
 export { getpower, powerAuthDel } from './packages/hooks/powerFunction.mjs';
 export { judgementIdCard, verifiyNumberInteger, verifyAccount, verifyAndSpace, verifyCarNum, verifyCnAndSpace, verifyEmail, verifyEnAndSpace, verifyFullName, verifyIPAddress, verifyIdCard, verifyNumberCnUppercase, verifyNumberComma, verifyNumberIntegerAndFloat, verifyNumberPercentage, verifyNumberPercentageFloat, verifyPassword, verifyPasswordPowerful, verifyPasswordStrength, verifyPhone, verifyPostalCode, verifyTelPhone, verifyTextColor, verifyUrl } from './packages/utils/toolsValidate.mjs';

package/es/packages/utils/index.mjs

@@ -13,7 +13,7 @@ export { gcj02ToBd09, wgs84ToBd09, wgs84ToGcj02 } from './gpsConvertor.mjs';
 export { StringToObj } from './json-utils.mjs';
 export { NextLoading } from './loading.mjs';
 import './md5Signature.mjs';
-export { getFileUrl, showFileUrl, showFileUrlByType } from './uploadfileurl.mjs';
+export { getFileDownloadUrl, getFileUrl, showFileUrl, showFileUrlByType } from './uploadfileurl.mjs';
 export { accessTokenKey, axiosInstance, cancelAllRequest, cancelRequest, clearAccessTokens, clearTokens, decryptJWT, getHeader, getJWTDate, getToken, reLoadLoginAccessToken, refreshAccessTokenKey, request2, default as service, sleep, tansParams } from './request.mjs';
 export { saulVModel } from './saulVModel.mjs';
 export { AppItem, getAppItemData, getAppItemText } from './gloabdata.mjs';

package/es/packages/utils/uploadfileurl.mjs

@@ -35,12 +35,24 @@ const showFileUrlByType = (url) => {
       return url;
     }
   } else {
+    return "/" + fileType;
+  }
+};
+const getFileDownloadUrl = (url) => {
+  if (url == "" || url == null || url == void 0) {
+    return "";
+  }
+  const match = url.match(/\.([a-zA-Z0-9]+)(?:\?|#|$)/);
+  const ftype = match ? match[1].toLowerCase() : "";
+  let fileType = getFileTypeByPath(ftype);
+  if (fileType != "") {
     if (window.__env__.VITE_IMG_URL) {
-      return window.__env__.VITE_IMG_URL + fileType;
+      return window.__env__.VITE_IMG_URL + url;
     } else {
-      return fileType;
+      return url;
     }
   }
+  return "";
 };
 const getFileTypeByPath = (Suffix) => {
   switch (Suffix) {
@@ -84,4 +96,4 @@ const getFileTypeByPath = (Suffix) => {
   }
 };
 
-export { getFileUrl, showFileUrl, showFileUrlByType };
+export { getFileDownloadUrl, getFileUrl, showFileUrl, showFileUrlByType };

package/es/utils/uploadfileurl.d.ts

@@ -6,4 +6,5 @@ declare const getFileUrl: (row: any) => string;
  */
 declare const showFileUrl: (url: any) => any;
 declare const showFileUrlByType: (url: any) => any;
-export { getFileUrl, showFileUrl, showFileUrlByType, };
+declare const getFileDownloadUrl: (url: any) => any;
+export { getFileUrl, showFileUrl, showFileUrlByType, getFileDownloadUrl, };

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.129 */
+/*! fmdeui-fmui v1.0.131 */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vxe-table'), require('@vxe-ui/plugin-render-element'), require('@vxe-ui/plugin-export-xlsx'), require('vxe-pc-ui'), require('exceljs'), require('@element-plus/icons-vue'), require('vue'), require('element-plus'), require('lodash-es'), require('js-cookie'), require('pinia'), require('vue-router'), require('@vueuse/core'), require('crypto-js'), require('xlsx-js-style'), require('vue-i18n'), require('sortablejs'), require('screenfull'), require('push.js'), require('mitt'), require('@microsoft/signalr'), require('axios')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'vxe-table', '@vxe-ui/plugin-render-element', '@vxe-ui/plugin-export-xlsx', 'vxe-pc-ui', 'exceljs', '@element-plus/icons-vue', 'vue', 'element-plus', 'lodash-es', 'js-cookie', 'pinia', 'vue-router', '@vueuse/core', 'crypto-js', 'xlsx-js-style', 'vue-i18n', 'sortablejs', 'screenfull', 'push.js', 'mitt', '@microsoft/signalr', 'axios'], factory) :
@@ -2271,12 +2271,24 @@
 	      return url;
 	    }
 	  } else {
+	    return "/" + fileType;
+	  }
+	};
+	const getFileDownloadUrl = (url) => {
+	  if (url == "" || url == null || url == void 0) {
+	    return "";
+	  }
+	  const match = url.match(/\.([a-zA-Z0-9]+)(?:\?|#|$)/);
+	  const ftype = match ? match[1].toLowerCase() : "";
+	  let fileType = getFileTypeByPath(ftype);
+	  if (fileType != "") {
 	    if (window.__env__.VITE_IMG_URL) {
-	      return window.__env__.VITE_IMG_URL + fileType;
+	      return window.__env__.VITE_IMG_URL + url;
 	    } else {
-	      return fileType;
+	      return url;
 	    }
 	  }
+	  return "";
 	};
 	const getFileTypeByPath = (Suffix) => {
 	  switch (Suffix) {
@@ -33858,6 +33870,7 @@
 	exports.getBdate = getBdate;
 	exports.getCountryCode = getCountryCode;
 	exports.getEdate = getEdate;
+	exports.getFileDownloadUrl = getFileDownloadUrl;
 	exports.getFileName = getFileName;
 	exports.getFileUrl = getFileUrl;
 	exports.getFormItemLabel = getFormItemLabel;