File tree Expand file tree Collapse file tree 15 files changed +28
-19
lines changed
Expand file tree Collapse file tree 15 files changed +28
-19
lines changed Original file line number Diff line number Diff line change @@ -22,5 +22,5 @@ export const datasourceApi = {
2222 saveField : ( data : any ) => request . post ( '/datasource/editField' , data ) ,
2323 getDs : ( id : number ) => request . post ( `/datasource/get/${ id } ` ) ,
2424 cancelRequests : ( ) => request . cancelRequests ( ) ,
25- getSchema : ( data : any ) => request . post ( '/datasource/getSchemaByConf' , data )
25+ getSchema : ( data : any ) => request . post ( '/datasource/getSchemaByConf' , data ) ,
2626}
Original file line number Diff line number Diff line change @@ -111,7 +111,7 @@ const logout = () => {
111111 <div :title =" account" class =" bottom ellipsis" >{{ account }}</div >
112112 </div >
113113 <div v-if =" isAdmin && !inSysmenu" class =" popover-item" @click =" toSystem" >
114- <el-icon size =" 16" >
114+ <el-icon style = " color : #646a73 " size =" 16" >
115115 <icon _admin_outlined ></icon _admin_outlined >
116116 </el-icon >
117117 <div class =" datasource-name" >{{ $t('common.system_manage') }}</div >
@@ -175,7 +175,7 @@ const logout = () => {
175175 <pwd-form v-if =" dialogVisible" ref =" pwdFormRef" @pwd-saved =" closePwd" />
176176 <template #footer >
177177 <div class =" dialog-footer" >
178- <el-button @click =" closePwd" >{{ t('common.cancel') }}</el-button >
178+ <el-button secondary @click =" closePwd" >{{ t('common.cancel') }}</el-button >
179179 <el-button type =" primary" @click =" savePwdHandler" >{{ t('common.save') }}</el-button >
180180 </div >
181181 </template >
@@ -276,6 +276,7 @@ const logout = () => {
276276 .info {
277277 height : 62px ;
278278 padding : 8px ;
279+ margin-bottom : 4px ;
279280
280281 img {
281282 float : left ;
@@ -302,10 +303,12 @@ const logout = () => {
302303 height : 32px ;
303304 display : flex ;
304305 align-items : center ;
305- padding-left : 12 px ;
306- padding-right : 8 px ;
306+ padding-left : 8 px ;
307+ padding-right : 4 px ;
307308 position : relative ;
308309 cursor : pointer ;
310+ margin : 0 4px ;
311+ border-radius : 4px ;
309312 & :hover {
310313 background-color : #1f23291a ;
311314 }
Original file line number Diff line number Diff line change 2828 --ed-color-primary-light-7 : #d2f1e9 !important ;
2929 --ed-border-color : #d9dcdf !important ;
3030 --ed-border-radius-base : 6px !important ;
31+ --ed-disabled-border-color : #d9dcdf !important ;
3132}
3233
3334a {
6162
6263@media (prefers- color - scheme: light ) {
6364 :root {
64- color : #213547 ;
65+ color : #1f2329 ;
6566 background-color : #ffffff ;
6667 }
6768
Original file line number Diff line number Diff line change @@ -271,7 +271,9 @@ defineExpose({
271271 />
272272 <template #footer >
273273 <span class =" dialog-footer" >
274- <el-button @click =" state.dialogVisible = false" >{{ t('common.cancel') }}</el-button >
274+ <el-button secondary @click =" state.dialogVisible = false" >{{
275+ t('common.cancel')
276+ }}</el-button >
275277 <el-button :disabled =" !titleValid" type =" primary" @click =" sureCurTitle" >{{
276278 t('common.confirm')
277279 }}</el-button >
Original file line number Diff line number Diff line change 4242 <el-col class =" adapt-count" >
4343 <span >{{ t('dashboard.chart_selected', [selectComponentCount]) }} </span >
4444 </el-col >
45- <el-button class =" close-button" @click =" dialogShow = false"
45+ <el-button secondary class =" close-button" @click =" dialogShow = false"
4646 >{{ t('common.cancel') }}
4747 </el-button >
4848 <el-button
Original file line number Diff line number Diff line change @@ -103,6 +103,7 @@ const onClickOutside = () => {
103103 v-click-outside =" onClickOutside"
104104 class =" more"
105105 size =" 16"
106+ style =" color : #646a73 "
106107 @click.stop
107108 >
108109 <icon _more_outlined ></icon _more_outlined >
Original file line number Diff line number Diff line change @@ -459,7 +459,7 @@ const btnSelectClick = (val: any) => {
459459 clearable
460460 />
461461 <div style =" display : flex ; justify-content : flex-end ; margin-top : 20px " >
462- <el-button @click =" closeTable" >{{ t('common.cancel') }}</el-button >
462+ <el-button secondary @click =" closeTable" >{{ t('common.cancel') }}</el-button >
463463 <el-button type =" primary" @click =" saveTable" >{{ t('common.save') }}</el-button >
464464 </div >
465465 </el-dialog >
@@ -481,7 +481,7 @@ const btnSelectClick = (val: any) => {
481481 type =" textarea"
482482 />
483483 <div style =" display : flex ; justify-content : flex-end ; margin-top : 20px " >
484- <el-button @click =" closeField" >{{ t('common.cancel') }}</el-button >
484+ <el-button secondary @click =" closeField" >{{ t('common.cancel') }}</el-button >
485485 <el-button type =" primary" @click =" saveField" >{{ t('common.save') }}</el-button >
486486 </div >
487487 </el-dialog >
Original file line number Diff line number Diff line change 108108 <div >{{ t('ds.edit.table_comment_label') }}</div >
109109 <el-input v-model =" tableComment" clearable :rows =" 3" type =" textarea" />
110110 <div style =" display : flex ; justify-content : flex-end ; margin-top : 20px " >
111- <el-button @click =" closeTable" >{{ t('common.cancel') }}</el-button >
111+ <el-button secondary @click =" closeTable" >{{ t('common.cancel') }}</el-button >
112112 <el-button type =" primary" @click =" saveTable" >{{ t('common.confirm') }}</el-button >
113113 </div >
114114 </el-dialog >
124124 <div >{{ t('ds.edit.field_comment_label') }}</div >
125125 <el-input v-model =" fieldComment" clearable :rows =" 3" type =" textarea" />
126126 <div style =" display : flex ; justify-content : flex-end ; margin-top : 20px " >
127- <el-button @click =" closeField" >{{ t('common.cancel') }}</el-button >
127+ <el-button secondary @click =" closeField" >{{ t('common.cancel') }}</el-button >
128128 <el-button type =" primary" @click =" saveField" >{{ t('common.confirm') }}</el-button >
129129 </div >
130130 </el-dialog >
Original file line number Diff line number Diff line change 146146 <span >{{ t('ds.form.selected', [checkList.length, tableList.length]) }}</span >
147147 </div >
148148 <div style =" display : flex ; justify-content : flex-end ; margin-top : 20px " >
149- <el-button @click =" close" >{{ t('common.cancel') }}</el-button >
149+ <el-button secondary @click =" close" >{{ t('common.cancel') }}</el-button >
150150 <el-button v-show =" !isCreate && !isEditTable && form.type !== 'excel'" @click =" check" >
151151 {{ t('ds.check') }}
152152 </el-button >
Original file line number Diff line number Diff line change @@ -934,7 +934,7 @@ const saveHandler = () => {
934934 </el-form >
935935 <template #footer >
936936 <div class =" dialog-footer" >
937- <el-button @click =" certificateBeforeClose" >{{ $t('common.cancel') }}</el-button >
937+ <el-button secondary @click =" certificateBeforeClose" >{{ $t('common.cancel') }}</el-button >
938938 <el-button type =" primary" @click =" saveHandler" >
939939 {{ $t('common.save') }}
940940 </el-button >
You can’t perform that action at this time.
0 commit comments