@fmdeui/fmui 1.0.17 → 1.0.18

package/es/packages/hooks/sysInfo.mjs

@@ -7,10 +7,10 @@ import '../api/index.mjs';
 import { feature } from '../api/sys/index.mjs';
 import { useBaseApi } from '../api/base/index.mjs';
 
-const storesThemeConfig = useThemeConfig();
-const { themeConfig } = storeToRefs(storesThemeConfig);
 async function loadSysInfo(tenantid) {
   var _a;
+  const storesThemeConfig = useThemeConfig();
+  const { themeConfig } = storeToRefs(storesThemeConfig);
   const [err, res] = await feature(useBaseApi("sysTenant").gcomm(null, "sysInfo/" + Number(tenantid)));
   if (err) {
     themeConfig.value.logoUrl = img;

package/es/packages/hooks/useInfo.mjs

@@ -1,44 +1,83 @@
 import { useUserInfo } from '../stores/userInfo.mjs';
 
-const { userInfos } = useUserInfo();
+const _getUserInfo = () => {
+  const store = useUserInfo();
+  return store.userInfos;
+};
 const isSupperAdmin = () => {
-  return (userInfos == null ? void 0 : userInfos.accountType) === 999;
+  var _a;
+  return ((_a = _getUserInfo()) == null ? void 0 : _a.accountType) === 999;
 };
 const isTenantAdmin = () => {
-  return (userInfos == null ? void 0 : userInfos.accountType) === 888;
+  var _a;
+  return ((_a = _getUserInfo()) == null ? void 0 : _a.accountType) === 888;
 };
 const isAdmin = () => {
   return isSupperAdmin() || isTenantAdmin();
 };
 const isNormalUser = () => {
-  return (userInfos == null ? void 0 : userInfos.accountType) === 777;
+  var _a;
+  return ((_a = _getUserInfo()) == null ? void 0 : _a.accountType) === 777;
 };
 const isMember = () => {
-  return (userInfos == null ? void 0 : userInfos.accountType) === 666;
+  var _a;
+  return ((_a = _getUserInfo()) == null ? void 0 : _a.accountType) === 666;
 };
 const userEmail = () => {
-  return userInfos == null ? void 0 : userInfos.email;
+  var _a;
+  return (_a = _getUserInfo()) == null ? void 0 : _a.email;
 };
 const userName = () => {
-  return userInfos == null ? void 0 : userInfos.userName;
+  var _a;
+  return (_a = _getUserInfo()) == null ? void 0 : _a.userName;
+};
+const userFriendName = () => {
+  var _a, _b, _c, _d, _e;
+  return ((_a = _getUserInfo()) == null ? void 0 : _a.realName) ? (_b = _getUserInfo()) == null ? void 0 : _b.realName : ((_c = _getUserInfo()) == null ? void 0 : _c.account) ? (_d = _getUserInfo()) == null ? void 0 : _d.account : (_e = _getUserInfo()) == null ? void 0 : _e.email;
 };
-const userFriendName = () => (userInfos == null ? void 0 : userInfos.realName) ? userInfos == null ? void 0 : userInfos.realName : (userInfos == null ? void 0 : userInfos.account) ? userInfos == null ? void 0 : userInfos.account : userInfos == null ? void 0 : userInfos.email;
 const tenantId = () => {
-  return userInfos == null ? void 0 : userInfos.tenantId;
-};
-const userAccount = () => userInfos == null ? void 0 : userInfos.account;
-const userPhone = () => userInfos == null ? void 0 : userInfos.phone;
-const userId = () => userInfos == null ? void 0 : userInfos.id;
-const orgId = () => userInfos == null ? void 0 : userInfos.orgId;
-const orgName = () => userInfos == null ? void 0 : userInfos.orgName;
-const posId = () => userInfos == null ? void 0 : userInfos.posId;
-const posName = () => userInfos == null ? void 0 : userInfos.posName;
-const roles = () => userInfos == null ? void 0 : userInfos.roles;
+  var _a;
+  return (_a = _getUserInfo()) == null ? void 0 : _a.tenantId;
+};
+const userAccount = () => {
+  var _a;
+  return (_a = _getUserInfo()) == null ? void 0 : _a.account;
+};
+const userPhone = () => {
+  var _a;
+  return (_a = _getUserInfo()) == null ? void 0 : _a.phone;
+};
+const userId = () => {
+  var _a;
+  return (_a = _getUserInfo()) == null ? void 0 : _a.id;
+};
+const orgId = () => {
+  var _a;
+  return (_a = _getUserInfo()) == null ? void 0 : _a.orgId;
+};
+const orgName = () => {
+  var _a;
+  return (_a = _getUserInfo()) == null ? void 0 : _a.orgName;
+};
+const posId = () => {
+  var _a;
+  return (_a = _getUserInfo()) == null ? void 0 : _a.posId;
+};
+const posName = () => {
+  var _a;
+  return (_a = _getUserInfo()) == null ? void 0 : _a.posName;
+};
+const roles = () => {
+  var _a;
+  return (_a = _getUserInfo()) == null ? void 0 : _a.roles;
+};
 const hasRoleCode = (code) => {
-  return userInfos.roles.find((u) => u.code === code) ? true : false;
+  var _a;
+  return ((_a = _getUserInfo()) == null ? void 0 : _a.roles.find((u) => u.code === code)) ? true : false;
 };
 const hasPrivilege = (privilege) => {
-  return userInfos.authApiList.includes(privilege);
+  var _a;
+  return (_a = _getUserInfo()) == null ? void 0 : _a.authApiList.includes(privilege);
 };
 
 export { hasPrivilege, hasRoleCode, isAdmin, isMember, isNormalUser, isSupperAdmin, isTenantAdmin, orgId, orgName, posId, posName, roles, tenantId, userAccount, userEmail, userFriendName, userId, userName, userPhone };

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.17 */
+/*! fmdeui-fmui v1.0.18 */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('pinia'), require('crypto-js'), require('xlsx-js-style'), require('element-plus'), require('vue'), require('@element-plus/icons-vue'), require('axios'), require('js-cookie'), require('@microsoft/signalr'), require('vxe-table'), require('@vxe-ui/plugin-render-element'), require('@vxe-ui/plugin-export-xlsx'), require('vxe-pc-ui'), require('vue-i18n'), require('exceljs'), require('lodash-es'), require('@vueuse/core'), require('mitt'), require('vue-router'), require('nprogress')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'pinia', 'crypto-js', 'xlsx-js-style', 'element-plus', 'vue', '@element-plus/icons-vue', 'axios', 'js-cookie', '@microsoft/signalr', 'vxe-table', '@vxe-ui/plugin-render-element', '@vxe-ui/plugin-export-xlsx', 'vxe-pc-ui', 'vue-i18n', 'exceljs', 'lodash-es', '@vueuse/core', 'mitt', 'vue-router', 'nprogress'], factory) :
@@ -18873,48 +18873,48 @@
 	  }
 	}
 
-	const storesThemeConfig$1 = useThemeConfig();
-	const { themeConfig: themeConfig$1 } = pinia$1.storeToRefs(storesThemeConfig$1);
 	async function loadSysInfo(tenantid) {
 	  var _a;
+	  const storesThemeConfig = useThemeConfig();
+	  const { themeConfig } = pinia$1.storeToRefs(storesThemeConfig);
 	  const [err, res] = await feature(useBaseApi("sysTenant").gcomm(null, "sysInfo/" + Number(tenantid)));
 	  if (err) {
-	    themeConfig$1.value.logoUrl = img;
+	    themeConfig.value.logoUrl = img;
 	    Local.remove("themeConfig");
-	    Local.set("themeConfig", storesThemeConfig$1.themeConfig);
+	    Local.set("themeConfig", storesThemeConfig.themeConfig);
 	    return;
 	  } else {
 	    if (res.data.type != "success" || res.data.result == null) return;
 	    const data = res.data.result;
-	    themeConfig$1.value.logoUrl = data.logo;
-	    themeConfig$1.value.globalTitle = data.title;
-	    themeConfig$1.value.globalViceTitle = data.viceTitle;
-	    themeConfig$1.value.globalViceTitleMsg = data.viceDesc;
-	    themeConfig$1.value.icp = data.icp;
-	    themeConfig$1.value.icpUrl = data.icpUrl;
-	    themeConfig$1.value.isWatermark = data.watermark != null;
-	    themeConfig$1.value.watermarkText = data.watermark;
-	    themeConfig$1.value.copyright = data.copyright;
-	    themeConfig$1.value.version = data.version;
-	    themeConfig$1.value.carouselFiles = data.carouselFiles;
-	    themeConfig$1.value.primary = data.themeColor;
-	    themeConfig$1.value.layout = data.layout;
-	    themeConfig$1.value.animation = data.animation;
-	    themeConfig$1.value.secondVer = data.secondVer;
-	    themeConfig$1.value.captcha = data.captcha;
-	    themeConfig$1.value.forceChangePassword = data.forceChangePassword;
-	    themeConfig$1.value.passwordExpirationTime = data.passwordExpirationTime;
-	    themeConfig$1.value.i18NSwitch = data.i18NSwitch;
-	    themeConfig$1.value.idleTimeout = data.idleTimeout;
-	    themeConfig$1.value.onlineNotice = data.onlineNotice;
-	    themeConfig$1.value.mobileLogin = data.mobileLogin;
-	    themeConfig$1.value.scanLogin = data.scanLogin;
-	    themeConfig$1.value.signUp = data.signUp;
+	    themeConfig.value.logoUrl = data.logo;
+	    themeConfig.value.globalTitle = data.title;
+	    themeConfig.value.globalViceTitle = data.viceTitle;
+	    themeConfig.value.globalViceTitleMsg = data.viceDesc;
+	    themeConfig.value.icp = data.icp;
+	    themeConfig.value.icpUrl = data.icpUrl;
+	    themeConfig.value.isWatermark = data.watermark != null;
+	    themeConfig.value.watermarkText = data.watermark;
+	    themeConfig.value.copyright = data.copyright;
+	    themeConfig.value.version = data.version;
+	    themeConfig.value.carouselFiles = data.carouselFiles;
+	    themeConfig.value.primary = data.themeColor;
+	    themeConfig.value.layout = data.layout;
+	    themeConfig.value.animation = data.animation;
+	    themeConfig.value.secondVer = data.secondVer;
+	    themeConfig.value.captcha = data.captcha;
+	    themeConfig.value.forceChangePassword = data.forceChangePassword;
+	    themeConfig.value.passwordExpirationTime = data.passwordExpirationTime;
+	    themeConfig.value.i18NSwitch = data.i18NSwitch;
+	    themeConfig.value.idleTimeout = data.idleTimeout;
+	    themeConfig.value.onlineNotice = data.onlineNotice;
+	    themeConfig.value.mobileLogin = data.mobileLogin;
+	    themeConfig.value.scanLogin = data.scanLogin;
+	    themeConfig.value.signUp = data.signUp;
 	    window.__env__.VITE_SM_PUBLIC_KEY = data.publicKey;
 	    updateFavicon(data.logo);
-	    updateIdleTimeout((_a = themeConfig$1.value.idleTimeout) != null ? _a : 0);
+	    updateIdleTimeout((_a = themeConfig.value.idleTimeout) != null ? _a : 0);
 	    Local.remove("themeConfig");
-	    Local.set("themeConfig", storesThemeConfig$1.themeConfig);
+	    Local.set("themeConfig", storesThemeConfig.themeConfig);
 	  }
 	}
 	const updateFavicon = (url) => {
@@ -18922,45 +18922,84 @@
 	  favicon.href = url ? url : "data:;base64,=";
 	};
 
-	const { userInfos } = useUserInfo();
+	const _getUserInfo = () => {
+	  const store = useUserInfo();
+	  return store.userInfos;
+	};
 	const isSupperAdmin = () => {
-	  return (userInfos == null ? void 0 : userInfos.accountType) === 999;
+	  var _a;
+	  return ((_a = _getUserInfo()) == null ? void 0 : _a.accountType) === 999;
 	};
 	const isTenantAdmin = () => {
-	  return (userInfos == null ? void 0 : userInfos.accountType) === 888;
+	  var _a;
+	  return ((_a = _getUserInfo()) == null ? void 0 : _a.accountType) === 888;
 	};
 	const isAdmin = () => {
 	  return isSupperAdmin() || isTenantAdmin();
 	};
 	const isNormalUser = () => {
-	  return (userInfos == null ? void 0 : userInfos.accountType) === 777;
+	  var _a;
+	  return ((_a = _getUserInfo()) == null ? void 0 : _a.accountType) === 777;
 	};
 	const isMember = () => {
-	  return (userInfos == null ? void 0 : userInfos.accountType) === 666;
+	  var _a;
+	  return ((_a = _getUserInfo()) == null ? void 0 : _a.accountType) === 666;
 	};
 	const userEmail = () => {
-	  return userInfos == null ? void 0 : userInfos.email;
+	  var _a;
+	  return (_a = _getUserInfo()) == null ? void 0 : _a.email;
 	};
 	const userName = () => {
-	  return userInfos == null ? void 0 : userInfos.userName;
+	  var _a;
+	  return (_a = _getUserInfo()) == null ? void 0 : _a.userName;
+	};
+	const userFriendName = () => {
+	  var _a, _b, _c, _d, _e;
+	  return ((_a = _getUserInfo()) == null ? void 0 : _a.realName) ? (_b = _getUserInfo()) == null ? void 0 : _b.realName : ((_c = _getUserInfo()) == null ? void 0 : _c.account) ? (_d = _getUserInfo()) == null ? void 0 : _d.account : (_e = _getUserInfo()) == null ? void 0 : _e.email;
 	};
-	const userFriendName = () => (userInfos == null ? void 0 : userInfos.realName) ? userInfos == null ? void 0 : userInfos.realName : (userInfos == null ? void 0 : userInfos.account) ? userInfos == null ? void 0 : userInfos.account : userInfos == null ? void 0 : userInfos.email;
 	const tenantId = () => {
-	  return userInfos == null ? void 0 : userInfos.tenantId;
+	  var _a;
+	  return (_a = _getUserInfo()) == null ? void 0 : _a.tenantId;
+	};
+	const userAccount = () => {
+	  var _a;
+	  return (_a = _getUserInfo()) == null ? void 0 : _a.account;
+	};
+	const userPhone = () => {
+	  var _a;
+	  return (_a = _getUserInfo()) == null ? void 0 : _a.phone;
+	};
+	const userId = () => {
+	  var _a;
+	  return (_a = _getUserInfo()) == null ? void 0 : _a.id;
+	};
+	const orgId = () => {
+	  var _a;
+	  return (_a = _getUserInfo()) == null ? void 0 : _a.orgId;
+	};
+	const orgName = () => {
+	  var _a;
+	  return (_a = _getUserInfo()) == null ? void 0 : _a.orgName;
+	};
+	const posId = () => {
+	  var _a;
+	  return (_a = _getUserInfo()) == null ? void 0 : _a.posId;
+	};
+	const posName = () => {
+	  var _a;
+	  return (_a = _getUserInfo()) == null ? void 0 : _a.posName;
+	};
+	const roles = () => {
+	  var _a;
+	  return (_a = _getUserInfo()) == null ? void 0 : _a.roles;
 	};
-	const userAccount = () => userInfos == null ? void 0 : userInfos.account;
-	const userPhone = () => userInfos == null ? void 0 : userInfos.phone;
-	const userId = () => userInfos == null ? void 0 : userInfos.id;
-	const orgId = () => userInfos == null ? void 0 : userInfos.orgId;
-	const orgName = () => userInfos == null ? void 0 : userInfos.orgName;
-	const posId = () => userInfos == null ? void 0 : userInfos.posId;
-	const posName = () => userInfos == null ? void 0 : userInfos.posName;
-	const roles = () => userInfos == null ? void 0 : userInfos.roles;
 	const hasRoleCode = (code) => {
-	  return userInfos.roles.find((u) => u.code === code) ? true : false;
+	  var _a;
+	  return ((_a = _getUserInfo()) == null ? void 0 : _a.roles.find((u) => u.code === code)) ? true : false;
 	};
 	const hasPrivilege = (privilege) => {
-	  return userInfos.authApiList.includes(privilege);
+	  var _a;
+	  return (_a = _getUserInfo()) == null ? void 0 : _a.authApiList.includes(privilege);
 	};
 
 	const useDateTimeShortCust = () => {