Merge remote-tracking branch 'origin/master' into KERNEL-11169

demo/js/base/tip/demo.title.js

@@ -30,6 +30,26 @@ Demo.Title = BI.inherit(BI.Widget, {
                 warningTitle: "自定义title提示效果",
                 text: "自定义title提示效果",
                 textAlign: "center"
+            }, {
+                type: "bi.label",
+                cls: "layout-bg3",
+                height: 50,
+                title: () => "函数返回值作为title提示",
+                text: "title提示支持函数",
+                textAlign: "center"
+            }, {
+                type: "bi.label",
+                cls: "layout-bg4",
+                height: 50,
+                title: function () {
+                    return {
+                        level: "success",
+                        text: "自定义title\n提示效果",
+                        textAlign: "center"
+                    };
+                },
+                text: "title提示支持对象,作为bi.tooltip的props",
+                textAlign: "center"
             }],
             hgap: 300,
             vgap: 20

package.json

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

src/base/combination/group.button.js

@@ -233,6 +233,23 @@ BI.ButtonGroup = BI.inherit(BI.Widget, {
         });
     },
 
+    setValueMap: function (map) {
+        map = map || {};
+        BI.each(this.buttons, function (i, item) {
+            if (BI.isNotNull(map[item.getValue()])) {
+                item.setSelected && item.setSelected(true);
+            } else {
+                item.setSelected && item.setSelected(false);
+            }
+        });
+    },
+
+    setAllSelected: function (v) {
+        BI.each(this.getAllButtons(), function (i, btn) {
+            (btn.setSelected || btn.setAllSelected).apply(btn, [v]);
+        });
+    },
+
     getNotSelectedValue: function () {
         var v = [];
         BI.each(this.buttons, function (i, item) {

src/base/single/0.single.js

@@ -23,11 +23,17 @@ BI.Single = BI.inherit(BI.Widget, {
 
     _showToolTip: function (e, opt) {
         opt || (opt = {});
-        var self = this, o = this.options;
+        var o = this.options;
-        var type = this.getTipType() || (this.isEnabled() ? "success" : "warning");
+        var tooltipOpt = {};
-        var title = type === "success" ? this.getTitle() : (this.getWarningTitle() || this.getTitle());
+        var title = this.getTitle();
-        if (BI.isKey(title)) {
+        if (BI.isPlainObject(title)) {
-            BI.Tooltips.show(e, this.getName(), title, type, this, opt);
+            tooltipOpt = title;
+        } else {
+            tooltipOpt.level = this.getTipType() || (this.isEnabled() ? "success" : "warning");
+            tooltipOpt.text = tooltipOpt.level === "success" ? title : (this.getWarningTitle() || title);
+        }
+        if (BI.isKey(tooltipOpt.text)) {
+            BI.Tooltips.show(e, this.getName(), tooltipOpt, this, opt);
             if (o.action) {
                 BI.Actions.runAction(o.action, "hover", o, this);
             }

src/base/single/button/buttons/button.js

@@ -24,7 +24,7 @@
             if (isVertical(props.iconPosition)) {
                 // 图标高度和文字高度默认相等
                 adaptiveHeight += (props.textHeight || 16) * 2;
-                adaptiveHeight += props.iconGap || 4;
+                adaptiveHeight += props.iconGap || 0;
                 var tGap = props.tgap || props.vgap || 2;
                 var bGap = props.bgap || props.vgap || 2;
                 adaptiveHeight += (tGap + bGap);
@@ -58,7 +58,7 @@
                 bgap: 0,
                 lgap: 0,
                 rgap: 0,
-                iconGap: 4,
+                iconGap: 0,
                 iconPosition: "left"
             });
         },

src/base/single/tip/tip.tooltip.js

@@ -7,8 +7,8 @@
  */
 BI.Tooltip = BI.inherit(BI.Tip, {
     _const: {
-        hgap: 5,
+        hgap: 8,
-        vgap: 3
+        vgap: 4
     },
 
     _defaultConfig: function () {
@@ -17,7 +17,8 @@ BI.Tooltip = BI.inherit(BI.Tip, {
             text: "",
             level: "success", // success或warning
             stopEvent: false,
-            stopPropagation: false
+            stopPropagation: false,
+            textAlign: "left",
         });
     },
 
@@ -44,10 +45,11 @@ BI.Tooltip = BI.inherit(BI.Tip, {
                 type: "bi.vertical",
                 element: this,
                 hgap: this._const.hgap,
+                innerVgap: this._const.vgap,
                 items: BI.map(texts, function (i, text) {
                     return {
                         type: "bi.label",
-                        textAlign: "left",
+                        textAlign: o.textAlign,
                         whiteSpace: "normal",
                         text: text,
                         textHeight: 18
@@ -58,11 +60,12 @@ BI.Tooltip = BI.inherit(BI.Tip, {
             this.text = BI.createWidget({
                 type: "bi.label",
                 element: this,
-                textAlign: "left",
+                textAlign: o.textAlign,
                 whiteSpace: "normal",
                 text: o.text,
                 textHeight: 18,
-                hgap: this._const.hgap
+                hgap: this._const.hgap,
+                vgap: this._const.vgap,
             });
         }
     },

src/case/layer/pane.list.js

@@ -150,6 +150,16 @@ BI.ListPane = BI.inherit(BI.Pane, {
         this.button_group.setValue.apply(this.button_group, arguments);
     },
 
+    setAllSelected: function (v) {
+        if (this.button_group.setAllSelected) {
+            this.button_group.setAllSelected(v);
+        } else {
+            BI.each(this.getAllButtons(), function (i, btn) {
+                (btn.setSelected || btn.setAllSelected).apply(btn, [v]);
+            });
+        }
+    },
+
     getValue: function () {
         return this.button_group.getValue.apply(this.button_group, arguments);
     },

src/case/list/list.select.js

@@ -113,9 +113,13 @@ BI.SelectList = BI.inherit(BI.Widget, {
     },
 
     setAllSelected: function (v) {
-        BI.each(this.getAllButtons(), function (i, btn) {
+        if (this.list.setAllSelected) {
-            (btn.setSelected || btn.setAllSelected).apply(btn, [v]);
+            this.list.setAllSelected(v);
-        });
+        } else {
+            BI.each(this.getAllButtons(), function (i, btn) {
+                (btn.setSelected || btn.setAllSelected).apply(btn, [v]);
+            });
+        }
         this.allSelected = !!v;
         this.toolbar.setSelected(v);
         this.toolbar.setHalfSelected(false);

src/core/controller/controller.tooltips.js

@@ -12,17 +12,25 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
         this.showingTips = {};// 存储正在显示的tooltip
     },
 
-    _createTooltip: function (text, level) {
+    /**
+     *
+     * @param opt
+     * @param opt.text {String} 文本
+     * @param opt.level {String} 级别, success或warning
+     * @param opt.textAlign {String} 文本对齐方式, left, center, right
+     * @returns {*}
+     * @private
+     */
+    _createTooltip: function (opt) {
         return BI.createWidget({
             type: "bi.tooltip",
-            text: text,
+            ...opt,
-            level: level,
             stopEvent: true
         });
     },
 
     // opt: {container: '', belowMouse: false}
-    show: function (e, name, text, level, context, opt) {
+    show: function (e, name, tooltipOpt, context, opt) {
         opt || (opt = {});
         var self = this;
         BI.each(this.showingTips, function (i, tip) {
@@ -30,7 +38,7 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
         });
         this.showingTips = {};
         if (!this.has(name)) {
-            this.create(name, text, level, opt.container || "body");
+            this.create(name, tooltipOpt, opt.container || "body");
         }
         if (!opt.belowMouse) {
             var offset = context.element.offset();
@@ -41,7 +49,6 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
             var top = offset.top + bounds.height + 5;
         }
         var tooltip = this.get(name);
-        tooltip.setText(text);
         tooltip.element.css({
             left: "0px",
             top: "0px"
@@ -84,9 +91,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
         return this;
     },
 
-    create: function (name, text, level, context) {
+    create: function (name, tooltipOpt, context) {
         if (!this.has(name)) {
-            var tooltip = this._createTooltip(text, level);
+            var tooltip = this._createTooltip(tooltipOpt);
             this.add(name, tooltip);
             BI.createWidget({
                 type: "bi.absolute",

src/core/element/element.js

@@ -0,0 +1,74 @@
+import { registFunction } from './plugins';
+
+export function Element(widget, attribs) {
+  this.l = this.r = this.t = this.b = 0; // 边框
+  this.marginLeft = this.marginRight = this.marginTop = this.marginBottom = 0; //间距
+  this.position = {};
+  this.classMap = {};
+  this.classList = [];
+  this.children = [];
+  this.attribs = attribs || {};
+  this.styles = {};
+  // 兼容处理
+  this['0'] = this;
+  this.style = {};
+  if (!widget) {
+    this.nodeName = 'body';
+    this.position.x = 0;
+    this.position.y = 0;
+    this.attribs.id = 'body';
+  } else if (BI.isWidget(widget)) {
+    this.widget = widget;
+    this.nodeName = widget.options.tagName;
+    this.textBaseLine = widget.options.textBaseLine;
+  } else if (BI.isString(widget)) {
+    this.nodeName = widget;
+  }
+}
+
+initElement(Element);
+registFunction(Element);
+
+function initElement(element) {
+  element.prototype = {
+    appendChild(child) {
+      child.parent = this;
+      if (this.children.push(child) !== 1) {
+        var sibling = this.children[this.children.length - 2];
+        sibling.next = child;
+        child.prev = sibling;
+        child.next = null;
+      }
+    },
+    append(child) {
+      child.parent = this;
+      if (this.children.push(child) !== 1) {
+        var sibling = this.children[this.children.length - 2];
+        sibling.next = child;
+        child.prev = sibling;
+        child.next = null;
+      }
+    },
+    getParent() {
+      return this.parent;
+    },
+    getSiblings() {
+      var parent = this.getParent();
+      return parent ? parent.getChildren() : [this];
+    },
+    getChildren() {
+      return this.children;
+    },
+
+    getBounds() {
+      return {};
+    },
+
+    width() {
+
+    },
+    height() {
+
+    }
+  };
+}

src/core/element/index.js

@@ -0,0 +1,31 @@
+import { Element } from './element';
+
+BI.Element = Element;
+BI.Element.renderEngine = {
+    createElement: (widget) => {
+        // eslint-disable-next-line no-undef
+        if (BI.isWidget(widget)) {
+            var o = widget.options;
+            if (o.element instanceof Element) {
+                return o.element;
+            }
+            if (typeof o.element === 'string' && o.element !== 'body') {
+                o.root = false;
+                return new Element(widget);
+            }
+
+            if (o.root === true) {
+                return new Element();
+            }
+        }
+        // eslint-disable-next-line no-undef
+        if (BI.isString(widget)) {
+            return new Element(widget);
+        }
+        return new Element(widget);
+    },
+
+    createFragment() {
+        return new Element();
+    }
+}

src/core/element/plugins/attr.js

@@ -0,0 +1,22 @@
+export const registAttrFun = (Element) => {
+  Element.registerFunction('attr', function (key, value) {
+    var self = this;
+    if (BI.isObject(key)) {
+      BI.each(key, (k, v) => {
+        self.attr(k, v);
+      });
+      return this;
+    }
+    if (BI.isNull(value)) {
+      return this.attribs[key];
+    }
+    this.attribs[key] = value;
+    return this;
+  });
+  Element.registerFunction('hasAttrib', function (key) {
+    return this.attribs[key] != null;
+  });
+  Element.registerFunction('removeAttr', function (key) {
+    delete this.attribs[key];
+  });
+};

src/core/element/plugins/class.js

@@ -0,0 +1,23 @@
+export const registClassFun = (Element) => {
+  Element.registerFunction('addClass', function (classList) {
+    var self = this;
+    BI.each(classList.split(' '), (i, cls) => {
+      if (cls && !self.classMap[cls]) {
+        self.classList.push(cls);
+      }
+      cls && (self.classMap[cls] = true);
+    });
+    return this;
+  });
+
+  Element.registerFunction('removeClass', function (classList) {
+    var self = this;
+    BI.each(classList.split(' '), (i, cls) => {
+      if (cls && self.classMap[cls]) {
+        delete self.classMap[cls];
+        self.classList.splice(self.classList.indexOf(cls), 1);
+      }
+    });
+    return this;
+  });
+};

src/core/element/plugins/css.js

@@ -0,0 +1,22 @@
+export const registCssFun = (Element) => {
+  Element.registerFunction('css', function (key, value) {
+    var self = this;
+    if (BI.isObject(key)) {
+      BI.each(key, (k, v) => {
+        self.css(k, v);
+      });
+      return this;
+    }
+    key = BI.trim(BI.camelize(key));
+    return css(this, key, value);
+  });
+};
+
+const css = (elem, key, value) => {
+  key = BI.trim(BI.camelize(key));
+  if (BI.isNull(value)) {
+    return elem.styles[key];
+  }
+  elem.styles[key] = value;
+  return elem;
+};

src/core/element/plugins/data.js

@@ -0,0 +1,12 @@
+export const registDataFun = (Element) => {
+  Element.registerFunction('data', function (key, value) {
+    if (!this._data) {
+      this._data = {};
+    }
+    if (BI.isNull(value)) {
+      return this._data[key];
+    }
+    this._data[key] = value;
+    return this;
+  });
+};

src/core/element/plugins/empty.js

@@ -0,0 +1,9 @@
+export const registEmptyFun = (Element) => {
+  Element.registerFunction('empty', function (text) {
+    this.children = [];
+    return this;
+  });
+  Element.registerFunction('destroy', function (text) {
+    return this;
+  });
+};

src/core/element/plugins/event.js

@@ -0,0 +1,32 @@
+var returnThis = function () {
+  return this;
+};
+export const registEventFun = (Element) => {
+  [
+    'mousedown',
+    'mouseup',
+    'mousewheel',
+    'keydown',
+    'keyup',
+    'focus',
+    'focusin',
+    'focusout',
+    'click',
+    'on',
+    'off',
+    'bind',
+    'unbind',
+    'trigger',
+    'hover',
+    'scroll',
+    'scrollLeft',
+    'scrollTop',
+    'resize',
+    'show',
+    'hide',
+    'dblclick',
+    'blur',
+  ].forEach((event) => {
+    Element.registerFunction(event, returnThis);
+  });
+};

src/core/element/plugins/html.js

@@ -0,0 +1,15 @@
+export const registHtmlFun = (Element) => {
+  Element.registerFunction('html', function (text) {
+    if (text && text.charAt(0) === '<') {
+      BI.createWidget({
+        type: 'bi.html',
+        element: this.widget,
+        html: text,
+      });
+      this.originalHtml = text;
+    } else {
+      this.text = BI.htmlDecode(text);
+    }
+    return this;
+  });
+};

src/core/element/plugins/index.js

@@ -0,0 +1,31 @@
+import { registAttrFun } from './attr';
+import { registClassFun } from './class';
+import { registCssFun } from './css';
+import { registDataFun } from './data';
+import { registEmptyFun } from './empty';
+import { registEventFun } from './event';
+import { registHtmlFun } from './html';
+import { registKeywordMarkFun } from './keywordMark';
+import { registRenderToHtmlFun } from './renderToHtml';
+import { registRenderToStringFun } from './renderToString';
+import { registTextFun } from './text';
+import { registValFun } from './val';
+
+export const registFunction = (Element) => {
+  var functionMap = {};
+  Element.registerFunction = (key, fn) => {
+    Element.prototype[key] = functionMap[key] = fn;
+  };
+  registAttrFun(Element);
+  registClassFun(Element);
+  registCssFun(Element);
+  registDataFun(Element);
+  registEmptyFun(Element);
+  registEventFun(Element);
+  registHtmlFun(Element);
+  registKeywordMarkFun(Element);
+  registRenderToStringFun(Element);
+  registRenderToHtmlFun(Element);
+  registTextFun(Element);
+  registValFun(Element);
+};

src/core/element/plugins/keywordMark.js

@@ -0,0 +1,6 @@
+export const registKeywordMarkFun = (Element) => {
+  Element.registerFunction('__textKeywordMarked__', function (text) {
+    this[0].textContent = text;
+    return this;
+  });
+};

src/core/element/plugins/renderToHtml.js

@@ -0,0 +1,65 @@
+var skipArray = [];
+var pxStyle = ['font-size', 'width', 'height'];
+var _renderToHtml = function (root) {
+  var str = '';
+  if (BI.isNull(root.originalHtml)) {
+    if (root.tag !== 'body') {
+      str += `<${root.tag}`;
+      if (root.classList.length > 0) {
+        str += ' class="';
+        BI.each(root.classList, (i, cls) => {
+          str += ` ${cls}`;
+        });
+        str += '"';
+      }
+      str += ' style="';
+      BI.each(root.originalStyles, (key, stl) => {
+        if (
+          skipArray.contains(key) ||
+          (key == 'height' && root.classList.contains('bi-design-components-data-data-table-cell'))
+        ) {
+          return;
+        }
+        key = BI.hyphenate(key);
+        if (key === 'font-family') {
+          stl = stl.replace(/\"/g, '');
+        }
+        if (pxStyle.contains(key) && BI.isNumeric(stl)) {
+          stl += 'px';
+        }
+        if (BI.isKey(stl)) {
+          str += ` ${key}:${stl};`;
+        }
+      });
+      str += '"';
+      BI.each(root.attribs, (key, attr) => {
+        if (BI.isKey(attr)) {
+          str += ` ${key}=${attr}`;
+        }
+      });
+      if (root.textContent) {
+        str += ` title=${root.textContent}`;
+      }
+      str += '>';
+    }
+    // 特殊处理，spread_table的行列元素是不取配置里的高度的，使用stretch拉伸的（leaves取了高度），但是功能代码里给单元格默认高度了，导致拉伸不了
+    //  而spread_grid_table的行列元素是取配置里的高度的，拉不拉伸都一样
+    BI.each(root.children, (i, child) => {
+      str += _renderToHtml(child);
+    });
+  } else {
+    str += root.originalHtml;
+  }
+  if (root.tag !== 'body') {
+    if (root.textContent) {
+      str += root.textContent;
+    }
+    str += `</${root.tag}>`;
+  }
+  return str;
+};
+export const registRenderToHtmlFun = (Element) => {
+  Element.registerFunction('renderToHtml', function () {
+    return _renderToHtml(this);
+  });
+};

src/core/element/plugins/renderToString.js

@@ -0,0 +1,50 @@
+var skipArray = ['width', 'height'];
+var _renderToString = function (root) {
+  var str = '';
+  if (root.nodeName !== 'body') {
+    str += `<${root.nodeName}`;
+    if (root.classList.length > 0) {
+      str += ' class="';
+      BI.each(root.classList, (i, cls) => {
+        str += ` ${cls}`;
+      });
+      str += '"';
+    }
+    str += ' style="';
+    BI.each(root.styles, (key, stl) => {
+      if (skipArray.includes(key)) {
+        return;
+      }
+      key = BI.hyphenate(key);
+      str += ` ${key}:${stl};`;
+    });
+    str += ` width:${root.width}px;`;
+    str += ` height:${root.height}px;`;
+    str += ' position: fixed;';
+    str += ` left: ${root.position.x}px;`;
+    str += ` top: ${root.position.y}px;`;
+    str += '"';
+    BI.each(root.attribs, (key, attr) => {
+      str += ` ${key}:${attr}`;
+    });
+    str += '>';
+  }
+  BI.each(root.children, (i, child) => {
+    str += _renderToString(child);
+  });
+  // if (root.htmlContent) {
+  //     str += root.htmlContent;
+  // }
+  if (root.nodeName !== 'body') {
+    if (root.text) {
+      str += root.text;
+    }
+    str += `</${root.nodeName}>`;
+  }
+  return str;
+};
+export const registRenderToStringFun = (Element) => {
+  Element.registerFunction('renderToString', function () {
+    return _renderToString(this);
+  });
+};

src/core/element/plugins/text.js

@@ -0,0 +1,10 @@
+export const registTextFun = (Element) => {
+  Element.registerFunction('setText', function (text) {
+    this.text = text;
+    return this;
+  });
+  Element.registerFunction('setValue', function (text) {
+    this.text = text;
+    return this;
+  });
+};

src/core/element/plugins/val.js

@@ -0,0 +1,9 @@
+export const registValFun = (Element) => {
+  Element.registerFunction('val', function (value) {
+    if (BI.isNotNull(value)) {
+      this.text = `${value}`;
+      return this;
+    }
+    return this.text;
+  });
+};

src/core/platform/web/config.js

@@ -210,12 +210,12 @@ BI.prepares.push(function () {
     });
     BI.Plugin.configWidget("bi.horizontal_sticky", function (ob) {
         if (!isSupportSticky) {
-            return BI.extend({}, ob, {type: "bi.horizontal_fill"});
+            return BI.extend({ scrollx: true }, ob, {type: "bi.horizontal_fill"});
         }
     });
     BI.Plugin.configWidget("bi.vertical_sticky", function (ob) {
         if (!isSupportSticky) {
-            return BI.extend({}, ob, {type: "bi.vertical_fill"});
+            return BI.extend({ scrolly: true }, ob, {type: "bi.vertical_fill"});
         }
     });
 

src/widget/multiselect/loader.js

@@ -87,6 +87,8 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, {
             }
         });
 
+        var renderEngine = BI.Widget._renderEngine;
+        BI.Widget.registerRenderEngine(BI.Element.renderEngine);
         this.cachGroup = BI.createWidget(o.el, {
             type: "bi.button_group",
             root: true,
@@ -98,6 +100,7 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, {
             }],
             value: o.value
         });
+        BI.Widget.registerRenderEngine(renderEngine);
 
         if (o.next !== false) {
             this.next = BI.createWidget(BI.extend({
@@ -145,7 +148,10 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, {
                 this.next.setEnd();
             }
         }
+        var renderEngine = BI.Widget._renderEngine;
+        BI.Widget.registerRenderEngine(BI.Element.renderEngine);
         this.cachGroup.addItems.apply(this.cachGroup, arguments);
+        BI.Widget.registerRenderEngine(renderEngine);
         this.button_group.addItems.apply(this.button_group, arguments);
     },
 
@@ -181,7 +187,10 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, {
             if (items.length > 100) {
                 this.cachItems = items.slice(100);
             }
+            var renderEngine = BI.Widget._renderEngine;
+            BI.Widget.registerRenderEngine(BI.Element.renderEngine);
             this.cachGroup.populate.call(this.cachGroup, items, keyword);
+            BI.Widget.registerRenderEngine(renderEngine);
             this.button_group.populate.call(this.button_group, items.slice(0, 100), keyword);
         }
     },
@@ -195,9 +204,15 @@ BI.MultiSelectInnerLoader = BI.inherit(BI.Widget, {
         return this.cachGroup.getNotSelectedValue();
     },
 
-    setValue: function () {
+    setAllSelected: function (v) {
-        this.cachGroup.setValue.apply(this.cachGroup, arguments);
+        this.button_group.setAllSelected(v);
-        this.button_group.setValue.apply(this.button_group, arguments);
+        this.cachGroup.setAllSelected(v);
+    },
+
+    setValue: function (value) {
+        var map = BI.makeObject(BI.isArray(value) ? value : [value]);
+        this.cachGroup.setValueMap.call(this.cachGroup, map);
+        this.button_group.setValueMap.call(this.button_group, map);
     },
 
     getValue: function () {