From ded6e8d2312e139e8ce770c7f1d5830bf2db4af6 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 19 七月 2023 11:39:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/main.js |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js
index 373277b..d6b2346 100644
--- a/Source/UBCS-WEB/src/main.js
+++ b/Source/UBCS-WEB/src/main.js
@@ -23,6 +23,7 @@
 import avueUeditor from 'avue-plugin-ueditor';
 import website from '@/config/website';
 import crudCommon from '@/mixins/crud';
+import Divider from './components/Divider';
 // 涓氬姟缁勪欢
 import tenantPackage from './views/system/tenantpackage';
 import enupackage from "@/views/modeling/enupackage";
@@ -35,10 +36,25 @@
 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 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 originalAdd from "@/views/modeling/originalAdd"
+import FormTemplateDialog from "@/components/FormTemplate/index"
+import linkTypeAdd from "@/views/modeling/LinkTypeAdd"
+import MasterTree from "@/components/Master/MasterTree";
+import FlowPath from "@/components/template/FlowPath";
+import Stage from "@/components/template/Stage";
+import businesswork from "@/components/work/BusinessWork"
+import MasterTransfer from "@/components/Master/MasterTransfer";
+// 灏嗗伐鍏峰嚱鏁版坊鍔犲埌鍏ㄥ眬
+import utilFunc from './util/func'
+Vue.prototype.$utilFunc = utilFunc
 // 娉ㄥ唽鍏ㄥ眬crud椹卞姩
 window.$crudCommon = crudCommon;
 // 鍔犺浇Vue鎷撳睍
@@ -47,6 +63,7 @@
 Vue.use(Element, {
   i18n: (key, value) => i18n.t(key, value)
 });
+
 Vue.use(window.AVUE, {
   size: 'small',
   tableSize: 'small',
@@ -72,7 +89,21 @@
 Vue.component('TemplatePro',TemplatePro)
 Vue.component('formulaEditor',formulaEditor)
 Vue.component('referConfigDialog',referConfigDialog)
+Vue.component('advancedQuery',advancedQuery)
 Vue.component('businessAdd',businessAdd)
+Vue.component('attrCrud',attrCrud)
+Vue.component('VciMasterCrud',VciMasterCrud)
+Vue.component('originalAdd',originalAdd)
+Vue.component('referBtmTypeCrudDialog',referBtmTypeCrudDialog)
+Vue.component('referSelectBtmAttrDialog',referSelectBtmAttrDialog)
+Vue.component('FormTemplateDialog',FormTemplateDialog)
+Vue.component('LinkTypeAdd',linkTypeAdd)
+Vue.component('MasterTree',MasterTree)
+Vue.component('FlowPath',FlowPath)
+Vue.component('Stage',Stage)
+Vue.component('Divider', Divider)
+Vue.component('businesswork', businesswork)
+Vue.component('MasterTransfer', MasterTransfer)
 
 // 鍔犺浇鐩稿叧url鍦板潃
 Object.keys(urls).forEach(key => {

--
Gitblit v1.9.3