From 81baaa36ffadbcdb76eba7fce76dbb81a9603048 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 27 Mar 2025 13:37:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main.js | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main.js b/src/main.js
index 28da644..7285c76 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,6 +26,7 @@
import codeEditor from './components/code-editor/main.vue';
import basicBlock from './components/basic-block/main.vue';
import basicContainer from './components/basic-container/main.vue';
+import SvgIcon from './components/SvgIcon.vue';
import thirdRegister from './components/third-register/main.vue';
import flowDesign from './components/flow-design/main.vue';
import flowDesignStep from './components/flow-design-step/main.vue';
@@ -34,7 +35,9 @@
// import formSetting from './views/tool/formsetting.vue';
// import tenantPackage from './views/system/tenantpackage.vue';
// import tenantDatasource from './views/system/tenantdatasource.vue';
-
+import './utils/rem'
+import { hToV, wToR } from '@/utils/pxConver';
+import 'virtual:svg-icons-register'
window.$crudCommon = crudCommon;
debug();
window.axios = axios;
@@ -49,6 +52,7 @@
app.component('thirdRegister', thirdRegister);
app.component('flowDesign', flowDesign);
app.component('flowDesignStep', flowDesignStep);
+app.component('SvgIcon', SvgIcon);
// app.component('codeSetting', codeSetting);
// app.component('formSetting', formSetting);
// app.component('tenantPackage', tenantPackage);
@@ -57,6 +61,9 @@
app.config.globalProperties.$dayjs = dayjs;
app.config.globalProperties.website = website;
app.config.globalProperties.getScreen = getScreen;
+app.config.globalProperties.wToR = wToR;
+app.config.globalProperties.hToV = hToV;
+
app.use(error);
app.use(i18n);
app.use(store);
--
Gitblit v1.9.3