Browse Source

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

es6
guyi 2 years ago
parent
commit
bddbfadfde
  1. 2
      package.json
  2. 7
      src/case/button/icon/icon.change.js
  3. 2
      src/case/combo/textvaluecombo/combo.textvalue.js
  4. 9
      src/core/platform/web/jquery/_jquery.js
  5. 2
      webpack/attachments.js

2
package.json

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

7
src/case/button/icon/icon.change.js

@ -31,8 +31,11 @@ BI.IconChangeButton = BI.inherit(BI.Single, {
}, },
_init: function () { _init: function () {
BI.IconChangeButton.superclass._init.apply(this, arguments);
var self = this, o = this.options; var self = this, o = this.options;
o.iconCls = BI.isFunction(o.iconCls) ? this.__watch(o.iconCls, function (context, newValue) {
self.setIcon(newValue);
}) : o.iconCls;
BI.IconChangeButton.superclass._init.apply(this, arguments);
this.button = BI.createWidget({ this.button = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
element: this, element: this,
@ -80,4 +83,4 @@ BI.IconChangeButton = BI.inherit(BI.Single, {
} }
}); });
BI.IconChangeButton.EVENT_CHANGE = "EVENT_CHANGE"; BI.IconChangeButton.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.icon_change_button", BI.IconChangeButton); BI.shortcut("bi.icon_change_button", BI.IconChangeButton);

2
src/case/combo/textvaluecombo/combo.textvalue.js

@ -116,7 +116,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
}, { }, {
eventName: BI.Combo.EVENT_AFTER_HIDEVIEW, eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
action: (...args) => { action: (...args) => {
if (changeTag) { if (o.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_SINGLE && changeTag) {
this.fireEvent(BI.TextValueCombo.EVENT_CHANGE, ...args); this.fireEvent(BI.TextValueCombo.EVENT_CHANGE, ...args);
} }
} }

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

@ -1,5 +1,5 @@
/*! /*!
* jQuery JavaScript Library v1.12.4 * jQuery JavaScript Library v3.6.1
* http://jquery.com/ * http://jquery.com/
* *
* Includes Sizzle.js * Includes Sizzle.js
@ -63,16 +63,15 @@
var support = {}; var support = {};
var var
version = "1.12.4", version = "3.6.1",
// Define a local copy of jQuery // Define a local copy of jQuery
jQuery = function( selector, context ) { jQuery = function (selector, context) {
// The jQuery object is actually just the init constructor 'enhanced' // The jQuery object is actually just the init constructor 'enhanced'
// Need init if jQuery is called (just allow error to be thrown if not included) // Need init if jQuery is called (just allow error to be thrown if not included)
return new jQuery.fn.init( selector, context ); return new jQuery.fn.init(selector, context);
}, },
// Support: Android<4.1, IE<9 // Support: Android<4.1, IE<9

2
webpack/attachments.js

@ -233,13 +233,13 @@ const demo = [].concat(
basicAttachmentMap.polyfill, basicAttachmentMap.polyfill,
basicAttachmentMap.core, basicAttachmentMap.core,
basicAttachmentMap.fix, basicAttachmentMap.fix,
basicAttachmentMap.config,
basicAttachmentMap.base, basicAttachmentMap.base,
basicAttachmentMap.case, basicAttachmentMap.case,
basicAttachmentMap.widget, basicAttachmentMap.widget,
basicAttachmentMap.router, basicAttachmentMap.router,
sync(["public/less/app.less", "public/less/**/*.less"]), sync(["public/less/app.less", "public/less/**/*.less"]),
[fixCompact, workerCompact], [fixCompact, workerCompact],
basicAttachmentMap.config,
basicAttachmentMap.ts, basicAttachmentMap.ts,
sync(["demo/less/*.less", "demo/less/**/*.less", "demo/app.js", "demo/js/**/*.js", "demo/config.js"]), sync(["demo/less/*.less", "demo/less/**/*.less", "demo/app.js", "demo/js/**/*.js", "demo/config.js"]),
); );

Loading…
Cancel
Save