Browse Source

Merge pull request #271513 in DEC/fineui from master to feature/x

* commit '33529b768eb5bff8d6ba8d5a058d2f4e2b6fa130':
  BI-143992 fix: 【6.0.17集成】FDL生成的ETL表,右键鼠标悬浮在灰化的来源、原始名上,提示不对
master^2^2
superman 9 months ago
parent
commit
4e2d22a017
  1. 12
      packages/fineui/src/widget/downlist/item.downlist.js
  2. 6
      packages/fineui/src/widget/downlist/popup.downlist.js
  3. 5
      packages/fineui/src/widget/multilayerdownlist/popup.downlist.js

12
packages/fineui/src/widget/downlist/item.downlist.js

@ -1,5 +1,14 @@
import { Label, Icon, BasicButton } from "@/base"; 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() @shortcut()
export class DownListItem extends BasicButton { export class DownListItem extends BasicButton {
@ -39,7 +48,6 @@ export class DownListItem extends BasicButton {
lgap: o.textLgap, lgap: o.textLgap,
rgap: o.textRgap, rgap: o.textRgap,
text: o.text, text: o.text,
title: o.title,
value: o.value, value: o.value,
keyword: o.keyword, keyword: o.keyword,
height: o.height, height: o.height,

6
packages/fineui/src/widget/downlist/popup.downlist.js

@ -127,7 +127,7 @@ export class DownListPopup extends Pane {
item.trigger = "hover"; item.trigger = "hover";
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
item.el = sourceItem.el; 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.type = "bi.down_list_group_item";
item.el.logic = { item.el.logic = {
dynamic: true, dynamic: true,
@ -151,7 +151,7 @@ export class DownListPopup extends Pane {
this._createChildren(item, sourceItem); this._createChildren(item, sourceItem);
} else { } else {
item.type = sourceItem.type || "bi.down_list_item"; item.type = sourceItem.type || "bi.down_list_item";
item.title = sourceItem.title || sourceItem.text; item.title = sourceItem.title;
item.textRgap = 10; item.textRgap = 10;
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
item.logic = { item.logic = {
@ -202,7 +202,7 @@ export class DownListPopup extends Pane {
this.singleValues.push(item.value); this.singleValues.push(item.value);
item.type = item.type || "bi.down_list_item"; item.type = item.type || "bi.down_list_item";
item.extraCls = " child-down-list-item"; item.extraCls = " child-down-list-item";
item.title = item.title || item.text; item.title = item.title;
item.textRgap = 10; item.textRgap = 10;
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
item.logic = { item.logic = {

5
packages/fineui/src/widget/multilayerdownlist/popup.downlist.js

@ -131,7 +131,7 @@ export class MultiLayerDownListPopup extends Pane {
item.trigger = "hover"; item.trigger = "hover";
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
item.el = sourceItem.el; 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.type = DownListGroupItem.xtype;
item.el.logic = { item.el.logic = {
dynamic: true, dynamic: true,
@ -155,7 +155,7 @@ export class MultiLayerDownListPopup extends Pane {
self._createChildren(item, sourceItem); self._createChildren(item, sourceItem);
} else { } else {
item.type = sourceItem.type || DownListItem.xtype; item.type = sourceItem.type || DownListItem.xtype;
item.title = sourceItem.title || sourceItem.text; item.title = sourceItem.title;
item.textRgap = 10; item.textRgap = 10;
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
item.logic = { item.logic = {
@ -209,7 +209,6 @@ export class MultiLayerDownListPopup extends Pane {
self.singleValues.push(item.value); self.singleValues.push(item.value);
item.type = item.type || DownListItem.xtype; item.type = item.type || DownListItem.xtype;
item.extraCls = " child-down-list-item"; item.extraCls = " child-down-list-item";
item.title = item.title || item.text;
item.textRgap = 10; item.textRgap = 10;
item.isNeedAdjustWidth = false; item.isNeedAdjustWidth = false;
item.logic = { item.logic = {

Loading…
Cancel
Save