Merge branch 'master' of ssh://code.fineres.com:7999/~claire.tang/fineui

.npmignore

@@ -37,3 +37,5 @@
 !babel.config.js
 !babel.config.ie8.js
 !.eslintrc
+!dist/2.0/jsy.min.css
+!dist/2.0/bi.min.css

bi.lessconfig.json

@@ -0,0 +1,20 @@
+{
+  "@color-primary": "#2C60DB",
+  "@color-green-100": "#3FC47B",
+  "@color-light-blue-100": "#19B8EA",
+  "@color-orange-100": "#FAAA39",
+  "@color-red-100": "#E65251",
+  "@color-black": "#000A19",
+  "@color-light-gray": "#ECEEF3",
+  "@color-light-gray-theme-dark": "#292F45",
+  "@color-dim-gray": "#2E3A4D",
+  "@color-sliver-theme-dark": "363E55",
+  "@border-color-disabled": "#E7E8EB",
+
+  "@color-bi-background-active-radio": "transparent",
+  "@color-bi-background-active-radio-content": "#2C60DB",
+  "@color-bi-background-disabled-active-radio-content": "#D0D4DA",
+  "@color-bi-background-disabled-active-radio-content-theme-dark": "#606479",
+  "@color-bi-background-disabled-active-checkbox-content": "#D0D4DA",
+  "@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479"
+}

dist/font/iconfont.svg

@@ -14,6 +14,10 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="biduishanchu" unicode="&#59534;" d="M625.7664 810.666667V725.333333c0-123.016533 97.621333-223.232 219.579733-227.4304l7.9872-0.136533 113.7664 0.034133v-512c0-31.4368-25.463467-56.900267-56.866133-56.900266H113.7664c-31.402667 0-56.866133 25.463467-56.866133 56.866133v768c0 31.402667 25.463467 56.900267 56.866133 56.900267h512zM341.333333 327.099733H227.566933a28.433067 28.433067 0 0 1-28.228266-24.849066l-0.238934-3.584v-227.566934c0-14.506667 10.8544-26.453333 24.917334-28.228266l3.549866-0.2048H341.333333a28.433067 28.433067 0 0 1 28.228267 24.8832l0.2048 3.549866V298.666667a28.433067 28.433067 0 0 1-28.433067 28.433066z m227.566934 170.666667h-113.800534a28.433067 28.433067 0 0 1-28.228266-24.849067l-0.2048-3.584v-398.2336c0-14.506667 10.8544-26.453333 24.8832-28.228266l3.549866-0.2048h113.800534a28.433067 28.433067 0 0 1 28.228266 24.8832l0.2048 3.549866V469.333333a28.433067 28.433067 0 0 1-28.433066 28.433067z m227.5328-170.666667H682.666667a28.433067 28.433067 0 0 1-28.228267-24.849066l-0.2048-3.584v-227.566934c0-14.506667 10.8544-26.453333 24.849067-28.228266L682.666667 42.666667h113.7664a28.433067 28.433067 0 0 1 28.228266 24.8832l0.238934 3.549866V298.666667a28.433067 28.433067 0 0 1-28.4672 28.433066zM984.6784 865.3824a28.433067 28.433067 0 0 0 0-40.2432l-91.136-91.101867 91.136-91.136a28.433067 28.433067 0 0 0-40.2432-40.209066L853.333333 693.828267l-91.136-91.136a28.433067 28.433067 0 1 0-40.209066 40.2432l91.136 91.101866-91.136 91.136A28.433067 28.433067 0 0 0 762.231467 865.348267L853.333333 774.2464l91.136 91.136a28.433067 28.433067 0 0 0 40.209067 0z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="kaifapingtai" unicode="&#59533;" d="M736 0a32 32 0 1 0 0-64h-448a32 32 0 1 0 0 64h448zM832 832a128 128 0 0 0 128-128v-512a128 128 0 0 0-128-128H192a128 128 0 0 0-128 128V704a128 128 0 0 0 128 128h640z m0-64H192a64 64 0 0 1-63.552-56.512L128 704v-512a64 64 0 0 1 56.512-63.552L192 128h640a64 64 0 0 1 63.552 56.512L896 192V704a64 64 0 0 1-56.512 63.552L832 768zM382.4 611.456a32 32 0 0 0 3.712-40.832l-3.712-4.48L269.248 453.12 382.4 339.84a32 32 0 0 0 3.712-40.832l-3.712-4.48a32 32 0 0 0-40.832-3.648l-4.48 3.712-126.72 126.72a44.8 44.8 0 0 0-3.968 58.752l4.032 4.608 126.72 126.72a32 32 0 0 0 45.248 0z m274.752 0a32 32 0 0 0 45.248 0l126.72-126.72 3.968-4.608a44.8 44.8 0 0 0-3.968-58.752l-126.72-126.72-4.48-3.712a32 32 0 0 0-40.768 3.712l-3.712 4.48a32 32 0 0 0 3.712 40.768l113.152 113.152-113.152 113.088-3.712 4.48a32 32 0 0 0 3.712 40.832zM544 64v-64h-64v64h64z m33.664 578.368a32 32 0 0 0 19.84-40.64L493.312 299.136A32 32 0 1 0 432.832 320L536.96 622.528a32 32 0 0 0 40.64 19.84z"  horiz-adv-x="1024" />
+      
       <glyph glyph-name="yunhangzhong1" unicode="&#59532;" d="M512 832a448 448 0 1 0 0-896A448 448 0 0 0 512 832z m0-64a384 384 0 1 1 0-768A384 384 0 0 1 512 768zM352 576m48 0l0 0q48 0 48-48l0-288q0-48-48-48l0 0q-48 0-48 48l0 288q0 48 48 48ZM576 576m48 0l0 0q48 0 48-48l0-288q0-48-48-48l0 0q-48 0-48 48l0 288q0 48 48 48Z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="tiaoyongrenwu" unicode="&#59531;" d="M260.846933 839.099733a85.367467 85.367467 0 0 1 160.9728 0h147.080534c31.402667 0 56.866133-25.463467 56.866133-56.866133v-512c0-31.402667-25.463467-56.900267-56.866133-56.900267H113.7664c-31.402667 0-56.866133 25.463467-56.866133 56.900267v512c0 31.402667 25.463467 56.866133 56.866133 56.866133h147.114667z m56.354134-170.666666S210.500267 585.728 195.2768 572.5184c-30.5152-22.664533-34.816-47.342933-0.580267-75.8784 15.7696-11.3664 122.538667-96.392533 122.538667-96.392533V473.429333s74.274133 11.264 121.719467-24.3712c49.834667-37.444267 73.045333-121.924267 73.045333-121.924266v2.798933c-0.136533 19.387733-2.901333 134.8608-48.708267 192.273067C417.792 579.242667 317.201067 595.285333 317.201067 595.285333V668.433067zM910.2336 753.7664c31.402667 0 56.866133-25.463467 56.866133-56.866133v-711.133867c0-31.402667-25.463467-56.866133-56.866133-56.866133H199.099733c-31.402667 0-56.866133 25.463467-56.866133 56.866133v170.666667h483.5328c29.764267 0 54.203733 22.869333 56.661333 51.985066L682.666667 213.333333V753.7664h227.566933zM739.498667 210.944l-0.341334-7.338667a113.800533 113.800533 0 0 0-107.076266-103.8336l-6.314667-0.170666h-426.666667v-113.800534h711.133867V696.900267h-170.666667l-0.068266-485.9904z"  horiz-adv-x="1024" />

jsy.lessconfig.json

@@ -0,0 +1,20 @@
+{
+  "@color-primary": "#00acbe",
+  "font-color-normal": "#0d1540",
+  "font-color-light-gray": "#0d1540",
+  "font-color-disabled": "fade(#0d1540, 40)",
+  "font-color-light-disabled": "fade(#0d1540, 20)",
+  "font-color-success": "#28b668",
+  "font-color-negative": "#e65251",
+  "font-color-warning": "#faaa39",
+  "font-color-tips": "fade(#0d1540, 40)",
+
+  "background-color-light-disabled": "fade(#0d1540, 5)",
+  "background-color-dark-success": "#28b668",
+  "background-color-negative": "#e65251",
+  "background-color-warning": "#faaa39",
+
+  "border-color-disabled": "#e8eaed",
+  "border-color-success": "#28b668",
+  "border-color-negative": "#e65251"
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20220116152304",
+  "version": "2.0.20220120115227",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",
@@ -54,7 +54,8 @@
   },
   "scripts": {
     "webpack:dev": "node --max_old_space_size=4096 node_modules/webpack-dev-server/bin/webpack-dev-server.js -p --progress --host 0.0.0.0 --config=webpack/webpack.dev.js --mode development",
-    "webpack:prod": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack -p --progress --config=webpack/webpack.prod.js --mode production",
+    "webpack:prod": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack -p --progress --config=webpack/webpack.prod.js --mode production && npm run biCss && npm run jsyCss",
+    "webpack:css": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack -p --progress --config=webpack/webpack.css.js --mode production",
     "start": "node server.js",
     "build": "npm run webpack:prod && tsc",
     "postbuild": "node ./lib/postbuild/postbuild.js",
@@ -62,7 +63,9 @@
     "dev": "npm run webpack:dev",
     "prepublishToPrivate": "npm run build && node ./lib/prepublish/prepublish.js",
     "publishToPrivate": "npm publish",
-    "postpublishToPrivate": " node ./lib/postpublish/postpublish.js"
+    "postpublishToPrivate": " node ./lib/postpublish/postpublish.js",
+    "biCss": "cross-env LESS_CONFIG_PATH=bi.lessconfig.json LESS_FILE_NAME=bi npm run webpack:css",
+    "jsyCss": "cross-env LESS_CONFIG_PATH=jsy.lessconfig.json LESS_FILE_NAME=jsy npm run webpack:css"
   },
   "repository": {
     "type": "git",

private/modern/app.less

@@ -1,2 +0,0 @@
-@import "../../src/less/resource/app";
-@import "var";

private/modern/background.less

@@ -1,2 +0,0 @@
-@import "../../src/less/resource/background";
-@import "var";

private/modern/font.less

@@ -1,2 +0,0 @@
-@import "../../src/less/resource/font";
-@import "var";

private/modern/icon.less

@@ -1,5 +0,0 @@
-@import "../../src/less/resource/icon";
-@import "var";
-
-
-

private/modern/var.less

@@ -1,5 +0,0 @@
-@import "../../src/less/index-modern";
-@webUrl: './';
-@fontUrl: '@{webUrl}font/'; //图片的基本地址
-@imageUrl: '@{webUrl}images/1x/'; //图片的基本地址
-@image2xUrl: '@{webUrl}images/2x/'; //2倍图片的基本地址

public/modern/app.less

@@ -1,2 +0,0 @@
-@import "../../src/less/resource/app";
-@import "var";

public/modern/background.less

@@ -1,2 +0,0 @@
-@import "../../src/less/resource/background";
-@import "var";

public/modern/font.less

@@ -1,2 +0,0 @@
-@import "../../src/less/resource/font";
-@import "var";

public/modern/icon.less

@@ -1,5 +0,0 @@
-@import "../../src/less/resource/icon";
-@import "var";
-
-
-

public/modern/var.less

@@ -1,6 +0,0 @@
-@import "../../src/less/index-modern";
-@webUrl: 'https://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/';
-@fontUrl: '@{webUrl}font/'; //图片的基本地址
-@imageUrl: '@{webUrl}images/1x/'; //图片的基本地址
-@image2xUrl: '@{webUrl}images/2x/'; //2倍图片的基本地址
-

src/base/combination/combo.js

@@ -1,5 +1,6 @@
 !(function () {
     var needHideWhenAnotherComboOpen = {};
+    var currentOpenedCombos = {};
     /**
      * @class BI.Combo
      * @extends BI.Widget
@@ -141,6 +142,7 @@
 
             this.element.removeClass(this.options.comboClass);
             delete needHideWhenAnotherComboOpen[this.getName()];
+            delete currentOpenedCombos[this.getName()];
 
             BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
             BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName());
@@ -161,6 +163,7 @@
                     }
                 }
             });
+            currentOpenedCombos[this.getName()] = this;
             this.options.hideWhenAnotherComboOpen && (needHideWhenAnotherComboOpen[this.getName()] = this);
             this.adjustWidth(e);
             this.adjustHeight(e);
@@ -300,8 +303,18 @@
             BI.Resizers.remove(this.getName());
             this.popupView && this.popupView._destroy();
             delete needHideWhenAnotherComboOpen[this.getName()];
+            delete currentOpenedCombos[this.getName()];
         }
     });
+    BI.Combo.closeAll = function () {
+        BI.each(currentOpenedCombos, function (i, combo) {
+            if (combo) {
+                combo.hideView();
+            }
+        });
+        currentOpenedCombos = {};
+        needHideWhenAnotherComboOpen = {};
+    };
     BI.Combo.EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE";
     BI.Combo.EVENT_CHANGE = "EVENT_CHANGE";
     BI.Combo.EVENT_EXPAND = "EVENT_EXPAND";

src/base/layer/layer.popup.js

@@ -7,6 +7,8 @@ BI.PopupView = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.PopupView.superclass._defaultConfig.apply(this, arguments), {
             _baseCls: "bi-popup-view",
+            // 品牌色
+            primary: false,
             maxWidth: "auto",
             minWidth: 100,
             // maxHeight: 200,
@@ -84,7 +86,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
             hgap: o.hgap,
             items: BI.LogicFactory.createLogicItemsByDirection(o.direction,
                 BI.extend({
-                    cls: "list-view-outer bi-card list-view-shadow"
+                    cls: "list-view-outer bi-card list-view-shadow" + (o.primary ? " bi-primary" : "")
                 }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, {
                     items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.tool, this.tab, this.view, this.toolbar)
                 })))

src/base/single/input/file.js

@@ -696,9 +696,9 @@
         _setEnable: function (enable) {
             BI.File.superclass._setEnable.apply(this, arguments);
             if (enable === true) {
-                this.element.attr("disabled", "disabled");
-            } else {
                 this.element.removeAttr("disabled");
+            } else {
+                this.element.attr("disabled", "disabled");
             }
         }
     });

src/case/button/node/node.first.plus.js

@@ -23,7 +23,9 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, {
         var self = this, o = this.options;
         this.checkbox = BI.createWidget({
             type: "bi.first_tree_node_checkbox",
-            stopPropagation: true
+            stopPropagation: true,
+            iconHeight: o.height,
+            iconWidth: o.height
         });
         this.text = BI.createWidget({
             type: "bi.label",

src/case/button/node/node.last.plus.js

@@ -23,7 +23,9 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, {
         var self = this, o = this.options;
         this.checkbox = BI.createWidget({
             type: "bi.last_tree_node_checkbox",
-            stopPropagation: true
+            stopPropagation: true,
+            iconHeight: o.height,
+            iconWidth: o.height
         });
         this.text = BI.createWidget({
             type: "bi.label",

src/case/button/node/node.mid.plus.js

@@ -23,7 +23,9 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, {
         var self = this, o = this.options;
         this.checkbox = BI.createWidget({
             type: "bi.mid_tree_node_checkbox",
-            stopPropagation: true
+            stopPropagation: true,
+            iconHeight: o.height,
+            iconWidth: o.height
         });
         this.text = BI.createWidget({
             type: "bi.label",
@@ -48,7 +50,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, {
         });
         var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
         var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 24,
+            width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2,
             el: this.checkbox
         }, this.text);
         BI.createWidget(BI.extend({

src/case/button/node/node.plus.js

@@ -22,7 +22,9 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, {
         BI.PlusGroupNode.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         this.checkbox = BI.createWidget({
-            type: "bi.tree_node_checkbox"
+            type: "bi.tree_node_checkbox",
+            iconHeight: o.height,
+            iconWidth: o.height
         });
         this.text = BI.createWidget({
             type: "bi.label",

src/case/button/treeitem/item.first.treeleaf.js

@@ -28,19 +28,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
         });
         var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
         var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 12,
+            width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2,
             el: {
                 type: "bi.layout",
-                cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background",
+                cls: (o.pNode && o.pNode.isLastNode) ? "" : this._getBaseLineCls(),
-                width: 12,
+                width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2,
                 height: o.height
             }
         }), {
-            width: 24,
+            width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
             el: {
                 type: "bi.layout",
-                cls: "first-line-conn-background",
+                cls: this._getFirstLineCls(),
-                width: 24,
+                width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
                 height: o.height
             }
         }, {
@@ -53,6 +53,24 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
         }))));
     },
 
+    _getBaseLineCls: function () {
+        switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) {
+            case "solid":
+                return "base-solid-line-conn-background";
+            default:
+                return "base-line-conn-background";
+        }
+    },
+
+    _getFirstLineCls: function () {
+        switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) {
+            case "solid":
+                return "first-solid-line-conn-background";
+            default:
+                return "first-line-conn-background";
+        }
+    },
+
     doRedMark: function () {
         this.text.doRedMark.apply(this.text, arguments);
     },

src/case/button/treeitem/item.last.treeleaf.js

@@ -28,19 +28,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
         });
         var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
         var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 12,
+            width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2,
             el: {
                 type: "bi.layout",
-                cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background",
+                cls: (o.pNode && o.pNode.isLastNode) ? "" : this._getBaseLineCls(),
-                width: 12,
+                width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2,
                 height: o.height
             }
         }), {
-            width: 24,
+            width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
             el: {
                 type: "bi.layout",
-                cls: "last-line-conn-background",
+                cls: this._getLastLineCls(),
-                width: 24,
+                width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
                 height: o.height
             }
         }, {
@@ -53,6 +53,24 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
         }))));
     },
 
+    _getBaseLineCls: function () {
+        switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) {
+            case "solid":
+                return "base-solid-line-conn-background";
+            default:
+                return "base-line-conn-background";
+        }
+    },
+
+    _getLastLineCls: function () {
+        switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) {
+            case "solid":
+                return "last-solid-line-conn-background";
+            default:
+                return "last-line-conn-background";
+        }
+    },
+
     doRedMark: function () {
         this.text.doRedMark.apply(this.text, arguments);
     },

src/case/button/treeitem/item.mid.treeleaf.js

@@ -28,19 +28,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, {
         });
         var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
         var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
-            width: 12,
+            width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2,
             el: {
                 type: "bi.layout",
-                cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background",
+                cls: (o.pNode && o.pNode.isLastNode) ? "" : this._getBaseLineCls(),
-                width: 12,
+                width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2,
                 height: o.height
             }
         }), {
-            width: 24,
+            width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
             el: {
                 type: "bi.layout",
-                cls: "mid-line-conn-background",
+                cls: this._getMidLineCls(),
-                width: 24,
+                width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
                 height: o.height
             }
         }, {
@@ -53,6 +53,24 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, {
         }))));
     },
 
+    _getBaseLineCls: function () {
+        switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) {
+            case "solid":
+                return "base-solid-line-conn-background";
+            default:
+                return "base-line-conn-background";
+        }
+    },
+
+    _getMidLineCls: function () {
+        switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) {
+            case "solid":
+                return "mid-solid-line-conn-background";
+            default:
+                return "mid-line-conn-background";
+        }
+    },
+
     doRedMark: function () {
         this.text.doRedMark.apply(this.text, arguments);
     },

src/case/button/treeitem/item.root.treeleaf.js

@@ -31,10 +31,10 @@ BI.RootTreeLeafItem = BI.inherit(BI.BasicButton, {
 
         var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
         var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
-            width: 24,
+            width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
             el: {
                 type: "bi.layout",
-                width: 24,
+                width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
                 height: o.height
             }
         }, {

src/case/checkbox/check.first.treenode.js

@@ -6,18 +6,27 @@
 BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
         return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
-            extraCls: "tree-collapse-icon-type2",
+            extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type2" : "tree-collapse-icon-type2",
             iconWidth: 24,
             iconHeight: 24
         });
     },
 
+    getLineCls: function () {
+        switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) {
+            case "solid":
+                return "tree-solid-expand-icon-type2";
+            default:
+                return "tree-expand-icon-type2";
+        }
+    },
+
     setSelected: function (v) {
         BI.FirstTreeNodeCheckbox.superclass.setSelected.apply(this, arguments);
         if(v === true) {
-            this.element.addClass("tree-expand-icon-type2");
+            this.element.addClass(this.getLineCls());
         } else {
-            this.element.removeClass("tree-expand-icon-type2");
+            this.element.removeClass(this.getLineCls());
         }
     }
 });

src/case/checkbox/check.last.treenode.js

@@ -6,18 +6,27 @@
 BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
         return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
-            extraCls: "tree-collapse-icon-type4",
+            extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type4" : "tree-collapse-icon-type4",
             iconWidth: 24,
             iconHeight: 24
         });
     },
 
+    getLineCls: function () {
+        switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) {
+            case "solid":
+                return "tree-solid-expand-icon-type4";
+            default:
+                return "tree-expand-icon-type4";
+        }
+    },
+
     setSelected: function (v) {
         BI.LastTreeNodeCheckbox.superclass.setSelected.apply(this, arguments);
         if (v === true) {
-            this.element.addClass("tree-expand-icon-type4");
+            this.element.addClass(this.getLineCls());
         } else {
-            this.element.removeClass("tree-expand-icon-type4");
+            this.element.removeClass(this.getLineCls());
         }
     }
 });

src/case/checkbox/check.mid.treenode.js

@@ -6,18 +6,27 @@
 BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
         return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
-            extraCls: "tree-collapse-icon-type3",
+            extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type3" : "tree-collapse-icon-type3",
             iconWidth: 24,
             iconHeight: 24
         });
     },
 
+    getLineCls: function () {
+        switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) {
+            case "solid":
+                return "tree-solid-expand-icon-type3";
+            default:
+                return "tree-expand-icon-type3";
+        }
+    },
+
     setSelected: function (v) {
         BI.MidTreeNodeCheckbox.superclass.setSelected.apply(this, arguments);
         if(v === true) {
-            this.element.addClass("tree-expand-icon-type3");
+            this.element.addClass(this.getLineCls());
         } else {
-            this.element.removeClass("tree-expand-icon-type3");
+            this.element.removeClass(this.getLineCls());
         }
     }
 });

src/case/checkbox/check.treenode.js

@@ -6,18 +6,27 @@
 BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
         return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
-            extraCls: "tree-collapse-icon-type1",
+            extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type1" : "tree-collapse-icon-type1",
             iconWidth: 24,
             iconHeight: 24
         });
     },
 
+    getLineCls: function () {
+        switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) {
+            case "solid":
+                return "tree-solid-expand-icon-type1";
+            default:
+                return "tree-expand-icon-type1";
+        }
+    },
+
     setSelected: function (v) {
         BI.TreeNodeCheckbox.superclass.setSelected.apply(this, arguments);
         if(v) {
-            this.element.addClass("tree-expand-icon-type1");
+            this.element.addClass(this.getLineCls());
         } else {
-            this.element.removeClass("tree-expand-icon-type1");
+            this.element.removeClass(this.getLineCls());
         }
     }
 });

src/case/combo/bubblecombo/combo.bubble.js

@@ -13,6 +13,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
             baseCls: "bi-bubble-combo",
             trigger: "click",
             toggle: true,
+            primary: false,
             direction: "bottom,left", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right
             isDefaultInit: false,
             destroyWhenHide: false,
@@ -57,6 +58,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
                 type: "bi.bubble_popup_view",
                 animation: "bi-zoom-big",
                 animationDuring: 200,
+                primary: o.primary
             }, o.popup)
         });
         this.combo.on(BI.Combo.EVENT_TRIGGER_CHANGE, function () {
@@ -95,7 +97,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
     },
 
     _createTriangle: function (direction) {
-        var pos = {}, op = {};
+        var o = this.options, pos = {}, op = {};
         var adjustLength = this.options.adjustLength;
         var offset = this.element.offset();
         var left = offset.left, right = offset.left + this.element.outerWidth();
@@ -143,7 +145,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
             cls: "button-combo-triangle-wrapper",
             items: [{
                 type: "bi.layout",
-                cls: "bubble-combo-triangle-" + direction
+                cls: "bubble-combo-triangle-" + direction + (o.primary ? " bi-primary": "")
             }]
         });
         pos.el = this.triangle;

src/case/combo/bubblecombo/popup.bubble.js

@@ -9,9 +9,9 @@ BI.BubblePopupView = BI.inherit(BI.PopupView, {
         var config = BI.BubblePopupView.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(config, {
             baseCls: config.baseCls + " bi-bubble-popup-view",
-            minWidth: 220,
+            minWidth: 70,
             maxWidth: 300,
-            minHeight: 90
+            minHeight: 50
         });
     },
 });
@@ -60,11 +60,11 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
         });
         return BI.createWidget({
             type: "bi.center",
-            height: 44,
+            height: 54,
-            rgap: 15,
+            rgap: 20,
             items: [{
                 type: "bi.right_vertical_adapt",
-                lgap: 10,
+                lgap: 15,
                 items: items
             }]
         });
@@ -79,12 +79,12 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, {
             layouts: [{
                 type: "bi.vertical",
                 cls: "bar-popup-container",
-                hgap: 15,
+                hgap: 20,
-                tgap: 10
+                tgap: 15
             }]
         });
 
-        button.element.css("min-height", o.minHeight - 44);
+        button.element.css("min-height", o.minHeight - 54);
 
         return button;
     }
@@ -134,6 +134,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, {
         });
         return {
             type: "bi.bubble_bar_popup_view",
+            primary: o.primary,
             minWidth: o.minWidth,
             maxWidth: o.maxWidth,
             minHeight: o.minHeight,

src/case/tree/tree.level.js

@@ -26,7 +26,7 @@ BI.LevelTree = BI.inherit(BI.Widget, {
     _formatItems: function (nodes, layer, pNode) {
         var self = this;
         BI.each(nodes, function (i, node) {
-            var extend = { layer: layer };
+            var extend = { layer: layer, height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT };
             if (!BI.isKey(node.id)) {
                 node.id = BI.UUID();
             }

src/case/tree/treeexpander/tree.expander.popup.js

@@ -1,16 +1,19 @@
 !(function () {
     var Widget = BI.inherit(BI.Widget, {
-        props: {
+        props: function () {
+            return {
                 baseCls: "bi-tree-expander-popup",
                 layer: 0, // 第几层级
                 el: {},
                 isLastNode: false,
+            };
         },
 
         render: function () {
 
             var self = this;
             var o = this.options;
+            var offset = BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2;
 
             this.popupView = BI.createWidget(BI.extend(o.el, {
                 value: o.value
@@ -19,12 +22,12 @@
             this.popupView.on(BI.Controller.EVENT_CHANGE, function () {
                 self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
             });
-            this.popupView.element.css("margin-left", -12 * o.layer);
+            this.popupView.element.css("margin-left", -offset * o.layer);
-            this.element.css("margin-left", 12 * o.layer);
+            this.element.css("margin-left", offset * o.layer);
 
             return {
                 type: "bi.vertical",
-                cls: !o.isLastNode ? "line" : "",
+                cls: !o.isLastNode ? (BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "line solid" : "line") : "",
                 scrolly: null,
                 items: [
                     this.popupView,

src/case/ztree/0.treeview.js

@@ -51,7 +51,7 @@ BI.TreeView = BI.inherit(BI.Pane, {
         }
         this.tree = BI.createWidget({
             type: "bi.layout",
-            element: "<ul id='" + this.id + "' class='ztree'></ul>"
+            element: "<ul id='" + this.id + "' class='ztree" + (BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? " solid'" : "'") + "></ul>"
         });
         BI.createWidget({
             type: "bi.default",

src/core/system.js

@@ -73,4 +73,7 @@
 
 BI.prepares.push(function () {
     BI.SIZE_CONSANTS = BI.Providers.getProvider("bi.provider.system").getSize();
+    // 不再增加线型的配置了,之后不维护前置版本直接删掉，都用实线连接线
+    BI.STYLE_CONSTANTS = {};
+    BI.STYLE_CONSTANTS.LINK_LINE_TYPE = BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT === 24 ? "dashed" : "solid";
 });

src/less/base/combo/combo.bubble.less

@@ -29,6 +29,9 @@
     &:before {
       background-color: @color-bi-background-bubble-combo-triangle;
     }
+    &.bi-primary:before {
+      background-color: @background-color-primary;
+    }
   }
 }
 

src/less/base/combo/combo.textvalue.icon.less

@@ -7,7 +7,7 @@
         color: @color-bi-text-error-hover-text-value-icon-combo;
       }
     }
-    &>.bi-border, &>.bi-border-bottom {
+    &.bi-border, &.bi-border-bottom {
       border-color: @border-color-negative;
     }
   }

src/less/base/combo/combo.textvalue.less

@@ -7,7 +7,7 @@
         color: @color-bi-text-error-hover-text-value-combo;
       }
     }
-    &>.bi-border, &>.bi-border-bottom {
+    &.bi-border, &.bi-border-bottom {
       border-color: @border-color-negative;
     }
   }

src/less/base/tree/tree.expander.less

@@ -7,3 +7,13 @@
   left: 11px;
 }
 
+.bi-tree-expander-popup.line.solid:before {
+  border-left: 1px solid @color-bi-border-tree-expander-popup-line;
+  left: 15px;
+}
+
+.bi-theme-dark {
+  .bi-tree-expander-popup.line.solid:before {
+    border-left: 1px solid @color-bi-border-tree-expander-popup-line-theme-dark;
+  }
+}