Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upgrade tdesign version #158

Merged
merged 3 commits into from
Aug 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"eslint.validate": ["javascript", "javascriptvue", "typescript", "typescriptreact"],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
},
"cSpell.words": ["tdesign", "tvision", "echarts", "nprogress", "commitlint", "stylelint", "vuex", "qrcode"]
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tdesign-vue-starter",
"version": "0.3.1",
"version": "0.4.0",
"scripts": {
"dev:mock": "vite --open --mode mock",
"dev": "vite --open --mode development",
Expand All @@ -24,7 +24,7 @@
"nprogress": "^0.2.0",
"qrcode.vue": "^1.7.0",
"tdesign-icons-vue": "^0.1.0",
"tdesign-vue": "^0.43.0",
"tdesign-vue": "^0.45.0",
"tvision-color": "~1.4.0",
"typescript": "^4.2.4",
"vue": "~2.6.11",
Expand Down
18 changes: 9 additions & 9 deletions src/layouts/components/LayoutContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@
</t-tab-panel>
</t-tabs>
<t-content :class="`${prefix}-content-layout`">
<l-breadcrumb v-if="setting.showBreadcrumb" />
<l-content />
<layout-breadcrumb v-if="setting.showBreadcrumb" />
<common-content />
</t-content>
<t-footer v-if="showFooter" :class="`${prefix}-footer-layout`">
<l-footer />
<layout-footer />
</t-footer>
</t-layout>
</template>
Expand All @@ -67,19 +67,19 @@ import Vue from 'vue';
import { mapGetters } from 'vuex';
import { RefreshIcon, ArrowLeftIcon, ArrowRightIcon, HomeIcon, CloseCircleIcon } from 'tdesign-icons-vue';

import LContent from './Content.vue';
import LBreadcrumb from './Breadcrumb.vue';
import LFooter from './Footer.vue';
import CommonContent from './Content.vue';
import LayoutBreadcrumb from './Breadcrumb.vue';
import LayoutFooter from './Footer.vue';

import { prefix } from '@/config/global';
import { SettingType } from '@/interface';

export default Vue.extend({
name: 'LayoutContent',
components: {
LContent,
LFooter,
LBreadcrumb,
CommonContent,
LayoutFooter,
LayoutBreadcrumb,
RefreshIcon,
ArrowLeftIcon,
ArrowRightIcon,
Expand Down
6 changes: 3 additions & 3 deletions src/layouts/components/LayoutHeader.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<l-header
<common-header
v-if="showHeader"
:showLogo="showHeaderLogo"
:theme="mode"
Expand All @@ -14,14 +14,14 @@
<script lang="ts">
import Vue from 'vue';
import { mapGetters } from 'vuex';
import LHeader from './Header.vue';
import CommonHeader from './Header.vue';

import { SettingType } from '@/interface';

export default Vue.extend({
name: 'LayoutHeader',
components: {
LHeader,
CommonHeader,
},
computed: {
...mapGetters({
Expand Down
6 changes: 3 additions & 3 deletions src/layouts/components/LayoutSidebar.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<l-side-nav
<side-nav
v-if="showSidebar"
:showLogo="showSidebarLogo"
:layout="setting.layout"
Expand All @@ -14,14 +14,14 @@
<script lang="ts">
import Vue from 'vue';
import { mapGetters } from 'vuex';
import LSideNav from './SideNav.vue';
import SideNav from './SideNav.vue';

import { SettingType } from '@/interface';

export default Vue.extend({
name: 'LayoutSidebar',
components: {
LSideNav,
SideNav,
},
computed: {
...mapGetters({
Expand Down
4 changes: 2 additions & 2 deletions src/pages/dashboard/detail/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<t-card :class="{ 'dashboard-detail-card': true }" title="采购商品申请趋势" subtitle="(件)">
<template #actions>
<t-date-range-picker
style="width: 240px"
style="width: 250px"
:default-value="LAST_7_DAYS"
theme="primary"
mode="date"
Expand All @@ -43,7 +43,7 @@
<t-card :class="{ 'dashboard-detail-card': true }" title="采购商品满意度分布" class="row-margin">
<template #actions>
<t-date-range-picker
style="display: inline-block; margin-right: 8px; width: 240px"
style="display: inline-block; margin-right: 8px; width: 250px"
:defaultValue="LAST_7_DAYS"
theme="primary"
mode="date"
Expand Down
2 changes: 1 addition & 1 deletion src/style/reset.less
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,5 @@ a {
}

.card-date-picker-container {
width: 240px;
width: 250px;
}