@fmdevui/fm-dev 1.0.8 → 1.0.10

package/lib/core/index.d.ts

@@ -1,4 +1,5 @@
 export * from './ui/login';
+export * from './ui/loading';
 export * from './api';
 export * from './directive';
 export * from './locales';
@@ -6,4 +7,5 @@ export * from './stores';
 export * from './utils';
 export * from './auth';
 export * from './hook/dateTimeShortCust';
+export * from './hook/useVxeTableOptionsHook';
 export * from './types';

package/lib/core/ui/loading/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 页面全局 Loading
+ * @method start 创建 loading
+ * @method done 移除 loading
+ */
+export declare const NextLoading: {
+    start: () => void;
+    done: (time?: number) => void;
+};

package/lib/index.js

@@ -6,12 +6,13 @@ var defaults = require('./defaults.js');
 require('./packages/core/index.js');
 var version = require('./version.js');
 var index = require('./packages/core/ui/login/index.js');
-var index$1 = require('./packages/core/api/base/index.js');
-var index$2 = require('./packages/core/api/sys/index.js');
-var index$3 = require('./packages/core/api/login/index.js');
+var index$1 = require('./packages/core/ui/loading/index.js');
+var index$2 = require('./packages/core/api/base/index.js');
+var index$3 = require('./packages/core/api/sys/index.js');
+var index$4 = require('./packages/core/api/login/index.js');
 var request = require('./packages/core/api/utils/request.js');
-var index$4 = require('./packages/core/directive/index.js');
-var index$5 = require('./packages/core/locales/index.js');
+var index$5 = require('./packages/core/directive/index.js');
+var index$6 = require('./packages/core/locales/index.js');
 var inpinia = require('./packages/core/stores/inpinia.js');
 var keepAliveNames = require('./packages/core/stores/keepAliveNames.js');
 var requestOldRoutes = require('./packages/core/stores/requestOldRoutes.js');
@@ -19,29 +20,31 @@ var routesList = require('./packages/core/stores/routesList.js');
 var tagsViewRoutes = require('./packages/core/stores/tagsViewRoutes.js');
 var themeConfig = require('./packages/core/stores/themeConfig.js');
 var userInfo = require('./packages/core/stores/userInfo.js');
-var index$6 = require('./packages/core/utils/array/index.js');
-var index$7 = require('./packages/core/utils/watermark/index.js');
-var index$8 = require('./packages/core/utils/base64/index.js');
-var index$9 = require('./packages/core/utils/storage/index.js');
+var index$7 = require('./packages/core/utils/array/index.js');
+var index$8 = require('./packages/core/utils/watermark/index.js');
+var index$9 = require('./packages/core/utils/base64/index.js');
+var index$a = require('./packages/core/utils/storage/index.js');
 var toolsValidate = require('./packages/core/utils/comm/toolsValidate.js');
 var formatTime = require('./packages/core/utils/comm/formatTime.js');
 var theme = require('./packages/core/utils/comm/theme.js');
 var download = require('./packages/core/utils/comm/download.js');
 var dataSignature = require('./packages/core/utils/comm/data-signature.js');
 var uploadfileurl = require('./packages/core/utils/comm/uploadfileurl.js');
-var index$a = require('./packages/core/utils/const/index.js');
-var index$b = require('./packages/core/auth/index.js');
+var index$b = require('./packages/core/utils/const/index.js');
+var index$c = require('./packages/core/auth/index.js');
 var dateTimeShortCust = require('./packages/core/hook/dateTimeShortCust.js');
+var useVxeTableOptionsHook = require('./packages/core/hook/useVxeTableOptionsHook.js');
 
 const install = defaults.default.install;
 
 exports.default = defaults.default;
 exports.version = version.version;
 exports.FmLogin = index.FmLogin;
-exports.useBaseApi = index$1.useBaseApi;
-exports.feature = index$2.feature;
-exports.useSysApi = index$2.useSysApi;
-exports.useLoginApi = index$3.useLoginApi;
+exports.NextLoading = index$1.NextLoading;
+exports.useBaseApi = index$2.useBaseApi;
+exports.feature = index$3.feature;
+exports.useSysApi = index$3.useSysApi;
+exports.useLoginApi = index$4.useLoginApi;
 exports.accessTokenKey = request.accessTokenKey;
 exports.axiosInstance = request.axiosInstance;
 exports.cancelAllRequest = request.cancelAllRequest;
@@ -55,13 +58,13 @@ exports.refreshAccessTokenKey = request.refreshAccessTokenKey;
 exports.request2 = request.request2;
 exports.service = request.service;
 exports.tansParams = request.tansParams;
-exports.directive = index$4.directive;
-exports.getCountryCode = index$5.getCountryCode;
-exports.i18n = index$5.i18n;
-exports.iso_3166_1_CountryList = index$5.iso_3166_1_CountryList;
-exports.languageList = index$5.languageList;
-exports.mergMessage = index$5.mergMessage;
-exports.setupI18n = index$5.setupI18n;
+exports.directive = index$5.directive;
+exports.getCountryCode = index$6.getCountryCode;
+exports.i18n = index$6.i18n;
+exports.iso_3166_1_CountryList = index$6.iso_3166_1_CountryList;
+exports.languageList = index$6.languageList;
+exports.mergMessage = index$6.mergMessage;
+exports.setupI18n = index$6.setupI18n;
 exports.pinia = inpinia.pinia;
 exports.useKeepALiveNames = keepAliveNames.useKeepALiveNames;
 exports.useRequestOldRoutes = requestOldRoutes.useRequestOldRoutes;
@@ -69,18 +72,18 @@ exports.useRoutesList = routesList.useRoutesList;
 exports.useTagsViewRoutes = tagsViewRoutes.useTagsViewRoutes;
 exports.useThemeConfig = themeConfig.useThemeConfig;
 exports.useUserInfo = userInfo.useUserInfo;
-exports.clone = index$6.clone;
-exports.isObjectValueEqual = index$6.isObjectValueEqual;
-exports.judgementSameArr = index$6.judgementSameArr;
-exports.removeDuplicate = index$6.removeDuplicate;
-exports.Watermark = index$7.Watermark;
-exports.base64ToFile = index$8.base64ToFile;
-exports.blobToFile = index$8.blobToFile;
-exports.dataURLtoBlob = index$8.dataURLtoBlob;
-exports.fileToBase64 = index$8.fileToBase64;
-exports.urlToBase64 = index$8.urlToBase64;
-exports.Local = index$9.Local;
-exports.Session = index$9.Session;
+exports.clone = index$7.clone;
+exports.isObjectValueEqual = index$7.isObjectValueEqual;
+exports.judgementSameArr = index$7.judgementSameArr;
+exports.removeDuplicate = index$7.removeDuplicate;
+exports.Watermark = index$8.Watermark;
+exports.base64ToFile = index$9.base64ToFile;
+exports.blobToFile = index$9.blobToFile;
+exports.dataURLtoBlob = index$9.dataURLtoBlob;
+exports.fileToBase64 = index$9.fileToBase64;
+exports.urlToBase64 = index$9.urlToBase64;
+exports.Local = index$a.Local;
+exports.Session = index$a.Session;
 exports.judgementIdCard = toolsValidate.judgementIdCard;
 exports.verifiyNumberInteger = toolsValidate.verifiyNumberInteger;
 exports.verifyAccount = toolsValidate.verifyAccount;
@@ -119,12 +122,13 @@ exports.getFileName = download.getFileName;
 exports.openWindow = download.openWindow;
 exports.signatureByKSort = dataSignature.signatureByKSort;
 exports.getFileUrl = uploadfileurl.getFileUrl;
-exports.PUB = index$a.PUB;
-exports.auth = index$b.auth;
-exports.authAll = index$b.authAll;
-exports.auths = index$b.auths;
-exports.hAuth = index$b.hAuth;
-exports.hAuthAll = index$b.hAuthAll;
-exports.hAuths = index$b.hAuths;
+exports.PUB = index$b.PUB;
+exports.auth = index$c.auth;
+exports.authAll = index$c.authAll;
+exports.auths = index$c.auths;
+exports.hAuth = index$c.hAuth;
+exports.hAuthAll = index$c.hAuthAll;
+exports.hAuths = index$c.hAuths;
 exports.useDateTimeShortCust = dateTimeShortCust.useDateTimeShortCust;
+exports.useVxeTable = useVxeTableOptionsHook.useVxeTable;
 exports.install = install;

package/lib/packages/core/hook/useVxeTableOptionsHook.js

@@ -0,0 +1,85 @@
+'use strict';
+
+var vue = require('vue');
+var elementPlus = require('element-plus');
+require('../stores/index.js');
+var lodashEs = require('lodash-es');
+var themeConfig = require('../stores/themeConfig.js');
+var inpinia = require('../stores/inpinia.js');
+
+const vxeSize = themeConfig.useThemeConfig(inpinia.pinia).themeConfig.globalComponentSize == "small" ? "mini" : themeConfig.useThemeConfig(inpinia.pinia).themeConfig.globalComponentSize == "default" ? "small" : "medium";
+const useVxeTable = (opt, extras) => {
+  opt.id = opt.id ? opt.id : String((/* @__PURE__ */ new Date()).getTime());
+  const options = vue.reactive({
+    id: opt.id,
+    height: "auto",
+    autoResize: true,
+    size: vxeSize,
+    loading: false,
+    align: "center",
+    // 自动监听父元素的变化去重新计算表格（对于父元素可能存在动态变化、显示隐藏的容器中、列宽异常等场景中的可能会用到）
+    // data: [] as Array<T>,
+    columns: opt.columns,
+    showFooter: opt.showFooter,
+    footerData: opt.footerData,
+    footerMethod: opt.footerMethod,
+    toolbarConfig: {
+      size: vxeSize,
+      slots: { buttons: "toolbar_buttons", tools: "toolbar_tools" },
+      refresh: {
+        code: "query"
+      },
+      export: true,
+      print: true,
+      zoom: true,
+      custom: true
+    },
+    checkboxConfig: { range: true },
+    // sortConfig: { trigger: 'cell', remote: true },
+    exportConfig: {
+      remote: false,
+      // 设置使用服务端导出
+      filename: `${opt.name}\u5BFC\u51FA_${elementPlus.dayjs().format("YYMMDDHHmmss")}`
+    },
+    pagerConfig: {
+      enabled: true,
+      size: vxeSize,
+      pageSize: 50
+    },
+    printConfig: { sheetName: "" },
+    customConfig: {
+      storage: {
+        // 是否启用 localStorage 本地保存，会将列操作状态保留在本地（需要有 id）
+        visible: true,
+        // 启用显示/隐藏列状态
+        resizable: true
+        // 启用列宽状态
+      }
+    }
+  });
+  if (opt.data) {
+    options.data = opt.data;
+  } else {
+    options.proxyConfig = {
+      enabled: true,
+      autoLoad: false,
+      sort: true,
+      props: {
+        list: "data.result",
+        // 全量
+        result: "data.result.items",
+        // 分页
+        total: "data.result.total",
+        message: "data.message"
+      }
+    };
+  }
+  if (opt.sortConfig) {
+    options.sortConfig = opt.sortConfig;
+  } else {
+    options.sortConfig = { remote: true };
+  }
+  return extras ? lodashEs.merge(options, extras) : options;
+};
+
+exports.useVxeTable = useVxeTable;

package/lib/packages/core/index.js

@@ -1,17 +1,19 @@
 'use strict';
 
 var index = require('./ui/login/index.js');
+var index$1 = require('./ui/loading/index.js');
 require('./api/index.js');
-var index$4 = require('./directive/index.js');
-var index$5 = require('./locales/index.js');
+var index$5 = require('./directive/index.js');
+var index$6 = require('./locales/index.js');
 require('./stores/index.js');
 require('./utils/index.js');
-var index$b = require('./auth/index.js');
+var index$c = require('./auth/index.js');
 var dateTimeShortCust = require('./hook/dateTimeShortCust.js');
+var useVxeTableOptionsHook = require('./hook/useVxeTableOptionsHook.js');
 require('./types/index.js');
-var index$1 = require('./api/base/index.js');
-var index$2 = require('./api/sys/index.js');
-var index$3 = require('./api/login/index.js');
+var index$2 = require('./api/base/index.js');
+var index$3 = require('./api/sys/index.js');
+var index$4 = require('./api/login/index.js');
 var request = require('./api/utils/request.js');
 var inpinia = require('./stores/inpinia.js');
 var keepAliveNames = require('./stores/keepAliveNames.js');
@@ -20,39 +22,41 @@ var routesList = require('./stores/routesList.js');
 var tagsViewRoutes = require('./stores/tagsViewRoutes.js');
 var themeConfig = require('./stores/themeConfig.js');
 var userInfo = require('./stores/userInfo.js');
-var index$6 = require('./utils/array/index.js');
-var index$7 = require('./utils/watermark/index.js');
-var index$8 = require('./utils/base64/index.js');
-var index$9 = require('./utils/storage/index.js');
+var index$7 = require('./utils/array/index.js');
+var index$8 = require('./utils/watermark/index.js');
+var index$9 = require('./utils/base64/index.js');
+var index$a = require('./utils/storage/index.js');
 var toolsValidate = require('./utils/comm/toolsValidate.js');
 var formatTime = require('./utils/comm/formatTime.js');
 var theme = require('./utils/comm/theme.js');
 var download = require('./utils/comm/download.js');
 var dataSignature = require('./utils/comm/data-signature.js');
 var uploadfileurl = require('./utils/comm/uploadfileurl.js');
-var index$a = require('./utils/const/index.js');
+var index$b = require('./utils/const/index.js');
 
 
 
 exports.FmLogin = index.FmLogin;
-exports.directive = index$4.directive;
-exports.getCountryCode = index$5.getCountryCode;
-exports.i18n = index$5.i18n;
-exports.iso_3166_1_CountryList = index$5.iso_3166_1_CountryList;
-exports.languageList = index$5.languageList;
-exports.mergMessage = index$5.mergMessage;
-exports.setupI18n = index$5.setupI18n;
-exports.auth = index$b.auth;
-exports.authAll = index$b.authAll;
-exports.auths = index$b.auths;
-exports.hAuth = index$b.hAuth;
-exports.hAuthAll = index$b.hAuthAll;
-exports.hAuths = index$b.hAuths;
+exports.NextLoading = index$1.NextLoading;
+exports.directive = index$5.directive;
+exports.getCountryCode = index$6.getCountryCode;
+exports.i18n = index$6.i18n;
+exports.iso_3166_1_CountryList = index$6.iso_3166_1_CountryList;
+exports.languageList = index$6.languageList;
+exports.mergMessage = index$6.mergMessage;
+exports.setupI18n = index$6.setupI18n;
+exports.auth = index$c.auth;
+exports.authAll = index$c.authAll;
+exports.auths = index$c.auths;
+exports.hAuth = index$c.hAuth;
+exports.hAuthAll = index$c.hAuthAll;
+exports.hAuths = index$c.hAuths;
 exports.useDateTimeShortCust = dateTimeShortCust.useDateTimeShortCust;
-exports.useBaseApi = index$1.useBaseApi;
-exports.feature = index$2.feature;
-exports.useSysApi = index$2.useSysApi;
-exports.useLoginApi = index$3.useLoginApi;
+exports.useVxeTable = useVxeTableOptionsHook.useVxeTable;
+exports.useBaseApi = index$2.useBaseApi;
+exports.feature = index$3.feature;
+exports.useSysApi = index$3.useSysApi;
+exports.useLoginApi = index$4.useLoginApi;
 exports.accessTokenKey = request.accessTokenKey;
 exports.axiosInstance = request.axiosInstance;
 exports.cancelAllRequest = request.cancelAllRequest;
@@ -73,18 +77,18 @@ exports.useRoutesList = routesList.useRoutesList;
 exports.useTagsViewRoutes = tagsViewRoutes.useTagsViewRoutes;
 exports.useThemeConfig = themeConfig.useThemeConfig;
 exports.useUserInfo = userInfo.useUserInfo;
-exports.clone = index$6.clone;
-exports.isObjectValueEqual = index$6.isObjectValueEqual;
-exports.judgementSameArr = index$6.judgementSameArr;
-exports.removeDuplicate = index$6.removeDuplicate;
-exports.Watermark = index$7.Watermark;
-exports.base64ToFile = index$8.base64ToFile;
-exports.blobToFile = index$8.blobToFile;
-exports.dataURLtoBlob = index$8.dataURLtoBlob;
-exports.fileToBase64 = index$8.fileToBase64;
-exports.urlToBase64 = index$8.urlToBase64;
-exports.Local = index$9.Local;
-exports.Session = index$9.Session;
+exports.clone = index$7.clone;
+exports.isObjectValueEqual = index$7.isObjectValueEqual;
+exports.judgementSameArr = index$7.judgementSameArr;
+exports.removeDuplicate = index$7.removeDuplicate;
+exports.Watermark = index$8.Watermark;
+exports.base64ToFile = index$9.base64ToFile;
+exports.blobToFile = index$9.blobToFile;
+exports.dataURLtoBlob = index$9.dataURLtoBlob;
+exports.fileToBase64 = index$9.fileToBase64;
+exports.urlToBase64 = index$9.urlToBase64;
+exports.Local = index$a.Local;
+exports.Session = index$a.Session;
 exports.judgementIdCard = toolsValidate.judgementIdCard;
 exports.verifiyNumberInteger = toolsValidate.verifiyNumberInteger;
 exports.verifyAccount = toolsValidate.verifyAccount;
@@ -123,4 +127,4 @@ exports.getFileName = download.getFileName;
 exports.openWindow = download.openWindow;
 exports.signatureByKSort = dataSignature.signatureByKSort;
 exports.getFileUrl = uploadfileurl.getFileUrl;
-exports.PUB = index$a.PUB;
+exports.PUB = index$b.PUB;

package/lib/packages/core/ui/loading/index.js

@@ -0,0 +1,42 @@
+'use strict';
+
+var vue = require('vue');
+
+const NextLoading = {
+  // 创建 loading
+  start: () => {
+    const bodys = document.body;
+    const div = document.createElement("div");
+    div.setAttribute("class", "loading-next");
+    const htmls = `
+			<div class="loading-next-box">
+				<div class="loading-next-box-warp">
+					<div class="loading-next-box-item"></div>
+					<div class="loading-next-box-item"></div>
+					<div class="loading-next-box-item"></div>
+					<div class="loading-next-box-item"></div>
+					<div class="loading-next-box-item"></div>
+					<div class="loading-next-box-item"></div>
+					<div class="loading-next-box-item"></div>
+					<div class="loading-next-box-item"></div>
+					<div class="loading-next-box-item"></div>
+				</div>
+			</div>
+		`;
+    div.innerHTML = htmls;
+    bodys.insertBefore(div, bodys.childNodes[0]);
+    window.nextLoading = true;
+  },
+  // 移除 loading
+  done: (time = 0) => {
+    vue.nextTick(() => {
+      setTimeout(() => {
+        window.nextLoading = false;
+        const el = document.querySelector(".loading-next");
+        el?.parentNode?.removeChild(el);
+      }, time);
+    });
+  }
+};
+
+exports.NextLoading = NextLoading;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fmdevui/fm-dev",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Page level components developed based on Element Plus.",
   "author": "fmdevui",
   "keywords": [