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

package.json

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

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();
     }
 });
 

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;

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;

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;

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;

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;

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;

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) {

typescript/base/combination/combo.ts

@@ -59,6 +59,8 @@ export declare class Combo extends Widget {
 
     getPopupPosition(): any;
 
+    adjustWidth(e?:MouseEvent): void;
+
     adjustHeight(e?: MouseEvent): void;
 
     toggle(): void;

typescript/case/combo/bubblecombo/combo.bubble.ts

@@ -17,4 +17,8 @@ export declare class BubbleCombo extends Widget {
     showView(): void;
 
     isViewVisible(): boolean;
+
+    adjustWidth(e?:MouseEvent): void;
+
+    adjustHeight(e?: MouseEvent): void;
 }

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({