diff --git a/src/api/date/apidate.ts b/src/api/date/apidate.ts
index 6e9e997e6..7acd1155d 100644
--- a/src/api/date/apidate.ts
+++ b/src/api/date/apidate.ts
@@ -7,3 +7,10 @@ export function getOrPostDate(methodStr:string,data?: any) {
data: data
});
}
+export function postSaveData(data?: any) {
+ return request({
+ url: "/systemapi/dataCenter/postSaveData",
+ method: "POST",
+ data: data
+ });
+}
diff --git a/src/api/date/type.ts b/src/api/date/type.ts
index 2ea0cd302..045f4e09e 100644
--- a/src/api/date/type.ts
+++ b/src/api/date/type.ts
@@ -25,7 +25,7 @@ export const dataSourceTypes = [
},
{
value: '3',
- label: '暂时未知',
+ label: 'TIDB',
},
{
value: '4',
@@ -47,3 +47,21 @@ export const interfaceTypes = [
label: 'API',
}
]
+
+//数据源表单结构
+export interface dataBaseStruct {
+ databaseName?: string;
+ port?: number;
+ ipAddress?: string;
+ datasourceType?: number;
+ datasourceTypeName?: string;
+ dataType?: number;
+ dataTypeName?: string;
+ interfaceType?: number;
+ interfaceTypeName?: string;
+ author?: string;
+ account?: string;
+ password?: string;
+ id?: string;
+ redashDatasourceId?: number;
+}
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index e39ad0445..39f9fdf75 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -22,7 +22,10 @@ declare module '@vue/runtime-core' {
DiyIconfont: typeof import('./../components/DesignForm/public/expand/diy-iconfont.vue')['default']
DragControl: typeof import('./../components/DesignForm/dragControl.vue')['default']
ElAffix: typeof import('element-plus/es')['ElAffix']
+<<<<<<< HEAD
ElAlert: typeof import('element-plus/es')['ElAlert']
+=======
+>>>>>>> v7_master
ElAside: typeof import('element-plus/es')['ElAside']
ElAvatar: typeof import('element-plus/es')['ElAvatar']
ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
@@ -32,7 +35,10 @@ declare module '@vue/runtime-core' {
ElCard: typeof import('element-plus/es')['ElCard']
ElCarousel: typeof import('element-plus/es')['ElCarousel']
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+<<<<<<< HEAD
ElCascader: typeof import('element-plus/es')['ElCascader']
+=======
+>>>>>>> v7_master
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
ElCol: typeof import('element-plus/es')['ElCol']
@@ -54,10 +60,14 @@ declare module '@vue/runtime-core' {
ElHeader: typeof import('element-plus/es')['ElHeader']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElImage: typeof import('element-plus/es')['ElImage']
+<<<<<<< HEAD
ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElLink: typeof import('element-plus/es')['ElLink']
+=======
+ ElInput: typeof import('element-plus/es')['ElInput']
+>>>>>>> v7_master
ElMain: typeof import('element-plus/es')['ElMain']
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
@@ -65,6 +75,7 @@ declare module '@vue/runtime-core' {
ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
ElPopover: typeof import('element-plus/es')['ElPopover']
+<<<<<<< HEAD
ElProgress: typeof import('element-plus/es')['ElProgress']
ElRadio: typeof import('element-plus/es')['ElRadio']
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
@@ -75,6 +86,13 @@ declare module '@vue/runtime-core' {
ElSelect: typeof import('element-plus/es')['ElSelect']
ElSelectV2: typeof import('element-plus/es')['ElSelectV2']
ElSlider: typeof import('element-plus/es')['ElSlider']
+=======
+ ElRadio: typeof import('element-plus/es')['ElRadio']
+ ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+ ElRow: typeof import('element-plus/es')['ElRow']
+ ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
+ ElSelect: typeof import('element-plus/es')['ElSelect']
+>>>>>>> v7_master
ElSpace: typeof import('element-plus/es')['ElSpace']
ElStep: typeof import('element-plus/es')['ElStep']
ElSteps: typeof import('element-plus/es')['ElSteps']
@@ -90,7 +108,10 @@ declare module '@vue/runtime-core' {
ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
+<<<<<<< HEAD
ElTransfer: typeof import('element-plus/es')['ElTransfer']
+=======
+>>>>>>> v7_master
ElTree: typeof import('element-plus/es')['ElTree']
ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
ElUpload: typeof import('element-plus/es')['ElUpload']
@@ -115,6 +136,7 @@ declare module '@vue/runtime-core' {
HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default']
IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+<<<<<<< HEAD
IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
IEpClose: typeof import('~icons/ep/close')['default']
IEpCollection: typeof import('~icons/ep/collection')['default']
@@ -135,6 +157,10 @@ declare module '@vue/runtime-core' {
IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
IEpUser: typeof import('~icons/ep/user')['default']
IEpView: typeof import('~icons/ep/view')['default']
+=======
+ IEpClose: typeof import('~icons/ep/close')['default']
+ IEpSetting: typeof import('~icons/ep/setting')['default']
+>>>>>>> v7_master
LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default']
List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']
diff --git a/src/views/date/assets.vue b/src/views/date/assets.vue
index db716cc3a..97b27fded 100644
--- a/src/views/date/assets.vue
+++ b/src/views/date/assets.vue
@@ -4,11 +4,20 @@
@ 备注: 数据资源
-->
-
+