Browse Source

fix: 修复控制台一些常见报错和警告 (#1750)

Co-authored-by: wangbin <18695686631@163.com>
pull/1755/head
wangxiaoer5200 5 years ago
committed by GitHub
parent
commit
d31cb904db
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/components/Application/src/AppLocalePicker.vue
  2. 2
      src/components/Table/src/components/settings/SizeSetting.vue
  3. 3
      src/layouts/default/header/components/lock/LockModal.vue
  4. 8
      src/layouts/default/tabs/components/TabContent.vue
  5. 6
      src/layouts/default/tabs/index.less
  6. 18
      src/views/dashboard/analysis/components/VisitRadar.vue
  7. 18
      src/views/dashboard/workbench/components/SaleRadar.vue
  8. 18
      src/views/demo/charts/SaleRadar.vue
  9. 2
      src/views/demo/feat/request-demo/index.vue
  10. 63
      src/views/demo/page/form/basic/data.ts
  11. 4
      src/views/demo/page/form/basic/index.vue

2
src/components/Application/src/AppLocalePicker.vue

@ -4,7 +4,7 @@
-->
<template>
<Dropdown
placement="bottomCenter"
placement="bottom"
:trigger="['click']"
:dropMenuList="localeList"
:selectedKeys="selectedKeys"

2
src/components/Table/src/components/settings/SizeSetting.vue

@ -4,7 +4,7 @@
<span>{{ t('component.table.settingDens') }}</span>
</template>
<Dropdown placement="bottomCenter" :trigger="['click']" :getPopupContainer="getPopupContainer">
<Dropdown placement="bottom" :trigger="['click']" :getPopupContainer="getPopupContainer">
<ColumnHeightOutlined />
<template #overlay>
<Menu @click="handleTitleClick" selectable v-model:selectedKeys="selectedKeysRef">

3
src/layouts/default/header/components/lock/LockModal.vue

@ -53,6 +53,9 @@
{
field: 'password',
label: t('layout.header.lockScreenPassword'),
colProps: {
span: 24,
},
component: 'InputPassword',
required: true,
},

8
src/layouts/default/tabs/components/TabContent.vue

@ -1,5 +1,11 @@
<template>
<Dropdown :dropMenuList="getDropMenuList" :trigger="getTrigger" @menu-event="handleMenuEvent">
<Dropdown
:dropMenuList="getDropMenuList"
:trigger="getTrigger"
placement="bottom"
overlayClassName="multiple-tabs__dropdown"
@menu-event="handleMenuEvent"
>
<div :class="`${prefixCls}__info`" @contextmenu="handleContext" v-if="getIsTabs">
<span class="ml-1">{{ getTitle }}</span>
</div>

6
src/layouts/default/tabs/index.less

@ -180,3 +180,9 @@ html[data-theme='light'] {
}
}
}
.multiple-tabs__dropdown {
.ant-dropdown-content {
width: 172px;
}
}

18
src/views/dashboard/analysis/components/VisitRadar.vue

@ -39,28 +39,22 @@
splitNumber: 8,
indicator: [
{
text: '电脑',
max: 100,
name: '电脑',
},
{
text: '充电器',
max: 100,
name: '充电器',
},
{
text: '耳机',
max: 100,
name: '耳机',
},
{
text: '手机',
max: 100,
name: '手机',
},
{
text: 'Ipad',
max: 100,
name: 'Ipad',
},
{
text: '耳机',
max: 100,
name: '耳机',
},
],
},

18
src/views/dashboard/workbench/components/SaleRadar.vue

@ -39,28 +39,22 @@
splitNumber: 8,
indicator: [
{
text: '2017',
max: 100,
name: '2017',
},
{
text: '2017',
max: 100,
name: '2017',
},
{
text: '2018',
max: 100,
name: '2018',
},
{
text: '2019',
max: 100,
name: '2019',
},
{
text: '2020',
max: 100,
name: '2020',
},
{
text: '2021',
max: 100,
name: '2021',
},
],
},

18
src/views/demo/charts/SaleRadar.vue

@ -43,28 +43,22 @@
splitNumber: 8,
indicator: [
{
text: '2017',
max: 100,
name: '2017',
},
{
text: '2017',
max: 100,
name: '2017',
},
{
text: '2018',
max: 100,
name: '2018',
},
{
text: '2019',
max: 100,
name: '2019',
},
{
text: '2020',
max: 100,
name: '2020',
},
{
text: '2021',
max: 100,
name: '2021',
},
],
},

2
src/views/demo/feat/request-demo/index.vue

@ -1,6 +1,6 @@
<template>
<div class="request-box">
<a-button @click="handleClick" color="primary"> 点击会重新发起请求5次 </a-button>
<a-button @click="handleClick" type="primary"> 点击会重新发起请求5次 </a-button>
<p>打开浏览器的network面板,可以看到发出了六次请求</p>
</div>
</template>

63
src/views/demo/page/form/basic/data.ts

@ -1,10 +1,14 @@
import { FormSchema } from '/@/components/Form';
const colProps = {
span: 8,
};
export const schemas: FormSchema[] = [
{
field: 'title',
component: 'Input',
label: '标题',
colProps,
componentProps: {
placeholder: '给目标起个名字',
},
@ -14,12 +18,37 @@ export const schemas: FormSchema[] = [
field: 'time',
component: 'RangePicker',
label: '起止日期',
colProps,
required: true,
},
{
field: 'client',
component: 'Input',
colProps,
label: '客户',
helpMessage: '目标的服务对象',
subLabel: '( 选填 )',
componentProps: {
placeholder: '请描述你服务的客户,内部客户直接 @姓名/工号',
},
},
{
field: 'weights',
component: 'InputNumber',
label: '权重',
colProps,
subLabel: '( 选填 )',
componentProps: {
formatter: (value: string) => (value ? `${value}%` : ''),
parser: (value: string) => value.replace('%', ''),
placeholder: '请输入',
},
},
{
field: 'target',
component: 'InputTextArea',
label: '目标描述',
colProps,
componentProps: {
placeholder: '请输入你的阶段性工作目标',
rows: 4,
@ -30,46 +59,33 @@ export const schemas: FormSchema[] = [
field: 'metrics',
component: 'InputTextArea',
label: '衡量标准',
colProps,
componentProps: {
placeholder: '请输入衡量标准',
rows: 4,
},
required: true,
},
{
field: 'client',
component: 'Input',
label: '客户',
helpMessage: '目标的服务对象',
subLabel: '( 选填 )',
componentProps: {
placeholder: '请描述你服务的客户,内部客户直接 @姓名/工号',
},
},
{
field: 'inviteer',
component: 'Input',
label: '邀评人',
subLabel: '( 选填 )',
componentProps: {
placeholder: '请直接 @姓名/工号,最多可邀请 5 人',
colProps: {
span: 8,
},
},
{
field: 'weights',
component: 'InputNumber',
label: '权重',
subLabel: '( 选填 )',
componentProps: {
formatter: (value: string) => (value ? `${value}%` : ''),
parser: (value: string) => value.replace('%', ''),
placeholder: '请输入',
placeholder: '请直接 @姓名/工号,最多可邀请 5 人',
},
},
{
field: 'disclosure',
component: 'RadioGroup',
label: '目标公开',
colProps: {
span: 16,
},
itemProps: {
extra: '客户、邀评人默认被分享',
},
@ -91,9 +107,12 @@ export const schemas: FormSchema[] = [
},
},
{
field: 'disclosurer',
field: 'disclosure',
component: 'Select',
label: ' ',
colProps: {
span: 8,
},
show: ({ model }) => {
return model.disclosure === '2';
},

4
src/views/demo/page/form/basic/index.vue

@ -25,12 +25,12 @@
span: 8,
},
wrapperCol: {
span: 10,
span: 15,
},
schemas: schemas,
actionColOptions: {
offset: 8,
span: 12,
span: 23,
},
submitButtonOptions: {
text: '提交',

Loading…
Cancel
Save