From 2bdaab0d5adb81c34451669ff1b1d89b5a4d0f43 Mon Sep 17 00:00:00 2001
From: yxh01132861 <yxh01132861@antgroup.com>
Date: Fri, 15 Sep 2023 17:11:02 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less | 4 ++++
 .../Formily/ColorRangeSelector/Internal/style.ts         | 8 ++++++--
 .../Formily/ControlPositionSelect/Select/index.tsx       | 2 +-
 .../Formily/ControlPositionSelect/Select/style.ts        | 9 ++++++++-
 .../src/components/Formily/FieldSelect/Select/index.tsx  | 1 +
 .../src/components/Formily/FieldSelect/Select/style.ts   | 9 ++++++++-
 .../Formily/RibbonSelect/RibbonSelect/style.ts           | 7 ++++++-
 7 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less b/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less
index 3560e77f..7315dce6 100644
--- a/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less
+++ b/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less
@@ -5,6 +5,10 @@
 @prefix-select-cls: ~'@{prefix}-vis-type-select';
 
 .@{prefix-select-cls} {
+  .ant-select-selection-item {
+    height: 30px;
+  }
+
   &__drop-down {
     display: flex;
     flex-wrap: wrap;
diff --git a/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts b/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts
index 917074a8..84b44183 100644
--- a/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts
+++ b/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts
@@ -1,12 +1,16 @@
 import { genStyleHook } from '@formily/antd-v5/esm/__builtins__';
 
 export default genStyleHook('color-range-selector', (token) => {
-  const { componentCls, antCls } = token;
-
+  const { componentCls, antCls, controlHeight, lineWidth } = token;
+  const selectHeightWithoutBorder = controlHeight - lineWidth * 2;
   return {
     [componentCls]: {
       maxWidth: 260,
 
+      [`${antCls}-select-selection-item`]: {
+        height: selectHeightWithoutBorder,
+      },
+
       [`${componentCls}__selection-item`]: {
         display: 'flex',
         alignItems: 'center',
diff --git a/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/index.tsx b/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/index.tsx
index 8a607377..4d5ba4c5 100644
--- a/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/index.tsx
+++ b/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/index.tsx
@@ -13,7 +13,7 @@ const PositionSelect: React.FC<SelectProps> = (props) => {
   const [wrapSSR, hashId] = useStyle(prefixCls);
 
   return wrapSSR(
-    <Select {...prop} popupClassName={cls(`${prefixCls}`, hashId)}>
+    <Select {...prop} className={cls(`${prefixCls}-select`, hashId)} popupClassName={cls(`${prefixCls}`, hashId)}>
       {(options ?? POSITION).map((item, index) => {
         return (
           <Select.Option value={item.value} key={index}>
diff --git a/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/style.ts b/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/style.ts
index c4f6aa48..ba2d6bd8 100644
--- a/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/style.ts
+++ b/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/style.ts
@@ -1,9 +1,16 @@
 import { genStyleHook } from '@formily/antd-v5/esm/__builtins__';
 
 export default genStyleHook('field-select', (token) => {
-  const { componentCls } = token;
+  const { antCls, componentCls, controlHeight, lineWidth } = token;
+  const selectHeightWithoutBorder = controlHeight - lineWidth * 2;
 
   return {
+    [`${componentCls}-select`]: {
+      [`${antCls}-select-selection-item`]: {
+        height: selectHeightWithoutBorder,
+      },
+    },
+
     [componentCls]: {
       [`${componentCls}-item`]: {
         lineHeight: '30px',
diff --git a/packages/li-p2/src/components/Formily/FieldSelect/Select/index.tsx b/packages/li-p2/src/components/Formily/FieldSelect/Select/index.tsx
index 281901f6..3ea8e487 100644
--- a/packages/li-p2/src/components/Formily/FieldSelect/Select/index.tsx
+++ b/packages/li-p2/src/components/Formily/FieldSelect/Select/index.tsx
@@ -22,6 +22,7 @@ const InternalSelect: React.FC<SelectProps<string, FieldSelectOptionType>> = (pr
   return wrapSSR(
     <Select
       {...prop}
+      className={cls(`${prefixCls}-select`, hashId)}
       popupClassName={cls(`${prefixCls}`, hashId)}
       open={open}
       onDropdownVisibleChange={(visible) => setOpen(visible)}
diff --git a/packages/li-p2/src/components/Formily/FieldSelect/Select/style.ts b/packages/li-p2/src/components/Formily/FieldSelect/Select/style.ts
index 0cc00a77..0188832f 100644
--- a/packages/li-p2/src/components/Formily/FieldSelect/Select/style.ts
+++ b/packages/li-p2/src/components/Formily/FieldSelect/Select/style.ts
@@ -1,9 +1,16 @@
 import { genStyleHook } from '@formily/antd-v5/esm/__builtins__';
 
 export default genStyleHook('field-select', (token) => {
-  const { componentCls, controlItemBgActive, controlItemBgHover, colorTextDescription } = token;
+  const { antCls, componentCls, controlItemBgActive, controlItemBgHover, controlHeight, lineWidth } = token;
+  const selectHeightWithoutBorder = controlHeight - lineWidth * 2;
 
   return {
+    [`${componentCls}-select`]: {
+      [`${antCls}-select-selection-item`]: {
+        height: selectHeightWithoutBorder,
+      },
+    },
+
     [componentCls]: {
       [`${componentCls}-dropdown`]: {
         maxHeight: 256,
diff --git a/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts b/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts
index 1bf8b9fb..c8d49f4d 100644
--- a/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts
+++ b/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts
@@ -1,10 +1,15 @@
 import { genStyleHook } from '@formily/antd-v5/esm/__builtins__';
 
 export default genStyleHook('ribbon-select', (token) => {
-  const { componentCls } = token;
+  const { componentCls, antCls, controlHeight, lineWidth } = token;
+  const selectHeightWithoutBorder = controlHeight - lineWidth * 2;
 
   return {
     [componentCls]: {
+      [`${antCls}-select-selection-item`]: {
+        height: selectHeightWithoutBorder,
+      },
+
       [`${componentCls}__selection-item`]: {
         display: 'flex',
         alignItems: 'center',

From fe818392ce01e0afe9c510209c20a6ec0da2388e Mon Sep 17 00:00:00 2001
From: yxh01132861 <yxh01132861@antgroup.com>
Date: Sat, 16 Sep 2023 16:14:48 +0800
Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E6=94=BE=E7=BD=AE=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ControlPositionSelect/Select/index.tsx    | 19 +-----------------
 .../ControlPositionSelect/Select/style.ts     | 20 -------------------
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 packages/li-p2/src/components/Formily/ControlPositionSelect/Select/style.ts

diff --git a/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/index.tsx b/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/index.tsx
index 4d5ba4c5..2e71ad7b 100644
--- a/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/index.tsx
+++ b/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/index.tsx
@@ -1,30 +1,13 @@
 /* eslint-disable react/no-array-index-key */
-import { usePrefixCls } from '@formily/antd-v5/esm/__builtins__';
 import type { SelectProps } from 'antd';
 import { Select } from 'antd';
-import cls from 'classnames';
 import React from 'react';
 import { POSITION } from './contants';
-import useStyle from './style';
 
 const PositionSelect: React.FC<SelectProps> = (props) => {
   const { options, ...prop } = props;
-  const prefixCls = usePrefixCls('formily-position-select');
-  const [wrapSSR, hashId] = useStyle(prefixCls);
 
-  return wrapSSR(
-    <Select {...prop} className={cls(`${prefixCls}-select`, hashId)} popupClassName={cls(`${prefixCls}`, hashId)}>
-      {(options ?? POSITION).map((item, index) => {
-        return (
-          <Select.Option value={item.value} key={index}>
-            <div className={cls(`${prefixCls}-item`, hashId)}>
-              <span>{item.label}</span>
-            </div>
-          </Select.Option>
-        );
-      })}
-    </Select>,
-  );
+  return <Select {...prop} options={options ?? POSITION} />;
 };
 
 export default PositionSelect;
diff --git a/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/style.ts b/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/style.ts
deleted file mode 100644
index ba2d6bd8..00000000
--- a/packages/li-p2/src/components/Formily/ControlPositionSelect/Select/style.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { genStyleHook } from '@formily/antd-v5/esm/__builtins__';
-
-export default genStyleHook('field-select', (token) => {
-  const { antCls, componentCls, controlHeight, lineWidth } = token;
-  const selectHeightWithoutBorder = controlHeight - lineWidth * 2;
-
-  return {
-    [`${componentCls}-select`]: {
-      [`${antCls}-select-selection-item`]: {
-        height: selectHeightWithoutBorder,
-      },
-    },
-
-    [componentCls]: {
-      [`${componentCls}-item`]: {
-        lineHeight: '30px',
-      },
-    },
-  };
-});

From 498063c0267406e31eaab0b0f37d0886dfe91e80 Mon Sep 17 00:00:00 2001
From: yxh01132861 <yxh01132861@antgroup.com>
Date: Sat, 16 Sep 2023 17:19:51 +0800
Subject: [PATCH 3/9] fix: antd-package

---
 packages/li-editor/package.json                          | 4 ++--
 .../BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less | 4 ----
 packages/li-p2/package.json                              | 4 ++--
 .../Formily/ColorRangeSelector/Internal/style.ts         | 7 +------
 .../src/components/Formily/FieldSelect/Select/index.tsx  | 1 -
 .../src/components/Formily/FieldSelect/Select/style.ts   | 9 +--------
 .../Formily/RibbonSelect/RibbonSelect/style.ts           | 8 +-------
 7 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/packages/li-editor/package.json b/packages/li-editor/package.json
index ca320db6..c411f3c5 100644
--- a/packages/li-editor/package.json
+++ b/packages/li-editor/package.json
@@ -66,7 +66,7 @@
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-dom": "^18.0.0",
     "@types/shapefile": "^0.6.1",
-    "antd": "^5.5.0",
+    "antd": "5.5.0",
     "dumi": "^1.1.46",
     "father": "^4.0.7",
     "rimraf": "^3.0.2",
@@ -76,7 +76,7 @@
     "@ant-design/icons": "^5.0.1",
     "@antv/l7": "^2.17.2",
     "@antv/larkmap": "^1.4.1",
-    "antd": "^5.5.0",
+    "antd": "5.5.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
diff --git a/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less b/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less
index 7315dce6..3560e77f 100644
--- a/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less
+++ b/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less
@@ -5,10 +5,6 @@
 @prefix-select-cls: ~'@{prefix}-vis-type-select';
 
 .@{prefix-select-cls} {
-  .ant-select-selection-item {
-    height: 30px;
-  }
-
   &__drop-down {
     display: flex;
     flex-wrap: wrap;
diff --git a/packages/li-p2/package.json b/packages/li-p2/package.json
index 26de363a..1917b380 100644
--- a/packages/li-p2/package.json
+++ b/packages/li-p2/package.json
@@ -57,7 +57,7 @@
     "@types/lodash-es": "^4.17.6",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "antd": "^5.5.0",
+    "antd": "5.5.0",
     "dumi": "^1.1.46",
     "father": "^4.0.7",
     "rimraf": "^3.0.2",
@@ -65,7 +65,7 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "^5.0.1",
-    "antd": "^5.5.0",
+    "antd": "5.5.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
diff --git a/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts b/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts
index 84b44183..f58152bc 100644
--- a/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts
+++ b/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts
@@ -1,16 +1,11 @@
 import { genStyleHook } from '@formily/antd-v5/esm/__builtins__';
 
 export default genStyleHook('color-range-selector', (token) => {
-  const { componentCls, antCls, controlHeight, lineWidth } = token;
-  const selectHeightWithoutBorder = controlHeight - lineWidth * 2;
+  const { componentCls, antCls } = token;
   return {
     [componentCls]: {
       maxWidth: 260,
 
-      [`${antCls}-select-selection-item`]: {
-        height: selectHeightWithoutBorder,
-      },
-
       [`${componentCls}__selection-item`]: {
         display: 'flex',
         alignItems: 'center',
diff --git a/packages/li-p2/src/components/Formily/FieldSelect/Select/index.tsx b/packages/li-p2/src/components/Formily/FieldSelect/Select/index.tsx
index 3ea8e487..281901f6 100644
--- a/packages/li-p2/src/components/Formily/FieldSelect/Select/index.tsx
+++ b/packages/li-p2/src/components/Formily/FieldSelect/Select/index.tsx
@@ -22,7 +22,6 @@ const InternalSelect: React.FC<SelectProps<string, FieldSelectOptionType>> = (pr
   return wrapSSR(
     <Select
       {...prop}
-      className={cls(`${prefixCls}-select`, hashId)}
       popupClassName={cls(`${prefixCls}`, hashId)}
       open={open}
       onDropdownVisibleChange={(visible) => setOpen(visible)}
diff --git a/packages/li-p2/src/components/Formily/FieldSelect/Select/style.ts b/packages/li-p2/src/components/Formily/FieldSelect/Select/style.ts
index 0188832f..205a7237 100644
--- a/packages/li-p2/src/components/Formily/FieldSelect/Select/style.ts
+++ b/packages/li-p2/src/components/Formily/FieldSelect/Select/style.ts
@@ -1,16 +1,9 @@
 import { genStyleHook } from '@formily/antd-v5/esm/__builtins__';
 
 export default genStyleHook('field-select', (token) => {
-  const { antCls, componentCls, controlItemBgActive, controlItemBgHover, controlHeight, lineWidth } = token;
-  const selectHeightWithoutBorder = controlHeight - lineWidth * 2;
+  const { componentCls, controlItemBgActive, controlItemBgHover } = token;
 
   return {
-    [`${componentCls}-select`]: {
-      [`${antCls}-select-selection-item`]: {
-        height: selectHeightWithoutBorder,
-      },
-    },
-
     [componentCls]: {
       [`${componentCls}-dropdown`]: {
         maxHeight: 256,
diff --git a/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts b/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts
index c8d49f4d..5c84dd48 100644
--- a/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts
+++ b/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts
@@ -1,15 +1,9 @@
 import { genStyleHook } from '@formily/antd-v5/esm/__builtins__';
 
 export default genStyleHook('ribbon-select', (token) => {
-  const { componentCls, antCls, controlHeight, lineWidth } = token;
-  const selectHeightWithoutBorder = controlHeight - lineWidth * 2;
-
+  const { componentCls } = token;
   return {
     [componentCls]: {
-      [`${antCls}-select-selection-item`]: {
-        height: selectHeightWithoutBorder,
-      },
-
       [`${componentCls}__selection-item`]: {
         display: 'flex',
         alignItems: 'center',

From 49cb67fecf03f53ebaea2bb8df00f0d4dbf271d2 Mon Sep 17 00:00:00 2001
From: yxh01132861 <yxh01132861@antgroup.com>
Date: Sat, 16 Sep 2023 17:34:34 +0800
Subject: [PATCH 4/9] fix: antd-package

---
 .../src/components/Formily/ColorRangeSelector/Internal/style.ts  | 1 +
 .../src/components/Formily/RibbonSelect/RibbonSelect/style.ts    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts b/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts
index f58152bc..917074a8 100644
--- a/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts
+++ b/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts
@@ -2,6 +2,7 @@ import { genStyleHook } from '@formily/antd-v5/esm/__builtins__';
 
 export default genStyleHook('color-range-selector', (token) => {
   const { componentCls, antCls } = token;
+
   return {
     [componentCls]: {
       maxWidth: 260,
diff --git a/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts b/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts
index 5c84dd48..1bf8b9fb 100644
--- a/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts
+++ b/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts
@@ -2,6 +2,7 @@ import { genStyleHook } from '@formily/antd-v5/esm/__builtins__';
 
 export default genStyleHook('ribbon-select', (token) => {
   const { componentCls } = token;
+
   return {
     [componentCls]: {
       [`${componentCls}__selection-item`]: {

From 2aaf51159d688abbf9da53d62bc203129d0ba621 Mon Sep 17 00:00:00 2001
From: yxh01132861 <yxh01132861@antgroup.com>
Date: Sat, 16 Sep 2023 18:16:16 +0800
Subject: [PATCH 5/9] =?UTF-8?q?fix:=20antd-=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/li-editor/package.json | 4 ++--
 packages/li-p2/package.json     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/li-editor/package.json b/packages/li-editor/package.json
index c411f3c5..bfa9a688 100644
--- a/packages/li-editor/package.json
+++ b/packages/li-editor/package.json
@@ -66,7 +66,7 @@
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-dom": "^18.0.0",
     "@types/shapefile": "^0.6.1",
-    "antd": "5.5.0",
+    "antd": "5.6.0",
     "dumi": "^1.1.46",
     "father": "^4.0.7",
     "rimraf": "^3.0.2",
@@ -76,7 +76,7 @@
     "@ant-design/icons": "^5.0.1",
     "@antv/l7": "^2.17.2",
     "@antv/larkmap": "^1.4.1",
-    "antd": "5.5.0",
+    "antd": "5.6.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
diff --git a/packages/li-p2/package.json b/packages/li-p2/package.json
index 1917b380..cda4aa94 100644
--- a/packages/li-p2/package.json
+++ b/packages/li-p2/package.json
@@ -57,7 +57,7 @@
     "@types/lodash-es": "^4.17.6",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "antd": "5.5.0",
+    "antd": "5.6.0",
     "dumi": "^1.1.46",
     "father": "^4.0.7",
     "rimraf": "^3.0.2",
@@ -65,7 +65,7 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "^5.0.1",
-    "antd": "5.5.0",
+    "antd": "5.6.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },

From 4ae27031fb596d087d193410f11910f2ab67a1a0 Mon Sep 17 00:00:00 2001
From: yxh01132861 <yxh01132861@antgroup.com>
Date: Sat, 16 Sep 2023 19:06:05 +0800
Subject: [PATCH 6/9] =?UTF-8?q?fix:=20antd-=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/li-editor/package.json                               | 4 ++--
 .../src/widgets/WidgetsPanel/WidgetList/WidgetGroup.tsx       | 2 ++
 packages/li-p2/package.json                                   | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/li-editor/package.json b/packages/li-editor/package.json
index bfa9a688..c411f3c5 100644
--- a/packages/li-editor/package.json
+++ b/packages/li-editor/package.json
@@ -66,7 +66,7 @@
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-dom": "^18.0.0",
     "@types/shapefile": "^0.6.1",
-    "antd": "5.6.0",
+    "antd": "5.5.0",
     "dumi": "^1.1.46",
     "father": "^4.0.7",
     "rimraf": "^3.0.2",
@@ -76,7 +76,7 @@
     "@ant-design/icons": "^5.0.1",
     "@antv/l7": "^2.17.2",
     "@antv/larkmap": "^1.4.1",
-    "antd": "5.6.0",
+    "antd": "5.5.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
diff --git a/packages/li-editor/src/widgets/WidgetsPanel/WidgetList/WidgetGroup.tsx b/packages/li-editor/src/widgets/WidgetsPanel/WidgetList/WidgetGroup.tsx
index 3ea60b61..db24fc24 100644
--- a/packages/li-editor/src/widgets/WidgetsPanel/WidgetList/WidgetGroup.tsx
+++ b/packages/li-editor/src/widgets/WidgetsPanel/WidgetList/WidgetGroup.tsx
@@ -40,6 +40,7 @@ const WidgetGroup: React.FC<WidgetGroupProps> = ({ className, item }) => {
     return null;
   }
 
+  // @ts-ignore
   const panels: CollapseProps['items'] = widgets
     .filter((widget) => {
       const implementWidget = appService.getImplementWidget(widget.type);
@@ -115,6 +116,7 @@ const WidgetGroup: React.FC<WidgetGroupProps> = ({ className, item }) => {
         defaultActiveKey={[]}
         ghost={true}
         expandIcon={({ isActive }) => <CaretRightOutlined rotate={isActive ? 90 : 0} />}
+        // @ts-ignore
         items={panels}
       />
     </div>
diff --git a/packages/li-p2/package.json b/packages/li-p2/package.json
index cda4aa94..1917b380 100644
--- a/packages/li-p2/package.json
+++ b/packages/li-p2/package.json
@@ -57,7 +57,7 @@
     "@types/lodash-es": "^4.17.6",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "antd": "5.6.0",
+    "antd": "5.5.0",
     "dumi": "^1.1.46",
     "father": "^4.0.7",
     "rimraf": "^3.0.2",
@@ -65,7 +65,7 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "^5.0.1",
-    "antd": "5.6.0",
+    "antd": "5.5.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },

From 2c514ae5d176ba26d47a41bde8b2a49db5989965 Mon Sep 17 00:00:00 2001
From: yxh01132861 <yxh01132861@antgroup.com>
Date: Mon, 18 Sep 2023 09:50:28 +0800
Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/li-editor/package.json               |  4 +--
 .../WidgetsPanel/WidgetList/WidgetGroup.tsx   |  2 --
 packages/li-p2/package.json                   |  4 +--
 .../ColorRangeSelector/Internal/index.tsx     | 25 +++++++++----------
 .../ColorRangeSelector/Internal/style.ts      |  6 +++++
 .../Formily/FieldSelect/Select/index.tsx      | 14 +++++------
 .../RibbonSelect/RibbonSelect/index.tsx       | 23 ++++++++---------
 .../RibbonSelect/RibbonSelect/style.ts        | 10 ++++----
 8 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/packages/li-editor/package.json b/packages/li-editor/package.json
index c411f3c5..ca320db6 100644
--- a/packages/li-editor/package.json
+++ b/packages/li-editor/package.json
@@ -66,7 +66,7 @@
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-dom": "^18.0.0",
     "@types/shapefile": "^0.6.1",
-    "antd": "5.5.0",
+    "antd": "^5.5.0",
     "dumi": "^1.1.46",
     "father": "^4.0.7",
     "rimraf": "^3.0.2",
@@ -76,7 +76,7 @@
     "@ant-design/icons": "^5.0.1",
     "@antv/l7": "^2.17.2",
     "@antv/larkmap": "^1.4.1",
-    "antd": "5.5.0",
+    "antd": "^5.5.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
diff --git a/packages/li-editor/src/widgets/WidgetsPanel/WidgetList/WidgetGroup.tsx b/packages/li-editor/src/widgets/WidgetsPanel/WidgetList/WidgetGroup.tsx
index db24fc24..3ea60b61 100644
--- a/packages/li-editor/src/widgets/WidgetsPanel/WidgetList/WidgetGroup.tsx
+++ b/packages/li-editor/src/widgets/WidgetsPanel/WidgetList/WidgetGroup.tsx
@@ -40,7 +40,6 @@ const WidgetGroup: React.FC<WidgetGroupProps> = ({ className, item }) => {
     return null;
   }
 
-  // @ts-ignore
   const panels: CollapseProps['items'] = widgets
     .filter((widget) => {
       const implementWidget = appService.getImplementWidget(widget.type);
@@ -116,7 +115,6 @@ const WidgetGroup: React.FC<WidgetGroupProps> = ({ className, item }) => {
         defaultActiveKey={[]}
         ghost={true}
         expandIcon={({ isActive }) => <CaretRightOutlined rotate={isActive ? 90 : 0} />}
-        // @ts-ignore
         items={panels}
       />
     </div>
diff --git a/packages/li-p2/package.json b/packages/li-p2/package.json
index 1917b380..26de363a 100644
--- a/packages/li-p2/package.json
+++ b/packages/li-p2/package.json
@@ -57,7 +57,7 @@
     "@types/lodash-es": "^4.17.6",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "antd": "5.5.0",
+    "antd": "^5.5.0",
     "dumi": "^1.1.46",
     "father": "^4.0.7",
     "rimraf": "^3.0.2",
@@ -65,7 +65,7 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "^5.0.1",
-    "antd": "5.5.0",
+    "antd": "^5.5.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
diff --git a/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/index.tsx b/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/index.tsx
index c99c24bc..29f75c17 100644
--- a/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/index.tsx
+++ b/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/index.tsx
@@ -61,19 +61,18 @@ const Internal = (props: ColorRangeSelectorProps) => {
 
         return (
           <Select.Option key={colorList.toString()} value={colorList.toString()}>
-            <div className={`${prefixCls}__selection-item`}>
-              {colorList.map((color) => (
-                <span
-                  key={color}
-                  className={`${prefixCls}__selection-item-color`}
-                  style={{
-                    backgroundColor: color,
-                    height: '22px',
-                    width: `${100 / colorList.length}%`,
-                  }}
-                />
-              ))}
-            </div>
+            {colorList.map((color) => (
+              <span
+                key={color}
+                className={`${prefixCls}__selection-item-color`}
+                style={{
+                  backgroundColor: color,
+                  height: '22px',
+                  width: `${100 / colorList.length}%`,
+                  display: 'inline-block',
+                }}
+              />
+            ))}
           </Select.Option>
         );
       })}
diff --git a/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts b/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts
index 917074a8..4b74863f 100644
--- a/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts
+++ b/packages/li-p2/src/components/Formily/ColorRangeSelector/Internal/style.ts
@@ -7,6 +7,12 @@ export default genStyleHook('color-range-selector', (token) => {
     [componentCls]: {
       maxWidth: 260,
 
+      [`${antCls}-select-selection-item`]: {
+        span: {
+          marginTop: 10,
+        },
+      },
+
       [`${componentCls}__selection-item`]: {
         display: 'flex',
         alignItems: 'center',
diff --git a/packages/li-p2/src/components/Formily/FieldSelect/Select/index.tsx b/packages/li-p2/src/components/Formily/FieldSelect/Select/index.tsx
index 281901f6..ce0c8f14 100644
--- a/packages/li-p2/src/components/Formily/FieldSelect/Select/index.tsx
+++ b/packages/li-p2/src/components/Formily/FieldSelect/Select/index.tsx
@@ -61,14 +61,12 @@ const InternalSelect: React.FC<SelectProps<string, FieldSelectOptionType>> = (pr
       {options?.map((item, index) => {
         return (
           <Select.Option value={item.value} key={index}>
-            <div className={cls(`${prefixCls}-item`, hashId)}>
-              {isUndefined(item.type) ? (
-                <Tag>未知</Tag>
-              ) : (
-                <Tag color={item.typeColor}>{isUndefined(item.typeName) ? item.type : item.typeName}</Tag>
-              )}
-              <span title={item.label}>{item.label}</span>
-            </div>
+            {isUndefined(item.type) ? (
+              <Tag>未知</Tag>
+            ) : (
+              <Tag color={item.typeColor}>{isUndefined(item.typeName) ? item.type : item.typeName}</Tag>
+            )}
+            <span title={item.label}>{item.label}</span>
           </Select.Option>
         );
       })}
diff --git a/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/index.tsx b/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/index.tsx
index cb198ecb..ea56a81e 100644
--- a/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/index.tsx
+++ b/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/index.tsx
@@ -56,18 +56,17 @@ const InternalRibbonSelect = (props: RibbonSelectProps) => {
         const colorList = colorReverse ? [...item].reverse() : item;
         return (
           <Select.Option key={index} value={index}>
-            <div className={`${prefixCls}__selection-item`}>
-              {colorList.map((color) => (
-                <span
-                  key={color}
-                  style={{
-                    backgroundColor: color,
-                    height: '24px',
-                    width: `${100 / colorList.length}%`,
-                  }}
-                />
-              ))}
-            </div>
+            {colorList.map((color) => (
+              <span
+                key={color}
+                style={{
+                  backgroundColor: color,
+                  height: '24px',
+                  width: `${100 / colorList.length}%`,
+                  display: 'inline-block',
+                }}
+              />
+            ))}
           </Select.Option>
         );
       })}
diff --git a/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts b/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts
index 1bf8b9fb..45949ec3 100644
--- a/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts
+++ b/packages/li-p2/src/components/Formily/RibbonSelect/RibbonSelect/style.ts
@@ -1,14 +1,14 @@
 import { genStyleHook } from '@formily/antd-v5/esm/__builtins__';
 
 export default genStyleHook('ribbon-select', (token) => {
-  const { componentCls } = token;
+  const { componentCls, antCls } = token;
 
   return {
     [componentCls]: {
-      [`${componentCls}__selection-item`]: {
-        display: 'flex',
-        alignItems: 'center',
-        height: '100%',
+      [`${antCls}-select-selection-item`]: {
+        span: {
+          marginTop: 10,
+        },
       },
     },
   };

From c842b9125ca15cf3426253c88266cf2b66cf7e64 Mon Sep 17 00:00:00 2001
From: yxh01132861 <yxh01132861@antgroup.com>
Date: Mon, 18 Sep 2023 11:05:03 +0800
Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E5=8F=AF=E8=A7=86=E5=8C=96=E5=9B=BE?=
 =?UTF-8?q?=E5=B1=82=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VisTypeSelect/VisTypeSelect.less          | 22 +++++--------------
 .../VisTypeSelect/VisTypeSelect.tsx           |  8 ++-----
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less b/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less
index 3560e77f..33217c60 100644
--- a/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less
+++ b/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.less
@@ -51,30 +51,18 @@
     text-align: center;
   }
 
-  &__selected-option {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    height: 100%;
-    margin: 0;
-  }
-
   &__selected-icon {
-    width: 22px;
-    height: 22px;
+    width: 15px;
+    height: 15px;
     color: @primary-color-1;
     background-image: url(@layer-icon-bg);
     background-repeat: no-repeat;
-    background-size: 22px 22px;
+    background-size: 15px 15px;
     border-radius: @border-radius;
 
     svg {
-      width: 22px;
-      height: 22px;
+      width: 15px;
+      height: 15px;
     }
   }
-
-  &__selected-label {
-    margin-left: 12px;
-  }
 }
diff --git a/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.tsx b/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.tsx
index 22888326..50287f9a 100644
--- a/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.tsx
+++ b/packages/li-editor/src/widgets/LayersPanel/LayerAttribute/BaseFormSchemaField/VisTypeSelect/VisTypeSelect.tsx
@@ -44,12 +44,8 @@ const VisTypeSelect: React.FC<SelectProps<any, any>> = (props) => {
       {options?.map((item: Record<string, any>, index) => {
         return (
           <Select.Option value={item.value} key={index}>
-            <div className="li-vis-type-select__selected-option">
-              <div className="li-vis-type-select__selected-icon">
-                <Icon component={item.icon} />
-              </div>
-              <span className="li-vis-type-select__selected-label">{item.label}</span>
-            </div>
+            <Icon component={item.icon} className="li-vis-type-select__selected-icon" style={{ marginRight: 5 }} />
+            {item.label}
           </Select.Option>
         );
       })}

From fe1e31694d3cbdc08b4005d831c57223d2653461 Mon Sep 17 00:00:00 2001
From: yxh01132861 <yxh01132861@antgroup.com>
Date: Mon, 18 Sep 2023 11:21:24 +0800
Subject: [PATCH 9/9] =?UTF-8?q?fix:=20demo=20=E5=9B=BE=E5=B1=82=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/builder/src/constans/projects.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/builder/src/constans/projects.ts b/examples/builder/src/constans/projects.ts
index d9fa1053..90902270 100644
--- a/examples/builder/src/constans/projects.ts
+++ b/examples/builder/src/constans/projects.ts
@@ -484,7 +484,7 @@ const DEFAULT_ANALYSIS_APP: Application = {
             select: { fillColor: false, strokeColor: 'red' },
           },
           label: {
-            field: '',
+            field: undefined,
             visible: false,
             style: {
               fill: '#454d64',