From d5d7f913589aac09957d1922c20da9d0e0681543 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 11 四月 2024 11:24:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/main.js | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/Source/ProjectWeb/src/main.js b/Source/ProjectWeb/src/main.js
index acf22d9..d13aa2e 100644
--- a/Source/ProjectWeb/src/main.js
+++ b/Source/ProjectWeb/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/index'
// 涓氬姟缁勪欢
import tenantPackage from './views/system/tenantpackage';
//鍩虹缁戝畾琛ㄥ崟鎸夐挳
@@ -31,6 +32,23 @@
import dynamicTableForm from '@/components/dynamic-components/dynamic-table-form'
//鍥哄畾琛ㄥ崟缁勪欢
import dynamicForm from '@/components/dynamic-components/dynamic-form'
+//瀵屾枃鏈粍浠�
+import richText from '@/components/PLT-basic-component/richText'
+// 涓婁紶鏂囦欢缁勪欢
+import UploadFiles from '@/components/PLT-basic-component/Upload-files'
+// 娉ㄥ唽鍏ㄥ眬瀹瑰櫒
+Vue.component('basicContainer', basicContainer);
+Vue.component('basicBlock', basicBlock);
+Vue.component('thirdRegister', thirdRegister);
+Vue.component('avueUeditor', avueUeditor);
+Vue.component('flowDesign', flowDesign);
+Vue.component('tenantPackage', tenantPackage);
+Vue.component('dynamicButton', dynamicButton);
+Vue.component('dynamicTableForm', dynamicTableForm);
+Vue.component('dynamicForm', dynamicForm);
+Vue.component('richText', richText);
+Vue.component('UploadFiles', UploadFiles);
+Vue.component('Divider', Divider);
import 'quill/dist/quill.core.css'
import 'quill/dist/quill.snow.css'
@@ -52,16 +70,6 @@
calcHeight: 65,
i18n: (key, value) => i18n.t(key, value)
});
-// 娉ㄥ唽鍏ㄥ眬瀹瑰櫒
-Vue.component('basicContainer', basicContainer);
-Vue.component('basicBlock', basicBlock);
-Vue.component('thirdRegister', thirdRegister);
-Vue.component('avueUeditor', avueUeditor);
-Vue.component('flowDesign', flowDesign);
-Vue.component('tenantPackage', tenantPackage);
-Vue.component('dynamicButton', dynamicButton);
-Vue.component('dynamicTableForm', dynamicTableForm);
-Vue.component('dynamicForm', dynamicForm);
// 鍔犺浇鐩稿叧url鍦板潃
Object.keys(urls).forEach(key => {
Vue.prototype[key] = urls[key];
--
Gitblit v1.9.3