Merge branch 'develop' of github.com:Tencent/tdesign-vue-next-starter into main

This commit is contained in:
Uyarn 2022-07-19 16:03:00 +08:00
commit 2ca9ad109d
5 changed files with 10 additions and 8 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "tdesign-vue-next-starter", "name": "tdesign-vue-next-starter",
"version": "0.3.5", "version": "0.3.6",
"scripts": { "scripts": {
"dev:mock": "vite --open --mode mock", "dev:mock": "vite --open --mode mock",
"dev": "vite --open --mode development", "dev": "vite --open --mode development",
@ -27,7 +27,7 @@
"qrcode.vue": "^3.2.2", "qrcode.vue": "^3.2.2",
"qs": "^6.10.5", "qs": "^6.10.5",
"tdesign-icons-vue-next": "^0.1.1", "tdesign-icons-vue-next": "^0.1.1",
"tdesign-vue-next": "0.17.4", "tdesign-vue-next": "0.18.0",
"tvision-color": "^1.3.1", "tvision-color": "^1.3.1",
"vue": "^3.2.31", "vue": "^3.2.31",
"vue-clipboard3": "^2.0.0", "vue-clipboard3": "^2.0.0",

View File

@ -31,7 +31,7 @@ export const CONTRACT_TYPE_OPTIONS = [
// 合同收付类型枚举 // 合同收付类型枚举
export const CONTRACT_PAYMENT_TYPES = { export const CONTRACT_PAYMENT_TYPES = {
PAYMENT: 0, PAYMENT: 0,
RECIPT: 1, RECEIPT: 1,
}; };
// 通知的优先级对应的TAG类型 // 通知的优先级对应的TAG类型

View File

@ -45,7 +45,7 @@
<div v-if="row.paymentType === CONTRACT_PAYMENT_TYPES.PAYMENT" class="payment-col"> <div v-if="row.paymentType === CONTRACT_PAYMENT_TYPES.PAYMENT" class="payment-col">
付款<trend class="dashboard-item-trend" type="up" /> 付款<trend class="dashboard-item-trend" type="up" />
</div> </div>
<div v-if="row.paymentType === CONTRACT_PAYMENT_TYPES.RECIPT" class="payment-col"> <div v-if="row.paymentType === CONTRACT_PAYMENT_TYPES.RECEIPT" class="payment-col">
收款<trend class="dashboard-item-trend" type="down" /> 收款<trend class="dashboard-item-trend" type="down" />
</div> </div>
</template> </template>
@ -83,6 +83,7 @@ import { CONTRACT_STATUS, CONTRACT_TYPES, CONTRACT_PAYMENT_TYPES } from '@/const
import Trend from '@/components/trend/index.vue'; import Trend from '@/components/trend/index.vue';
import { getList } from '@/api/list'; import { getList } from '@/api/list';
import { useSettingStore } from '@/store'; import { useSettingStore } from '@/store';
import { prefix } from '@/config/global';
import { COLUMNS } from './constants'; import { COLUMNS } from './constants';
@ -181,7 +182,7 @@ const offsetTop = computed(() => {
}); });
const getContainer = () => { const getContainer = () => {
return document.querySelector('.tdesign-starter-layout'); return document.querySelector(`.${prefix}-layout`);
}; };
</script> </script>

View File

@ -93,7 +93,7 @@
<p v-if="row.paymentType === CONTRACT_PAYMENT_TYPES.PAYMENT" class="payment-col"> <p v-if="row.paymentType === CONTRACT_PAYMENT_TYPES.PAYMENT" class="payment-col">
付款<trend class="dashboard-item-trend" type="up" /> 付款<trend class="dashboard-item-trend" type="up" />
</p> </p>
<p v-if="row.paymentType === CONTRACT_PAYMENT_TYPES.RECIPT" class="payment-col"> <p v-if="row.paymentType === CONTRACT_PAYMENT_TYPES.RECEIPT" class="payment-col">
收款<trend class="dashboard-item-trend" type="down" /> 收款<trend class="dashboard-item-trend" type="down" />
</p> </p>
</template> </template>
@ -118,6 +118,7 @@ import { MessagePlugin } from 'tdesign-vue-next';
import Trend from '@/components/trend/index.vue'; import Trend from '@/components/trend/index.vue';
import { getList } from '@/api/list'; import { getList } from '@/api/list';
import { useSettingStore } from '@/store'; import { useSettingStore } from '@/store';
import { prefix } from '@/config/global';
import { import {
CONTRACT_STATUS, CONTRACT_STATUS,
@ -265,7 +266,7 @@ const offsetTop = computed(() => {
}); });
const getContainer = () => { const getContainer = () => {
return document.querySelector('.tdesign-starter-layout'); return document.querySelector(`.${prefix}-layout`);
}; };
</script> </script>

View File

@ -16,7 +16,7 @@
margin-left: 0; margin-left: 0;
} }
} }
.tdesign-starter-link { .@{starter-prefix}-link {
color: var(--td-brand-color); color: var(--td-brand-color);
text-decoration: none; text-decoration: none;
margin-right: 24px; margin-right: 24px;