From 0721c5e2692b41b854f0a6a23d8aa9603dbfd17d Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 23 Mar 2017 20:45:35 +0800 Subject: [PATCH] add --- dist/base.css | 18 -- dist/base.js | 117 --------- dist/case.js | 236 +++++++++--------- src/base/layer/layer.scroll.js | 118 --------- .../expander/expander.branch.handstand.js | 0 .../{ => tree}/expander/expander.branch.js | 0 src/css/base/view/scrollview.css | 18 -- src/less/base/logintimeout/login.timeout.less | 30 --- src/less/base/reqloading/loading.request.less | 20 -- .../timeouttoast/widget.timeouttoast.less | 25 -- src/less/base/view/scrollview.less | 19 -- 11 files changed, 118 insertions(+), 483 deletions(-) delete mode 100644 src/base/layer/layer.scroll.js rename src/case/{ => tree}/expander/expander.branch.handstand.js (100%) rename src/case/{ => tree}/expander/expander.branch.js (100%) delete mode 100644 src/css/base/view/scrollview.css delete mode 100644 src/less/base/logintimeout/login.timeout.less delete mode 100644 src/less/base/reqloading/loading.request.less delete mode 100644 src/less/base/timeouttoast/widget.timeouttoast.less delete mode 100644 src/less/base/view/scrollview.less diff --git a/dist/base.css b/dist/base.css index 2a8560251..0400f6ab9 100644 --- a/dist/base.css +++ b/dist/base.css @@ -2287,24 +2287,6 @@ ul.ztree.zTreeDragUL { .bi-list-view .list-view-toolbar > .first-element { border-left: none; } -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-scroll-view .scroll-container { - border-left: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; -} -.bi-scroll-view .scroll-drop-down-icon { - font-size: 14px; - border-bottom: 1px solid #d4dadd; - border-left: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; - background: #f4f4f4; -} -.bi-scroll-view .scroll-drop-down-icon:active { - background: #d4dadd; -} .bi-flex-center-layout { display: box; /* OLD - Android 4.4- */ diff --git a/dist/base.js b/dist/base.js index 66653a559..345bc1725 100644 --- a/dist/base.js +++ b/dist/base.js @@ -15178,123 +15178,6 @@ BI.PopupView = BI.inherit(BI.Widget, { }); BI.PopupView.EVENT_CHANGE = "EVENT_CHANGE"; $.shortcut("bi.popup_view", BI.PopupView);/** - * guy - * @class BI.ScrollView - * @extends BI.Widget - */ -BI.ScrollView = BI.inherit(BI.Widget, { - - _const: { - dropDownHeight: 15, - expandIcon: "column-next-page-h-font", - collapseIcon: "column-pre-page-h-font" - }, - - _defaultConfig: function() { - return BI.extend(BI.ScrollView.superclass._defaultConfig.apply(this, arguments), { - baseCls:"bi-scroll-view", - scrollHeight: 50, - maxHeight: 300 - }) - }, - - _init : function() { - BI.ScrollView.superclass._init.apply(this, arguments); - - this.scrollUp = false; - this.scroll = BI.createWidget({ - type: "bi.vertical", - cls: "scroll-container", - scrolly: true - }) - BI.createWidget({ - type: "bi.vertical", - element: this, - scrolly: false, - items: [this.scroll] - }) - - this.dropdown = BI.createWidget({ - type: "bi.icon_button", - height: this._const.dropDownHeight, - cls: "scroll-drop-down-icon " + this._const.expandIcon, - handler: BI.bind(this._dropDownOrUp, this) - }) - - BI.createWidget({ - type: "bi.absolute", - element: this, - items: [{ - el: this.dropdown, - left: 0, - right: 0, - bottom: -1 * this._const.dropDownHeight - }] - }) - this.populate(this.options.items); - }, - - _dropDownOrUp: function(){ - if(!this.scrollUp){ - var height = this.element.height(); - height += this.options.scrollHeight; - height = Math.min(height, this.scroll.element[0].scrollHeight, this.options.maxHeight); - this.element.height(height); - this._checkDropDownState(); - } else { - var height = this.element.height(); - height -= this.options.scrollHeight; - height = Math.max(height, this.options.height); - this.element.height(height); - this._checkDropDownState(); - } - }, - - _checkDropDownState: function(){ - var height = this.element.height(); - if(!this._checkScroll() || height >= this.options.maxHeight){ - this.scrollUp = true; - this.dropdown.element.removeClass(this._const.expandIcon).addClass(this._const.collapseIcon); - } else if(height <= this.options.height){ - this.scrollUp = false; - this.dropdown.element.addClass(this._const.expandIcon); - } else { - this.dropdown.element.addClass(this.scrollUp ? this._const.collapseIcon : this._const.expandIcon); - } - }, - - _checkScroll: function(){ - this.scroll.element.height(this.element.height()); - return this.scroll.element[0].scrollHeight > this.scroll.element[0].clientHeight; - }, - - _checkDropDown: function(){ - if(this._checkScroll()){ - this.dropdown.visible(); - //this.scrollUp = false; - this._checkDropDownState(); - } else { - this.dropdown.invisible(); - } - }, - - populate: function(){ - this.scroll.populate.apply(this.scroll, arguments); - this.resize(); - }, - - resize: function(){ - this.element.height(this.options.height); - BI.nextTick(BI.bind(this._checkDropDown, this)); - }, - - addItem: function(){ - this.scroll.addItem.apply(this.scroll, arguments); - BI.nextTick(BI.bind(this._checkDropDown, this)); - } -}); - -$.shortcut("bi.scroll_view", BI.ScrollView);/** * 搜索面板 * * Created by GUY on 2015/9/28. diff --git a/dist/case.js b/dist/case.js index 704fdb1e5..7ea957f9b 100644 --- a/dist/case.js +++ b/dist/case.js @@ -6165,124 +6165,6 @@ BI.SimpleStateEditor.EVENT_SPACE = "EVENT_SPACE"; BI.SimpleStateEditor.EVENT_EMPTY = "EVENT_EMPTY"; $.shortcut("bi.simple_state_editor", BI.SimpleStateEditor);/** - * 倒立的Branch - * @class BI.HandStandBranchExpander - * @extend BI.Widget - * create by young - */ -BI.HandStandBranchExpander = BI.inherit(BI.Widget, { - _defaultConfig: function () { - return BI.extend(BI.HandStandBranchExpander.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-handstand-branch-expander", - direction: BI.Direction.Top, - logic: { - dynamic: true - }, - el: {type: "bi.label"}, - popup: {} - }) - }, - - _init: function () { - BI.HandStandBranchExpander.superclass._init.apply(this, arguments); - var o = this.options; - this._initExpander(); - this._initBranchView(); - BI.createWidget(BI.extend({ - element: this - }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, { - items: BI.LogicFactory.createLogicItemsByDirection(o.direction, { - type: "bi.center_adapt", - items: [this.expander] - }, this.branchView) - })))); - }, - - _initExpander: function () { - var self = this, o = this.options; - this.expander = BI.createWidget(o.el); - this.expander.on(BI.Controller.EVENT_CHANGE, function () { - self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); - }); - }, - - _initBranchView: function () { - var self = this, o = this.options; - this.branchView = BI.createWidget(o.popup, {}); - this.branchView.on(BI.Controller.EVENT_CHANGE, function () { - self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); - }); - }, - - populate: function (items) { - this.branchView.populate.apply(this.branchView, arguments); - }, - - getValue: function () { - return this.branchView.getValue(); - } -}); -BI.HandStandBranchExpander.EVENT_CHANGE = "EVENT_CHANGE"; -$.shortcut("bi.handstand_branch_expander", BI.HandStandBranchExpander);/** - * @class BI.BranchExpander - * @extend BI.Widget - * create by young - */ -BI.BranchExpander = BI.inherit(BI.Widget, { - _defaultConfig: function () { - return BI.extend(BI.BranchExpander.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-branch-expander", - direction: BI.Direction.Left, - logic: { - dynamic: true - }, - el: {}, - popup: {} - }) - }, - - _init: function () { - BI.BranchExpander.superclass._init.apply(this, arguments); - var o = this.options; - this._initExpander(); - this._initBranchView(); - BI.createWidget(BI.extend({ - element: this - }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, { - items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.expander, this.branchView) - })))); - }, - - _initExpander: function () { - var self = this, o = this.options; - this.expander = BI.createWidget(o.el, { - type: "bi.label", - width: 30, - height: "100%" - }); - this.expander.on(BI.Controller.EVENT_CHANGE, function () { - self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); - }); - }, - - _initBranchView: function () { - var self = this, o = this.options; - this.branchView = BI.createWidget(o.popup, {}); - this.branchView.on(BI.Controller.EVENT_CHANGE, function () { - self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); - }); - }, - - populate: function (items) { - this.branchView.populate.apply(this.branchView, arguments); - }, - - getValue: function () { - return this.branchView.getValue(); - } -}); -BI.BranchExpander.EVENT_CHANGE = "EVENT_CHANGE"; -$.shortcut("bi.branch_expander", BI.BranchExpander);/** * 有确定取消按钮的弹出层 * @class BI.BarFloatSection * @extends BI.FloatSection @@ -10024,6 +9906,124 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, { }); BI.MultiSelectBar.EVENT_CHANGE = "MultiSelectBar.EVENT_CHANGE"; $.shortcut("bi.multi_select_bar", BI.MultiSelectBar);/** + * 倒立的Branch + * @class BI.HandStandBranchExpander + * @extend BI.Widget + * create by young + */ +BI.HandStandBranchExpander = BI.inherit(BI.Widget, { + _defaultConfig: function () { + return BI.extend(BI.HandStandBranchExpander.superclass._defaultConfig.apply(this, arguments), { + baseCls: "bi-handstand-branch-expander", + direction: BI.Direction.Top, + logic: { + dynamic: true + }, + el: {type: "bi.label"}, + popup: {} + }) + }, + + _init: function () { + BI.HandStandBranchExpander.superclass._init.apply(this, arguments); + var o = this.options; + this._initExpander(); + this._initBranchView(); + BI.createWidget(BI.extend({ + element: this + }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, { + items: BI.LogicFactory.createLogicItemsByDirection(o.direction, { + type: "bi.center_adapt", + items: [this.expander] + }, this.branchView) + })))); + }, + + _initExpander: function () { + var self = this, o = this.options; + this.expander = BI.createWidget(o.el); + this.expander.on(BI.Controller.EVENT_CHANGE, function () { + self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); + }); + }, + + _initBranchView: function () { + var self = this, o = this.options; + this.branchView = BI.createWidget(o.popup, {}); + this.branchView.on(BI.Controller.EVENT_CHANGE, function () { + self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); + }); + }, + + populate: function (items) { + this.branchView.populate.apply(this.branchView, arguments); + }, + + getValue: function () { + return this.branchView.getValue(); + } +}); +BI.HandStandBranchExpander.EVENT_CHANGE = "EVENT_CHANGE"; +$.shortcut("bi.handstand_branch_expander", BI.HandStandBranchExpander);/** + * @class BI.BranchExpander + * @extend BI.Widget + * create by young + */ +BI.BranchExpander = BI.inherit(BI.Widget, { + _defaultConfig: function () { + return BI.extend(BI.BranchExpander.superclass._defaultConfig.apply(this, arguments), { + baseCls: "bi-branch-expander", + direction: BI.Direction.Left, + logic: { + dynamic: true + }, + el: {}, + popup: {} + }) + }, + + _init: function () { + BI.BranchExpander.superclass._init.apply(this, arguments); + var o = this.options; + this._initExpander(); + this._initBranchView(); + BI.createWidget(BI.extend({ + element: this + }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, { + items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.expander, this.branchView) + })))); + }, + + _initExpander: function () { + var self = this, o = this.options; + this.expander = BI.createWidget(o.el, { + type: "bi.label", + width: 30, + height: "100%" + }); + this.expander.on(BI.Controller.EVENT_CHANGE, function () { + self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); + }); + }, + + _initBranchView: function () { + var self = this, o = this.options; + this.branchView = BI.createWidget(o.popup, {}); + this.branchView.on(BI.Controller.EVENT_CHANGE, function () { + self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); + }); + }, + + populate: function (items) { + this.branchView.populate.apply(this.branchView, arguments); + }, + + getValue: function () { + return this.branchView.getValue(); + } +}); +BI.BranchExpander.EVENT_CHANGE = "EVENT_CHANGE"; +$.shortcut("bi.branch_expander", BI.BranchExpander);/** * @class BI.HandStandBranchTree * @extends BI.Widget * create by young diff --git a/src/base/layer/layer.scroll.js b/src/base/layer/layer.scroll.js deleted file mode 100644 index 01fe2652f..000000000 --- a/src/base/layer/layer.scroll.js +++ /dev/null @@ -1,118 +0,0 @@ -/** - * guy - * @class BI.ScrollView - * @extends BI.Widget - */ -BI.ScrollView = BI.inherit(BI.Widget, { - - _const: { - dropDownHeight: 15, - expandIcon: "column-next-page-h-font", - collapseIcon: "column-pre-page-h-font" - }, - - _defaultConfig: function() { - return BI.extend(BI.ScrollView.superclass._defaultConfig.apply(this, arguments), { - baseCls:"bi-scroll-view", - scrollHeight: 50, - maxHeight: 300 - }) - }, - - _init : function() { - BI.ScrollView.superclass._init.apply(this, arguments); - - this.scrollUp = false; - this.scroll = BI.createWidget({ - type: "bi.vertical", - cls: "scroll-container", - scrolly: true - }) - BI.createWidget({ - type: "bi.vertical", - element: this, - scrolly: false, - items: [this.scroll] - }) - - this.dropdown = BI.createWidget({ - type: "bi.icon_button", - height: this._const.dropDownHeight, - cls: "scroll-drop-down-icon " + this._const.expandIcon, - handler: BI.bind(this._dropDownOrUp, this) - }) - - BI.createWidget({ - type: "bi.absolute", - element: this, - items: [{ - el: this.dropdown, - left: 0, - right: 0, - bottom: -1 * this._const.dropDownHeight - }] - }) - this.populate(this.options.items); - }, - - _dropDownOrUp: function(){ - if(!this.scrollUp){ - var height = this.element.height(); - height += this.options.scrollHeight; - height = Math.min(height, this.scroll.element[0].scrollHeight, this.options.maxHeight); - this.element.height(height); - this._checkDropDownState(); - } else { - var height = this.element.height(); - height -= this.options.scrollHeight; - height = Math.max(height, this.options.height); - this.element.height(height); - this._checkDropDownState(); - } - }, - - _checkDropDownState: function(){ - var height = this.element.height(); - if(!this._checkScroll() || height >= this.options.maxHeight){ - this.scrollUp = true; - this.dropdown.element.removeClass(this._const.expandIcon).addClass(this._const.collapseIcon); - } else if(height <= this.options.height){ - this.scrollUp = false; - this.dropdown.element.addClass(this._const.expandIcon); - } else { - this.dropdown.element.addClass(this.scrollUp ? this._const.collapseIcon : this._const.expandIcon); - } - }, - - _checkScroll: function(){ - this.scroll.element.height(this.element.height()); - return this.scroll.element[0].scrollHeight > this.scroll.element[0].clientHeight; - }, - - _checkDropDown: function(){ - if(this._checkScroll()){ - this.dropdown.visible(); - //this.scrollUp = false; - this._checkDropDownState(); - } else { - this.dropdown.invisible(); - } - }, - - populate: function(){ - this.scroll.populate.apply(this.scroll, arguments); - this.resize(); - }, - - resize: function(){ - this.element.height(this.options.height); - BI.nextTick(BI.bind(this._checkDropDown, this)); - }, - - addItem: function(){ - this.scroll.addItem.apply(this.scroll, arguments); - BI.nextTick(BI.bind(this._checkDropDown, this)); - } -}); - -$.shortcut("bi.scroll_view", BI.ScrollView); \ No newline at end of file diff --git a/src/case/expander/expander.branch.handstand.js b/src/case/tree/expander/expander.branch.handstand.js similarity index 100% rename from src/case/expander/expander.branch.handstand.js rename to src/case/tree/expander/expander.branch.handstand.js diff --git a/src/case/expander/expander.branch.js b/src/case/tree/expander/expander.branch.js similarity index 100% rename from src/case/expander/expander.branch.js rename to src/case/tree/expander/expander.branch.js diff --git a/src/css/base/view/scrollview.css b/src/css/base/view/scrollview.css deleted file mode 100644 index 151b8a0fb..000000000 --- a/src/css/base/view/scrollview.css +++ /dev/null @@ -1,18 +0,0 @@ -/****添加计算宽度的--运算符直接需要space****/ -/****** common color(常用颜色,可用于普遍场景) *****/ -/**** custom color(自定义颜色,用于特定场景) ****/ -.bi-scroll-view .scroll-container { - border-left: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; - border-bottom: 1px solid #d4dadd; -} -.bi-scroll-view .scroll-drop-down-icon { - font-size: 14px; - border-bottom: 1px solid #d4dadd; - border-left: 1px solid #d4dadd; - border-right: 1px solid #d4dadd; - background: #f4f4f4; -} -.bi-scroll-view .scroll-drop-down-icon:active { - background: #d4dadd; -} diff --git a/src/less/base/logintimeout/login.timeout.less b/src/less/base/logintimeout/login.timeout.less deleted file mode 100644 index ebfa99736..000000000 --- a/src/less/base/logintimeout/login.timeout.less +++ /dev/null @@ -1,30 +0,0 @@ -@import "../../bibase"; -.bi-login-timeout-center{ - & .input-wrapper{ - border-bottom: 1px solid @color-bi-border-line; - & .login-input{ - font-size: @font-size-16; - } - & .error-mask{ - background: @color-bi-background-black; - .opacity(0.25); - color: @color-bi-text; - font-size: @font-size-16; - } - } - & .login-button{ - background: @color-bi-background-highlight; - .border-radius(25px); - font-size: @font-size-22; - color: @color-bi-text; - &:hover{ - .opacity(0.8); - } - } -} -.bi-login-timeout-south{ - & .keep-state{ - font-size: @font-size-14; - color: @color-bi-text-gray; - } -} \ No newline at end of file diff --git a/src/less/base/reqloading/loading.request.less b/src/less/base/reqloading/loading.request.less deleted file mode 100644 index ea2affda2..000000000 --- a/src/less/base/reqloading/loading.request.less +++ /dev/null @@ -1,20 +0,0 @@ -@import "../../bibase"; - -.bi-request-loading { - & .mask-pane { - background: @color-bi-background-default; - .opacity(0.8); - } - & .loading-comment { - font-size: 20px; - color: @color-bi-text-gray; - } - & .load-fail-comment { - font-size: 20px; - color: @color-bi-text-gray; - } - & .load-timeout-warning { - font-size: @font-size-16; - color: @color-bi-text-warning; - } -} \ No newline at end of file diff --git a/src/less/base/timeouttoast/widget.timeouttoast.less b/src/less/base/timeouttoast/widget.timeouttoast.less deleted file mode 100644 index b9447cd36..000000000 --- a/src/less/base/timeouttoast/widget.timeouttoast.less +++ /dev/null @@ -1,25 +0,0 @@ -@import "../../bibase"; - -.bi-timeout-toast { - font-size: @font-size-14; - .border-radius(2px); - background: @color-bi-tip-warning-background; - color: @color-bi-text-warning; - & .cancel-button { - background: @color-bi-background-default; - border: 1px solid @color-bi-border-normal; - color: @color-bi-text-black; - .border-radius(2px); - &:hover { - .opacity(0.8); - } - } - & .retry-button { - background: @color-bi-background-highlight; - .border-radius(2px); - color: @color-bi-text; - &:hover { - .opacity(0.8); - } - } -} \ No newline at end of file diff --git a/src/less/base/view/scrollview.less b/src/less/base/view/scrollview.less deleted file mode 100644 index 666adb59f..000000000 --- a/src/less/base/view/scrollview.less +++ /dev/null @@ -1,19 +0,0 @@ -@import "../../bibase"; - -.bi-scroll-view{ - .scroll-container{ - border-left: 1px solid @color-bi-split-dark; - border-right: 1px solid @color-bi-split-dark; - border-bottom: 1px solid @color-bi-split-dark; - } - & .scroll-drop-down-icon{ - font-size: @font-size-14; - border-bottom: 1px solid @color-bi-split-dark; - border-left: 1px solid @color-bi-split-dark; - border-right: 1px solid @color-bi-split-dark; - background: @color-bi-background-gray; - &:active{ - background: @color-bi-background-dark; - } - } -} \ No newline at end of file