diff --git a/packages/fineui/dist/font/iconfont.eot b/packages/fineui/dist/font/iconfont.eot index 7d8b86a35..cb92e239c 100644 Binary files a/packages/fineui/dist/font/iconfont.eot and b/packages/fineui/dist/font/iconfont.eot differ diff --git a/packages/fineui/dist/font/iconfont.svg b/packages/fineui/dist/font/iconfont.svg index defb623c6..bf6e0058b 100644 --- a/packages/fineui/dist/font/iconfont.svg +++ b/packages/fineui/dist/font/iconfont.svg @@ -14,6 +14,54 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1128,19 +1176,19 @@ - + - + - + - + - + @@ -1336,11 +1384,11 @@ - + - + @@ -1352,11 +1400,11 @@ - + - + @@ -1382,93 +1430,93 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1480,139 +1528,139 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1624,43 +1672,43 @@ - + - + - + - + - + - + - + diff --git a/packages/fineui/dist/font/iconfont.ttf b/packages/fineui/dist/font/iconfont.ttf index b9868178f..c1245be37 100644 Binary files a/packages/fineui/dist/font/iconfont.ttf and b/packages/fineui/dist/font/iconfont.ttf differ diff --git a/packages/fineui/dist/font/iconfont.woff b/packages/fineui/dist/font/iconfont.woff index 3d1f09be5..a05e760b9 100644 Binary files a/packages/fineui/dist/font/iconfont.woff and b/packages/fineui/dist/font/iconfont.woff differ diff --git a/packages/fineui/dist/font/iconfont.woff2 b/packages/fineui/dist/font/iconfont.woff2 index 5a225cd54..91697cc4c 100644 Binary files a/packages/fineui/dist/font/iconfont.woff2 and b/packages/fineui/dist/font/iconfont.woff2 differ diff --git a/packages/fineui/package.json b/packages/fineui/package.json index f467aa097..509cc8077 100644 --- a/packages/fineui/package.json +++ b/packages/fineui/package.json @@ -57,7 +57,7 @@ "jquery": "3.6.3" }, "devDependencies": { - "core-js": "^3.30.2", + "core-js": "^3.37.1", "cross-env": "^7.0.3" } } \ No newline at end of file diff --git a/packages/fineui/src/core/5.inject.js b/packages/fineui/src/core/5.inject.js index 901512a03..6f8182ee2 100644 --- a/packages/fineui/src/core/5.inject.js +++ b/packages/fineui/src/core/5.inject.js @@ -62,7 +62,7 @@ const constantInjection = {}; export function constant(xtype, cls) { if (isNotNull(constantInjection[xtype])) { - _global.console && console.error(`constant: [${xtype}]already registered`); + _global.console && console.warn(`constant: [${xtype}]already registered`); } else { constantInjection[xtype] = cls; } diff --git a/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js b/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js index 2c854fb31..4d5bab1da 100644 --- a/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js +++ b/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js @@ -10,7 +10,6 @@ export class MultiSelectCheckSelectedSwitcher extends Widget { static EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE"; static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"; static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW"; - static EVENT_TRIGGER_COMBO = "EVENT_TRIGGER_COMBO"; _defaultConfig() { return extend(super._defaultConfig(...arguments), { @@ -49,7 +48,6 @@ export class MultiSelectCheckSelectedSwitcher extends Widget { itemsCreator: o.itemsCreator, onClickContinueSelect() { self.switcher.hideView(); - self.fireEvent(MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_COMBO); }, ref(_ref) { self.checkPane = _ref; diff --git a/packages/fineui/src/widget/multitree/multi.tree.combo.js b/packages/fineui/src/widget/multitree/multi.tree.combo.js index 435db661e..7d61b6e9d 100644 --- a/packages/fineui/src/widget/multitree/multi.tree.combo.js +++ b/packages/fineui/src/widget/multitree/multi.tree.combo.js @@ -182,7 +182,6 @@ export class MultiTreeCombo extends Single { return self.combo.isViewVisible(); } - let shouldComboPopulate = true; this.trigger.on(MultiSelectTrigger.EVENT_FOCUS, () => { self.fireEvent(MultiTreeCombo.EVENT_FOCUS); }); @@ -260,14 +259,14 @@ export class MultiTreeCombo extends Single { } self.combo.setValue(self.storeValue); self.numberCounter.setValue(self.storeValue); - shouldComboPopulate && self.populate(); + self.populate(); self.fireEvent(MultiTreeCombo.EVENT_BEFORE_POPUPVIEW); }); this.combo.on(Combo.EVENT_BEFORE_HIDEVIEW, () => { if (isSearching()) { self._stopEditing(); self._dataChange && - self.fireEvent(MultiTreeCombo.EVENT_CONFIRM); + self.fireEvent(MultiTreeCombo.EVENT_CONFIRM); } else { if (isPopupView()) { self._stopEditing(); @@ -276,7 +275,7 @@ export class MultiTreeCombo extends Single { self.storeValue = { value: {} }; } self._dataChange && - self.fireEvent(MultiTreeCombo.EVENT_CONFIRM); + self.fireEvent(MultiTreeCombo.EVENT_CONFIRM); } } clear = false; @@ -317,18 +316,10 @@ export class MultiTreeCombo extends Single { valueFormatter: o.valueFormatter, value: { value: o.value || {} }, }); - this.numberCounter.on( - MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_COMBO, - () => { - self.populate(); - shouldComboPopulate = true; - } - ); this.numberCounter.on( MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_CHANGE, () => { if (!self.combo.isViewVisible()) { - shouldComboPopulate = false; self.combo.showView(); } }