@fmdeui/fmui 1.0.68 → 1.0.70

package/es/packages/components/input/src/index.vue2.mjs

@@ -149,6 +149,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         case "amount":
         case "decimal":
           formatted = formatAmount(Number(val));
+          if (formatted === "") {
+            formatted = 0;
+          }
           break;
         case "phone":
           formatted = (_b = validate(String(val || ""), REGEX.PHONE, "plus.input.validatePhone")) != null ? _b : "";

package/es/packages/hooks/sysInfo.mjs

@@ -43,6 +43,8 @@ async function loadSysInfo(tenantid) {
     themeConfig.value.idleTimeout = data.idleTimeout;
     themeConfig.value.onlineNotice = data.onlineNotice;
     themeConfig.value.mobileLogin = data.mobileLogin;
+    themeConfig.value.isExpireTip = data.isExpireTip;
+    themeConfig.value.expireDay = data.expireDay;
     themeConfig.value.scanLogin = data.scanLogin;
     themeConfig.value.signUp = data.signUp;
     window.__env__.VITE_SM_PUBLIC_KEY = data.publicKey;

package/es/packages/stores/themeConfig.mjs

@@ -28,7 +28,7 @@ const useThemeConfig = defineStore("themeConfig", {
       // 默认菜单导航背景颜色
       menuBar: "#FFFFFF",
       // 默认菜单导航字体颜色
-      menuBarColor: "#1095df",
+      menuBarColor: "#000000",
       // 默认菜单高亮背景色
       menuBarActiveColor: "var(--el-color-primary-light-7)",
       // 是否开启菜单背景颜色渐变
@@ -37,7 +37,7 @@ const useThemeConfig = defineStore("themeConfig", {
        * 分栏设置
        */
       // 默认分栏菜单背景颜色
-      columnsMenuBar: "#2C3A49",
+      columnsMenuBar: "#1095df",
       // 默认分栏菜单字体颜色
       columnsMenuBarColor: "#F0F0F0",
       // 是否开启分栏菜单背景颜色渐变
@@ -99,6 +99,10 @@ const useThemeConfig = defineStore("themeConfig", {
       // 水印文案
       watermarkText: "\u7BA1\u7406\u5E73\u53F0",
       adminTel: "137 0885 2680 \u5F20\u5148\u751F",
+      // 是否到期提醒
+      isExpireTip: false,
+      // 到期提醒天数
+      expireDay: 99,
       /**
        * 其它设置
        */

package/es/packages/stores/userInfo.mjs

@@ -17,7 +17,18 @@ const useUserInfo = defineStore("userInfo", {
     userTableList: []
     // 用户表格字段列表
   }),
-  getters: {},
+  getters: {
+    // 获取当前用户信息
+    getUserInfos: (state) => state.userInfos,
+    // 获取当前用户公司ID
+    getcmpId: (state) => {
+      return Number(state.userInfos.cmpId > 0 ? state.userInfos.cmpId : state.userInfos.tenantId);
+    },
+    // 获取当前用户租户ID
+    getTenantId: (state) => {
+      return Number(state.userInfos.tenantId);
+    }
+  },
   actions: {
     // 存储用户信息到浏览器缓存
     async setUserInfos() {

package/es/stores/userInfo.d.ts

@@ -1,10 +1,57 @@
 import { UserInfosState } from 'fmdeui-fmui/es/types';
-import { StoreDefinition } from 'pinia';
+import { StoreDefinition, PiniaCustomStateProperties } from 'pinia';
 /**
  * 用户信息
  * @methods setUserInfos 设置用户信息
  */
-export declare const useUserInfo: StoreDefinition<"userInfo", UserInfosState<any>, {}, {
+export declare const useUserInfo: StoreDefinition<"userInfo", UserInfosState<any>, {
+    getUserInfos: (state: {
+        userInfos: {
+            [x: string]: any;
+            authApiList: string[];
+            photo: string;
+            roles: string[];
+            time: number;
+            userName: string;
+        };
+        constList: any[];
+        dictList: any;
+        userTableList: any[];
+    } & PiniaCustomStateProperties<UserInfosState<any>>) => {
+        [x: string]: any;
+        authApiList: string[];
+        photo: string;
+        roles: string[];
+        time: number;
+        userName: string;
+    };
+    getcmpId: (state: {
+        userInfos: {
+            [x: string]: any;
+            authApiList: string[];
+            photo: string;
+            roles: string[];
+            time: number;
+            userName: string;
+        };
+        constList: any[];
+        dictList: any;
+        userTableList: any[];
+    } & PiniaCustomStateProperties<UserInfosState<any>>) => number;
+    getTenantId: (state: {
+        userInfos: {
+            [x: string]: any;
+            authApiList: string[];
+            photo: string;
+            roles: string[];
+            time: number;
+            userName: string;
+        };
+        constList: any[];
+        dictList: any;
+        userTableList: any[];
+    } & PiniaCustomStateProperties<UserInfosState<any>>) => number;
+}, {
     setUserInfos(): Promise<void>;
     setConstList(): Promise<void>;
     setDictList(): Promise<void>;

package/es/types/pinia/index.d.ts

@@ -75,6 +75,8 @@ export interface ThemeConfigState {
         adminTel: string;
         tagsStyle: string;
         animation: string;
+        isExpireTip: boolean;
+        expireDay: number;
         columnsAsideStyle: string;
         columnsAsideLayout: string;
         layout: string;

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.68 */
+/*! fmdeui-fmui v1.0.70 */
 (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) :
@@ -2904,7 +2904,7 @@
 	      // 默认菜单导航背景颜色
 	      menuBar: "#FFFFFF",
 	      // 默认菜单导航字体颜色
-	      menuBarColor: "#1095df",
+	      menuBarColor: "#000000",
 	      // 默认菜单高亮背景色
 	      menuBarActiveColor: "var(--el-color-primary-light-7)",
 	      // 是否开启菜单背景颜色渐变
@@ -2913,7 +2913,7 @@
 	       * 分栏设置
 	       */
 	      // 默认分栏菜单背景颜色
-	      columnsMenuBar: "#2C3A49",
+	      columnsMenuBar: "#1095df",
 	      // 默认分栏菜单字体颜色
 	      columnsMenuBarColor: "#F0F0F0",
 	      // 是否开启分栏菜单背景颜色渐变
@@ -2975,6 +2975,10 @@
 	      // 水印文案
 	      watermarkText: "\u7BA1\u7406\u5E73\u53F0",
 	      adminTel: "137 0885 2680 \u5F20\u5148\u751F",
+	      // 是否到期提醒
+	      isExpireTip: false,
+	      // 到期提醒天数
+	      expireDay: 99,
 	      /**
 	       * 其它设置
 	       */
@@ -3712,7 +3716,18 @@
 	    userTableList: []
 	    // 用户表格字段列表
 	  }),
-	  getters: {},
+	  getters: {
+	    // 获取当前用户信息
+	    getUserInfos: (state) => state.userInfos,
+	    // 获取当前用户公司ID
+	    getcmpId: (state) => {
+	      return Number(state.userInfos.cmpId > 0 ? state.userInfos.cmpId : state.userInfos.tenantId);
+	    },
+	    // 获取当前用户租户ID
+	    getTenantId: (state) => {
+	      return Number(state.userInfos.tenantId);
+	    }
+	  },
 	  actions: {
 	    // 存储用户信息到浏览器缓存
 	    async setUserInfos() {
@@ -20192,6 +20207,8 @@
 	    themeConfig.value.idleTimeout = data.idleTimeout;
 	    themeConfig.value.onlineNotice = data.onlineNotice;
 	    themeConfig.value.mobileLogin = data.mobileLogin;
+	    themeConfig.value.isExpireTip = data.isExpireTip;
+	    themeConfig.value.expireDay = data.expireDay;
 	    themeConfig.value.scanLogin = data.scanLogin;
 	    themeConfig.value.signUp = data.signUp;
 	    window.__env__.VITE_SM_PUBLIC_KEY = data.publicKey;
@@ -20527,6 +20544,9 @@
 	        case "amount":
 	        case "decimal":
 	          formatted = formatAmount(Number(val));
+	          if (formatted === "") {
+	            formatted = 0;
+	          }
 	          break;
 	        case "phone":
 	          formatted = (_b = validate(String(val || ""), REGEX.PHONE, "plus.input.validatePhone")) != null ? _b : "";