Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

8 天以前 10d4c82e729694bd49a29f589d607690dc4b71f8

 src/main.js

@@ -4,6 +4,7 @@


import ElementPlus from 'element-plus'

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

@@ -39,10 +40,13 @@
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)



@@ -51,20 +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)

@@ -80,5 +93,6 @@
  // 支持 large、default、small

  size: Cookies.get('size') || 'default'

})

app._context.components.ElDialog.props.closeOnClickModal.default = false



app.mount('#app')