From 7a49d45da7e1d8d1b9aca8bbfcd22b622bc3e6ac Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 28 七月 2023 16:02:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/main.js | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js
index d6b2346..a4c5b4c 100644
--- a/Source/UBCS-WEB/src/main.js
+++ b/Source/UBCS-WEB/src/main.js
@@ -33,17 +33,17 @@
import Torelationpackage from "@/views/modeling/Torelationpackage"
import originalRange from "@/views/modeling/originalRange"
import originalLink from "@/views/modeling/originalLink"
-import classifyTrees from "@/components/Tree/classifyTrees"
-import classifyTreeform from "@/components/Tree/classifyTreeform"
-import TemplatePro from "@/components/Tree/TemplatePro"
-import attrCrud from "@/components/Tree/attrCrud"
+import classifyTrees from "@/components/Theme/ThemeClassifyTrees"
+import classifyTreeform from "@/components/Theme/ThemeClassifyTreeform"
+import TemplatePro from "@/components/Theme/ThemeTemplatePro"
+import attrCrud from "@/components/Theme/ThemeAttrCrud"
import formulaEditor from "@/components/code-dialog-page/formulaEditor"
import referConfigDialog from "@/components/code-dialog-page/referConfigDialog"
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 VciMasterCrud from "@/components/Crud/VciMasterCrud"
+import VciMasterCrud from "@/components/MasterCrud/VciMasterCrud"
import originalAdd from "@/views/modeling/originalAdd"
import FormTemplateDialog from "@/components/FormTemplate/index"
import linkTypeAdd from "@/views/modeling/LinkTypeAdd"
@@ -52,6 +52,7 @@
import Stage from "@/components/template/Stage";
import businesswork from "@/components/work/BusinessWork"
import MasterTransfer from "@/components/Master/MasterTransfer";
+import ThemeImport from "@/components/Theme/ThemeImport";
// 灏嗗伐鍏峰嚱鏁版坊鍔犲埌鍏ㄥ眬
import utilFunc from './util/func'
Vue.prototype.$utilFunc = utilFunc
@@ -104,6 +105,7 @@
Vue.component('Divider', Divider)
Vue.component('businesswork', businesswork)
Vue.component('MasterTransfer', MasterTransfer)
+Vue.component('ThemeImport', ThemeImport)
// 鍔犺浇鐩稿叧url鍦板潃
Object.keys(urls).forEach(key => {
--
Gitblit v1.9.3