Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui

# Conflicts: # dist/bundle.min.js
6 years ago · ab50c5f000
6 changed files with 10 additions and 10 deletions
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -94244,7 +94244,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
                }
            });
        },
-        
+
        props: {
            baseCls: "bi-filter-operation",
            expander: {},
@ -94411,7 +94411,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
                    iconCls2: "pull-down-font",
                    text: text,
                    height: 30,
-                    width: 100
+                    width: 110
                });
                combos.push({
                    type: "bi.combo",
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -94493,7 +94493,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
                }
            });
        },
-        
+
        props: {
            baseCls: "bi-filter-operation",
            expander: {},
@ -94660,7 +94660,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
                    iconCls2: "pull-down-font",
                    text: text,
                    height: 30,
-                    width: 100
+                    width: 110
                });
                combos.push({
                    type: "bi.combo",
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/widget.js
+++ b/dist/widget.js
@ -6590,7 +6590,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
                }
            });
        },
-        
+
        props: {
            baseCls: "bi-filter-operation",
            expander: {},
@ -6757,7 +6757,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
                    iconCls2: "pull-down-font",
                    text: text,
                    height: 30,
-                    width: 100
+                    width: 110
                });
                combos.push({
                    type: "bi.combo",
--- a/src/widget/filter/operation/filter.operation.js
+++ b/src/widget/filter/operation/filter.operation.js
@ -28,7 +28,7 @@
                }
            });
        },
-        
+
        props: {
            baseCls: "bi-filter-operation",
            expander: {},
@ -195,7 +195,7 @@
                    iconCls2: "pull-down-font",
                    text: text,
                    height: 30,
-                    width: 100
+                    width: 110
                });
                combos.push({
                    type: "bi.combo",