@fmdeui/fmui 1.0.40 → 1.0.42

package/es/index.mjs

@@ -27,6 +27,7 @@ export { feature, useSysApi } from './packages/api/sys/index.mjs';
 export { flowLoading } from './packages/utils/flowLoading.mjs';
 export { formatAxis, formatDate, formatPast, getWeek } from './packages/utils/formatTime.mjs';
 export { gcj02ToBd09, wgs84ToBd09, wgs84ToGcj02 } from './packages/utils/gpsConvertor.mjs';
+export { getFileUrl, showFileUrl } from './packages/utils/uploadfileurl.mjs';
 export { hasPrivilege, hasRoleCode, isAdmin, isMember, isNormalUser, isSupperAdmin, isTenantAdmin, orgId, orgName, posId, posName, roles, tenantId, userAccount, userEmail, userFriendName, userId, userName, userPhone } from './packages/hooks/useInfo.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';
 export { loadSysInfo, updateFavicon } from './packages/hooks/sysInfo.mjs';

package/es/packages/components/fm-layout/src/logo/index.vue2.mjs

@@ -1,7 +1,9 @@
 import { defineComponent, computed, openBlock, createElementBlock, unref, createCommentVNode, createElementVNode, toDisplayString } from 'vue';
 import { storeToRefs } from 'pinia';
 import '../../../../stores/index.mjs';
+import '../../../../utils/index.mjs';
 import { useThemeConfig } from '../../../../stores/themeConfig.mjs';
+import { showFileUrl } from '../../../../utils/uploadfileurl.mjs';
 
 const _hoisted_1 = ["src"];
 const _hoisted_2 = ["src"];
@@ -30,7 +32,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }, [
         showLogo.value ? (openBlock(), createElementBlock("img", {
           key: 0,
-          src: unref(themeConfig).logoUrl,
+          src: unref(showFileUrl)(unref(themeConfig).logoUrl),
           class: "layout-logo-medium-img"
         }, null, 8, _hoisted_1)) : createCommentVNode("v-if", true),
         createElementVNode(
@@ -46,7 +48,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         onClick: onThemeConfigChange
       }, [
         createElementVNode("img", {
-          src: unref(themeConfig).logoUrl,
+          src: unref(showFileUrl)(unref(themeConfig).logoUrl),
           class: "layout-logo-size-img"
         }, null, 8, _hoisted_2)
       ]));

package/es/packages/components/fm-layout/src/navBars/topBar/user.vue2.mjs

@@ -19,6 +19,7 @@ import { useFormEvents } from '../../../../../hooks/composables/useDialogEvents.
 import { Local, Session } from '../../../../../utils/storage.mjs';
 import { useBaseApi } from '../../../../../api/base/index.mjs';
 import { signalR } from '../../../../../utils/signalR.mjs';
+import { showFileUrl } from '../../../../../utils/uploadfileurl.mjs';
 import { clearAccessTokens } from '../../../../../utils/request.mjs';
 
 const _hoisted_1 = { class: "layout-navbars-breadcrumb-user-icon" };
@@ -642,7 +643,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                   ]),
                   default: withCtx(() => [
                     createElementVNode("img", {
-                      src: unref(userInfos).avatar,
+                      src: unref(showFileUrl)(unref(userInfos).avatar),
                       class: "layout-navbars-breadcrumb-user-link-photo mr5"
                     }, null, 8, _hoisted_11)
                   ]),

package/es/packages/hooks/setupVXETableHook.mjs

@@ -16,7 +16,6 @@ const setupVXETable = (app) => {
     size: vxeSize,
     // 全局尺寸mini、small、medium/default
     i18n: (key, args) => i18n.global.t(key, args),
-    // i18n: (key, args) => i18n.global.t(key, args),
     // zIndex: 999, // 全局 zIndex 起始值，如果项目的的 z-index 样式值过大时就需要跟随设置更大，避免被遮挡
     // version: 0, // 版本号，对于某些带数据缓存的功能有用到，上升版本号可以用于重置数据
     // loadingText: '加载中...', // 全局loading提示内容，如果为null则不显示文本

package/es/packages/locale/index.mjs

@@ -165,7 +165,7 @@ async function loadLocaleMessages(tempmodel) {
       name: key,
       el: element[key].el,
       message: mergeArrObj(itemize, key),
-      vxe: vxe[key].vxe
+      vxe: vxe[key].default.vxe
     };
     i18n.global.setLocaleMessage(key, messages[key]);
   }

package/es/packages/stores/themeConfig.mjs

@@ -28,7 +28,7 @@ const useThemeConfig = defineStore("themeConfig", {
       // 默认菜单导航背景颜色
       menuBar: "#FFFFFF",
       // 默认菜单导航字体颜色
-      menuBarColor: "#000000",
+      menuBarColor: "#1095df",
       // 默认菜单高亮背景色
       menuBarActiveColor: "var(--el-color-primary-light-7)",
       // 是否开启菜单背景颜色渐变
@@ -103,7 +103,7 @@ const useThemeConfig = defineStore("themeConfig", {
        */
       // Tagsview 风格：可选值"<tags-style-one|tags-style-four|tags-style-five>"，默认 tags-style-five
       // 定义的值与 `/src/layout/navBars/tagsView/tagsView.vue` 中的 class 同名
-      tagsStyle: "tags-style-one",
+      tagsStyle: "tags-style-five",
       // 主页面切换动画: Animate.css
       animation: "fadeDown",
       // 分栏高亮风格：可选值"<columns-round|columns-card>"，默认 columns-round

package/es/packages/utils/index.mjs

@@ -13,6 +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 } 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 { Local, Session } from './storage.mjs';

package/es/packages/utils/uploadfileurl.mjs

@@ -0,0 +1,19 @@
+const getFileUrl = (row) => {
+  if (row.bucketName == "Local") {
+    return `/${row.filePath}/${row.id}${row.suffix}`;
+  } else {
+    return `/${row.filePath}/${row.id}${row.suffix}`;
+  }
+};
+const showFileUrl = (url) => {
+  if (url == "logo.png") {
+    return url;
+  }
+  if (window.__env__.VITE_IMG_URL) {
+    return window.__env__.VITE_IMG_URL + url;
+  } else {
+    return url;
+  }
+};
+
+export { getFileUrl, showFileUrl };

package/es/utils/index.d.ts

@@ -13,6 +13,7 @@ export * from './gpsConvertor';
 export * from './json-utils';
 export * from './loading';
 export * from './md5Signature';
+export * from './uploadfileurl';
 export * from './request';
 export * from './saulVModel';
 export * from './storage';

package/es/utils/uploadfileurl.d.ts

@@ -0,0 +1,8 @@
+declare const getFileUrl: (row: any) => string;
+/**
+ *
+ * @param url 显示文件短地址
+ * @returns
+ */
+declare const showFileUrl: (url: any) => any;
+export { getFileUrl, showFileUrl, };

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.40 */
+/*! fmdeui-fmui v1.0.42 */
 (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('@vueuse/core'), require('crypto-js'), require('xlsx-js-style'), require('vue-i18n'), require('vue-router'), 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', '@vueuse/core', 'crypto-js', 'xlsx-js-style', 'vue-i18n', 'vue-router', 'sortablejs', 'screenfull', 'push.js', 'mitt', '@microsoft/signalr', 'axios'], factory) :
@@ -1244,6 +1244,24 @@
 	  }
 	};
 
+	const getFileUrl = (row) => {
+	  if (row.bucketName == "Local") {
+	    return `/${row.filePath}/${row.id}${row.suffix}`;
+	  } else {
+	    return `/${row.filePath}/${row.id}${row.suffix}`;
+	  }
+	};
+	const showFileUrl = (url) => {
+	  if (url == "logo.png") {
+	    return url;
+	  }
+	  if (window.__env__.VITE_IMG_URL) {
+	    return window.__env__.VITE_IMG_URL + url;
+	  } else {
+	    return url;
+	  }
+	};
+
 	const Local = {
 	  // 查看 v2.4.3版本更新日志
 	  setKey(key) {
@@ -1904,7 +1922,7 @@
 	      // 默认菜单导航背景颜色
 	      menuBar: "#FFFFFF",
 	      // 默认菜单导航字体颜色
-	      menuBarColor: "#000000",
+	      menuBarColor: "#1095df",
 	      // 默认菜单高亮背景色
 	      menuBarActiveColor: "var(--el-color-primary-light-7)",
 	      // 是否开启菜单背景颜色渐变
@@ -1979,7 +1997,7 @@
 	       */
 	      // Tagsview 风格：可选值"<tags-style-one|tags-style-four|tags-style-five>"，默认 tags-style-five
 	      // 定义的值与 `/src/layout/navBars/tagsView/tagsView.vue` 中的 class 同名
-	      tagsStyle: "tags-style-one",
+	      tagsStyle: "tags-style-five",
 	      // 主页面切换动画: Animate.css
 	      animation: "fadeDown",
 	      // 分栏高亮风格：可选值"<columns-round|columns-card>"，默认 columns-round
@@ -18410,7 +18428,7 @@
 	      name: key,
 	      el: element[key].el,
 	      message: mergeArrObj(itemize, key),
-	      vxe: vxe[key].vxe
+	      vxe: vxe[key].default.vxe
 	    };
 	    i18n.global.setLocaleMessage(key, messages[key]);
 	  }
@@ -18437,7 +18455,6 @@
 	    size: vxeSize,
 	    // 全局尺寸mini、small、medium/default
 	    i18n: (key, args) => i18n.global.t(key, args),
-	    // i18n: (key, args) => i18n.global.t(key, args),
 	    // zIndex: 999, // 全局 zIndex 起始值，如果项目的的 z-index 样式值过大时就需要跟随设置更大，避免被遮挡
 	    // version: 0, // 版本号，对于某些带数据缓存的功能有用到，上升版本号可以用于重置数据
 	    // loadingText: '加载中...', // 全局loading提示内容，如果为null则不显示文本
@@ -26318,7 +26335,7 @@
 	      }, [
 	        showLogo.value ? (vue.openBlock(), vue.createElementBlock("img", {
 	          key: 0,
-	          src: vue.unref(themeConfig).logoUrl,
+	          src: vue.unref(showFileUrl)(vue.unref(themeConfig).logoUrl),
 	          class: "layout-logo-medium-img"
 	        }, null, 8, _hoisted_1$d)) : vue.createCommentVNode("v-if", true),
 	        vue.createElementVNode(
@@ -26334,7 +26351,7 @@
 	        onClick: onThemeConfigChange
 	      }, [
 	        vue.createElementVNode("img", {
-	          src: vue.unref(themeConfig).logoUrl,
+	          src: vue.unref(showFileUrl)(vue.unref(themeConfig).logoUrl),
 	          class: "layout-logo-size-img"
 	        }, null, 8, _hoisted_2$8)
 	      ]));
@@ -28009,7 +28026,7 @@
 	                  ]),
 	                  default: vue.withCtx(() => [
 	                    vue.createElementVNode("img", {
-	                      src: vue.unref(userInfos).avatar,
+	                      src: vue.unref(showFileUrl)(vue.unref(userInfos).avatar),
 	                      class: "layout-navbars-breadcrumb-user-link-photo mr5"
 	                    }, null, 8, _hoisted_11$1)
 	                  ]),
@@ -28611,6 +28628,7 @@
 	exports.gcj02ToBd09 = gcj02ToBd09;
 	exports.getCountryCode = getCountryCode;
 	exports.getFileName = getFileName;
+	exports.getFileUrl = getFileUrl;
 	exports.getHeader = getHeader;
 	exports.getJWTDate = getJWTDate;
 	exports.getToken = getToken;
@@ -28656,6 +28674,7 @@
 	exports.setIntroduction = setIntroduction;
 	exports.setJsCdn = setJsCdn;
 	exports.setupI18n = setupI18n;
+	exports.showFileUrl = showFileUrl;
 	exports.signalR = signalR;
 	exports.signatureByKSort = signatureByKSort;
 	exports.sleep = sleep;