Skip to content

Commit 0c67eaa

Browse files
authored
Merge pull request #85 from Tencent/fix/page/setting
fix(setting): fix setting page
2 parents 293ea0c + 3851492 commit 0c67eaa

4 files changed

Lines changed: 7 additions & 14 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"vite-plugin-mock": "^2.9.6",
6666
"vite-svg-loader": "^3.1.0",
6767
"vue-clipboard3": "^1.0.1",
68-
"vue-tsc": "^0.32.0"
68+
"vue-tsc": "^0.29.8"
6969
},
7070
"config": {
7171
"commitizen": {

src/layouts/components/SideNav.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ const useComputed = (props) => {
5050
export default defineComponent({
5151
name: 'SideNav',
5252
components: {
53-
MenuContent,
5453
tLogoFull,
5554
tLogo,
5655
},
@@ -120,12 +119,6 @@ export default defineComponent({
120119
.join('');
121120
};
122121

123-
const routerChange = (path: string) => {
124-
router.push({
125-
path,
126-
});
127-
};
128-
129122
const goHome = () => {
130123
router.push('/dashboard/base');
131124
};
@@ -136,7 +129,6 @@ export default defineComponent({
136129
autoCollapsed,
137130
changeCollapsed,
138131
getActiveName,
139-
routerChange,
140132
goHome,
141133
};
142134
},
@@ -167,7 +159,7 @@ export default defineComponent({
167159
),
168160
}}
169161
>
170-
<menu-content navData={this.menu} />
162+
<MenuContent navData={this.menu} />
171163
</t-menu>
172164
<div class={`${prefix}-side-nav-placeholder${this.collapsed ? '-hidden' : ''}`}></div>
173165
</div>

src/layouts/setting.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
:value="COLOR_OPTIONS[COLOR_OPTIONS.length - 1]"
5050
class="setting-layout-color-group dynamic-color-btn"
5151
>
52-
<color-container :value="COLOR_OPTIONS[COLOR_OPTIONS.length - 1]" />
52+
<ColorContainer :value="COLOR_OPTIONS[COLOR_OPTIONS.length - 1]" />
5353
</t-radio-button>
5454
</t-popup>
5555
</div>
@@ -59,7 +59,7 @@
5959
<t-radio-group v-model="formData.layout" default-vaule="top">
6060
<div v-for="(item, index) in LAYOUT_OPTION" :key="index" class="setting-layout-drawer">
6161
<t-radio-button :key="index" :value="item">
62-
<thumbnail :src="getThumbnailUrl(item)" />
62+
<Thumbnail :src="getThumbnailUrl(item)" />
6363
</t-radio-button>
6464
</div>
6565
</t-radio-group>
@@ -97,6 +97,8 @@ import { MessagePlugin, PopupVisibleChangeContext } from 'tdesign-vue-next';
9797
import { Color } from 'tvision-color';
9898
import useClipboard from 'vue-clipboard3';
9999
import { useSettingStore } from '@/store';
100+
import Thumbnail from '@/components/thumbnail/index.vue';
101+
import ColorContainer from '@/components/color/index.vue';
100102
101103
import 'vue-color-kit/dist/vue-color-kit.css';
102104

src/pages/form/step/index.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@
142142
<script setup lang="ts">
143143
import { ref, computed } from 'vue';
144144
import { useRouter } from 'vue-router';
145-
import { ValidateResultContext } from 'tdesign-vue-next';
146145
import Card from '@/components/card/index.vue';
147146
148147
import {
@@ -173,7 +172,7 @@ const amount = computed(() => {
173172
return '--';
174173
});
175174
176-
const onSubmit = (result: ValidateResultContext<FormData>, val: number) => {
175+
const onSubmit = (result, val: number) => {
177176
if (result.validateResult === true) {
178177
activeForm.value = val;
179178
}

0 commit comments

Comments
 (0)