From 10d4c82e729694bd49a29f589d607690dc4b71f8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 26 五月 2025 16:42:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main.js | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/main.js b/src/main.js
index 664a465..12c1e3a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,7 +3,9 @@
import Cookies from 'js-cookie'
import ElementPlus from 'element-plus'
-import locale from 'element-plus/lib/locale/lang/zh-cn' // 涓枃璇█
+import 'element-plus/dist/index.css'
+import 'element-plus/theme-chalk/dark/css-vars.css'
+import locale from 'element-plus/es/locale/lang/zh-cn'
import '@/assets/styles/index.scss' // global css
@@ -11,7 +13,6 @@
import store from './store'
import router from './router'
import directive from './directive' // directive
-
// 娉ㄥ唽鎸囦护
import plugins from './plugins' // plugins
@@ -25,22 +26,27 @@
import './permission' // permission control
import { useDict } from '@/utils/dict'
-import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel } from '@/utils/ruoyi'
+import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi'
// 鍒嗛〉缁勪欢
import Pagination from '@/components/Pagination'
// 鑷畾涔夎〃鏍煎伐鍏风粍浠�
import RightToolbar from '@/components/RightToolbar'
+// 瀵屾枃鏈粍浠�
+import Editor from "@/components/Editor"
// 鏂囦欢涓婁紶缁勪欢
import FileUpload from "@/components/FileUpload"
// 鍥剧墖涓婁紶缁勪欢
import ImageUpload from "@/components/ImageUpload"
// 鍥剧墖棰勮缁勪欢
import ImagePreview from "@/components/ImagePreview"
-// 鑷畾涔夋爲閫夋嫨缁勪欢
-import TreeSelect from '@/components/TreeSelect'
// 瀛楀吀鏍囩缁勪欢
import DictTag from '@/components/DictTag'
+// 琛ㄦ牸缁勪欢
+import PIMTable from "@/components/PIMTable/PIMTable.vue";
+
+import { getToken } from "@/utils/auth";
+import {calculateTaxExclusiveTotalPrice, summarizeTable} from "@/utils/summarizeTable.js";
const app = createApp(App)
@@ -49,18 +55,29 @@
app.config.globalProperties.download = download
app.config.globalProperties.parseTime = parseTime
app.config.globalProperties.resetForm = resetForm
+app.config.globalProperties.summarizeTable = summarizeTable
+app.config.globalProperties.calculateTaxExclusiveTotalPrice = calculateTaxExclusiveTotalPrice
app.config.globalProperties.handleTree = handleTree
app.config.globalProperties.addDateRange = addDateRange
app.config.globalProperties.selectDictLabel = selectDictLabel
+app.config.globalProperties.selectDictLabels = selectDictLabels
+app.config.globalProperties.javaApi = 'http://114.132.189.42:7003'
+app.config.globalProperties.HaveJson = (val) => {
+ return JSON.parse(JSON.stringify(val));
+};
+app.config.globalProperties.uploadHeader = {
+ Authorization: "Bearer " + getToken(),
+};
// 鍏ㄥ眬缁勪欢鎸傝浇
app.component('DictTag', DictTag)
app.component('Pagination', Pagination)
-app.component('TreeSelect', TreeSelect)
app.component('FileUpload', FileUpload)
app.component('ImageUpload', ImageUpload)
app.component('ImagePreview', ImagePreview)
app.component('RightToolbar', RightToolbar)
+app.component('Editor', Editor)
+app.component('PIMTable', PIMTable)
app.use(router)
app.use(store)
@@ -73,7 +90,9 @@
// 浣跨敤element-plus 骞朵笖璁剧疆鍏ㄥ眬鐨勫ぇ灏�
app.use(ElementPlus, {
locale: locale,
- size: Cookies.get('size') || 'medium'
+ // 鏀寔 large銆乨efault銆乻mall
+ size: Cookies.get('size') || 'default'
})
+app._context.components.ElDialog.props.closeOnClickModal.default = false
app.mount('#app')
--
Gitblit v1.9.3