Merge branch 'master' into 测试

src/main.js

@@ -29,7 +29,7 @@ import { useDict } from "/src/utils/dict";
 import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, selectDictLabels } from "/src/utils/ruoyi";
 import { createPinia } from "pinia"; //引入pinia
 import piniaPluginPersist from "pinia-plugin-persist"; //引入pinia数据持久化插件
-import VueLazyLoad from 'vue-lazyload'
+import VueLazyLoad from "vue-lazyload";
 
 // 按钮防抖
 import preReClick from "./directive/preReClick.js";
@@ -51,7 +51,7 @@ import {
   downloadFile,
   NumberToChinese,
 } from "/src/utils/util";
-import '@/utils/table2excel'
+import "@/utils/table2excel";
 
 // 分页组件
 import Pagination from "/src/components/Pagination";
@@ -114,10 +114,10 @@ app.use(createPinia().use(piniaPluginPersist)); //安装插件
 
 app.use(VueLazyLoad, {
   preLoad: 1.3,
-  error: './assets/images/empty.png',
+  error: "./assets/images/empty.png",
   attempt: 1,
-  listenEvents: ['scroll'],
-})
+  listenEvents: ["scroll"],
+});
 
 directive(app);
 
@@ -127,5 +127,6 @@ app.use(ElementPlus, {
   // 支持 large、default、small
   size: Cookies.get("size") || "default",
 });
+app._context.components.ElDialog.props.closeOnClickModal.default = false;
 app.use(preReClick);
 app.mount("#app");