From d31cb904dbbe48612eda1c6c1abefc227d7e9684 Mon Sep 17 00:00:00 2001
From: wangxiaoer5200 <38752239+wangxiaoer5200@users.noreply.github.com>
Date: Fri, 25 Mar 2022 23:39:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=E4=B8=80=E4=BA=9B=E5=B8=B8=E8=A7=81=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E5=92=8C=E8=AD=A6=E5=91=8A=20(#1750)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: wangbin <18695686631@163.com>
---
 .../Application/src/AppLocalePicker.vue       |  2 +-
 .../src/components/settings/SizeSetting.vue   |  2 +-
 .../header/components/lock/LockModal.vue      |  3 +
 .../default/tabs/components/TabContent.vue    |  8 ++-
 src/layouts/default/tabs/index.less           |  6 ++
 .../analysis/components/VisitRadar.vue        | 18 ++----
 .../workbench/components/SaleRadar.vue        | 18 ++----
 src/views/demo/charts/SaleRadar.vue           | 18 ++----
 src/views/demo/feat/request-demo/index.vue    |  2 +-
 src/views/demo/page/form/basic/data.ts        | 63 ++++++++++++-------
 src/views/demo/page/form/basic/index.vue      |  4 +-
 11 files changed, 80 insertions(+), 64 deletions(-)

diff --git a/src/components/Application/src/AppLocalePicker.vue b/src/components/Application/src/AppLocalePicker.vue
index 75f1caa7..f71b8128 100644
--- a/src/components/Application/src/AppLocalePicker.vue
+++ b/src/components/Application/src/AppLocalePicker.vue
@@ -4,7 +4,7 @@
 -->
 <template>
   <Dropdown
-    placement="bottomCenter"
+    placement="bottom"
     :trigger="['click']"
     :dropMenuList="localeList"
     :selectedKeys="selectedKeys"
diff --git a/src/components/Table/src/components/settings/SizeSetting.vue b/src/components/Table/src/components/settings/SizeSetting.vue
index 190340a5..79c4a228 100644
--- a/src/components/Table/src/components/settings/SizeSetting.vue
+++ b/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">
diff --git a/src/layouts/default/header/components/lock/LockModal.vue b/src/layouts/default/header/components/lock/LockModal.vue
index 90a3f7c7..4e098eb3 100644
--- a/src/layouts/default/header/components/lock/LockModal.vue
+++ b/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,
           },
diff --git a/src/layouts/default/tabs/components/TabContent.vue b/src/layouts/default/tabs/components/TabContent.vue
index c71a6ae8..27a065de 100644
--- a/src/layouts/default/tabs/components/TabContent.vue
+++ b/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>
diff --git a/src/layouts/default/tabs/index.less b/src/layouts/default/tabs/index.less
index ceb1296d..cec94f6f 100644
--- a/src/layouts/default/tabs/index.less
+++ b/src/layouts/default/tabs/index.less
@@ -180,3 +180,9 @@ html[data-theme='light'] {
     }
   }
 }
+
+.multiple-tabs__dropdown {
+  .ant-dropdown-content {
+    width: 172px;
+  }
+}
diff --git a/src/views/dashboard/analysis/components/VisitRadar.vue b/src/views/dashboard/analysis/components/VisitRadar.vue
index d0fc8ce8..f73f01e3 100644
--- a/src/views/dashboard/analysis/components/VisitRadar.vue
+++ b/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: '耳机',
             },
           ],
         },
diff --git a/src/views/dashboard/workbench/components/SaleRadar.vue b/src/views/dashboard/workbench/components/SaleRadar.vue
index 38fdd37e..3d176f22 100644
--- a/src/views/dashboard/workbench/components/SaleRadar.vue
+++ b/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',
             },
           ],
         },
diff --git a/src/views/demo/charts/SaleRadar.vue b/src/views/demo/charts/SaleRadar.vue
index 8dd9b01d..8ea3d5a3 100644
--- a/src/views/demo/charts/SaleRadar.vue
+++ b/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',
                 },
               ],
             },
diff --git a/src/views/demo/feat/request-demo/index.vue b/src/views/demo/feat/request-demo/index.vue
index b1da5227..eb01a231 100644
--- a/src/views/demo/feat/request-demo/index.vue
+++ b/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>
diff --git a/src/views/demo/page/form/basic/data.ts b/src/views/demo/page/form/basic/data.ts
index 76d29654..f1f8e676 100644
--- a/src/views/demo/page/form/basic/data.ts
+++ b/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: '邀评人',
+    colProps: {
+      span: 8,
+    },
     subLabel: '( 选填 )',
     componentProps: {
       placeholder: '请直接 @姓名／工号，最多可邀请 5 人',
     },
   },
-  {
-    field: 'weights',
-    component: 'InputNumber',
-    label: '权重',
-    subLabel: '( 选填 )',
-    componentProps: {
-      formatter: (value: string) => (value ? `${value}%` : ''),
-      parser: (value: string) => value.replace('%', ''),
-      placeholder: '请输入',
-    },
-  },
   {
     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';
     },
diff --git a/src/views/demo/page/form/basic/index.vue b/src/views/demo/page/form/basic/index.vue
index b7872196..d91a79c5 100644
--- a/src/views/demo/page/form/basic/index.vue
+++ b/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: '提交',