From 75644559d41011b289048c11f8a8b7ded471914e Mon Sep 17 00:00:00 2001 From: zsmj Date: Tue, 1 Nov 2022 11:36:32 +0800 Subject: [PATCH 01/39] =?UTF-8?q?DESIGN-4355=20feat:=20tooltip=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=BC=82=E6=AD=A5=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/0.single.js | 55 +++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/src/base/single/0.single.js b/src/base/single/0.single.js index 93705ca91..0d42ec143 100644 --- a/src/base/single/0.single.js +++ b/src/base/single/0.single.js @@ -19,35 +19,35 @@ BI.Single = BI.inherit(BI.Widget, { return BI.extend(conf, { readonly: false, title: null, - warningTitle: null, - tipType: null, // success或warning - belowMouse: false, // title是否跟随鼠标 + warningTitle: null, // deprecated + tipType: null, // deprecated success或warning + belowMouse: false, // title是否跟随鼠标 enableHover: false, }); }, _showToolTip: function (e, opt) { opt || (opt = {}); + var self = this; var o = this.options; - var tooltipOpt = {}; var title = this.getTitle(); - if (BI.isPlainObject(title)) { - tooltipOpt = title; + + if (title instanceof Promise) { + title.then(resolvedTitle => { + this.mouseOver && showToolTip(this._getTooltipOptions(resolvedTitle)); + }); } else { - tooltipOpt.level = this.getTipType() || "success"; - // 由于以前的用法,存在大量disabled:true搭配warningTitle的情况,所以这里做一个兼容,disabled:true的情况下,依然优先显示warningTitle,避免只设置了warningTitle而没有设置title的情况 - if (BI.isNull(o.tipType) && !this.isEnabled()) { - tooltipOpt.text = (this.getWarningTitle() || title); - } else { - tooltipOpt.text = tooltipOpt.level === "success" ? title : (this.getWarningTitle() || title); - } + showToolTip(this._getTooltipOptions(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); + + function showToolTip(tooltipOpt) { + if (BI.isKey(tooltipOpt.text) && !BI.Tooltips.has(self.getName())) { + BI.Tooltips.show(e, self.getName(), tooltipOpt, self, opt); + if (o.action) { + BI.Actions.runAction(o.action, "hover", o, self); + } + BI.Actions.runGlobalAction("hover", o, self); } - BI.Actions.runGlobalAction("hover", o, this); } }, @@ -91,12 +91,30 @@ BI.Single = BI.inherit(BI.Widget, { } }, + _getTooltipOptions: function (title) { + var o = this.options; + var tooltipOpt = {}; + if (BI.isPlainObject(title)) { + tooltipOpt = title; + } else { + tooltipOpt.level = this.getTipType() || "success"; + // 由于以前的用法,存在大量disabled:true搭配warningTitle的情况,所以这里做一个兼容,disabled:true的情况下,依然优先显示warningTitle,避免只设置了warningTitle而没有设置title的情况 + if (BI.isNull(o.tipType) && !this.isEnabled()) { + tooltipOpt.text = (this.getWarningTitle() || title); + } else { + tooltipOpt.text = tooltipOpt.level === "success" ? title : (this.getWarningTitle() || title); + } + } + return tooltipOpt; + }, + enableHover: function (opt) { opt || (opt = {}); var self = this; if (!this._hoverBinded) { this.element.unbind("mouseenter.title").on("mouseenter.title", function (e) { self._e = e; + self.mouseOver = true; if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) { delayingTooltips = self.getName(); self.showTimeout = BI.delay(function () { @@ -144,6 +162,7 @@ BI.Single = BI.inherit(BI.Widget, { }); this.element.unbind("mouseleave.title").on("mouseleave.title", function (e) { self._e = null; + self.mouseOver = false; self._clearTimeOut(); self._hideTooltip(); }); From 4889554cfd5c41c01032712a47a18fc3b61bb2f9 Mon Sep 17 00:00:00 2001 From: zsmj Date: Tue, 1 Nov 2022 17:07:12 +0800 Subject: [PATCH 02/39] =?UTF-8?q?DESIGN-4355=20feat:=20tooltip=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=BC=82=E6=AD=A5=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/0.single.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/base/single/0.single.js b/src/base/single/0.single.js index 0d42ec143..c13e02e81 100644 --- a/src/base/single/0.single.js +++ b/src/base/single/0.single.js @@ -33,8 +33,10 @@ BI.Single = BI.inherit(BI.Widget, { var title = this.getTitle(); if (title instanceof Promise) { + this.requestingTitle = title; title.then(resolvedTitle => { - this.mouseOver && showToolTip(this._getTooltipOptions(resolvedTitle)); + // 由于是异步的,所以无法避免Promise resolve时机问题,所以设计为:鼠标移出了则不显示,并且只显示最后一次发起的查询结果 + this.mouseOver && this.requestingTitle === title && showToolTip(this._getTooltipOptions(resolvedTitle)); }); } else { showToolTip(this._getTooltipOptions(title)); From 3390d8ed24de2a97c15c06a51a1fa795df822943 Mon Sep 17 00:00:00 2001 From: zsmj Date: Tue, 1 Nov 2022 17:07:46 +0800 Subject: [PATCH 03/39] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E5=86=99=E5=8F=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/button/node/siwtcher.tree.node.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/case/button/node/siwtcher.tree.node.js b/src/case/button/node/siwtcher.tree.node.js index 89d055c51..8669f697b 100644 --- a/src/case/button/node/siwtcher.tree.node.js +++ b/src/case/button/node/siwtcher.tree.node.js @@ -32,10 +32,10 @@ BI.TreeNodeSwitcher = BI.inherit(BI.NodeButton, { return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type2", "tree-expand-icon-type2"]; } else if (options.isLastNode) { // 最后一个节点 - return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type3", "tree-expand-icon-type3"]; + return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type4", "tree-expand-icon-type4"]; } else { // 其他情况 - return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type4", "tree-expand-icon-type4"]; + return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type3", "tree-expand-icon-type3"]; } }, From 0293ab2064db2aacef11126a8344193a88cc4a88 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 1 Nov 2022 19:55:13 +0800 Subject: [PATCH 04/39] auto upgrade version to 2.0.20221101195503 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d8d1135eb..864d956f2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221101100519", + "version": "2.0.20221101195503", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 43ecbf5be860485a6c3d7c9a42b9db7b09e3e7f2 Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 2 Nov 2022 11:35:44 +0800 Subject: [PATCH 05/39] =?UTF-8?q?KERNEL-13158:=20context=E8=B7=B3=E8=BF=87?= =?UTF-8?q?popup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/fix/fix.compact.js | 4 +- examples/useContext.html | 54 +++++++++++++++++++++++++-- src/widget/downlist/combo.downlist.js | 37 +++++++++--------- 3 files changed, 72 insertions(+), 23 deletions(-) diff --git a/dist/fix/fix.compact.js b/dist/fix/fix.compact.js index 6179d484b..1fdba9727 100644 --- a/dist/fix/fix.compact.js +++ b/dist/fix/fix.compact.js @@ -109,13 +109,13 @@ pushTarget(this.store); return true; } - if (this._store) { + if (this._store || this.options._store) { var store = BI.Widget.findStore(this.options.context || this._parent || this.options.element || this._context); if (store) { pushTarget(store); needPop = true; } - this.store = this._store(); + this.store = (this._store || this.options._store)(); this.store && (this.store._widget = this); needPop && popTarget(); needPop = false; diff --git a/examples/useContext.html b/examples/useContext.html index 4f91239bd..96e40628c 100644 --- a/examples/useContext.html +++ b/examples/useContext.html @@ -25,7 +25,7 @@ cssScale: 2.0 }; }, - childContext: ["text"], + childContext: ["text", "cssScale"], computed: { text: function () { @@ -41,10 +41,20 @@ }); BI.model("demo.model", Model); + var TempModel = BI.inherit(BI.Model, { + state: function () { + return { + cssScale: 1.0 + }; + }, + childContext: ["cssScale"], + }); + BI.model("demo.temp_model", TempModel); + var oldFormat = BI.pixFormat; BI.pixFormat = function (pix, border) { var context = BI.useContext("cssScale"); - if (!context) { + if (!context || context.model.cssScale <=1) { return oldFormat.apply(this, arguments); } if (!BI.isNumber(pix)) { @@ -59,8 +69,8 @@ var oldPix = BI.toPix; BI.toPix = function (pix, border) { var context = BI.useContext("cssScale"); - if (!context) { - return oldPix.apply(this, arguments); + if (!context || context.model.cssScale <=1) { + return oldFormat.apply(this, arguments); } if (!BI.isNumber(pix)) { return pix; @@ -130,6 +140,42 @@ day: 15 } } + }, { + type: "bi.down_list_combo", + cls: "bi-border", + width: 24, + height: 24, + popup: { + _store: function () { + return BI.Models.getModel("demo.temp_model"); + } + }, + value: [{value: 2}, {value: 3, childValue: 4}], + items: [[{ + text: "属于", + value: 1, + cls: "dot-e-font" + }, { + text: "不属于", + value: 2, + cls: "dot-e-font" + }], [{ + el: { + text: "大于", + value: 3, + iconCls1: "dot-e-font" + }, + value: 3, + children: [{ + text: "固定值", + value: 4, + cls: "dot-e-font" + }, { + text: "平均值", + value: 5, + cls: "dot-e-font" + }] + }]] }] }; }; diff --git a/src/widget/downlist/combo.downlist.js b/src/widget/downlist/combo.downlist.js index cf983dfc4..8b9aa4c0c 100644 --- a/src/widget/downlist/combo.downlist.js +++ b/src/widget/downlist/combo.downlist.js @@ -17,7 +17,7 @@ text: item.text, icon: item.icon, cls: item.cls, - iconCls1: item.iconCls1, + iconCls1: item.iconCls1, value: item.value }; } @@ -25,7 +25,7 @@ }); return result; } - + /** * Created by roy on 15/8/14. */ @@ -41,16 +41,17 @@ container: null, stopPropagation: false, el: {}, + popup: {}, minWidth: 140, maxHeight: 1000, destroyWhenHide: false }); }, - + _init: function () { BI.DownListCombo.superclass._init.apply(this, arguments); var self = this, o = this.options; - + this.downlistcombo = BI.createWidget({ element: this, type: "bi.combo", @@ -63,12 +64,13 @@ belowMouse: o.belowMouse, stopPropagation: o.stopPropagation, destroyWhenHide: o.destroyWhenHide, - el: BI.createWidget(o.el, { + el: { type: "bi.icon_trigger", extraCls: o.iconCls, width: o.width, - height: o.height - }), + height: o.height, + ...o.el + }, popup: { el: { type: "bi.down_list_popup", @@ -94,39 +96,40 @@ }, stopPropagation: o.stopPropagation, maxHeight: o.maxHeight, - minWidth: o.minWidth + minWidth: o.minWidth, + ...o.popup } }); - + this.downlistcombo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () { self.fireEvent(BI.DownListCombo.EVENT_BEFORE_POPUPVIEW); }); }, - + hideView: function () { this.downlistcombo.hideView(); }, - + showView: function (e) { this.downlistcombo.showView(e); }, - + populate: function (items) { this.popupView.populate(items); }, - + setValue: function (v) { this.popupView.setValue(v); }, - + getValue: function () { return this.popupView.getValue(); }, - + adjustWidth: function () { this.downlistcombo.adjustWidth(); }, - + adjustHeight: function () { this.downlistcombo.adjustHeight(); } @@ -134,6 +137,6 @@ BI.DownListCombo.EVENT_CHANGE = "EVENT_CHANGE"; BI.DownListCombo.EVENT_SON_VALUE_CHANGE = "EVENT_SON_VALUE_CHANGE"; BI.DownListCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; - + BI.shortcut("bi.down_list_combo", BI.DownListCombo); }()); From 3c2d7e826754cc12097004c52e2051f308e93ad7 Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 2 Nov 2022 11:42:40 +0800 Subject: [PATCH 06/39] =?UTF-8?q?KERNEL-13158:=20context=E8=B7=B3=E8=BF=87?= =?UTF-8?q?popup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/useContext.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/useContext.html b/examples/useContext.html index 96e40628c..f770cd294 100644 --- a/examples/useContext.html +++ b/examples/useContext.html @@ -119,7 +119,7 @@ var child; var store = BI.useStore(); return function () { - this.element[0].style.setProperty('--css-scale', store.model.cssScale); + this.element[0].style.setProperty('--css-scale', 2); return { type: "bi.vertical", vgap: 20, From 4c54640fee1858b4da24ce0e8d4637771fb314af Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 2 Nov 2022 11:43:34 +0800 Subject: [PATCH 07/39] =?UTF-8?q?KERNEL-13158:=20context=E8=B7=B3=E8=BF=87?= =?UTF-8?q?popup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/useContext.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/useContext.html b/examples/useContext.html index f770cd294..4092713e9 100644 --- a/examples/useContext.html +++ b/examples/useContext.html @@ -22,7 +22,7 @@ state: function () { return { expand: false, - cssScale: 2.0 + cssScale: true }; }, childContext: ["text", "cssScale"], @@ -44,7 +44,7 @@ var TempModel = BI.inherit(BI.Model, { state: function () { return { - cssScale: 1.0 + cssScale: false }; }, childContext: ["cssScale"], @@ -54,7 +54,7 @@ var oldFormat = BI.pixFormat; BI.pixFormat = function (pix, border) { var context = BI.useContext("cssScale"); - if (!context || context.model.cssScale <=1) { + if (!context || context.model.cssScale === false) { return oldFormat.apply(this, arguments); } if (!BI.isNumber(pix)) { @@ -69,7 +69,7 @@ var oldPix = BI.toPix; BI.toPix = function (pix, border) { var context = BI.useContext("cssScale"); - if (!context || context.model.cssScale <=1) { + if (!context || context.model.cssScale === false) { return oldFormat.apply(this, arguments); } if (!BI.isNumber(pix)) { From 72d40d30d86080beb162b99f0941a7499be08e06 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 2 Nov 2022 14:35:47 +0800 Subject: [PATCH 08/39] auto upgrade version to 2.0.20221102143540 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 864d956f2..a8cca0fbc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221101195503", + "version": "2.0.20221102143540", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 42f63d618b9a583e1f22064a1824aa939cfc4d21 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 2 Nov 2022 15:05:09 +0800 Subject: [PATCH 09/39] auto upgrade version to 2.0.20221102150501 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a8cca0fbc..e4f7bd149 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221102143540", + "version": "2.0.20221102150501", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From fc3e0f8319c2f90cd4328c23acd8c0f2889b9953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cauchy=2EKe-=E6=9F=AF=E5=B0=8F=E9=BE=99?= Date: Wed, 2 Nov 2022 17:14:50 +0800 Subject: [PATCH 10/39] =?UTF-8?q?fix:=E8=A1=A5=E5=85=85=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E7=9A=84this=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/fix/fix.compact.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/fix/fix.compact.js b/dist/fix/fix.compact.js index 1fdba9727..dced5e166 100644 --- a/dist/fix/fix.compact.js +++ b/dist/fix/fix.compact.js @@ -115,7 +115,7 @@ pushTarget(store); needPop = true; } - this.store = (this._store || this.options._store)(); + this.store = (this._store || this.options._store).call(this); this.store && (this.store._widget = this); needPop && popTarget(); needPop = false; From fbfb588d400935fe87670b6a01bd4d814b268f9b Mon Sep 17 00:00:00 2001 From: data Date: Wed, 2 Nov 2022 17:56:00 +0800 Subject: [PATCH 11/39] auto upgrade version to 2.0.20221102175548 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e4f7bd149..2caf34e3b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221102150501", + "version": "2.0.20221102175548", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From c2d87e089d5ff050069ee337f6de28889ade3c08 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 2 Nov 2022 18:55:46 +0800 Subject: [PATCH 12/39] auto upgrade version to 2.0.20221102185525 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2caf34e3b..2b7e1f3a2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221102175548", + "version": "2.0.20221102185525", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 4aac8e2de92fb3fff10bb227e228c5b105bb1925 Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 3 Nov 2022 11:04:03 +0800 Subject: [PATCH 13/39] =?UTF-8?q?=E6=97=A0JRIA=20fix:=20=E5=A4=8D=E9=80=89?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E7=9A=84=E6=95=B0=E5=AD=97=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/widget/multiselect/trigger/button.checkselected.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/less/widget/multiselect/trigger/button.checkselected.less b/src/less/widget/multiselect/trigger/button.checkselected.less index 35c00dec0..b02c76e80 100644 --- a/src/less/widget/multiselect/trigger/button.checkselected.less +++ b/src/less/widget/multiselect/trigger/button.checkselected.less @@ -3,7 +3,8 @@ .bi-multi-select-check-selected-button { z-index: 1; min-width: 16px; - .border-radius(8px); + .border-radius(50%); + &:active { color: @color-bi-text-highlight; background-color: @color-bi-background-multi-select-trigger-check-selected; From 1ba3c656445669088350e21447bb40ece4f3a5df Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 3 Nov 2022 13:36:46 +0800 Subject: [PATCH 14/39] =?UTF-8?q?REPORT-83685=20fix:=20BI.parseDateTime?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=AF=B9%l:%M:%S=20%p=E8=BF=99=E7=A7=8D?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=9A=84=E6=97=A5=E6=9C=9F=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=87=BA=E9=94=99=EF=BC=88=E5=90=8E=E9=9D=A2=E5=B8=A6%p=20?= =?UTF-8?q?=E8=BF=99=E7=A7=8D=E7=9A=84=E9=83=BD=E6=98=AF=E5=90=8C=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E6=8A=A5=E9=94=99=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/2.base.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/2.base.js b/src/core/2.base.js index d7007de52..63ff1821d 100644 --- a/src/core/2.base.js +++ b/src/core/2.base.js @@ -1079,7 +1079,7 @@ case "%b": case "%B": for (j = 0; j < 12; ++j) { - if (BI.Date._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { + if (BI.getMonthName(j).substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { m = j; break; } @@ -1144,7 +1144,7 @@ if (a[i].search(/[a-zA-Z]+/) != -1) { var t = -1; for (j = 0; j < 12; ++j) { - if (BI.Date._MN[j].substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { + if (BI.getMonthName(j).substr(0, a[i].length).toLowerCase() == a[i].toLowerCase()) { t = j; break; } From aa1821f70b627137a36df449d0222fa04869ba67 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 3 Nov 2022 14:17:48 +0800 Subject: [PATCH 15/39] auto upgrade version to 2.0.20221103141722 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2b7e1f3a2..d3027b82b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221102185525", + "version": "2.0.20221103141722", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From b52589d7edaa65118578ecf31bcedd50699414a0 Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 3 Nov 2022 14:32:03 +0800 Subject: [PATCH 16/39] =?UTF-8?q?REPORT-83685=20fix:=20BI.parseDateTime?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=AF=B9%l:%M:%S=20%p=E8=BF=99=E7=A7=8D?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=9A=84=E6=97=A5=E6=9C=9F=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=87=BA=E9=94=99=EF=BC=88=E5=90=8E=E9=9D=A2=E5=B8=A6%p=20?= =?UTF-8?q?=E8=BF=99=E7=A7=8D=E7=9A=84=E9=83=BD=E6=98=AF=E5=90=8C=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84=E6=8A=A5=E9=94=99=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/func/alias.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/func/alias.js b/src/core/func/alias.js index 0dca26ca6..2884e492b 100644 --- a/src/core/func/alias.js +++ b/src/core/func/alias.js @@ -815,7 +815,7 @@ break; case "M": // 月 if (len > 2) { - str = BI.Date._MN[date.getMonth()]; + str = BI.getMonthName(date.getMonth()); } else if (len < 2) { str = date.getMonth() + 1; } else { From 3903acbe2d2ecb59c5fa90cd89862c1d397d8ebe Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 3 Nov 2022 15:08:48 +0800 Subject: [PATCH 17/39] =?UTF-8?q?KERNEL-13158:=20context=E8=B7=B3=E8=BF=87?= =?UTF-8?q?popup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/layer/panel.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/case/layer/panel.js b/src/case/layer/panel.js index f73423789..4ec115b51 100644 --- a/src/case/layer/panel.js +++ b/src/case/layer/panel.js @@ -18,9 +18,6 @@ BI.Panel = BI.inherit(BI.Widget, { }, render: function () { - BI.Panel.superclass._init.apply(this, arguments); - var o = this.options; - return { type: "bi.vertical_fill", rowSize: ["", "fill"], From 925ba1387afb4d4443a76129925e1a9fec5cb978 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 3 Nov 2022 15:38:14 +0800 Subject: [PATCH 18/39] auto upgrade version to 2.0.20221103153759 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d3027b82b..980ee16a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221103141722", + "version": "2.0.20221103153759", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 26bf2679d5689272c555bd8ff871cfc7d8cf8a2e Mon Sep 17 00:00:00 2001 From: data Date: Thu, 3 Nov 2022 16:26:20 +0800 Subject: [PATCH 19/39] auto upgrade version to 2.0.20221103162604 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 980ee16a0..81a548ecd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221103153759", + "version": "2.0.20221103162604", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 724404e6b5850027821cba6cc1da3ef17c643880 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 3 Nov 2022 16:35:44 +0800 Subject: [PATCH 20/39] auto upgrade version to 2.0.20221103163534 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 81a548ecd..4c66bfcb5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221103162604", + "version": "2.0.20221103163534", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From d0b104e67153a0adf37dc5846f9fd5679818fd0c Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 3 Nov 2022 21:28:52 +0800 Subject: [PATCH 21/39] =?UTF-8?q?BI-115904=20fix:=20=E3=80=90=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=86=85=E6=B5=8BBUG=E3=80=91=E5=B1=95=E5=BC=80?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A0=91=E5=AD=90=E8=8A=82=E7=82=B9=EF=BC=8C?= =?UTF-8?q?=E4=BC=9A=E5=87=BA=E7=8E=B0=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/ztree/1.asynctree.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/case/ztree/1.asynctree.js b/src/case/ztree/1.asynctree.js index dde174b5b..ef44f50d3 100644 --- a/src/case/ztree/1.asynctree.js +++ b/src/case/ztree/1.asynctree.js @@ -1,6 +1,6 @@ /** * guy - * 同步树 + * 异步树 * @class BI.AsyncTree * @extends BI.TreeView */ @@ -194,7 +194,8 @@ BI.AsyncTree = BI.inherit(BI.TreeView, { // 展开节点会将halfCheck置为false以开启自动计算半选, 所以第一次展开节点的时候需要在置为false之前获取配置 var checkState = treeNode.getCheckStatus(); - if (!treeNode.children) { + if (!treeNode.children && !treeNode.requested) { + treeNode.requested = true; setTimeout(function () { getNodes({ times: 1, From d5735be70fc6088920f8b93171a3297a60d24df1 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 4 Nov 2022 11:06:42 +0800 Subject: [PATCH 22/39] auto upgrade version to 2.0.20221104110628 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4c66bfcb5..44d6d6029 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221103163534", + "version": "2.0.20221104110628", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 17a888e39d1e9a4cf5174f855dcbdb99b2cf471a Mon Sep 17 00:00:00 2001 From: data Date: Fri, 4 Nov 2022 13:56:10 +0800 Subject: [PATCH 23/39] auto upgrade version to 2.0.20221104135556 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 44d6d6029..8d5f2830e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221104110628", + "version": "2.0.20221104135556", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 8c3b50b19ed2fc6c1a3cf22db2b4f8342ffb7220 Mon Sep 17 00:00:00 2001 From: zsmj Date: Fri, 4 Nov 2022 15:59:30 +0800 Subject: [PATCH 24/39] =?UTF-8?q?=E6=97=A0JIRA=20=20fix:=20bi.text=5Fvalue?= =?UTF-8?q?=5Fdown=5Flist=5Fcombo=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combo.textvaluedownlist.js | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js index 9410d9190..956e18552 100644 --- a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -19,14 +19,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { if(BI.isNotNull(o.value)) { value = this._digest(o.value); } - this.trigger = BI.createWidget({ - type: "bi.down_list_select_text_trigger", - cls: "text-value-down-list-trigger", - height: BI.toPix(o.height, 2), - items: o.items, - text: o.text, - value: value - }); this.combo = BI.createWidget({ type: "bi.down_list_combo", @@ -35,7 +27,17 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { adjustLength: 2, width: BI.toPix(o.width, 2), height: BI.toPix(o.height, 2), - el: this.trigger, + el: { + type: "bi.down_list_select_text_trigger", + ref: function (_ref) { + self.trigger = _ref; + }, + cls: "text-value-down-list-trigger", + height: BI.toPix(o.height, 2), + items: o.items, + text: o.text, + value: value + }, value: BI.isNull(value) ? [] : [value], items: BI.deepClone(o.items) }); @@ -79,7 +81,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { setValue: function (v) { v = this._digest(v); this.combo.setValue([v]); - this.trigger.setValue(v); + this.trigger?.setValue(v); }, getValue: function () { @@ -94,4 +96,4 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { } }); BI.TextValueDownListCombo.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.text_value_down_list_combo", BI.TextValueDownListCombo); \ No newline at end of file +BI.shortcut("bi.text_value_down_list_combo", BI.TextValueDownListCombo); From 7146cbf1293ef6cac2b9f728d217fc88762e7a55 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 4 Nov 2022 16:44:33 +0800 Subject: [PATCH 25/39] auto upgrade version to 2.0.20221104164422 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8d5f2830e..e37469887 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221104135556", + "version": "2.0.20221104164422", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 12ae22ad8bb3fd9e34bb4c4f5e35cbe3ee9ec4c0 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 4 Nov 2022 17:14:51 +0800 Subject: [PATCH 26/39] auto upgrade version to 2.0.20221104171438 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e37469887..2763717c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221104164422", + "version": "2.0.20221104171438", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 0e2b432b78c56d4b0829b6523d35a51ad611732f Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 4 Nov 2022 19:40:39 +0800 Subject: [PATCH 27/39] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/date/calendar/combo.month.date.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/widget/date/calendar/combo.month.date.js b/src/widget/date/calendar/combo.month.date.js index 82068ceac..aac5a7fc0 100644 --- a/src/widget/date/calendar/combo.month.date.js +++ b/src/widget/date/calendar/combo.month.date.js @@ -48,6 +48,7 @@ BI.MonthDateCombo = BI.inherit(BI.Trigger, { el: { type: "bi.vertical", hgap: 6, + vgap: 5, items: [this.popup] } } From 1714e340a0d20fc0788986b7f5592f17de2dde28 Mon Sep 17 00:00:00 2001 From: data Date: Sat, 5 Nov 2022 20:26:01 +0800 Subject: [PATCH 28/39] auto upgrade version to 2.0.20221105202549 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2763717c5..3ae40e3cd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221104171438", + "version": "2.0.20221105202549", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 2256e0c1a34e1cfc3798640335ae5fa4de5cddcc Mon Sep 17 00:00:00 2001 From: data Date: Mon, 7 Nov 2022 12:16:47 +0800 Subject: [PATCH 29/39] auto upgrade version to 2.0.20221107121634 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ae40e3cd..ebe1185ea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221105202549", + "version": "2.0.20221107121634", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 0faf129968ab4468cc10b85c37a65b511061c5f3 Mon Sep 17 00:00:00 2001 From: zsmj Date: Mon, 7 Nov 2022 20:08:27 +0800 Subject: [PATCH 30/39] =?UTF-8?q?KERNEL-13349=20feat:=20=E5=A4=8D=E9=80=89?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86checkselectedswitcher=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multitree/trigger/multi.tree.button.checkselected.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/widget/multitree/trigger/multi.tree.button.checkselected.js b/src/widget/multitree/trigger/multi.tree.button.checkselected.js index 59522d784..5efd65b2e 100644 --- a/src/widget/multitree/trigger/multi.tree.button.checkselected.js +++ b/src/widget/multitree/trigger/multi.tree.button.checkselected.js @@ -19,8 +19,8 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, { this.indicator = BI.createWidget({ type: "bi.icon_button", cls: "check-font trigger-check-selected icon-size-12", - width: 15, - height: 15, + width: 16, + height: 16, stopPropagation: true }); @@ -31,7 +31,6 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, { hgap: 4, text: BI.i18nText("BI-Check_Selected"), textAlign: "center", - textHeight: 15 }); this.checkSelected.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); @@ -65,4 +64,4 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, { }); BI.MultiTreeCheckSelectedButton.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.multi_tree_check_selected_button", BI.MultiTreeCheckSelectedButton); \ No newline at end of file +BI.shortcut("bi.multi_tree_check_selected_button", BI.MultiTreeCheckSelectedButton); From cb56f7ea1eeb0b4897a9c94040bb8e611b1646a6 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 8 Nov 2022 10:38:14 +0800 Subject: [PATCH 31/39] auto upgrade version to 2.0.20221108103803 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ebe1185ea..1cf189554 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221107121634", + "version": "2.0.20221108103803", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From a6eb62fbb70255cdd676127c1d2c1c167aea0d95 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 8 Nov 2022 10:54:42 +0800 Subject: [PATCH 32/39] auto upgrade version to 2.0.20221108105434 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1cf189554..28e42b317 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221108103803", + "version": "2.0.20221108105434", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 5ba6f57f1d3ce14f8dfbbae1f6bb778f00978533 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 8 Nov 2022 16:24:51 +0800 Subject: [PATCH 33/39] auto upgrade version to 2.0.20221108162444 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 28e42b317..3425c2683 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221108105434", + "version": "2.0.20221108162444", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 5fd597275e33cd0e8ffbcbfbee101d03a62c31c7 Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 9 Nov 2022 16:16:11 +0800 Subject: [PATCH 34/39] =?UTF-8?q?=E6=97=A0JIRA=20revert=20commit=20c45e768?= =?UTF-8?q?,=20=E4=B8=8D=E6=98=AF=E5=AE=9E=E6=97=B6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E5=BE=8B=E4=B8=8D=E8=AE=B8=E7=94=A8=E6=B0=94?= =?UTF-8?q?=E6=B3=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/editor/editor.js | 5 ----- src/widget/editor/editor.text.js | 4 ---- 2 files changed, 9 deletions(-) diff --git a/src/base/single/editor/editor.js b/src/base/single/editor/editor.js index 95e863430..ac9e779e9 100644 --- a/src/base/single/editor/editor.js +++ b/src/base/single/editor/editor.js @@ -344,11 +344,6 @@ BI.Editor = BI.inherit(BI.Single, { return this.editor.isValid(); }, - setValid: function (b) { - this.editor.setValid(b); - this._checkError(); - }, - destroyed: function () { BI.Bubbles.remove(this.getName()); }, diff --git a/src/widget/editor/editor.text.js b/src/widget/editor/editor.text.js index 4525a2a7b..19f51fd73 100644 --- a/src/widget/editor/editor.text.js +++ b/src/widget/editor/editor.text.js @@ -138,10 +138,6 @@ BI.TextEditor = BI.inherit(BI.Widget, { return this.editor.isValid(); }, - setValid: function (b) { - this.editor.setValid(b); - }, - setValue: function (v) { this.editor.setValue(v); }, From ebaf1dad8a7257d8e44a19e8026d6fb0a663519c Mon Sep 17 00:00:00 2001 From: Treecat Date: Wed, 9 Nov 2022 17:43:24 +0800 Subject: [PATCH 35/39] =?UTF-8?q?REPORT-83562=20feat:=20=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E9=9D=9E=E6=9C=AC=E6=9C=88=E7=9A=84=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=8F=AF=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/calendar/calendar.js | 3 ++- src/less/case/calendar/calendar.less | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 src/less/case/calendar/calendar.less diff --git a/src/case/calendar/calendar.js b/src/case/calendar/calendar.js index bfd76e2b4..88ccf198a 100644 --- a/src/case/calendar/calendar.js +++ b/src/case/calendar/calendar.js @@ -161,7 +161,8 @@ BI.Calendar = BI.inherit(BI.Widget, { once: false, forceSelected: true, value: o.year + "-" + month + "-" + td.text, - disabled: td.lastMonth || td.nextMonth || td.disabled, + disabled: td.disabled, + cls: td.lastMonth || td.nextMonth ? "not-current-month-day": "", lgap: 2, rgap: 2, tgap: 4, diff --git a/src/less/case/calendar/calendar.less b/src/less/case/calendar/calendar.less new file mode 100644 index 000000000..388bcf9e3 --- /dev/null +++ b/src/less/case/calendar/calendar.less @@ -0,0 +1,5 @@ +@import "../../index.less"; + +.bi-calendar-date-item.not-current-month-day { + color: @color-bi-text-disabled-button !important; +} \ No newline at end of file From f9b6a56b102eeedf4d6ad63a76ec81b6a0c670d4 Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 9 Nov 2022 19:30:22 +0800 Subject: [PATCH 36/39] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?tape=E5=B8=83=E5=B1=80=20NaN=E7=9A=84=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/wrapper/layout/layout.tape.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/wrapper/layout/layout.tape.js b/src/core/wrapper/layout/layout.tape.js index 185af813d..9303f5865 100644 --- a/src/core/wrapper/layout/layout.tape.js +++ b/src/core/wrapper/layout/layout.tape.js @@ -217,7 +217,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, { top: self._optimiseGap(top[i] + self._optimiseItemTgap(item) + self._optimiseItemVgap(item) + o.vgap + o.tgap) }); - if (rowSize === "" || rowSize === "fill") { + if (BI.isNull(rowSize) || rowSize === "" || rowSize === "fill") { return true; } }); @@ -235,7 +235,7 @@ BI.VTapeLayout = BI.inherit(BI.Layout, { bottom: self._optimiseGap(bottom[i] + self._optimiseItemBgap(item) + self._optimiseItemVgap(item) + o.vgap + o.bgap) }); - if (rowSize === "" || rowSize === "fill") { + if (BI.isNull(rowSize) || rowSize === "" || rowSize === "fill") { return true; } }); From 638f3f67d1e8e920c1481916506ff46419c56ec6 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 9 Nov 2022 19:38:48 +0800 Subject: [PATCH 37/39] auto upgrade version to 2.0.20221109193835 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3425c2683..187ba3f22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221108162444", + "version": "2.0.20221109193835", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 58a9abd7d83126e840bc3276a34abfcb6cb074c6 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 10 Nov 2022 10:16:36 +0800 Subject: [PATCH 38/39] auto upgrade version to 2.0.20221110101625 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 187ba3f22..212bbb8ce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221109193835", + "version": "2.0.20221110101625", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 30c1955d88d2fdc4782e3a2da51bca4b106a072d Mon Sep 17 00:00:00 2001 From: data Date: Thu, 10 Nov 2022 17:56:15 +0800 Subject: [PATCH 39/39] auto upgrade version to 2.0.20221110175602 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 212bbb8ce..52d9823d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20221110101625", + "version": "2.0.20221110175602", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",