Pull request #3664: KERNEL-15856 fix:兼容定时调度

Merge in VISUAL/fineui from ~TREECAT/fineui:es6 to es6

* commit '3995479d53bc38a829a1d5d9357ff73476abde38':
  Revert "无jira: fix:material 代理问题"
  KERNEL-15856 fix:兼容定时调度
  无jira: fix:material 代理问题

README

@@ -13,24 +13,14 @@ http://fanruan.design/doc.html?post=0169cf558d
 
 ## 开发
 
-`pnpm run dev`
+pnpm run dev
 
 * demo: [http://localhost:3000/](http://localhost:3000/) 
 * fineui: [http://localhost:9001/fineui.js](http://localhost:9001/fineui.js)
 
 ## 构建
 
-`pnpm run build`
-
-## 自定义less变量构建
-```
-cross-env LESS_CONFIG_PATH=your_less_config.json && pnpm build
-```
-
-## 构建自定义的css
-```
-cross-env LESS_CONFIG_PATH=your_less_config.json LESS_FILE_NAME=your_file_name pnpm --filter @fui/core webpack:css
-```
+pnpm run build
 
 ## 发布
 

package.json

@@ -23,17 +23,13 @@
         "@babel/core": "^7.21.0",
         "@babel/runtime": "^7.21.0",
         "@fui/babel-preset-fineui": "^3.0.1",
-        "@fui/eslint-plugin": "^1.1.0",
         "@types/node": "^18.15.11",
-        "@typescript-eslint/eslint-plugin": "^5.60.0",
-        "@typescript-eslint/parser": "^5.60.0",
         "autoprefixer": "^10.4.14",
         "babel-loader": "^9.1.2",
         "babel-plugin-module-resolver": "^5.0.0",
         "circular-dependency-plugin": "^5.2.2",
         "css-loader": "^6.7.3",
         "css-minimizer-webpack-plugin": "^5.0.0",
-        "eslint": "^8.43.0",
         "fork-ts-checker-webpack-plugin": "^8.0.0",
         "glob": "^9.3.4",
         "html-webpack-plugin": "^5.5.0",
@@ -43,15 +39,14 @@
         "npm-run-all": "^4.1.5",
         "postcss": "^8.4.21",
         "postcss-loader": "^7.1.0",
-        "prettier": "^3.0.0",
         "style-loader": "^3.3.1",
         "terser-webpack-plugin": "^5.3.7",
         "ts-node": "^10.9.1",
         "typescript": "^4.9.5",
         "webpack": "^5.75.0",
         "webpack-bundle-analyzer": "^4.8.0",
-        "webpack-cli": "^5.1.4",
-        "webpack-dev-server": "^4.15.1",
-        "webpack-merge": "^5.9.0"
+        "webpack-cli": "^5.0.1",
+        "webpack-dev-server": "^4.11.1",
+        "webpack-merge": "^5.8.0"
     }
 }

packages/fineui/lessconfig/bi.lessconfig.json

@@ -23,12 +23,12 @@
   "@color-bi-border-disabled-radio": "rgba(9, 30, 64, 0.19)",
   "@color-bi-background-active-radio-content": "#2C60DB",
   "@color-bi-border-checkbox-theme-dark": "rgba(255, 255, 255, 0.37)",
-  "@color-bi-border-hover-active-radio-theme-dark": "#497FFD",
-  "@color-bi-background-active-radio-content-theme-dark": "#497FFD",
+  "@color-bi-border-hover-active-radio-theme-dark": "#3869DC",
+  "@color-bi-background-active-radio-content-theme-dark": "#3869DC",
   "@color-bi-background-disabled-active-radio-content": "#FFFFFF",
   "@color-bi-background-disabled-active-radio-content-theme-dark": "#606479",
   "@color-bi-background-disabled-active-checkbox-content": "#FFFFFF",
-  "@color-bi-background-disabled-active-checkbox-content-theme-dark": "rgba(255, 255, 255, 0.24)",
+  "@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479",
   "@color-bi-background-tooltip-success": "#3F506A",
   "@color-bi-background-tooltip-failure": "#E65251",
   "@color-bi-border-tooltip-success": "#2E3A4D",
@@ -48,17 +48,5 @@
   "@font-solid-bottom": "e905",
   "@font-solid-right": "e906",
   "@font-dot": "e762",
-  "@font-down-triangle": "e70b",
-  "@color-bi-background-theme-dark": "#1B1F31",
-  "@border-color-light-line-theme-dark": "#30364B",
-  "@color-bi-background-header-background": "#F8F9FC",
-  "@color-bi-background-header-background-theme-dark": "#1B1F31",
-  "@color-bi-background-common-light-button": "#E5EFFF",
-  "@color-bi-background-common-light-button-theme-dark": "#0F2A62",
-  "@color-bi-text-highlight-theme-dark": "#497FFD",
-  "@color-bi-border-active-chooser-show-button-theme-dark": "#497FFD",
-  "@color-bi-background-button-theme-dark": "#497FFD",
-  "@color-bi-background-active-switch-theme-dark": "#497FFD",
-  "@color-bi-text-common-light-button-theme-dark": "#497FFD",
-  "@color-bi-text-common-light-button": "#2c60db"
+  "@font-down-triangle": "e70b"
 }

packages/fineui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fui/core",
-  "version": "3.0.20231204103846",
+  "version": "3.0.20230615140705",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "module": "dist/lib/index.js",
@@ -23,14 +23,11 @@
     "dev:fineui": "webpack-dev-server --progress --config=webpack/webpack.dev.js",
     "build": "tsc && run-p build:*",
     "build:es": "babel src -d dist/lib --config-file ./esm.babel.js",
-    "webpack:css": "webpack --progress --config=webpack/webpack.css.js --mode production",
     "build:fineui": "webpack --progress --config=webpack/webpack.prod.js",
     "prepublishToPrivate": "npm run build && node ./lib/prepublish.js",
     "publishToPrivate": "npm publish",
     "tsc": "tsc",
-    "link": "pnpm link --global",
-    "build:biCss": "cross-env LESS_CONFIG_PATH=bi.lessconfig.json LESS_FILE_NAME=bi npm run webpack:css",
-    "build:jsyCss": "cross-env LESS_CONFIG_PATH=jsy.lessconfig.json LESS_FILE_NAME=jsy npm run webpack:css"
+    "link": "pnpm link --global"
   },
   "files": [
     "dist",

packages/fineui/src/base/1.pane.js

@@ -158,10 +158,4 @@ export class Pane extends Widget {
         this.options.items = items || [];
         this.check();
     }
-
-    destroyed() {
-        super.destroyed?.();
-        Layers.remove(`${this.getName()}-loading`);
-        this._loading?.destroy();
-    }
 }

packages/fineui/src/base/collection/collection.js

@@ -125,12 +125,6 @@ export class CollectionView extends Widget {
         }
     }
 
-    destroyed() {
-        each(this.renderedCells, (i, cell) => {
-            cell.el._destroy();
-        });
-    }
-
     _calculateSizeAndPositionData() {
         const { items, cellSizeAndPositionGetter } = this.options;
         const cellMetadata = [];

packages/fineui/src/base/combination/bubble.js

@@ -72,7 +72,6 @@ export class Bubble extends Widget {
             popup: {},
             comboClass: "bi-combo-popup",
             hoverClass: "bi-combo-hover",
-            extraModifiers: []
         });
     }
 
@@ -411,16 +410,7 @@ export class Bubble extends Widget {
     }
 
     _popupView(e) {
-        const {
-            adjustXOffset,
-            showArrow,
-            adjustYOffset,
-            adjustLength,
-            placement,
-            hideWhenClickOutside,
-            hideWhenBlur,
-            extraModifiers
-        } =
+        const { adjustXOffset, showArrow, adjustYOffset, adjustLength, placement, hideWhenClickOutside, hideWhenBlur } =
             this.options;
         this._assertPopupViewRender();
         this.fireEvent(Bubble.EVENT_BEFORE_POPUPVIEW);
@@ -439,7 +429,6 @@ export class Bubble extends Widget {
                     offset: () => [adjustXOffset, (showArrow ? 12 : 0) + (adjustYOffset + adjustLength)],
                 },
             },
-            ...extraModifiers
         ];
         if (this.options.showArrow) {
             modifiers.push({
@@ -531,7 +520,6 @@ export class Bubble extends Widget {
         this.combo.setValue(v);
         if (isNull(this.popupView)) {
             this.options.popup.value = v;
-            !isNull(this.options.popup.el) && (this.options.popup.el.value = v);
         } else {
             this.popupView.setValue(v);
         }

packages/fineui/src/base/combination/expander.js

@@ -276,7 +276,7 @@ export class Expander extends Widget {
     }
 
     _setEnable(arg) {
-        super._setEnable(...arguments);
+        super._setEnable(arguments);
         !arg && this.element.removeClass(this.options.hoverClass);
         !arg && this.isViewVisible() && this._hideView();
     }
@@ -341,6 +341,6 @@ export class Expander extends Widget {
     }
 
     destroy() {
-        super.destroy(...arguments);
+        super.destroy(arguments);
     }
 }

packages/fineui/src/base/combination/group.button.js

@@ -418,12 +418,12 @@ export class ButtonGroup extends Widget {
     }
 
     empty() {
-        super.empty(...arguments);
+        super.empty(arguments);
         this.options.items = [];
     }
 
     destroy() {
-        super.destroy(...arguments);
+        super.destroy(arguments);
         this.options.items = [];
     }
 }

packages/fineui/src/base/combination/group.virtual.js

@@ -56,7 +56,7 @@ export class VirtualGroup extends Widget {
 
     _packageBtns(items) {
         const o = this.options;
-        const btMap = (this.buttonMap = {});
+        const map = (this.buttonMap = {});
         const layouts = isArray(o.layouts) ? o.layouts : [o.layouts];
         for (let i = layouts.length - 1; i > 0; i--) {
             items = map(items, (k, it) => {
@@ -68,8 +68,8 @@ export class VirtualGroup extends Widget {
                             el: extend(
                                 {
                                     ref: _ref => {
-                                        if (isKey(el.value)) {
-                                            btMap[el.value] = _ref;
+                                        if (isKey(map[el.value])) {
+                                            map[el.value] = _ref;
                                         }
                                     },
                                 },

packages/fineui/src/base/combination/loader.js

@@ -181,7 +181,7 @@ export class Loader extends Widget {
             isEmpty(optionsItems) &&
             nextTick(
                 bind(() => {
-                    isDefaultInit && isEmpty(this.options.items) && this._populate();
+                    isDefaultInit && isEmpty(optionsItems) && this._populate();
                 }, this)
             );
         const items = isFunction(optionsItems)
@@ -204,7 +204,7 @@ export class Loader extends Widget {
             {
                 times: this.times,
                 count: this.count,
-            }, this.options
+            }
         ]);
     }
 
@@ -218,7 +218,7 @@ export class Loader extends Widget {
             {
                 times: this.times,
                 count: this.count,
-            }, this.options
+            }
         ]);
     }
 
@@ -342,6 +342,6 @@ export class Loader extends Widget {
     }
 
     destroy() {
-        super.destroy(...arguments);
+        super.destroy(arguments);
     }
 }

packages/fineui/src/base/combination/navigation.js

@@ -191,6 +191,6 @@ export class Navigation extends Widget {
     }
 
     destroy() {
-        super.destroy(...arguments);
+        super.destroy(arguments);
     }
 }

packages/fineui/src/base/combination/searcher.js

@@ -134,7 +134,7 @@ export class Searcher extends Widget {
             this.popupView = createWidget(popup, {
                 type: SearcherView.xtype,
                 chooseType,
-            }, this);
+            });
             this.popupView.on(Controller.EVENT_CHANGE, (type, value, obj, ...args) => {
                 this.fireEvent(Controller.EVENT_CHANGE, type, value, obj, ...args);
                 if (type === Events.CLICK) {

packages/fineui/src/base/combination/switcher.js

@@ -263,7 +263,7 @@ export class Switcher extends Widget {
     }
 
     _setEnable(arg) {
-        super._setEnable(...arguments);
+        super._setEnable(arguments);
         !arg && this.isViewVisible() && this._hideView();
     }
 

packages/fineui/src/base/combination/tab.js

@@ -158,10 +158,6 @@ export class Tab extends Widget {
         return this.layout.isCardExisted(cardName);
     }
 
-    getAllCardIds() {
-        return Object.keys(this.cardMap);
-    }
-
     getSelect() {
         return this.curr;
     }
@@ -204,6 +200,6 @@ export class Tab extends Widget {
 
     destroy() {
         this.cardMap = {};
-        super.destroy(...arguments);
+        super.destroy(arguments);
     }
 }

packages/fineui/src/base/foundation/message.js

@@ -3,62 +3,25 @@
  * 弹出提示消息框，用于模拟阻塞操作（通过回调函数实现）
  * @class Msg
  */
-import {
-    Widget,
-    isString,
-    isNull,
-    isFunction,
-    createWidget,
-    remove,
-    each,
-    emptyFn,
-    delay,
-    zIndex_tip,
-    i18nText,
-    KeyCode,
-    isPlainObject,
-    SIZE_CONSANTS,
-    CenterAdaptLayout,
-    VerticalLayout,
-    HTapeLayout,
-    RightVerticalAdaptLayout
-} from "../../core";
-import { Button, IconLabel, Label, Toast } from "../single";
+import { Widget, isString, isNull, isFunction, createWidget, remove, each, emptyFn, delay, zIndex_tip, i18nText, KeyCode, isPlainObject, SIZE_CONSANTS } from "../../core";
+import { Toast } from "../single";
 
+export const Msg = (() => {
     let $mask, $pop;
 
     const messageShows = [];
 
     const toastStack = [];
 
-const AlertLevel = {
-    WARNING: 'warning',
-    INFO: 'info',
-    ERROR: 'error',
-    SUCCESS: 'success',
-}
-
-function getIconCls(level) {
-    switch (level) {
-        case AlertLevel.ERROR:
-            return 'alert-error-font';
-        case AlertLevel.SUCCESS:
-            return 'alert-success-font';
-        case AlertLevel.INFO:
-            return 'alert-info-font';
-        case AlertLevel.WARNING:
-        default:
-            return 'alert-warning-font';
-    }
-}
-
-
-export const Msg = {
-    alert(title, message, callback, config) {
-        _show(false, title, message, callback, config);
+    return {
+        alert (title, message, callback) {
+            this._show(false, title, message, callback);
         },
-    confirm(title, message, callback, config) {
-        _show(true, title, message, callback, config);
+        confirm (title, message, callback) {
+            this._show(true, title, message, callback);
+        },
+        prompt (title, message, value, callback, min_width) {
+            // Msg.prompt(title, message, value, callback, min_width);
         },
         toast (message, options, context) {
             isString(options) && (options = { level: options });
@@ -119,16 +82,7 @@ export const Msg = {
                 toast.destroy?.();
             };
         },
-};
-
-function _show(hasCancel, title, message, callback, config = {}) {
-    config = {
-        buttonHeight: 28,
-        cancelText: i18nText("BI-Basic_Cancel"),
-        sureText: i18nText("BI-Basic_OK"),
-        level: AlertLevel.WARNING,
-        ...config,
-    }
+        _show (hasCancel, title, message, callback) {
             isNull($mask) &&
                 ($mask = Widget._renderEngine
                     .createElement("<div class=\"bi-z-index-mask\">")
@@ -153,7 +107,6 @@ function _show(hasCancel, title, message, callback, config = {}) {
                     bottom: 0,
                 })
                 .appendTo("body");
-
             function close() {
                 messageShows[messageShows.length - 1].destroy();
                 messageShows.pop();
@@ -162,14 +115,12 @@ function _show(hasCancel, title, message, callback, config = {}) {
                     $mask = null;
                 }
             }
-
             const controlItems = [];
             if (hasCancel === true) {
                 controlItems.push({
                     el: {
-                type: Button.xtype,
-                height: config.buttonHeight,
-                text: config.cancelText,
+                        type: "bi.button",
+                        text: i18nText("BI-Basic_Cancel"),
                         light: true,
                         handler () {
                             close();
@@ -182,9 +133,8 @@ function _show(hasCancel, title, message, callback, config = {}) {
             }
             controlItems.push({
                 el: {
-            type: Button.xtype,
-            height: config.buttonHeight,
-            text: config.sureText,
+                    type: "bi.button",
+                    text: i18nText("BI-Basic_OK"),
                     handler () {
                         close();
                         if (isFunction(callback)) {
@@ -195,16 +145,10 @@ function _show(hasCancel, title, message, callback, config = {}) {
             });
             const conf = {
                 element: $pop,
-        type: CenterAdaptLayout.xtype,
+                type: "bi.center_adapt",
                 items: [
                     {
-                type: VerticalLayout.xtype,
-                cls: "bi-card bi-border-radius",
-                width: 450,
-                css: {
-                    'max-height': '100%'
-                },
-                hgap: 32,
+                        type: "bi.border",
                         attributes: {
                             tabIndex: 1,
                         },
@@ -226,64 +170,81 @@ function _show(hasCancel, title, message, callback, config = {}) {
                             });
                             try {
                                 this.element.focus();
-                    } catch (e) {
-                    }
+                            } catch (e) {}
                         },
-                items: [
-                    {
+                        cls: "bi-card",
+                        items: {
+                            north: {
                                 el: {
-                            type: HTapeLayout.xtype,
-                            height: 24,
-                            items: [
-                                {
-                                    type: IconLabel.xtype,
-                                    cls: `${getIconCls(config.level)} icon-size-20`,
-                                    width: 24,
-                                    height: 24,
+                                    type: "bi.border",
+                                    cls: "bi-message-title bi-background",
+                                    items: {
+                                        center: {
+                                            el: {
+                                                type: "bi.label",
+                                                cls: "bi-font-bold",
+                                                text: title || i18nText("BI-Basic_Prompt"),
+                                                textAlign: "left",
+                                                hgap: 20,
+                                                height: 40,
                                             },
-                                {
+                                        },
+                                        east: {
                                             el: {
-                                        type: Label.xtype,
-                                        css: {"font-size": 16},
-                                        cls: 'bi-font-bold', // 16px
-                                        textAlign: 'left',
-                                        text: title || i18nText('BI-Basic_Prompt'),
-                                        lgap: 16,
+                                                type: "bi.icon_button",
+                                                cls: "bi-message-close close-font",
+                                                //                                                    height: 50,
+                                                handler () {
+                                                    close();
+                                                    if (isFunction(callback)) {
+                                                        callback.apply(null, [false]);
+                                                    }
                                                 },
-                                    width: 'fill',
                                             },
-                            ],
+                                            width: 56,
                                         },
-                        tgap: 32,
                                     },
-                    {
+                                },
+                                height: 40,
+                            },
+                            center: {
                                 el: isPlainObject(message)
                                     ? message
                                     : {
-                                type: Label.xtype,
-                                css: { "font-size": 14 },
-                                cls: 'alert-content',
-                                textAlign: 'left',
+                                        type: "bi.label",
+                                        vgap: 10,
+                                        hgap: 20,
+                                        whiteSpace: "normal",
                                         text: message,
-                                whiteSpace: 'normal',
                                     },
-                        height: 'fill',
-                        tgap: 12,
-                        lgap: 40,
                             },
+                            south: {
+                                el: {
+                                    type: "bi.absolute",
+                                    items: [
                                         {
-                        el: config.footer && isFunction(config.footer) ? config.footer(close) : {
-                            type: RightVerticalAdaptLayout.xtype,
-                            lgap: 12,
+                                            el: {
+                                                type: "bi.right_vertical_adapt",
+                                                lgap: 10,
                                                 items: controlItems,
                                             },
-                        tgap: 32,
-                        bgap: 24,
-                    },
+                                            top: 0,
+                                            left: 20,
+                                            right: 20,
+                                            bottom: 0,
+                                        }
                                     ],
                                 },
+                                height: 44,
+                            },
+                        },
+                        width: 450,
+                        height: 200,
+                    }
                 ],
             };
 
             messageShows[messageShows.length] = createWidget(conf);
-}
+        },
+    };
+})();

packages/fineui/src/base/index.js

@@ -11,4 +11,3 @@ export * from "./layer";
 export * from "./list";
 export * from "./single";
 export * from "./el";
-export * from "./context";

packages/fineui/src/base/layer/layer.popover.js

@@ -16,7 +16,6 @@ import {
 } from "@/core";
 import { Label, IconButton, Button } from "../single";
 import { Resizers } from "../0.base";
-import { getOuterBody } from "@/core/utils/dom";
 
 /**
  * Popover弹出层，
@@ -47,7 +46,6 @@ export class Popover extends Widget {
             body: null,
             footer: null,
             footerHeight: 44,
-            footerButtonHeight: 28,
             closable: true, // BI-40839 是否显示右上角的关闭按钮
             bodyHgap: SIZE_CONSANTS.H_GAP_SIZE,
             bodyTgap: SIZE_CONSANTS.V_GAP_SIZE,
@@ -64,7 +62,29 @@ export class Popover extends Widget {
         // var self = this;
         const { header, headerHeight, closable, logic, footer, footerHeight, body, bodyTgap, bodyHgap } = this.options;
         const c = this._constant;
+        this.startX = 0;
+        this.startY = 0;
         const size = this._calculateSize();
+        this.tracker = new MouseMoveTracker(
+            (deltaX, deltaY) => {
+                const W = Widget._renderEngine.createElement("body").width();
+                const H = Widget._renderEngine.createElement("body").height();
+                this.startX += deltaX;
+                this.startY += deltaY;
+                this.element.css({
+                    left: `${clamp(this.startX, 0, W - this.element.width())}px`,
+                    top: `${clamp(this.startY, 0, H - this.element.height())}px`,
+                });
+                // BI-12134 没有什么特别好的方法
+                Resizers._resize({
+                    target: this.element[0],
+                });
+            },
+            () => {
+                this.tracker.releaseMouseMoves();
+            },
+            _global
+        );
         const items = [
             {
                 el: {
@@ -193,33 +213,9 @@ export class Popover extends Widget {
                 }
         );
     }
-
     // mounted之后绑定事件
     mounted() {
-        this.startX = 0;
-        this.startY = 0;
-        this.tracker = new MouseMoveTracker(
-            (deltaX, deltaY) => {
-                const el = Widget._renderEngine.createElement(getOuterBody())[0];
-                const W = el.clientWidth;
-                const H = el.clientHeight;
-                this.startX += deltaX;
-                this.startY += deltaY;
-                this.element.css({
-                    left: `${clamp(this.startX, 0, W - this.element.width())}px`,
-                    top: `${clamp(this.startY, 0, H - this.element.height())}px`,
-                });
-                // BI-12134 没有什么特别好的方法
-                Resizers._resize({
-                    target: this.element[0],
-                });
-            },
-            () => {
-                this.tracker.releaseMouseMoves();
-            },
-            _global
-        );
-        this.dragger?.element.mousedown(e => {
+        this.dragger.element.mousedown(e => {
             if (this.options.draggable !== false) {
                 this.startX = this.element[0].offsetLeft;
                 this.startY = this.element[0].offsetTop;
@@ -230,11 +226,11 @@ export class Popover extends Widget {
 
     _getSuitableBodyHeight(height) {
         const { headerHeight, footer, footerHeight, bodyTgap } = this.options;
-        const bodyDom = getOuterBody();
+
         return clamp(
             height,
             0,
-            Widget._renderEngine.createElement(bodyDom)[0].clientHeight -
+            Widget._renderEngine.createElement("body")[0].clientHeight -
                 headerHeight -
                 (footer ? footerHeight : 0) -
                 bodyTgap
@@ -242,11 +238,11 @@ export class Popover extends Widget {
     }
 
     _getSuitableHeight(height) {
-        return clamp(height, 0, Widget._renderEngine.createElement(getOuterBody())[0].clientHeight);
+        return clamp(height, 0, Widget._renderEngine.createElement("body")[0].clientHeight);
     }
 
     _getSuitableWidth(width) {
-        return clamp(width, 0, Widget._renderEngine.createElement(getOuterBody())[0].clientWidth);
+        return clamp(width, 0, Widget._renderEngine.createElement("body").width());
     }
 
     _calculateSize() {
@@ -277,13 +273,11 @@ export class Popover extends Widget {
             type: sizeValue.type || "default",
         };
     }
-
     setDraggable(b) {
         this.options.draggable = b;
     }
 
-    hide() {
-    }
+    hide() {}
 
     open() {
         this.show();
@@ -311,7 +305,7 @@ export class BarPopover extends Popover {
     }
 
     beforeCreate() {
-        const { footer, warningTitle, footerButtonHeight } = this.options;
+        const { footer, warningTitle } = this.options;
         footer ||
             (this.options.footer = {
                 type: RightVerticalAdaptLayout.xtype,
@@ -319,10 +313,9 @@ export class BarPopover extends Popover {
                 items: [
                     {
                         type: Button.xtype,
-                    height: footerButtonHeight,
                         text: this.options.btns[1],
                         value: 1,
-                    light: true,
+                        level: "ignore",
                         handler: v => {
                             this.fireEvent(Popover.EVENT_CANCEL, v);
                             this.close(v);
@@ -330,7 +323,6 @@ export class BarPopover extends Popover {
                     },
                     {
                         type: Button.xtype,
-                    height: footerButtonHeight,
                         text: this.options.btns[0],
                         warningTitle,
                         value: 0,

packages/fineui/src/base/list/listview.js

@@ -111,6 +111,11 @@ export class ListView extends Widget {
         }
     }
     _calculateBlocksToRender() {
+        // BI-115750 不可见状态下依赖元素实际尺寸构造的线段树会分段错误，所以不进行后续计算和线段树的初始化。
+        // 这样从不可见状态变为可见状态能够重新触发线段树初始化
+        if (!this.element.is(":visible")) {
+            return;
+        }
         this._renderMoreIf();
     }
 

packages/fineui/src/base/list/virtualgrouplist.js

@@ -1,4 +1,4 @@
-import { VerticalLayout, Layout, Widget, shortcut, extend, isFunction, isNumber, sum, PrefixIntervalTree, ResizeDetector } from "@/core";
+import { VerticalLayout, Layout, Widget, shortcut, extend, isFunction, isNumber, PrefixIntervalTree, ResizeDetector } from "@/core";
 import { VirtualGroup } from "../combination";
 
 /**
@@ -17,7 +17,7 @@ export class VirtualGroupList extends Widget {
             overscanHeight: 100,
             blockSize: 10,
             scrollTop: 0,
-            rowHeight: "auto", // 'auto' 或 数值 或function
+            rowHeight: "auto",
             items: [],
             el: {},
             itemFormatter: (item, index) => item,
@@ -25,7 +25,6 @@ export class VirtualGroupList extends Widget {
     }
 
     init() {
-        this._calculateSummaryHeight();
         this.renderedIndex = -1;
     }
 
@@ -45,7 +44,7 @@ export class VirtualGroupList extends Widget {
                 },
                 {
                     type: VirtualGroup.xtype,
-                    height: this.summaryHeight,
+                    height: rowHeight * items.length,
                     ref: (ref) => {
                         this.container = ref;
                     },
@@ -98,7 +97,7 @@ export class VirtualGroupList extends Widget {
     }
 
     _isAutoHeight() {
-        return this.options.rowHeight === 'auto';
+        return !isNumber(this.options.rowHeight);
     }
 
     _renderMoreIf() {
@@ -164,22 +163,12 @@ export class VirtualGroupList extends Widget {
                     itemsArr.push(items[j]);
                 }
             }
-            this.container.element.height(this.summaryHeight - topHeight);
+            this.container.element.height(rowHeight * items.length - topHeight);
             this.container.populate(
                 itemsArr.map((item, i) => itemFormatter(item, (start < 0 ? 0 : start) * blockSize + i))
             );
         }
     }
-
-    _calculateSummaryHeight() {
-        const o = this.options;
-        if (isFunction(o.rowHeight)) {
-            this.summaryHeight = sum(o.items, o.rowHeight);
-        } else {
-            this.summaryHeight = this._isAutoHeight() ? 0 : o.rowHeight * o.items.length;
-        }
-    }
-
     _populate(items) {
         const { blockSize, rowHeight, scrollTop } = this.options;
         if (items && this.options.items !== items) {
@@ -191,16 +180,6 @@ export class VirtualGroupList extends Widget {
             Math.ceil(this.options.items.length / blockSize),
             this._isAutoHeight() ? 0 : rowHeight * blockSize
         );
-        if (isFunction(rowHeight)) {
-            for (let i = 0; i < this.options.items.length / blockSize; i++) {
-                const index = i * blockSize;
-                let summaryHeight = 0;
-                for (let j = index; j < index + blockSize && j < this.options.items.length; j++) {
-                    summaryHeight += rowHeight(j, this.options.items[j]);
-                }
-                this.tree.set(i, summaryHeight);
-            }
-        }
 
         this._calculateBlocksToRender();
         try {
@@ -210,7 +189,6 @@ export class VirtualGroupList extends Widget {
 
     _restore() {
         this.renderedIndex = -1;
-        this._calculateSummaryHeight();
         // 依赖于cache的占位元素也要初始化
         this.topBlank.setHeight(0);
         this.bottomBlank.setHeight(0);
@@ -236,8 +214,4 @@ export class VirtualGroupList extends Widget {
         ResizeDetector.removeResizeListener(this);
         this.restore();
     }
-
-    getNodeByValue(value) {
-        return this.container.getNodeByValue(value);
-    }
 }

packages/fineui/src/base/single/0.single.js

@@ -72,7 +72,7 @@ export class Single extends Widget {
                 this.setValue(newValue);
             })
             : value;
-        super._init(...arguments);
+        super._init(arguments);
     }
 
     _mounted() {

packages/fineui/src/base/single/button/button.basic.js

@@ -69,7 +69,7 @@ export class BasicButton extends Single {
                 this.setSelected(newValue);
             })
             : opts.selected;
-        super._init(...arguments);
+        super._init(arguments);
 
         if (opts.shadow) {
             this._createShadow();
@@ -193,7 +193,6 @@ export class BasicButton extends Single {
                                     trigger: "",
                                     // bubble的提示不需要一直存在在界面上
                                     destroyWhenHide: true,
-                                    hideWhenAnotherComboOpen: true,
                                     ref: _ref => {
                                         this.combo = _ref;
                                     },

packages/fineui/src/base/single/button/listitem/icontextitem.js

@@ -59,7 +59,6 @@ export class IconTextItem extends BasicButton {
                         lgap: o.textLgap,
                         rgap: o.textRgap,
                         text: o.text,
-                        title: o.title,
                         value: o.value,
                         keyword: o.keyword,
                         height: o.height,

packages/fineui/src/base/single/editor/editor.textarea.js

@@ -279,7 +279,7 @@ export class TextAreaEditor extends Single {
     }
 
     _setValid(b) {
-        super._setValid(...arguments);
+        super._setValid(arguments);
         // this.content.setValid(b);
         // this.watermark && this.watermark.setValid(b);
     }

packages/fineui/src/base/single/input/checkbox/checkbox.js

@@ -52,7 +52,7 @@ export class Checkbox extends BasicButton {
     }
 
     doClick() {
-        super.doClick(...arguments);
+        super.doClick(arguments);
         if (this.isValid()) {
             this.fireEvent(Checkbox.EVENT_CHANGE);
         }

packages/fineui/src/base/single/input/file.js

@@ -242,11 +242,14 @@ const sendFile = (toString => {
                     upload.onloadstart();
                 }
             }
-            if (handler.file.getAsBinary) {
             const boundary = `AjaxUploadBoundary${new Date().getTime()}`;
             xhr.setRequestHeader("Content-Type", `multipart/form-data; boundary=${boundary}`);
+            if (handler.file.getAsBinary) {
                 xhr[xhr.sendAsBinary ? "sendAsBinary" : "send"](multipart(boundary, handler.name, handler.file));
             } else {
+                xhr.setRequestHeader("Content-Type", "multipart/form-data");
+                //                    xhr.setRequestHeader("X-Name", handler.name);
+                //                    xhr.setRequestHeader("X-File-Name", handler.file.fileName);
                 const form = new FormData();
                 form.append("FileData", handler.file);
                 xhr.send(form);
@@ -538,7 +541,7 @@ export class File extends Widget {
                 // We can still show some information
             }
             this.fireEvent(File.EVENT_PROGRESS, {
-                file: _wrap.file,
+                file: this.file,
                 total: rpe.total,
                 loaded: rpe.loaded,
                 simulation: rpe.simulation,
@@ -756,7 +759,7 @@ export class File extends Widget {
     }
 
     _setEnable(enable) {
-        super._setEnable(...arguments);
+        super._setEnable(arguments);
         if (enable === true) {
             this.element.removeAttr("disabled");
         } else {

packages/fineui/src/base/single/input/input.js

@@ -144,7 +144,7 @@ export class Input extends Single {
     _blur() {
         const blur = () => {
             if (!this.isValid() && this.options.quitChecker.apply(this, [trim(this.getValue())]) !== false) {
-                this.element.val(this._lastValidValue ?? this.options.value ?? "");
+                this.element.val(this._lastValidValue ? this._lastValidValue : "");
                 this._checkValidationOnValueChange();
                 this._defaultState();
             }
@@ -344,7 +344,7 @@ export class Input extends Single {
     }
 
     _setValid() {
-        super._setValid(...arguments);
+        super._setValid(arguments);
         if (this.isValid()) {
             this._lastChangedValue = this.getValue();
             this.element.removeClass("bi-input-error");

packages/fineui/src/base/single/input/radio/radio.image.js

@@ -28,7 +28,7 @@ export class ImageRadio extends IconButton {
     }
 
     doClick() {
-        super.doClick(...arguments);
+        super.doClick(arguments);
         if (this.isValid()) {
             this.fireEvent(ImageRadio.EVENT_CHANGE);
         }

packages/fineui/src/base/single/input/radio/radio.js

@@ -51,7 +51,7 @@ export class Radio extends BasicButton {
     }
 
     doClick() {
-        super.doClick(...arguments);
+        super.doClick(arguments);
         if (this.isValid()) {
             this.fireEvent(Radio.EVENT_CHANGE);
         }

packages/fineui/src/base/tree/customtree.js

@@ -16,8 +16,7 @@ import {
     isNull,
     createWidget,
     Controller,
-    Events,
-    omit,
+    Events
 } from "@/core";
 
 /**
@@ -105,8 +104,7 @@ export class CustomTree extends Widget {
 
                     return itemsCreator.apply(this, args);
                 };
-                isNull(item.popup.el) && (item.popup.el = deepClone(omit(this.options.el, "node")));
-                item.popup.el.node = item.el;
+                isNull(item.popup.el) && (item.popup.el = deepClone(this.options.el));
                 items.push(item);
             } else {
                 items.push(node);
@@ -124,8 +122,9 @@ export class CustomTree extends Widget {
             itemsCreator: (op, callback) => {
                 itemsCreator.apply(this, [
                     op,
-                    (...args) => {
-                        args[0] = this._formatItems(args[0]);
+                    items => {
+                        const args = Array.prototype.slice.call(arguments, 0);
+                        args[0] = this._formatItems(items);
                         callback(...args);
                     }
                 ]);

packages/fineui/src/bundle.js

@@ -5,15 +5,12 @@ import {_defineVarProperties} from "@/core/constant/writable.var";
 
 _global.BI = _global.BI || {};
 
-// for fr, 已经有的就不对外暴露了.
-// 要知道BI只有`BI.$`, 挂在全局对象上的只是为了兼容而已
-if (!_global.$ && !_global.jQuery) {
-    _global.jQuery = _global.$ = fuiExport.$;
-}
 
 Object.assign(_global, {
     Fix: fuiExport.Fix,
     _: fuiExport._,
+    $: fuiExport.$,
+    jQuery: fuiExport.$,
 });
 
 Object.assign(_global.BI, fuiExport, injectFn);

packages/fineui/src/case/button/item.multiselect.js

@@ -19,7 +19,6 @@ export class MultiSelectItem extends BasicButton {
             },
             height: SIZE_CONSANTS.LIST_ITEM_HEIGHT,
             iconWrapperWidth: 26,
-            el: {},
         });
     }
 
@@ -56,7 +55,6 @@ export class MultiSelectItem extends BasicButton {
                         keyword: o.keyword,
                         value: o.value,
                         py: o.py,
-                        ...o.el
                     },
                 }
             ],

packages/fineui/src/case/button/switch.js

@@ -1,13 +1,15 @@
 import { AbsoluteLayout, shortcut, i18nText } from "@/core";
 import { TextButton, Label, BasicButton } from "@/base";
 
-const CIRCLE_SIZE = 12;
-
 @shortcut()
 export class Switch extends BasicButton {
     static xtype = "bi.switch";
     static EVENT_CHANGE = "EVENT_CHANGE";
 
+    constants = {
+        CIRCLE_SIZE: 12,
+    };
+
     props = {
         extraCls: "bi-switch",
         attributes: {
@@ -16,12 +18,12 @@ export class Switch extends BasicButton {
         height: 20,
         width: 44,
         showTip: false,
-        textGap: 8,
     };
 
     render() {
-        const { selected, width, height, textGap, showTip } = this.options;
-        const tgap = (height - CIRCLE_SIZE) / 2;
+        const o = this.options,
+            c = this.constants;
+        const tgap = (o.height - c.CIRCLE_SIZE) / 2;
 
         return {
             type: AbsoluteLayout.xtype,
@@ -37,15 +39,15 @@ export class Switch extends BasicButton {
                     width: 12,
                     height: 12,
                     top: tgap,
-                    left: selected ? width - height + tgap : tgap,
+                    left: o.selected ? 28 : 4,
                 },
                 {
                     type: Label.xtype,
                     text: i18nText("BI-Basic_Simple_Open"),
                     cls: "content-tip",
-                    left: textGap,
+                    left: 8,
                     top: tgap - 2,
-                    invisible: !(showTip && selected),
+                    invisible: !(o.showTip && o.selected),
                     ref: _ref => {
                         this.openTip = _ref;
                     },
@@ -54,9 +56,9 @@ export class Switch extends BasicButton {
                     type: Label.xtype,
                     text: i18nText("BI-Basic_Simple_Close"),
                     cls: "content-tip",
-                    right: textGap,
+                    right: 8,
                     top: tgap - 2,
-                    invisible: !(showTip && !selected),
+                    invisible: !(o.showTip && !o.selected),
                     ref: _ref => {
                         this.closeTip = _ref;
                     },
@@ -76,9 +78,7 @@ export class Switch extends BasicButton {
 
     setSelected(v) {
         super.setSelected(...arguments);
-        const { width, height } = this.options;
-        const tgap = (height - CIRCLE_SIZE) / 2;
-        this.layout.attr("items")[0].left = v ? width - height + tgap : tgap;
+        this.layout.attr("items")[0].left = v ? 28 : 4;
         this.layout.resize();
         this.options.showTip && this.openTip.setVisible(v);
         this.options.showTip && this.closeTip.setVisible(!v);

packages/fineui/src/case/button/treeitem/item.icon.treeleaf.js

@@ -1,9 +1,6 @@
 import { CenterAdaptLayout, shortcut, extend, createWidget, LogicFactory, Direction } from "@/core";
 import { Icon, Label, BasicButton } from "@/base";
 
-/**
- * @deprecated
- */
 @shortcut()
 export class IconTreeLeafItem extends BasicButton {
     static xtype = "bi.icon_tree_leaf_item";

packages/fineui/src/case/button/treeitem/item.multilayer.icon.treeleaf.js

@@ -1,14 +1,9 @@
-import {
-    shortcut,
-    extend,
-} from "@/core";
-import { BasicTreeItem } from "./treeitem";
-
-/**
- * @deprecated
- */
+import { IconTreeLeafItem } from "./item.icon.treeleaf";
+import { Layout, HorizontalAdaptLayout, shortcut, extend, createWidget, Controller, makeArray, count, Events } from "@/core";
+import { BasicButton } from "@/base";
+
 @shortcut()
-export class MultiLayerIconTreeLeafItem extends BasicTreeItem {
+export class MultiLayerIconTreeLeafItem extends BasicButton {
     static xtype = "bi.multilayer_icon_tree_leaf_item";
 
     _defaultConfig() {
@@ -19,8 +14,89 @@ export class MultiLayerIconTreeLeafItem extends BasicTreeItem {
             iconCls: "",
             iconHeight: 16,
             iconWidth: 16,
-            showLine: false,
-            indentWidth: 0
         });
     }
+
+    _init() {
+        super._init(...arguments);
+        const o = this.options;
+        this.item = createWidget({
+            type: IconTreeLeafItem.xtype,
+            cls: "bi-list-item-none",
+            iconCls: o.iconCls,
+            id: o.id,
+            pId: o.pId,
+            isFront: true,
+            height: o.height,
+            hgap: o.hgap,
+            text: o.text,
+            value: o.value,
+            py: o.py,
+            keyword: o.keyword,
+            iconWidth: o.iconWidth,
+            iconHeight: o.iconHeight,
+        });
+        this.item.on(Controller.EVENT_CHANGE, (...args) => {
+            const [type] = args;
+            if (type === Events.CLICK) {
+                // 本身实现click功能
+                return;
+            }
+            this.fireEvent(Controller.EVENT_CHANGE, ...args);
+        });
+
+        const items = [];
+        count(0, o.layer, () => {
+            items.push({
+                type: Layout.xtype,
+                width: 15,
+                height: o.height,
+            });
+        });
+        items.push(this.item);
+        createWidget({
+            type: HorizontalAdaptLayout.xtype,
+            element: this,
+            columnSize: makeArray(o.layer, 15),
+            items,
+        });
+    }
+
+    doRedMark() {
+        this.item.doRedMark(...arguments);
+    }
+
+    unRedMark() {
+        this.item.unRedMark(...arguments);
+    }
+
+    doHighLight() {
+        this.item.doHighLight(...arguments);
+    }
+
+    unHighLight() {
+        this.item.unHighLight(...arguments);
+    }
+
+    getId() {
+        return this.options.id;
+    }
+
+    getPId() {
+        return this.options.pId;
+    }
+
+    doClick() {
+        super.doClick(...arguments);
+        this.item.setSelected(this.isSelected());
+    }
+
+    setSelected(v) {
+        super.setSelected(...arguments);
+        this.item.setSelected(v);
+    }
+
+    getValue() {
+        return this.options.value;
+    }
 }

packages/fineui/src/case/button/treeitem/treeitem.js

@@ -20,8 +20,6 @@ export class BasicTreeItem extends NodeButton {
             iconWidth: null,
             iconHeight: null,
             iconCls: "",
-            showLine: true,
-            indentWidth: null,
         });
     }
 
@@ -39,16 +37,14 @@ export class BasicTreeItem extends NodeButton {
             py,
             keyword,
             iconCls,
-            showLine,
-            indentWidth
         } = this.options;
 
         const indent = {
             el: {
                 type: Layout.xtype,
                 height,
-                width: indentWidth ?? height,
-                cls: showLine ? this.getLineCls() : "",
+                width: height,
+                cls: this.getLineCls(),
             },
             lgap: layer * SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2, //  偏移公式为每一层的偏移量为节点高度的一半
             width: "",

packages/fineui/src/case/colorchooser/colorchooser.js

@@ -24,7 +24,6 @@ export class ColorChooser extends Widget {
             height: 24,
             el: {},
             simple: false,
-            colorBoardHeight: 80,
         });
     }
 
@@ -63,8 +62,6 @@ export class ColorChooser extends Widget {
                     el: extend(
                         {
                             type: HexColorChooserPopup.xtype,
-                            colorItems: o.colorItems,
-                            colorBoardHeight: o.colorBoardHeight,
                             recommendColorsGetter: o.recommendColorsGetter,
                             ref: _ref => {
                                 this.colorPicker = _ref;

packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js

@@ -22,13 +22,7 @@ import { Label, Combo, TextItem } from "@/base";
 import { PopupPanel } from "../layer";
 import { CustomColorChooser } from "./colorchooser.custom";
 import { ColorChooserPopup } from "./colorchooser.popup";
-import {
-    ColorPickerEditor,
-    ColorPicker,
-    HexColorPicker,
-    SimpleHexColorPickerEditor,
-    HexColorPickerEditor
-} from "./colorpicker";
+import { ColorPickerEditor, ColorPicker, HexColorPicker } from "./colorpicker";
 
 /**
  * @author windy
@@ -47,7 +41,6 @@ export class HexColorChooserPopup extends Widget {
         width: 300,
         recommendColorsGetter: emptyFn, // 推荐色获取接口
         simple: false, // 简单模式, popup中没有自动和透明
-        colorBoardHeight: 80,
     };
 
     render() {
@@ -66,12 +59,10 @@ export class HexColorChooserPopup extends Widget {
                                 extend(
                                     {
                                         type: o.simple
-                                            ? SimpleHexColorPickerEditor.xtype
-                                            : HexColorPickerEditor.xtype,
+                                            ? "bi.simple_hex_color_picker_editor"
+                                            : "bi.hex_color_picker_editor",
                                         value: o.value,
                                         height: o.simple ? 36 : 70,
-                                        transparent: o.transparent,
-                                        auto: o.auto,
                                         listeners: [
                                             {
                                                 eventName: ColorPickerEditor.EVENT_CHANGE,
@@ -168,7 +159,6 @@ export class HexColorChooserPopup extends Widget {
                                                 type: HexColorPicker.xtype,
                                                 space: true,
                                                 value: o.value,
-                                                items: o.colorItems,
                                                 listeners: [
                                                     {
                                                         eventName: ColorPicker.EVENT_CHANGE,
@@ -189,7 +179,7 @@ export class HexColorChooserPopup extends Widget {
                                             bottom: 1,
                                         }
                                     ],
-                                    height: o.colorBoardHeight,
+                                    height: 80,
                                 }
                             ],
                         },

packages/fineui/src/case/colorchooser/colorchooser.trigger.long.js

@@ -27,7 +27,6 @@ export class LongColorChooserTrigger extends Trigger {
     }
 
     _init() {
-        const {height} = this.options;
         super._init(...arguments);
         this.colorContainer = createWidget({
             type: HTapeLayout.xtype,
@@ -52,7 +51,7 @@ export class LongColorChooserTrigger extends Trigger {
                         },
                         textAlign: "left",
                         hgap: 5,
-                        height: height - 4,
+                        height: 18,
                         text: i18nText("BI-Basic_Auto"),
                     },
                 }

packages/fineui/src/case/colorchooser/colorpicker/editor.colorpicker.hex.js

@@ -39,10 +39,8 @@ export class HexColorPickerEditor extends Widget {
     static EVENT_CHANGE = "EVENT_CHANGE";
 
     props = {
-        baseCls: "bi-color-picker-editor bi-hex-color-picker-editor",
+        baseCls: "bi-color-picker-editor",
         height: 30,
-        transparent: true,
-        auto: true,
     };
 
     render() {
@@ -97,13 +95,11 @@ export class HexColorPickerEditor extends Widget {
                                 height: 24,
                                 items: [
                                     {
-                                        el: {
                                         type: ColorChooserShowButton.xtype,
                                         cls: "trans-color-icon",
                                         height: 22,
                                         title: i18nText("BI-Transparent_Color"),
                                         text: i18nText("BI-Transparent_Color"),
-                                            invisible: !this.options.transparent,
                                         listeners: [
                                             {
                                                 eventName: ColorChooserShowButton.EVENT_CHANGE,
@@ -117,8 +113,6 @@ export class HexColorPickerEditor extends Widget {
                                             this.transparent = _ref;
                                         },
                                     },
-                                        rgap: this.options.auto ? 5 : 0,
-                                    },
                                     {
                                         el: {
                                             type: ColorChooserShowButton.xtype,
@@ -126,7 +120,6 @@ export class HexColorPickerEditor extends Widget {
                                             height: 22,
                                             title: i18nText("BI-Basic_Auto"),
                                             text: i18nText("BI-Basic_Auto"),
-                                            invisible: !this.options.auto,
                                             listeners: [
                                                 {
                                                     eventName: ColorChooserShowButton.EVENT_CHANGE,
@@ -140,7 +133,7 @@ export class HexColorPickerEditor extends Widget {
                                                 this.none = _ref;
                                             },
                                         },
-                                        lgap: this.options.transparent ? 5 : 0,
+                                        lgap: 10,
                                     }
                                 ],
                             },
@@ -183,9 +176,6 @@ export class HexColorPickerEditor extends Widget {
                                                 {
                                                     eventName: "EVENT_CHANGE",
                                                     action: () => {
-                                                        if (isEmptyString(this.hexEditor.getValue())) {
-                                                            return;
-                                                        }
                                                         this._checkHexEditor();
                                                         if (
                                                             checker(this.storeValue.r) &&
@@ -271,6 +261,9 @@ export class HexColorPickerEditor extends Widget {
     }
 
     _checkHexEditor() {
+        if (isEmptyString(this.hexEditor.getValue())) {
+            this.hexEditor.setValue("000000");
+        }
         const json = DOM.rgb2json(DOM.hex2rgb(`#${this.hexEditor.getValue()}`));
         this.storeValue = {
             r: json.r || 0,

packages/fineui/src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js

@@ -23,8 +23,7 @@ import { TextEditor } from "@/widget/editor/editor.text";
 
 const RGB_WIDTH = 32,
     HEX_WIDTH = 70,
-    HEX_PREFIX_POSITION = 1,
-    DEFAULT_HEX = "ffffff";
+    HEX_PREFIX_POSITION = 1;
 
 /**
  * @author windy
@@ -38,7 +37,7 @@ export class SimpleHexColorPickerEditor extends Widget {
     static EVENT_CHANGE = "EVENT_CHANGE";
 
     props = {
-        baseCls: "bi-color-picker-editor bi-simple-hex-color-picker-editor",
+        baseCls: "bi-color-picker-editor",
         height: 36,
     };
 
@@ -113,7 +112,6 @@ export class SimpleHexColorPickerEditor extends Widget {
                                 errorText: i18nText("BI-Color_Picker_Error_Text_Hex"),
                                 width: HEX_WIDTH,
                                 height: 24,
-                                value: DEFAULT_HEX,
                                 listeners: [
                                     {
                                         eventName: "EVENT_CHANGE",

packages/fineui/src/case/combo/bubblecombo/combo.bubble.js

@@ -27,7 +27,6 @@ export class BubbleCombo extends Widget {
             destroyWhenHide: false,
             hideWhenClickOutside: true,
             hideWhenBlur: true,
-            hideWhenAnotherComboOpen: false,
             isNeedAdjustHeight: true, // 是否需要高度调整
             isNeedAdjustWidth: true,
             stopPropagation: false,

packages/fineui/src/case/combo/bubblecombo/popup.bubble.js

@@ -33,7 +33,7 @@ export class BubblePopupBarView extends BubblePopupView {
             buttons: [{
                 value: false,
                 text: i18nText("BI-Basic_Cancel"),
-                light: true,
+                level: "ignore",
             }, {
                 text: i18nText(i18nText("BI-Basic_OK")),
                 value: true,

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

@@ -144,8 +144,8 @@ export class TextValueCombo extends Widget {
 
         return {
             type: Combo.xtype,
-            height: toPix(o.height, o.simple ? 1 : 2),
-            width: toPix(o.width, o.simple ? 0 : 2),
+            height: toPix(o.height, 2),
+            width: toPix(o.width, 2),
             ref: ref => (this.combo = ref),
             container: o.container,
             direction: o.direction,
@@ -216,7 +216,6 @@ export class TextValueCombo extends Widget {
     }
 
     setValue(v) {
-        this.options.value = v;
         this.combo.setValue(v);
         this._checkError(v);
     }

packages/fineui/src/case/list/list.select.js

@@ -71,12 +71,10 @@ export class SelectList extends Widget {
             itemsCreator: (op, callback) => {
                 op.times === 1 && this.toolbar.setVisible(false);
                 o.itemsCreator(op, (items, keywords, context, ...args) => {
-                    const tipText = get(context, "tipText", "");
-                    const isEmptyTipText = isEmptyString(tipText);
-                    // tipText 和 items 本身就是互斥的
-                    callback(isEmptyTipText ? items : [], keywords, context, ...args);
+                    callback(items, keywords, context, ...args);
                     if (op.times === 1) {
-                        const visible = isEmptyTipText && items && items.length > 0;
+                        const tipText = get(context, "tipText", "");
+                        const visible = isEmptyString(tipText) && items && items.length > 0;
                         this.toolbar.setVisible(visible);
                         this.toolbar.setEnable(this.isEnabled() && visible);
                     }

packages/fineui/src/case/pager/pager.direction.js

@@ -40,11 +40,6 @@ export class DirectionPager extends Widget {
     }
     _init() {
         super._init(...arguments);
-
-        this.ITEM_GAP = 0;
-        this.ITEM_WIDTH = this.options.height - 2 * this.ITEM_GAP;
-        this.MIDDLE_GAP = 16;
-
         this._createVPager();
         this._createHPager();
         this.layout = createWidget({
@@ -54,23 +49,23 @@ export class DirectionPager extends Widget {
             items: [
                 {
                     el: this.vpager,
-                    top: this.ITEM_GAP,
-                    right: this.ITEM_WIDTH * 3 + this.MIDDLE_GAP,
+                    top: 0,
+                    right: 86,
                 },
                 {
                     el: this.vlabel,
-                    top: this.ITEM_GAP,
-                    right: this.ITEM_WIDTH * 4 + this.MIDDLE_GAP,
+                    top: 0,
+                    right: 110,
                 },
                 {
                     el: this.hpager,
-                    top: this.ITEM_GAP,
+                    top: 0,
                     right: 0,
                 },
                 {
                     el: this.hlabel,
-                    top: this.ITEM_GAP,
-                    right: this.ITEM_WIDTH,
+                    top: 0,
+                    right: 24,
                 }
             ],
         });
@@ -80,20 +75,20 @@ export class DirectionPager extends Widget {
         const v = this.options.vertical;
         this.vlabel = createWidget({
             type: Label.xtype,
-            width: this.ITEM_WIDTH,
-            height: this.ITEM_WIDTH,
+            width: 24,
+            height: 24,
             value: v.curr,
             title: v.curr,
             invisible: true,
         });
         this.vpager = createWidget({
             type: Pager.xtype,
-            width: this.ITEM_WIDTH * 3,
+            width: 72,
             layouts: [
                 {
                     type: HorizontalLayout.xtype,
                     scrollx: false,
-                    rgap: this.ITEM_WIDTH,
+                    rgap: 24,
                 }
             ],
             invisible: true,
@@ -110,8 +105,8 @@ export class DirectionPager extends Widget {
                 value: "prev",
                 title: i18nText("BI-Up_Page"),
                 warningTitle: i18nText("BI-Current_Is_First_Page"),
-                height: this.ITEM_WIDTH - 2,
-                width: this.ITEM_WIDTH - 2,
+                height: 22,
+                width: 22,
                 cls: "bi-border bi-border-radius direction-pager-prev column-pre-page-h-font bi-list-item-select2",
             },
             next: {
@@ -119,8 +114,8 @@ export class DirectionPager extends Widget {
                 value: "next",
                 title: i18nText("BI-Down_Page"),
                 warningTitle: i18nText("BI-Current_Is_Last_Page"),
-                height: this.ITEM_WIDTH - 2,
-                width: this.ITEM_WIDTH - 2,
+                height: 22,
+                width: 22,
                 cls: "bi-border bi-border-radius direction-pager-next column-next-page-h-font bi-list-item-select2",
             },
 
@@ -142,20 +137,20 @@ export class DirectionPager extends Widget {
         const h = this.options.horizontal;
         this.hlabel = createWidget({
             type: Label.xtype,
-            width: this.ITEM_WIDTH,
-            height: this.ITEM_WIDTH,
+            width: 24,
+            height: 24,
             value: h.curr,
             title: h.curr,
             invisible: true,
         });
         this.hpager = createWidget({
             type: Pager.xtype,
-            width: this.ITEM_WIDTH * 3,
+            width: 72,
             layouts: [
                 {
                     type: HorizontalLayout.xtype,
                     scrollx: false,
-                    rgap: this.ITEM_WIDTH,
+                    rgap: 24,
                 }
             ],
             invisible: true,
@@ -172,8 +167,8 @@ export class DirectionPager extends Widget {
                 value: "prev",
                 title: i18nText("BI-Left_Page"),
                 warningTitle: i18nText("BI-Current_Is_First_Page"),
-                height: this.ITEM_WIDTH - 2,
-                width: this.ITEM_WIDTH - 2,
+                height: 22,
+                width: 22,
                 cls: "bi-border bi-border-radius direction-pager-prev row-pre-page-h-font bi-list-item-select2",
             },
             next: {
@@ -181,8 +176,8 @@ export class DirectionPager extends Widget {
                 value: "next",
                 title: i18nText("BI-Right_Page"),
                 warningTitle: i18nText("BI-Current_Is_Last_Page"),
-                height: this.ITEM_WIDTH - 2,
-                width: this.ITEM_WIDTH - 2,
+                height: 22,
+                width: 22,
                 cls: "bi-border bi-border-radius direction-pager-next row-next-page-h-font bi-list-item-select2",
             },
 
@@ -265,7 +260,7 @@ export class DirectionPager extends Widget {
             vShow = true;
         }
         this.setVisible(hShow || vShow);
-        const num = [this.ITEM_WIDTH * 3 + this.MIDDLE_GAP, this.ITEM_WIDTH * 4 + this.MIDDLE_GAP, 0, this.ITEM_WIDTH];
+        const num = [86, 110, 0, 24];
         const items = this.layout.attr("items");
 
         if (vShow === true && hShow === true) {

packages/fineui/src/case/ztree/asynctree.js

@@ -1,19 +1,7 @@
-import {
-    cjkEncodeDO,
-    deepClone,
-    each,
-    extend,
-    isEmpty,
-    isNotNull,
-    isNull,
-    shortcut,
-    AbsoluteLayout,
-    createWidget,
-} from "@/core";
+import { cjkEncodeDO, deepClone, each, extend, isEmpty, isNotNull, isNull, shortcut } from "@/core";
 import { TreeView } from "./treeview";
 import { TreeRenderPageService } from "./treerender.page.service";
 import $ from "jquery";
-import { IconLabel } from "@/base";
 
 @shortcut()
 export class AsyncTree extends TreeView {
@@ -209,34 +197,7 @@ export class AsyncTree extends TreeView {
                 },
                 options
             );
-
-            let loadingIcon;
-            createWidget({
-                type: AbsoluteLayout.xtype,
-                element: self.element.find(`#${treeNode.tId}`),
-                css: {
-                    position: "relative",
-                },
-                items: [
-                    {
-                        el: {
-                            type: IconLabel.xtype,
-                            width: 20,
-                            height: 20,
-                            cls: "button-loading-font anim-rotate bi-card",
-                            ref: ref => {
-                                loadingIcon = ref;
-                            },
-                        },
-                        left: 5,
-                        top: 5,
-                    },
-                ],
-            });
-            o.itemsCreator(op, (...args) => {
-                complete.apply(this, args);
-                loadingIcon.destroy();
-            });
+            o.itemsCreator(op, complete);
         }
 
         // 展开节点会将halfCheck置为false以开启自动计算半选, 所以第一次展开节点的时候需要在置为false之前获取配置

packages/fineui/src/case/ztree/list/listasynctree.js

@@ -1,4 +1,4 @@
-import { ListTreeView } from "./listtreeview";
+import { Listtreeview } from "./listtreeview";
 import { cjkEncodeDO, delay, isEmpty, shortcut, extend } from "@/core";
 import $ from "jquery";
 
@@ -11,7 +11,7 @@ import $ from "jquery";
  */
 
 @shortcut()
-export class ListAsyncTree extends ListTreeView {
+export class Listasynctree extends Listtreeview {
     static xtype = "bi.list_async_tree";
 
     // 配置属性

packages/fineui/src/case/ztree/list/listparttree.js

@@ -1,4 +1,4 @@
-import { ListAsyncTree } from "./listasynctree";
+import { Listasynctree } from "./listasynctree";
 import { shortcut, extend, Events, delay } from "@/core";
 import { TreeView } from "../treeview";
 import $ from "jquery";
@@ -11,7 +11,7 @@ import $ from "jquery";
  */
 
 @shortcut()
-export class ListPartTree extends ListAsyncTree {
+export class ListPartTree extends Listasynctree {
     static xtype = "bi.list_part_tree";
 
     _loadMore() {

packages/fineui/src/case/ztree/list/listtreeview.js

@@ -11,7 +11,7 @@ import $ from "jquery";
  */
 
 @shortcut()
-export class ListTreeView extends TreeView {
+export class Listtreeview extends TreeView {
     static xtype = "bi.list_tree_view";
 
     _constants = {

packages/fineui/src/case/ztree/parttree.js

@@ -16,15 +16,9 @@ export class PartTree extends AsyncTree {
 
     static EVENT_CLICK_TREE_NODE = "EVENT_CLICK_TREE_NODE";
 
-    _defaultConfig() {
-        return extend(super._defaultConfig(...arguments), {
-            isSelectedAny: true, //是否返回所有被checked的结点(包括被checked的结点的子结点)
-        });
-    }
-
     constructor(...args) {
         super(...args);
-        this.seMethos = AsyncTree.superclass._selectTreeNode;
+        this.seMethos = super._selectTreeNode;
     }
 
     _loadMore() {
@@ -61,11 +55,8 @@ export class PartTree extends AsyncTree {
         const name = this._getNodeValue(treeNode);
         this.fireEvent(PartTree.EVENT_CLICK_TREE_NODE);
         if (treeNode.checked === true) {
-            if (this.options.isSelectedAny) {
-                this.options.paras.selectedValues = this._getUnionValue(); //获取所有被selected的结点
-            } else {
-                this._addTreeNode(this.options.paras.selectedValues, parentValues, name, {});//给selectedValues增加被click的结点（不包含该节点的子结点）
-            }
+            this.options.paras.selectedValues = this._getUnionValue();
+            // this._buildTree(self.options.paras.selectedValues, concat(parentValues, name));
             o.itemsCreator(
                 extend({}, o.paras, {
                     type: TreeView.REQ_TYPE_ADJUST_DATA,

packages/fineui/src/case/ztree/tree.list.display.js

@@ -1,4 +1,4 @@
-import { ListTreeView } from "./list/listtreeview";
+import { Listtreeview } from "./list/listtreeview";
 import { each, shortcut, i18nText } from "@/core";
 import $ from "jquery";
 
@@ -10,7 +10,7 @@ import $ from "jquery";
  */
 
 @shortcut()
-export class ListDisplayTree extends ListTreeView {
+export class ListDisplayTree extends Listtreeview {
     static xtype = "bi.list_display_tree";
     static EVENT_CHANGE = "EVENT_CHANGE";
 

packages/fineui/src/component/form/form.field.js

@@ -69,7 +69,7 @@ export class FormField extends Widget {
 
         return {
             type: VerticalAdaptLayout.xtype,
-            columnSize: isKey(o.label) ? ["auto", "fill"] : ["fill"],
+            columnSize: ["auto", "fill"],
             verticalAlign: VerticalAlign.Stretch,
             items: isKey(o.label)
                 ? [

packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.js

@@ -169,13 +169,11 @@ export class AbstractTreeValueChooser extends Widget {
                 value: node.value,
                 open: true,
                 disabled: node.disabled,
-                iconCls: node.iconCls,
             });
         }
     }
 
     _reqSelectedTreeNode(op, callback) {
-        const self = this;
         const selectedValues = deepClone(op.selectedValues);
         const notSelectedValue = op.notSelectedValue || {};
         const keyword = op.keyword || "";
@@ -190,7 +188,7 @@ export class AbstractTreeValueChooser extends Widget {
         dealWithSelectedValues(selectedValues);
         callback(selectedValues);
 
-        function dealWithSelectedValues(selectedValues) {
+        const dealWithSelectedValues = selectedValues => {
             let p = parentValues.concat(notSelectedValue);
             // 存储的值中存在这个值就把它删掉
             // 例如选中了中国-江苏-南京， 取消中国或江苏或南京
@@ -199,18 +197,18 @@ export class AbstractTreeValueChooser extends Widget {
                 // 如果搜索的值在父亲链中
                 if (isSearchValueInParent(p)) {
                     // 例如选中了 中国-江苏， 搜索江苏， 取消江苏(干掉了江苏)
-                    self._deleteNode(selectedValues, p);
+                    this._deleteNode(selectedValues, p);
                 } else {
                     const searched = [];
                     // 要找到所有以notSelectedValue为叶子节点的链路
                     const find = search(parentValues, notSelectedValue, [], searched);
                     if (find && isNotEmptyArray(searched)) {
                         each(searched, (i, arr) => {
-                            const node = self._getNode(selectedValues, arr);
+                            const node = this._getNode(selectedValues, arr);
                             if (node) {
                                 // 例如选中了 中国-江苏， 搜索江苏， 取消中国（实际上只想删除中国-江苏，因为搜的是江苏）
                                 // 例如选中了 中国-江苏-南京，搜索南京，取消中国（实际上只想删除中国-江苏-南京，因为搜的是南京）
-                                self._deleteNode(selectedValues, arr);
+                                this._deleteNode(selectedValues, arr);
                             } else {
                                 // 例如选中了 中国-江苏，搜索南京，取消中国（实际上只想删除中国-江苏-南京，因为搜的是南京）
                                 expandSelectedValue(selectedValues, arr, last(arr));
@@ -241,14 +239,14 @@ export class AbstractTreeValueChooser extends Widget {
                     // 添加去掉搜索的结果集
                     if (result.length > 0) {
                         each(result, (i, strs) => {
-                            self._buildTree(selectedValues, strs);
+                            this._buildTree(selectedValues, strs);
                         });
                     }
                 }
             }
         };
 
-        function expandSelectedValue(selectedValues, parents, notSelectedValue) {
+        const expandSelectedValue = (selectedValues, parents, notSelectedValue) => {
             let next = selectedValues;
             const childrenCount = [];
             const path = [];
@@ -261,7 +259,7 @@ export class AbstractTreeValueChooser extends Widget {
                     }
                     if (isEmpty(next)) {
                         const split = parents.slice(0, i);
-                        const expanded = self._getChildren(split);
+                        const expanded = this._getChildren(split);
                         path.push(split);
                         childrenCount.push(expanded.length);
                         // 如果只有一个值且取消的就是这个值
@@ -272,7 +270,7 @@ export class AbstractTreeValueChooser extends Widget {
                         ) {
                             for (let j = childrenCount.length - 1; j >= 0; j--) {
                                 if (childrenCount[j] === 1) {
-                                    self._deleteNode(selectedValues, path[j]);
+                                    this._deleteNode(selectedValues, path[j]);
                                 } else {
                                     break;
                                 }
@@ -297,16 +295,16 @@ export class AbstractTreeValueChooser extends Widget {
             });
         };
 
-        function search(parents, current, result, searched) {
+        const search = (parents, current, result, searched) => {
             const newParents = clone(parents);
             newParents.push(current);
-            if (self._isMatch(parents, current, keyword)) {
+            if (this._isMatch(parents, current, keyword)) {
                 searched && searched.push(newParents);
 
                 return true;
             }
 
-            const children = self._getChildren(newParents);
+            const children = this._getChildren(newParents);
 
             const notSearch = [];
             let can = false;
@@ -329,9 +327,9 @@ export class AbstractTreeValueChooser extends Widget {
             return can;
         };
 
-        function isSearchValueInParent(parentValues) {
+        const isSearchValueInParent = parentValues => {
             for (let i = 0, len = parentValues.length; i < len; i++) {
-                if (self._isMatch(parentValues.slice(0, i), parentValues[i], keyword)) {
+                if (this._isMatch(parentValues.slice(0, i), parentValues[i], keyword)) {
                     return true;
                 }
             }
@@ -391,7 +389,7 @@ export class AbstractTreeValueChooser extends Widget {
             each(selected, (k, v) => {
                 const p = clone(parents);
                 p.push(k);
-                if (!dealWithSelectedValues(selected[k], p) || op.searcherPaneAutoShrink === false) {
+                if (!dealWithSelectedValues(selected[k], p)) {
                     each(selected[k], (nk, nv) => {
                         const t = clone(p);
                         t.push(nk);
@@ -532,7 +530,6 @@ export class AbstractTreeValueChooser extends Widget {
                 halfCheck: half,
                 flag,
                 disabled: node.disabled,
-                iconCls: node.iconCls,
             });
         }
 
@@ -704,7 +701,6 @@ export class AbstractTreeValueChooser extends Widget {
                     disabled: nodes[i].disabled,
                     title: nodes[i].title || nodes[i].text,
                     warningTitle: nodes[i].warningTitle,
-                    iconCls: nodes[i].iconCls,
                 });
                 if (openState) {
                     getResult(parentValues.concat([nodes[i].value]), { checked: state[0], half: state[1] });

packages/fineui/src/component/treevaluechooser/abstract.treevaluechooser.list.js

@@ -31,7 +31,7 @@ export class AbstractListTreeValueChooser extends AbstractTreeValueChooser {
             return;
         }
 
-        doCheck.call(this, [], this.tree.getRoot(), selectedValues);
+        doCheck([], this.tree.getRoot(), selectedValues);
 
         callback({
             items: values(result),
@@ -76,7 +76,6 @@ export class AbstractListTreeValueChooser extends AbstractTreeValueChooser {
     }
 
     _reqInitTreeNode(op, callback) {
-        const self = this;
         let result = [];
         const keyword = op.keyword || "";
         const selectedValues = op.selectedValues;
@@ -90,8 +89,8 @@ export class AbstractListTreeValueChooser extends AbstractTreeValueChooser {
             });
         });
 
-        function search() {
-            const children = self._getChildren([]);
+        const search = () => {
+            const children = this._getChildren([]);
             let start = children.length;
             if (lastSearchValue !== "") {
                 for (let j = 0, len = start; j < len; j++) {
@@ -106,22 +105,22 @@ export class AbstractListTreeValueChooser extends AbstractTreeValueChooser {
             const output = [];
             let find;
             for (let i = start, len = children.length; i < len; i++) {
-                if (output.length < self._const.perPage) {
+                if (output.length < this._const.perPage) {
                     find = nodeSearch(1, [], children[i].value, result);
-                } else if (output.length === self._const.perPage) {
+                } else if (output.length === this._const.perPage) {
                     find = nodeSearch(1, [], children[i].value, []);
                 }
                 if (find[0] === true) {
                     output.push(children[i].value);
                 }
-                if (output.length > self._const.perPage) {
+                if (output.length > this._const.perPage) {
                     break;
                 }
             }
 
             // 深层嵌套的比较麻烦，这边先实现的是在根节点添加
             if (op.times === 1) {
-                const nodes = self._getAddedValueNode([], selectedValues);
+                const nodes = this._getAddedValueNode([], selectedValues);
                 result = concat(
                     filter(nodes, (idx, node) => {
                         const find = Func.getSearchResult([node.text || node.value], keyword);
@@ -135,8 +134,8 @@ export class AbstractListTreeValueChooser extends AbstractTreeValueChooser {
             return output;
         };
 
-        function createOneJson(parentValues, value, isOpen, checked, flag, result) {
-            const node = self._getTreeNode(parentValues, value);
+        const createOneJson = (parentValues, value, isOpen, checked, flag, result) => {
+            const node = this._getTreeNode(parentValues, value);
             result.push({
                 id: node.id,
                 pId: node.pId,
@@ -152,9 +151,9 @@ export class AbstractListTreeValueChooser extends AbstractTreeValueChooser {
             });
         };
 
-        function nodeSearch(deep, parentValues, current, result) {
+        const nodeSearch = (deep, parentValues, current, result) => {
             let checked;
-            if (self._isMatch(parentValues, current, keyword)) {
+            if (this._isMatch(parentValues, current, keyword)) {
                 checked = isSelected(parentValues, current);
                 createOneJson(parentValues, current, false, checked, true, result);
                 
@@ -162,7 +161,7 @@ export class AbstractListTreeValueChooser extends AbstractTreeValueChooser {
             }
             const newParents = clone(parentValues);
             newParents.push(current);
-            const children = self._getChildren(newParents);
+            const children = this._getChildren(newParents);
 
             let can = false;
             checked = false;

packages/fineui/src/component/treevaluechooser/pane.treevaluechooser.js

@@ -15,10 +15,6 @@ export class TreeValueChooserPane extends AbstractTreeValueChooser {
             items: null,
             itemsCreator: emptyFn,
             showLine: true,
-            showIcon: false,
-            //searcherPaneAutoShrink和searcherPaneIsSelectedAny同时为false时，返回值和非搜索状态下的树逻辑一致
-            searcherPaneAutoShrink: true,//其搜索树是否会判别子结点全选则取父结点的值
-            searcherPaneIsSelectedAny: true, //其搜索树是否返回所有被checked的结点(包括被checked的结点的子结点)
         });
     }
 
@@ -29,12 +25,7 @@ export class TreeValueChooserPane extends AbstractTreeValueChooser {
             type: o.hideSearch ? MultiSelectTreePopup.xtype : MultiSelectTree.xtype,
             element: this,
             showLine: o.showLine,
-            showIcon: o.showIcon,
-            searcherPaneIsSelectedAny: o.hideSearch || o.searcherPaneIsSelectedAny,
-            itemsCreator: (options, callback) => {
-                options.searcherPaneAutoShrink = o.hideSearch || o.searcherPaneAutoShrink;
-                this._itemsCreator.call(this, options, callback);
-            },
+            itemsCreator: bind(this._itemsCreator, this),
         });
 
         this.pane.on(MultiSelectTree.EVENT_CHANGE, () => {

packages/fineui/src/core/1.lodash.js

@@ -14,7 +14,7 @@
     var undefined;
 
     /** Used as the semantic version number. */
-    var VERSION = '4.17.21';
+    var VERSION = '4.17.5';
 
     /** Used as the size to enable large array optimizations. */
     var LARGE_ARRAY_SIZE = 200;
@@ -899,7 +899,7 @@
     }
 
     /**
-     * Gets the value at `key`, unless `key` is "__proto__" or "constructor".
+     * Gets the value at `key`, unless `key` is "__proto__".
      *
      * @private
      * @param {Object} object The object to query.
@@ -907,10 +907,6 @@
      * @returns {*} Returns the property value.
      */
     function safeGet(object, key) {
-        if (key === 'constructor' && typeof object[key] === 'function') {
-            return;
-        }
-
         return key == '__proto__'
             ? undefined
             : object[key];
@@ -6146,30 +6142,6 @@
         return (array && array.length) ? baseUniq(array, baseIteratee(iteratee, 2)) : [];
     }
 
-    /**
-     * This method is like `uniq` except that it accepts `comparator` which
-     * is invoked to compare elements of `array`. The order of result values is
-     * determined by the order they occur in the array. The comparator is invoked
-     * with two arguments: (arrVal, othVal).
-     *
-     * @since 4.0.0
-     * @category Array
-     * @param {Array} array The array to inspect.
-     * @param {Function} [comparator] The comparator invoked per element.
-     * @returns {Array} Returns the new duplicate free array.
-     * @see uniq, uniqBy
-     * @example
-     *
-     * const objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 2 }]
-     *
-     * uniqWith(objects, isEqual)
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
-     */
-    function uniqWith(array, comparator) {
-        comparator = typeof comparator === 'function' ? comparator : undefined;
-        return (array && array.length) ? baseUniq(array, undefined, comparator) : [];
-    }
-
     /**
      * This method is like `_.zip` except that it accepts an array of grouped
      * elements and creates an array regrouping the elements to their pre-zip
@@ -10069,7 +10041,6 @@
     lodash.union = union;
     lodash.uniq = uniq;
     lodash.uniqBy = uniqBy;
-    lodash.uniqWith = uniqWith;
     lodash.unzip = unzip;
     lodash.values = values;
     lodash.without = without;

packages/fineui/src/core/2.base.js

@@ -482,7 +482,6 @@ _.each(
         "take",
         "takeRight",
         "uniqBy",
-        "uniqWith"
     ],
     name => {
         lodashFns[name] = _apply(name);
@@ -511,7 +510,6 @@ export const range = lodashFns.range;
 export const take = lodashFns.take;
 export const takeRight = lodashFns.takeRight;
 export const uniqBy = lodashFns.uniqBy;
-export const uniqWith = lodashFns.uniqWith;
 export const findIndex = lodashFns.findIndex;
 export const findLastIndex = lodashFns.findLastIndex;
 
@@ -914,8 +912,7 @@ export const delay = lodashFns.delay;
 export const defer = lodashFns.defer;
 export const wrap = lodashFns.wrap;
 
-
-export let nextTick = /*!PURE*/(function () {
+export const nextTick = (function () {
     const callbacks = [];
     let pending = false;
     let timerFunc = void 0;
@@ -974,7 +971,7 @@ export let nextTick = /*!PURE*/(function () {
             pending = true;
             timerFunc();
         }
-
+        // $flow-disable-line
         if (!cb && typeof Promise !== "undefined") {
             return new Promise((resolve, reject) => {
                 _resolve = resolve;
@@ -983,10 +980,6 @@ export let nextTick = /*!PURE*/(function () {
     };
 })();
 
-export const setNextTick = (fn) => {
-    nextTick = fn;
-}
-
 // 数字相关方法
 _.each(["random"], name => {
     lodashFns[name] = _apply(name);
@@ -1369,7 +1362,7 @@ export function parseDateTime(str, fmt) {
         m = today.getMonth();
     }
     if (_global.isNaN(d)) {
-        d = 1;
+        d = Math.min(getMonthDays(getDate(y, m)), today.getDate());
     }
     if (_global.isNaN(hr)) {
         hr = today.getHours();
@@ -1518,7 +1511,7 @@ export function getTime() {
     }
     if (isNotNull(BI.timeZone)) {
         // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间，都以整的0800这样的为基准
-        return dt.getTime() + BI.timeZone + new Date().getTimezoneOffset() * 60000;
+        return dt.getTime() - BI.timeZone - new Date().getTimezoneOffset() * 60000;
     }
 
     return dt.getTime();

packages/fineui/src/core/3.ob.js

@@ -155,7 +155,7 @@ export class OB {
         eventName = eventName.toLowerCase();
 
         /* alex:如果fn是null,就是把eventName上面所有方法都un掉*/
-        if (!fn) {
+        if (fn === null) {
             delete this._getEvents()[eventName];
         } else {
             const fns = this._getEvents()[eventName];

packages/fineui/src/core/4.widget.js

@@ -25,7 +25,7 @@ import {
 import { OB } from "./3.ob";
 import { Providers, _lazyCreateWidget } from "./5.inject";
 import { DOM } from "./utils";
-import { Events, pixFormat } from "./constant";
+import { Events, emptyFn, pixFormat } from "./constant";
 import { Plugin } from "./6.plugin";
 import { _global } from "./0.foundation";
 import { SystemProvider } from "./system";
@@ -241,8 +241,7 @@ export class Widget extends OB {
                 if (beforeRenderResult instanceof Promise) {
                     beforeRenderResult.then(render).catch((e) => {
                         _global.console && console.error(e);
-                        // 异步render，组件此时可能已经被销毁
-                        !this.isDestroyed() ? render() : _global.console && console.error('Async render error! Widget has been destroyed!');
+                        render();
                     });
                 }
             } else {
@@ -259,8 +258,7 @@ export class Widget extends OB {
             if (beforeInitResult instanceof Promise) {
                 beforeInitResult.then(init).catch((e) => {
                     _global.console && console.error(e);
-                    // 异步init，组件此时可能已经被销毁
-                    !this.isDestroyed() ? init() : _global.console && console.error('Async init error! Widget has been destroyed!');
+                    init();
                 });
             }
         } else {
@@ -338,6 +336,29 @@ export class Widget extends OB {
         }
     }
 
+    __watch(getter, handler, options) {
+        if (_global.Fix) {
+            this._watchers = this._watchers || [];
+            const watcher = new Fix.Watcher(
+                null,
+                () => getter.call(this, this),
+                (handler &&
+                    ((v) => {
+                        handler.call(this, this, v);
+                    })) ||
+                emptyFn,
+                extend({ deep: true }, options)
+            );
+            this._watchers.push(() => {
+                watcher.teardown();
+            });
+
+            return watcher.value;
+        } else {
+            return getter();
+        }
+    }
+
     /**
      * 初始化根节点
      * @private
@@ -870,13 +891,13 @@ export class Widget extends OB {
         callLifeHook(this, "destroyed");
         this.destroyed = null;
         this._isDestroyed = true;
+        // this._purgeRef();  // 清除ref的时机还是要仔细考虑一下
     }
 
     _unMount() {
         this._assetMounted();
         this.__destroy();
         this.fireEvent(Events.UNMOUNT);
-        // this._purgeRef(); // 子组件unmount ref置为null了，父组件拿不到ref，导致报错
         this.purgeListeners();
     }
 

packages/fineui/src/core/5.inject.js

@@ -427,7 +427,7 @@ const providers = {},
 export const Providers = {
     getProvider: (type, config) => {
         if (!providerInjection[type]) {
-            _global.console && console.warn(`provider: [${type}] undefined`);
+            _global.console && console.error(`provider: [${type}] undefined`);
         }
         runConfigFunction(type);
         if (!providers[type]) {
@@ -602,11 +602,6 @@ export function getResource(type, config) {
     throw new Error("unknown type: [" + type + "] undefined");
 }
 
-/**
- * 根据 xtype 获取已被注册的类
- * @param {string} xtype 
- * @returns 
- */
 export function getClass(xtype) {
     return kv[xtype] || serviceInjection[xtype];
 }

packages/fineui/src/core/constant/writable.var.js

@@ -1,72 +1,76 @@
 /**
  * 可写的常量
  */
-import { isNumber, nextTick, setNextTick } from "../2.base";
+import { isNumber } from "../2.base";
 import { _global } from "../0.foundation";
 import { Cache } from "../structure";
-import { Element, setElement } from "../element/element";
-import { setDom, DOM } from "../utils";
 
 const PropertyDescriptors = {};
 
-export function _defineVarProperties(libName) {
-    Object.defineProperties(libName, PropertyDescriptors);
-}
-
-function addDescriptor(key, options) {
-    options.enumerable = options.enumerable === undefined ? true : options.enumerable;
-    options.configurable = options.configurable === undefined ? true : options.configurable;
-    PropertyDescriptors[key] = options;
-}
-
 export let EVENT_RESPONSE_TIME = 200;
 export const setEventResponseTime = v => {
     EVENT_RESPONSE_TIME = v;
 };
-addDescriptor("EVENT_RESPONSE_TIME", {
-    get: () => EVENT_RESPONSE_TIME,
+PropertyDescriptors["EVENT_RESPONSE_TIME"] = {
+    enumerable: true,
+    configurable: true,
+    get: function () {
+        return EVENT_RESPONSE_TIME;
+    },
     set: setEventResponseTime,
-});
+};
 
 export let pixUnit = "px";
 export const setPixUnit = v => {
     pixUnit = v;
 };
-addDescriptor("pixUnit", {
-    get: () => pixUnit,
+PropertyDescriptors["pixUnit"] = {
+    enumerable: true,
+    configurable: true,
+    get: function () {
+        return pixUnit;
+    },
     set: setPixUnit,
-});
+};
 
 export let pixRatio = 1;
 export const setPixRatio = v => {
     pixRatio = v;
 };
-addDescriptor("pixRatio", {
-    get: () => pixRatio,
+PropertyDescriptors["pixRatio"] = {
+    enumerable: true,
+    configurable: true,
+    get: function () {
+        return pixRatio;
+    },
     set: setPixRatio,
-});
+};
 
 export let StartOfWeek = 1;
 export const setStartOfWeek = v => {
-    if (![0, 1].includes(v)) {
-        console.error("setStartOfWeek must be 0 or 1");
-        return;
-    }
     StartOfWeek = v;
 };
-addDescriptor("StartOfWeek", {
-    get: () => StartOfWeek,
+PropertyDescriptors["StartOfWeek"] = {
+    enumerable: true,
+    configurable: true,
+    get: function () {
+        return StartOfWeek;
+    },
     set: setStartOfWeek,
-});
+};
 
 export let BlankSplitChar = "\u200b \u200b";
 export const setBlankSplitChar = v => {
     BlankSplitChar = v;
 };
-addDescriptor("BlankSplitChar", {
-    get: () => BlankSplitChar,
+PropertyDescriptors["BlankSplitChar"] = {
+    enumerable: true,
+    configurable: true,
+    get: function () {
+        return BlankSplitChar;
+    },
     set: setBlankSplitChar,
-});
+};
 
 // 一定返回最终的单位
 export let pixFormat = (pix, border) => {
@@ -86,10 +90,14 @@ export let pixFormat = (pix, border) => {
 export const setPixFormat = v => {
     pixFormat = v;
 };
-addDescriptor("pixFormat", {
-    get: () => pixFormat,
+PropertyDescriptors["pixFormat"] = {
+    enumerable: true,
+    configurable: true,
+    get: function () {
+        return pixFormat;
+    },
     set: setPixFormat,
-});
+};
 
 export let toPix = (pix, border) => {
     if (!isNumber(pix)) {
@@ -107,10 +115,14 @@ export let toPix = (pix, border) => {
 export let setToPix = v => {
     toPix = v;
 };
-addDescriptor("toPix", {
-    get: () => toPix,
+PropertyDescriptors["toPix"] = {
+    enumerable: true,
+    configurable: true,
+    get: function () {
+        return toPix;
+    },
     set: setToPix,
-});
+};
 
 const getCacheItem = key => {
     Cache.getItem(key, { typeConversion: true, defaultValue: true });
@@ -120,31 +132,15 @@ export const setEventBlur = v => {
     EVENT_BLUR = v;
     Cache.setItem("event.blur", v);
 };
-addDescriptor("EVENT_BLUR", {
-    get: () => EVENT_BLUR,
+PropertyDescriptors["EVENT_BLUR"] = {
+    enumerable: true,
+    configurable: true,
+    get: function () {
+        return EVENT_BLUR;
+    },
     set: setEventBlur,
-});
-
-addDescriptor("Element", {
-    get: () => Element,
-    set: setElement,
-});
-
-addDescriptor("DOM", {
-    get: () => DOM,
-    set: setDom,
-});
-
-addDescriptor("nextTick", {
-    get: () => nextTick,
-    set: setNextTick,
-});
+};
 
-export let PasteLimit = 2000;
-export const setPasteLimit = v => {
-    PasteLimit = v;
-};
-addDescriptor("PasteLimit", {
-    get: () => PasteLimit,
-    set: setPasteLimit,
-});
+export function _defineVarProperties(libName) {
+    Object.defineProperties(libName, PropertyDescriptors);
+}

packages/fineui/src/core/controller/controller.layer.js

@@ -8,7 +8,7 @@ import { isNull, isNotNull, each, keys, isWidget, isNotEmptyString, extend, bind
 import { Widget } from "../4.widget";
 import { createWidget } from "../5.inject";
 import { zIndex_layer } from "../constant";
-import { getPositionRelativeContainingBlockRect, getOuterBody } from "../utils/dom";
+import { DOM } from "../utils";
 
 export class LayerController extends Controller {
     constructor(Resizers) {
@@ -63,7 +63,7 @@ export class LayerController extends Controller {
             w = from.element;
         }
         if (isNotEmptyString(w)) {
-            w = Widget._renderEngine.createElement(w === 'body' ? getOuterBody() : w);
+            w = Widget._renderEngine.createElement(w);
         }
         if (this.has(name)) {
             return this.get(name);
@@ -86,7 +86,7 @@ export class LayerController extends Controller {
         }, context);
         createWidget({
             type: "bi.absolute",
-            element: op.container || this.getRender(),
+            element: op.container || this.options.render,
             items: [
                 {
                     el: layout,
@@ -108,7 +108,7 @@ export class LayerController extends Controller {
                     height: offset.height || (w.outerHeight() - (offset.top || 0) - (offset.bottom || 0)) || "",
                 };
 
-                const { top, left, scaleY, scaleX } = getPositionRelativeContainingBlockRect(layout.element[0].parentNode || layout.element[0]);
+                const { top, left, scaleY, scaleX } = DOM.getPositionRelativeContainingBlockRect(layout.element[0]);
 
                 css.top = (css.top - top) / scaleY;
                 css.left = (css.left - left) / scaleX;
@@ -164,15 +164,6 @@ export class LayerController extends Controller {
         return this;
     }
 
-    getRender() {
-        // 默认挂在body上的都找最外层的body
-        let render = this.options.render;
-        if (render === 'body') {
-            return getOuterBody();
-        }
-        return render;
-    }
-
     _getLayout(name) {
         return this.layouts[name];
     }

packages/fineui/src/core/controller/controller.masker.js

@@ -12,7 +12,7 @@ export class MaskersController extends LayerController {
     }
 
     init() {
-        super.init(...arguments);
+        super.init(arguments);
         this.zindex = zIndex_masker;
     }
 }

packages/fineui/src/core/controller/controller.popover.js

@@ -7,7 +7,6 @@ import { isNotNull, each } from "../2.base";
 import { Widget } from "../4.widget";
 import { createWidget } from "../5.inject";
 import { zIndex_popover } from "../constant";
-import { getOuterBody } from "../utils/dom";
 
 export class PopoverController extends Controller {
     constructor() {
@@ -57,9 +56,8 @@ export class PopoverController extends Controller {
             this.floatContainer[name].visible();
             const popover = this.get(name);
             popover.show && popover.show();
-            const render = this.getRender();
-            const el = Widget._renderEngine.createElement(render)[0];
-            const W = el.clientWidth, H = el.clientHeight;
+            const W = Widget._renderEngine.createElement(this.options.render).width(),
+                H = Widget._renderEngine.createElement(this.options.render).height();
             const w = popover.element.width(), h = popover.element.height();
             let left = (W - w) / 2, top = (H - h) / 2;
             if (left < 0) {
@@ -126,7 +124,7 @@ export class PopoverController extends Controller {
         popover.on(BI.Popover.EVENT_CLOSE, () => this.close(name));
         createWidget({
             type: "bi.absolute",
-            element: options.container || this.getRender(),
+            element: options.container || this.options.render,
             items: [{
                 el: this.floatContainer[name],
                 left: 0,
@@ -139,15 +137,6 @@ export class PopoverController extends Controller {
         return this;
     }
 
-    getRender() {
-        // 默认挂在body上的都找最外层的body
-        let render = this.options.render;
-        if (render === 'body') {
-            return getOuterBody();
-        }
-        return render;
-    }
-
     get(name) {
         return this.floatManager[name];
     }

packages/fineui/src/core/element/element.js

@@ -1,8 +1,7 @@
 import { registFunction } from "./plugins";
 import { isWidget, isString } from "../2.base";
 
-export let Element = class {
-    constructor(widget, attribs) {
+export function Element(widget, attribs) {
     this.l = this.r = this.t = this.b = 0; // 边框
     this.marginLeft = this.marginRight = this.marginTop = this.marginBottom = 0; // 间距
     this.position = {};
@@ -28,6 +27,11 @@ export let Element = class {
     }
 }
 
+initElement(Element);
+registFunction(Element);
+
+function initElement(element) {
+    element.prototype = {
         appendChild(child) {
             child.parent = this;
             if (this.children.push(child) !== 1) {
@@ -36,8 +40,7 @@ export let Element = class {
                 child.prev = sibling;
                 child.next = null;
             }
-    }
-
+        },
         append(child) {
             child.parent = this;
             if (this.children.push(child) !== 1) {
@@ -46,33 +49,28 @@ export let Element = class {
                 child.prev = sibling;
                 child.next = null;
             }
-    }
-
+        },
         getParent() {
             return this.parent;
-    }
-
+        },
         getSiblings() {
             const parent = this.getParent();
             
             return parent ? parent.getChildren() : [this];
-    }
-
+        },
         getChildren() {
             return this.children;
-    }
+        },
 
         getBounds() {
             return {};
-    }
+        },
 
-    width() {}
+        width() {
 
-    height() {}
-}
-
-registFunction(Element);
+        },
+        height() {
 
-export function setElement(element) {
-    Element = element;
+        },
+    };
 }

packages/fineui/src/core/func/alias.js

@@ -9,8 +9,7 @@ import {
     leftPad,
     parseDateTime,
     values,
-    isArray,
-    getDate
+    isArray
 } from "../2.base";
 import { replaceAll } from "./string";
 import { getFullDayName, getMonthName, getTimezone } from "./date";
@@ -638,7 +637,7 @@ export const getEncodeURL = function(urlTemplate, param) {
 
 export const encodeURIComponent = function(url) {
     const specialCharsMap = getSpecialCharsMap();
-    url = url ?? "";
+    url = url || "";
     url = replaceAll(`${url}`, keys(specialCharsMap || []).join("|"), str => {
         switch (str) {
             case "\\":
@@ -681,10 +680,10 @@ export const contentFormat = function(cv, fmt) {
         if (!(cv instanceof Date)) {
             if (typeof cv === "number") {
                 // 毫秒数类型
-                cv = getDate(cv);
+                cv = new Date(cv);
             } else {
                 // 字符串类型转化为date类型
-                cv = getDate(Date.parse((`${cv}`).replace(/-|\./g, "/")));
+                cv = new Date(Date.parse((`${cv}`).replace(/-|\./g, "/")));
             }
         }
         if (!isInvalidDate(cv) && !isNull(cv)) {

packages/fineui/src/core/func/date.js

@@ -180,7 +180,7 @@ export function getQuarterStartDate(date) {
 export function getQuarterEndDate(date) {
     const quarterEndMonth = getQuarterStartMonth(date) + 2;
     
-    return getDate(date.getFullYear(), quarterEndMonth, getMonthDays(date, quarterEndMonth));
+    return getDate(date.getFullYear(), quarterEndMonth, getMonthDays(date));
 }
 
 /**

packages/fineui/src/core/loader/loader.style.js

@@ -13,7 +13,7 @@ export class StyleLoaderManager extends OB {
     }
 
     _init() {
-        super._init(...arguments);
+        super._init(arguments);
         this.stylesManager = {};
     }
 

packages/fineui/src/core/platform/web/config.js

@@ -3,8 +3,7 @@ import { Providers } from "../../5.inject";
 import { Plugin } from "../../6.plugin";
 import { isSupportCss3, isIE, getIEVersion } from "../../platform/web";
 import { HorizontalAlign, VerticalAlign } from "../../constant";
-import {
-    FlexCenterLayout, FlexHorizontalLayout, VerticalLayout,
+import { FlexCenterLayout, FlexHorizontalLayout, VerticalLayout,
     FlexVerticalLayout, TdLayout, InlineLayout,
     FloatHorizontalFillLayout, ResponsiveInlineLayout,
     InlineCenterAdaptLayout, FlexVerticalCenterAdapt,
@@ -27,7 +26,7 @@ import { HalfButton } from "@/case";
 // 1、支持flex的浏览器下使用flex布局
 // 2、不支持flex的浏览器下使用inline布局
 // 3、当列宽既需要自动列宽又需要自适应列宽时，inline布局也处理不了了。当横向出滚动条时使用table布局，不出滚动条时使用float布局
-let _isSupportFlex, _isSupportGrid, _isSupportSticky;
+let _isSupportFlex, _isSupportGrid;
 
 function isSupportFlex() {
     if (!_isSupportFlex) {
@@ -46,7 +45,7 @@ function isSupportGrid() {
 }
 
 // 判断浏览器是否支持sticky 属性
-const innerSupportSticky = function() {
+const isSupportSticky = (function () {
     const vendorList = ["", "-webkit-", "-ms-", "-moz-", "-o-"],
         vendorListLength = vendorList.length,
         stickyElement = document.createElement("div");
@@ -58,15 +57,7 @@ const innerSupportSticky = function() {
     }
 
     return false;
-};
-
-// 判断浏览器是否支持sticky 属性
-const isSupportSticky = function() {
-    if (_isSupportSticky == null) {
-        _isSupportSticky = innerSupportSticky();
-    }
-    return _isSupportSticky;
-};
+}());
 
 
 const configWidget = Plugin.configWidget;
@@ -83,7 +74,7 @@ configWidget("bi.horizontal", ob => {
     }
 
     return extend({
-        scrollx: true
+        scrollx: true,
     }, ob, { type: InlineLayout.xtype });
 });
 configWidget("bi.vertical", ob => {
@@ -99,15 +90,15 @@ configWidget("bi.vertical", ob => {
                 return {
                     type: InlineLayout.xtype,
                     horizontalAlign: ob.horizontalAlign,
-                    items: [item]
+                    items: [item],
                 };
-            })
+            }),
         });
     }
     if (ob.verticalAlign === VerticalAlign.Stretch) {
         if (isSupportFlex()) {
             return extend({
-                horizontalAlign: HorizontalAlign.Stretch
+                horizontalAlign: HorizontalAlign.Stretch,
             }, ob, { type: FlexVerticalLayout.xtype });
         }
     }
@@ -137,12 +128,12 @@ configWidget("bi.inline", ob => {
         // 宽度是不是受限
         if ((ob.scrollable !== true && ob.scrollx !== true) || ob.horizontalAlign === HorizontalAlign.Stretch) {
             return extend({
-                verticalAlign: VerticalAlign.Top
+                verticalAlign: VerticalAlign.Top,
             }, ob, { type: FloatHorizontalFillLayout.xtype });
         }
 
         return extend({
-            horizontalAlign: HorizontalAlign.Stretch
+            horizontalAlign: HorizontalAlign.Stretch,
         }, ob, { type: TableAdaptLayout.xtype });
     }
     if (Providers.getProvider(SystemProvider.xtype).getResponsiveMode()) {
@@ -188,18 +179,18 @@ configWidget("bi.horizontal_adapt", ob => {
     // 主要出现在center_adapt或者horizontal_adapt的场景，或者主动设置horizontalAlign的场景
     if (isAdapt) {
         return extend({
-            horizontalAlign: HorizontalAlign.Center
+            horizontalAlign: HorizontalAlign.Center,
         }, ob, { type: TableAdaptLayout.xtype });
     }
     if (supportFlex) {
         return extend({
             horizontalAlign: HorizontalAlign.Center,
-            scrollx: false
+            scrollx: false,
         }, ob, { type: FlexHorizontalLayout.xtype });
     }
 
     return extend({
-        horizontalAlign: HorizontalAlign.Center
+        horizontalAlign: HorizontalAlign.Center,
     }, ob, { type: TableAdaptLayout.xtype });
 });
 
@@ -219,14 +210,14 @@ configWidget("bi.horizontal_fill", ob => {
         return extend({
             horizontalAlign: HorizontalAlign.Stretch,
             verticalAlign: VerticalAlign.Stretch,
-            scrollx: false
+            scrollx: false,
         }, ob, { type: FlexHorizontalLayout.xtype });
     }
     if ((ob.horizontalAlign && ob.horizontalAlign !== HorizontalAlign.Stretch) || (ob.scrollable === true || ob.scrollx === true)) {
         // 宽度不受限，要用table布局
         return extend({
             horizontalAlign: HorizontalAlign.Stretch,
-            verticalAlign: VerticalAlign.Stretch
+            verticalAlign: VerticalAlign.Stretch,
         }, ob, { type: TableLayout.xtype });
     }
 
@@ -237,14 +228,14 @@ configWidget("bi.vertical_fill", ob => {
         return extend({
             horizontalAlign: HorizontalAlign.Stretch,
             verticalAlign: VerticalAlign.Stretch,
-            scrolly: false
+            scrolly: false,
         }, ob, { type: FlexVerticalLayout.xtype });
     }
     if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
         // 有滚动条，降级到table布局处理
         return extend({}, ob, {
             type: TdLayout.xtype,
-            items: map(ob.items, (i, item) => [item])
+            items: map(ob.items, (i, item) => [item]),
         });
     }
     let hasAuto = false;
@@ -267,12 +258,12 @@ configWidget("bi.vertical_fill", ob => {
     return extend({}, ob, { type: VTapeLayout.xtype });
 });
 configWidget("bi.horizontal_sticky", ob => {
-    if (!isSupportSticky()) {
+    if (!isSupportSticky) {
         return extend({ scrollx: true }, ob, { type: HorizontalFillLayout.xtype });
     }
 });
 configWidget("bi.vertical_sticky", ob => {
-    if (!isSupportSticky()) {
+    if (!isSupportSticky) {
         return extend({ scrolly: true }, ob, { type: VerticalFillLayout.xtype });
     }
 });

packages/fineui/src/core/platform/web/detectElementResize.js

@@ -46,14 +46,10 @@ export const ResizeDetector = {
         addResizeListener(widget.element[0], fn);
 
         return function () {
-            // 如果fn是debounce需要cancel掉
-            fn?.cancel?.();
             removeResizeListener(widget.element[0], fn);
         };
     },
     removeResizeListener(widget, fn) {
-        // 如果fn是debounce需要cancel掉
-        fn?.cancel?.();
         removeResizeListener(widget.element[0], fn);
     },
 };

packages/fineui/src/core/platform/web/load.js

@@ -81,34 +81,25 @@ export function syncLoadScript(uri) {
     return false;
 }
 
-
-const promises = {};
-
 /**
  * 默认的异步加载javascript方法
  * @param uri
  * @returns {Promise<boolean>|Promise<unknown>}
  */
 export function loadScript(uri) {
-    if (promises[uri]) {
-        return Promise.all(promises[uri]);
+    if (_LOADED[uri]) {
+        return Promise.resolve(true);
     }
-
-    const promise = new Promise(resolve => {
+    return new Promise(resolve => {
         const script = document.createElement("script");
         script.type = "application/javascript";
+        script.src = uri;
         script.onload = function() {
-            _LOADED[uri] = true;
             resolve(true);
         };
-        script.src = uri;
         document.head.appendChild(script);
+        _LOADED[uri] = true;
     });
-
-    promises[uri] = [];
-    promises[uri].push(promise);
-
-    return Promise.all(promises[uri]);
 }
 
 /**

packages/fineui/src/core/structure/cache.js

@@ -13,7 +13,7 @@ export const Cache = {
         return Cache._getKeyPrefix() + (key || "");
     },
     getItem: function (key, opt = {}) {
-        const { defaultValue = null, typeConversion } = opt;
+        const { defaultValue, typeConversion } = opt;
         const storageKey = Cache._generateKey(key);
         let value = localStorage.getItem(storageKey);
 

packages/fineui/src/core/utils/color.js

@@ -42,7 +42,7 @@ export function getContrastColor(color) {
         return "#FFFFFF";
     }
 
-    return "#091e40";
+    return "#3D4D66";
 }
 
 export function rgb2hex(rgbColour) {

packages/fineui/src/core/utils/dom.js

@@ -1,9 +1,9 @@
 /**
  * 对DOM操作的通用函数
  */
-import $ from "jquery";
-import { each, isEmpty, isNotNull, isNull } from "../2.base";
 import { Widget } from "../4.widget";
+import { each, isEmpty, isNull, isNotNull } from "../2.base";
+import $ from "jquery";
 import { isIE } from "./../platform";
 
 export function ready(fn) {
@@ -741,15 +741,8 @@ export function getComboPosition(combo, popup, extraWidth, extraHeight, needAdap
         default:
             break;
     }
-    if (needAdaptHeight === true && popup.resetHeight) {
-        const comboRect = combo.element[0].getBoundingClientRect();
-        const relativeOffset = positionRelativeElement ? positionRelativeElement.getBoundingClientRect().top : 0;
-        const positionTop = position.top + relativeOffset;
-        if (positionTop < comboRect.top) {
-            popup.resetHeight(Math.min(viewportBounds.height - positionTop, comboRect.top, maxHeight));
-        } else if (positionTop >= comboRect.bottom) {
-            popup.resetHeight(Math.min(viewportBounds.height - positionTop, viewportBounds.height - comboRect.bottom, maxHeight));
-        }
+    if (needAdaptHeight === true) {
+        popup.resetHeight && popup.resetHeight(Math.min(viewportBounds.height - position.top - (positionRelativeElement ? positionRelativeElement.getBoundingClientRect().top : 0), maxHeight));
     }
 
     return position;
@@ -795,21 +788,3 @@ export function getPositionRelativeContainingBlockRect(element) {
         scaleY: rect.height / positionRelativeElement.offsetHeight,
     };
 }
-
-/**
- * 获取最外层的body
- */
-export function getOuterBody() {
-    // 默认挂在body上的都找最外层的body
-    // let parentWindow = window;
-    // let body = document.body;
-    // try {
-    //     while (parentWindow.parent !== parentWindow) {
-    //         parentWindow = parentWindow.parent;
-    //     }
-    //     body = parentWindow.document.body;
-    // } catch (e) {}
-    // return body;
-
-    return document.body;
-}

packages/fineui/src/core/utils/index.js

@@ -6,11 +6,7 @@ import * as platformDom from "./dom";
 import * as colorDom from "./color";
 
 
-export let DOM = {
+export const DOM = {
     ...platformDom,
     ...colorDom,
 };
-
-export function setDom(dom) {
-    DOM = dom;
-}

packages/fineui/src/core/wrapper/layout/flex/flex.horizontal.js

@@ -87,7 +87,7 @@ export class FlexHorizontalLayout extends Layout {
             }
         }
         if (columnSize > 0) {
-            w.element.css({ width: this._optimiseGap(columnSize) });
+            w.element.width(this._optimiseGap(columnSize));
         }
         if (columnSize === "fill") {
             w.element.addClass("f-f");

packages/fineui/src/core/wrapper/layout/layout.card.js

@@ -107,12 +107,9 @@ export class CardLayout extends Layout {
             throw new Error("cardName not exist", cardName);
         }
 
-        let child = this._children[this._getChildName(cardName)];
+        const child = this._children[this._getChildName(cardName)];
         this._deleteCardByName(cardName);
-        if (child) {
-            child._destroy();
-            child = null;
-        }
+        child && child._destroy();
     }
 
     addCardByName(cardName, cardItem) {

packages/fineui/src/core/wrapper/layout/layout.table.js

@@ -59,7 +59,7 @@ export class TableLayout extends Layout {
         
         return {
             type: "bi.default",
-            ref: (_ref) => {
+            ref(_ref) {
                 this.layout = _ref;
             },
             items: this._formatItems(items),

packages/fineui/src/fix/fix.compact.js

@@ -7,7 +7,7 @@ import {
     extend,
     isFunction,
     Widget,
-    Providers, emptyFn
+    Providers
 } from "@/core";
 import { Fix } from "./fix";
 
@@ -204,7 +204,6 @@ Widget.prototype.__destroy = function () {
             unwatch();
         });
     });
-    Fix.cleanupDeps();
     this._watchers && (this._watchers = []);
     if (this.store) {
         this.store._parent && (this.store._parent = null);
@@ -214,25 +213,6 @@ Widget.prototype.__destroy = function () {
     delete this.__cacheStore;
 };
 
-Widget.prototype.__watch = function (getter, handler, options) {
-    this._watchers = this._watchers || [];
-    const watcher = new Fix.Watcher(
-        null,
-        () => getter.call(this, this),
-        (handler &&
-            ((v) => {
-                handler.call(this, this, v);
-            })) ||
-        emptyFn,
-        extend({ deep: true }, options)
-    );
-    this._watchers.push(() => {
-        watcher.teardown();
-    });
-
-    return watcher.value;
-};
-
 _.each(["_render", "__afterRender", "_mount", "__afterMount"], (name) => {
     const old = Widget.prototype[name];
     old &&

packages/fineui/src/index.js

@@ -10,12 +10,10 @@ export * from "./widget";
 export * from "./component";
 export * from "./fix";
 export * from "./router";
-export * from "./third";
 export * as Popper from "@popperjs/core";
 export const jQuery = jquery;
 export const $ = jquery;
 
 import * as D from "@/core/decorator";
 import { Fix } from "./fix";
-
 export const Decorators = { ...D, Model: Fix.Model };

packages/fineui/src/less/base/colorchooser/colorpicker/button.colorshow.less

@@ -5,11 +5,3 @@
     border-color: @color-bi-border-active-chooser-show-button;
   }
 }
-
-.bi-theme-dark {
-  .bi-color-chooser-show-button {
-    &.active, &:active {
-      border-color: @color-bi-border-active-chooser-show-button-theme-dark;
-    }
-  }
-}

packages/fineui/src/less/base/single/button/button.less

@@ -1,5 +1,4 @@
 @import "../../../index.less";
-
 @hoverVal: opacity .3s ease;
 @activeVal: transform .5s ease, opacity 1s ease;
 @activeStopVal: transform 0s;
@@ -7,7 +6,6 @@ body .bi-button, #body .bi-button {
   &.hack {
     .border-radius(0px);
   }
-
   .border-radius(2px);
   outline: 0;
   border: 1px solid @color-bi-border-button;
@@ -16,51 +14,41 @@ body .bi-button, #body .bi-button {
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
-
   &.loading {
     cursor: not-allowed;
   }
-
   &.block {
     font-size: inherit;
     border-width: 0;
     .border-radius(0px);
   }
-
   &.clear {
     font-size: inherit;
     border-width: 0;
     background-color: transparent;
-
     &:hover, &:focus {
       .opacity(0.8);
     }
-
     &:active {
       .opacity(1);
     }
-
     &:after {
       display: none;
     }
   }
-
   &.plain {
     font-size: inherit;
     border-width: 0;
     background-color: transparent;
   }
-
   &.ghost {
     font-size: inherit;
     background-color: transparent;
   }
-
   &.button-common {
     &, & .b-font:before {
       color: @color-bi-text-common-button;
     }
-
     &.light {
       border-width: 0;
       background-color: @color-bi-background-common-light-button;
@@ -77,101 +65,81 @@ body .bi-button, #body .bi-button {
         background-color: @color-bi-background-active-common-light-button;
       }
     }
-
     &.clear, &.clear .b-font:before {
       color: @color-bi-text-common-clear-button;
     }
-
     &.plain, &.plain .b-font:before {
       background-color: transparent;
       color: @color-bi-text-common-plain-button;
     }
-
     &.plain {
       &:hover {
         background-color: @color-bi-background-hover-plain-button;
       }
-
       &:focus {
         background-color: @color-bi-background-active-plain-button;
       }
     }
-
     &.ghost {
       &, & .b-font:before {
         color: @color-bi-text-common-ghost-button;
       }
-
       &:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before {
         color: @color-bi-text;
         background-color: @color-bi-background-hover-common-ghost-button;
       }
-
       &:active {
         background-color: @color-bi-background-active-common-ghost-button;
       }
     }
   }
-
   &.button-ignore {
     & {
       background-color: @color-bi-background-ignore-button;
-
       &:not(.clear, .ghost) {
         border-color: @color-bi-border-ignore-button;
       }
     }
-
     &:not(.clear, .ghost) {
       &, & .b-font:before {
         color: @color-bi-text-ignore-button;
       }
     }
-
     &.clear {
       background-color: transparent;
       border-width: 0;
     }
-
     &.ghost {
       &:hover, &:focus {
         border-color: @color-bi-border-ignore-button;
-
         &, & .b-font:before {
           color: @color-bi-text-ignore-button;
         }
       }
-
       background-color: transparent;
       border-color: @color-bi-border-dark-gray-line;
     }
-
     &.plain, &.plain .b-font:before {
       background-color: transparent;
       color: @color-bi-text-ignore-plain-button;
     }
-
     &.plain {
       &:hover {
         background-color: @color-bi-background-hover-plain-button;
       }
-
       &:focus {
         background-color: @color-bi-background-active-plain-button;
       }
     }
   }
-
   &.button-success {
     & {
       &, & .b-font:before {
         color: @color-bi-text-success-button;
       }
-
       background-color: @color-bi-background-success-button;
       border-color: @color-bi-border-success-button;
     }
-
     &.light {
       border-width: 0;
       background-color: @color-bi-background-success-light-button;
@@ -188,59 +156,47 @@ body .bi-button, #body .bi-button {
         background-color: @color-bi-background-active-success-light-button;
       }
     }
-
     &.clear {
       &, & .b-font:before {
         color: @color-bi-text-success-clear-button;
       }
-
       background-color: transparent;
       border-width: 0;
     }
-
     &.ghost {
       &, & .b-font:before {
         color: @color-bi-text-success-ghost-button;
       }
-
       background-color: transparent;
-
       &:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before {
         color: @color-bi-text;
         background-color: @color-bi-background-success-button;
       }
-
       &:active {
         background-color: @color-bi-background-success-button;
       }
     }
-
     &.plain, &.plain .b-font:before {
       background-color: transparent;
       color: @color-bi-text-success-plain-button;
     }
-
     &.plain {
       &:hover {
         background-color: @color-bi-background-hover-plain-button;
       }
-
       &:focus {
         background-color: @color-bi-background-active-plain-button;
       }
     }
   }
-
   &.button-warning {
     & {
       &, & .b-font:before {
         color: @color-bi-text-warning-button;
       }
-
       background-color: @color-bi-background-warning-button;
       border-color: @color-bi-border-warning-button;
     }
-
     &.light {
       border-width: 0;
       background-color: @color-bi-background-warning-light-button;
@@ -257,59 +213,47 @@ body .bi-button, #body .bi-button {
         background-color: @color-bi-background-active-warning-light-button;
       }
     }
-
     &.clear {
       &, & .b-font:before {
         color: @color-bi-text-warning-clear-button;
       }
-
       background-color: transparent;
       border-width: 0;
     }
-
     &.ghost {
       &, & .b-font:before {
         color: @color-bi-text-warning-ghost-button;
       }
-
       background-color: transparent;
-
       &:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before {
         color: @color-bi-text;
         background-color: @color-bi-background-warning-button;
       }
-
       &:active {
         background-color: @color-bi-background-warning-button;
       }
     }
-
     &.plain, &.plain .b-font:before {
       background-color: transparent;
       color: @color-bi-text-warning-plain-button;
     }
-
     &.plain {
       &:hover {
         background-color: @color-bi-background-hover-plain-button;
       }
-
       &:focus {
         background-color: @color-bi-background-active-plain-button;
       }
     }
   }
-
   &.button-error {
     & {
       &, & .b-font:before {
         color: @color-bi-text-error-button;
       }
-
       background-color: @color-bi-background-error-button;
       border-color: @color-bi-border-error-button;
     }
-
     &.light {
       border-width: 0;
       background-color: @color-bi-background-error-light-button;
@@ -326,49 +270,39 @@ body .bi-button, #body .bi-button {
         background-color: @color-bi-background-active-error-light-button;
       }
     }
-
     &.clear {
       &, & .b-font:before {
         color: @color-bi-text-error-clear-button;
       }
-
       background-color: transparent;
       border-width: 0;
     }
-
     &.ghost {
       &, & .b-font:before {
         color: @color-bi-text-error-ghost-button;
       }
-
       background-color: transparent;
-
       &:hover, &:focus, &:hover .b-font:before, &:focus .b-font:before {
         color: @color-bi-text;
         background-color: @color-bi-background-error-button;
       }
-
       &:active {
         background-color: @color-bi-background-error-button;
       }
     }
-
     &.plain, &.plain .b-font:before {
       background-color: transparent;
       color: @color-bi-text-error-plain-button;
     }
-
     &.plain {
       &:hover {
         background-color: @color-bi-background-hover-plain-button;
       }
-
       &:focus {
         background-color: @color-bi-background-active-plain-button;
       }
     }
   }
-
   &.button-common.disabled,
   &.button-success.disabled,
   &.button-error.disabled,
@@ -377,30 +311,25 @@ body .bi-button, #body .bi-button {
       &, & .b-font:before {
         color: @color-bi-text-disabled-button !important;
       }
-
       background-color: fade(@color-bi-background-disabled-button, 20%) !important;
       @ieColor: argb(fade(@color-bi-background-disabled-button, 20%));
+      filter: ~"progid:DXImageTransform.Microsoft.gradient(startColorstr=@{ieColor},endColorstr=@{ieColor})";
       border-color: @color-bi-border-disabled-button !important;
     }
-
     &:after {
       display: none;
     }
   }
-
   &.button-ignore.disabled {
     &, & .b-font:before {
       color: @color-bi-text-disabled-ignore-button !important;
     }
-
     background: @color-bi-background-disabled-ignore-button !important;
     border-color: @color-bi-border-disabled-ignore-button !important;
-
     &:after {
       display: none;
     }
   }
-
   &.button-common.disabled,
   &.button-success.disabled,
   &.button-warning.disabled,
@@ -410,81 +339,65 @@ body .bi-button, #body .bi-button {
       &, & .b-font:before {
         color: @color-bi-text-disabled-ignore-clear-button !important;
       }
-
       background: transparent !important;
       border-width: 0 !important;
-
       &:hover, &:focus, &:active {
         .opacity(1);
       }
     }
-
     &.plain {
       &, & .b-font:before {
         color: @color-bi-text-disabled-plain-clear-button !important;
       }
-
       background: transparent !important;
       border-width: 0 !important;
-
       &:hover, &:focus, &:active {
         .opacity(1);
       }
     }
-
     &.ghost {
       &, & .b-font:before {
         // color: @color-bi-text-disabled-ignore-ghost-button !important;
       }
-
       background: transparent !important;
       // border-color: @color-bi-border-disabled-ignore-ghost-button !important;
       .opacity(0.5);
     }
   }
-
   &.button-ignore.disabled {
     &.ghost {
       .opacity(1);
     }
   }
-
   &.button-common.disabled {
     &.ghost {
       &, & .b-font:before {
         color: @color-bi-text-disabled-common-ghost-button !important;
       }
-
       border-color: @color-bi-border-disabled-common-ghost-button !important;
     }
   }
-
   &.button-success.disabled {
     &.ghost {
       &, & .b-font:before {
         color: @color-bi-text-disabled-success-ghost-button !important;
       }
-
       border-color: @color-bi-border-disabled-success-ghost-button !important;
     }
   }
-
   &.button-warning.disabled {
     &.ghost {
       &, & .b-font:before {
         color: @color-bi-text-disabled-warning-ghost-button !important;
       }
-
       border-color: @color-bi-border-disabled-warning-ghost-button !important;
     }
   }
-
   &.button-error.disabled {
     &.ghost {
       &, & .b-font:before {
         color: @color-bi-text-disabled-error-ghost-button !important;
       }
-
       border-color: @color-bi-border-disabled-error-ghost-button !important;
     }
   }
@@ -511,17 +424,14 @@ body .bi-button, #body .bi-button {
       top: 0;
       pointer-events: none;
     }
-
     &.hack:after {
       content: none;
     }
-
     &:active:after {
       transform: scale(0, 1);
       .opacity(0.1);
       .transition(@activeStopVal)
     }
-
     &:hover, &:focus {
       & .bi-button-mask {
         .opacity(0.1);
@@ -530,7 +440,6 @@ body .bi-button, #body .bi-button {
       }
     }
   }
-
   &.button-ignore {
     &:after {
       content: "";
@@ -547,54 +456,42 @@ body .bi-button, #body .bi-button {
       top: 0;
       pointer-events: none;
     }
-
     &.hack:after {
       content: none;
     }
-
     &:active:after {
       transform: scale(0, 1);
       .opacity(0.1);
       .transition(@activeStopVal)
     }
-
     &:hover, &:focus {
       &:not(.clear, .ghost) {
         background-color: @color-bi-background-hover-ignore-button-mask;
       }
-
       .transition(@hoverVal);
     }
   }
-
   & .popup-content{
     font-size: @font-size-14;
   }
-
   .bi-button-mask {
     pointer-events: none;
   }
 }
 
-.bi-theme-dark, #body .bi-theme-dark {
-  .bi-button {
-    background-color: @color-bi-background-button-theme-dark;
-
+.bi-theme-dark {
+  .bi-button, #body .bi-button {
     &.button-ignore {
       background-color: @color-bi-background-ignore-button-theme-dark;
-
       &:hover, &:focus {
         background-color: @color-bi-background-hover-ignore-button-theme-dark;
       }
-
       &:active {
         background-color: @color-bi-background-active-ignore-button-theme-dark;
       }
-
       &.clear {
         background-color: transparent;
       }
-
       &.ghost {
         border-color: @color-bi-border-dark-gray-line-theme-dark;
       }
@@ -609,51 +506,36 @@ body .bi-button, #body .bi-button {
         border-color: @color-bi-border-dark-gray-line-theme-dark !important;
         background-color: fade(@color-bi-background-disabled-button-theme-dark, 20%) !important;
         @ieColor: argb(fade(@color-bi-background-disabled-button-theme-dark, 20%));
+        filter: ~"progid:DXImageTransform.Microsoft.gradient(startColorstr=@{ieColor},endColorstr=@{ieColor})";
 
         &.clear {
           background-color: transparent !important;
         }
-
         &.ghost {
           // 深色系下灰化就统一用灰化色
           &, & .b-font:before {
             color: @color-bi-text-disabled-theme-dark !important;
           }
-
           background: transparent !important;
           .opacity(1);
         }
       }
     }
-
     &.button-ignore.disabled {
       &, &.base-disabled {
         &, & .b-font:before {
           color: @color-bi-text-disabled-theme-dark !important;
         }
-
         border-color: @color-bi-border-dark-gray-line-theme-dark !important;
         background-color: @color-bi-background-ignore-button-theme-dark !important;
-
         &.clear {
           background-color: transparent !important;
         }
-
         &.ghost {
           background: transparent !important;
           .opacity(1);
         }
       }
     }
-
-    &.button-common {
-      &.light {
-        background-color: @color-bi-background-common-light-button-theme-dark;
-
-        &, & .b-font:before {
-          color: @color-bi-text-common-light-button-theme-dark;
-        }
-      }
-    }
   }
 }

packages/fineui/src/less/base/single/button/switch.less

@@ -25,7 +25,7 @@
   .bi-switch {
     background-color: @color-bi-background-switch-theme-dark;
     &.active {
-      background-color: @color-bi-background-active-switch-theme-dark;
+      background-color: @color-bi-background-active-switch;
     }
   }
 }

packages/fineui/src/less/base/single/input/radio.less

@@ -15,9 +15,6 @@
       border-color: @color-bi-border-hover-active-radio;
     }
   }
-  .bi-radio-icon {
-    background-color: @color-bi-background-active-radio-content;
-  }
   &.active {
     & .radio-content, &.radio-content {
       border-color:  @color-bi-border-hover-active-radio;

packages/fineui/src/less/base/tree/ztree.less

@@ -272,9 +272,7 @@
 }
 
 .bi-theme-dark {
-  .ztree.solid li span.button.center_docu, .ztree.solid li span.button.bottom_docu,.ztree.solid li span.button.roots_docu {
-    background: none;
-    
+  .ztree.solid li span.button.center_docu, .ztree.solid li span.button.bottom_docu {
     &:before {
       border-right: 1px solid @border-color-dark-gray-line-theme-dark;
     }

packages/fineui/src/less/core/utils/common.less

@@ -2,19 +2,15 @@
 
 .base-disabled {
   cursor: not-allowed !important;
-
   .cursor-pointer {
     cursor: not-allowed !important;
   }
-
   .cursor-default {
     cursor: not-allowed !important;
   }
-
   .cursor-move {
     cursor: not-allowed !important;
   }
-
   .cursor-text{
     cursor: not-allowed !important;
   }
@@ -58,19 +54,15 @@
 
 .base-invalid {
   cursor: default !important;
-
   .cursor-pointer {
     cursor: default !important;
   }
-
   .cursor-default {
     cursor: default !important;
   }
-
   .cursor-move {
     cursor: default !important;
   }
-
   .cursor-text{
     cursor: default !important;
   }
@@ -81,7 +73,6 @@
   &:focus, &:hover {
     border-color: @color-bi-border-highlight;
   }
-
   // ie下不支持focus-within， 和上面写在一起会导致ie下:hover不生效
   &:focus-within {
     border-color: @color-bi-border-highlight;
@@ -104,10 +95,6 @@
 
 .bi-theme-dark {
   .bi-focus-shadow {
-    &:focus, &:hover {
-      border-color: @color-bi-border-highlight-theme-dark;
-    }
-
     &.disabled {
       &:hover {
         border-color: @border-color-line-theme-dark;
@@ -138,7 +125,6 @@
   & .bi-input {
     color: @color-bi-text-background;
   }
-
   & .bi-textarea {
     color: @color-bi-text-background;
   }
@@ -146,13 +132,11 @@
 
 .bi-theme-dark {
   .bi-background {
-    background-color: @color-bi-background-theme-dark;
+    background-color: @color-bi-background-normal-theme-dark;
     color: @color-bi-text-background-theme-dark;
-
     & .bi-input {
       color: @color-bi-text-background-theme-dark;
     }
-
     & .bi-textarea {
       color: @color-bi-text-background-theme-dark;
     }
@@ -162,11 +146,9 @@
 .bi-header-background {
   background-color: @color-bi-background-header-background;
   color: @color-bi-text-header-background;
-
   & .bi-input {
     color: @color-bi-text-header-background;
   }
-
   & .bi-textarea {
     color: @color-bi-text-header-background;
   }
@@ -176,11 +158,9 @@
   .bi-header-background {
     background-color: @color-bi-background-header-background-theme-dark;
     color: @color-bi-text-header-background-theme-dark;
-
     & .bi-input {
       color: @color-bi-text-header-background-theme-dark;
     }
-
     & .bi-textarea {
       color: @color-bi-text-header-background-theme-dark;
     }
@@ -191,15 +171,12 @@
 .bi-card {
   background-color: @color-bi-background-card;
   color: @color-bi-text-card;
-
   & .bi-input {
     color: @color-bi-text-card;
   }
-
   & .bi-textarea {
     color: @color-bi-text-card;
   }
-
   &.bi-primary {
     background-color: @background-color-card-primary;
     color: @color-card-primary;
@@ -207,14 +184,12 @@
 }
 
 .bi-theme-dark {
-  .bi-card, &.bi-card {
+  .bi-card {
     background-color: @color-bi-background-card-theme-dark;
     color: @color-bi-text-card-theme-dark;
-
     & .bi-input {
       color: @color-bi-text-card-theme-dark;
     }
-
     & .bi-textarea {
       color: @color-bi-text-card-theme-dark;
     }
@@ -224,24 +199,20 @@
 //灰化
 .bi-disabled {
   color: @color-bi-text-disabled;
-
   & .bi-input {
     color: @color-bi-text-disabled;
   }
-
   & .bi-textarea {
     color: @color-bi-text-disabled;
   }
 }
 
 .bi-theme-dark {
-  .bi-disabled, &.bi-disabled {
+  .bi-disabled {
     color: @color-bi-text-disabled-theme-dark;
-
     & .bi-input {
       color: @color-bi-text-disabled-theme-dark;
     }
-
     & .bi-textarea {
       color: @color-bi-text-disabled-theme-dark;
     }
@@ -251,24 +222,20 @@
 // 提示区域, 灰色字体
 .bi-tips {
   color: @color-bi-text-tips;
-
   & .bi-input {
     color: @color-bi-text-tips;
   }
-
   & .bi-textarea {
     color: @color-bi-text-tips;
   }
 }
 
 .bi-theme-dark {
-  .bi-tips, &.bi-tips {
+  .bi-tips {
     color: @color-bi-text-tips-theme-dark;
-
     & .bi-input {
       color: @color-bi-text-tips-theme-dark;;
     }
-
     & .bi-textarea {
       color: @color-bi-text-tips-theme-dark;
     }
@@ -278,11 +245,9 @@
 // 边框
 .bi-border {
   border: 1px solid @color-bi-border-line;
-
   &.disabled {
     border-color: @color-bi-border-disabled !important;
   }
-
   &.error {
     border-color: @border-color-negative;
   }
@@ -290,11 +255,9 @@
 
 .bi-border-top {
   border-top: 1px solid @color-bi-border-line;
-
   &.disabled {
     border-color: @color-bi-border-disabled !important;
   }
-
   &.error {
     border-color: @border-color-negative;
   }
@@ -302,11 +265,9 @@
 
 .bi-border-right {
   border-right: 1px solid @color-bi-border-line;
-
   &.disabled {
     border-color: @color-bi-border-disabled !important;
   }
-
   &.error {
     border-color: @border-color-negative;
   }
@@ -314,11 +275,9 @@
 
 .bi-border-bottom {
   border-bottom: 1px solid @color-bi-border-line;
-
   &.disabled {
     border-color: @color-bi-border-disabled !important;
   }
-
   &.error {
     border-color: @border-color-negative;
   }
@@ -326,11 +285,9 @@
 
 .bi-border-left {
   border-left: 1px solid @color-bi-border-line;
-
   &.disabled {
     border-color: @color-bi-border-disabled !important;
   }
-
   &.error {
     border-color: @border-color-negative;
   }
@@ -339,7 +296,6 @@
 .bi-theme-dark {
   .bi-border {
     border: 1px solid @color-bi-border-line-theme-dark;
-
     &.disabled {
       border-color: @color-bi-border-disabled-theme-dark !important;
     }
@@ -347,7 +303,6 @@
 
   .bi-border-top {
     border-top: 1px solid @color-bi-border-line-theme-dark;
-
     &.disabled {
       border-color: @color-bi-border-disabled-theme-dark !important;
     }
@@ -355,7 +310,6 @@
 
   .bi-border-right {
     border-right: 1px solid @color-bi-border-line-theme-dark;
-
     &.disabled {
       border-color: @color-bi-border-disabled-theme-dark !important;
     }
@@ -363,7 +317,6 @@
 
   .bi-border-bottom {
     border-bottom: 1px solid @color-bi-border-line-theme-dark;
-
     &.disabled {
       border-color: @color-bi-border-disabled-theme-dark !important;
     }
@@ -371,7 +324,6 @@
 
   .bi-border-left {
     border-left: 1px solid @color-bi-border-line-theme-dark;
-
     &.disabled {
       border-color: @color-bi-border-disabled-theme-dark !important;
     }
@@ -469,11 +421,9 @@
 // 标红
 .bi-keyword-red-mark {
   color: @color-bi-text-redmark;
-
   & .bi-input {
     color: @color-bi-text-redmark;
   }
-
   & .bi-textarea {
     color: @color-bi-text-redmark;
   }
@@ -482,11 +432,9 @@
 // 高亮
 .bi-high-light {
   color: @color-bi-text-highlight;
-
   & .bi-input {
     color: @color-bi-text-highlight;
   }
-
   & .bi-textarea {
     color: @color-bi-text-highlight;
   }
@@ -494,11 +442,9 @@
 
 .bi-error {
   color: @color-bi-text-failure;
-
   & .bi-input {
     color: @color-bi-text-failure;
   }
-
   & .bi-textarea {
     color: @color-bi-text-failure;
   }
@@ -507,11 +453,9 @@
 .bi-high-light-background {
   background-color: @color-bi-background-highlight;
   color: @color-bi-text;
-
   & .bi-input {
     color: @color-bi-text;
   }
-
   & .bi-textarea {
     color: @color-bi-text;
   }
@@ -520,11 +464,9 @@
 .bi-error-background {
   background-color: @color-bi-background-failure;
   color: @color-bi-text;
-
   & .bi-input {
     color: @color-bi-text;
   }
-
   & .bi-textarea {
     color: @color-bi-text;
   }
@@ -532,7 +474,6 @@
 
 .bi-high-light-border {
   border: 1px solid @color-bi-border-highlight;
-
   &.disabled {
     border-color: @color-bi-border-disabled !important;
   }
@@ -540,7 +481,6 @@
 
 .bi-high-light-border-top {
   border-top: 1px solid @color-bi-border-highlight;
-
   &.disabled {
     border-color: @color-bi-border-disabled !important;
   }
@@ -548,7 +488,6 @@
 
 .bi-high-light-border-right {
   border-right: 1px solid @color-bi-border-highlight;
-
   &.disabled {
     border-color: @color-bi-border-disabled !important;
   }
@@ -556,7 +495,6 @@
 
 .bi-high-light-border-bottom {
   border-bottom: 1px solid @color-bi-border-highlight;
-
   &.disabled {
     border-color: @color-bi-border-disabled !important;
   }
@@ -564,7 +502,6 @@
 
 .bi-high-light-border-left {
   border-left: 1px solid @color-bi-border-highlight;
-
   &.disabled {
     border-color: @color-bi-border-disabled !important;
   }
@@ -575,11 +512,9 @@
   color: @color-bi-text-water-mark;
   cursor: text;
   .user-select-disable();
-
   & .bi-input {
     color: @color-bi-text-water-mark;
   }
-
   & .bi-textarea {
     color: @color-bi-text-water-mark;
   }
@@ -588,11 +523,9 @@
 .bi-theme-dark {
   .bi-water-mark {
     color: @color-bi-text-water-mark-theme-dark;
-
     & .bi-input {
       color: @color-bi-text-water-mark-theme-dark;
     }
-
     & .bi-textarea {
       color: @color-bi-text-water-mark-theme-dark;
     }
@@ -615,30 +548,24 @@
 // 蒙板
 .bi-mask {
   color: @color-bi-text;
-
   & .bi-input {
     color: @color-bi-text;
   }
-
   & .bi-textarea {
     color: @color-bi-text;
   }
-
   .background-color(@color-bi-background-black, 20%);
 }
 
 .bi-theme-dark {
   .bi-mask {
     color: @color-bi-text-white-theme-dark;
-
     & .bi-input {
       color: @color-bi-text-white-theme-dark;
     }
-
     & .bi-textarea {
       color: @color-bi-text-white-theme-dark;
     }
-
     .background-color(@color-bi-background-default, 20%);
   }
 }
@@ -649,7 +576,7 @@
 }
 
 .bi-theme-dark {
-  .bi-z-index-mask, &.bi-z-index-mask {
+  .bi-z-index-mask {
     //color: @color-bi-background-default;
     //& .bi-input {
     //  color: @color-bi-background-default;

packages/fineui/src/less/core/utils/list-item.less

@@ -161,12 +161,12 @@
       }
     }
     &.active, &:active {
-      color: @color-bi-text-highlight-theme-dark;
+      color: @color-bi-text-highlight;
       & .bi-input {
-        color: @color-bi-text-highlight-theme-dark;
+        color: @color-bi-text-highlight;
       }
       & .bi-textarea {
-        color: @color-bi-text-highlight-theme-dark;
+        color: @color-bi-text-highlight;
       }
     }
     &.disabled {

packages/fineui/src/less/lib/colors.less

@@ -38,7 +38,6 @@
 
 //基本提亮颜色
 @color-bi-text-highlight: @font-color-highlight;
-@color-bi-text-highlight-theme-dark: @font-color-highlight;
 //标红色
 @color-bi-text-redmark: @font-color-warning;
 
@@ -51,7 +50,6 @@
 @color-bi-background-normal: @background-color-normal;
 //深色主题普通背景
 @color-bi-background-normal-theme-dark: @background-color-normal-theme-dark;
-@color-bi-background-theme-dark: @background-color-normal-theme-dark;
 //默认背景
 @color-bi-background-default: @background-color-default;
 //深色主题默认背景
@@ -134,6 +132,3 @@
 @color-bi-border-warning: @border-color-warning;
 //边框提亮
 @color-bi-border-highlight: @border-color-highlight;
-@color-bi-border-highlight-theme-dark: @border-color-highlight;
-
-@color-bi-alert-warning: @color-bi-orange;

packages/fineui/src/less/lib/constant.less

@@ -248,5 +248,3 @@
 
 //box-shadow效果
 @box-shadow-toast: 0 6px 20px -2px rgba(9, 30, 64, 0.16);
-
-@color-bi-orange: #f0ac3c;

packages/fineui/src/less/lib/font.less

@@ -58,8 +58,3 @@
 @font-key: "e1d0";
 
 @font-add: "e1c7";
-
-@font-alert-warning: 'e755';
-@font-alert-success: 'e6de';
-@font-alert-info: 'e74b';
-@font-alert-error: 'e757';

packages/fineui/src/less/lib/theme.less

@@ -62,7 +62,6 @@
 // 按钮
 @color-bi-border-button: @color-bi-border-highlight;
 @color-bi-background-button: @color-bi-background-highlight;
-@color-bi-background-button-theme-dark: @color-bi-background-highlight;
 @color-bi-text-common-button: @color-bi-text;
 @color-bi-text-common-clear-button: @color-bi-text-highlight;
 @color-bi-text-common-plain-button: @color-bi-text-highlight;
@@ -76,9 +75,7 @@
 @color-bi-background-hover-common-ghost-button-theme-dark: @color-bi-background-default;
 
 @color-bi-text-common-light-button: @color-bi-text-highlight;
-@color-bi-text-common-light-button-theme-dark: @color-bi-text-highlight;
 @color-bi-background-common-light-button: @color-bi-background-light-blue;
-@color-bi-background-common-light-button-theme-dark: @color-bi-background-light-blue;
 @color-bi-background-hover-common-light-button: @color-bi-background-light-blue;
 @color-bi-background-active-common-light-button: @color-bi-background-light-blue;
 @color-bi-background-hover-plain-button: @color-black-5;
@@ -205,7 +202,6 @@
 @color-bi-border-picker-button-mask: @color-bi-border-black;
 @color-bi-border-picker-button-mask-theme-dark: @color-bi-border-default;
 @color-bi-border-active-chooser-show-button: @color-bi-border-highlight;
-@color-bi-border-active-chooser-show-button-theme-dark: @color-bi-border-highlight;
 @color-bi-background-disabled-chooser-popup-mask: @color-bi-background-default;
 // combo
 @color-bi-border-hover-combo: @color-bi-border-highlight;

packages/fineui/src/less/resource/app.less

@@ -25,20 +25,10 @@ body {
   outline: 0 none;
 }
 
-@-moz-document url-prefix() {
 div, textarea {
   scrollbar-color: fade(@scroll-color, 10%) fade(@scroll-color, 5%);
   scrollbar-width: thin;
-  }
 
-  .bi-theme-dark {
-    div, textarea {
-      scrollbar-color: fade(@scroll-color-theme-dark, 10%) fade(@scroll-color-theme-dark, 5%);
-    }
-  }
-}
-
-div, textarea {
   &::-webkit-scrollbar {
     -webkit-appearance: none;
     width: 10px;
@@ -73,6 +63,8 @@ div, textarea {
 
 .bi-theme-dark {
   div, textarea {
+    scrollbar-color: fade(@scroll-color-theme-dark, 10%) fade(@scroll-color-theme-dark, 5%);
+
     &::-webkit-scrollbar {
       -webkit-appearance: none;
     }