From 3c797a7537636a286e5043457c4848f60684369a Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 14 Apr 2022 20:01:13 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E8=B7=AF?= =?UTF-8?q?=E7=94=B1=E6=94=AF=E6=8C=81history=E6=A8=A1=E5=BC=8F=20(?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BAhash=E6=A8=A1=E5=BC=8F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/router.js | 1 + webpack/webpack.dev.js | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/router/router.js b/src/router/router.js index efcf2f777..02eb68904 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -3126,6 +3126,7 @@ BI.RouterWidget = BI.inherit(BI.Widget, { init: function () { this.$router = this._router = BI.Router.$router = $router = new VueRouter({ + mode: this.options.mode, routes: this.options.routes }); this.$router.beforeEach(function (to, from, next) { diff --git a/webpack/webpack.dev.js b/webpack/webpack.dev.js index d3c0fb5bc..9e5a21432 100644 --- a/webpack/webpack.dev.js +++ b/webpack/webpack.dev.js @@ -36,11 +36,17 @@ module.exports = merge(common, { output: { path: dirs.DEST, filename: "[name].js", + publicPath: '/', }, devServer: { contentBase: path.join(__dirname, ".."), port: 9001, liveReload: true, + historyApiFallback: { + rewrites: [ + { from: /.*/, to: '/index.html' }, + ], + }, }, plugins: [ new MiniCssExtractPlugin({ From 59bbfb2095f31391c7d69681c22c61bb5c8f441d Mon Sep 17 00:00:00 2001 From: data Date: Fri, 15 Apr 2022 15:45:40 +0800 Subject: [PATCH 2/8] auto upgrade version to 2.0.20220415154533 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 94c5d75ac..a271c61fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220414140544", + "version": "2.0.20220415154533", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 206a32946c3b1103a7605c2bed31dcaab1ed4be0 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 15 Apr 2022 15:53:41 +0800 Subject: [PATCH 3/8] auto upgrade version to 2.0.20220415155328 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a271c61fc..86576dc57 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220415154533", + "version": "2.0.20220415155328", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 8d5f650a1cadf5810fab8dad81ed55b49f15fc95 Mon Sep 17 00:00:00 2001 From: Claire <1119518763@qq.com> Date: Fri, 15 Apr 2022 17:32:56 +0800 Subject: [PATCH 4/8] =?UTF-8?q?BI-99093=20fix:bubbleCombo=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0combo=E7=9A=84adjustW=E3=80=81H=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/bubblecombo/combo.bubble.js | 8 ++++++++ typescript/base/combination/combo.ts | 2 ++ typescript/case/combo/bubblecombo/combo.bubble.ts | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/src/case/combo/bubblecombo/combo.bubble.js b/src/case/combo/bubblecombo/combo.bubble.js index e143efab0..2709295d9 100644 --- a/src/case/combo/bubblecombo/combo.bubble.js +++ b/src/case/combo/bubblecombo/combo.bubble.js @@ -99,6 +99,14 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { isViewVisible: function () { return this.combo.isViewVisible(); + }, + + adjustWidth: function () { + this.combo.adjustWidth(); + }, + + adjustHeight: function () { + this.combo.adjustHeight(); } }); diff --git a/typescript/base/combination/combo.ts b/typescript/base/combination/combo.ts index 249e7e6f2..52e70e477 100644 --- a/typescript/base/combination/combo.ts +++ b/typescript/base/combination/combo.ts @@ -59,6 +59,8 @@ export declare class Combo extends Widget { getPopupPosition(): any; + adjustHeight(e?:MouseEvent): void; + adjustHeight(e?: MouseEvent): void; toggle(): void; diff --git a/typescript/case/combo/bubblecombo/combo.bubble.ts b/typescript/case/combo/bubblecombo/combo.bubble.ts index cd50d722b..982d48457 100644 --- a/typescript/case/combo/bubblecombo/combo.bubble.ts +++ b/typescript/case/combo/bubblecombo/combo.bubble.ts @@ -17,4 +17,8 @@ export declare class BubbleCombo extends Widget { showView(): void; isViewVisible(): boolean; + + adjustHeight(e?:MouseEvent): void; + + adjustHeight(e?: MouseEvent): void; } From 4225a58e8c673636eccdba9a6849437ddea8c466 Mon Sep 17 00:00:00 2001 From: Claire <1119518763@qq.com> Date: Fri, 15 Apr 2022 18:06:09 +0800 Subject: [PATCH 5/8] =?UTF-8?q?BI-104252=20fix:bubbleCombo=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0combo=E7=9A=84adjustW=E3=80=81H=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/base/combination/combo.ts | 2 +- typescript/case/combo/bubblecombo/combo.bubble.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/typescript/base/combination/combo.ts b/typescript/base/combination/combo.ts index 52e70e477..c7d511a2b 100644 --- a/typescript/base/combination/combo.ts +++ b/typescript/base/combination/combo.ts @@ -59,7 +59,7 @@ export declare class Combo extends Widget { getPopupPosition(): any; - adjustHeight(e?:MouseEvent): void; + adjustWidth(e?:MouseEvent): void; adjustHeight(e?: MouseEvent): void; diff --git a/typescript/case/combo/bubblecombo/combo.bubble.ts b/typescript/case/combo/bubblecombo/combo.bubble.ts index 982d48457..d5366233f 100644 --- a/typescript/case/combo/bubblecombo/combo.bubble.ts +++ b/typescript/case/combo/bubblecombo/combo.bubble.ts @@ -18,7 +18,7 @@ export declare class BubbleCombo extends Widget { isViewVisible(): boolean; - adjustHeight(e?:MouseEvent): void; + adjustWidth(e?:MouseEvent): void; adjustHeight(e?: MouseEvent): void; } From 749991a0e19bf95f1eae96c3b77d0ce7d6a34418 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 18 Apr 2022 09:06:05 +0800 Subject: [PATCH 6/8] auto upgrade version to 2.0.20220418090551 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 86576dc57..075663232 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220415155328", + "version": "2.0.20220418090551", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 14718b4309383c3693c19e19417201ea0f50987b Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 18 Apr 2022 09:57:09 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feature:=20=E4=B8=8D=E5=88=A4=E6=96=ADitem.?= =?UTF-8?q?width>=3D1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/wrapper/layout/flex/flex.horizontal.js | 2 +- src/core/wrapper/layout/flex/flex.vertical.js | 2 +- src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js | 2 +- src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js | 2 +- src/core/wrapper/layout/sticky/sticky.horizontal.js | 2 +- src/core/wrapper/layout/sticky/sticky.vertical.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/wrapper/layout/flex/flex.horizontal.js b/src/core/wrapper/layout/flex/flex.horizontal.js index 7b87a2d1c..7d53dfe0e 100644 --- a/src/core/wrapper/layout/flex/flex.horizontal.js +++ b/src/core/wrapper/layout/flex/flex.horizontal.js @@ -52,7 +52,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, { _addElement: function (i, item) { var o = this.options; var w = BI.FlexHorizontalLayout.superclass._addElement.apply(this, arguments); - var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width >= 1 ? null : item.width; + var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width; if (o.columnSize.length > 0) { if (item.width >= 1 && o.columnSize[i] >= 1 && o.columnSize[i] !== item.width) { columnSize = null; diff --git a/src/core/wrapper/layout/flex/flex.vertical.js b/src/core/wrapper/layout/flex/flex.vertical.js index 4f9ee1119..46b175e9b 100644 --- a/src/core/wrapper/layout/flex/flex.vertical.js +++ b/src/core/wrapper/layout/flex/flex.vertical.js @@ -51,7 +51,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, { _addElement: function (i, item) { var o = this.options; var w = BI.FlexVerticalLayout.superclass._addElement.apply(this, arguments); - var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height >= 1 ? null : item.height; + var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height; if (o.rowSize.length > 0) { if (item.height >= 1 && o.rowSize[i] >= 1 && o.rowSize[i] !== item.height) { rowSize = null; diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js index d159d8890..8c803abaa 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js @@ -48,7 +48,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, { _addElement: function (i, item) { var o = this.options; var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments); - var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width >= 1 ? null : item.width; + var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width; if (o.columnSize.length > 0) { if (item.width >= 1 && o.columnSize[i] >= 1 && o.columnSize[i] !== item.width) { columnSize = null; diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js index 0f1c9b166..33609e717 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js @@ -48,7 +48,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { _addElement: function (i, item) { var o = this.options; var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments); - var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height >= 1 ? null : item.height; + var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height; if (o.rowSize.length > 0) { if (item.height >= 1 && o.rowSize[i] >= 1 && o.rowSize[i] !== item.height) { rowSize = null; diff --git a/src/core/wrapper/layout/sticky/sticky.horizontal.js b/src/core/wrapper/layout/sticky/sticky.horizontal.js index f178afd6b..c5b644542 100644 --- a/src/core/wrapper/layout/sticky/sticky.horizontal.js +++ b/src/core/wrapper/layout/sticky/sticky.horizontal.js @@ -13,7 +13,7 @@ BI.HorizontalStickyLayout = BI.inherit(BI.FlexHorizontalLayout, { _addElement: function (i, item) { var o = this.options; var w = BI.HorizontalStickyLayout.superclass._addElement.apply(this, arguments); - var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width >= 1 ? null : item.width; + var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width; if (o.columnSize.length > 0) { if (item.width >= 1 && o.columnSize[i] >= 1 && o.columnSize[i] !== item.width) { columnSize = null; diff --git a/src/core/wrapper/layout/sticky/sticky.vertical.js b/src/core/wrapper/layout/sticky/sticky.vertical.js index d99b8828e..a5ba3d837 100644 --- a/src/core/wrapper/layout/sticky/sticky.vertical.js +++ b/src/core/wrapper/layout/sticky/sticky.vertical.js @@ -13,7 +13,7 @@ BI.VerticalStickyLayout = BI.inherit(BI.FlexVerticalLayout, { _addElement: function (i, item) { var o = this.options; var w = BI.VerticalStickyLayout.superclass._addElement.apply(this, arguments); - var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height >= 1 ? null : item.height; + var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height; if (o.rowSize.length > 0) { if (item.height >= 1 && o.rowSize[i] >= 1 && o.rowSize[i] !== item.height) { rowSize = null; From 54f3741e61ce0a0a06279d59d0ad91b4a1e740e6 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 18 Apr 2022 12:15:39 +0800 Subject: [PATCH 8/8] auto upgrade version to 2.0.20220418121529 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 075663232..af1ceb00b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220418090551", + "version": "2.0.20220418121529", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts",