fanruan
/
fineui
4
1
Fork 2
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master' into bugfix

es6
iapyang 4 years ago
parent
81adeeb34a 55e91eb995
commit
6832be8e6f
34 changed files with 106 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  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. 25
      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. 25
      dist/core.js
  13. 2
      dist/core.js.map
  14. 2
      dist/demo.css
  15. 25
      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. 25
      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. 22
      dist/fineui_without_jquery_polyfill.js
  26. 2
      dist/fineui_without_jquery_polyfill.js.map
  27. 2
      dist/font.css
  28. 2
      dist/resource.css
  29. 2
      dist/utils.js
  30. 2
      dist/utils.min.js
  31. 2
      package.json
  32. 3
      src/core/platform/web/jquery/_jquery.js
  33. 3
      typescript/index.ts
  34. 13
      typescript/widget/yearmonth/popup.yearmonth.ts

2
dist/2.0/fineui.css vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

25
dist/2.0/fineui.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-23 13:50:23 */
/*! time: 2020-12-24 10:01:02 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -27037,9 +27037,7 @@ BI.Popover = BI.inherit(BI.Widget, {
NORMAL: "normal",
BIG: "big",
},
MAX_HEIGHT: 600,
BODY_TGAP: 10,
BODY_HGAP: 20,
MAX_HEIGHT: 600
},
props: {
@ -27054,6 +27052,8 @@ BI.Popover = BI.inherit(BI.Widget, {
footer: null,
footerHeight: 44,
closable: true, // BI-40839 是否显示右上角的关闭按钮
bodyHgap: 20,
bodyTgap: 10
},
render: function () {
@ -27126,23 +27126,23 @@ BI.Popover = BI.inherit(BI.Widget, {
self.body = this;
},
css: {
"max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP),
"max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - o.bodyTgap),
"min-height": this._getSuitableBodyHeight(size.height),
},
items: [{
el: o.body,
}],
},
hgap: c.BODY_HGAP,
tgap: c.BODY_TGAP,
hgap: o.bodyHgap,
tgap: o.bodyTgap,
} : {
el: {
type: "bi.absolute",
items: [{
el: o.body,
left: c.BODY_HGAP,
top: c.BODY_TGAP,
right: c.BODY_HGAP,
left: o.bodyHgap,
top: o.bodyTgap,
right: o.bodyHgap,
bottom: 0,
}],
},
@ -27190,7 +27190,7 @@ BI.Popover = BI.inherit(BI.Widget, {
_getSuitableBodyHeight: function (height) {
var o = this.options;
var c = this._constant;
return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP);
return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - o.bodyTgap);
},
_getSuitableHeight: function (height) {
@ -75211,7 +75211,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
copy = options[ name ];
// Prevent never-ending loop
if ( target === copy ) {
if ( name === "__proto__" || target === copy ) {
continue;
}
@ -80882,7 +80882,6 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
var rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
rnoshimcache = new RegExp( "<(?:" + nodeNames + ")[\\s/>]", "i" ),
// rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
// Support: IE 10-11, Edge 10240+
// In IE/Edge using regex groups here causes severe slowdowns.

2
dist/2.0/fineui.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/core.css vendored
View File

File diff suppressed because one or more lines are too long

25
dist/core.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-23 13:50:23 */
/*! time: 2020-12-24 10:01:02 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -27037,9 +27037,7 @@ BI.Popover = BI.inherit(BI.Widget, {
NORMAL: "normal",
BIG: "big",
},
MAX_HEIGHT: 600,
BODY_TGAP: 10,
BODY_HGAP: 20,
MAX_HEIGHT: 600
},
props: {
@ -27054,6 +27052,8 @@ BI.Popover = BI.inherit(BI.Widget, {
footer: null,
footerHeight: 44,
closable: true, // BI-40839 是否显示右上角的关闭按钮
bodyHgap: 20,
bodyTgap: 10
},
render: function () {
@ -27126,23 +27126,23 @@ BI.Popover = BI.inherit(BI.Widget, {
self.body = this;
},
css: {
"max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP),
"max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - o.bodyTgap),
"min-height": this._getSuitableBodyHeight(size.height),
},
items: [{
el: o.body,
}],
},
hgap: c.BODY_HGAP,
tgap: c.BODY_TGAP,
hgap: o.bodyHgap,
tgap: o.bodyTgap,
} : {
el: {
type: "bi.absolute",
items: [{
el: o.body,
left: c.BODY_HGAP,
top: c.BODY_TGAP,
right: c.BODY_HGAP,
left: o.bodyHgap,
top: o.bodyTgap,
right: o.bodyHgap,
bottom: 0,
}],
},
@ -27190,7 +27190,7 @@ BI.Popover = BI.inherit(BI.Widget, {
_getSuitableBodyHeight: function (height) {
var o = this.options;
var c = this._constant;
return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP);
return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - o.bodyTgap);
},
_getSuitableHeight: function (height) {
@ -75211,7 +75211,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
copy = options[ name ];
// Prevent never-ending loop
if ( target === copy ) {
if ( name === "__proto__" || target === copy ) {
continue;
}
@ -80882,7 +80882,6 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
var rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
rnoshimcache = new RegExp( "<(?:" + nodeNames + ")[\\s/>]", "i" ),
// rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
// Support: IE 10-11, Edge 10240+
// In IE/Edge using regex groups here causes severe slowdowns.

2
dist/core.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/demo.css vendored
View File

File diff suppressed because one or more lines are too long

25
dist/demo.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-23 13:50:23 */
/*! time: 2020-12-24 10:01:02 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -27037,9 +27037,7 @@ BI.Popover = BI.inherit(BI.Widget, {
NORMAL: "normal",
BIG: "big",
},
MAX_HEIGHT: 600,
BODY_TGAP: 10,
BODY_HGAP: 20,
MAX_HEIGHT: 600
},
props: {
@ -27054,6 +27052,8 @@ BI.Popover = BI.inherit(BI.Widget, {
footer: null,
footerHeight: 44,
closable: true, // BI-40839 是否显示右上角的关闭按钮
bodyHgap: 20,
bodyTgap: 10
},
render: function () {
@ -27126,23 +27126,23 @@ BI.Popover = BI.inherit(BI.Widget, {
self.body = this;
},
css: {
"max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP),
"max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - o.bodyTgap),
"min-height": this._getSuitableBodyHeight(size.height),
},
items: [{
el: o.body,
}],
},
hgap: c.BODY_HGAP,
tgap: c.BODY_TGAP,
hgap: o.bodyHgap,
tgap: o.bodyTgap,
} : {
el: {
type: "bi.absolute",
items: [{
el: o.body,
left: c.BODY_HGAP,
top: c.BODY_TGAP,
right: c.BODY_HGAP,
left: o.bodyHgap,
top: o.bodyTgap,
right: o.bodyHgap,
bottom: 0,
}],
},
@ -27190,7 +27190,7 @@ BI.Popover = BI.inherit(BI.Widget, {
_getSuitableBodyHeight: function (height) {
var o = this.options;
var c = this._constant;
return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP);
return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - o.bodyTgap);
},
_getSuitableHeight: function (height) {
@ -75211,7 +75211,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
copy = options[ name ];
// Prevent never-ending loop
if ( target === copy ) {
if ( name === "__proto__" || target === copy ) {
continue;
}
@ -80882,7 +80882,6 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
var rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
rnoshimcache = new RegExp( "<(?:" + nodeNames + ")[\\s/>]", "i" ),
// rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
// Support: IE 10-11, Edge 10240+
// In IE/Edge using regex groups here causes severe slowdowns.

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

25
dist/fineui.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-23 13:50:23 */
/*! time: 2020-12-24 10:01:02 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -27037,9 +27037,7 @@ BI.Popover = BI.inherit(BI.Widget, {
NORMAL: "normal",
BIG: "big",
},
MAX_HEIGHT: 600,
BODY_TGAP: 10,
BODY_HGAP: 20,
MAX_HEIGHT: 600
},
props: {
@ -27054,6 +27052,8 @@ BI.Popover = BI.inherit(BI.Widget, {
footer: null,
footerHeight: 44,
closable: true, // BI-40839 是否显示右上角的关闭按钮
bodyHgap: 20,
bodyTgap: 10
},
render: function () {
@ -27126,23 +27126,23 @@ BI.Popover = BI.inherit(BI.Widget, {
self.body = this;
},
css: {
"max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP),
"max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - o.bodyTgap),
"min-height": this._getSuitableBodyHeight(size.height),
},
items: [{
el: o.body,
}],
},
hgap: c.BODY_HGAP,
tgap: c.BODY_TGAP,
hgap: o.bodyHgap,
tgap: o.bodyTgap,
} : {
el: {
type: "bi.absolute",
items: [{
el: o.body,
left: c.BODY_HGAP,
top: c.BODY_TGAP,
right: c.BODY_HGAP,
left: o.bodyHgap,
top: o.bodyTgap,
right: o.bodyHgap,
bottom: 0,
}],
},
@ -27190,7 +27190,7 @@ BI.Popover = BI.inherit(BI.Widget, {
_getSuitableBodyHeight: function (height) {
var o = this.options;
var c = this._constant;
return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP);
return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - o.bodyTgap);
},
_getSuitableHeight: function (height) {
@ -75211,7 +75211,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
copy = options[ name ];
// Prevent never-ending loop
if ( target === copy ) {
if ( name === "__proto__" || target === copy ) {
continue;
}
@ -80882,7 +80882,6 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
var rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
rnoshimcache = new RegExp( "<(?:" + nodeNames + ")[\\s/>]", "i" ),
// rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
// Support: IE 10-11, Edge 10240+
// In IE/Edge using regex groups here causes severe slowdowns.

2
dist/fineui.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

22
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-23 13:50:23 */
/*! time: 2020-12-24 10:01:02 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -23064,9 +23064,7 @@ BI.Popover = BI.inherit(BI.Widget, {
NORMAL: "normal",
BIG: "big",
},
MAX_HEIGHT: 600,
BODY_TGAP: 10,
BODY_HGAP: 20,
MAX_HEIGHT: 600
},
props: {
@ -23081,6 +23079,8 @@ BI.Popover = BI.inherit(BI.Widget, {
footer: null,
footerHeight: 44,
closable: true, // BI-40839 是否显示右上角的关闭按钮
bodyHgap: 20,
bodyTgap: 10
},
render: function () {
@ -23153,23 +23153,23 @@ BI.Popover = BI.inherit(BI.Widget, {
self.body = this;
},
css: {
"max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP),
"max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - o.bodyTgap),
"min-height": this._getSuitableBodyHeight(size.height),
},
items: [{
el: o.body,
}],
},
hgap: c.BODY_HGAP,
tgap: c.BODY_TGAP,
hgap: o.bodyHgap,
tgap: o.bodyTgap,
} : {
el: {
type: "bi.absolute",
items: [{
el: o.body,
left: c.BODY_HGAP,
top: c.BODY_TGAP,
right: c.BODY_HGAP,
left: o.bodyHgap,
top: o.bodyTgap,
right: o.bodyHgap,
bottom: 0,
}],
},
@ -23217,7 +23217,7 @@ BI.Popover = BI.inherit(BI.Widget, {
_getSuitableBodyHeight: function (height) {
var o = this.options;
var c = this._constant;
return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP);
return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - o.bodyTgap);
},
_getSuitableHeight: function (height) {

2
dist/fineui_without_jquery_polyfill.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/font.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/resource.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/utils.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-23 13:50:23 */
/*! time: 2020-12-24 10:01:02 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
Unescape View File

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

3
src/core/platform/web/jquery/_jquery.js vendored
Unescape View File

@ -213,7 +213,7 @@
copy = options[ name ];
// Prevent never-ending loop
if ( target === copy ) {
if ( name === "__proto__" || target === copy ) {
continue;
}
@ -5884,7 +5884,6 @@
var rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
rnoshimcache = new RegExp( "<(?:" + nodeNames + ")[\\s/>]", "i" ),
// rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
// Support: IE 10-11, Edge 10240+
// In IE/Edge using regex groups here causes severe slowdowns.

3
typescript/index.ts
Unescape View File

@ -141,6 +141,7 @@ import { EditorIconCheckCombo } from "./case/combo/editoriconcheckcombo/combo.ed
import { IconTextValueCombo } from './case/combo/icontextvaluecombo/combo.icontextvalue';
import { ListView } from './base/list/listview';
import { FloatCenterLayout } from './core/wrapper/layout/middle/middle.float.center';
import { DynamicYearMonthPopup } from './widget/yearmonth/popup.yearmonth';
type ClassConstructor<T extends {}> = T & {
@ -297,6 +298,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var {
IconTextValueCombo: typeof IconTextValueCombo;
ListView: typeof ListView;
FloatCenterLayout: typeof FloatCenterLayout;
DynamicYearMonthPopup: typeof DynamicYearMonthPopup;
}
export default {
@ -447,4 +449,5 @@ export {
IconTextValueCombo,
ListView,
FloatCenterLayout,
DynamicYearMonthPopup,
};

13
typescript/widget/yearmonth/popup.yearmonth.ts
Unescape View File

@ -0,0 +1,13 @@
import { Widget } from '../../core/widget';
export declare class DynamicYearMonthPopup extends Widget {
static xtype: string;
static BUTTON_CLEAR_EVENT_CHANGE: string;
static BUTTON_lABEL_EVENT_CHANGE: string;
static BUTTON_OK_EVENT_CHANGE: string;
static EVENT_CHANGE: string;
setMinDate(minDate: string): void;
setMaxDate(maxDate: string): void;
}
Write Preview
Loading…
Cancel
Save