From 70fb56a9fb61f70ccc55fcbc085b470e9423858a Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 05 六月 2023 16:16:35 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS-WEB/src/main.js | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js
index 054fbb3..5ceed92 100644
--- a/Source/UBCS-WEB/src/main.js
+++ b/Source/UBCS-WEB/src/main.js
@@ -39,9 +39,17 @@
import formulaEditor from "@/components/code-dialog-page/formulaEditor"
import referConfigCrudDialog from "@/components/code-dialog-page/referConfigCrudDialog"
import referConfigFormDialog from "@/components/code-dialog-page/referConfigFormDialog"
+import referBtmTypeCrudDialog from "@/components/code-dialog-page/referBtmTypeCrudDialog"
+import referSelectBtmAttrDialog from "@/components/code-dialog-page/referSelectBtmAttrDialog"
+import advancedQuery from "@/components/advanced-query/advancedQuery"
import businessAdd from "@/views/modeling/BusinessAdd"
import TableCrud from "@/components/Crud/Crud"
+import originalAdd from "@/views/modeling/originalAdd"
+import FormTemplateDialog from "@/components/FormTemplate/index"
+// 灏嗗伐鍏峰嚱鏁版坊鍔犲埌鍏ㄥ眬
+import utilFunc from './util/func'
+Vue.prototype.$utilFunc = utilFunc
// 娉ㄥ唽鍏ㄥ眬crud椹卞姩
window.$crudCommon = crudCommon;
// 鍔犺浇Vue鎷撳睍
@@ -77,11 +85,14 @@
Vue.component('formulaEditor',formulaEditor)
Vue.component('referConfigCrudDialog',referConfigCrudDialog)
Vue.component('referConfigFormDialog',referConfigFormDialog)
+Vue.component('advancedQuery',advancedQuery)
Vue.component('businessAdd',businessAdd)
Vue.component('attrCrud',attrCrud)
Vue.component('TableCrud',TableCrud)
-
-
+Vue.component('originalAdd',originalAdd)
+Vue.component('referBtmTypeCrudDialog',referBtmTypeCrudDialog)
+Vue.component('referSelectBtmAttrDialog',referSelectBtmAttrDialog)
+Vue.component('FormTemplateDialog',FormTemplateDialog)
// 鍔犺浇鐩稿叧url鍦板潃
Object.keys(urls).forEach(key => {
--
Gitblit v1.9.3