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 | 37 +++++++++++++++++++++++++++++-------- 1 files changed, 29 insertions(+), 8 deletions(-) diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js index a59e801..d6b2346 100644 --- a/Source/UBCS-WEB/src/main.js +++ b/Source/UBCS-WEB/src/main.js @@ -20,9 +20,10 @@ import basicContainer from './components/basic-container/main'; import thirdRegister from './components/third-register/main'; import flowDesign from './components/flow-design/main'; -import avueUeditor from 'avue-plugin-uavueeditor'; +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"; @@ -37,10 +38,20 @@ import TemplatePro from "@/components/Tree/TemplatePro" import attrCrud from "@/components/Tree/attrCrud" 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 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 @@ -77,12 +88,22 @@ Vue.component('classifyTreeform',classifyTreeform) Vue.component('TemplatePro',TemplatePro) Vue.component('formulaEditor',formulaEditor) -Vue.component('referConfigCrudDialog',referConfigCrudDialog) -Vue.component('referConfigFormDialog',referConfigFormDialog) +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