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

package.json

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

src/case/colorchooser/colorchooser.trigger.js

@@ -10,7 +10,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
     _defaultConfig: function (config) {
         var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             height: 22
         });
     },

src/case/colorchooser/colorchooser.trigger.long.js

@@ -10,7 +10,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
     _defaultConfig: function (config) {
         var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             height: 24
         });
     },

src/case/combo/icontextvaluecombo/combo.icontextvalue.js

@@ -5,7 +5,7 @@
 BI.IconTextValueCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function (config) {
         return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-icon-text-value-combo bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: "bi-icon-text-value-combo " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             height: 24,
             iconHeight: null,
             iconWidth: null,

src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@@ -28,7 +28,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
 
         return {
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
             container: o.container,
             adjustLength: 2,
             height: height,

src/case/combo/textvaluecombo/combo.textvalue.js

@@ -7,7 +7,7 @@
 BI.TextValueCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function (config) {
         return BI.extend(BI.TextValueCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-text-value-combo bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: "bi-text-value-combo " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             height: 24,
             chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
             text: "",

src/less/base/colorchooser/colorchooser.trigger.less

@@ -1,9 +1,5 @@
 @import "../../index.less";
 
-.bi-color-chooser-trigger {
-  .border-radius(2px);
-}
-
 .bi-combo-popup {
   &>.bi-color-chooser-trigger {
     border-color: @color-bi-border-hover-combo;

src/less/base/editor/editor.search.less

@@ -1,7 +1,6 @@
 @import "../../index.less";
 /*************BI.SearchEditor******************/
 .bi-search-editor {
-  .border-radius(2px);
   & .circle-close-font{
     font-size: @font-size-18;
   }

src/less/core/utils/common.less

@@ -339,6 +339,14 @@
   .border-radius(2px);
 }
 
+.bi-border-corner-left-radius {
+  .border-corner-left-radius(2px, 2px);
+}
+
+.bi-border-corner-right-radius {
+  .border-corner-right-radius(2px, 2px);
+}
+
 .bi-font-bold {
   font-weight: 700;
 }

src/less/widget/numbereditor/number.editor.less

@@ -1,7 +1,6 @@
 @import "../../index.less";
 
 .bi-number-editor {
-  .border-radius(2px);
   & .pull-down-font {
     font-size: @font-size-12;
   }

src/less/widget/numberinterval/numberinterval.less

@@ -4,14 +4,7 @@
   &.hack {
     .border-radius(0px);
   }
-  & .number-interval-small-editor {
-    .border-corner-left-radius(2px, 2px);
-  }
-  & .number-interval-big-editor {
-    .border-corner-right-radius(2px, 2px);
-  }
   & .number-interval-big-combo {
-    .border-corner-left-radius(2px, 2px);
     & .bi-icon-combo-trigger {
       & .icon-combo-trigger-icon {
         font-size: @font-size-14;
@@ -20,7 +13,6 @@
   }
 
   & .number-interval-small-combo {
-    .border-corner-right-radius(2px, 2px);
     & .bi-icon-combo-trigger {
       & .icon-combo-trigger-icon {
         font-size: @font-size-14;

src/less/widget/year/trigger.year.less

@@ -1,4 +1,4 @@
 @import "../../index.less";
 .bi-year-trigger{
-  .border-radius(2px);
+
 }

src/widget/downlist/combo.downlist.js

@@ -22,29 +22,13 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
     _init: function () {
         BI.DownListCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
-        this.popupview = BI.createWidget({
-            type: "bi.down_list_popup",
-            items: o.items,
-            chooseType: o.chooseType,
-            value: o.value
-        });
-
-        this.popupview.on(BI.DownListPopup.EVENT_CHANGE, function (value) {
-            self.fireEvent(BI.DownListCombo.EVENT_CHANGE, value);
-            self.downlistcombo.hideView();
-        });
-
-        this.popupview.on(BI.DownListPopup.EVENT_SON_VALUE_CHANGE, function (value, fatherValue) {
-            self.fireEvent(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, value, fatherValue);
-            self.downlistcombo.hideView();
-        });
-
 
         this.downlistcombo = BI.createWidget({
             element: this,
             type: "bi.combo",
             trigger: o.trigger,
             isNeedAdjustWidth: false,
+            isDefaultInit: true,
             container: o.container,
             adjustLength: o.adjustLength,
             direction: o.direction,
@@ -58,7 +42,28 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
                 height: o.height
             }),
             popup: {
-                el: this.popupview,
+                el: {
+                    type: "bi.down_list_popup",
+                    ref: function (ref) {
+                        self.popupView = ref;
+                    },
+                    items: o.items,
+                    chooseType: o.chooseType,
+                    value: o.value,
+                    listeners: [{
+                        eventName: BI.DownListPopup.EVENT_CHANGE,
+                        action: function (value) {
+                            self.fireEvent(BI.DownListCombo.EVENT_CHANGE, value);
+                            self.downlistcombo.hideView();
+                        }
+                    }, {
+                        eventName: BI.DownListPopup.EVENT_SON_VALUE_CHANGE,
+                        action: function (value, fatherValue) {
+                            self.fireEvent(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, value, fatherValue);
+                            self.downlistcombo.hideView();
+                        }
+                    }]
+                },
                 stopPropagation: o.stopPropagation,
                 maxHeight: o.maxHeight,
                 minWidth: o.minWidth
@@ -79,15 +84,15 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
     },
 
     populate: function (items) {
-        this.popupview.populate(items);
+        this.popupView.populate(items);
     },
 
     setValue: function (v) {
-        this.popupview.setValue(v);
+        this.popupView.setValue(v);
     },
 
     getValue: function () {
-        return this.popupview.getValue();
+        return this.popupView.getValue();
     },
 
     adjustWidth: function () {

src/widget/dynamicdate/dynamicdate.combo.js

@@ -38,7 +38,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
             items: [{
                 el: {
                     type: "bi.combo",
-                    cls: (opts.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
+                    cls: (opts.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
                     container: opts.container,
                     ref: function () {
                         self.combo = this;

src/widget/dynamicdatetime/dynamicdatetime.combo.js

@@ -38,7 +38,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
             items: [{
                 el: {
                     type: "bi.combo",
-                    cls: (opts.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
+                    cls: (opts.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
                     destroyWhenHide: true,
                     container: opts.container,
                     ref: function () {

src/widget/editor/editor.search.js

@@ -5,7 +5,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function (config) {
         var conf = BI.SearchEditor.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: "bi-search-editor bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: "bi-search-editor bi-focus-shadow " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             height: 24,
             errorText: "",
             watermark: BI.i18nText("BI-Basic_Search"),

src/widget/multilayerselecttree/multilayerselecttree.combo.js

@@ -38,7 +38,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         return {
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius " + (BI.isKey(o.status) ? ("status-" + o.status) : ""),
+            cls: (o.simple ? "bi-border-bottom " : "bi-border bi-border-radius ") + (BI.isKey(o.status) ? ("status-" + o.status) : ""),
             container: o.container,
             destroyWhenHide: o.destroyWhenHide,
             adjustLength: 2,

src/widget/multilayersingletree/multilayersingletree.combo.js

@@ -45,7 +45,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         return {
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius " + (BI.isKey(o.status) ? ("status-" + o.status) : ""),
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius ") + (BI.isKey(o.status) ? ("status-" + o.status) : ""),
             container: o.container,
             destroyWhenHide: o.destroyWhenHide,
             adjustLength: 2,

src/widget/multiselect/multiselect.combo.js

@@ -124,7 +124,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,

src/widget/multiselect/multiselect.combo.nobar.js

@@ -122,7 +122,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: false,
             container: o.container,
             el: this.trigger,

src/widget/multiselect/multiselect.insert.combo.js

@@ -125,7 +125,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: !o.allowEdit,
             el: this.trigger,
             adjustLength: 1,

src/widget/multiselect/multiselect.insert.combo.nobar.js

@@ -117,7 +117,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: false,
             container: o.container,
             el: this.trigger,

src/widget/multitree/multi.tree.combo.js

@@ -49,7 +49,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,

src/widget/multitree/multi.tree.insert.combo.js

@@ -65,7 +65,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,

src/widget/multitree/multi.tree.list.combo.js

@@ -80,7 +80,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,

src/widget/numbereditor/number.editor.js

@@ -5,7 +5,7 @@
 BI.NumberEditor = BI.inherit(BI.Widget, {
     _defaultConfig: function (conf) {
         return BI.extend(BI.NumberEditor.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-number-editor bi-focus-shadow " + (conf.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: "bi-number-editor bi-focus-shadow " + (conf.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             validationChecker: BI.emptyFn,
             valueFormatter: function (v) {
                 return v;

src/widget/numberinterval/numberinterval.js

@@ -55,7 +55,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
                 }
                 return true;
             },
-            cls: "number-interval-small-editor " + (o.simple ? "bi-border-bottom" : "bi-border")
+            cls: "number-interval-small-editor " + (o.simple ? "bi-border-bottom" : "bi-border bi-border-corner-left-radius")
         });
 
         this.smallTip = BI.createWidget({
@@ -93,7 +93,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
                 }
                 return true;
             },
-            cls: "number-interval-big-editor" + (o.simple ? " bi-border-bottom" : " bi-border")
+            cls: "number-interval-big-editor" + (o.simple ? " bi-border-bottom" : " bi-border bi-border-corner-right-radius")
         });
 
         this.bigTip = BI.createWidget({
@@ -113,7 +113,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         });
         this.smallCombo = BI.createWidget({
             type: "bi.icon_combo",
-            cls: "number-interval-small-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-right"),
+            cls: "number-interval-small-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-right bi-border-corner-right-radius"),
             height: o.height - (o.simple ? 0 : 2),
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",
@@ -132,7 +132,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         }
         this.bigCombo = BI.createWidget({
             type: "bi.icon_combo",
-            cls: "number-interval-big-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-left"),
+            cls: "number-interval-big-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-left bi-border-corner-left-radius"),
             height: o.height - (o.simple ? 0 : 2),
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",

src/widget/singleselect/singleselect.combo.js

@@ -83,7 +83,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             container: o.container,
             toggle: false,
             el: this.trigger,

src/widget/singleselect/singleselect.insert.combo.js

@@ -94,7 +94,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius",
+            cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             container: o.container,
             toggle: false,
             el: this.trigger,

src/widget/singletree/singletree.combo.js

@@ -6,7 +6,7 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
 
     _defaultConfig: function (config) {
         return BI.extend(BI.SingleTreeCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-single-tree-combo bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: "bi-single-tree-combo " + (config.simple ? "bi-border-bottom" : "bi-border bi-border-radius"),
             trigger: {},
             height: 24,
             text: "",

src/widget/timeinterval/timeinterval.js

@@ -69,6 +69,7 @@ BI.TimeInterval = BI.inherit(BI.Single, {
         var self = this, o = this.options;
         var combo = BI.createWidget({
             type: "bi.dynamic_date_time_combo",
+            simple: o.simple,
             supportDynamic: o.supportDynamic,
             minDate: o.minDate,
             maxDate: o.maxDate,

src/widget/year/combo.year.js

@@ -133,7 +133,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
             items: [{
                 el: {
                     type: "bi.htape",
-                    cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
+                    cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
                     ref: function () {
                         self.comboWrapper = this;
                     },

src/widget/yearmonth/combo.yearmonth.js

@@ -132,7 +132,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
             items: [{
                 el: {
                     type: "bi.htape",
-                    cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
+                    cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
                     ref: function () {
                         self.comboWrapper = this;
                     },

src/widget/yearquarter/combo.yearquarter.js

@@ -135,7 +135,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
             items: [{
                 el: {
                     type: "bi.htape",
-                    cls: (o.simple ? "bi-border-bottom" : "bi-border") + " bi-border-radius bi-focus-shadow",
+                    cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
                     ref: function () {
                         self.comboWrapper = this;
                     },