连续登录失败，导致失败提醒累加

package.json

@@ -23,25 +23,21 @@
   "dependencies": {
     "@jeecg/online": "3.6.2-beta",
     "@iconify/iconify": "^3.1.1",
-    "@ant-design/colors": "^7.0.0",
+    "@ant-design/colors": "^7.0.2",
     "@ant-design/icons-vue": "^7.0.1",
-    "@logicflow/core": "^1.2.12",
-    "@logicflow/extension": "^1.2.13",
-    "@vue/runtime-core": "^3.3.4",
     "@vue/shared": "^3.3.4",
-    "@vueuse/shared": "^10.4.1",
-    "@vueuse/core": "^10.4.1",
+    "@vueuse/core": "^10.7.1",
     "@tinymce/tinymce-vue": "^4.0.7",
-    "@zxcvbn-ts/core": "^3.0.3",
-    "ant-design-vue": "^4.0.8",
-    "axios": "^1.5.0",
+    "@zxcvbn-ts/core": "^3.0.4",
+    "ant-design-vue": "^4.1.2",
+    "axios": "^1.6.4",
     "china-area-data": "^5.0.1",
     "clipboard": "^2.0.11",
     "codemirror": "^5.65.3",
     "cron-parser": "^4.9.0",
-    "cropperjs": "^1.5.13",
-    "crypto-js": "^4.1.1",
-    "dayjs": "^1.11.9",
+    "cropperjs": "^1.6.1",
+    "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.10",
     "dom-align": "^1.12.4",
     "echarts": "^5.4.3",
     "emoji-mart-vue-fast": "^15.0.0",
@@ -53,109 +49,107 @@
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
     "path-to-regexp": "^6.2.1",
-    "pinia": "2.1.6",
+    "pinia": "2.1.7",
     "print-js": "^1.6.0",
     "qs": "^6.11.2",
     "qrcode": "^1.5.3",
-    "qrcodejs2": "0.0.2",
     "resize-observer-polyfill": "^1.5.1",
     "showdown": "^2.1.0",
-    "sortablejs": "^1.15.0",
+    "sortablejs": "^1.15.1",
     "tinymce": "^6.6.2",
-    "vditor": "^3.9.5",
-    "vue": "3.3.11",
-    "vue-cropper": "^0.6.2",
+    "vditor": "^3.9.8",
+    "vue": "^3.4.15",
+    "vue-cropper": "^0.6.4",
     "vue-cropperjs": "^5.0.0",
-    "vue-i18n": "9.2.2",
+    "vue-i18n": "^9.8.0",
     "vue-infinite-scroll": "^2.0.2",
     "vue-print-nb-jeecg": "^1.0.12",
-    "vue-router": "^4.2.4",
+    "vue-router": "^4.2.5",
     "vue-types": "^5.1.1",
     "vuedraggable": "^4.1.0",
-    "vxe-table": "4.5.12",
+    "vxe-table": "4.5.17",
     "vxe-table-plugin-antd": "3.1.0",
-    "xe-utils": "3.5.13",
-    "vue-json-pretty": "^2.2.4",
+    "xe-utils": "3.5.14",
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.7.1",
-    "@commitlint/config-conventional": "^17.7.0",
-    "@iconify/json": "^2.2.107",
-    "@purge-icons/generated": "^0.9.0",
-    "@types/codemirror": "^5.60.9",
-    "@types/crypto-js": "^4.1.1",
-    "@types/fs-extra": "^11.0.1",
-    "@types/inquirer": "^9.0.3",
-    "@types/intro.js": "^5.1.1",
-    "@types/jest": "^29.5.4",
-    "@types/lodash-es": "^4.17.8",
-    "@types/mockjs": "^1.0.7",
-    "@types/node": "^20.5.6",
-    "@types/nprogress": "^0.2.0",
-    "@types/qrcode": "^1.5.1",
-    "@types/qs": "^6.9.7",
-    "@types/showdown": "^2.0.1",
-    "@types/sortablejs": "^1.15.1",
-    "@typescript-eslint/eslint-plugin": "^6.4.1",
-    "@typescript-eslint/parser": "^6.5.0",
+    "@commitlint/cli": "^18.4.3",
+    "@commitlint/config-conventional": "^18.4.3",
+    "@iconify/json": "^2.2.164",
+    "@purge-icons/generated": "^0.10.0",
+    "@types/codemirror": "^5.60.15",
+    "@types/crypto-js": "^4.2.1",
+    "@types/fs-extra": "^11.0.4",
+    "@types/inquirer": "^9.0.7",
+    "@types/intro.js": "^5.1.5",
+    "@types/jest": "^29.5.11",
+    "@types/lodash-es": "^4.17.12",
+    "@types/mockjs": "^1.0.10",
+    "@types/node": "^20.10.6",
+    "@types/nprogress": "^0.2.3",
+    "@types/qrcode": "^1.5.5",
+    "@types/qs": "^6.9.11",
+    "@types/showdown": "^2.0.6",
+    "@types/sortablejs": "^1.15.7",
+    "@typescript-eslint/eslint-plugin": "^6.17.0",
+    "@typescript-eslint/parser": "^6.17.0",
     "@vitejs/plugin-vue": "^4.3.3",
-    "@vitejs/plugin-vue-jsx": "^3.0.2",
-    "@vue/compiler-sfc": "^3.3.4",
-    "@vue/test-utils": "^2.4.1",
-    "autoprefixer": "^10.4.15",
+    "@vitejs/plugin-vue-jsx": "^3.1.0",
+    "@vue/compiler-sfc": "^3.4.4",
+    "@vue/test-utils": "^2.4.3",
+    "autoprefixer": "^10.4.16",
     "commitizen": "^4.3.0",
-    "conventional-changelog-cli": "^3.0.0",
+    "conventional-changelog-cli": "^4.1.0",
     "cross-env": "^7.0.3",
-    "cz-git": "^1.7.1",
-    "czg": "^1.7.1",
+    "cz-git": "^1.8.0",
+    "czg": "^1.8.0",
     "dotenv": "^16.3.1",
-    "eslint": "^8.47.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-define-config": "^1.23.0",
-    "eslint-plugin-jest": "^27.2.3",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-vue": "^9.17.0",
-    "esno": "^0.17.0",
-    "fs-extra": "^11.1.1",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-define-config": "^2.1.0",
+    "eslint-plugin-jest": "^27.6.1",
+    "eslint-plugin-prettier": "^5.1.2",
+    "eslint-plugin-vue": "^9.19.2",
+    "esno": "^4.0.0",
+    "fs-extra": "^11.2.0",
     "http-server": "^14.1.1",
     "husky": "^8.0.3",
-    "inquirer": "^9.2.10",
+    "inquirer": "^9.2.12",
     "is-ci": "^3.0.1",
-    "jest": "^29.6.4",
+    "jest": "^29.7.0",
     "less": "^4.2.0",
-    "lint-staged": "14.0.1",
+    "lint-staged": "15.2.0",
     "npm-run-all": "^4.1.5",
     "picocolors": "^1.0.0",
-    "postcss": "^8.4.28",
+    "postcss": "^8.4.32",
     "postcss-html": "^1.5.0",
     "postcss-less": "^6.0.0",
-    "prettier": "^3.0.2",
+    "prettier": "^3.1.1",
     "pretty-quick": "^3.1.3",
-    "rimraf": "^5.0.1",
-    "rollup": "^3.28.1",
-    "rollup-plugin-visualizer": "^5.9.2",
-    "stylelint": "^15.10.3",
+    "rimraf": "^5.0.5",
+    "rollup": "^4.9.2",
+    "rollup-plugin-visualizer": "^5.12.0",
+    "stylelint": "^16.1.0",
     "stylelint-config-prettier": "^9.0.5",
-    "stylelint-config-recommended": "^13.0.0",
+    "stylelint-config-recommended": "^14.0.0",
     "stylelint-config-recommended-vue": "^1.5.0",
-    "stylelint-config-standard": "^34.0.0",
-    "stylelint-order": "^6.0.3",
+    "stylelint-config-standard": "^36.0.0",
+    "stylelint-order": "^6.0.4",
     "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
     "typescript": "^4.9.5",
     "vite": "^4.4.9",
     "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-html": "^3.2.0",
-    "vite-plugin-mkcert": "^1.16.0",
+    "vite-plugin-html": "^3.2.1",
+    "vite-plugin-mkcert": "^1.17.1",
     "vite-plugin-mock": "^2.9.6",
-    "vite-plugin-purge-icons": "^0.9.2",
+    "vite-plugin-purge-icons": "^0.10.0",
     "vite-plugin-svg-icons": "^2.0.1",
     "@rys-fe/vite-plugin-theme": "^0.8.6",
     "vite-plugin-vue-setup-extend-plus": "^0.1.0",
-    "unocss": "^0.55.3",
-    "vue-eslint-parser": "^9.3.1",
-    "vue-tsc": "^1.8.8"
+    "unocss": "^0.58.3",
+    "vue-eslint-parser": "^9.3.2",
+    "vue-tsc": "^1.8.27"
   },
   "repository": {
     "type": "git",

src/components/CodeEditor/index.ts

@@ -1,6 +1,4 @@
 import { withInstall } from '/@/utils';
 import codeEditor from './src/CodeEditor.vue';
-import jsonPreview from './src/json-preview/JsonPreview.vue';
 
 export const CodeEditor = withInstall(codeEditor);
-export const JsonPreview = withInstall(jsonPreview);

src/components/CodeEditor/src/json-preview/JsonPreview.vue

@@ -1,12 +0,0 @@
-<template>
-  <vue-json-pretty :path="'res'" :deep="3" :showLength="true" :data="data" />
-</template>
-
-<script lang="ts" setup>
-  import VueJsonPretty from 'vue-json-pretty';
-  import 'vue-json-pretty/lib/styles.css';
-
-  defineProps({
-    data: Object,
-  });
-</script>

src/components/Cropper/src/Cropper.vue

@@ -9,7 +9,7 @@
   import Cropper from 'cropperjs';
   import 'cropperjs/dist/cropper.css';
   import { useDesign } from '/@/hooks/web/useDesign';
-  import { useDebounceFn } from '@vueuse/shared';
+  import { useDebounceFn } from '@vueuse/core';
 
   type Options = Cropper.Options;
 

src/components/Table/src/components/settings/ColumnSetting.vue

@@ -508,8 +508,11 @@
       }
 
       .ant-checkbox-group {
-        width: 100%;
+        // update-begin--author:liaozhiyang---date:20240118---for：【QQYUN-7887】表格列设置宽度过长
+        // width: 100%;
         min-width: 260px;
+        max-width: min-content;
+        // update-end--author:liaozhiyang---date:20240118---for：【QQYUN-7887】表格列设置宽度过长
         // flex-wrap: wrap;
       }
 

src/hooks/system/useThirdLogin.ts

@@ -68,6 +68,9 @@ export function useThirdLogin() {
       } else {
         createMessage.warning('不识别的信息传递');
       }
+      //update-begin---author:wangshuai---date:2024-02-20---for:【QQYUN-8156】连续登录失败，导致失败提醒累加---
+      window.removeEventListener('message', unref(receiveMessage),false);
+      //update-end---author:wangshuai---date:2024-02-20---for:【QQYUN-8156】连续登录失败，导致失败提醒累加---
     };
     window.addEventListener('message', receiveMessage, false);
   }

src/layouts/default/header/components/user-dropdown/DepartSelect.vue

@@ -1,5 +1,5 @@
 <template>
-  <BasicModal v-bind="config" :title="currTitle" v-model:visible="visible" wrapClassName="loginSelectModal">
+  <BasicModal v-bind="config" :maxHeight="500" :title="currTitle" v-model:visible="visible" wrapClassName="loginSelectModal">
     <a-form ref="formRef" v-bind="layout" :colon="false" class="loginSelectForm">
       <a-form-item v-if="isMultiTenant" :validate-status="validate_status">
         <!--label内容-->

src/layouts/default/tabs/tabs.theme.smooth.less

@@ -122,7 +122,7 @@ html[data-theme='light'] {
         }
       }
 
-      .ant-tabs-tab-active {
+      .ant-tabs-tab.ant-tabs-tab-active {
         position: relative;
         padding: 0 30px 0 36px;
         color: @primary-color !important;

src/utils/common/compUtils.ts

@@ -143,7 +143,12 @@ export function mapTableTotalSummary(tableData: Recordable[], fieldKeys: string[
   let totals: any = { _row: '合计', _index: '合计' };
   fieldKeys.forEach((key) => {
     totals[key] = tableData.reduce((prev, next) => {
-      prev += next[key];
+      // update-begin--author:liaozhiyang---date:20240118---for：【QQYUN-7891】PR 合计工具方法，转换为Nuber类型再计算
+      const value = Number(next[key]);
+      if (!Number.isNaN(value)) {
+        prev += value;
+      }
+      // update-end--author:liaozhiyang---date:20240118---for：【QQYUN-7891】PR 合计工具方法，转换为Nuber类型再计算
       return prev;
     }, 0);
   });
@@ -516,4 +521,4 @@ export function tenantSaasMessage(title){
       cancelButtonProps: { style: { display: 'none' } },
     })
   }
-}
+}

src/utils/props.ts

@@ -3,7 +3,7 @@
 import { warn } from 'vue';
 import { isObject } from '@vue/shared';
 import { fromPairs } from 'lodash-es';
-import type { ExtractPropTypes, PropType } from '@vue/runtime-core';
+import type { ExtractPropTypes, PropType } from 'vue';
 import type { Mutable } from './types';
 
 const wrapperKey = Symbol();

src/views/demo/document/form/BasicFormAdd.vue

@@ -17,7 +17,7 @@
   //引入依赖
   import { useForm, BasicForm, FormSchema } from '/@/components/Form';
   import { CollapseContainer } from '/@/components/Container';
-  import { ref } from '@vue/runtime-core';
+  import { ref } from 'vue';
 
   //自定义表单字段
   const formSchemas: FormSchema[] = [