inl-ui 0.1.155 → 0.1.158

package/dist/components/index.cjs

@@ -7160,7 +7160,67 @@ const PageContent = vue.defineComponent({
       }
     };
     const activeMenu = useActiveMenu(() => props.menu, props.extraPages, false, false, extraIframeList);
+    let interval = null;
+    vue.onMounted(() => {
+      interval = setInterval(() => {
+        historyArr.forEach(item => {
+          if (item.inUse) {
+            item.sendTime += 1e3;
+            if (item.sendTime >= 60 * 1e3) {
+              sendRecord(item, "update");
+              item.sendTime = 0;
+            }
+          }
+          if (item.leaveTime > 0) {
+            item.leaveTime += 1e3;
+          }
+        });
+        historyArr = historyArr.filter(item => item.leaveTime <= 60 * 1e3);
+      }, 1e3);
+    });
+    let historyArr = [];
+    const sendRecord = async (obj, fun) => {
+      const userInfo = JSON.parse(sessionStorage.getItem("userinfo") || "{}");
+      obj.userId = userInfo.userId;
+      obj.userName = userInfo.userName;
+      obj.menuName = obj.name;
+      obj.type = 1;
+      await axios__default["default"].post(fun === "insert" ? "/api/common/v1/menu-usage/record" : "/api/common/v1/menu-usage/update-duration", obj, {
+        headers: {
+          token: sessionStorage.getItem("token") || ""
+        }
+      });
+    };
     vue.watch(activeMenu, (val, oldVal) => {
+      console.log("activeMenu changed:", val, oldVal);
+      debugger;
+      if (oldVal) {
+        const historyItem = historyArr.find(item => item.id === oldVal.id);
+        if (historyItem) {
+          historyItem.inUse = false;
+          historyItem.sendTime = 0;
+          historyItem.leaveTime = 1e3;
+        }
+      }
+      if (val) {
+        const historyItem = historyArr.find(item => item.id === val.id);
+        if (historyItem) {
+          historyItem.leaveTime = 0;
+          historyItem.sendTime = 0;
+          historyItem.inUse = true;
+          sendRecord({
+            ...val,
+            uuid: historyItem.uuid
+          }, "update");
+        } else {
+          val.leaveTime = 0;
+          val.sendTime = 0;
+          val.inUse = true;
+          val.uuid = crypto.randomUUID();
+          historyArr.push(val);
+          sendRecord(val, "insert");
+        }
+      }
       handleMenuChange(val);
       function postIframeActive(id, active) {
         const iframeEl = document.querySelector(`#iframe${id}`);
@@ -7252,6 +7312,7 @@ const PageContent = vue.defineComponent({
       tabListRef.value?.closeTab(tab);
     };
     vue.onBeforeUnmount(() => {
+      clearInterval(interval);
       for (const app of loadAppList.value) {
         app.app.unmount();
       }
@@ -7481,7 +7542,6 @@ const Layout = vue.defineComponent({
     const currMenu = vue.ref();
     const handleMenuSelect = menu => {
       currMenu.value = menu;
-      console.log("currMenu.value", currMenu.value);
       vue.nextTick(() => currMenu.value = void 0);
     };
     vue.onBeforeUnmount(() => {

package/dist/components/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, createVNode, ref, watch, resolveComponent, isVNode, computed, onBeforeUnmount, inject, onActivated, onDeactivated, nextTick, watchEffect, Fragment, withDirectives, vShow, toRaw, reactive, provide, createTextVNode, onMounted, KeepAlive, toRefs, shallowRef, onBeforeMount, mergeProps, onBeforeUpdate, Teleport } from 'vue';
+import { defineComponent, createVNode, ref, watch, resolveComponent, isVNode, computed, onBeforeUnmount, inject, onActivated, onDeactivated, nextTick, watchEffect, Fragment, onMounted, withDirectives, vShow, toRaw, reactive, provide, createTextVNode, KeepAlive, toRefs, shallowRef, onBeforeMount, mergeProps, onBeforeUpdate, Teleport } from 'vue';
 import { createFromIconfontCN, SearchOutlined, DownOutlined, PoweroffOutlined, MenuUnfoldOutlined, MenuFoldOutlined, SkinFilled, FullscreenOutlined, PauseCircleOutlined, PlayCircleFilled, FullscreenExitOutlined, CaretUpOutlined, CaretRightOutlined, CaretDownOutlined, FileExcelTwoTone, InboxOutlined, MessageOutlined } from '@ant-design/icons-vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useMounted, resolveRef, useThrottleFn, useLocalStorage, useFullscreen, useMouseInElement, useVModel, useMagicKeys, whenever, watchArray, useEventListener, useSessionStorage, useElementBounding, useToggle, useMemory, useWindowSize, useClipboard, useBreakpoints, breakpointsAntDesign } from '@vueuse/core';
@@ -7131,7 +7131,67 @@ const PageContent = defineComponent({
       }
     };
     const activeMenu = useActiveMenu(() => props.menu, props.extraPages, false, false, extraIframeList);
+    let interval = null;
+    onMounted(() => {
+      interval = setInterval(() => {
+        historyArr.forEach(item => {
+          if (item.inUse) {
+            item.sendTime += 1e3;
+            if (item.sendTime >= 60 * 1e3) {
+              sendRecord(item, "update");
+              item.sendTime = 0;
+            }
+          }
+          if (item.leaveTime > 0) {
+            item.leaveTime += 1e3;
+          }
+        });
+        historyArr = historyArr.filter(item => item.leaveTime <= 60 * 1e3);
+      }, 1e3);
+    });
+    let historyArr = [];
+    const sendRecord = async (obj, fun) => {
+      const userInfo = JSON.parse(sessionStorage.getItem("userinfo") || "{}");
+      obj.userId = userInfo.userId;
+      obj.userName = userInfo.userName;
+      obj.menuName = obj.name;
+      obj.type = 1;
+      await axios$3.post(fun === "insert" ? "/api/common/v1/menu-usage/record" : "/api/common/v1/menu-usage/update-duration", obj, {
+        headers: {
+          token: sessionStorage.getItem("token") || ""
+        }
+      });
+    };
     watch(activeMenu, (val, oldVal) => {
+      console.log("activeMenu changed:", val, oldVal);
+      debugger;
+      if (oldVal) {
+        const historyItem = historyArr.find(item => item.id === oldVal.id);
+        if (historyItem) {
+          historyItem.inUse = false;
+          historyItem.sendTime = 0;
+          historyItem.leaveTime = 1e3;
+        }
+      }
+      if (val) {
+        const historyItem = historyArr.find(item => item.id === val.id);
+        if (historyItem) {
+          historyItem.leaveTime = 0;
+          historyItem.sendTime = 0;
+          historyItem.inUse = true;
+          sendRecord({
+            ...val,
+            uuid: historyItem.uuid
+          }, "update");
+        } else {
+          val.leaveTime = 0;
+          val.sendTime = 0;
+          val.inUse = true;
+          val.uuid = crypto.randomUUID();
+          historyArr.push(val);
+          sendRecord(val, "insert");
+        }
+      }
       handleMenuChange(val);
       function postIframeActive(id, active) {
         const iframeEl = document.querySelector(`#iframe${id}`);
@@ -7223,6 +7283,7 @@ const PageContent = defineComponent({
       tabListRef.value?.closeTab(tab);
     };
     onBeforeUnmount(() => {
+      clearInterval(interval);
       for (const app of loadAppList.value) {
         app.app.unmount();
       }
@@ -7452,7 +7513,6 @@ const Layout = defineComponent({
     const currMenu = ref();
     const handleMenuSelect = menu => {
       currMenu.value = menu;
-      console.log("currMenu.value", currMenu.value);
       nextTick(() => currMenu.value = void 0);
     };
     onBeforeUnmount(() => {

package/dist/index.cjs

@@ -45,7 +45,7 @@ var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 var mqtt__default = /*#__PURE__*/_interopDefaultLegacy(mqtt);
 
-var version = "0.1.154";
+var version = "0.1.157";
 
 const setTheme = theme => {
   if (theme === "dark") {
@@ -8315,7 +8315,67 @@ const PageContent = vue.defineComponent({
       }
     };
     const activeMenu = useActiveMenu(() => props.menu, props.extraPages, false, false, extraIframeList);
+    let interval = null;
+    vue.onMounted(() => {
+      interval = setInterval(() => {
+        historyArr.forEach(item => {
+          if (item.inUse) {
+            item.sendTime += 1e3;
+            if (item.sendTime >= 60 * 1e3) {
+              sendRecord(item, "update");
+              item.sendTime = 0;
+            }
+          }
+          if (item.leaveTime > 0) {
+            item.leaveTime += 1e3;
+          }
+        });
+        historyArr = historyArr.filter(item => item.leaveTime <= 60 * 1e3);
+      }, 1e3);
+    });
+    let historyArr = [];
+    const sendRecord = async (obj, fun) => {
+      const userInfo = JSON.parse(sessionStorage.getItem("userinfo") || "{}");
+      obj.userId = userInfo.userId;
+      obj.userName = userInfo.userName;
+      obj.menuName = obj.name;
+      obj.type = 1;
+      await axios__default["default"].post(fun === "insert" ? "/api/common/v1/menu-usage/record" : "/api/common/v1/menu-usage/update-duration", obj, {
+        headers: {
+          token: sessionStorage.getItem("token") || ""
+        }
+      });
+    };
     vue.watch(activeMenu, (val, oldVal) => {
+      console.log("activeMenu changed:", val, oldVal);
+      debugger;
+      if (oldVal) {
+        const historyItem = historyArr.find(item => item.id === oldVal.id);
+        if (historyItem) {
+          historyItem.inUse = false;
+          historyItem.sendTime = 0;
+          historyItem.leaveTime = 1e3;
+        }
+      }
+      if (val) {
+        const historyItem = historyArr.find(item => item.id === val.id);
+        if (historyItem) {
+          historyItem.leaveTime = 0;
+          historyItem.sendTime = 0;
+          historyItem.inUse = true;
+          sendRecord({
+            ...val,
+            uuid: historyItem.uuid
+          }, "update");
+        } else {
+          val.leaveTime = 0;
+          val.sendTime = 0;
+          val.inUse = true;
+          val.uuid = crypto.randomUUID();
+          historyArr.push(val);
+          sendRecord(val, "insert");
+        }
+      }
       handleMenuChange(val);
       function postIframeActive(id, active) {
         const iframeEl = document.querySelector(`#iframe${id}`);
@@ -8407,6 +8467,7 @@ const PageContent = vue.defineComponent({
       tabListRef.value?.closeTab(tab);
     };
     vue.onBeforeUnmount(() => {
+      clearInterval(interval);
       for (const app of loadAppList.value) {
         app.app.unmount();
       }
@@ -8636,7 +8697,6 @@ const Layout = vue.defineComponent({
     const currMenu = vue.ref();
     const handleMenuSelect = menu => {
       currMenu.value = menu;
-      console.log("currMenu.value", currMenu.value);
       vue.nextTick(() => currMenu.value = void 0);
     };
     vue.onBeforeUnmount(() => {

package/dist/index.d.ts

@@ -11,7 +11,7 @@ import { Key } from 'ant-design-vue/lib/table/interface';
 import * as vue_jsx_runtime from 'vue/jsx-runtime';
 import * as _ant_design_icons_vue_lib_components_IconFont from '@ant-design/icons-vue/lib/components/IconFont';
 
-var version = "0.1.154";
+var version = "0.1.157";
 
 declare const _default$p: {
     set(theme: string): void;

package/dist/index.js

@@ -1,6 +1,6 @@
 import qiankun from 'vite-plugin-qiankun';
 import renderWithQiankun, { qiankunWindow } from 'vite-plugin-qiankun/dist/helper';
-import { defineComponent, createVNode, createApp, ref, watch, reactive, computed, onBeforeUnmount, inject, watchEffect, onActivated, onDeactivated, resolveComponent, isVNode, nextTick, Fragment, withDirectives, vShow, toRaw, provide, createTextVNode, onMounted, KeepAlive, toRefs, shallowRef, onBeforeMount, mergeProps, onBeforeUpdate, Teleport } from 'vue';
+import { defineComponent, createVNode, createApp, ref, watch, reactive, computed, onBeforeUnmount, inject, watchEffect, onActivated, onDeactivated, resolveComponent, isVNode, nextTick, Fragment, onMounted, withDirectives, vShow, toRaw, provide, createTextVNode, KeepAlive, toRefs, shallowRef, onBeforeMount, mergeProps, onBeforeUpdate, Teleport } from 'vue';
 import axios$3 from 'axios';
 import { message, Menu, MenuItem, Input as Input$1, Badge, Avatar as Avatar$1, MenuDivider, Modal, SubMenu, Dropdown, Tooltip, Select, LayoutHeader, LayoutSider, Layout as Layout$1, LayoutContent, Form, Row, Col, FormItem, SelectOption, Switch, InputNumber } from 'ant-design-vue';
 import _, { isPlainObject as isPlainObject$2, omit, cloneDeep, differenceBy, isObject as isObject$3, concat } from 'lodash';
@@ -14,7 +14,7 @@ import { XPopup, CommentBlock, setAxiosOption } from '@sszj-temp/mobile';
 import { marked } from 'marked';
 import '@sszj-temp/mobile/style.css';
 
-var version = "0.1.154";
+var version = "0.1.157";
 
 const setTheme = theme => {
   if (theme === "dark") {
@@ -8284,7 +8284,67 @@ const PageContent = defineComponent({
       }
     };
     const activeMenu = useActiveMenu(() => props.menu, props.extraPages, false, false, extraIframeList);
+    let interval = null;
+    onMounted(() => {
+      interval = setInterval(() => {
+        historyArr.forEach(item => {
+          if (item.inUse) {
+            item.sendTime += 1e3;
+            if (item.sendTime >= 60 * 1e3) {
+              sendRecord(item, "update");
+              item.sendTime = 0;
+            }
+          }
+          if (item.leaveTime > 0) {
+            item.leaveTime += 1e3;
+          }
+        });
+        historyArr = historyArr.filter(item => item.leaveTime <= 60 * 1e3);
+      }, 1e3);
+    });
+    let historyArr = [];
+    const sendRecord = async (obj, fun) => {
+      const userInfo = JSON.parse(sessionStorage.getItem("userinfo") || "{}");
+      obj.userId = userInfo.userId;
+      obj.userName = userInfo.userName;
+      obj.menuName = obj.name;
+      obj.type = 1;
+      await axios$3.post(fun === "insert" ? "/api/common/v1/menu-usage/record" : "/api/common/v1/menu-usage/update-duration", obj, {
+        headers: {
+          token: sessionStorage.getItem("token") || ""
+        }
+      });
+    };
     watch(activeMenu, (val, oldVal) => {
+      console.log("activeMenu changed:", val, oldVal);
+      debugger;
+      if (oldVal) {
+        const historyItem = historyArr.find(item => item.id === oldVal.id);
+        if (historyItem) {
+          historyItem.inUse = false;
+          historyItem.sendTime = 0;
+          historyItem.leaveTime = 1e3;
+        }
+      }
+      if (val) {
+        const historyItem = historyArr.find(item => item.id === val.id);
+        if (historyItem) {
+          historyItem.leaveTime = 0;
+          historyItem.sendTime = 0;
+          historyItem.inUse = true;
+          sendRecord({
+            ...val,
+            uuid: historyItem.uuid
+          }, "update");
+        } else {
+          val.leaveTime = 0;
+          val.sendTime = 0;
+          val.inUse = true;
+          val.uuid = crypto.randomUUID();
+          historyArr.push(val);
+          sendRecord(val, "insert");
+        }
+      }
       handleMenuChange(val);
       function postIframeActive(id, active) {
         const iframeEl = document.querySelector(`#iframe${id}`);
@@ -8376,6 +8436,7 @@ const PageContent = defineComponent({
       tabListRef.value?.closeTab(tab);
     };
     onBeforeUnmount(() => {
+      clearInterval(interval);
       for (const app of loadAppList.value) {
         app.app.unmount();
       }
@@ -8605,7 +8666,6 @@ const Layout = defineComponent({
     const currMenu = ref();
     const handleMenuSelect = menu => {
       currMenu.value = menu;
-      console.log("currMenu.value", currMenu.value);
       nextTick(() => currMenu.value = void 0);
     };
     onBeforeUnmount(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "inl-ui",
-  "version": "0.1.155",
+  "version": "0.1.158",
   "description": "工业 pc ui库",
   "main": "dist/index.cjs",
   "module": "dist/index.js",