Browse Source

Merge remote-tracking branch 'origin/master'

es6
Kobi 4 years ago
parent
commit
eb845123c0
  1. 2
      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. 738
      dist/2.0/fineui.js
  5. 2
      dist/2.0/fineui.js.map
  6. 2
      dist/2.0/fineui.min.css
  7. 4
      dist/2.0/fineui.min.js
  8. 2
      dist/2.0/fineui.min.js.map
  9. 2
      dist/2.0/fineui_without_normalize.css
  10. 2
      dist/2.0/fineui_without_normalize.min.css
  11. 2
      dist/core.css
  12. 712
      dist/core.js
  13. 2
      dist/core.js.map
  14. 2
      dist/demo.css
  15. 1072
      dist/demo.js
  16. 2
      dist/demo.js.map
  17. 2
      dist/fineui.css
  18. 4
      dist/fineui.ie.min.js
  19. 2
      dist/fineui.ie.min.js.map
  20. 738
      dist/fineui.js
  21. 2
      dist/fineui.js.map
  22. 2
      dist/fineui.min.css
  23. 4
      dist/fineui.min.js
  24. 2
      dist/fineui.min.js.map
  25. 98
      dist/fineui_without_jquery_polyfill.js
  26. 2
      dist/fineui_without_jquery_polyfill.js.map
  27. 2
      dist/font.css
  28. 8
      dist/lib/base/combination/loader.d.ts
  29. 4
      dist/lib/index.d.ts
  30. 9
      dist/lib/widget/datetime/datetime.combo.d.ts
  31. 2
      dist/resource.css
  32. 28
      dist/utils.js
  33. 2
      dist/utils.js.map
  34. 4
      dist/utils.min.js
  35. 2
      dist/utils.min.js.map
  36. 2
      package.json
  37. 5
      src/base/layer/layer.popup.js
  38. 10
      src/base/single/text.js
  39. 4
      src/base/tree/ztree/parttree.js
  40. 8
      src/case/button/item.multiselect.js
  41. 9
      src/case/button/item.singleselect.radio.js
  42. 11
      src/core/widget.js
  43. 1
      src/widget/singletree/singletree.trigger.js
  44. 4
      tsconfig.json
  45. 14
      typescript/base/combination/loader.ts
  46. 3
      typescript/index.ts
  47. 12
      typescript/widget/datetime/datetime.combo.ts

2
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

738
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

2
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

2
dist/2.0/fineui_without_normalize.css vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/core.css vendored

File diff suppressed because one or more lines are too long

712
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

2
dist/demo.css vendored

File diff suppressed because one or more lines are too long

1072
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

2
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

738
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

2
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

98
dist/fineui_without_jquery_polyfill.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-3-9 21:10:47 */
/*! time: 2021-3-15 16:15:53 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -82,7 +82,7 @@
/******/
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 1416);
/******/ return __webpack_require__(__webpack_require__.s = 1417);
/******/ })
/************************************************************************/
/******/ ([
@ -9816,7 +9816,7 @@ BI.Req = {
*/
!(function () {
function callLifeHook (self, life) {
function callLifeHook(self, life) {
var hook = self.options[life] || self[life];
if (hook) {
var hooks = BI.isArray(hook) ? hook : [hook];
@ -9885,7 +9885,8 @@ BI.Req = {
shouldUpdate: null,
update: null,
update: function () {
},
beforeUpdate: null,
@ -9907,7 +9908,7 @@ BI.Req = {
_initRender: function () {
var self = this;
function render () {
function render() {
if (self.options.beforeRender || self.beforeRender) {
(self.options.beforeRender || self.beforeRender).call(self, BI.bind(self._render, self));
} else {
@ -10402,12 +10403,12 @@ BI.Req = {
BI.Widget.context = context = contextStack.pop();
};
function pushTarget (_current) {
function pushTarget(_current) {
if (current) currentStack.push(current);
BI.Widget.current = current = _current;
}
function popTarget () {
function popTarget() {
BI.Widget.current = current = currentStack.pop();
}
@ -18635,14 +18636,14 @@ BI.shortcut("bi.single", BI.Single);
"padding-bottom": (o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit
});
}
if (BI.isNumber(o.height)) {
this.element.css({lineHeight: o.height / BI.pixRatio + BI.pixUnit});
if (BI.isWidthOrHeight(o.height)) {
this.element.css({ lineHeight: BI.isNumber(o.height) ? (o.height / BI.pixRatio + BI.pixUnit) : o.height });
}
if (BI.isNumber(o.lineHeight)) {
this.element.css({lineHeight: o.lineHeight / BI.pixRatio + BI.pixUnit});
if (BI.isWidthOrHeight(o.lineHeight)) {
this.element.css({ lineHeight: BI.isNumber(o.lineHeight) ? (o.lineHeight / BI.pixRatio + BI.pixUnit) : o.lineHeight });
}
if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({maxWidth: o.maxWidth / BI.pixRatio + BI.pixUnit});
this.element.css({ maxWidth: BI.isNumber(o.maxWidth) ? (o.maxWidth / BI.pixRatio + BI.pixUnit) : o.maxWidth });
}
this.element.css({
textAlign: o.textAlign,
@ -23467,6 +23468,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
vgap: 0,
hgap: 0,
innerVGap: 0,
innerHGap: 0,
direction: BI.Direction.Top, // 工具栏的方向
stopEvent: false, // 是否停止mousedown、mouseup事件
stopPropagation: false, // 是否停止mousedown、mouseup向上冒泡
@ -23547,7 +23549,9 @@ BI.PopupView = BI.inherit(BI.Widget, {
this.button_group.element.css({
"min-height": BI.isNumeric(o.minHeight) ? (o.minHeight / BI.pixRatio + BI.pixUnit) : o.minHeight,
"padding-top": o.innerVGap / BI.pixRatio + BI.pixUnit,
"padding-bottom": o.innerVGap / BI.pixRatio + BI.pixUnit
"padding-bottom": o.innerVGap / BI.pixRatio + BI.pixUnit,
"padding-left": o.innerHGap / BI.pixRatio + BI.pixUnit,
"padding-right": o.innerHGap / BI.pixRatio + BI.pixUnit,
});
return this.button_group;
},
@ -28942,8 +28946,9 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
logic: {
dynamic: false
},
iconWrapperWidth: 16,
iconWrapperWidth: 26,
textHgap: 0,
textLgap: 0,
textRgap: 0
});
},
@ -28960,8 +28965,9 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
whiteSpace: "nowrap",
textHeight: o.height,
height: o.height,
hgap: o.textHgap,
rgap: o.textHgap,
hgap: o.hgap,
rgap: o.rgap,
lgap: o.textLgap,
text: o.text,
keyword: o.keyword,
value: o.value,
@ -29147,7 +29153,9 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
},
height: 24,
iconWrapperWidth: 16,
hgap: 10,
textHgap: 0,
textLgap: 0,
textRgap: 0
});
},
@ -29164,8 +29172,9 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
whiteSpace: "nowrap",
textHeight: o.height,
height: o.height,
hgap: o.textHgap,
rgap: o.textHgap,
hgap: o.hgap,
rgap: o.textRgap,
lgap: o.textLgap,
text: o.text,
keyword: o.keyword,
value: o.value,
@ -29178,7 +29187,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.radio],
width: o.conWrapperWidth
width: o.iconWrapperWidth
}, this.text)
}))));
},
@ -61090,7 +61099,6 @@ BI.SingleTreeTrigger = BI.inherit(BI.Trigger, {
},
populate: function (items) {
BI.SingleTreeTrigger.superclass.populate.apply(this, arguments);
this.trigger.populate(items);
}
@ -61098,6 +61106,7 @@ BI.SingleTreeTrigger = BI.inherit(BI.Trigger, {
BI.shortcut("bi.single_tree_trigger", BI.SingleTreeTrigger);
/***/ }),
/* 675 */
/***/ (function(module, exports) {
@ -69334,6 +69343,12 @@ Object.defineProperty(exports, "Router", {
return _router.Router;
}
});
Object.defineProperty(exports, "DateTimeCombo", {
enumerable: true,
get: function get() {
return _datetime.DateTimeCombo;
}
});
exports["default"] = void 0;
var _combo = __webpack_require__(718);
@ -69628,6 +69643,8 @@ var _button6 = __webpack_require__(840);
var _router = __webpack_require__(841);
var _datetime = __webpack_require__(842);
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; }
@ -70954,7 +70971,15 @@ var _button = __webpack_require__(8);
/***/ }),
/* 842 */,
/* 842 */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var _single = __webpack_require__(2);
/***/ }),
/* 843 */,
/* 844 */,
/* 845 */,
@ -71004,7 +71029,8 @@ var _button = __webpack_require__(8);
/* 889 */,
/* 890 */,
/* 891 */,
/* 892 */
/* 892 */,
/* 893 */
/***/ (function(module, exports) {
;(function () {
@ -71167,17 +71193,17 @@ var _button = __webpack_require__(8);
/***/ }),
/* 893 */,
/* 894 */,
/* 895 */,
/* 896 */
/* 896 */,
/* 897 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(897);
/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(898);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(17)))
/***/ }),
/* 897 */
/* 898 */
/***/ (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"); } }
@ -72710,8 +72736,8 @@ var _button = __webpack_require__(8);
/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(63).setImmediate))
/***/ }),
/* 898 */,
/* 899 */
/* 899 */,
/* 900 */
/***/ (function(module, exports) {
;(function () {
@ -73058,7 +73084,6 @@ var _button = __webpack_require__(8);
/***/ }),
/* 900 */,
/* 901 */,
/* 902 */,
/* 903 */,
@ -73275,13 +73300,13 @@ var _button = __webpack_require__(8);
/* 1114 */,
/* 1115 */,
/* 1116 */,
/* 1117 */
/* 1117 */,
/* 1118 */
/***/ (function(module, exports) {
/***/ }),
/* 1118 */,
/* 1119 */,
/* 1120 */,
/* 1121 */,
@ -73579,7 +73604,8 @@ var _button = __webpack_require__(8);
/* 1413 */,
/* 1414 */,
/* 1415 */,
/* 1416 */
/* 1416 */,
/* 1417 */
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(123);
@ -73683,7 +73709,7 @@ __webpack_require__(396);
__webpack_require__(153);
__webpack_require__(154);
__webpack_require__(155);
__webpack_require__(896);
__webpack_require__(897);
__webpack_require__(397);
__webpack_require__(398);
__webpack_require__(399);
@ -74063,9 +74089,9 @@ __webpack_require__(712);
__webpack_require__(713);
__webpack_require__(714);
__webpack_require__(715);
__webpack_require__(899);
__webpack_require__(892);
__webpack_require__(1117);
__webpack_require__(900);
__webpack_require__(893);
__webpack_require__(1118);
module.exports = __webpack_require__(716);

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

8
dist/lib/base/combination/loader.d.ts vendored

@ -2,7 +2,13 @@ import { Widget } from "../../core/widget";
export declare class Loader extends Widget {
static xtype: string;
static EVENT_CHANGE: string;
populate<T>(items: T[]): void;
_prevLoad(): void;
_nextLoad(): void;
hasPrev(): boolean;
hasNext(): boolean;
prependItems<T>(items: T[]): void;
addItems<T>(items: T[]): void;
populate(...args: any[]): void;
setNotSelectedValue(...args: any[]): void;
getNotSelectedValue<T>(): T;
getAllButtons<T>(): T[];

4
dist/lib/index.d.ts vendored

@ -153,6 +153,7 @@ import { TextNode } from "./base/single/button/node/textnode";
import { TextValueCheckComboPopup } from "./case/combo/textvaluecheckcombo/popup.textvaluecheck";
import { ImageButton } from './base/single/button/buttons/button.image';
import { History, Router } from "./router/router";
import { DateTimeCombo } from './widget/datetime/datetime.combo';
export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
OB: typeof OB;
Plugin: _Plugin;
@ -310,9 +311,10 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
ImageButton: typeof ImageButton;
Router: typeof Router;
history: History;
DateTimeCombo: typeof DateTimeCombo;
}
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, Tree, Node, TextNode, TextValueCheckComboPopup, ImageButton, Router, History, };
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, TextNode, TextValueCheckComboPopup, ImageButton, Router, History, DateTimeCombo, };

9
dist/lib/widget/datetime/datetime.combo.d.ts vendored

@ -0,0 +1,9 @@
import { Single } from '../../base/single/single';
export declare class DateTimeCombo extends Single {
static xtype: string;
static EVENT_CANCEL: string;
static EVENT_CONFIRM: string;
static EVENT_CHANGE: string;
static EVENT_BEFORE_POPUPVIEW: string;
hidePopupView: () => void;
}

2
dist/resource.css vendored

File diff suppressed because one or more lines are too long

28
dist/utils.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-3-9 21:10:47 */
/*! time: 2021-3-15 16:15:53 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -82,12 +82,12 @@
/******/
/******/
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 1239);
/******/ return __webpack_require__(__webpack_require__.s = 1240);
/******/ })
/************************************************************************/
/******/ ({
/***/ 1100:
/***/ 1101:
/***/ (function(module, exports) {
BI.i18n = {
@ -320,7 +320,14 @@ if(_global.BI.prepares == null) {
/***/ }),
/***/ 1239:
/***/ 124:
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(125)(__webpack_require__(126))
/***/ }),
/***/ 1240:
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(123);
@ -350,8 +357,8 @@ __webpack_require__(140);
__webpack_require__(141);
__webpack_require__(142);
__webpack_require__(143);
__webpack_require__(1100);
__webpack_require__(1240);
__webpack_require__(1101);
__webpack_require__(1241);
__webpack_require__(153);
__webpack_require__(154);
module.exports = __webpack_require__(155);
@ -359,14 +366,7 @@ module.exports = __webpack_require__(155);
/***/ }),
/***/ 124:
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(125)(__webpack_require__(126))
/***/ }),
/***/ 1240:
/***/ 1241:
/***/ (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.20210309211237",
"version": "2.0.20210315161742",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",

5
src/base/layer/layer.popup.js

@ -18,6 +18,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
vgap: 0,
hgap: 0,
innerVGap: 0,
innerHGap: 0,
direction: BI.Direction.Top, // 工具栏的方向
stopEvent: false, // 是否停止mousedown、mouseup事件
stopPropagation: false, // 是否停止mousedown、mouseup向上冒泡
@ -98,7 +99,9 @@ BI.PopupView = BI.inherit(BI.Widget, {
this.button_group.element.css({
"min-height": BI.isNumeric(o.minHeight) ? (o.minHeight / BI.pixRatio + BI.pixUnit) : o.minHeight,
"padding-top": o.innerVGap / BI.pixRatio + BI.pixUnit,
"padding-bottom": o.innerVGap / BI.pixRatio + BI.pixUnit
"padding-bottom": o.innerVGap / BI.pixRatio + BI.pixUnit,
"padding-left": o.innerHGap / BI.pixRatio + BI.pixUnit,
"padding-right": o.innerHGap / BI.pixRatio + BI.pixUnit,
});
return this.button_group;
},

10
src/base/single/text.js

@ -44,14 +44,14 @@
"padding-bottom": (o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit
});
}
if (BI.isNumber(o.height)) {
this.element.css({lineHeight: o.height / BI.pixRatio + BI.pixUnit});
if (BI.isWidthOrHeight(o.height)) {
this.element.css({ lineHeight: BI.isNumber(o.height) ? (o.height / BI.pixRatio + BI.pixUnit) : o.height });
}
if (BI.isNumber(o.lineHeight)) {
this.element.css({lineHeight: o.lineHeight / BI.pixRatio + BI.pixUnit});
if (BI.isWidthOrHeight(o.lineHeight)) {
this.element.css({ lineHeight: BI.isNumber(o.lineHeight) ? (o.lineHeight / BI.pixRatio + BI.pixUnit) : o.lineHeight });
}
if (BI.isWidthOrHeight(o.maxWidth)) {
this.element.css({maxWidth: o.maxWidth / BI.pixRatio + BI.pixUnit});
this.element.css({ maxWidth: BI.isNumber(o.maxWidth) ? (o.maxWidth / BI.pixRatio + BI.pixUnit) : o.maxWidth });
}
this.element.css({
textAlign: o.textAlign,

4
src/base/tree/ztree/parttree.js

@ -93,7 +93,9 @@ BI.PartTree = BI.inherit(BI.AsyncTree, {
// if(checkState.checked === true && checkState.half === false && nodes[i].flag === true){
// continue;
// }
if (BI.isNotEmptyArray(node.children)) {
// 未展开当前节点和展开当前节点后点击全选应该表现一致
// 这两种情况的check_Child_State分别为-1和2
if (BI.isNotEmptyArray(node.children) && node.check_Child_State !== 2) {
track(node.children);
return true;
}

8
src/case/button/item.multiselect.js

@ -11,8 +11,9 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
logic: {
dynamic: false
},
iconWrapperWidth: 16,
iconWrapperWidth: 26,
textHgap: 0,
textLgap: 0,
textRgap: 0
});
},
@ -29,8 +30,9 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
whiteSpace: "nowrap",
textHeight: o.height,
height: o.height,
hgap: o.textHgap,
rgap: o.textHgap,
hgap: o.hgap,
rgap: o.rgap,
lgap: o.textLgap,
text: o.text,
keyword: o.keyword,
value: o.value,

9
src/case/button/item.singleselect.radio.js

@ -12,7 +12,9 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
},
height: 24,
iconWrapperWidth: 16,
hgap: 10,
textHgap: 0,
textLgap: 0,
textRgap: 0
});
},
@ -29,8 +31,9 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
whiteSpace: "nowrap",
textHeight: o.height,
height: o.height,
hgap: o.textHgap,
rgap: o.textHgap,
hgap: o.hgap,
rgap: o.textRgap,
lgap: o.textLgap,
text: o.text,
keyword: o.keyword,
value: o.value,
@ -43,7 +46,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.radio],
width: o.conWrapperWidth
width: o.iconWrapperWidth
}, this.text)
}))));
},

11
src/core/widget.js

@ -7,7 +7,7 @@
*/
!(function () {
function callLifeHook (self, life) {
function callLifeHook(self, life) {
var hook = self.options[life] || self[life];
if (hook) {
var hooks = BI.isArray(hook) ? hook : [hook];
@ -76,7 +76,8 @@
shouldUpdate: null,
update: null,
update: function () {
},
beforeUpdate: null,
@ -98,7 +99,7 @@
_initRender: function () {
var self = this;
function render () {
function render() {
if (self.options.beforeRender || self.beforeRender) {
(self.options.beforeRender || self.beforeRender).call(self, BI.bind(self._render, self));
} else {
@ -593,12 +594,12 @@
BI.Widget.context = context = contextStack.pop();
};
function pushTarget (_current) {
function pushTarget(_current) {
if (current) currentStack.push(current);
BI.Widget.current = current = _current;
}
function popTarget () {
function popTarget() {
BI.Widget.current = current = currentStack.pop();
}

1
src/widget/singletree/singletree.trigger.js

@ -52,7 +52,6 @@ BI.SingleTreeTrigger = BI.inherit(BI.Trigger, {
},
populate: function (items) {
BI.SingleTreeTrigger.superclass.populate.apply(this, arguments);
this.trigger.populate(items);
}

4
tsconfig.json

@ -25,6 +25,8 @@
"include": [
"typescript/*.ts",
"typescript/**/*.ts",
"types/*.d.ts"
"types/*.d.ts",
"src/*.js",
"src/**/*.js",
]
}

14
typescript/base/combination/loader.ts

@ -5,7 +5,19 @@ export declare class Loader extends Widget {
static EVENT_CHANGE: string;
populate<T>(items: T[]): void;
_prevLoad(): void;
_nextLoad(): void;
hasPrev(): boolean;
hasNext(): boolean;
prependItems<T>(items: T[]): void;
addItems<T>(items: T[]): void;
populate(...args: any[]): void;
setNotSelectedValue(...args: any[]): void;

3
typescript/index.ts

@ -153,6 +153,7 @@ import { TextNode } from "./base/single/button/node/textnode";
import { TextValueCheckComboPopup } from "./case/combo/textvaluecheckcombo/popup.textvaluecheck";
import { ImageButton } from './base/single/button/buttons/button.image';
import { History, Router } from "./router/router";
import { DateTimeCombo } from './widget/datetime/datetime.combo';
export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
@ -312,6 +313,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
ImageButton: typeof ImageButton;
Router: typeof Router;
history: History,
DateTimeCombo: typeof DateTimeCombo;
}
export default {
@ -473,4 +475,5 @@ export {
ImageButton,
Router,
History,
DateTimeCombo,
};

12
typescript/widget/datetime/datetime.combo.ts

@ -0,0 +1,12 @@
import { Single } from '../../base/single/single';
export declare class DateTimeCombo extends Single {
static xtype: string;
static EVENT_CANCEL: string;
static EVENT_CONFIRM: string;
static EVENT_CHANGE: string;
static EVENT_BEFORE_POPUPVIEW: string;
hidePopupView: () => void;
}
Loading…
Cancel
Save