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

This commit is contained in:
Uyarn 2023-07-12 13:22:32 +08:00
commit 455b69ea78
13 changed files with 354 additions and 106 deletions

View File

@ -1,6 +1,6 @@
{
"name": "@tencent/tdesign-vue-next-starter",
"version": "0.7.7",
"version": "0.8.0",
"scripts": {
"dev:mock": "vite --open --mode mock",
"dev": "vite --open --mode development",
@ -12,7 +12,7 @@
"lint": "eslint --ext .vue,.js,.jsx,.ts,.tsx ./ --max-warnings 0",
"lint:fix": "eslint --ext .vue,.js,jsx,.ts,.tsx ./ --max-warnings 0 --fix",
"stylelint": "stylelint src/**/*.{html,vue,sass,less}",
"stylelint:fix": "stylelint --fix src/**/*.{html,vue,vss,sass,less}",
"stylelint:fix": "stylelint --fix src/**/*.{html,vue,css,sass,less}",
"prepare": "husky install",
"site:preview": "npm run build && cp -r dist _site",
"test": "echo \"no test specified,work in process\"",
@ -20,60 +20,59 @@
},
"dependencies": {
"axios": "^1.4.0",
"dayjs": "^1.11.8",
"dayjs": "^1.11.9",
"echarts": "5.1.2",
"lodash": "^4.17.21",
"nprogress": "^0.2.0",
"pinia": "^2.0.33",
"pinia": "^2.1.4",
"pinia-plugin-persistedstate": "^3.1.0",
"qrcode.vue": "^3.3.4",
"qs": "^6.11.1",
"qrcode.vue": "^3.4.0",
"qs": "^6.11.2",
"tdesign-icons-vue-next": "^0.1.11",
"tdesign-vue-next": "^1.3.8",
"tdesign-vue-next": "^1.3.10",
"tvision-color": "^1.6.0",
"vue": "^3.3.4",
"vue-clipboard3": "^2.0.0",
"vue-router": "~4.2.2"
"vue-router": "~4.2.3"
},
"devDependencies": {
"@commitlint/cli": "^17.3.0",
"@commitlint/config-conventional": "^17.3.0",
"@types/echarts": "^4.9.16",
"@types/lodash": "^4.14.191",
"@commitlint/cli": "^17.6.6",
"@commitlint/config-conventional": "^17.6.6",
"@types/echarts": "^4.9.18",
"@types/lodash": "^4.14.195",
"@types/nprogress": "^0.2.0",
"@types/qs": "^6.9.7",
"@typescript-eslint/eslint-plugin": "^5.47.1",
"@typescript-eslint/parser": "^5.47.1",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.0.1",
"@vue/compiler-sfc": "^3.2.47",
"@vue/eslint-config-typescript": "^11.0.2",
"commitizen": "^4.2.4",
"@vue/compiler-sfc": "^3.3.4",
"@vue/eslint-config-typescript": "^11.0.3",
"commitizen": "^4.3.0",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^8.30.0",
"eslint": "^8.44.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-vue": "^9.8.0",
"eslint-plugin-vue-scoped-css": "^2.2.0",
"husky": "^8.0.2",
"eslint-plugin-vue": "^9.15.1",
"eslint-plugin-vue-scoped-css": "^2.5.0",
"husky": "^8.0.3",
"less": "^4.1.3",
"lint-staged": "^13.1.0",
"lint-staged": "^13.2.3",
"mockjs": "^1.1.0",
"postcss-html": "^1.5.0",
"postcss-less": "^6.0.0",
"prettier": "^2.8.1",
"stylelint": "~14.9.1",
"stylelint-config-prettier": "~9.0.4",
"stylelint-less": "1.0.6",
"stylelint-order": "~6.0.1",
"typescript": "~4.9.5",
"prettier": "^2.8.8",
"stylelint": "~15.10.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-order": "~6.0.3",
"typescript": "~5.1.6",
"vite": "^4.3.9",
"vite-plugin-mock": "^2.9.6",
"vite-plugin-mock": "^3.0.0",
"vite-svg-loader": "^4.0.0",
"vue-tsc": "^1.8.2"
"vue-tsc": "^1.8.4"
},
"config": {
"commitizen": {
@ -85,7 +84,7 @@
"prettier --write",
"npm run lint:fix"
],
"*.{html,vue,vss,sass,less}": [
"*.{html,vue,css,sass,less}": [
"npm run stylelint:fix"
]
}

View File

@ -1,6 +1,6 @@
<template>
<router-view v-if="!isRefreshing" v-slot="{ Component }">
<transition name="fade" mode="out-in">
<transition name="fade">
<keep-alive :include="aliveViews">
<component :is="Component" />
</keep-alive>
@ -53,6 +53,7 @@ const isRefreshing = computed(() => {
.fade-enter-active {
transition: opacity @anim-duration-slow @anim-time-fn-easing;
}
.fade-enter,
.fade-leave-to {
opacity: 0;

View File

@ -206,7 +206,6 @@ watchEffect(() => {
position: fixed;
bottom: 200px;
right: 0;
transition: transform 0.3s cubic-bezier(0.7, 0.3, 0.1, 1), visibility 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
height: 40px;
width: 40px;
border-radius: 20px 0 0 20px;
@ -252,9 +251,9 @@ watchEffect(() => {
.setting-group-title {
font-size: 14px;
line-height: 22px;
margin: 32px 0 24px 0;
margin: 32px 0 24px;
text-align: left;
font-family: PingFang SC;
font-family: 'PingFang SC', var(--td-font-family);
font-style: normal;
font-weight: 500;
color: var(--td-text-color-primary);
@ -283,6 +282,7 @@ watchEffect(() => {
.setting-container {
padding-bottom: 100px;
}
.t-radio-group.t-size-m {
min-height: 32px;
width: 100%;
@ -306,6 +306,7 @@ watchEffect(() => {
padding: 8px;
border-radius: var(--td-radius-default);
border: 2px solid var(--td-component-border);
> .t-radio-button__label {
display: inline-flex;
}

View File

@ -22,6 +22,7 @@
class="form-item-content"
:options="CONTRACT_STATUS_OPTIONS"
placeholder="请选择合同状态"
clearable
/>
</t-form-item>
</t-col>
@ -43,6 +44,7 @@
class="form-item-content"
:options="CONTRACT_TYPE_OPTIONS"
placeholder="请选择合同类型"
clearable
/>
</t-form-item>
</t-col>
@ -120,6 +122,13 @@ import {
} from '@/constants';
import { useSettingStore } from '@/store';
interface FormData {
name: string;
no: string;
status?: number;
type: string;
}
const store = useSettingStore();
const COLUMNS: PrimaryTableCol[] = [
@ -168,11 +177,10 @@ const COLUMNS: PrimaryTableCol[] = [
const searchForm = {
name: '',
no: '',
status: typeof CONTRACT_STATUS,
type: '',
};
const formData = ref({ ...searchForm });
const formData = ref<FormData>({ ...searchForm });
const rowKey = 'index';
const verticalAlign = 'top' as const;
const hover = true;
@ -242,6 +250,7 @@ const onReset = (val: unknown) => {
};
const onSubmit = (val: unknown) => {
console.log(val);
console.log(formData.value);
};
const rehandlePageChange = (pageInfo: PageInfo, newDataSource: TableRowData[]) => {
console.log('分页变化', pageInfo, newDataSource);
@ -281,6 +290,7 @@ const headerAffixedTop = computed(
display: flex;
justify-content: flex-end;
align-items: center;
.expand {
.t-button__text {
display: flex;

View File

@ -27,7 +27,7 @@
text-decoration: none;
margin-right: 24px;
cursor: pointer;
transition: color 0.2s cubic-bezier(0.38, 0, 0.24, 1);
transition: color .2s cubic-bezier(.38, 0, .24, 1);
}
.left-operation-container,
@ -45,7 +45,8 @@
}
.t-menu--dark .t-menu__operations .t-icon {
color: rgba(255, 255, 255, 0.55);
color: rgba(255, 255, 255, 55%);
&:hover {
cursor: pointer;
}
@ -81,6 +82,7 @@
&-layout {
height: calc(100vh - var(--td-comp-size-xxxl));
overflow-y: scroll;
&-tabs-nav {
max-width: 100%;
position: fixed;
@ -127,7 +129,7 @@
top: 0;
bottom: 0;
z-index: 200;
transition: all 0.3s;
transition: all .3s;
min-height: 100%;
&-mix {
@ -153,6 +155,7 @@
align-items: center;
justify-content: center;
width: 100%;
&:hover {
cursor: pointer;
}
@ -173,19 +176,19 @@
&-logo-normal {
color: var(--td-brand-color);
font: var(--td-font-body-large);
transition: all 0.3s;
transition: all .3s;
}
}
&-side-nav-placeholder {
flex: 1 1 232px;
min-width: 232px;
transition: all 0.3s;
transition: all .3s;
&-hidden {
flex: 1 1 72px;
min-width: 72px;
transition: all 0.3s;
transition: all .3s;
}
}
}
@ -204,7 +207,7 @@
.version-container {
color: var(--td-text-color-primary);
opacity: 0.4;
opacity: .4;
}
.t-menu__popup {

View File

@ -1,8 +1,8 @@
// 对部分样式进行重置
body {
color: var(--td-text-color-secondary);
font-family: -apple-system, BlinkMacSystemFont, var(--td-font-family);
font: var(--td-font-body-medium);
font-family: -apple-system, BlinkMacSystemFont, var(--td-font-family);
-webkit-font-smoothing: antialiased;
padding: 0;
margin: 0;

75
src/types/axios.d.ts vendored
View File

@ -1,18 +1,89 @@
import { AxiosRequestConfig } from 'axios';
import type { AxiosRequestConfig } from 'axios';
/**
* Axios请求配置
*/
export interface RequestOptions {
/**
*
*
* : http://www.baidu.com/api
*/
apiUrl?: string;
/**
*
*
* : http://www.baidu.com/api
* urlPrefix: 'api'
*/
isJoinPrefix?: boolean;
/**
*
*/
urlPrefix?: string;
/**
* POST请求的时候添加参数到Url中
*/
joinParamsToUrl?: boolean;
/**
*
*/
formatDate?: boolean;
/**
*
*/
isTransformResponse?: boolean;
/**
*
*
* : 需要获取响应头时使用该属性
*/
isReturnNativeResponse?: boolean;
ignoreRepeatRequest?: boolean;
/**
*
*
*
*
*
*/
ignoreCancelToken?: boolean;
/**
*
*/
joinTime?: boolean;
/**
* Token
*/
withToken?: boolean;
/**
*
*/
retry?: {
/**
*
*/
count: number;
/**
*
*
* 单位: 毫秒
*/
delay: number;
};
/**
*
*
* 单位: 毫秒
*/
throttle?: {
delay: number;
};
/**
*
*
* 单位: 毫秒
*/
debounce?: {
delay: number;
};
}

View File

@ -1,6 +1,15 @@
import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
import axios, {
AxiosError,
AxiosInstance,
AxiosRequestConfig,
AxiosRequestHeaders,
AxiosResponse,
InternalAxiosRequestConfig,
} from 'axios';
import cloneDeep from 'lodash/cloneDeep';
import debounce from 'lodash/debounce';
import isFunction from 'lodash/isFunction';
import throttle from 'lodash/throttle';
import { stringify } from 'qs';
import { ContentTypeEnum } from '@/constants';
@ -9,12 +18,20 @@ import { AxiosRequestConfigRetry, RequestOptions, Result } from '@/types/axios';
import { AxiosCanceler } from './AxiosCancel';
import { CreateAxiosOptions } from './AxiosTransform';
// Axios模块
/**
* Axios
*/
export class VAxios {
// axios句柄
/**
* Axios实例句柄
* @private
*/
private instance: AxiosInstance;
// axios选项
/**
* Axios配置
* @private
*/
private readonly options: CreateAxiosOptions;
constructor(options: CreateAxiosOptions) {
@ -23,57 +40,71 @@ export class VAxios {
this.setupInterceptors();
}
// 创建axios句柄
/**
* Axios实例
* @param config
* @private
*/
private createAxios(config: CreateAxiosOptions): void {
this.instance = axios.create(config);
}
// 获取数据处理
/**
*
* @private
*/
private getTransform() {
const { transform } = this.options;
return transform;
}
// 获取句柄
/**
* Axios实例
*/
getAxios(): AxiosInstance {
return this.instance;
}
// 配置 axios
/**
* Axios
* @param config
*/
configAxios(config: CreateAxiosOptions) {
if (!this.instance) {
return;
}
if (!this.instance) return;
this.createAxios(config);
}
// 设置通用头信息
/**
*
* @param headers
*/
setHeader(headers: Record<string, string>): void {
if (!this.instance) {
return;
}
if (!this.instance) return;
Object.assign(this.instance.defaults.headers, headers);
}
// 设置拦截器
/**
*
* @private
*/
private setupInterceptors() {
const transform = this.getTransform();
if (!transform) {
return;
}
if (!transform) return;
const { requestInterceptors, requestInterceptorsCatch, responseInterceptors, responseInterceptorsCatch } =
transform;
const axiosCanceler = new AxiosCanceler();
// 请求配置处理
// 请求拦截器
this.instance.interceptors.request.use((config: InternalAxiosRequestConfig) => {
// 如果忽略取消令牌,则不会取消重复的请求
// @ts-ignore
const { ignoreRepeatRequest } = config.requestOptions;
const ignoreRepeat = ignoreRepeatRequest ?? this.options.requestOptions?.ignoreRepeatRequest;
if (!ignoreRepeat) axiosCanceler.addPending(config);
const { ignoreCancelToken } = config.requestOptions;
const ignoreCancel = ignoreCancelToken ?? this.options.requestOptions?.ignoreCancelToken;
if (!ignoreCancel) axiosCanceler.addPending(config);
if (requestInterceptors && isFunction(requestInterceptors)) {
config = requestInterceptors(config, this.options);
config = requestInterceptors(config, this.options) as InternalAxiosRequestConfig;
}
return config;
@ -99,9 +130,12 @@ export class VAxios {
}
}
// 支持Form Data
/**
* FormData
* @param config
*/
supportFormData(config: AxiosRequestConfig) {
const headers = config.headers || this.options.headers;
const headers = config.headers || (this.options.headers as AxiosRequestHeaders);
const contentType = headers?.['Content-Type'] || headers?.['content-type'];
if (
@ -118,7 +152,10 @@ export class VAxios {
};
}
// 支持params数组参数格式化
/**
* params
* @param config
*/
supportParamsStringify(config: AxiosRequestConfig) {
const headers = config.headers || this.options.headers;
const contentType = headers?.['Content-Type'] || headers?.['content-type'];
@ -153,8 +190,62 @@ export class VAxios {
return this.request({ ...config, method: 'PATCH' }, options);
}
// 请求
async request<T = any>(config: AxiosRequestConfigRetry, options?: RequestOptions): Promise<T> {
/**
*
* @param key key
* @param file
* @param config
* @param options
*/
upload<T = any>(key: string, file: File, config: AxiosRequestConfig, options?: RequestOptions): Promise<T> {
const params: FormData = config.params ?? new FormData();
params.append(key, file);
return this.request(
{
...config,
method: 'POST',
headers: {
'Content-Type': ContentTypeEnum.FormData,
},
params,
},
options,
);
}
/**
*
* @param config
* @param options
*/
request<T = any>(config: AxiosRequestConfigRetry, options?: RequestOptions): Promise<T> {
const { requestOptions } = this.options;
if (requestOptions.throttle !== undefined && requestOptions.debounce !== undefined) {
throw new Error('throttle and debounce cannot be set at the same time');
}
if (requestOptions.throttle && requestOptions.throttle.delay !== 0) {
return new Promise((resolve) => {
throttle(() => resolve(this.synthesisRequest(config, options)), requestOptions.throttle.delay);
});
}
if (requestOptions.debounce && requestOptions.debounce.delay !== 0) {
return new Promise((resolve) => {
debounce(() => resolve(this.synthesisRequest(config, options)), requestOptions.debounce.delay);
});
}
return this.synthesisRequest(config, options);
}
/**
*
* @private
*/
private async synthesisRequest<T = any>(config: AxiosRequestConfigRetry, options?: RequestOptions): Promise<T> {
let conf: CreateAxiosOptions = cloneDeep(config);
const transform = this.getTransform();

View File

@ -5,10 +5,20 @@ import isFunction from 'lodash/isFunction';
// 存储请求与取消令牌的键值对列表
let pendingMap = new Map<string, Canceler>();
/**
* Url
* @param config
*/
export const getPendingUrl = (config: AxiosRequestConfig) => [config.method, config.url].join('&');
/**
* @description
*/
export class AxiosCanceler {
// 添加请求到列表
/**
*
* @param config
*/
addPending(config: AxiosRequestConfig) {
this.removePending(config);
const url = getPendingUrl(config);
@ -22,7 +32,9 @@ export class AxiosCanceler {
});
}
// 清空所有请求
/**
*
*/
removeAllPending() {
pendingMap.forEach((cancel) => {
if (cancel && isFunction(cancel)) cancel();
@ -30,7 +42,10 @@ export class AxiosCanceler {
pendingMap.clear();
}
// 移除某个请求
/**
*
* @param config
*/
removePending(config: AxiosRequestConfig) {
const url = getPendingUrl(config);
@ -43,6 +58,9 @@ export class AxiosCanceler {
}
}
/**
*
*/
reset() {
pendingMap = new Map<string, Canceler>();
}

View File

@ -1,38 +1,64 @@
import type { AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
import type { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
import { AxiosError } from 'axios';
import type { RequestOptions, Result } from '@/types/axios';
// 创建Axios选项
/**
* @description Axios实例配置
*/
export interface CreateAxiosOptions extends AxiosRequestConfig {
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication#authentication_schemes
/**
*
*
* https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication#authentication_schemes
*/
authenticationScheme?: string;
// 数据处理
/**
*
*/
transform?: AxiosTransform;
// 请求选项
/**
*
*/
requestOptions?: RequestOptions;
}
// Axios 数据处理
/**
* Axios请求数据处理
*/
export abstract class AxiosTransform {
// 请求前Hook
/**
*
*/
beforeRequestHook?: (config: AxiosRequestConfig, options: RequestOptions) => AxiosRequestConfig;
// 转换前Hook
transformRequestHook?: (res: AxiosResponse<Result>, options: RequestOptions) => any;
/**
*
*/
transformRequestHook?: <T = any>(res: AxiosResponse<Result>, options: RequestOptions) => T;
// 请求失败处理
requestCatchHook?: (e: Error | AxiosError, options: RequestOptions) => Promise<any>;
/**
*
*/
requestCatchHook?: <T = any>(e: Error | AxiosError, options: RequestOptions) => Promise<T>;
// 请求前的拦截器
requestInterceptors?: (config: AxiosRequestConfig, options: CreateAxiosOptions) => InternalAxiosRequestConfig;
/**
*
*/
requestInterceptors?: (config: AxiosRequestConfig, options: CreateAxiosOptions) => AxiosRequestConfig;
// 请求后的拦截器
/**
*
*/
responseInterceptors?: (res: AxiosResponse) => AxiosResponse;
// 请求前的拦截器错误处理
/**
*
*/
requestInterceptorsCatch?: (error: AxiosError) => void;
// 请求后的拦截器错误处理
/**
*
*/
responseInterceptorsCatch?: (error: AxiosError, instance: AxiosInstance) => void;
}

View File

@ -1,5 +1,5 @@
// axios配置 可自行根据项目进行更改,只需更改该文件即可,其他文件可以不动
import type { AxiosInstance, InternalAxiosRequestConfig } from 'axios';
import type { AxiosInstance } from 'axios';
import isString from 'lodash/isString';
import merge from 'lodash/merge';
@ -122,7 +122,7 @@ const transform: AxiosTransform = {
? `${options.authenticationScheme} ${token}`
: token;
}
return config as InternalAxiosRequestConfig;
return config;
},
// 响应拦截器处理
@ -186,8 +186,10 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
formatDate: true,
// 是否加入时间戳
joinTime: true,
// 忽略重复请求
ignoreRepeatRequest: true,
// 是否忽略请求取消令牌
// 如果启用,则重复请求时不进行处理
// 如果禁用,则重复请求时会取消当前请求
ignoreCancelToken: true,
// 是否携带token
withToken: true,
// 重试

View File

@ -1,7 +1,33 @@
module.exports = {
defaultSeverity: 'error',
extends: ['stylelint-config-prettier'],
plugins: ['stylelint-less'],
extends: ['stylelint-config-standard'],
rules: {
'no-duplicate-selectors': null,
'number-leading-zero': 'never',
'block-no-empty': null,
'selector-class-pattern': null,
'declaration-block-no-redundant-longhand-properties': [true, { ignoreShorthands: ['/flex/'] }],
'custom-property-pattern': null,
'keyframes-name-pattern': null,
'no-empty-source': null,
'font-family-no-missing-generic-family-keyword': [
true,
{
ignoreFontFamilies: ['PingFangSC-Regular', 'PingFangSC-Medium', 't'],
},
],
'unit-no-unknown': [true, { ignoreUnits: ['rpx'] }],
'function-url-quotes': null,
'max-line-length': null,
'at-rule-empty-line-before': ['always', { ignore: ['after-comment'] }],
'declaration-colon-newline-after': null,
'no-descending-specificity': null,
'selector-type-no-unknown': null,
'color-function-notation': 'legacy',
'value-keyword-case': null,
'property-no-unknown': [true, { checkPrefixed: true }],
'import-notation': 'string',
},
overrides: [
{
files: ['**/*.html', '**/*.vue'],

View File

@ -35,7 +35,7 @@ export default ({ mode }: ConfigEnv): UserConfig => {
vueJsx(),
viteMockServe({
mockPath: 'mock',
localEnabled: true,
enable: true,
}),
svgLoader(),
],