diff --git a/packages/fineui/src/base/combination/bubble.js b/packages/fineui/src/base/combination/bubble.js index 974b1633d..c78fcf111 100644 --- a/packages/fineui/src/base/combination/bubble.js +++ b/packages/fineui/src/base/combination/bubble.js @@ -506,7 +506,7 @@ export class Bubble extends Widget { } _setEnable(arg) { - super._setEnable(arguments); + super._setEnable(...arguments); if (arg === true) { this.element.removeClass("base-disabled disabled"); } else if (arg === false) { diff --git a/packages/fineui/src/bundle.js b/packages/fineui/src/bundle.js index 4f0e5252f..e3215520a 100644 --- a/packages/fineui/src/bundle.js +++ b/packages/fineui/src/bundle.js @@ -14,3 +14,8 @@ Object.assign(_global, { }); Object.assign(_global.BI, fuiExport, injectFn); + +Object.defineProperty(_global.BI, "EVENT_BLUR", { + set: fuiExport.setEventBlur, + get: () => fuiExport.EVENT_BLUR +}); diff --git a/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js b/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js index 86f4f188e..61a48946f 100644 --- a/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js +++ b/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js @@ -267,8 +267,8 @@ export class HexColorChooserPopup extends Widget { type: Layout.xtype, cls: "disable-mask", invisible: !o.disabled, - ref: () => { - this.mask = this; + ref: (ref) => { + this.mask = ref; }, }, left: 0, diff --git a/packages/fineui/src/case/colorchooser/colorchooser.popup.js b/packages/fineui/src/case/colorchooser/colorchooser.popup.js index 635cc192c..9b1689f9a 100644 --- a/packages/fineui/src/case/colorchooser/colorchooser.popup.js +++ b/packages/fineui/src/case/colorchooser/colorchooser.popup.js @@ -191,8 +191,8 @@ export class ColorChooserPopup extends Widget { type: Layout.xtype, cls: "disable-mask", invisible: !o.disabled, - ref: () => { - this.mask = this; + ref: (ref) => { + this.mask = ref; }, }, left: 0, diff --git a/packages/fineui/src/core/constant/var.js b/packages/fineui/src/core/constant/var.js index a109324c0..30f3246c0 100644 --- a/packages/fineui/src/core/constant/var.js +++ b/packages/fineui/src/core/constant/var.js @@ -2,11 +2,14 @@ * 常量 */ import { isNumber } from "../2.base"; +import { Cache } from "../structure/cache"; + +export let EVENT_BLUR = Cache.getItem("event.blur", {typeConversion: true, defaultValue: true}); +export const setEventBlur = (v) => { EVENT_BLUR = v, Cache.setItem("event.blur", v) }; export const MAX = 0xfffffffffffffff; export const MIN = -0xfffffffffffffff; export const EVENT_RESPONSE_TIME = 200; -export const EVENT_BLUR = true; export const zIndex_layer = 1e5; export const zIndex_popover = 1e6; export const zIndex_popup = 1e7; diff --git a/packages/fineui/src/core/structure/cache.js b/packages/fineui/src/core/structure/cache.js index 38e238f7a..e0ebe4607 100644 --- a/packages/fineui/src/core/structure/cache.js +++ b/packages/fineui/src/core/structure/cache.js @@ -12,8 +12,22 @@ export const Cache = { _generateKey: function (key) { return Cache._getKeyPrefix() + (key || ""); }, - getItem: function (key) { - return localStorage.getItem(Cache._generateKey(key)); + getItem: function (key, opt = {}) { + const { defaultValue, typeConversion } = opt; + const storageKey = Cache._generateKey(key); + let value = localStorage.getItem(storageKey); + + if (value !== null && typeConversion) { + if (value === "true") { + value = true; + } else if (value === "false") { + value = false; + } else if (Number.isNaN(Number(value))) { + value = Number(value); + } + } + + return value !== null ? value : defaultValue; }, setItem: function (key, value) { localStorage.setItem(Cache._generateKey(key), value);