Browse Source

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

master
Tangjinxia 4 years ago
parent
commit
3f36272a13
  1. 4
      dist/2.0/fineui.css
  2. 4
      dist/2.0/fineui.ie.min.js
  3. 2
      dist/2.0/fineui.ie.min.js.map
  4. 710
      dist/2.0/fineui.js
  5. 2
      dist/2.0/fineui.js.map
  6. 4
      dist/2.0/fineui.min.css
  7. 4
      dist/2.0/fineui.min.js
  8. 2
      dist/2.0/fineui.min.js.map
  9. 4
      dist/2.0/fineui_without_normalize.css
  10. 4
      dist/2.0/fineui_without_normalize.min.css
  11. 4
      dist/core.css
  12. 684
      dist/core.js
  13. 2
      dist/core.js.map
  14. 4
      dist/demo.css
  15. 1040
      dist/demo.js
  16. 2
      dist/demo.js.map
  17. 4
      dist/fineui.css
  18. 4
      dist/fineui.ie.min.js
  19. 2
      dist/fineui.ie.min.js.map
  20. 710
      dist/fineui.js
  21. 2
      dist/fineui.js.map
  22. 4
      dist/fineui.min.css
  23. 4
      dist/fineui.min.js
  24. 2
      dist/fineui.min.js.map
  25. 74
      dist/fineui_without_jquery_polyfill.js
  26. 2
      dist/fineui_without_jquery_polyfill.js.map
  27. 2
      dist/font.css
  28. 3
      dist/lib/index.d.ts
  29. 2
      dist/lib/widget/editor/editor.search.d.ts
  30. 2
      dist/resource.css
  31. 14
      dist/utils.js
  32. 2
      dist/utils.js.map
  33. 4
      dist/utils.min.js
  34. 2
      dist/utils.min.js.map
  35. 2
      package.json
  36. 2
      src/case/combo/bubblecombo/combo.bubble.js
  37. 2
      src/less/base/combo/combo.bubble.less
  38. 1
      src/less/base/combo/popup.bubble.less
  39. 4
      src/less/base/tree/ztree.less
  40. 14
      src/less/core/utils/common.less
  41. 38
      src/less/visual.less
  42. 7
      src/widget/date/calendar/popup.year.js
  43. 8
      src/widget/editor/editor.search.js
  44. 3
      typescript/index.ts
  45. 4
      typescript/widget/editor/editor.search.ts

4
dist/2.0/fineui.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

710
dist/2.0/fineui.js vendored

File diff suppressed because it is too large Load Diff

2
dist/2.0/fineui.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui_without_normalize.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui_without_normalize.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/core.css vendored

File diff suppressed because one or more lines are too long

684
dist/core.js vendored

File diff suppressed because it is too large Load Diff

2
dist/core.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/demo.css vendored

File diff suppressed because one or more lines are too long

1040
dist/demo.js vendored

File diff suppressed because it is too large Load Diff

2
dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

710
dist/fineui.js vendored

File diff suppressed because it is too large Load Diff

2
dist/fineui.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

74
dist/fineui_without_jquery_polyfill.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-1-19 09:30:24 */
/*! time: 2021-1-20 14:20:28 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -82,7 +82,7 @@
/******/
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 1405);
/******/ return __webpack_require__(__webpack_require__.s = 1406);
/******/ })
/************************************************************************/
/******/ ([
@ -31025,7 +31025,7 @@ BI.shortcut("bi.tree_node_checkbox", BI.TreeNodeCheckbox);
*/
BI.BubbleCombo = BI.inherit(BI.Widget, {
_const: {
TRIANGLE_LENGTH: 6
TRIANGLE_LENGTH: 9
},
_defaultConfig: function () {
return BI.extend(BI.BubbleCombo.superclass._defaultConfig.apply(this, arguments), {
@ -38188,9 +38188,6 @@ BI.YearPopup = BI.inherit(BI.Widget, {
cardCreator: BI.bind(this._createYearCalendar, this),
afterCardCreated: function () {
this.setValue(self.selectedYear);
var calendar = this.getSelectedCard();
calendar && self.backBtn.setEnable(!calendar.isFrontYear());
calendar && self.preBtn.setEnable(!calendar.isFinalYear());
}
});
@ -38209,8 +38206,6 @@ BI.YearPopup = BI.inherit(BI.Widget, {
var calendar = this.navigation.getSelectedCard();
if (BI.isNotNull(calendar)) {
calendar.setMinDate(this.options.min);
this.backBtn.setEnable(!calendar.isFrontYear());
this.preBtn.setEnable(!calendar.isFinalYear());
}
},
@ -38218,8 +38213,6 @@ BI.YearPopup = BI.inherit(BI.Widget, {
var calendar = this.navigation.getSelectedCard();
if (BI.isNotNull(calendar)) {
calendar.setMaxDate(this.options.max);
this.backBtn.setEnable(!calendar.isFrontYear());
this.preBtn.setEnable(!calendar.isFinalYear());
}
},
@ -43038,6 +43031,14 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
isValid: function () {
return this.editor.isValid();
},
showClearIcon: function () {
this.clear.visible();
},
hideClearIcon: function () {
this.clear.invisible();
}
});
BI.SearchEditor.EVENT_CHANGE = "EVENT_CHANGE";
@ -68671,6 +68672,18 @@ Object.defineProperty(exports, "DateCalendarPopup", {
return _popupCalendar.DateCalendarPopup;
}
});
Object.defineProperty(exports, "Tree", {
enumerable: true,
get: function get() {
return _tree2.Tree;
}
});
Object.defineProperty(exports, "Node", {
enumerable: true,
get: function get() {
return _tree2.Node;
}
});
exports["default"] = void 0;
var _combo = __webpack_require__(714);
@ -68955,6 +68968,8 @@ var _controller2 = __webpack_require__(831);
var _popupCalendar = __webpack_require__(832);
var _tree2 = __webpack_require__(833);
function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@ -70240,7 +70255,13 @@ var _controller = __webpack_require__(90);
var _widget = __webpack_require__(1);
/***/ }),
/* 833 */,
/* 833 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
/***/ }),
/* 834 */,
/* 835 */,
/* 836 */,
@ -70290,7 +70311,8 @@ var _widget = __webpack_require__(1);
/* 880 */,
/* 881 */,
/* 882 */,
/* 883 */
/* 883 */,
/* 884 */
/***/ (function(module, exports) {
;(function () {
@ -70453,17 +70475,17 @@ var _widget = __webpack_require__(1);
/***/ }),
/* 884 */,
/* 885 */,
/* 886 */,
/* 887 */
/* 887 */,
/* 888 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(888);
/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(889);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(17)))
/***/ }),
/* 888 */
/* 889 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(setImmediate) {function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@ -71942,8 +71964,8 @@ var _widget = __webpack_require__(1);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(62).setImmediate))
/***/ }),
/* 889 */,
/* 890 */
/* 890 */,
/* 891 */
/***/ (function(module, exports) {
;(function () {
@ -72239,7 +72261,6 @@ var _widget = __webpack_require__(1);
/***/ }),
/* 891 */,
/* 892 */,
/* 893 */,
/* 894 */,
@ -72456,13 +72477,13 @@ var _widget = __webpack_require__(1);
/* 1105 */,
/* 1106 */,
/* 1107 */,
/* 1108 */
/* 1108 */,
/* 1109 */
/***/ (function(module, exports) {
/***/ }),
/* 1109 */,
/* 1110 */,
/* 1111 */,
/* 1112 */,
@ -72758,7 +72779,8 @@ var _widget = __webpack_require__(1);
/* 1402 */,
/* 1403 */,
/* 1404 */,
/* 1405 */
/* 1405 */,
/* 1406 */
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(123);
@ -72862,7 +72884,7 @@ __webpack_require__(393);
__webpack_require__(153);
__webpack_require__(154);
__webpack_require__(155);
__webpack_require__(887);
__webpack_require__(888);
__webpack_require__(394);
__webpack_require__(395);
__webpack_require__(396);
@ -73239,9 +73261,9 @@ __webpack_require__(708);
__webpack_require__(709);
__webpack_require__(710);
__webpack_require__(711);
__webpack_require__(890);
__webpack_require__(883);
__webpack_require__(1108);
__webpack_require__(891);
__webpack_require__(884);
__webpack_require__(1109);
module.exports = __webpack_require__(712);

2
dist/fineui_without_jquery_polyfill.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/font.css vendored

File diff suppressed because one or more lines are too long

3
dist/lib/index.d.ts vendored

@ -148,6 +148,7 @@ import { _utils } from './core/utils';
import { Controller } from "./core/controller/controller";
import { LayerController } from "./core/controller/controller.layer";
import { DateCalendarPopup } from "./widget/date/calendar/popup.calendar.date";
import { Tree, Node } from "./core/utils/tree";
export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
OB: typeof OB;
Plugin: _Plugin;
@ -305,4 +306,4 @@ declare const _default: {
Decorators: typeof decorator;
};
export default _default;
export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiSelectBar, SelectList, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, AbstractTreeValueChooser, AbstractListTreeValueChooser, ListTreeValueChooserInsertCombo, TreeValueChooserCombo, TreeValueChooserInsertCombo, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiTreeListCombo, MultiTreeInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, AbstractAllValueChooser, AllValueChooserCombo, TextAreaEditor, SingleSelectItem, DynamicDateTimeCombo, MultiTreeCombo, CenterLayout, VirtualGroup, GridLayout, MultiTreePopup, SingleSelectRadioItem, SingleSelectInsertCombo, SingleSelectCombo, CardLayout, DynamicYearMonthCombo, TimeCombo, Iframe, TextValueDownListCombo, Switch, HorizontalLayout, ShelterEditor, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, DateCalendarPopup, };
export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiSelectBar, SelectList, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, AbstractTreeValueChooser, AbstractListTreeValueChooser, ListTreeValueChooserInsertCombo, TreeValueChooserCombo, TreeValueChooserInsertCombo, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiTreeListCombo, MultiTreeInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, AbstractAllValueChooser, AllValueChooserCombo, TextAreaEditor, SingleSelectItem, DynamicDateTimeCombo, MultiTreeCombo, CenterLayout, VirtualGroup, GridLayout, MultiTreePopup, SingleSelectRadioItem, SingleSelectInsertCombo, SingleSelectCombo, CardLayout, DynamicYearMonthCombo, TimeCombo, Iframe, TextValueDownListCombo, Switch, HorizontalLayout, ShelterEditor, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, DateCalendarPopup, Tree, Node, };

2
dist/lib/widget/editor/editor.search.d.ts vendored

@ -28,4 +28,6 @@ export declare class SearchEditor extends Widget {
getLastChangedValue(): string;
isEditing(): boolean;
isValid(): boolean;
showClearIcon(): void;
hideClearIcon(): void;
}

2
dist/resource.css vendored

File diff suppressed because one or more lines are too long

14
dist/utils.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-1-19 09:30:24 */
/*! time: 2021-1-20 14:20:28 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -82,12 +82,12 @@
/******/
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 1230);
/******/ return __webpack_require__(__webpack_require__.s = 1231);
/******/ })
/************************************************************************/
/******/ ({
/***/ 1091:
/***/ 1092:
/***/ (function(module, exports) {
BI.i18n = {
@ -320,7 +320,7 @@ if(_global.BI.prepares == null) {
/***/ }),
/***/ 1230:
/***/ 1231:
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(123);
@ -350,8 +350,8 @@ __webpack_require__(140);
__webpack_require__(141);
__webpack_require__(142);
__webpack_require__(143);
__webpack_require__(1091);
__webpack_require__(1231);
__webpack_require__(1092);
__webpack_require__(1232);
__webpack_require__(153);
__webpack_require__(154);
module.exports = __webpack_require__(155);
@ -359,7 +359,7 @@ module.exports = __webpack_require__(155);
/***/ }),
/***/ 1231:
/***/ 1232:
/***/ (function(module, exports) {
/**

2
dist/utils.js.map vendored

File diff suppressed because one or more lines are too long

4
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/utils.min.js.map vendored

File diff suppressed because one or more lines are too long

2
package.json

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

2
src/case/combo/bubblecombo/combo.bubble.js

@ -6,7 +6,7 @@
*/
BI.BubbleCombo = BI.inherit(BI.Widget, {
_const: {
TRIANGLE_LENGTH: 6
TRIANGLE_LENGTH: 9
},
_defaultConfig: function () {
return BI.extend(BI.BubbleCombo.superclass._defaultConfig.apply(this, arguments), {

2
src/less/base/combo/combo.bubble.less

@ -28,8 +28,6 @@
& .bubble-combo-triangle-left, & .bubble-combo-triangle-right, & .bubble-combo-triangle-top, & .bubble-combo-triangle-bottom {
&:before {
background-color: @color-bi-background-default;
border-bottom: 1px solid @border-color-light-line;
border-right: 1px solid @border-color-light-line;
}
}
}

1
src/less/base/combo/popup.bubble.less

@ -2,6 +2,7 @@
.bi-bubble-popup-view {
.box-shadows(0px 9px 28px 8px rgba(0, 0, 0, 0.05), 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12));
.border-radius(4px);
// 只去掉bubble-popup子元素的阴影
&.bi-popup-view > .list-view-shadow {

4
src/less/base/tree/ztree.less

@ -35,11 +35,11 @@
vertical-align: top;
display: inline-block;
&:hover {
.background-color(@color-bi-background-highlight, 6%);
.background-color(@color-bi-background-highlight, 10%);
}
&:active {
color: @color-bi-text-highlight;
.background-color(@color-bi-background-highlight, 6%);
.background-color(@color-bi-background-highlight, 15%);
}
}

14
src/less/core/utils/common.less

@ -685,7 +685,7 @@ textarea {
& .bi-textarea {
color: @color-bi-text-black;
}
.background-color(@color-bi-background-highlight, 6%);
.background-color(@color-bi-background-highlight, 10%);
}
&:active {
color: @color-bi-text-highlight;
@ -695,7 +695,7 @@ textarea {
& .bi-textarea {
color: @color-bi-text-highlight;
}
.background-color(@color-bi-background-highlight, 6%);
.background-color(@color-bi-background-highlight, 15%);
}
&.active {
color: @color-bi-text-highlight;
@ -773,7 +773,7 @@ textarea {
& .bi-textarea {
color: @color-bi-text-black;
}
.background-color(@color-bi-background-highlight, 6%);
.background-color(@color-bi-background-highlight, 10%);
}
&:active, &.active {
color: @color-bi-text-highlight;
@ -783,7 +783,7 @@ textarea {
& .bi-textarea {
color: @color-bi-text-highlight;
}
.background-color(@color-bi-background-highlight, 6%);
.background-color(@color-bi-background-highlight, 15%);
}
&.disabled {
&, &:hover, &:active {
@ -812,7 +812,7 @@ textarea {
& .bi-textarea {
color: @color-bi-text;
}
.background-color(@color-bi-background-highlight, 6%);
.background-color(@color-bi-background-highlight, 10%);
}
&:active, &.active {
color: @color-bi-text-highlight;
@ -822,7 +822,7 @@ textarea {
& .bi-textarea {
color: @color-bi-text-highlight;
}
.background-color(@color-bi-background-highlight, 6%);
.background-color(@color-bi-background-highlight, 15%);
}
&.disabled {
&, &:hover, &:active {
@ -845,7 +845,7 @@ textarea {
// 激活和选中时背景高亮
.bi-list-item-select {
&:hover, &.hover {
.background-color(@color-bi-background-highlight, 6%);
.background-color(@color-bi-background-highlight, 10%);
}
&:active, &.active {
color: @color-bi-text;

38
src/less/visual.less

@ -200,73 +200,77 @@
.triangle-top() {
position: absolute;
width: 16px;
height: 6px;
height: 9px;
//虽然position:absolute使得:before的display属性为block,但是其仍然受到祖先text-align:center的影响,这边重置掉
text-align: left;
&:before {
position: absolute;
width: 6px;
height: 6px;
width: 9px;
height: 9px;
margin-left: 4px;
margin-top: 2px;
margin-top: 5px;
content: "";
transform: rotate(-135deg);
.box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.06));
}
}
.triangle-bottom() {
position: absolute;
width: 16px;
height: 6px;
height: 9px;
//虽然position:absolute使得:before的display属性为block,但是其仍然受到祖先text-align:center的影响,这边重置掉
text-align: left;
&:before {
position: absolute;
width: 6px;
height: 6px;
width: 9px;
height: 9px;
margin-left: 4px;
margin-top: -3px;
margin-top: -5px;
content: "";
transform: rotate(45deg);
.box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.07));
}
}
.triangle-left() {
position: absolute;
width: 6px;
width: 9px;
height: 16px;
//虽然position:absolute使得:before的display属性为block,但是其仍然受到祖先text-align:center的影响,这边重置掉
text-align: left;
&:before {
position: absolute;
width: 6px;
height: 6px;
margin-left: 2px;
margin-top: 3px;
width: 9px;
height: 9px;
margin-left: 5px;
margin-top: 4px;
content: "";
transform: rotate(135deg);
.box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.06));
}
}
.triangle-right() {
position: absolute;
width: 6px;
width: 9px;
height: 16px;
//虽然position:absolute使得:before的display属性为block,但是其仍然受到祖先text-align:center的影响,这边重置掉
text-align: left;
&:before {
position: absolute;
width: 6px;
height: 6px;
margin-left: -3px;
width: 10px;
height: 10px;
margin-left: -5px;
margin-top: 4px;
content: "";
transform: rotate(-45deg);
.box-shadow(3px 3px 10px 0, rgba(0, 0, 0, 0.07));
}
}

7
src/widget/date/calendar/popup.year.js

@ -70,9 +70,6 @@ BI.YearPopup = BI.inherit(BI.Widget, {
cardCreator: BI.bind(this._createYearCalendar, this),
afterCardCreated: function () {
this.setValue(self.selectedYear);
var calendar = this.getSelectedCard();
calendar && self.backBtn.setEnable(!calendar.isFrontYear());
calendar && self.preBtn.setEnable(!calendar.isFinalYear());
}
});
@ -91,8 +88,6 @@ BI.YearPopup = BI.inherit(BI.Widget, {
var calendar = this.navigation.getSelectedCard();
if (BI.isNotNull(calendar)) {
calendar.setMinDate(this.options.min);
this.backBtn.setEnable(!calendar.isFrontYear());
this.preBtn.setEnable(!calendar.isFinalYear());
}
},
@ -100,8 +95,6 @@ BI.YearPopup = BI.inherit(BI.Widget, {
var calendar = this.navigation.getSelectedCard();
if (BI.isNotNull(calendar)) {
calendar.setMaxDate(this.options.max);
this.backBtn.setEnable(!calendar.isFrontYear());
this.preBtn.setEnable(!calendar.isFinalYear());
}
},

8
src/widget/editor/editor.search.js

@ -183,6 +183,14 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
isValid: function () {
return this.editor.isValid();
},
showClearIcon: function () {
this.clear.visible();
},
hideClearIcon: function () {
this.clear.invisible();
}
});
BI.SearchEditor.EVENT_CHANGE = "EVENT_CHANGE";

3
typescript/index.ts

@ -148,6 +148,7 @@ import { _utils } from './core/utils';
import { Controller } from "./core/controller/controller";
import { LayerController } from "./core/controller/controller.layer";
import { DateCalendarPopup } from "./widget/date/calendar/popup.calendar.date";
import { Tree, Node } from "./core/utils/tree";
export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
@ -456,4 +457,6 @@ export {
FloatCenterLayout,
DynamicYearMonthPopup,
DateCalendarPopup,
Tree,
Node,
};

4
typescript/widget/editor/editor.search.ts

@ -38,4 +38,8 @@ export declare class SearchEditor extends Widget {
isEditing(): boolean;
isValid(): boolean;
showClearIcon(): void;
hideClearIcon(): void;
}

Loading…
Cancel
Save