Merge branch 'master' of https://code.fineres.com/scm/~roy.liu/fineui

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-23 13:50:23 */
+/*! time: 2020-12-24 10:43:10 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,7 +82,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1400);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1401);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -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) {
@@ -67913,6 +67913,12 @@ Object.defineProperty(exports, "FloatCenterLayout", {
     return _middleFloat.FloatCenterLayout;
   }
 });
+Object.defineProperty(exports, "DynamicYearMonthPopup", {
+  enumerable: true,
+  get: function get() {
+    return _popup2.DynamicYearMonthPopup;
+  }
+});
 exports["default"] = void 0;
 
 var _combo = __webpack_require__(712);
@@ -68189,6 +68195,8 @@ var _listview = __webpack_require__(826);
 
 var _middleFloat = __webpack_require__(827);
 
+var _popup2 = __webpack_require__(828);
+
 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; }
@@ -69447,7 +69455,15 @@ var _widget = __webpack_require__(1);
 var _layout = __webpack_require__(3);
 
 /***/ }),
-/* 828 */,
+/* 828 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _widget = __webpack_require__(1);
+
+/***/ }),
 /* 829 */,
 /* 830 */,
 /* 831 */,
@@ -69497,7 +69513,8 @@ var _layout = __webpack_require__(3);
 /* 875 */,
 /* 876 */,
 /* 877 */,
-/* 878 */
+/* 878 */,
+/* 879 */
 /***/ (function(module, exports) {
 
 ;(function () {
@@ -69660,17 +69677,17 @@ var _layout = __webpack_require__(3);
 
 
 /***/ }),
-/* 879 */,
 /* 880 */,
 /* 881 */,
-/* 882 */
+/* 882 */,
+/* 883 */
 /***/ (function(module, exports, __webpack_require__) {
 
-/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(883);
+/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(884);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(17)))
 
 /***/ }),
-/* 883 */
+/* 884 */
 /***/ (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"); } }
@@ -71147,8 +71164,8 @@ var _layout = __webpack_require__(3);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(62).setImmediate))
 
 /***/ }),
-/* 884 */,
-/* 885 */
+/* 885 */,
+/* 886 */
 /***/ (function(module, exports) {
 
 ;(function () {
@@ -71444,7 +71461,6 @@ var _layout = __webpack_require__(3);
 
 
 /***/ }),
-/* 886 */,
 /* 887 */,
 /* 888 */,
 /* 889 */,
@@ -71661,13 +71677,13 @@ var _layout = __webpack_require__(3);
 /* 1100 */,
 /* 1101 */,
 /* 1102 */,
-/* 1103 */
+/* 1103 */,
+/* 1104 */
 /***/ (function(module, exports) {
 
 
 
 /***/ }),
-/* 1104 */,
 /* 1105 */,
 /* 1106 */,
 /* 1107 */,
@@ -71963,7 +71979,8 @@ var _layout = __webpack_require__(3);
 /* 1397 */,
 /* 1398 */,
 /* 1399 */,
-/* 1400 */
+/* 1400 */,
+/* 1401 */
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(122);
@@ -72067,7 +72084,7 @@ __webpack_require__(392);
 __webpack_require__(152);
 __webpack_require__(153);
 __webpack_require__(154);
-__webpack_require__(882);
+__webpack_require__(883);
 __webpack_require__(393);
 __webpack_require__(394);
 __webpack_require__(395);
@@ -72443,9 +72460,9 @@ __webpack_require__(706);
 __webpack_require__(707);
 __webpack_require__(708);
 __webpack_require__(709);
-__webpack_require__(885);
-__webpack_require__(878);
-__webpack_require__(1103);
+__webpack_require__(886);
+__webpack_require__(879);
+__webpack_require__(1104);
 module.exports = __webpack_require__(710);
 
 

dist/lib/index.d.ts

@@ -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';
 declare type ClassConstructor<T extends {}> = T & {
     new (config: any): T;
     (config: any): T;
@@ -294,9 +295,10 @@ export interface BI extends _func, _i18n, _base, _inject, _var {
     IconTextValueCombo: typeof IconTextValueCombo;
     ListView: typeof ListView;
     FloatCenterLayout: typeof FloatCenterLayout;
+    DynamicYearMonthPopup: typeof DynamicYearMonthPopup;
 }
 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, 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, };
+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, 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, };

dist/lib/widget/yearmonth/popup.yearmonth.d.ts

@@ -0,0 +1,10 @@
+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;
+}

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-23 13:50:23 */
+/*! time: 2020-12-24 10:43:10 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,12 +82,12 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1225);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1226);
 /******/ })
 /************************************************************************/
 /******/ ({
 
-/***/ 1086:
+/***/ 1087:
 /***/ (function(module, exports) {
 
 BI.i18n = {
@@ -315,7 +315,7 @@ if(_global.BI.prepares == null) {
 
 /***/ }),
 
-/***/ 1225:
+/***/ 1226:
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(122);
@@ -345,8 +345,8 @@ __webpack_require__(139);
 __webpack_require__(140);
 __webpack_require__(141);
 __webpack_require__(142);
-__webpack_require__(1086);
-__webpack_require__(1226);
+__webpack_require__(1087);
+__webpack_require__(1227);
 __webpack_require__(152);
 __webpack_require__(153);
 module.exports = __webpack_require__(154);
@@ -354,7 +354,7 @@ module.exports = __webpack_require__(154);
 
 /***/ }),
 
-/***/ 1226:
+/***/ 1227:
 /***/ (function(module, exports) {
 
 /**

package.json

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

src/base/layer/layer.popover.js

@@ -10,9 +10,7 @@ BI.Popover = BI.inherit(BI.Widget, {
             NORMAL: "normal",
             BIG: "big",
         },
-        MAX_HEIGHT: 600,
-        BODY_TGAP: 10,
-        BODY_HGAP: 20,
+        MAX_HEIGHT: 600
     },
 
     props: {
@@ -27,6 +25,8 @@ BI.Popover = BI.inherit(BI.Widget, {
         footer: null,
         footerHeight: 44,
         closable: true, // BI-40839 是否显示右上角的关闭按钮
+        bodyHgap: 20,
+        bodyTgap: 10
     },
 
     render: function () {
@@ -99,23 +99,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,
                 }],
             },
@@ -163,7 +163,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) {

src/core/platform/web/jquery/_jquery.js

@@ -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.

typescript/index.ts

@@ -141,8 +141,12 @@ 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';
+<<<<<<< HEAD
 import { _msg } from './base/foundation/message';
 import { _web } from './core/platform/web';
+=======
+import { DynamicYearMonthPopup } from './widget/yearmonth/popup.yearmonth';
+>>>>>>> 6719cf4a69338c554f8e06c51d91a74c6b66e71e
 
 
 type ClassConstructor<T extends {}> = T & {
@@ -299,7 +303,11 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web {
     IconTextValueCombo: typeof IconTextValueCombo;
     ListView: typeof ListView;
     FloatCenterLayout: typeof FloatCenterLayout;
+<<<<<<< HEAD
     Msg: _msg;
+=======
+    DynamicYearMonthPopup: typeof DynamicYearMonthPopup;
+>>>>>>> 6719cf4a69338c554f8e06c51d91a74c6b66e71e
 }
 
 export default {
@@ -450,4 +458,5 @@ export {
     IconTextValueCombo,
     ListView,
     FloatCenterLayout,
+    DynamicYearMonthPopup,
 };

typescript/widget/yearmonth/popup.yearmonth.ts

@@ -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;
+}