From a8ca58a136a3718ceb9ca101fe32eccbd8dd5eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=A0=E5=B1=8F=E5=B1=B1=E6=9C=80=E9=80=9F=E4=B8=8B?= =?UTF-8?q?=E5=B1=B1=E4=BC=A0=E8=AF=B4?= Date: Wed, 3 Apr 2024 11:22:38 +0800 Subject: [PATCH] =?UTF-8?q?BI-143992=20fix:=20=E3=80=906.0.17=E9=9B=86?= =?UTF-8?q?=E6=88=90=E3=80=91FDL=E7=94=9F=E6=88=90=E7=9A=84ETL=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=8F=B3=E9=94=AE=E9=BC=A0=E6=A0=87=E6=82=AC=E6=B5=AE?= =?UTF-8?q?=E5=9C=A8=E7=81=B0=E5=8C=96=E7=9A=84=E6=9D=A5=E6=BA=90=E3=80=81?= =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E5=90=8D=E4=B8=8A=EF=BC=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/widget/downlist/item.downlist.js | 12 ++++++++++-- .../fineui/src/widget/downlist/popup.downlist.js | 6 +++--- .../src/widget/multilayerdownlist/popup.downlist.js | 5 ++--- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/packages/fineui/src/widget/downlist/item.downlist.js b/packages/fineui/src/widget/downlist/item.downlist.js index 6e27674ec..a83de5eb6 100644 --- a/packages/fineui/src/widget/downlist/item.downlist.js +++ b/packages/fineui/src/widget/downlist/item.downlist.js @@ -1,5 +1,14 @@ import { Label, Icon, BasicButton } from "@/base"; -import { CenterAdaptLayout, shortcut, extend, createWidget, isPlainObject, LogicFactory, Direction, SIZE_CONSANTS } from "@/core"; +import { + CenterAdaptLayout, + shortcut, + extend, + createWidget, + isPlainObject, + LogicFactory, + Direction, + SIZE_CONSANTS +} from "@/core"; @shortcut() export class DownListItem extends BasicButton { @@ -39,7 +48,6 @@ export class DownListItem extends BasicButton { lgap: o.textLgap, rgap: o.textRgap, text: o.text, - title: o.title, value: o.value, keyword: o.keyword, height: o.height, diff --git a/packages/fineui/src/widget/downlist/popup.downlist.js b/packages/fineui/src/widget/downlist/popup.downlist.js index ebb1e48ce..e85e05819 100644 --- a/packages/fineui/src/widget/downlist/popup.downlist.js +++ b/packages/fineui/src/widget/downlist/popup.downlist.js @@ -127,7 +127,7 @@ export class DownListPopup extends Pane { item.trigger = "hover"; item.isNeedAdjustWidth = false; item.el = sourceItem.el; - item.el.title = sourceItem.el.title || sourceItem.el.text; + item.el.title = sourceItem.el.title; item.el.type = "bi.down_list_group_item"; item.el.logic = { dynamic: true, @@ -151,7 +151,7 @@ export class DownListPopup extends Pane { this._createChildren(item, sourceItem); } else { item.type = sourceItem.type || "bi.down_list_item"; - item.title = sourceItem.title || sourceItem.text; + item.title = sourceItem.title; item.textRgap = 10; item.isNeedAdjustWidth = false; item.logic = { @@ -202,7 +202,7 @@ export class DownListPopup extends Pane { this.singleValues.push(item.value); item.type = item.type || "bi.down_list_item"; item.extraCls = " child-down-list-item"; - item.title = item.title || item.text; + item.title = item.title; item.textRgap = 10; item.isNeedAdjustWidth = false; item.logic = { diff --git a/packages/fineui/src/widget/multilayerdownlist/popup.downlist.js b/packages/fineui/src/widget/multilayerdownlist/popup.downlist.js index a55504ec0..512ca7a0f 100644 --- a/packages/fineui/src/widget/multilayerdownlist/popup.downlist.js +++ b/packages/fineui/src/widget/multilayerdownlist/popup.downlist.js @@ -131,7 +131,7 @@ export class MultiLayerDownListPopup extends Pane { item.trigger = "hover"; item.isNeedAdjustWidth = false; item.el = sourceItem.el; - item.el.title = sourceItem.el.title || sourceItem.el.text; + item.el.title = sourceItem.el.title; item.el.type = DownListGroupItem.xtype; item.el.logic = { dynamic: true, @@ -155,7 +155,7 @@ export class MultiLayerDownListPopup extends Pane { self._createChildren(item, sourceItem); } else { item.type = sourceItem.type || DownListItem.xtype; - item.title = sourceItem.title || sourceItem.text; + item.title = sourceItem.title; item.textRgap = 10; item.isNeedAdjustWidth = false; item.logic = { @@ -209,7 +209,6 @@ export class MultiLayerDownListPopup extends Pane { self.singleValues.push(item.value); item.type = item.type || DownListItem.xtype; item.extraCls = " child-down-list-item"; - item.title = item.title || item.text; item.textRgap = 10; item.isNeedAdjustWidth = false; item.logic = {