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

* commit '72d40d30d86080beb162b99f0941a7499be08e06':
  auto upgrade version to 2.0.20221102143540
  auto upgrade version to 2.0.20221101195503
  无JIRA fix: 图标写反了
  DESIGN-4355 feat: tooltip提示异步获取
  DESIGN-4355 feat: tooltip提示异步获取

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221101100519",
+  "version": "2.0.20221102143540",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

src/base/single/0.single.js

@@ -19,8 +19,8 @@ BI.Single = BI.inherit(BI.Widget, {
         return BI.extend(conf, {
             readonly: false,
             title: null,
-            warningTitle: null,
+            warningTitle: null, // deprecated
-            tipType: null, // success或warning
+            tipType: null, // deprecated  success或warning
             belowMouse: false, //  title是否跟随鼠标
             enableHover: false,
         });
@@ -28,26 +28,28 @@ BI.Single = BI.inherit(BI.Widget, {
 
     _showToolTip: function (e, opt) {
         opt || (opt = {});
+        var self = this;
         var o = this.options;
-        var tooltipOpt = {};
         var title = this.getTitle();
-        if (BI.isPlainObject(title)) {
+
-            tooltipOpt = title;
+        if (title instanceof Promise) {
-        } else {
+            this.requestingTitle = title;
-            tooltipOpt.level = this.getTipType() || "success";
+            title.then(resolvedTitle => {
-            //  由于以前的用法,存在大量disabled:true搭配warningTitle的情况,所以这里做一个兼容,disabled:true的情况下,依然优先显示warningTitle,避免只设置了warningTitle而没有设置title的情况
+                //  由于是异步的,所以无法避免Promise resolve时机问题,所以设计为:鼠标移出了则不显示,并且只显示最后一次发起的查询结果
-            if (BI.isNull(o.tipType) && !this.isEnabled()) {
+                this.mouseOver && this.requestingTitle === title && showToolTip(this._getTooltipOptions(resolvedTitle));
-                tooltipOpt.text = (this.getWarningTitle() || title);
+            });
         } else {
-                tooltipOpt.text = tooltipOpt.level === "success" ? title : (this.getWarningTitle() || title);
+            showToolTip(this._getTooltipOptions(title));
         }
-        }
+
-        if (BI.isKey(tooltipOpt.text)) {
+        function showToolTip(tooltipOpt) {
-            BI.Tooltips.show(e, this.getName(), tooltipOpt, this, opt);
+            if (BI.isKey(tooltipOpt.text) && !BI.Tooltips.has(self.getName())) {
+                BI.Tooltips.show(e, self.getName(), tooltipOpt, self, opt);
                 if (o.action) {
-                BI.Actions.runAction(o.action, "hover", o, this);
+                    BI.Actions.runAction(o.action, "hover", o, self);
+                }
+                BI.Actions.runGlobalAction("hover", o, self);
             }
-            BI.Actions.runGlobalAction("hover", o, this);
         }
     },
 
@@ -91,12 +93,30 @@ BI.Single = BI.inherit(BI.Widget, {
         }
     },
 
+    _getTooltipOptions: function (title) {
+        var o = this.options;
+        var tooltipOpt = {};
+        if (BI.isPlainObject(title)) {
+            tooltipOpt = title;
+        } else {
+            tooltipOpt.level = this.getTipType() || "success";
+            //  由于以前的用法,存在大量disabled:true搭配warningTitle的情况,所以这里做一个兼容,disabled:true的情况下,依然优先显示warningTitle,避免只设置了warningTitle而没有设置title的情况
+            if (BI.isNull(o.tipType) && !this.isEnabled()) {
+                tooltipOpt.text = (this.getWarningTitle() || title);
+            } else {
+                tooltipOpt.text = tooltipOpt.level === "success" ? title : (this.getWarningTitle() || title);
+            }
+        }
+        return tooltipOpt;
+    },
+
     enableHover: function (opt) {
         opt || (opt = {});
         var self = this;
         if (!this._hoverBinded) {
             this.element.unbind("mouseenter.title").on("mouseenter.title", function (e) {
                 self._e = e;
+                self.mouseOver = true;
                 if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
                     delayingTooltips = self.getName();
                     self.showTimeout = BI.delay(function () {
@@ -144,6 +164,7 @@ BI.Single = BI.inherit(BI.Widget, {
             });
             this.element.unbind("mouseleave.title").on("mouseleave.title", function (e) {
                 self._e = null;
+                self.mouseOver = false;
                 self._clearTimeOut();
                 self._hideTooltip();
             });

src/case/button/node/siwtcher.tree.node.js

@@ -32,10 +32,10 @@ BI.TreeNodeSwitcher = BI.inherit(BI.NodeButton, {
             return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type2", "tree-expand-icon-type2"];
         } else if (options.isLastNode) {
             //  最后一个节点
-            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type3", "tree-expand-icon-type3"];
+            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type4", "tree-expand-icon-type4"];
         } else {
             //  其他情况
-            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type4", "tree-expand-icon-type4"];
+            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type3", "tree-expand-icon-type3"];
         }
     },