@fmdeui/fmui 1.0.38 → 1.0.40

package/es/components/fm-layout/index.d.ts

@@ -5,10 +5,14 @@ export declare const FLayout: {
         onLayoutChangePassword?: ((...args: any[]) => any) | undefined;
         onLayoutOnlineUsers?: ((...args: any[]) => any) | undefined;
         onLayoutSearchMenu?: ((...args: any[]) => any) | undefined;
+        onLayoutSetBrowserTitle?: ((...args: any[]) => any) | undefined;
+        onLayoutSetOpenLink?: ((...args: any[]) => any) | undefined;
     }>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
         layoutChangePassword: (...args: any[]) => void;
         layoutOnlineUsers: (...args: any[]) => void;
         layoutSearchMenu: (...args: any[]) => void;
+        layoutSetBrowserTitle: (...args: any[]) => void;
+        layoutSetOpenLink: (...args: any[]) => void;
     }, PublicProps, {}, true, {}, {}, GlobalComponents, GlobalDirectives, string, {}, any, ComponentProvideOptions, {
         P: {};
         B: {};
@@ -20,6 +24,8 @@ export declare const FLayout: {
         onLayoutChangePassword?: ((...args: any[]) => any) | undefined;
         onLayoutOnlineUsers?: ((...args: any[]) => any) | undefined;
         onLayoutSearchMenu?: ((...args: any[]) => any) | undefined;
+        onLayoutSetBrowserTitle?: ((...args: any[]) => any) | undefined;
+        onLayoutSetOpenLink?: ((...args: any[]) => any) | undefined;
     }>, {}, {}, {}, {}, {}>;
     __isFragment?: never;
     __isTeleport?: never;
@@ -28,10 +34,14 @@ export declare const FLayout: {
     onLayoutChangePassword?: ((...args: any[]) => any) | undefined;
     onLayoutOnlineUsers?: ((...args: any[]) => any) | undefined;
     onLayoutSearchMenu?: ((...args: any[]) => any) | undefined;
+    onLayoutSetBrowserTitle?: ((...args: any[]) => any) | undefined;
+    onLayoutSetOpenLink?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
     layoutChangePassword: (...args: any[]) => void;
     layoutOnlineUsers: (...args: any[]) => void;
     layoutSearchMenu: (...args: any[]) => void;
+    layoutSetBrowserTitle: (...args: any[]) => void;
+    layoutSetOpenLink: (...args: any[]) => void;
 }, string, {}, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
     $slots: any;
 });

package/es/components/fm-layout/src/index.vue.d.ts

@@ -10,10 +10,14 @@ declare const __VLS_component: DefineComponent<{}, {}, {}, {}, {}, ComponentOpti
     layoutChangePassword: (...args: any[]) => void;
     layoutOnlineUsers: (...args: any[]) => void;
     layoutSearchMenu: (...args: any[]) => void;
+    layoutSetBrowserTitle: (...args: any[]) => void;
+    layoutSetOpenLink: (...args: any[]) => void;
 }, string, PublicProps, Readonly<{}> & Readonly<{
     onLayoutChangePassword?: ((...args: any[]) => any) | undefined;
     onLayoutOnlineUsers?: ((...args: any[]) => any) | undefined;
     onLayoutSearchMenu?: ((...args: any[]) => any) | undefined;
+    onLayoutSetBrowserTitle?: ((...args: any[]) => any) | undefined;
+    onLayoutSetOpenLink?: ((...args: any[]) => any) | undefined;
 }>, {}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;

package/es/hooks/other.d.ts

@@ -1,9 +1,8 @@
-import { EmptyArrayType, EmptyObjectType, RouteItem, RouteToFrom } from 'fmdeui-fmui/es/types';
+import { EmptyArrayType, EmptyObjectType, RouteToFrom } from 'fmdeui-fmui/es/types';
 /**
  * 设置浏览器标题国际化
  * @method const title = useTitle(); ==> title()
  */
-export declare function useTitle(): void;
 /**
  * 设置 自定义 tagsView 名称、 自定义 tagsView 名称国际化
  * @param params 路由 query、params 中的 tagsViewName
@@ -43,7 +42,6 @@ export declare function handleEmpty(list: EmptyArrayType): EmptyArrayType;
  * 打开外部链接
  * @param val 当前点击项菜单
  */
-export declare function handleOpenLink(val: RouteItem): void;
 /**
  * 统一批量导出
  * @method elSvg 导出全局注册 element plus svg 图标
@@ -57,13 +55,11 @@ export declare function handleOpenLink(val: RouteItem): void;
  * @method handleOpenLink 打开外部链接
  */
 declare const other: {
-    useTitle: () => void;
     setTagsViewNameI18n(route: RouteToFrom): string;
     lazyImg: (el: string, arr: EmptyArrayType) => void;
     globalComponentSize: () => string;
     deepClone: (obj: EmptyObjectType) => EmptyObjectType;
     isMobile: () => boolean;
     handleEmpty: (list: EmptyArrayType) => EmptyArrayType;
-    handleOpenLink: (val: RouteItem) => void;
 };
 export default other;

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

@@ -13,7 +13,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     name: "FLayout"
   },
   __name: "index",
-  emits: ["layoutChangePassword", "layoutOnlineUsers", "layoutSearchMenu"],
+  emits: ["layoutChangePassword", "layoutOnlineUsers", "layoutSearchMenu", "layoutSetBrowserTitle", "layoutSetOpenLink"],
   setup(__props, { emit: __emit }) {
     const layouts = {
       defaults: defineAsyncComponent(() => import('./main/defaults.vue.mjs')),
@@ -33,6 +33,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           curMyEmit("layoutOnlineUsers");
         } else if (data.name == "searchFormMenu") {
           curMyEmit("layoutSearchMenu");
+        } else if (data.name == "setFBrowserTitle") {
+          curMyEmit("layoutSetBrowserTitle");
+        } else if (data.name == "setFOpenLink") {
+          curMyEmit("layoutSetOpenLink", data);
         }
       }
     });

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

@@ -11,7 +11,6 @@ import '../../../../../api/index.mjs';
 import { getCountryCode, languageList } from '../../../../../locale/index.mjs';
 import '../../../../../hooks/index.mjs';
 import emitter from '../../../../../utils/mitt.mjs';
-import other from '../../../../../hooks/other.mjs';
 import Push from 'push.js';
 import { useRoutesList } from '../../../../../stores/routesList.mjs';
 import { useUserInfo } from '../../../../../stores/userInfo.mjs';
@@ -150,7 +149,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       Local.set("themeConfig", themeConfig.value);
       currentCountryCode.value = getCountryCode(lang);
       locale.value = lang;
-      other.useTitle();
+      events.onFormDialogOpen({
+        name: "setFBrowserTitle"
+      });
       initI18nOrSize("globalI18n", "disabledI18n");
       refreshCurrentTabpage();
       if (lang == "en") window.$changeLang("en");

package/es/packages/components/fm-layout/src/navMenu/horizontal.vue2.mjs

@@ -3,9 +3,10 @@ import { useRoute, onBeforeRouteUpdate } from 'vue-router';
 import { storeToRefs } from 'pinia';
 import '../../../../stores/index.mjs';
 import emitter from '../../../../utils/mitt.mjs';
-import other from '../../../../hooks/other.mjs';
+import '../../../../hooks/index.mjs';
 import { useRoutesList } from '../../../../stores/routesList.mjs';
 import { useThemeConfig } from '../../../../stores/themeConfig.mjs';
+import { useFormEvents } from '../../../../hooks/composables/useDialogEvents.mjs';
 
 const _hoisted_1 = { class: "el-menu-horizontal-warp" };
 const _hoisted_2 = ["onClick"];
@@ -65,8 +66,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         else state.defaultActive = path;
       }
     };
+    const events = useFormEvents();
     const onALinkClick = (val) => {
-      other.handleOpenLink(val);
+      events.onFormDialogOpen({
+        name: "setFOpenLink",
+        data: val
+      });
     };
     onBeforeMount(() => {
       setCurrentRouterHighlight(route);

package/es/packages/components/fm-layout/src/navMenu/subItem.vue2.mjs

@@ -1,5 +1,6 @@
 import { defineComponent, computed, resolveComponent, openBlock, createElementBlock, Fragment, renderList, createBlock, withCtx, createVNode, createElementVNode, toDisplayString, withModifiers, createTextVNode } from 'vue';
-import other from '../../../../hooks/other.mjs';
+import '../../../../hooks/index.mjs';
+import { useFormEvents } from '../../../../hooks/composables/useDialogEvents.mjs';
 
 const _hoisted_1 = ["onClick"];
 var _sfc_main = /* @__PURE__ */ defineComponent({
@@ -13,11 +14,15 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
+    const events = useFormEvents();
     const chils = computed(() => {
       return props.chil;
     });
     const onALinkClick = (val) => {
-      other.handleOpenLink(val);
+      events.onFormDialogOpen({
+        name: "setFOpenLink",
+        data: val
+      });
     };
     return (_ctx, _cache) => {
       const _component_SvgIcon = resolveComponent("SvgIcon");

package/es/packages/components/fm-layout/src/navMenu/vertical.vue2.mjs

@@ -2,7 +2,8 @@ import { defineComponent, defineAsyncComponent, reactive, computed, onMounted, w
 import { useRoute, onBeforeRouteUpdate } from 'vue-router';
 import { storeToRefs } from 'pinia';
 import '../../../../stores/index.mjs';
-import other from '../../../../hooks/other.mjs';
+import '../../../../hooks/index.mjs';
+import { useFormEvents } from '../../../../hooks/composables/useDialogEvents.mjs';
 import { useThemeConfig } from '../../../../stores/themeConfig.mjs';
 
 const _hoisted_1 = ["onClick"];
@@ -18,6 +19,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const SubItem = defineAsyncComponent(() => import('./subItem.vue.mjs'));
     const props = __props;
+    const events = useFormEvents();
     const storesThemeConfig = useThemeConfig();
     const { themeConfig } = storeToRefs(storesThemeConfig);
     const route = useRoute();
@@ -39,7 +41,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       else return path;
     };
     const onALinkClick = (val) => {
-      other.handleOpenLink(val);
+      events.onFormDialogOpen({
+        name: "setFOpenLink",
+        data: val
+      });
     };
     onMounted(() => {
       state.defaultActive = setParentHighlight(route);

package/es/packages/hooks/commonFunction.mjs

@@ -4,12 +4,11 @@ import { i18n } from '../locale/index.mjs';
 import '../utils/index.mjs';
 import '../stores/index.mjs';
 import '../api/index.mjs';
-import { useThemeConfig } from '../stores/themeConfig.mjs';
 import { formatDate } from '../utils/formatTime.mjs';
 import { useBaseApi } from '../api/base/index.mjs';
+import { useThemeConfig } from '../stores/themeConfig.mjs';
 
 function commonFunction() {
-  const themeStore = useThemeConfig();
   const { copy, isSupported } = useClipboard();
   const percentFormat = (row, column, cellValue) => {
     return cellValue ? `${cellValue}%` : "-";
@@ -93,6 +92,7 @@ function commonFunction() {
     return fieldValue;
   };
   const getTimeRangePickerShortcuts = () => {
+    const themeStore = useThemeConfig();
     return [
       {
         text: "\u8FD1\u4E00\u5468",

package/es/packages/hooks/other.mjs

@@ -1,27 +1,9 @@
-import { getCurrentInstance, nextTick } from 'vue';
+import { nextTick } from 'vue';
 import pinia from '../stores/inpinia.mjs';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '../stores/themeConfig.mjs';
 import { i18n } from '../locale/index.mjs';
-import { verifyUrl } from '../utils/toolsValidate.mjs';
 
-const { proxy } = getCurrentInstance();
-function useTitle() {
-  const stores = useThemeConfig(pinia);
-  const { themeConfig } = storeToRefs(stores);
-  const router = proxy.$mycurRouter;
-  nextTick(() => {
-    let webTitle = "";
-    let globalTitle = themeConfig.value.globalTitle;
-    const { path, meta } = router.currentRoute.value;
-    if (path === "/login") {
-      webTitle = meta.title;
-    } else {
-      webTitle = setTagsViewNameI18n(router.currentRoute.value);
-    }
-    document.title = `${webTitle} - ${globalTitle}` || globalTitle;
-  });
-}
 function setTagsViewNameI18n(item) {
   let tagsViewName = "";
   const { query, params, meta } = item;
@@ -97,21 +79,13 @@ function handleEmpty(list) {
   }
   return arr;
 }
-function handleOpenLink(val) {
-  var _a, _b, _c;
-  const { origin, pathname } = window.location;
-  const router = proxy.$mycurRouter;
-  router.push(val.path);
-  if (verifyUrl((_a = val.meta) == null ? void 0 : _a.isLink)) window.open((_b = val.meta) == null ? void 0 : _b.isLink);
-  else window.open(`${origin}${pathname}#${(_c = val.meta) == null ? void 0 : _c.isLink}`);
-}
 const other = {
   // elSvg: (app: App) => {
   // 	elSvg(app);
   // },
-  useTitle: () => {
-    useTitle();
-  },
+  // useTitle: () => {
+  // 	useTitle();
+  // },
   setTagsViewNameI18n(route) {
     return setTagsViewNameI18n(route);
   },
@@ -129,10 +103,10 @@ const other = {
   },
   handleEmpty: (list) => {
     return handleEmpty(list);
-  },
-  handleOpenLink: (val) => {
-    handleOpenLink(val);
   }
+  // handleOpenLink: (val: RouteItem) => {
+  // 	handleOpenLink(val);
+  // },
 };
 
-export { deepClone, other as default, globalComponentSize, handleEmpty, handleOpenLink, isMobile, lazyImg, setTagsViewNameI18n, useTitle };
+export { deepClone, other as default, globalComponentSize, handleEmpty, isMobile, lazyImg, setTagsViewNameI18n };

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.38 */
+/*! fmdeui-fmui v1.0.40 */
 (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) :
@@ -22439,7 +22439,7 @@
 	    name: "FLayout"
 	  },
 	  __name: "index",
-	  emits: ["layoutChangePassword", "layoutOnlineUsers", "layoutSearchMenu"],
+	  emits: ["layoutChangePassword", "layoutOnlineUsers", "layoutSearchMenu", "layoutSetBrowserTitle", "layoutSetOpenLink"],
 	  setup(__props, { emit: __emit }) {
 	    const layouts = {
 	      defaults: vue.defineAsyncComponent(() => Promise.resolve().then(function () { return defaults; })),
@@ -22459,6 +22459,10 @@
 	          curMyEmit("layoutOnlineUsers");
 	        } else if (data.name == "searchFormMenu") {
 	          curMyEmit("layoutSearchMenu");
+	        } else if (data.name == "setFBrowserTitle") {
+	          curMyEmit("layoutSetBrowserTitle");
+	        } else if (data.name == "setFOpenLink") {
+	          curMyEmit("layoutSetOpenLink", data);
 	        }
 	      }
 	    });
@@ -22519,7 +22523,6 @@
 	const FLayout = _sfc_main$o;
 
 	function commonFunction() {
-	  const themeStore = useThemeConfig();
 	  const { copy, isSupported } = core.useClipboard();
 	  const percentFormat = (row, column, cellValue) => {
 	    return cellValue ? `${cellValue}%` : "-";
@@ -22603,6 +22606,7 @@
 	    return fieldValue;
 	  };
 	  const getTimeRangePickerShortcuts = () => {
+	    const themeStore = useThemeConfig();
 	    return [
 	      {
 	        text: "\u8FD1\u4E00\u5468",
@@ -22688,23 +22692,6 @@
 	  };
 	}
 
-	const { proxy } = vue.getCurrentInstance();
-	function useTitle() {
-	  const stores = useThemeConfig(pinia);
-	  const { themeConfig } = pinia$1.storeToRefs(stores);
-	  const router = proxy.$mycurRouter;
-	  vue.nextTick(() => {
-	    let webTitle = "";
-	    let globalTitle = themeConfig.value.globalTitle;
-	    const { path, meta } = router.currentRoute.value;
-	    if (path === "/login") {
-	      webTitle = meta.title;
-	    } else {
-	      webTitle = setTagsViewNameI18n(router.currentRoute.value);
-	    }
-	    document.title = `${webTitle} - ${globalTitle}` || globalTitle;
-	  });
-	}
 	function setTagsViewNameI18n(item) {
 	  let tagsViewName = "";
 	  const { query, params, meta } = item;
@@ -22780,21 +22767,13 @@
 	  }
 	  return arr;
 	}
-	function handleOpenLink(val) {
-	  var _a, _b, _c;
-	  const { origin, pathname } = window.location;
-	  const router = proxy.$mycurRouter;
-	  router.push(val.path);
-	  if (verifyUrl((_a = val.meta) == null ? void 0 : _a.isLink)) window.open((_b = val.meta) == null ? void 0 : _b.isLink);
-	  else window.open(`${origin}${pathname}#${(_c = val.meta) == null ? void 0 : _c.isLink}`);
-	}
 	const other = {
 	  // elSvg: (app: App) => {
 	  // 	elSvg(app);
 	  // },
-	  useTitle: () => {
-	    useTitle();
-	  },
+	  // useTitle: () => {
+	  // 	useTitle();
+	  // },
 	  setTagsViewNameI18n(route) {
 	    return setTagsViewNameI18n(route);
 	  },
@@ -22812,10 +22791,10 @@
 	  },
 	  handleEmpty: (list) => {
 	    return handleEmpty(list);
-	  },
-	  handleOpenLink: (val) => {
-	    handleOpenLink(val);
 	  }
+	  // handleOpenLink: (val: RouteItem) => {
+	  // 	handleOpenLink(val);
+	  // },
 	};
 
 	const _hoisted_1$i = { class: "layout-breadcrumb-seting" };
@@ -26381,6 +26360,7 @@
 	  setup(__props) {
 	    const SubItem = vue.defineAsyncComponent(() => Promise.resolve().then(function () { return subItem; }));
 	    const props = __props;
+	    const events = useFormEvents();
 	    const storesThemeConfig = useThemeConfig();
 	    const { themeConfig } = pinia$1.storeToRefs(storesThemeConfig);
 	    const route = vueRouter.useRoute();
@@ -26402,7 +26382,10 @@
 	      else return path;
 	    };
 	    const onALinkClick = (val) => {
-	      other.handleOpenLink(val);
+	      events.onFormDialogOpen({
+	        name: "setFOpenLink",
+	        data: val
+	      });
 	    };
 	    vue.onMounted(() => {
 	      state.defaultActive = setParentHighlight(route);
@@ -26900,11 +26883,15 @@
 	  },
 	  setup(__props) {
 	    const props = __props;
+	    const events = useFormEvents();
 	    const chils = vue.computed(() => {
 	      return props.chil;
 	    });
 	    const onALinkClick = (val) => {
-	      other.handleOpenLink(val);
+	      events.onFormDialogOpen({
+	        name: "setFOpenLink",
+	        data: val
+	      });
 	    };
 	    return (_ctx, _cache) => {
 	      const _component_SvgIcon = vue.resolveComponent("SvgIcon");
@@ -27529,7 +27516,9 @@
 	      Local.set("themeConfig", themeConfig.value);
 	      currentCountryCode.value = getCountryCode(lang);
 	      locale.value = lang;
-	      other.useTitle();
+	      events.onFormDialogOpen({
+	        name: "setFBrowserTitle"
+	      });
 	      initI18nOrSize("globalI18n", "disabledI18n");
 	      refreshCurrentTabpage();
 	      if (lang == "en") window.$changeLang("en");
@@ -28129,8 +28118,12 @@
 	        else state.defaultActive = path;
 	      }
 	    };
+	    const events = useFormEvents();
 	    const onALinkClick = (val) => {
-	      other.handleOpenLink(val);
+	      events.onFormDialogOpen({
+	        name: "setFOpenLink",
+	        data: val
+	      });
 	    };
 	    vue.onBeforeMount(() => {
 	      setCurrentRouterHighlight(route);