Skip to content

Commit 06c6da2

Browse files
dataeaseShuxuwei-fit2cloud
dataeaseShu
authored and
xuwei-fit2cloud
committed
fix: UI库升级
1 parent 4fdb46f commit 06c6da2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+81
-181
lines changed

‎core/core-frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"crypto-js": "^4.1.1",
3030
"dayjs": "^1.11.9",
3131
"echarts": "^5.5.1",
32-
"element-plus-secondary": "^0.6.8",
32+
"element-plus-secondary": "^1.0.0",
3333
"element-resize-detector": "^1.2.4",
3434
"exceljs": "^4.4.0",
3535
"file-saver": "^2.0.5",

‎core/core-frontend/src/components/cron/src/Cron.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ const emits = defineEmits(['update:modelValue'])
121121
</el-tabs>
122122
<!-- table -->
123123
<el-table
124-
header-cell-class-name="header-cell"
125124
:data="tableData"
126125
size="mini"
127126
border

‎core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/ComponentColorSelector.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
:title="t('visualization.table_color_matching')"
7171
name="table_color_matching"
7272
class="inner-collapse"
73+
effect="dark"
7374
:class="`inner-collapse_${themes}`"
7475
>
7576
<div style="padding: 0 8px 8px">
@@ -425,7 +426,7 @@ span {
425426
max-width: 192px;
426427
}
427428
:deep(.custom-color-setting-btn) {
428-
margin-top: 31px;
429+
margin-top: 28px;
429430
}
430431
}
431432

‎core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/FilterStyleSimpleSelector.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div style="width: 100%">
3-
<el-form label-position="top" style="width: 100%">
3+
<el-form label-position="top" size="small" style="width: 100%">
44
<div style="width: 100%; padding: 16px 8px 0">
55
<el-row :gutter="8">
66
<el-col :span="12">

‎core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/OverallSetting.vue

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<el-form label-position="top">
2+
<el-form size="small" label-position="top">
33
<el-form-item
44
class="form-item"
55
:class="'form-item-' + themes"
@@ -71,7 +71,6 @@
7171
v-model="canvasStyleData.dashboard.gapSize"
7272
:effect="themes"
7373
controls-position="right"
74-
size="middle"
7574
:min="0"
7675
:max="10"
7776
@change="themeChange"
@@ -112,14 +111,12 @@
112111
type="number"
113112
:min="1"
114113
:max="3600"
115-
size="middle"
116114
:disabled="!canvasStyleData.refreshViewEnable"
117115
@change="onRefreshChange"
118116
>
119117
<template #append>
120118
<el-select
121119
v-model="canvasStyleData.refreshUnit"
122-
size="middle"
123120
:effect="themes"
124121
:disabled="!canvasStyleData.refreshViewEnable"
125122
style="width: 90px"
@@ -162,14 +159,12 @@
162159
type="number"
163160
:min="1"
164161
:max="3600"
165-
size="middle"
166162
:disabled="!canvasStyleData.refreshBrowserEnable"
167163
@change="onRefreshChange"
168164
>
169165
<template #append>
170166
<el-select
171167
v-model="canvasStyleData.refreshBrowserUnit"
172-
size="middle"
173168
:effect="themes"
174169
:disabled="!canvasStyleData.refreshBrowserEnable"
175170
style="width: 90px"
@@ -232,7 +227,6 @@
232227
v-model="canvasStyleData.dashboard.resultCount"
233228
:effect="themes"
234229
controls-position="right"
235-
size="middle"
236230
:min="1"
237231
:max="10000"
238232
@change="themeChange"

‎core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/SeniorStyleSetting.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
>
1313
<el-color-picker
1414
:effect="themes"
15+
size="small"
1516
v-model="seniorStyleSetting.linkageIconColor"
1617
:trigger-width="100"
1718
is-custom
@@ -31,6 +32,7 @@
3132
v-model="seniorStyleSetting.drillLayerColor"
3233
:effect="themes"
3334
:trigger-width="100"
35+
size="small"
3436
is-custom
3537
:predefine="state.predefineColors"
3638
@change="themeChange"

‎core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/ViewSimpleTitle.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
v-model="titleForm.color"
1212
class="color-picker-style"
1313
is-custom
14+
size="small"
1415
:predefine="state.predefineColors"
1516
@change="changeTitleStyle('color')"
1617
/>

‎core/core-frontend/src/components/data-visualization/CanvasAttr.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ onMounted(() => {
9797
<el-form-item class="form-item form-item-dark" label="W">
9898
<el-input-number
9999
effect="dark"
100-
size="middle"
100+
size="small"
101101
:min="600"
102102
:max="50000"
103103
v-model="canvasStyleData.width"
@@ -110,7 +110,7 @@ onMounted(() => {
110110
<el-form-item class="form-item form-item-dark" label="H">
111111
<el-input-number
112112
effect="dark"
113-
size="middle"
113+
size="small"
114114
:min="600"
115115
:max="50000"
116116
v-model="canvasStyleData.height"
@@ -132,7 +132,7 @@ onMounted(() => {
132132
</el-icon>
133133
</el-tooltip>
134134
<el-select
135-
style="margin: 0 0 0 8px; flex: 1"
135+
style="width: 139px; margin: 0 0 0 8px; flex: 1"
136136
effect="dark"
137137
v-model="canvasStyleData.screenAdaptor"
138138
@change="onStyleChange"
@@ -401,7 +401,6 @@ onMounted(() => {
401401
font-size: 12px;
402402
font-style: normal;
403403
font-weight: 400;
404-
margin: 3px 0 !important;
405404
}
406405
:deep(.form-item-dark) {
407406
.ed-form-item__label {

‎core/core-frontend/src/components/data-visualization/ComponentToolBar.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ onUnmounted(() => {
176176
.scale-area {
177177
display: flex;
178178
align-items: center;
179+
180+
:deep(.ed-input-number__decrease) {
181+
--ed-input-number-controls-height: 12px;
182+
}
179183
}
180184
}
181185
:deep(.ed-input--dark .ed-input__wrapper),

‎core/core-frontend/src/components/grid-table/src/GridTable.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ defineExpose({
127127
<template>
128128
<div class="flex-table" :class="!tableData.length && 'no-data'">
129129
<el-table
130-
header-cell-class-name="header-cell"
131130
ref="table"
132131
:border="border"
133132
v-bind="state.tableAttrs"

0 commit comments

Comments
 (0)