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

package.json

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

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

@@ -31,8 +31,11 @@ BI.IconChangeButton = BI.inherit(BI.Single, {
     },
 
     _init: function () {
-        BI.IconChangeButton.superclass._init.apply(this, arguments);
         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({
             type: "bi.icon_button",
             element: this,
@@ -80,4 +83,4 @@ BI.IconChangeButton = BI.inherit(BI.Single, {
     }
 });
 BI.IconChangeButton.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.icon_change_button", BI.IconChangeButton);
+BI.shortcut("bi.icon_change_button", BI.IconChangeButton);

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

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

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

@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v1.12.4
+ * jQuery JavaScript Library v3.6.1
  * http://jquery.com/
  *
  * Includes Sizzle.js
@@ -63,16 +63,15 @@
 	var support = {};
 
 
-
 	var
-		version = "1.12.4",
+		version = "3.6.1",
 
 		// Define a local copy of jQuery
-		jQuery = function( selector, context ) {
+		jQuery = function (selector, context) {
 
 			// 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)
-			return new jQuery.fn.init( selector, context );
+			return new jQuery.fn.init(selector, context);
 		},
 
 		// Support: Android<4.1, IE<9

webpack/attachments.js

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