Skip to content

Commit fa1e54a

Browse files
authored
Merge pull request #174 from Tencent/feat/upgrade/0.16.0
feat: upgrade 0.16.0
2 parents 893ffd4 + 0cc022c commit fa1e54a

9 files changed

Lines changed: 33 additions & 19 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"pinia": "^2.0.11",
2626
"qrcode.vue": "^3.2.2",
2727
"tdesign-icons-vue-next": "^0.0.6",
28-
"tdesign-vue-next": "^0.15.4",
28+
"tdesign-vue-next": "^0.16.0",
2929
"tvision-color": "^1.3.1",
3030
"vue": "^3.2.31",
3131
"vue-clipboard3": "^2.0.0",

src/pages/dashboard/base/components/middle-chart.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
<t-card title="统计数据" :subtitle="`(万元)${currentMonth}`" class="dashboard-chart-card">
55
<template #option>
66
<div class="dashboard-chart-title-container">
7-
<t-date-picker
7+
<t-date-range-picker
88
class="card-date-picker-container"
99
theme="primary"
1010
mode="date"
11-
range
1211
:default-value="LAST_7_DAYS"
1312
@change="onCurrencyChange"
1413
/>

src/pages/dashboard/base/components/overview.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99
:class="{ 'dashboard-overview-card': true, 'overview-panel': true }"
1010
>
1111
<template #actions>
12-
<t-date-picker
12+
<t-date-range-picker
1313
class="card-date-picker-container"
1414
theme="primary"
1515
mode="date"
16-
range
1716
:default-value="LAST_7_DAYS"
1817
@change="onStokeDataChange"
1918
/>

src/pages/dashboard/detail/index.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@
2020
<t-col :xs="12" :xl="9">
2121
<t-card class="dashboard-detail-card" title="采购商品申请趋势" subtitle="(件)">
2222
<template #actions>
23-
<t-date-picker
23+
<t-date-range-picker
2424
class="card-date-picker-container"
2525
:default-value="LAST_7_DAYS"
2626
theme="primary"
2727
mode="date"
28-
range
2928
style="width: 240px"
3029
@change="onMaterialChange"
3130
/>
@@ -44,12 +43,11 @@
4443
</t-row>
4544
<t-card :class="['dashboard-detail-card', 'row-margin']" title="采购商品满意度分布">
4645
<template #actions>
47-
<t-date-picker
46+
<t-date-range-picker
4847
class="card-date-picker-container"
4948
:default-value="LAST_7_DAYS"
5049
theme="primary"
5150
mode="date"
52-
range
5351
style="display: inline-block; margin-right: 8px; width: 240px"
5452
@change="onSatisfyChange"
5553
/>

src/pages/detail/deploy/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ const deleteClickOp = (e) => {
204204
</script>
205205

206206
<style lang="less" scoped>
207+
@import url('../base/index.less');
208+
207209
.detail-deploy {
208210
:deep(.t-card) {
209211
padding: 8px;

src/pages/list/components/CommonTable.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<t-row>
1313
<t-col :span="10">
1414
<t-row :gutter="[16, 24]">
15-
<t-col :flex="1">
15+
<t-col :span="4">
1616
<t-form-item label="合同名称" name="name">
1717
<t-input
1818
v-model="formData.name"
@@ -23,7 +23,7 @@
2323
/>
2424
</t-form-item>
2525
</t-col>
26-
<t-col :flex="1">
26+
<t-col :span="4">
2727
<t-form-item label="合同状态" name="status">
2828
<t-select
2929
v-model="formData.status"
@@ -33,7 +33,7 @@
3333
/>
3434
</t-form-item>
3535
</t-col>
36-
<t-col :flex="1">
36+
<t-col :span="4">
3737
<t-form-item label="合同编号" name="no">
3838
<t-input
3939
v-model="formData.no"
@@ -43,10 +43,11 @@
4343
/>
4444
</t-form-item>
4545
</t-col>
46-
<t-col :flex="1">
46+
<t-col :span="4">
4747
<t-form-item label="合同类型" name="type">
4848
<t-select
4949
v-model="formData.type"
50+
style="display: inline-block"
5051
class="form-item-content"
5152
:options="CONTRACT_TYPE_OPTIONS"
5253
placeholder="请选择合同类型"

src/pages/user/index.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@
3535
<t-tab-panel value="second" label="内容列表">
3636
<t-card :bordered="false" class="card-padding-no" title="主页访问数据" describe="(次)">
3737
<template #actions>
38-
<t-date-picker
38+
<t-date-range-picker
3939
class="card-date-picker-container"
4040
:default-value="LAST_7_DAYS"
4141
theme="primary"
4242
mode="date"
43-
range
4443
@change="onLineChange"
4544
/>
4645
</template>

src/style/index.less

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ p {
6868
}
6969
}
7070

71-
.t-button + .t-button {
72-
margin-left: var(--tdvns-spacer);
73-
}
74-
7571
.container-base-margin-top {
7672
margin-top: 16px;
7773
}

src/style/layout.less

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,26 @@
1111
margin-left: var(--tdvns-spacer);
1212
}
1313

14+
.t-jumper-jumper {
15+
.t-button + .t-button {
16+
margin-left: 0
17+
}
18+
}
19+
.tdesign-starter-link {
20+
color: var(--td-brand-color);
21+
text-decoration: none;
22+
margin-right: 24px;
23+
cursor: pointer;
24+
transition: color .2s cubic-bezier(.38,0,.24,1);
25+
}
26+
27+
.left-operation-container,.operation-container {
28+
.t-button + .t-button {
29+
margin-left: var(--tdvns-spacer);
30+
}
31+
}
32+
33+
1434
.t-layout.t-layout--with-sider {
1535
> .t-layout {
1636
flex: 1;

0 commit comments

Comments
 (0)