Pull request #3161: 无JIRA fix: 文本过滤组件

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '73cfcc5e7b786476d71befaa15118f69a4c8dbc6':
  Revert "无JIRA fix: _initElementHeight和_initElementWidth方法修复"
  无JIRA fix: 文本过滤组件
  无JIRA fix: _initElementHeight和_initElementWidth方法修复

src/widget/dynamicdatetime/dynamicdatetime.combo.js

@@ -8,7 +8,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
     },
 
     props: {
-        baseCls: "bi-dynamic-date-combo",
+        baseCls: "bi-dynamic-date--time-combo",
         height: 24,
         minDate: "1900-01-01",
         maxDate: "2099-12-31",

src/widget/multiselect/search/multiselect.search.insert.pane.js

@@ -54,11 +54,11 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
         });
 
         this.resizer = BI.createWidget({
-            type: "bi.vtape",
+            type: "bi.vertical_fill",
+            rowSize: ["", "fill"],
             element: this,
             items: [{
                 el: this.addNotMatchTip,
-                height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
             }, {
                 el: this.loader,
             }],

src/widget/multiselectlist/multiselectlist.insert.js

@@ -74,7 +74,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
                 ref: function (ref) {
                     self.editor = ref;
                 },
-                height: o.searcherHeight || BI.SIZE_CONSANTS.TRIGGER_HEIGHT,
             },
             isAutoSearch: false,
             isAutoSync: false,
@@ -83,7 +82,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
             },
             adapter: this.adapter,
             popup: this.searcherPane,
-            height: 200,
             masker: false,
             listeners: [{
                 eventName: BI.Searcher.EVENT_START,
@@ -168,14 +166,13 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
         });
 
         BI.createWidget({
-            type: "bi.vtape",
+            type: "bi.vertical_fill",
+            rowSize: ["", "fill"],
             element: this,
             items: [{
                 el: this.trigger,
-                height: o.searcherHeight || BI.SIZE_CONSANTS.TRIGGER_HEIGHT,
             }, {
                 el: this.adapter,
-                height: "fill"
             }]
         });
         BI.createWidget({

src/widget/singleselect/search/singleselect.search.pane.insert.js

@@ -15,7 +15,7 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, {
 
     _defaultConfig: function () {
         return BI.extend(BI.SingleSelectSearchInsertPane.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-single-select-search-pane bi-card",
+            baseCls: "bi-single-select-search-pane-insert bi-card",
             allowNoSelect: false,
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
@@ -53,7 +53,8 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, {
         });
 
         this.resizer = BI.createWidget({
-            type: "bi.vtape",
+            type: "bi.vertical_fill",
+            rowSize: ["", "fill"],
             element: this,
             items: [{
                 type: "bi.vertical",
@@ -92,4 +93,4 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, {
 
 BI.SingleSelectSearchInsertPane.EVENT_CHANGE = "EVENT_CHANGE";
 
-BI.shortcut("bi.single_select_search_insert_pane", BI.SingleSelectSearchInsertPane);
+BI.shortcut("bi.single_select_search_insert_pane", BI.SingleSelectSearchInsertPane);

src/widget/singleselect/search/singleselect.search.pane.js

@@ -53,11 +53,11 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, {
         });
 
         this.resizer = BI.createWidget({
-            type: "bi.vtape",
+            type: "bi.vertical_fill",
+            rowSize: ["", "fill"],
             element: this,
             items: [{
                 el: this.tooltipClick,
-                height: 0
             }, {
                 el: this.loader
             }]
@@ -98,4 +98,4 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, {
 
 BI.SingleSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
 
-BI.shortcut("bi.single_select_search_pane", BI.SingleSelectSearchPane);
+BI.shortcut("bi.single_select_search_pane", BI.SingleSelectSearchPane);

src/widget/singleselect/singleselectlist.insert.js

@@ -6,7 +6,7 @@
 BI.SingleSelectInsertList = BI.inherit(BI.Single, {
     _defaultConfig: function () {
         return BI.extend(BI.SingleSelectInsertList.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multi-select-insert-list",
+            baseCls: "bi-single-select-insert-list",
             allowNoSelect: false,
             itemsCreator: BI.emptyFn,
             itemWrapper: BI.emptyFn,
@@ -81,7 +81,6 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
             },
             adapter: this.adapter,
             popup: this.searcherPane,
-            height: 200,
             masker: false,
             value: o.value,
             listeners: [{
@@ -124,14 +123,13 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
         });
 
         BI.createWidget({
-            type: "bi.vtape",
+            type: "bi.vertical_fill",
+            rowSize: ["", "fill"],
             element: this,
             items: [{
                 el: this.trigger,
-                height: 24
             }, {
                 el: this.adapter,
-                height: "fill"
             }]
         });
         BI.createWidget({

src/widget/year/popup.year.js

@@ -11,7 +11,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
     },
 
     props: {
-        baseCls: "bi-year-popup",
+        baseCls: "bi-dynamic-year-popup",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期,
@@ -243,4 +243,4 @@ BI.DynamicYearPopup.BUTTON_CLEAR_EVENT_CHANGE = "BUTTON_CLEAR_EVENT_CHANGE";
 BI.DynamicYearPopup.BUTTON_lABEL_EVENT_CHANGE = "BUTTON_lABEL_EVENT_CHANGE";
 BI.DynamicYearPopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE";
 BI.DynamicYearPopup.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);
+BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);