From 9ebdad06fd19dfe33d897d406000e10ed139ef8b Mon Sep 17 00:00:00 2001 From: Treecat Date: Thu, 10 Nov 2022 15:51:24 +0800 Subject: [PATCH 01/22] =?UTF-8?q?KERNEL-13489=20fix:=20=E8=AE=A9Button?= =?UTF-8?q?=E6=B2=A1=E6=9C=89icon=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?= =?UTF-8?q?=E5=8F=AA=E6=B8=B2=E6=9F=93=E4=B8=80=E4=B8=AA=20label?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/button/buttons/button.js | 116 +++++++++++++---------- 1 file changed, 66 insertions(+), 50 deletions(-) diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js index 39cfffda3..2e7a75936 100644 --- a/src/base/single/button/buttons/button.js +++ b/src/base/single/button/buttons/button.js @@ -71,6 +71,35 @@ render: function () { var o = this.options, self = this; + // bi.center_adapt 作用：让 hgap 不影响 iconGap。 + BI.createWidget({ + type: "bi.center_adapt", + horizontalAlign: o.textAlign, + element: this, + ref(ref) { + self.containerRef = ref; + }, + hgap: o.hgap, + vgap: o.vgap, + items: self.generateItems() + }); + + // 如果 options 对应的属性为 true 则给元素添加 class + var classArr = ["block", "clear", "ghost", "plain", "loading", "light"]; + BI.each(classArr, function (_, clz) { + if (BI.get(o, clz) === true) { + self.element.addClass(clz); + } + }); + + if (o.minWidth > 0) { + this.element.css({ "min-width": BI.pixFormat(o.minWidth) }); + } + }, + + generateItems(defaultRenderIcon) { + var o = this.options; + // 由于button默认情况下有个边框，所以要主动算行高 var lineHeight, textHeight = o.textHeight; var hasBorder = false @@ -90,7 +119,32 @@ } } - var iconInvisible = !o.loading && !o.iconCls && !o.icon; + var iconInvisible = !(o.loading || o.iconCls || o.icon || defaultRenderIcon); + + var textWidth = o.textWidth; + if (BI.isNull(o.textWidth)) { + textWidth = (o.minWidth > 0 && o.width < o.minWidth) ? o.minWidth : o.width; + textWidth -= (o.hgap * 2 + o.iconGap) + textWidth -= iconInvisible || isVertical(o.iconPosition) ? 0 : this._const.iconWidth + } + this.text = BI.createWidget({ + type: "bi.label", + text: o.text, + whiteSpace: o.whiteSpace, + textAlign: o.textAlign, + textWidth: textWidth, + textHeight: BI.toPix(textHeight, hasBorder ? 2 : 0), + height: BI.toPix(lineHeight, hasBorder ? 2 : 0), + value: o.value, + title: null, + }); + + if (iconInvisible) { + return [this.text] + } + + this._iconRendered = true; + if (BI.isPlainObject(o.icon) && !o.loading) { this.icon = BI.createWidget(o.icon); } else { @@ -107,64 +161,24 @@ }); } - // 用户可能设置的 width 小于按钮的最小宽度 - var actualWidth = (o.minWidth > 0 && o.width < o.minWidth) ? o.minWidth : o.width; - var textWidth = iconInvisible && o.width ? actualWidth - o.hgap * 2 : null; - if (BI.isNotNull(o.textWidth)) { - // textWidth 需要减去图标 - textWidth = o.textWidth - (iconInvisible || isVertical(o.iconPosition) ? 0 : this._const.iconWidth); - } - this.text = BI.createWidget({ - type: "bi.label", - text: o.text, - whiteSpace: o.whiteSpace, - textAlign: o.textAlign, - textWidth: textWidth, - textHeight: BI.toPix(textHeight, hasBorder ? 2 : 0), - height: BI.toPix(lineHeight, hasBorder ? 2 : 0), - value: o.value, - title: null, - }); - var layoutType = "bi.horizontal"; var gapContainer = { lgap: o.iconPosition === "left" && o.text ? o.iconGap : 0, rgap: o.iconPosition === "right" ? o.iconGap : 0, tgap: o.iconPosition === "top" ? o.iconGap : 0, bgap: o.iconPosition === "bottom" ? o.iconGap : 0, }; - var items = [this.icon, BI.extend({el: this.text}, gapContainer)]; - if (isVertical(o.iconPosition)) { - layoutType = "bi.vertical"; - } + + var items = [this.icon, BI.extend({ el: this.text }, gapContainer)]; if (o.iconPosition === "right" || o.iconPosition === "bottom") { - items = [BI.extend({el: this.text}, gapContainer), this.icon]; + items.reverse(); } - // bi.center_adapt 作用：让 hgap 不影响 iconGap。 - BI.createWidget({ - type: "bi.center_adapt", - horizontalAlign: o.textAlign, - element: this, - hgap: o.hgap, - vgap: o.vgap, - items: [{ - type: layoutType, - horizontalAlign: "center", - verticalAlign: "middle", - items: items, - }], - }); - - var classArr = ["block", "clear", "ghost", "plain", "loading", "light"]; - // 如果 options 对应的属性为 true 则给元素添加 class - BI.each(classArr, function (_, clz) { - if (BI.get(o, clz) === true) { - self.element.addClass(clz); - } - }); - if (o.minWidth > 0) { - this.element.css({ "min-width": BI.pixFormat(o.minWidth) }); - } + return [{ + type: isVertical(o.iconPosition) ? "bi.vertical" : "bi.horizontal", + horizontalAlign: "center", + verticalAlign: "middle", + items, + }]; }, doClick: function () { @@ -194,6 +208,7 @@ loading: function () { this._loading = true; this.element.addClass("loading"); + !this._iconRendered && this.containerRef.populate(this.generateItems(true)); if (this.icon.loading) { this.icon.loading(); } else { @@ -228,6 +243,7 @@ setIcon: function (cls) { var o = this.options; + !this._iconRendered && this.containerRef.populate(this.generateItems(true)); if (this.icon && o.iconCls !== cls) { this.icon.element.removeClass(o.iconCls).addClass(cls); o.iconCls = cls; From 0572011a85cd80f9d745693ea84c169f5c93f660 Mon Sep 17 00:00:00 2001 From: Treecat Date: Thu, 10 Nov 2022 16:42:31 +0800 Subject: [PATCH 02/22] =?UTF-8?q?KERNEL-13489=20fix:=20button=20=E7=9A=84?= =?UTF-8?q?=E7=BC=A9=E5=86=99=E6=94=B9=E6=88=90=E7=AE=AD=E5=A4=B4=E5=87=BD?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/button/buttons/button.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js index 2e7a75936..a06f23191 100644 --- a/src/base/single/button/buttons/button.js +++ b/src/base/single/button/buttons/button.js @@ -76,7 +76,7 @@ type: "bi.center_adapt", horizontalAlign: o.textAlign, element: this, - ref(ref) { + ref: (ref) => { self.containerRef = ref; }, hgap: o.hgap, @@ -167,7 +167,7 @@ tgap: o.iconPosition === "top" ? o.iconGap : 0, bgap: o.iconPosition === "bottom" ? o.iconGap : 0, }; - + var items = [this.icon, BI.extend({ el: this.text }, gapContainer)]; if (o.iconPosition === "right" || o.iconPosition === "bottom") { items.reverse(); From c5e1c6e8f3aad7661b4d0e30a8e04ecaeaeffade Mon Sep 17 00:00:00 2001 From: data Date: Fri, 11 Nov 2022 09:06:36 +0800 Subject: [PATCH 03/22] auto upgrade version to 2.0.20221111090621 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 52d9823d0..f4fe5b8be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221110175602", + "version": "2.0.20221111090621", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From a46cab92bbaa758074672efad5e149a320ff77d9 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 11 Nov 2022 14:57:15 +0800 Subject: [PATCH 04/22] auto upgrade version to 2.0.20221111145656 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f4fe5b8be..326f247ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221111090621", + "version": "2.0.20221111145656", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 24bf52614bb01de5b2ee34191eb1806f87a87e16 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 11 Nov 2022 16:40:35 +0800 Subject: [PATCH 05/22] =?UTF-8?q?KERNEL-13158:=20=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/segment/button.segment.less | 2 +- src/less/base/segment/segment.less | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/less/base/segment/button.segment.less b/src/less/base/segment/button.segment.less index 451d65f33..5fdd04264 100644 --- a/src/less/base/segment/button.segment.less +++ b/src/less/base/segment/button.segment.less @@ -10,7 +10,7 @@ .line-segment-button-line { .transition(background 0.3s); } - &.active, &:active { + &.active, &:active:not(.disabled) { font-weight: bold; } } diff --git a/src/less/base/segment/segment.less b/src/less/base/segment/segment.less index f106ddc75..69aa01dbc 100644 --- a/src/less/base/segment/segment.less +++ b/src/less/base/segment/segment.less @@ -18,6 +18,13 @@ border-color: @color-bi-split-disabled-segment; } } +.bi-linear-segment { + &.disabled { + .bi-high-light-background { + background-color: @color-bi-background-dark-gray !important; + } + } +} .bi-theme-dark { .bi-segment { From 5b9b1cd03ceb96c03bdfca91ab5050ae32e20e72 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 11 Nov 2022 19:54:10 +0800 Subject: [PATCH 06/22] auto upgrade version to 2.0.20221111195401 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 326f247ab..492da6569 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221111145656", + "version": "2.0.20221111195401", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From a2a247237cc1f8db002ef1cd0196b5bab2546696 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 14 Nov 2022 22:13:18 +0800 Subject: [PATCH 07/22] auto upgrade version to 2.0.20221114221310 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 492da6569..998f59bfd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221111195401", + "version": "2.0.20221114221310", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 0ac1e8483ca229410b2daa20564c9da6f4a0f3c9 Mon Sep 17 00:00:00 2001 From: "Zhenfei.Li" Date: Tue, 15 Nov 2022 11:44:55 +0800 Subject: [PATCH 08/22] =?UTF-8?q?KERNEL-13521=20refactor:=20segment?= =?UTF-8?q?=E4=BD=BF=E7=94=A8grid=E5=B8=83=E5=B1=80=EF=BC=8C=E4=BD=BF?= =?UTF-8?q?=E5=85=B6=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8=E6=9C=80=E9=95=BF?= =?UTF-8?q?=E9=A1=B9=E5=AE=BD=E5=BA=A6=E7=AD=89=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/case/demo.segment.js | 8 ++++---- src/case/segment/segment.js | 11 +++++------ src/less/base/segment/segment.less | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/demo/js/case/demo.segment.js b/demo/js/case/demo.segment.js index 8831c11f3..f6b2b0068 100644 --- a/demo/js/case/demo.segment.js +++ b/demo/js/case/demo.segment.js @@ -5,20 +5,20 @@ Demo.Func = BI.inherit(BI.Widget, { render: function () { BI.createWidget({ - type: "bi.vertical", + type: "bi.horizontal", element: this, vgap: 20, hgap: 30, items: [{ type: "bi.segment", items: [{ - text: "1", + text: "较长的选项1", value: 1 }, { - text: "2", + text: "选项2", value: 2 }, { - text: "3", + text: "选项3", value: 3 }] }] diff --git a/src/case/segment/segment.js b/src/case/segment/segment.js index dac7754d1..ef52ae24a 100644 --- a/src/case/segment/segment.js +++ b/src/case/segment/segment.js @@ -23,13 +23,12 @@ BI.Segment = BI.inherit(BI.Widget, { items: BI.createItems(o.items, { type: "bi.segment_button", height: BI.toPix(o.height, 2), - whiteSpace: o.whiteSpace + whiteSpace: o.whiteSpace, }), - layout: [ - { - type: "bi.center" - } - ] + layouts: o.layouts || [{ + type: "bi.table", + columnSize: BI.makeArrayByArray(o.items, "fill"), + }], }); this.buttonGroup.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); diff --git a/src/less/base/segment/segment.less b/src/less/base/segment/segment.less index 69aa01dbc..74ffe2f16 100644 --- a/src/less/base/segment/segment.less +++ b/src/less/base/segment/segment.less @@ -7,7 +7,7 @@ border-top: 1px solid @color-bi-split-segment; border-bottom: 1px solid @color-bi-split-segment; } - & > .first-element{ + & > .first-element, & > .first-row{ border-left: 1px solid @color-bi-split-segment; .border-corner-radius(2px,0px,0px,2px) } From b5bdace1fbbd6ee371dac0708a62e5240d21368c Mon Sep 17 00:00:00 2001 From: "Zhenfei.Li" Date: Tue, 15 Nov 2022 17:17:06 +0800 Subject: [PATCH 09/22] =?UTF-8?q?KERNEL-13521=20refactor:=20segment?= =?UTF-8?q?=E8=B0=83=E6=95=B4&=E8=A1=8C=E5=88=97=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=90=8D=E6=96=B9=E6=B3=95=E6=8A=BD=E5=88=B0?= =?UTF-8?q?layout=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/case/demo.segment.js | 16 +++--- src/case/segment/segment.js | 12 ++--- src/core/wrapper/layout.js | 21 +++++++- src/core/wrapper/layout/layout.division.js | 44 ++++++--------- src/core/wrapper/layout/layout.grid.js | 31 ++++------- src/core/wrapper/layout/layout.table.js | 62 +++++++++------------- src/core/wrapper/layout/layout.window.js | 39 +++++--------- src/less/base/segment/segment.less | 8 +-- 8 files changed, 101 insertions(+), 132 deletions(-) diff --git a/demo/js/case/demo.segment.js b/demo/js/case/demo.segment.js index f6b2b0068..946c5d952 100644 --- a/demo/js/case/demo.segment.js +++ b/demo/js/case/demo.segment.js @@ -1,6 +1,6 @@ Demo.Func = BI.inherit(BI.Widget, { props: { - baseCls: "demo-func" + baseCls: "demo-func", }, render: function () { @@ -13,16 +13,16 @@ Demo.Func = BI.inherit(BI.Widget, { type: "bi.segment", items: [{ text: "较长的选项1", - value: 1 + value: 1, }, { text: "选项2", - value: 2 + value: 2, }, { text: "选项3", - value: 3 - }] - }] + value: 3, + }], + }], }); - } + }, }); -BI.shortcut("demo.segment", Demo.Func); \ No newline at end of file +BI.shortcut("demo.segment", Demo.Func); diff --git a/src/case/segment/segment.js b/src/case/segment/segment.js index ef52ae24a..3f323ffb6 100644 --- a/src/case/segment/segment.js +++ b/src/case/segment/segment.js @@ -10,7 +10,7 @@ BI.Segment = BI.inherit(BI.Widget, { return BI.extend(BI.Segment.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-segment", items: [], - height: 24 + height: 24, }); }, _init: function () { @@ -20,12 +20,12 @@ BI.Segment = BI.inherit(BI.Widget, { element: this, type: "bi.button_group", value: o.value, - items: BI.createItems(o.items, { + items: [BI.createItems(o.items, { type: "bi.segment_button", height: BI.toPix(o.height, 2), whiteSpace: o.whiteSpace, - }), - layouts: o.layouts || [{ + })], + layouts: [{ type: "bi.table", columnSize: BI.makeArrayByArray(o.items, "fill"), }], @@ -57,7 +57,7 @@ BI.Segment = BI.inherit(BI.Widget, { getValue: function () { return this.buttonGroup.getValue(); - } + }, }); BI.Segment.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.segment", BI.Segment); \ No newline at end of file +BI.shortcut("bi.segment", BI.Segment); diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js index 8ca284d30..d2926385d 100644 --- a/src/core/wrapper/layout.js +++ b/src/core/wrapper/layout.js @@ -16,7 +16,7 @@ BI.Layout = BI.inherit(BI.Widget, { scrolly: false, // true, false items: [], innerHgap: 0, - innerVgap: 0 + innerVgap: 0, }; }, @@ -727,6 +727,25 @@ BI.Layout = BI.inherit(BI.Widget, { }); }, + getRowColumnCls: function (rowIndex, colIndex, lastRowIndex, lastColIndex) { + var cls = ""; + if (rowIndex === 0) { + cls += " first-row"; + } else if (rowIndex === lastRowIndex) { + cls += " last-row"; + } + if (colIndex === 0) { + cls += " first-col"; + } else if (colIndex === lastColIndex) { + cls += " last-col"; + } + BI.isOdd(rowIndex + 1) ? (cls += " odd-row") : (cls += " even-row"); + BI.isOdd(colIndex + 1) ? (cls += " odd-col") : (cls += " even-col"); + cls += " center-element"; + + return cls; + }, + removeWidget: function (nameOrWidget) { var removeIndex, self = this; if (BI.isWidget(nameOrWidget)) { diff --git a/src/core/wrapper/layout/layout.division.js b/src/core/wrapper/layout/layout.division.js index 988d118be..307166283 100644 --- a/src/core/wrapper/layout/layout.division.js +++ b/src/core/wrapper/layout/layout.division.js @@ -28,44 +28,31 @@ BI.DivisionLayout = BI.inherit(BI.Layout, { }, stroke: function (items) { - var o = this.options; + var o = this.options, self = this; var rows = o.rows || o.items.length, columns = o.columns || ((o.items[0] && o.items[0].length) | 0); var map = BI.makeArray(rows), widths = {}, heights = {}; - function firstElement (item, row, col) { - if (row === 0) { - item.addClass("first-row"); - } - if (col === 0) { - item.addClass("first-col"); - } - item.addClass(BI.isOdd(row + 1) ? "odd-row" : "even-row"); - item.addClass(BI.isOdd(col + 1) ? "odd-col" : "even-col"); - item.addClass("center-element"); + function firstElement (item, cls) { + item.addClass(cls); + + return item; } - function firstObject (item, row, col) { - var cls = ""; - if (row === 0) { - cls += " first-row"; - } - if (col === 0) { - cls += " first-col"; - } - BI.isOdd(row + 1) ? (cls += " odd-row") : (cls += " even-row"); - BI.isOdd(col + 1) ? (cls += " odd-col") : (cls += " even-col"); - item.cls = (item.cls || "") + cls + " center-element"; + function firstObject (item, cls) { + item.cls = (item.cls || "") + cls; + + return item; } - function first (item, row, col) { + function first (item, cls) { if (item instanceof BI.Widget) { - firstElement(item.element, row, col); + firstElement(item.element, cls); } else if (item.el instanceof BI.Widget) { - firstElement(item.el.element, row, col); + firstElement(item.el.element, cls); } else if (item.el) { - firstObject(item.el, row, col); + firstObject(item.el, cls); } else { - firstObject(item, row, col); + firstObject(item, cls); } } @@ -79,6 +66,7 @@ BI.DivisionLayout = BI.inherit(BI.Layout, { heights[j] = (heights[j] || 0) + item.height; map[i][j] = el; }); + return; } widths[item.row] = (widths[item.row] || 0) + item.width; @@ -106,7 +94,7 @@ BI.DivisionLayout = BI.inherit(BI.Layout, { if (j == o.columns - 1) { w.element.css({right: "0%"}); } - first(w, i, j); + first(w, self.getRowColumnCls(i, j, rows - 1, columns - 1)); totalW += map[i][j].width; } } diff --git a/src/core/wrapper/layout/layout.grid.js b/src/core/wrapper/layout/layout.grid.js index a81c31681..53e4cf00b 100644 --- a/src/core/wrapper/layout/layout.grid.js +++ b/src/core/wrapper/layout/layout.grid.js @@ -36,29 +36,16 @@ BI.GridLayout = BI.inherit(BI.Layout, { els[i] = []; } - function firstElement (item, row, col) { - if (row === 0) { - item.addClass("first-row"); - } - if (col === 0) { - item.addClass("first-col"); - } - item.addClass(BI.isOdd(row + 1) ? "odd-row" : "even-row"); - item.addClass(BI.isOdd(col + 1) ? "odd-col" : "even-col"); - item.addClass("center-element"); + function firstElement (item, cls) { + item.addClass(cls); + + return item; } - function firstObject (item, row, col) { - var cls = ""; - if (row === 0) { - cls += " first-row"; - } - if (col === 0) { - cls += " first-col"; - } - BI.isOdd(row + 1) ? (cls += " odd-row") : (cls += " even-row"); - BI.isOdd(col + 1) ? (cls += " odd-col") : (cls += " even-col"); - item.cls = (item.cls || "") + cls + " center-element"; + function firstObject (item, cls) { + item.cls = (item.cls || "") + cls; + + return item; } function first (item, row, col) { @@ -89,7 +76,7 @@ BI.GridLayout = BI.inherit(BI.Layout, { type: "bi.layout" }); } - first(els[i][j], i, j); + first(els[i][j], self.getRowColumnCls(i, j, rows - 1, columns - 1)); els[i][j].element.css({ position: "absolute", top: height * i + "%", diff --git a/src/core/wrapper/layout/layout.table.js b/src/core/wrapper/layout/layout.table.js index 6352672c2..51d6eeb14 100644 --- a/src/core/wrapper/layout/layout.table.js +++ b/src/core/wrapper/layout/layout.table.js @@ -16,7 +16,7 @@ BI.TableLayout = BI.inherit(BI.Layout, { // rowSize: 30, // or [30,30,30] hgap: 0, vgap: 0, - items: [] + items: [], }); }, render: function () { @@ -45,57 +45,43 @@ BI.TableLayout = BI.inherit(BI.Layout, { return self._optimiseGap(size); }).join(" ") : BI.range(o.items.length).fill(this._optimiseGap(o.rowSize)).join(" "), "grid-row-gap": this._optimiseGap(o.vgap), - "grid-column-gap": this._optimiseGap(o.hgap) + "grid-column-gap": this._optimiseGap(o.hgap), }); } + return { type: "bi.default", ref: function (_ref) { self.layout = _ref; }, - items: this._formatItems(items) + items: this._formatItems(items), }; }, _formatItems: function (items) { - var o = this.options; + var o = this.options, self = this; + + function firstElement (item, cls) { + item.addClass(cls); - function firstElement (item, row, col) { - if (row === 0) { - item.addClass("first-row"); - } - if (col === 0) { - item.addClass("first-col"); - } - item.addClass(BI.isOdd(row + 1) ? "odd-row" : "even-row"); - item.addClass(BI.isOdd(col + 1) ? "odd-col" : "even-col"); - item.addClass("center-element"); return item; } - function firstObject (item, row, col) { - var cls = ""; - if (row === 0) { - cls += " first-row"; - } - if (col === 0) { - cls += " first-col"; - } - BI.isOdd(row + 1) ? (cls += " odd-row") : (cls += " even-row"); - BI.isOdd(col + 1) ? (cls += " odd-col") : (cls += " even-col"); - item.cls = (item.cls || "") + cls + " center-element"; + function firstObject (item, cls) { + item.cls = (item.cls || "") + cls; + return item; } - function first (item, row, col) { + function first (item, cls) { if (item instanceof BI.Widget) { - return firstElement(item.element, row, col); + return firstElement(item.element, cls); } else if (item.el instanceof BI.Widget) { - return firstElement(item.el.element, row, col); + return firstElement(item.el.element, cls); } else if (item.el) { - return firstObject(item.el, row, col); + return firstObject(item.el, cls); } else { - return firstObject(item, row, col); + return firstObject(item, cls); } } @@ -105,18 +91,20 @@ BI.TableLayout = BI.inherit(BI.Layout, { columnSize: ["fill"], horizontalAlign: o.horizontalAlign, verticalAlign: o.verticalAlign, - items: [BI.formatEL(item)] + items: [BI.formatEL(item)], }; } - return BI.reduce(items, function (row, result, i) { - return result.concat(BI.map(row, function (j, item) { + return BI.reduce(items, function (rowItems, result, rowIndex) { + return result.concat(BI.map(rowItems, function (colIndex, item) { + var cls = self.getRowColumnCls(rowIndex, colIndex, items.length - 1, rowItems.length - 1); if (BI.isEmpty(item)) { return first(wrapLayout({ - type: "bi.layout" - }), i, j); + type: "bi.layout", + }), cls); } - return first(wrapLayout(item), i, j); + + return first(wrapLayout(item), cls); })); }, []); }, @@ -127,6 +115,6 @@ BI.TableLayout = BI.inherit(BI.Layout, { populate: function (items) { this.layout.populate(this._formatItems(items)); - } + }, }); BI.shortcut("bi.table", BI.TableLayout); diff --git a/src/core/wrapper/layout/layout.window.js b/src/core/wrapper/layout/layout.window.js index c7d14623c..a6e6c6a26 100644 --- a/src/core/wrapper/layout/layout.window.js +++ b/src/core/wrapper/layout/layout.window.js @@ -35,7 +35,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, { }, stroke: function (items) { - var o = this.options; + var o = this.options, self = this; if (BI.isNumber(o.rowSize)) { o.rowSize = BI.makeArray(o.items.length, 1 / o.items.length); } @@ -43,29 +43,16 @@ BI.WindowLayout = BI.inherit(BI.Layout, { o.columnSize = BI.makeArray(o.items[0].length, 1 / o.items[0].length); } - function firstElement (item, row, col) { - if (row === 0) { - item.addClass("first-row"); - } - if (col === 0) { - item.addClass("first-col"); - } - item.addClass(BI.isOdd(row + 1) ? "odd-row" : "even-row"); - item.addClass(BI.isOdd(col + 1) ? "odd-col" : "even-col"); - item.addClass("center-element"); + function firstElement (item, cls) { + item.addClass(cls); + + return item; } - function firstObject (item, row, col) { - var cls = ""; - if (row === 0) { - cls += " first-row"; - } - if (col === 0) { - cls += " first-col"; - } - BI.isOdd(row + 1) ? (cls += " odd-row") : (cls += " even-row"); - BI.isOdd(col + 1) ? (cls += " odd-col") : (cls += " even-col"); - item.cls = (item.cls || "") + cls + " center-element"; + function firstObject (item, cls) { + item.cls = (item.cls || "") + cls; + + return item; } function first (item, row, col) { @@ -109,7 +96,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, { h = this._optimiseGap(o.rowSize[i]); } wi.element.css({top: t, height: h}); - first(wi, i, j); + first(wi, self.getRowColumnCls(i, j, o.rows - 1, o.columns - 1)); } if (!BI.isNumber(o.rowSize[i])) { break; @@ -127,7 +114,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, { h = this._optimiseGap(o.rowSize[i]); } wi.element.css({bottom: b, height: h}); - first(wi, i, j); + first(wi, self.getRowColumnCls(i, j, o.rows - 1, o.columns - 1)); } if (!BI.isNumber(o.rowSize[i])) { break; @@ -145,7 +132,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, { w = this._optimiseGap(o.columnSize[j]); } wi.element.css({left: l, width: w}); - first(wi, i, j); + first(wi, self.getRowColumnCls(i, j, o.rows - 1, o.columns - 1)); } if (!BI.isNumber(o.columnSize[j])) { break; @@ -163,7 +150,7 @@ BI.WindowLayout = BI.inherit(BI.Layout, { w = this._optimiseGap(o.columnSize[j]); } wi.element.css({right: r, width: w}); - first(wi, i, j); + first(wi, self.getRowColumnCls(i, j, o.rows - 1, o.columns - 1)); } if (!BI.isNumber(o.columnSize[j])) { break; diff --git a/src/less/base/segment/segment.less b/src/less/base/segment/segment.less index 74ffe2f16..08fec037a 100644 --- a/src/less/base/segment/segment.less +++ b/src/less/base/segment/segment.less @@ -7,14 +7,14 @@ border-top: 1px solid @color-bi-split-segment; border-bottom: 1px solid @color-bi-split-segment; } - & > .first-element, & > .first-row{ + & > .first-col{ border-left: 1px solid @color-bi-split-segment; .border-corner-radius(2px,0px,0px,2px) } - & > .last-element{ + & > .last-col{ .border-corner-radius(0px,2px,2px,0px) } - &.disabled > .center-element, &.disabled > .first-element{ + &.disabled > .center-element, &.disabled > .first-col{ border-color: @color-bi-split-disabled-segment; } } @@ -34,7 +34,7 @@ border-top: 1px solid @color-bi-split-segment-theme-dark; border-bottom: 1px solid @color-bi-split-segment-theme-dark; } - & > .first-element{ + & > .first-col{ border-left: 1px solid @color-bi-split-segment-theme-dark; } } From eeb4a183da525f278f05c725d5135e6a951cb40e Mon Sep 17 00:00:00 2001 From: iapyang Date: Tue, 15 Nov 2022 17:19:05 +0800 Subject: [PATCH 10/22] =?UTF-8?q?KERNEL-13523=20chore:=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=B8=8Bfui-cli=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/cli/cli.js | 35 ++++++----------------------------- bin/cli/worker/cli.worker.js | 4 ++-- package.json | 8 ++++++-- 3 files changed, 14 insertions(+), 33 deletions(-) mode change 100644 => 100755 bin/cli/cli.js diff --git a/bin/cli/cli.js b/bin/cli/cli.js old mode 100644 new mode 100755 index 732fc1133..513024023 --- a/bin/cli/cli.js +++ b/bin/cli/cli.js @@ -1,44 +1,21 @@ #!/usr/bin/env node +const yargs = require('yargs/yargs'); +const { hideBin } = require('yargs/helpers'); const workerCmd = require('./worker/cli.worker'); -function getArgs (startIndex = 1) { - const args = {}; - process.argv - .slice(startIndex, process.argv.length) - .forEach(arg => { - // long arg - if (arg.slice(0, 2) === '--') { - const longArg = arg.split('='); - const longArgFlag = longArg[0].slice(2, longArg[0].length); - const longArgValue = longArg.length > 1 ? longArg[1] : true; - args[longArgFlag] = longArgValue; - // flags - } else if (arg[0] === '-') { - const flags = arg.slice(1, arg.length); - args[flags] = true; - } - }); +const argv = yargs(hideBin(process.argv)).argv; - return args; -} +const cmd = argv._[0]; const cmds = new Map([ ['worker', workerCmd], ]); -const baseCmd = 'fui-cli'; - -const startIndex = process.argv.findIndex(argv => argv.indexOf(baseCmd) !== -1); - -if (startIndex === -1) { - throw new Error(`Command ${baseCmd} not found in args`); -} - -const cmd = process.argv[startIndex + 1]; +if (!cmd) throw new Error('Command is undefined!'); if (cmds.has(cmd)) { - cmds.get(cmd)?.exec(getArgs(startIndex + 2)); + cmds.get(cmd)?.exec(argv); } else { throw new Error(`Command ${cmd} not supported`); } diff --git a/bin/cli/worker/cli.worker.js b/bin/cli/worker/cli.worker.js index 555c99cf0..b67513fbb 100644 --- a/bin/cli/worker/cli.worker.js +++ b/bin/cli/worker/cli.worker.js @@ -5,7 +5,7 @@ function first2UpperCase(str) { return str.toLowerCase().replace(/( |^)[a-z]/g, L => L.toUpperCase()); } -function scanAndCreate(structure, workerName, root = process.env.INIT_CWD) { +function scanAndCreate(structure, workerName, root) { Object.keys(structure) .forEach(name => { if (typeof structure[name] === 'object') { @@ -60,7 +60,7 @@ module.exports = { }, }; - scanAndCreate(structure, name); + scanAndCreate(structure, name, args.where ? path.resolve(args.where) : process.cwd()); }, }; diff --git a/package.json b/package.json index 998f59bfd..ebc245f87 100644 --- a/package.json +++ b/package.json @@ -86,5 +86,9 @@ "registry": "https://registry.npmjs.org" }, "author": "fanruan", - "license": "MIT" -} \ No newline at end of file + "license": "MIT", + "dependencies": { + "@types/yargs": "17.0.13", + "yargs": "17.6.2" + } +} From 2f9c3337fc4bbb099c6e44dc556c8d1c46443cb8 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 15 Nov 2022 17:54:05 +0800 Subject: [PATCH 11/22] =?UTF-8?q?KERNEL-13158:=20zhenfei=E6=BC=8F=E6=94=B9?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/linearsegment/linear.segment.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/case/linearsegment/linear.segment.js b/src/case/linearsegment/linear.segment.js index 3c1b677c3..b0b00f95b 100644 --- a/src/case/linearsegment/linear.segment.js +++ b/src/case/linearsegment/linear.segment.js @@ -3,9 +3,6 @@ BI.LinearSegment = BI.inherit(BI.Widget, { props: { baseCls: "bi-linear-segment", items: [], - layouts: [{ - type: "bi.center" - }], height: 30 }, @@ -13,11 +10,14 @@ BI.LinearSegment = BI.inherit(BI.Widget, { var self = this, o = this.options; return { type: "bi.button_group", - items: BI.createItems(o.items, { + items: [BI.createItems(o.items, { type: "bi.linear_segment_button", height: o.height - }), - layouts: o.layouts, + })], + layouts: [{ + type: "bi.table", + columnSize: BI.makeArrayByArray(o.items, "fill"), + }], value: o.value, listeners: [{ eventName: "__EVENT_CHANGE__", From 616f473ea979f9a4083c085061a351e4c01eda89 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 15 Nov 2022 17:56:33 +0800 Subject: [PATCH 12/22] auto upgrade version to 2.0.20221115175620 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ebc245f87..0f26417fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221114221310", + "version": "2.0.20221115175620", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", @@ -91,4 +91,4 @@ "@types/yargs": "17.0.13", "yargs": "17.6.2" } -} +} \ No newline at end of file From d205e542834eee9f8f8a58f92b84c9fd0bcd08ea Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 16 Nov 2022 14:01:10 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E6=97=A0JIRA=20configRender.call(this?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/4.widget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/4.widget.js b/src/core/4.widget.js index 3adf1f5f4..e541191df 100644 --- a/src/core/4.widget.js +++ b/src/core/4.widget.js @@ -364,7 +364,7 @@ var workerMode = BI.Providers.getProvider("bi.provider.system").getWorkerMode(); var render = BI.isFunction(this.options.render) ? this.options.render : (workerMode ? (this.$render || this.render) : this.render); var els = render && render.call(this); - els = this.options.configRender ? this.options.configRender(els) : els; + els = this.options.configRender ? this.options.configRender.call(this, els) : els; els = BI.Plugin.getRender(this.options.type, els); if (BI.isPlainObject(els)) { els = [els]; From e27686460c6817e82da5c046e36a7681b874ede4 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 16 Nov 2022 14:34:11 +0800 Subject: [PATCH 14/22] auto upgrade version to 2.0.20221116143350 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f26417fe..3c9656bb8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221115175620", + "version": "2.0.20221116143350", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 346b126b617dc3fcfa57c6a75be0f0ea735a2ae3 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 16 Nov 2022 15:15:21 +0800 Subject: [PATCH 15/22] auto upgrade version to 2.0.20221116151511 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3c9656bb8..37c1ef1db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221116143350", + "version": "2.0.20221116151511", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From d90c2469cc7113c06d56107d1d2ba91c868ce3ef Mon Sep 17 00:00:00 2001 From: windy Date: Wed, 16 Nov 2022 17:20:41 +0800 Subject: [PATCH 16/22] =?UTF-8?q?BI-117406=20fix:=20=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/year/combo.year.js | 2 +- src/widget/yearmonth/combo.yearmonth.js | 2 +- src/widget/yearquarter/combo.yearquarter.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/widget/year/combo.year.js b/src/widget/year/combo.year.js index 558a6c62a..d2d68d19b 100644 --- a/src/widget/year/combo.year.js +++ b/src/widget/year/combo.year.js @@ -141,7 +141,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, { items: [{ el: { type: "bi.icon_button", - cls: "bi-trigger-icon-button", + cls: "bi-trigger-icon-button date-change-h-font", width: this._const.iconWidth, height: BI.toPix(o.height, border), ref: function () { diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js index 4a85db0f2..82d6e3ca8 100644 --- a/src/widget/yearmonth/combo.yearmonth.js +++ b/src/widget/yearmonth/combo.yearmonth.js @@ -141,7 +141,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { items: [{ el: { type: "bi.icon_button", - cls: "bi-trigger-icon-button", + cls: "bi-trigger-icon-button date-change-h-font", width: BI.toPix(o.height, border), height: BI.toPix(o.height, border), ref: function () { diff --git a/src/widget/yearquarter/combo.yearquarter.js b/src/widget/yearquarter/combo.yearquarter.js index 455fd9901..1403d254f 100644 --- a/src/widget/yearquarter/combo.yearquarter.js +++ b/src/widget/yearquarter/combo.yearquarter.js @@ -144,7 +144,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { items: [{ el: { type: "bi.icon_button", - cls: "bi-trigger-icon-button", + cls: "bi-trigger-icon-button date-change-h-font", width: this._consts.iconWidth, height: BI.toPix(o.height, border), ref: function () { @@ -169,7 +169,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { } switch (type) { case BI.DynamicYearQuarterCombo.Dynamic: - this.comboWrapper.resize(); + this.changeIcon.setVisible(true); break; default: this.changeIcon.setVisible(false); From 851ca0f4615a2718f7fa8679944f73ea1ebe2fea Mon Sep 17 00:00:00 2001 From: data Date: Wed, 16 Nov 2022 17:54:48 +0800 Subject: [PATCH 17/22] auto upgrade version to 2.0.20221116175433 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 37c1ef1db..02af54253 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221116151511", + "version": "2.0.20221116175433", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 686ad06db08bf632615d32253aee29593ed07581 Mon Sep 17 00:00:00 2001 From: "Xavier.Meng" Date: Wed, 16 Nov 2022 18:28:48 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E6=97=A0JIRA=20refactor(base):=20?= =?UTF-8?q?=E7=BB=99findIndex=E5=8A=A0=E6=B3=9B=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/core/base.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/typescript/core/base.ts b/typescript/core/base.ts index b5a3ce55c..6182a0833 100644 --- a/typescript/core/base.ts +++ b/typescript/core/base.ts @@ -148,9 +148,9 @@ export interface _base { takeRight: (array: T[], n: number) => T[]; - findIndex: (array: any[], value: any, callback?: Function | object | string, thisArg?: any) => number; + findIndex: (array: T[], predicate?: ((index: number, item: T, array: T[]) => any) | object | string, thisArg?: any) => number; - findLastIndex: (array: any[], value: any, callback?: Function | object | string, thisArg?: any) => number; + findLastIndex: (array: T[], predicate?: ((index: number, item: T, array: T[]) => any) | object | string, thisArg?: any) => number; makeArray: (length: number, value?: T) => number[] | T[]; From 42dd1d2f7f80b5ec3490a336c778109bec6e1e5d Mon Sep 17 00:00:00 2001 From: data Date: Wed, 16 Nov 2022 20:15:11 +0800 Subject: [PATCH 19/22] auto upgrade version to 2.0.20221116201501 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 02af54253..5729038dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221116175433", + "version": "2.0.20221116201501", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 5a30dce710034e67b04a7686f795feb8eac3a8c4 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 17 Nov 2022 12:54:21 +0800 Subject: [PATCH 20/22] auto upgrade version to 2.0.20221117125408 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5729038dd..1866c70bd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221116201501", + "version": "2.0.20221117125408", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 67cd40af6df45ea34a55b0ee907df807413b82b1 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 17 Nov 2022 17:24:05 +0800 Subject: [PATCH 21/22] auto upgrade version to 2.0.20221117172352 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1866c70bd..841972678 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221117125408", + "version": "2.0.20221117172352", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From ad85ebd3986dfff8779654385e9819a38df81a19 Mon Sep 17 00:00:00 2001 From: windy Date: Mon, 21 Nov 2022 14:47:31 +0800 Subject: [PATCH 22/22] =?UTF-8?q?BI-117324=20=E6=B7=B1=E8=89=B2=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E6=A0=91=E8=8A=82=E7=82=B9=E6=9F=A5=E7=9C=8B=E5=B7=B2?= =?UTF-8?q?=E9=80=89=E6=96=87=E5=AD=97=E7=9C=8B=E4=B8=8D=E6=B8=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/tree/tree.display.less | 8 ++++++++ src/less/base/tree/ztree.less | 6 ++++++ src/less/lib/colors.less | 1 + src/less/lib/constant.less | 1 + src/less/lib/theme.less | 1 + 5 files changed, 17 insertions(+) diff --git a/src/less/base/tree/tree.display.less b/src/less/base/tree/tree.display.less index 2343d4054..6c483feac 100644 --- a/src/less/base/tree/tree.display.less +++ b/src/less/base/tree/tree.display.less @@ -17,4 +17,12 @@ background-color: inherit; .opacity(1); } +} + +.bi-theme-dark { + .bi-display-tree { + .ztree * { + color: @color-bi-text-display-tree-theme-dark; + } + } } \ No newline at end of file diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less index a75904add..e9eee2c97 100644 --- a/src/less/base/tree/ztree.less +++ b/src/less/base/tree/ztree.less @@ -90,6 +90,12 @@ } } + .ztree li span.button.chk { + &.bi-checkbox { + border-color: @color-bi-border-dark-line-theme-dark; + } + } + &.bi-half-button { border: 1px solid @color-bi-border-hover-active-checkbox-theme-dark; } diff --git a/src/less/lib/colors.less b/src/less/lib/colors.less index dca2a9989..fd429ac08 100644 --- a/src/less/lib/colors.less +++ b/src/less/lib/colors.less @@ -13,6 +13,7 @@ @color-bi-text-black-theme-dark: @font-color-normal-theme-dark; //灰色字体颜色 @color-bi-text-gray: @font-color-gray; +@color-bi-text-gray-theme-dark: @font-color-gray-theme-dark; //浅灰色字体 @color-bi-text-light-gray: @font-color-light-gray; //深色主题浅灰色字体 diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index 17421baf0..fa69a4783 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -167,6 +167,7 @@ @font-color-light-disabled: @color-dark-gray; @font-color-light-disabled-theme-dark: @color-dark-gray-theme-dark; @font-color-gray: #999999; +@font-color-gray-theme-dark: @color-gray-theme-dark; @font-color-white: @color-white; @font-color-white-theme-dark: @color-white-theme-dark; @font-color-light-highlight: @color-light-blue-100; diff --git a/src/less/lib/theme.less b/src/less/lib/theme.less index ae3fd45bb..1092dd18a 100644 --- a/src/less/lib/theme.less +++ b/src/less/lib/theme.less @@ -233,6 +233,7 @@ @color-bi-color-error-input-text-area: @color-bi-text-failure; // tree @color-bi-text-display-tree: @color-bi-text-gray; +@color-bi-text-display-tree-theme-dark: @color-bi-text-gray-theme-dark; @color-bi-border-tree-expander-popup-line: @color-bi-border-dark-gray-line; @color-bi-border-tree-expander-popup-line-theme-dark: @color-bi-border-dark-gray-line-theme-dark; // popup