Commit d31cb904dbbe48612eda1c6c1abefc227d7e9684
Committed by
GitHub
1 parent
a542317d
fix: 修复控制台一些常见报错和警告 (#1750)
Co-authored-by: wangbin <18695686631@163.com>
Showing
11 changed files
with
80 additions
and
64 deletions
src/components/Application/src/AppLocalePicker.vue
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | --> | 4 | --> |
5 | <template> | 5 | <template> |
6 | <Dropdown | 6 | <Dropdown |
7 | - placement="bottomCenter" | 7 | + placement="bottom" |
8 | :trigger="['click']" | 8 | :trigger="['click']" |
9 | :dropMenuList="localeList" | 9 | :dropMenuList="localeList" |
10 | :selectedKeys="selectedKeys" | 10 | :selectedKeys="selectedKeys" |
src/components/Table/src/components/settings/SizeSetting.vue
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | <span>{{ t('component.table.settingDens') }}</span> | 4 | <span>{{ t('component.table.settingDens') }}</span> |
5 | </template> | 5 | </template> |
6 | 6 | ||
7 | - <Dropdown placement="bottomCenter" :trigger="['click']" :getPopupContainer="getPopupContainer"> | 7 | + <Dropdown placement="bottom" :trigger="['click']" :getPopupContainer="getPopupContainer"> |
8 | <ColumnHeightOutlined /> | 8 | <ColumnHeightOutlined /> |
9 | <template #overlay> | 9 | <template #overlay> |
10 | <Menu @click="handleTitleClick" selectable v-model:selectedKeys="selectedKeysRef"> | 10 | <Menu @click="handleTitleClick" selectable v-model:selectedKeys="selectedKeysRef"> |
src/layouts/default/header/components/lock/LockModal.vue
@@ -53,6 +53,9 @@ | @@ -53,6 +53,9 @@ | ||
53 | { | 53 | { |
54 | field: 'password', | 54 | field: 'password', |
55 | label: t('layout.header.lockScreenPassword'), | 55 | label: t('layout.header.lockScreenPassword'), |
56 | + colProps: { | ||
57 | + span: 24, | ||
58 | + }, | ||
56 | component: 'InputPassword', | 59 | component: 'InputPassword', |
57 | required: true, | 60 | required: true, |
58 | }, | 61 | }, |
src/layouts/default/tabs/components/TabContent.vue
1 | <template> | 1 | <template> |
2 | - <Dropdown :dropMenuList="getDropMenuList" :trigger="getTrigger" @menu-event="handleMenuEvent"> | 2 | + <Dropdown |
3 | + :dropMenuList="getDropMenuList" | ||
4 | + :trigger="getTrigger" | ||
5 | + placement="bottom" | ||
6 | + overlayClassName="multiple-tabs__dropdown" | ||
7 | + @menu-event="handleMenuEvent" | ||
8 | + > | ||
3 | <div :class="`${prefixCls}__info`" @contextmenu="handleContext" v-if="getIsTabs"> | 9 | <div :class="`${prefixCls}__info`" @contextmenu="handleContext" v-if="getIsTabs"> |
4 | <span class="ml-1">{{ getTitle }}</span> | 10 | <span class="ml-1">{{ getTitle }}</span> |
5 | </div> | 11 | </div> |
src/layouts/default/tabs/index.less
src/views/dashboard/analysis/components/VisitRadar.vue
@@ -39,28 +39,22 @@ | @@ -39,28 +39,22 @@ | ||
39 | splitNumber: 8, | 39 | splitNumber: 8, |
40 | indicator: [ | 40 | indicator: [ |
41 | { | 41 | { |
42 | - text: '电脑', | ||
43 | - max: 100, | 42 | + name: '电脑', |
44 | }, | 43 | }, |
45 | { | 44 | { |
46 | - text: '充电器', | ||
47 | - max: 100, | 45 | + name: '充电器', |
48 | }, | 46 | }, |
49 | { | 47 | { |
50 | - text: '耳机', | ||
51 | - max: 100, | 48 | + name: '耳机', |
52 | }, | 49 | }, |
53 | { | 50 | { |
54 | - text: '手机', | ||
55 | - max: 100, | 51 | + name: '手机', |
56 | }, | 52 | }, |
57 | { | 53 | { |
58 | - text: 'Ipad', | ||
59 | - max: 100, | 54 | + name: 'Ipad', |
60 | }, | 55 | }, |
61 | { | 56 | { |
62 | - text: '耳机', | ||
63 | - max: 100, | 57 | + name: '耳机', |
64 | }, | 58 | }, |
65 | ], | 59 | ], |
66 | }, | 60 | }, |
src/views/dashboard/workbench/components/SaleRadar.vue
@@ -39,28 +39,22 @@ | @@ -39,28 +39,22 @@ | ||
39 | splitNumber: 8, | 39 | splitNumber: 8, |
40 | indicator: [ | 40 | indicator: [ |
41 | { | 41 | { |
42 | - text: '2017', | ||
43 | - max: 100, | 42 | + name: '2017', |
44 | }, | 43 | }, |
45 | { | 44 | { |
46 | - text: '2017', | ||
47 | - max: 100, | 45 | + name: '2017', |
48 | }, | 46 | }, |
49 | { | 47 | { |
50 | - text: '2018', | ||
51 | - max: 100, | 48 | + name: '2018', |
52 | }, | 49 | }, |
53 | { | 50 | { |
54 | - text: '2019', | ||
55 | - max: 100, | 51 | + name: '2019', |
56 | }, | 52 | }, |
57 | { | 53 | { |
58 | - text: '2020', | ||
59 | - max: 100, | 54 | + name: '2020', |
60 | }, | 55 | }, |
61 | { | 56 | { |
62 | - text: '2021', | ||
63 | - max: 100, | 57 | + name: '2021', |
64 | }, | 58 | }, |
65 | ], | 59 | ], |
66 | }, | 60 | }, |
src/views/demo/charts/SaleRadar.vue
@@ -43,28 +43,22 @@ | @@ -43,28 +43,22 @@ | ||
43 | splitNumber: 8, | 43 | splitNumber: 8, |
44 | indicator: [ | 44 | indicator: [ |
45 | { | 45 | { |
46 | - text: '2017', | ||
47 | - max: 100, | 46 | + name: '2017', |
48 | }, | 47 | }, |
49 | { | 48 | { |
50 | - text: '2017', | ||
51 | - max: 100, | 49 | + name: '2017', |
52 | }, | 50 | }, |
53 | { | 51 | { |
54 | - text: '2018', | ||
55 | - max: 100, | 52 | + name: '2018', |
56 | }, | 53 | }, |
57 | { | 54 | { |
58 | - text: '2019', | ||
59 | - max: 100, | 55 | + name: '2019', |
60 | }, | 56 | }, |
61 | { | 57 | { |
62 | - text: '2020', | ||
63 | - max: 100, | 58 | + name: '2020', |
64 | }, | 59 | }, |
65 | { | 60 | { |
66 | - text: '2021', | ||
67 | - max: 100, | 61 | + name: '2021', |
68 | }, | 62 | }, |
69 | ], | 63 | ], |
70 | }, | 64 | }, |
src/views/demo/feat/request-demo/index.vue
1 | <template> | 1 | <template> |
2 | <div class="request-box"> | 2 | <div class="request-box"> |
3 | - <a-button @click="handleClick" color="primary"> 点击会重新发起请求5次 </a-button> | 3 | + <a-button @click="handleClick" type="primary"> 点击会重新发起请求5次 </a-button> |
4 | <p>打开浏览器的network面板,可以看到发出了六次请求</p> | 4 | <p>打开浏览器的network面板,可以看到发出了六次请求</p> |
5 | </div> | 5 | </div> |
6 | </template> | 6 | </template> |
src/views/demo/page/form/basic/data.ts
1 | import { FormSchema } from '/@/components/Form'; | 1 | import { FormSchema } from '/@/components/Form'; |
2 | +const colProps = { | ||
3 | + span: 8, | ||
4 | +}; | ||
2 | 5 | ||
3 | export const schemas: FormSchema[] = [ | 6 | export const schemas: FormSchema[] = [ |
4 | { | 7 | { |
5 | field: 'title', | 8 | field: 'title', |
6 | component: 'Input', | 9 | component: 'Input', |
7 | label: '标题', | 10 | label: '标题', |
11 | + colProps, | ||
8 | componentProps: { | 12 | componentProps: { |
9 | placeholder: '给目标起个名字', | 13 | placeholder: '给目标起个名字', |
10 | }, | 14 | }, |
@@ -14,12 +18,37 @@ export const schemas: FormSchema[] = [ | @@ -14,12 +18,37 @@ export const schemas: FormSchema[] = [ | ||
14 | field: 'time', | 18 | field: 'time', |
15 | component: 'RangePicker', | 19 | component: 'RangePicker', |
16 | label: '起止日期', | 20 | label: '起止日期', |
21 | + colProps, | ||
17 | required: true, | 22 | required: true, |
18 | }, | 23 | }, |
19 | { | 24 | { |
25 | + field: 'client', | ||
26 | + component: 'Input', | ||
27 | + colProps, | ||
28 | + label: '客户', | ||
29 | + helpMessage: '目标的服务对象', | ||
30 | + subLabel: '( 选填 )', | ||
31 | + componentProps: { | ||
32 | + placeholder: '请描述你服务的客户,内部客户直接 @姓名/工号', | ||
33 | + }, | ||
34 | + }, | ||
35 | + { | ||
36 | + field: 'weights', | ||
37 | + component: 'InputNumber', | ||
38 | + label: '权重', | ||
39 | + colProps, | ||
40 | + subLabel: '( 选填 )', | ||
41 | + componentProps: { | ||
42 | + formatter: (value: string) => (value ? `${value}%` : ''), | ||
43 | + parser: (value: string) => value.replace('%', ''), | ||
44 | + placeholder: '请输入', | ||
45 | + }, | ||
46 | + }, | ||
47 | + { | ||
20 | field: 'target', | 48 | field: 'target', |
21 | component: 'InputTextArea', | 49 | component: 'InputTextArea', |
22 | label: '目标描述', | 50 | label: '目标描述', |
51 | + colProps, | ||
23 | componentProps: { | 52 | componentProps: { |
24 | placeholder: '请输入你的阶段性工作目标', | 53 | placeholder: '请输入你的阶段性工作目标', |
25 | rows: 4, | 54 | rows: 4, |
@@ -30,46 +59,33 @@ export const schemas: FormSchema[] = [ | @@ -30,46 +59,33 @@ export const schemas: FormSchema[] = [ | ||
30 | field: 'metrics', | 59 | field: 'metrics', |
31 | component: 'InputTextArea', | 60 | component: 'InputTextArea', |
32 | label: '衡量标准', | 61 | label: '衡量标准', |
62 | + colProps, | ||
33 | componentProps: { | 63 | componentProps: { |
34 | placeholder: '请输入衡量标准', | 64 | placeholder: '请输入衡量标准', |
35 | rows: 4, | 65 | rows: 4, |
36 | }, | 66 | }, |
37 | required: true, | 67 | required: true, |
38 | }, | 68 | }, |
39 | - { | ||
40 | - field: 'client', | ||
41 | - component: 'Input', | ||
42 | - label: '客户', | ||
43 | - helpMessage: '目标的服务对象', | ||
44 | - subLabel: '( 选填 )', | ||
45 | - componentProps: { | ||
46 | - placeholder: '请描述你服务的客户,内部客户直接 @姓名/工号', | ||
47 | - }, | ||
48 | - }, | 69 | + |
49 | { | 70 | { |
50 | field: 'inviteer', | 71 | field: 'inviteer', |
51 | component: 'Input', | 72 | component: 'Input', |
52 | label: '邀评人', | 73 | label: '邀评人', |
53 | - subLabel: '( 选填 )', | ||
54 | - componentProps: { | ||
55 | - placeholder: '请直接 @姓名/工号,最多可邀请 5 人', | 74 | + colProps: { |
75 | + span: 8, | ||
56 | }, | 76 | }, |
57 | - }, | ||
58 | - { | ||
59 | - field: 'weights', | ||
60 | - component: 'InputNumber', | ||
61 | - label: '权重', | ||
62 | subLabel: '( 选填 )', | 77 | subLabel: '( 选填 )', |
63 | componentProps: { | 78 | componentProps: { |
64 | - formatter: (value: string) => (value ? `${value}%` : ''), | ||
65 | - parser: (value: string) => value.replace('%', ''), | ||
66 | - placeholder: '请输入', | 79 | + placeholder: '请直接 @姓名/工号,最多可邀请 5 人', |
67 | }, | 80 | }, |
68 | }, | 81 | }, |
69 | { | 82 | { |
70 | field: 'disclosure', | 83 | field: 'disclosure', |
71 | component: 'RadioGroup', | 84 | component: 'RadioGroup', |
72 | label: '目标公开', | 85 | label: '目标公开', |
86 | + colProps: { | ||
87 | + span: 16, | ||
88 | + }, | ||
73 | itemProps: { | 89 | itemProps: { |
74 | extra: '客户、邀评人默认被分享', | 90 | extra: '客户、邀评人默认被分享', |
75 | }, | 91 | }, |
@@ -91,9 +107,12 @@ export const schemas: FormSchema[] = [ | @@ -91,9 +107,12 @@ export const schemas: FormSchema[] = [ | ||
91 | }, | 107 | }, |
92 | }, | 108 | }, |
93 | { | 109 | { |
94 | - field: 'disclosurer', | 110 | + field: 'disclosure', |
95 | component: 'Select', | 111 | component: 'Select', |
96 | label: ' ', | 112 | label: ' ', |
113 | + colProps: { | ||
114 | + span: 8, | ||
115 | + }, | ||
97 | show: ({ model }) => { | 116 | show: ({ model }) => { |
98 | return model.disclosure === '2'; | 117 | return model.disclosure === '2'; |
99 | }, | 118 | }, |
src/views/demo/page/form/basic/index.vue
@@ -25,12 +25,12 @@ | @@ -25,12 +25,12 @@ | ||
25 | span: 8, | 25 | span: 8, |
26 | }, | 26 | }, |
27 | wrapperCol: { | 27 | wrapperCol: { |
28 | - span: 10, | 28 | + span: 15, |
29 | }, | 29 | }, |
30 | schemas: schemas, | 30 | schemas: schemas, |
31 | actionColOptions: { | 31 | actionColOptions: { |
32 | offset: 8, | 32 | offset: 8, |
33 | - span: 12, | 33 | + span: 23, |
34 | }, | 34 | }, |
35 | submitButtonOptions: { | 35 | submitButtonOptions: { |
36 | text: '提交', | 36 | text: '提交', |