diff --git a/.npmignore b/.npmignore index bf0de0497..baaa993b9 100644 --- a/.npmignore +++ b/.npmignore @@ -37,3 +37,5 @@ !babel.config.js !babel.config.ie8.js !.eslintrc +!dist/2.0/jsy.min.css +!dist/2.0/bi.min.css diff --git a/bi.lessconfig.json b/bi.lessconfig.json new file mode 100644 index 000000000..975ecf6b6 --- /dev/null +++ b/bi.lessconfig.json @@ -0,0 +1,20 @@ +{ + "@color-primary": "#2C60DB", + "@color-green-100": "#3FC47B", + "@color-light-blue-100": "#19B8EA", + "@color-orange-100": "#FAAA39", + "@color-red-100": "#E65251", + "@color-black": "#000A19", + "@color-light-gray": "#ECEEF3", + "@color-light-gray-theme-dark": "#292F45", + "@color-dim-gray": "#2E3A4D", + "@color-sliver-theme-dark": "363E55", + "@border-color-disabled": "#E7E8EB", + + "@color-bi-background-active-radio": "transparent", + "@color-bi-background-active-radio-content": "#2C60DB", + "@color-bi-background-disabled-active-radio-content": "#D0D4DA", + "@color-bi-background-disabled-active-radio-content-theme-dark": "#606479", + "@color-bi-background-disabled-active-checkbox-content": "#D0D4DA", + "@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479" +} diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot index 4afd41d25..b11de9ca4 100644 Binary files a/dist/font/iconfont.eot and b/dist/font/iconfont.eot differ diff --git a/dist/font/iconfont.svg b/dist/font/iconfont.svg index ab6530d93..0e6a2d923 100644 --- a/dist/font/iconfont.svg +++ b/dist/font/iconfont.svg @@ -14,6 +14,10 @@ /> + + + + diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf index 8aaef189e..1c884f5ca 100644 Binary files a/dist/font/iconfont.ttf and b/dist/font/iconfont.ttf differ diff --git a/dist/font/iconfont.woff b/dist/font/iconfont.woff index ef3407516..501fc8f12 100644 Binary files a/dist/font/iconfont.woff and b/dist/font/iconfont.woff differ diff --git a/dist/font/iconfont.woff2 b/dist/font/iconfont.woff2 index 40fb743a1..5e4470215 100644 Binary files a/dist/font/iconfont.woff2 and b/dist/font/iconfont.woff2 differ diff --git a/dist/images/1x/icon/dark/tree_solid_collapse_1.png b/dist/images/1x/icon/dark/tree_solid_collapse_1.png new file mode 100644 index 000000000..3825febd3 Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_collapse_1.png differ diff --git a/dist/images/1x/icon/dark/tree_solid_collapse_2.png b/dist/images/1x/icon/dark/tree_solid_collapse_2.png new file mode 100644 index 000000000..d9c33bada Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_collapse_2.png differ diff --git a/dist/images/1x/icon/dark/tree_solid_collapse_3.png b/dist/images/1x/icon/dark/tree_solid_collapse_3.png new file mode 100644 index 000000000..a73232ffb Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_collapse_3.png differ diff --git a/dist/images/1x/icon/dark/tree_solid_collapse_4.png b/dist/images/1x/icon/dark/tree_solid_collapse_4.png new file mode 100644 index 000000000..aeb12dd5a Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_collapse_4.png differ diff --git a/dist/images/1x/icon/dark/tree_solid_collapse_5.png b/dist/images/1x/icon/dark/tree_solid_collapse_5.png new file mode 100644 index 000000000..ea1e4a8d6 Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_collapse_5.png differ diff --git a/dist/images/1x/icon/dark/tree_solid_expand_1.png b/dist/images/1x/icon/dark/tree_solid_expand_1.png new file mode 100644 index 000000000..6365fbd12 Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_expand_1.png differ diff --git a/dist/images/1x/icon/dark/tree_solid_expand_2.png b/dist/images/1x/icon/dark/tree_solid_expand_2.png new file mode 100644 index 000000000..fa29e6eb1 Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_expand_2.png differ diff --git a/dist/images/1x/icon/dark/tree_solid_expand_3.png b/dist/images/1x/icon/dark/tree_solid_expand_3.png new file mode 100644 index 000000000..9513a4b82 Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_expand_3.png differ diff --git a/dist/images/1x/icon/dark/tree_solid_expand_4.png b/dist/images/1x/icon/dark/tree_solid_expand_4.png new file mode 100644 index 000000000..6be667d7d Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_expand_4.png differ diff --git a/dist/images/1x/icon/dark/tree_solid_expand_5.png b/dist/images/1x/icon/dark/tree_solid_expand_5.png new file mode 100644 index 000000000..66648d619 Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_expand_5.png differ diff --git a/dist/images/1x/icon/dark/tree_solid_vertical_line_1.png b/dist/images/1x/icon/dark/tree_solid_vertical_line_1.png new file mode 100644 index 000000000..a64ab7e49 Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_vertical_line_1.png differ diff --git a/dist/images/1x/icon/dark/tree_solid_vertical_line_2.png b/dist/images/1x/icon/dark/tree_solid_vertical_line_2.png new file mode 100644 index 000000000..e43e151e7 Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_vertical_line_2.png differ diff --git a/dist/images/1x/icon/dark/tree_solid_vertical_line_3.png b/dist/images/1x/icon/dark/tree_solid_vertical_line_3.png new file mode 100644 index 000000000..a7b4e4bf0 Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_vertical_line_3.png differ diff --git a/dist/images/1x/icon/dark/tree_solid_vertical_line_4.png b/dist/images/1x/icon/dark/tree_solid_vertical_line_4.png new file mode 100644 index 000000000..20d66af62 Binary files /dev/null and b/dist/images/1x/icon/dark/tree_solid_vertical_line_4.png differ diff --git a/dist/images/1x/icon/tree_solid_collapse_1.png b/dist/images/1x/icon/tree_solid_collapse_1.png new file mode 100644 index 000000000..a5e5dcf9c Binary files /dev/null and b/dist/images/1x/icon/tree_solid_collapse_1.png differ diff --git a/dist/images/1x/icon/tree_solid_collapse_2.png b/dist/images/1x/icon/tree_solid_collapse_2.png new file mode 100644 index 000000000..2acf7e7c4 Binary files /dev/null and b/dist/images/1x/icon/tree_solid_collapse_2.png differ diff --git a/dist/images/1x/icon/tree_solid_collapse_3.png b/dist/images/1x/icon/tree_solid_collapse_3.png new file mode 100644 index 000000000..5bd6fbe19 Binary files /dev/null and b/dist/images/1x/icon/tree_solid_collapse_3.png differ diff --git a/dist/images/1x/icon/tree_solid_collapse_4.png b/dist/images/1x/icon/tree_solid_collapse_4.png new file mode 100644 index 000000000..b445df5d9 Binary files /dev/null and b/dist/images/1x/icon/tree_solid_collapse_4.png differ diff --git a/dist/images/1x/icon/tree_solid_collapse_5.png b/dist/images/1x/icon/tree_solid_collapse_5.png new file mode 100644 index 000000000..f69e7dfb7 Binary files /dev/null and b/dist/images/1x/icon/tree_solid_collapse_5.png differ diff --git a/dist/images/1x/icon/tree_solid_expand_1.png b/dist/images/1x/icon/tree_solid_expand_1.png new file mode 100644 index 000000000..0b28d5e7e Binary files /dev/null and b/dist/images/1x/icon/tree_solid_expand_1.png differ diff --git a/dist/images/1x/icon/tree_solid_expand_2.png b/dist/images/1x/icon/tree_solid_expand_2.png new file mode 100644 index 000000000..e418819a2 Binary files /dev/null and b/dist/images/1x/icon/tree_solid_expand_2.png differ diff --git a/dist/images/1x/icon/tree_solid_expand_3.png b/dist/images/1x/icon/tree_solid_expand_3.png new file mode 100644 index 000000000..6759ade95 Binary files /dev/null and b/dist/images/1x/icon/tree_solid_expand_3.png differ diff --git a/dist/images/1x/icon/tree_solid_expand_4.png b/dist/images/1x/icon/tree_solid_expand_4.png new file mode 100644 index 000000000..b8357157d Binary files /dev/null and b/dist/images/1x/icon/tree_solid_expand_4.png differ diff --git a/dist/images/1x/icon/tree_solid_expand_5.png b/dist/images/1x/icon/tree_solid_expand_5.png new file mode 100644 index 000000000..a4ed55589 Binary files /dev/null and b/dist/images/1x/icon/tree_solid_expand_5.png differ diff --git a/dist/images/1x/icon/tree_solid_vertical_line_1.png b/dist/images/1x/icon/tree_solid_vertical_line_1.png new file mode 100644 index 000000000..b80a5808f Binary files /dev/null and b/dist/images/1x/icon/tree_solid_vertical_line_1.png differ diff --git a/dist/images/1x/icon/tree_solid_vertical_line_2.png b/dist/images/1x/icon/tree_solid_vertical_line_2.png new file mode 100644 index 000000000..894cfd153 Binary files /dev/null and b/dist/images/1x/icon/tree_solid_vertical_line_2.png differ diff --git a/dist/images/1x/icon/tree_solid_vertical_line_3.png b/dist/images/1x/icon/tree_solid_vertical_line_3.png new file mode 100644 index 000000000..8a6914b63 Binary files /dev/null and b/dist/images/1x/icon/tree_solid_vertical_line_3.png differ diff --git a/dist/images/1x/icon/tree_solid_vertical_line_4.png b/dist/images/1x/icon/tree_solid_vertical_line_4.png new file mode 100644 index 000000000..28d18d2a9 Binary files /dev/null and b/dist/images/1x/icon/tree_solid_vertical_line_4.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_collapse_1.png b/dist/images/2x/icon/dark/tree_solid_collapse_1.png new file mode 100644 index 000000000..9bd5051d1 Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_collapse_1.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_collapse_2.png b/dist/images/2x/icon/dark/tree_solid_collapse_2.png new file mode 100644 index 000000000..a111825f4 Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_collapse_2.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_collapse_3.png b/dist/images/2x/icon/dark/tree_solid_collapse_3.png new file mode 100644 index 000000000..c16ac4fc3 Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_collapse_3.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_collapse_4.png b/dist/images/2x/icon/dark/tree_solid_collapse_4.png new file mode 100644 index 000000000..f8b7f8ef2 Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_collapse_4.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_collapse_5.png b/dist/images/2x/icon/dark/tree_solid_collapse_5.png new file mode 100644 index 000000000..5620b0886 Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_collapse_5.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_expand_1.png b/dist/images/2x/icon/dark/tree_solid_expand_1.png new file mode 100644 index 000000000..edae4d431 Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_expand_1.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_expand_2.png b/dist/images/2x/icon/dark/tree_solid_expand_2.png new file mode 100644 index 000000000..5951e659f Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_expand_2.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_expand_3.png b/dist/images/2x/icon/dark/tree_solid_expand_3.png new file mode 100644 index 000000000..de68cf779 Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_expand_3.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_expand_4.png b/dist/images/2x/icon/dark/tree_solid_expand_4.png new file mode 100644 index 000000000..dee6827fb Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_expand_4.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_expand_5.png b/dist/images/2x/icon/dark/tree_solid_expand_5.png new file mode 100644 index 000000000..6b6a559f9 Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_expand_5.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_vertical_line_1.png b/dist/images/2x/icon/dark/tree_solid_vertical_line_1.png new file mode 100644 index 000000000..2c674dfd9 Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_vertical_line_1.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_vertical_line_2.png b/dist/images/2x/icon/dark/tree_solid_vertical_line_2.png new file mode 100644 index 000000000..ab5584b5f Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_vertical_line_2.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_vertical_line_3.png b/dist/images/2x/icon/dark/tree_solid_vertical_line_3.png new file mode 100644 index 000000000..adf63d3d5 Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_vertical_line_3.png differ diff --git a/dist/images/2x/icon/dark/tree_solid_vertical_line_4.png b/dist/images/2x/icon/dark/tree_solid_vertical_line_4.png new file mode 100644 index 000000000..17c39572d Binary files /dev/null and b/dist/images/2x/icon/dark/tree_solid_vertical_line_4.png differ diff --git a/dist/images/2x/icon/tree_solid_collapse_1.png b/dist/images/2x/icon/tree_solid_collapse_1.png new file mode 100644 index 000000000..3aa9463ad Binary files /dev/null and b/dist/images/2x/icon/tree_solid_collapse_1.png differ diff --git a/dist/images/2x/icon/tree_solid_collapse_2.png b/dist/images/2x/icon/tree_solid_collapse_2.png new file mode 100644 index 000000000..b0be8e5c0 Binary files /dev/null and b/dist/images/2x/icon/tree_solid_collapse_2.png differ diff --git a/dist/images/2x/icon/tree_solid_collapse_3.png b/dist/images/2x/icon/tree_solid_collapse_3.png new file mode 100644 index 000000000..b592b6a14 Binary files /dev/null and b/dist/images/2x/icon/tree_solid_collapse_3.png differ diff --git a/dist/images/2x/icon/tree_solid_collapse_4.png b/dist/images/2x/icon/tree_solid_collapse_4.png new file mode 100644 index 000000000..f9b67b9cd Binary files /dev/null and b/dist/images/2x/icon/tree_solid_collapse_4.png differ diff --git a/dist/images/2x/icon/tree_solid_collapse_5.png b/dist/images/2x/icon/tree_solid_collapse_5.png new file mode 100644 index 000000000..55e059d6f Binary files /dev/null and b/dist/images/2x/icon/tree_solid_collapse_5.png differ diff --git a/dist/images/2x/icon/tree_solid_expand_1.png b/dist/images/2x/icon/tree_solid_expand_1.png new file mode 100644 index 000000000..751eac8f4 Binary files /dev/null and b/dist/images/2x/icon/tree_solid_expand_1.png differ diff --git a/dist/images/2x/icon/tree_solid_expand_2.png b/dist/images/2x/icon/tree_solid_expand_2.png new file mode 100644 index 000000000..2a94194d1 Binary files /dev/null and b/dist/images/2x/icon/tree_solid_expand_2.png differ diff --git a/dist/images/2x/icon/tree_solid_expand_3.png b/dist/images/2x/icon/tree_solid_expand_3.png new file mode 100644 index 000000000..2300dad28 Binary files /dev/null and b/dist/images/2x/icon/tree_solid_expand_3.png differ diff --git a/dist/images/2x/icon/tree_solid_expand_4.png b/dist/images/2x/icon/tree_solid_expand_4.png new file mode 100644 index 000000000..7eb88716c Binary files /dev/null and b/dist/images/2x/icon/tree_solid_expand_4.png differ diff --git a/dist/images/2x/icon/tree_solid_expand_5.png b/dist/images/2x/icon/tree_solid_expand_5.png new file mode 100644 index 000000000..7ae297dd6 Binary files /dev/null and b/dist/images/2x/icon/tree_solid_expand_5.png differ diff --git a/dist/images/2x/icon/tree_solid_vertical_line_1.png b/dist/images/2x/icon/tree_solid_vertical_line_1.png new file mode 100644 index 000000000..2b1a23d9b Binary files /dev/null and b/dist/images/2x/icon/tree_solid_vertical_line_1.png differ diff --git a/dist/images/2x/icon/tree_solid_vertical_line_2.png b/dist/images/2x/icon/tree_solid_vertical_line_2.png new file mode 100644 index 000000000..429f958ac Binary files /dev/null and b/dist/images/2x/icon/tree_solid_vertical_line_2.png differ diff --git a/dist/images/2x/icon/tree_solid_vertical_line_3.png b/dist/images/2x/icon/tree_solid_vertical_line_3.png new file mode 100644 index 000000000..a44f13db0 Binary files /dev/null and b/dist/images/2x/icon/tree_solid_vertical_line_3.png differ diff --git a/dist/images/2x/icon/tree_solid_vertical_line_4.png b/dist/images/2x/icon/tree_solid_vertical_line_4.png new file mode 100644 index 000000000..7de47eeed Binary files /dev/null and b/dist/images/2x/icon/tree_solid_vertical_line_4.png differ diff --git a/jsy.lessconfig.json b/jsy.lessconfig.json new file mode 100644 index 000000000..8e2974193 --- /dev/null +++ b/jsy.lessconfig.json @@ -0,0 +1,20 @@ +{ + "@color-primary": "#00acbe", + "font-color-normal": "#0d1540", + "font-color-light-gray": "#0d1540", + "font-color-disabled": "fade(#0d1540, 40)", + "font-color-light-disabled": "fade(#0d1540, 20)", + "font-color-success": "#28b668", + "font-color-negative": "#e65251", + "font-color-warning": "#faaa39", + "font-color-tips": "fade(#0d1540, 40)", + + "background-color-light-disabled": "fade(#0d1540, 5)", + "background-color-dark-success": "#28b668", + "background-color-negative": "#e65251", + "background-color-warning": "#faaa39", + + "border-color-disabled": "#e8eaed", + "border-color-success": "#28b668", + "border-color-negative": "#e65251" +} \ No newline at end of file diff --git a/package.json b/package.json index 63f1a90a0..741693633 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220116152304", + "version": "2.0.20220120115227", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", @@ -54,7 +54,8 @@ }, "scripts": { "webpack:dev": "node --max_old_space_size=4096 node_modules/webpack-dev-server/bin/webpack-dev-server.js -p --progress --host 0.0.0.0 --config=webpack/webpack.dev.js --mode development", - "webpack:prod": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack -p --progress --config=webpack/webpack.prod.js --mode production", + "webpack:prod": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack -p --progress --config=webpack/webpack.prod.js --mode production && npm run biCss && npm run jsyCss", + "webpack:css": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack -p --progress --config=webpack/webpack.css.js --mode production", "start": "node server.js", "build": "npm run webpack:prod && tsc", "postbuild": "node ./lib/postbuild/postbuild.js", @@ -62,7 +63,9 @@ "dev": "npm run webpack:dev", "prepublishToPrivate": "npm run build && node ./lib/prepublish/prepublish.js", "publishToPrivate": "npm publish", - "postpublishToPrivate": " node ./lib/postpublish/postpublish.js" + "postpublishToPrivate": " node ./lib/postpublish/postpublish.js", + "biCss": "cross-env LESS_CONFIG_PATH=bi.lessconfig.json LESS_FILE_NAME=bi npm run webpack:css", + "jsyCss": "cross-env LESS_CONFIG_PATH=jsy.lessconfig.json LESS_FILE_NAME=jsy npm run webpack:css" }, "repository": { "type": "git", diff --git a/private/modern/app.less b/private/modern/app.less deleted file mode 100644 index d086387ac..000000000 --- a/private/modern/app.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../src/less/resource/app"; -@import "var"; diff --git a/private/modern/background.less b/private/modern/background.less deleted file mode 100644 index 996147127..000000000 --- a/private/modern/background.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../src/less/resource/background"; -@import "var"; diff --git a/private/modern/font.less b/private/modern/font.less deleted file mode 100644 index c236f82ed..000000000 --- a/private/modern/font.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../src/less/resource/font"; -@import "var"; diff --git a/private/modern/icon.less b/private/modern/icon.less deleted file mode 100644 index 43e3123c5..000000000 --- a/private/modern/icon.less +++ /dev/null @@ -1,5 +0,0 @@ -@import "../../src/less/resource/icon"; -@import "var"; - - - diff --git a/private/modern/var.less b/private/modern/var.less deleted file mode 100644 index 9eff8bc78..000000000 --- a/private/modern/var.less +++ /dev/null @@ -1,5 +0,0 @@ -@import "../../src/less/index-modern"; -@webUrl: './'; -@fontUrl: '@{webUrl}font/'; //图片的基本地址 -@imageUrl: '@{webUrl}images/1x/'; //图片的基本地址 -@image2xUrl: '@{webUrl}images/2x/'; //2倍图片的基本地址 diff --git a/public/modern/app.less b/public/modern/app.less deleted file mode 100644 index d086387ac..000000000 --- a/public/modern/app.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../src/less/resource/app"; -@import "var"; diff --git a/public/modern/background.less b/public/modern/background.less deleted file mode 100644 index 996147127..000000000 --- a/public/modern/background.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../src/less/resource/background"; -@import "var"; diff --git a/public/modern/font.less b/public/modern/font.less deleted file mode 100644 index c236f82ed..000000000 --- a/public/modern/font.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../src/less/resource/font"; -@import "var"; diff --git a/public/modern/icon.less b/public/modern/icon.less deleted file mode 100644 index 43e3123c5..000000000 --- a/public/modern/icon.less +++ /dev/null @@ -1,5 +0,0 @@ -@import "../../src/less/resource/icon"; -@import "var"; - - - diff --git a/public/modern/var.less b/public/modern/var.less deleted file mode 100644 index 189948635..000000000 --- a/public/modern/var.less +++ /dev/null @@ -1,6 +0,0 @@ -@import "../../src/less/index-modern"; -@webUrl: 'https://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/'; -@fontUrl: '@{webUrl}font/'; //图片的基本地址 -@imageUrl: '@{webUrl}images/1x/'; //图片的基本地址 -@image2xUrl: '@{webUrl}images/2x/'; //2倍图片的基本地址 - diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index 94c2fab8a..58f1b23cd 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -1,5 +1,6 @@ !(function () { var needHideWhenAnotherComboOpen = {}; + var currentOpenedCombos = {}; /** * @class BI.Combo * @extends BI.Widget @@ -83,7 +84,7 @@ element: this }, BI.LogicFactory.createLogic("vertical", BI.extend(o.logic, { items: [ - { el: this.combo } + {el: this.combo} ] })))); o.isDefaultInit && (this._assertPopupView()); @@ -141,6 +142,7 @@ this.element.removeClass(this.options.comboClass); delete needHideWhenAnotherComboOpen[this.getName()]; + delete currentOpenedCombos[this.getName()]; BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName()); @@ -152,7 +154,7 @@ this._assertPopupViewRender(); this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW); // popupVisible是为了获取其宽高, 放到可视范围之外以防止在IE下闪一下 - this.popupView.css({ left: -999999999, top: -99999999 }); + this.popupView.css({left: -999999999, top: -99999999}); this.popupView.visible(); BI.each(needHideWhenAnotherComboOpen, function (i, combo) { if (i !== self.getName()) { @@ -161,6 +163,7 @@ } } }); + currentOpenedCombos[this.getName()] = this; this.options.hideWhenAnotherComboOpen && (needHideWhenAnotherComboOpen[this.getName()] = this); this.adjustWidth(e); this.adjustHeight(e); @@ -300,8 +303,18 @@ BI.Resizers.remove(this.getName()); this.popupView && this.popupView._destroy(); delete needHideWhenAnotherComboOpen[this.getName()]; + delete currentOpenedCombos[this.getName()]; } }); + BI.Combo.closeAll = function () { + BI.each(currentOpenedCombos, function (i, combo) { + if (combo) { + combo.hideView(); + } + }); + currentOpenedCombos = {}; + needHideWhenAnotherComboOpen = {}; + }; BI.Combo.EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE"; BI.Combo.EVENT_CHANGE = "EVENT_CHANGE"; BI.Combo.EVENT_EXPAND = "EVENT_EXPAND"; diff --git a/src/base/layer/layer.popup.js b/src/base/layer/layer.popup.js index 66db79ec7..53c8e17d1 100644 --- a/src/base/layer/layer.popup.js +++ b/src/base/layer/layer.popup.js @@ -7,6 +7,8 @@ BI.PopupView = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.PopupView.superclass._defaultConfig.apply(this, arguments), { _baseCls: "bi-popup-view", + // 品牌色 + primary: false, maxWidth: "auto", minWidth: 100, // maxHeight: 200, @@ -84,7 +86,7 @@ BI.PopupView = BI.inherit(BI.Widget, { hgap: o.hgap, items: BI.LogicFactory.createLogicItemsByDirection(o.direction, BI.extend({ - cls: "list-view-outer bi-card list-view-shadow" + cls: "list-view-outer bi-card list-view-shadow" + (o.primary ? " bi-primary" : "") }, BI.LogicFactory.createLogic(BI.LogicFactory.createLogicTypeByDirection(o.direction), BI.extend({}, o.logic, { items: BI.LogicFactory.createLogicItemsByDirection(o.direction, this.tool, this.tab, this.view, this.toolbar) }))) diff --git a/src/base/single/input/file.js b/src/base/single/input/file.js index 904fbfcf5..e9b1a5a2a 100644 --- a/src/base/single/input/file.js +++ b/src/base/single/input/file.js @@ -696,9 +696,9 @@ _setEnable: function (enable) { BI.File.superclass._setEnable.apply(this, arguments); if (enable === true) { - this.element.attr("disabled", "disabled"); - } else { this.element.removeAttr("disabled"); + } else { + this.element.attr("disabled", "disabled"); } } }); diff --git a/src/case/button/node/node.first.plus.js b/src/case/button/node/node.first.plus.js index 7969867fb..3489f2a32 100644 --- a/src/case/button/node/node.first.plus.js +++ b/src/case/button/node/node.first.plus.js @@ -23,7 +23,9 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.checkbox = BI.createWidget({ type: "bi.first_tree_node_checkbox", - stopPropagation: true + stopPropagation: true, + iconHeight: o.height, + iconWidth: o.height }); this.text = BI.createWidget({ type: "bi.label", diff --git a/src/case/button/node/node.last.plus.js b/src/case/button/node/node.last.plus.js index acc72d6a3..b7bedc519 100644 --- a/src/case/button/node/node.last.plus.js +++ b/src/case/button/node/node.last.plus.js @@ -23,7 +23,9 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.checkbox = BI.createWidget({ type: "bi.last_tree_node_checkbox", - stopPropagation: true + stopPropagation: true, + iconHeight: o.height, + iconWidth: o.height }); this.text = BI.createWidget({ type: "bi.label", diff --git a/src/case/button/node/node.mid.plus.js b/src/case/button/node/node.mid.plus.js index 4615ce7b9..6286db826 100644 --- a/src/case/button/node/node.mid.plus.js +++ b/src/case/button/node/node.mid.plus.js @@ -23,7 +23,9 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.checkbox = BI.createWidget({ type: "bi.mid_tree_node_checkbox", - stopPropagation: true + stopPropagation: true, + iconHeight: o.height, + iconWidth: o.height }); this.text = BI.createWidget({ type: "bi.label", @@ -48,7 +50,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/case/button/node/node.plus.js b/src/case/button/node/node.plus.js index 16b78b8f1..3d71fc892 100644 --- a/src/case/button/node/node.plus.js +++ b/src/case/button/node/node.plus.js @@ -22,7 +22,9 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, { BI.PlusGroupNode.superclass._init.apply(this, arguments); var self = this, o = this.options; this.checkbox = BI.createWidget({ - type: "bi.tree_node_checkbox" + type: "bi.tree_node_checkbox", + iconHeight: o.height, + iconWidth: o.height }); this.text = BI.createWidget({ type: "bi.label", diff --git a/src/case/button/treeitem/item.first.treeleaf.js b/src/case/button/treeitem/item.first.treeleaf.js index afaa2f6fc..52663de39 100644 --- a/src/case/button/treeitem/item.first.treeleaf.js +++ b/src/case/button/treeitem/item.first.treeleaf.js @@ -28,19 +28,19 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 12, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2, el: { type: "bi.layout", - cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 12, + cls: (o.pNode && o.pNode.isLastNode) ? "" : this._getBaseLineCls(), + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2, height: o.height } }), { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: { type: "bi.layout", - cls: "first-line-conn-background", - width: 24, + cls: this._getFirstLineCls(), + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, height: o.height } }, { @@ -53,6 +53,24 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, { })))); }, + _getBaseLineCls: function () { + switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) { + case "solid": + return "base-solid-line-conn-background"; + default: + return "base-line-conn-background"; + } + }, + + _getFirstLineCls: function () { + switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) { + case "solid": + return "first-solid-line-conn-background"; + default: + return "first-line-conn-background"; + } + }, + doRedMark: function () { this.text.doRedMark.apply(this.text, arguments); }, diff --git a/src/case/button/treeitem/item.last.treeleaf.js b/src/case/button/treeitem/item.last.treeleaf.js index 8b30892a3..76449063e 100644 --- a/src/case/button/treeitem/item.last.treeleaf.js +++ b/src/case/button/treeitem/item.last.treeleaf.js @@ -28,19 +28,19 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 12, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2, el: { type: "bi.layout", - cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 12, + cls: (o.pNode && o.pNode.isLastNode) ? "" : this._getBaseLineCls(), + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2, height: o.height } }), { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: { type: "bi.layout", - cls: "last-line-conn-background", - width: 24, + cls: this._getLastLineCls(), + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, height: o.height } }, { @@ -53,6 +53,24 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, { })))); }, + _getBaseLineCls: function () { + switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) { + case "solid": + return "base-solid-line-conn-background"; + default: + return "base-line-conn-background"; + } + }, + + _getLastLineCls: function () { + switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) { + case "solid": + return "last-solid-line-conn-background"; + default: + return "last-line-conn-background"; + } + }, + doRedMark: function () { this.text.doRedMark.apply(this.text, arguments); }, diff --git a/src/case/button/treeitem/item.mid.treeleaf.js b/src/case/button/treeitem/item.mid.treeleaf.js index a3a7a6c93..58af36e4e 100644 --- a/src/case/button/treeitem/item.mid.treeleaf.js +++ b/src/case/button/treeitem/item.mid.treeleaf.js @@ -28,19 +28,19 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : { - width: 12, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2, el: { type: "bi.layout", - cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background", - width: 12, + cls: (o.pNode && o.pNode.isLastNode) ? "" : this._getBaseLineCls(), + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2, height: o.height } }), { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: { type: "bi.layout", - cls: "mid-line-conn-background", - width: 24, + cls: this._getMidLineCls(), + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, height: o.height } }, { @@ -53,6 +53,24 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, { })))); }, + _getBaseLineCls: function () { + switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) { + case "solid": + return "base-solid-line-conn-background"; + default: + return "base-line-conn-background"; + } + }, + + _getMidLineCls: function () { + switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) { + case "solid": + return "mid-solid-line-conn-background"; + default: + return "mid-line-conn-background"; + } + }, + doRedMark: function () { this.text.doRedMark.apply(this.text, arguments); }, diff --git a/src/case/button/treeitem/item.root.treeleaf.js b/src/case/button/treeitem/item.root.treeleaf.js index 8e1a9a02f..f4637afdc 100644 --- a/src/case/button/treeitem/item.root.treeleaf.js +++ b/src/case/button/treeitem/item.root.treeleaf.js @@ -31,10 +31,10 @@ BI.RootTreeLeafItem = BI.inherit(BI.BasicButton, { var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: { type: "bi.layout", - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, height: o.height } }, { diff --git a/src/case/checkbox/check.first.treenode.js b/src/case/checkbox/check.first.treenode.js index 572908d8d..aa808488f 100644 --- a/src/case/checkbox/check.first.treenode.js +++ b/src/case/checkbox/check.first.treenode.js @@ -6,18 +6,27 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { - extraCls: "tree-collapse-icon-type2", + extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type2" : "tree-collapse-icon-type2", iconWidth: 24, iconHeight: 24 }); }, + getLineCls: function () { + switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) { + case "solid": + return "tree-solid-expand-icon-type2"; + default: + return "tree-expand-icon-type2"; + } + }, + setSelected: function (v) { BI.FirstTreeNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v === true) { - this.element.addClass("tree-expand-icon-type2"); + this.element.addClass(this.getLineCls()); } else { - this.element.removeClass("tree-expand-icon-type2"); + this.element.removeClass(this.getLineCls()); } } }); diff --git a/src/case/checkbox/check.last.treenode.js b/src/case/checkbox/check.last.treenode.js index e0a9f621d..cb536f8cc 100644 --- a/src/case/checkbox/check.last.treenode.js +++ b/src/case/checkbox/check.last.treenode.js @@ -6,18 +6,27 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { - extraCls: "tree-collapse-icon-type4", + extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type4" : "tree-collapse-icon-type4", iconWidth: 24, iconHeight: 24 }); }, + getLineCls: function () { + switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) { + case "solid": + return "tree-solid-expand-icon-type4"; + default: + return "tree-expand-icon-type4"; + } + }, + setSelected: function (v) { BI.LastTreeNodeCheckbox.superclass.setSelected.apply(this, arguments); if (v === true) { - this.element.addClass("tree-expand-icon-type4"); + this.element.addClass(this.getLineCls()); } else { - this.element.removeClass("tree-expand-icon-type4"); + this.element.removeClass(this.getLineCls()); } } }); diff --git a/src/case/checkbox/check.mid.treenode.js b/src/case/checkbox/check.mid.treenode.js index 7679b466e..7ec4e5230 100644 --- a/src/case/checkbox/check.mid.treenode.js +++ b/src/case/checkbox/check.mid.treenode.js @@ -6,18 +6,27 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { - extraCls: "tree-collapse-icon-type3", + extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type3" : "tree-collapse-icon-type3", iconWidth: 24, iconHeight: 24 }); }, + getLineCls: function () { + switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) { + case "solid": + return "tree-solid-expand-icon-type3"; + default: + return "tree-expand-icon-type3"; + } + }, + setSelected: function (v) { BI.MidTreeNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v === true) { - this.element.addClass("tree-expand-icon-type3"); + this.element.addClass(this.getLineCls()); } else { - this.element.removeClass("tree-expand-icon-type3"); + this.element.removeClass(this.getLineCls()); } } }); diff --git a/src/case/checkbox/check.treenode.js b/src/case/checkbox/check.treenode.js index b5642aae4..128bb73c6 100644 --- a/src/case/checkbox/check.treenode.js +++ b/src/case/checkbox/check.treenode.js @@ -6,18 +6,27 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { - extraCls: "tree-collapse-icon-type1", + extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type1" : "tree-collapse-icon-type1", iconWidth: 24, iconHeight: 24 }); }, + getLineCls: function () { + switch (BI.STYLE_CONSTANTS.LINK_LINE_TYPE) { + case "solid": + return "tree-solid-expand-icon-type1"; + default: + return "tree-expand-icon-type1"; + } + }, + setSelected: function (v) { BI.TreeNodeCheckbox.superclass.setSelected.apply(this, arguments); if(v) { - this.element.addClass("tree-expand-icon-type1"); + this.element.addClass(this.getLineCls()); } else { - this.element.removeClass("tree-expand-icon-type1"); + this.element.removeClass(this.getLineCls()); } } }); diff --git a/src/case/combo/bubblecombo/combo.bubble.js b/src/case/combo/bubblecombo/combo.bubble.js index 3e9e4c750..dbd42e84d 100644 --- a/src/case/combo/bubblecombo/combo.bubble.js +++ b/src/case/combo/bubblecombo/combo.bubble.js @@ -13,6 +13,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { baseCls: "bi-bubble-combo", trigger: "click", toggle: true, + primary: false, direction: "bottom,left", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right isDefaultInit: false, destroyWhenHide: false, @@ -57,6 +58,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { type: "bi.bubble_popup_view", animation: "bi-zoom-big", animationDuring: 200, + primary: o.primary }, o.popup) }); this.combo.on(BI.Combo.EVENT_TRIGGER_CHANGE, function () { @@ -95,7 +97,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { }, _createTriangle: function (direction) { - var pos = {}, op = {}; + var o = this.options, pos = {}, op = {}; var adjustLength = this.options.adjustLength; var offset = this.element.offset(); var left = offset.left, right = offset.left + this.element.outerWidth(); @@ -143,7 +145,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { cls: "button-combo-triangle-wrapper", items: [{ type: "bi.layout", - cls: "bubble-combo-triangle-" + direction + cls: "bubble-combo-triangle-" + direction + (o.primary ? " bi-primary": "") }] }); pos.el = this.triangle; diff --git a/src/case/combo/bubblecombo/popup.bubble.js b/src/case/combo/bubblecombo/popup.bubble.js index f0a79f116..cbb15070a 100644 --- a/src/case/combo/bubblecombo/popup.bubble.js +++ b/src/case/combo/bubblecombo/popup.bubble.js @@ -9,9 +9,9 @@ BI.BubblePopupView = BI.inherit(BI.PopupView, { var config = BI.BubblePopupView.superclass._defaultConfig.apply(this, arguments); return BI.extend(config, { baseCls: config.baseCls + " bi-bubble-popup-view", - minWidth: 220, + minWidth: 70, maxWidth: 300, - minHeight: 90 + minHeight: 50 }); }, }); @@ -60,11 +60,11 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, { }); return BI.createWidget({ type: "bi.center", - height: 44, - rgap: 15, + height: 54, + rgap: 20, items: [{ type: "bi.right_vertical_adapt", - lgap: 10, + lgap: 15, items: items }] }); @@ -79,12 +79,12 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, { layouts: [{ type: "bi.vertical", cls: "bar-popup-container", - hgap: 15, - tgap: 10 + hgap: 20, + tgap: 15 }] }); - button.element.css("min-height", o.minHeight - 44); + button.element.css("min-height", o.minHeight - 54); return button; } @@ -134,6 +134,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, { }); return { type: "bi.bubble_bar_popup_view", + primary: o.primary, minWidth: o.minWidth, maxWidth: o.maxWidth, minHeight: o.minHeight, diff --git a/src/case/tree/tree.level.js b/src/case/tree/tree.level.js index eb6d5099d..baac6a94c 100644 --- a/src/case/tree/tree.level.js +++ b/src/case/tree/tree.level.js @@ -26,7 +26,7 @@ BI.LevelTree = BI.inherit(BI.Widget, { _formatItems: function (nodes, layer, pNode) { var self = this; BI.each(nodes, function (i, node) { - var extend = { layer: layer }; + var extend = { layer: layer, height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT }; if (!BI.isKey(node.id)) { node.id = BI.UUID(); } diff --git a/src/case/tree/treeexpander/tree.expander.popup.js b/src/case/tree/treeexpander/tree.expander.popup.js index 6deae0982..bf2c6addb 100644 --- a/src/case/tree/treeexpander/tree.expander.popup.js +++ b/src/case/tree/treeexpander/tree.expander.popup.js @@ -1,16 +1,19 @@ !(function () { var Widget = BI.inherit(BI.Widget, { - props: { - baseCls: "bi-tree-expander-popup", - layer: 0, // 第几层级 - el: {}, - isLastNode: false, + props: function () { + return { + baseCls: "bi-tree-expander-popup", + layer: 0, // 第几层级 + el: {}, + isLastNode: false, + }; }, render: function () { var self = this; var o = this.options; + var offset = BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2; this.popupView = BI.createWidget(BI.extend(o.el, { value: o.value @@ -19,12 +22,12 @@ this.popupView.on(BI.Controller.EVENT_CHANGE, function () { self.fireEvent(BI.Controller.EVENT_CHANGE, arguments); }); - this.popupView.element.css("margin-left", -12 * o.layer); - this.element.css("margin-left", 12 * o.layer); + this.popupView.element.css("margin-left", -offset * o.layer); + this.element.css("margin-left", offset * o.layer); return { type: "bi.vertical", - cls: !o.isLastNode ? "line" : "", + cls: !o.isLastNode ? (BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "line solid" : "line") : "", scrolly: null, items: [ this.popupView, diff --git a/src/case/ztree/0.treeview.js b/src/case/ztree/0.treeview.js index f9dd56f50..5bf3188dc 100644 --- a/src/case/ztree/0.treeview.js +++ b/src/case/ztree/0.treeview.js @@ -51,7 +51,7 @@ BI.TreeView = BI.inherit(BI.Pane, { } this.tree = BI.createWidget({ type: "bi.layout", - element: "
    " + element: "" }); BI.createWidget({ type: "bi.default", diff --git a/src/core/system.js b/src/core/system.js index d12fb9154..5dfe3a0a5 100644 --- a/src/core/system.js +++ b/src/core/system.js @@ -73,4 +73,7 @@ BI.prepares.push(function () { BI.SIZE_CONSANTS = BI.Providers.getProvider("bi.provider.system").getSize(); + // 不再增加线型的配置了,之后不维护前置版本直接删掉，都用实线连接线 + BI.STYLE_CONSTANTS = {}; + BI.STYLE_CONSTANTS.LINK_LINE_TYPE = BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT === 24 ? "dashed" : "solid"; }); diff --git a/src/less/base/combo/combo.bubble.less b/src/less/base/combo/combo.bubble.less index 54223bd5c..16f9f6e9f 100644 --- a/src/less/base/combo/combo.bubble.less +++ b/src/less/base/combo/combo.bubble.less @@ -29,6 +29,9 @@ &:before { background-color: @color-bi-background-bubble-combo-triangle; } + &.bi-primary:before { + background-color: @background-color-primary; + } } } diff --git a/src/less/base/combo/combo.textvalue.icon.less b/src/less/base/combo/combo.textvalue.icon.less index 6951dcebb..79fef76ed 100644 --- a/src/less/base/combo/combo.textvalue.icon.less +++ b/src/less/base/combo/combo.textvalue.icon.less @@ -7,7 +7,7 @@ color: @color-bi-text-error-hover-text-value-icon-combo; } } - &>.bi-border, &>.bi-border-bottom { + &.bi-border, &.bi-border-bottom { border-color: @border-color-negative; } } diff --git a/src/less/base/combo/combo.textvalue.less b/src/less/base/combo/combo.textvalue.less index f1e703030..dbf76aaa0 100644 --- a/src/less/base/combo/combo.textvalue.less +++ b/src/less/base/combo/combo.textvalue.less @@ -7,7 +7,7 @@ color: @color-bi-text-error-hover-text-value-combo; } } - &>.bi-border, &>.bi-border-bottom { + &.bi-border, &.bi-border-bottom { border-color: @border-color-negative; } } diff --git a/src/less/base/tree/tree.expander.less b/src/less/base/tree/tree.expander.less index 85bab28ae..371e39eec 100644 --- a/src/less/base/tree/tree.expander.less +++ b/src/less/base/tree/tree.expander.less @@ -7,3 +7,13 @@ left: 11px; } +.bi-tree-expander-popup.line.solid:before { + border-left: 1px solid @color-bi-border-tree-expander-popup-line; + left: 15px; +} + +.bi-theme-dark { + .bi-tree-expander-popup.line.solid:before { + border-left: 1px solid @color-bi-border-tree-expander-popup-line-theme-dark; + } +} diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less index cbe26d634..eb20d2818 100644 --- a/src/less/base/tree/ztree.less +++ b/src/less/base/tree/ztree.less @@ -25,6 +25,11 @@ padding: 0 0 0 18px } +.ztree.solid li ul { + margin: 0; + padding: 0 0 0 24px +} + // 此处不用2倍图，改用css画虚线 // z-tree的line是一整块子节点区域，所以不能使用background-size: contain // 使用1倍图太模糊，这边就使用css自己画了，calc属性支持IE9, IE8反正会走hack, 不影响 @@ -40,19 +45,33 @@ } } +.ztree.solid li ul.line { + &:before { + border-left: 1px solid @border-color-dark-gray-line; + height: 100%; + left: 15px; + margin-top: 0; + } +} + .bi-theme-dark { .ztree li ul.line { &:before { border-left: 1px dashed @border-color-dark-gray-line; } } + .ztree.solid li ul.line { + &:before { + border-left: 1px solid @border-color-dark-gray-line-theme-dark; + } + } } .ztree li a { padding: 1px 3px 0 0; margin: 0; cursor: pointer; - height: 24px; + height: 23px; background-color: transparent; text-decoration: none; vertical-align: top; @@ -66,6 +85,10 @@ } } +.ztree.solid li a { + height: 31px; +} + .ztree li a.curSelectedNode { } @@ -113,6 +136,10 @@ } } +.ztree.solid li span { + line-height: 32px; +} + .ztree li span.button { line-height: 0; margin: 0; @@ -229,6 +256,11 @@ height: 24px } +.ztree.solid li span.button.switch { + width: 32px; + height: 32px +} + .ztree li span.button.switch.noline_open { width: 0; } diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index 21caf1b3a..0dfefd2af 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -122,6 +122,10 @@ & .bi-textarea { color: @color-bi-text-card; } + &.bi-primary { + background-color: @background-color-primary; + color: @color-card-primary; + } } .bi-theme-dark { diff --git a/src/less/index-modern.less b/src/less/index-modern.less deleted file mode 100644 index 3edda1ca0..000000000 --- a/src/less/index-modern.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "lib/colors-modern"; -@import "lib/theme-modern"; diff --git a/src/less/lib/colors-modern.less b/src/less/lib/colors-modern.less deleted file mode 100644 index 72d0c388d..000000000 --- a/src/less/lib/colors-modern.less +++ /dev/null @@ -1,181 +0,0 @@ -@import "constant"; - -// 通用色彩库。从constant.less中获取相关颜色,不要出现#xxxxxx - -//默认字体颜色 -@color-bi-text-normal: var(--color-bi-text-normal); -//深色主题默认字体颜色 -@color-bi-text-theme-dark: var(--color-bi-text-theme-dark); -@color-bi-text-normal-theme-dark: var(--color-bi-text-normal-theme-dark); -//黑色字体颜色 -@color-bi-text-black: var(--color-bi-text-black); -//深色主题黑色字体颜色 -@color-bi-text-black-theme-dark: var(--color-bi-text-black-theme-dark); -//灰色字体颜色 -@color-bi-text-gray: var(--color-bi-text-gray); -//浅灰色字体 -@color-bi-text-light-gray: var(--color-bi-text-light-gray); -//深色主题浅灰色字体 -@color-bi-text-light-gray-theme-dark: var(--color-bi-text-light-gray-theme-dark); -//白色字体颜色 -@color-bi-text: var(--color-bi-text); -@color-bi-text-white: var(--color-bi-text-white); -//深色主题白色字体颜色 -@color-bi-text-white-theme-dark: var(--color-bi-text-white-theme-dark); -//灰化字体颜色 -@color-bi-text-disabled: var(--color-bi-text-disabled); -//深色主题灰化字体颜色 -@color-bi-text-disabled-theme-dark: var(--color-bi-text-disabled-theme-dark); -//灰化图标色 -@color-bi-icon-disabled: var(--color-bi-icon-disabled); -//深色主题灰化图标颜色 -@color-bi-icon-disabled-theme-dark: var(--color-bi-icon-disabled-theme-dark); -//提示字体颜色 -@color-bi-text-tips: var(--color-bi-text-tips); -//深色主题提示字体颜色 -@color-bi-text-tips-theme-dark: var(--color-bi-text-tips-theme-dark); -//成功字体颜色 -@color-bi-text-success: var(--color-bi-text-success); -//失败字体颜色 -@color-bi-text-failure: var(--color-bi-text-failure); -//基本提亮颜色 -@color-bi-text-highlight: var(--color-bi-text-highlight); -//标红色 -@color-bi-text-redmark: var(--color-bi-text-redmark); - -//普通背景 -@color-bi-background-normal: var(--color-bi-background-normal); -//深色主题普通背景 -@color-bi-background-normal-theme-dark: var(--color-bi-background-normal-theme-dark); -//默认背景 -@color-bi-background-default: var(--color-bi-background-default); -//深色主题默认背景 -@color-bi-background-default-theme-dark: var(--color-bi-background-default-theme-dark); -//黑色背景 -@color-bi-background-black: var(--color-bi-background-black); -//深色主题黑色背景 -@color-bi-background-black-theme-dark: var(--color-bi-background-black-theme-dark); -//浅黑色背景 -@color-bi-background-light-black: var(--color-bi-background-light-black); -//深色主题浅黑色背景 -@color-bi-background-light-black-theme-dark: var(--color-bi-background-light-black-theme-dark); -//深灰色背景 -@color-bi-background-dark-gray: var(--color-bi-background-dark-gray); -//深色主题深灰色背景 -@color-bi-background-dark-gray-theme-dark: var(--color-bi-background-dark-gray-theme-dark); -//灰色背景(浅) -@color-bi-background-light-gray: var(--color-bi-background-light-gray); -//深色主题灰色背景(浅) -@color-bi-background-light-gray-theme-dark: var(--color-bi-background-light-gray-theme-dark); -//灰色背景(中) -@color-bi-background-medium-gray: var(--color-bi-background-medium-gray); -//深色主题灰色背景(中) -@color-bi-background-medium-gray-theme-dark: var(--color-bi-background-medium-gray-theme-dark); -//灰化背景 -@color-bi-background-disabled: var(--color-bi-background-disabled); -//深色主题灰化背景 -@color-bi-background-disabled-theme-dark: var(--color-bi-background-disabled-theme-dark); -//浅灰化背景 -@color-bi-background-light-disabled: var(--color-bi-background-light-disabled); -//深色主题浅灰化背景 -@color-bi-background-light-disabled-theme-dark: var(--color-bi-background-light-disabled-theme-dark); -//成功背景色 -@color-bi-background-success: var(--color-bi-background-success); -//成功背景色(浅) -@color-bi-background-light-success: var(--color-bi-background-light-success); -//失败背景色 -@color-bi-background-failure: var(--color-bi-background-failure); -//失败背景色(浅) -@color-bi-background-light-failure: var(--color-bi-background-light-failure); -//失败背景色(深) -@color-bi-background-dark-failure: var(--color-bi-background-dark-failure); -//警示背景色 -@color-bi-background-warning: var(--color-bi-background-warning); -//警示背景色(浅) -@color-bi-background-light-warning: var(--color-bi-background-light-warning); -//背景提亮色 -@color-bi-background-highlight: var(--color-bi-background-highlight); -//背景提亮色(浅) -@color-bi-background-light-highlight: var(--color-bi-background-light-highlight); - -//黑色边框色 -@color-bi-border-black: var(--color-bi-border-black); -//默认边框色 -@color-bi-border-default: var(--color-bi-border-default); -//边框线色 -@color-bi-border-line: var(--color-bi-border-line); -//深色主题边框线色 -@color-bi-border-line-theme-dark: var(--color-bi-border-line-theme-dark); -//深灰色边框线 -@color-bi-border-dark-gray-line: var(--color-bi-border-dark-gray-line); -//深灰色主题深色边框线 -@color-bi-border-dark-gray-line-theme-dark: var(--color-bi-border-dark-gray-line-theme-dark); -//深色边框线 -@color-bi-border-dark-line: var(--color-bi-border-dark-line); -//深色主题深色边框线 -@color-bi-border-dark-line-theme-dark: var(--color-bi-border-dark-line-theme-dark); -//灰化边框 -@color-bi-border-disabled: var(--color-bi-border-disabled); -//深色主题灰化边框 -@color-bi-border-disabled-theme-dark: var(--color-bi-border-disabled-theme-dark); -//成功边框色 -@color-bi-border-success: var(--color-bi-border-success); -//失败边框色 -@color-bi-border-failure: var(--color-bi-border-failure); -//警示边框色 -@color-bi-border-warning: var(--color-bi-border-warning); -//边框提亮 -@color-bi-border-highlight: var(--color-bi-border-highlight); - -//颜色百分比 -//green -@color-bi-green-80: var(--color-bi-green-80); -@color-bi-green-60: var(--color-bi-green-60); -@color-bi-green-40: var(--color-bi-green-40); -@color-bi-green-30: var(--color-bi-green-30); -@color-bi-green-20: var(--color-bi-green-20); -@color-bi-green-10: var(--color-bi-green-10); -@color-bi-green-5: var(--color-bi-green-5); - -//blue -@color-bi-blue-80: var(--color-bi-blue-80); -@color-bi-blue-60: var(--color-bi-blue-60); -@color-bi-blue-40: var(--color-bi-blue-40); -@color-bi-blue-30: var(--color-bi-blue-30); -@color-bi-blue-20: var(--color-bi-blue-20); -@color-bi-blue-10: var(--color-bi-blue-10); -@color-bi-blue-5: var(--color-bi-blue-5); - -//light-blue -@color-bi-light-blue-80: var(--color-bi-light-blue-80); -@color-bi-light-blue-60: var(--color-bi-light-blue-60); -@color-bi-light-blue-40: var(--color-bi-light-blue-40); -@color-bi-light-blue-30: var(--color-bi-light-blue-30); -@color-bi-light-blue-20: var(--color-bi-light-blue-20); -@color-bi-light-blue-10: var(--color-bi-light-blue-10); -@color-bi-light-blue-5: var(--color-bi-light-blue-5); - -// orange -@color-bi-orange-80: var(--color-bi-orange-80); -@color-bi-orange-60: var(--color-bi-orange-60); -@color-bi-orange-40: var(--color-bi-orange-40); -@color-bi-orange-30: var(--color-bi-orange-30); -@color-bi-orange-20: var(--color-bi-orange-20); -@color-bi-orange-10: var(--color-bi-orange-10); -@color-bi-orange-5: var(--color-bi-orange-5); - -// red -@color-bi-red-80: var(--color-bi-red-80); -@color-bi-red-60: var(--color-bi-red-60); -@color-bi-red-40: var(--color-bi-red-40); -@color-bi-red-30: var(--color-bi-red-30); -@color-bi-red-20: var(--color-bi-red-20); -@color-bi-red-10: var(--color-bi-red-10); -@color-bi-red-5: var(--color-bi-red-5); - -// yellow -@color-bi-yellow-80: var(--color-bi-yellow-80); -@color-bi-yellow-60: var(--color-bi-yellow-60); -@color-bi-yellow-40: var(--color-bi-yellow-40); -@color-bi-yellow-20: var(--color-bi-yellow-20); -@color-bi-yellow-5: var(--color-bi-yellow-5); diff --git a/src/less/lib/colors.less b/src/less/lib/colors.less index 6ce390b70..394bb5f66 100644 --- a/src/less/lib/colors.less +++ b/src/less/lib/colors.less @@ -26,10 +26,6 @@ @color-bi-text-disabled: @font-color-disabled; //深色主题灰化字体颜色 @color-bi-text-disabled-theme-dark: @font-color-disabled-theme-dark; -//灰化图标色 -@color-bi-icon-disabled: @font-color-light-disabled; -//深色主题灰化图标颜色 -@color-bi-icon-disabled-theme-dark: @font-color-light-disabled-theme-dark; //提示字体颜色 @color-bi-text-tips: @font-color-tips; //深色主题提示字体颜色 @@ -43,6 +39,11 @@ //标红色 @color-bi-text-redmark: @font-color-warning; +//灰化图标色 +@color-bi-icon-disabled: @font-color-light-disabled; +//深色主题灰化图标颜色 +@color-bi-icon-disabled-theme-dark: @font-color-light-disabled-theme-dark; + //普通背景 @color-bi-background-normal: @background-color-normal; //深色主题普通背景 diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index f5cf713f2..6029c7ef9 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -22,232 +22,225 @@ // 色板 // 品牌 -@color-brand-blue-100: #2C60DB; -@color-brand-blue-90: fade(@color-brand-blue-100, 90); -@color-brand-blue-80: fade(@color-brand-blue-100, 80); -@color-brand-blue-60: fade(@color-brand-blue-100, 60); -@color-brand-blue-50: fade(@color-brand-blue-100, 50); -@color-brand-blue-40: fade(@color-brand-blue-100, 40); -@color-brand-blue-30: fade(@color-brand-blue-100, 30); -@color-brand-blue-20: fade(@color-brand-blue-100, 20); -@color-brand-blue-10: fade(@color-brand-blue-100, 10); -@color-brand-blue-5: fade(@color-brand-blue-100, 5); +@color-primary: #3685f2; +@color-card-primary: @color-white; +@background-color-primary: #1e4092; //green -@color-bi-green-100: #13cd66; -@color-bi-green-90: fade(@color-bi-green-100, 90); -@color-bi-green-80: fade(@color-bi-green-100, 80); -@color-bi-green-60: fade(@color-bi-green-100, 60); -@color-bi-green-50: fade(@color-bi-green-100, 50); -@color-bi-green-40: fade(@color-bi-green-100, 40); -@color-bi-green-30: fade(@color-bi-green-100, 30); -@color-bi-green-20: fade(@color-bi-green-100, 20); -@color-bi-green-10: fade(@color-bi-green-100, 10); -@color-bi-green-5: fade(@color-bi-green-100, 5); +@color-green-100: #13cd66; +@color-green-90: fade(@color-green-100, 90); +@color-green-80: fade(@color-green-100, 80); +@color-green-60: fade(@color-green-100, 60); +@color-green-50: fade(@color-green-100, 50); +@color-green-40: fade(@color-green-100, 40); +@color-green-30: fade(@color-green-100, 30); +@color-green-20: fade(@color-green-100, 20); +@color-green-10: fade(@color-green-100, 10); +@color-green-5: fade(@color-green-100, 5); //cyan -@color-bi-sea-green-100: #3FB4AB; -@color-bi-sea-green-90: fade(@color-bi-sea-green-100, 90); -@color-bi-sea-green-80: fade(@color-bi-sea-green-100, 80); -@color-bi-sea-green-60: fade(@color-bi-sea-green-100, 60); -@color-bi-sea-green-50: fade(@color-bi-sea-green-100, 50); -@color-bi-sea-green-40: fade(@color-bi-sea-green-100, 40); -@color-bi-sea-green-30: fade(@color-bi-sea-green-100, 30); -@color-bi-sea-green-20: fade(@color-bi-sea-green-100, 20); -@color-bi-sea-green-10: fade(@color-bi-sea-green-100, 10); -@color-bi-sea-green-5: fade(@color-bi-sea-green-100, 5); +@color-sea-green-100: #3FB4AB; +@color-sea-green-90: fade(@color-sea-green-100, 90); +@color-sea-green-80: fade(@color-sea-green-100, 80); +@color-sea-green-60: fade(@color-sea-green-100, 60); +@color-sea-green-50: fade(@color-sea-green-100, 50); +@color-sea-green-40: fade(@color-sea-green-100, 40); +@color-sea-green-30: fade(@color-sea-green-100, 30); +@color-sea-green-20: fade(@color-sea-green-100, 20); +@color-sea-green-10: fade(@color-sea-green-100, 10); +@color-sea-green-5: fade(@color-sea-green-100, 5); //blue -@color-bi-blue-100: #3685f2; -@color-bi-blue-90: fade(@color-bi-blue-100, 90); -@color-bi-blue-80: fade(@color-bi-blue-100, 80); -@color-bi-blue-60: fade(@color-bi-blue-100, 60); -@color-bi-blue-50: fade(@color-bi-blue-100, 50); -@color-bi-blue-40: fade(@color-bi-blue-100, 40); -@color-bi-blue-30: fade(@color-bi-blue-100, 30); -@color-bi-blue-20: fade(@color-bi-blue-100, 20); -@color-bi-blue-10: fade(@color-bi-blue-100, 10); -@color-bi-blue-5: fade(@color-bi-blue-100, 5); +@color-blue-100: @color-primary; +@color-blue-90: fade(@color-blue-100, 90); +@color-blue-80: fade(@color-blue-100, 80); +@color-blue-60: fade(@color-blue-100, 60); +@color-blue-50: fade(@color-blue-100, 50); +@color-blue-40: fade(@color-blue-100, 40); +@color-blue-30: fade(@color-blue-100, 30); +@color-blue-20: fade(@color-blue-100, 20); +@color-blue-10: fade(@color-blue-100, 10); +@color-blue-5: fade(@color-blue-100, 5); //light-blue -@color-bi-light-blue-100: #eaf2fd; -@color-bi-light-blue-90: fade(@color-bi-light-blue-100, 90); -@color-bi-light-blue-80: fade(@color-bi-light-blue-100, 80); -@color-bi-light-blue-60: fade(@color-bi-light-blue-100, 60); -@color-bi-light-blue-50: fade(@color-bi-light-blue-100, 50); -@color-bi-light-blue-40: fade(@color-bi-light-blue-100, 40); -@color-bi-light-blue-30: fade(@color-bi-light-blue-100, 30); -@color-bi-light-blue-20: fade(@color-bi-light-blue-100, 20); -@color-bi-light-blue-10: fade(@color-bi-light-blue-100, 10); -@color-bi-light-blue-5: fade(@color-bi-light-blue-100, 5); +@color-light-blue-100: #eaf2fd; +@color-light-blue-90: fade(@color-light-blue-100, 90); +@color-light-blue-80: fade(@color-light-blue-100, 80); +@color-light-blue-60: fade(@color-light-blue-100, 60); +@color-light-blue-50: fade(@color-light-blue-100, 50); +@color-light-blue-40: fade(@color-light-blue-100, 40); +@color-light-blue-30: fade(@color-light-blue-100, 30); +@color-light-blue-20: fade(@color-light-blue-100, 20); +@color-light-blue-10: fade(@color-light-blue-100, 10); +@color-light-blue-5: fade(@color-light-blue-100, 5); // orange -@color-bi-orange-100: #faaa39; -@color-bi-orange-90: fade(@color-bi-orange-100, 90); -@color-bi-orange-80: fade(@color-bi-orange-100, 80); -@color-bi-orange-60: fade(@color-bi-orange-100, 60); -@color-bi-orange-50: fade(@color-bi-orange-100, 50); -@color-bi-orange-40: fade(@color-bi-orange-100, 40); -@color-bi-orange-30: fade(@color-bi-orange-100, 30); -@color-bi-orange-20: fade(@color-bi-orange-100, 20); -@color-bi-orange-10: fade(@color-bi-orange-100, 10); -@color-bi-orange-5: fade(@color-bi-orange-100, 5); +@color-orange-100: #faaa39; +@color-orange-90: fade(@color-orange-100, 90); +@color-orange-80: fade(@color-orange-100, 80); +@color-orange-60: fade(@color-orange-100, 60); +@color-orange-50: fade(@color-orange-100, 50); +@color-orange-40: fade(@color-orange-100, 40); +@color-orange-30: fade(@color-orange-100, 30); +@color-orange-20: fade(@color-orange-100, 20); +@color-orange-10: fade(@color-orange-100, 10); +@color-orange-5: fade(@color-orange-100, 5); // red -@color-bi-red-100: #e65251; -@color-bi-red-90: fade(@color-bi-red-100, 90); -@color-bi-red-80: fade(@color-bi-red-100, 80); -@color-bi-red-60: fade(@color-bi-red-100, 60); -@color-bi-red-50: fade(@color-bi-red-100, 50); -@color-bi-red-40: fade(@color-bi-red-100, 40); -@color-bi-red-30: fade(@color-bi-red-100, 30); -@color-bi-red-20: fade(@color-bi-red-100, 20); -@color-bi-red-10: fade(@color-bi-red-100, 10); -@color-bi-red-5: fade(@color-bi-red-100, 5); +@color-red-100: #e65251; +@color-red-90: fade(@color-red-100, 90); +@color-red-80: fade(@color-red-100, 80); +@color-red-60: fade(@color-red-100, 60); +@color-red-50: fade(@color-red-100, 50); +@color-red-40: fade(@color-red-100, 40); +@color-red-30: fade(@color-red-100, 30); +@color-red-20: fade(@color-red-100, 20); +@color-red-10: fade(@color-red-100, 10); +@color-red-5: fade(@color-red-100, 5); // yellow -@font-color-yellow-100: #ffc101; -@color-bi-yellow-80: fade(@font-color-yellow-100, 90); -@color-bi-yellow-60: fade(@font-color-yellow-100, 60); -@color-bi-yellow-40: fade(@font-color-yellow-100, 40); -@color-bi-yellow-20: fade(@font-color-yellow-100, 20); -@color-bi-yellow-5: fade(@font-color-yellow-100, 5); +@color-yellow-100: #ffc101; +@color-yellow-80: fade(@color-yellow-100, 90); +@color-yellow-60: fade(@color-yellow-100, 60); +@color-yellow-40: fade(@color-yellow-100, 40); +@color-yellow-20: fade(@color-yellow-100, 20); +@color-yellow-5: fade(@color-yellow-100, 5); // black -@color-bi-black-100: #232e40; -@color-bi-black-90: fade(@color-bi-black-100, 90); -@color-bi-black-80: fade(@color-bi-black-100, 80); -@color-bi-black-60: fade(@color-bi-black-100, 60); -@color-bi-black-50: fade(@color-bi-black-100, 50); -@color-bi-black-40: fade(@color-bi-black-100, 40); -@color-bi-black-30: fade(@color-bi-black-100, 30); -@color-bi-black-20: fade(@color-bi-black-100, 20); -@color-bi-black-10: fade(@color-bi-black-100, 10); -@color-bi-black-5: fade(@color-bi-black-100, 5); +@color-black-100: #232e40; +@color-black-90: fade(@color-black-100, 90); +@color-black-80: fade(@color-black-100, 80); +@color-black-60: fade(@color-black-100, 60); +@color-black-50: fade(@color-black-100, 50); +@color-black-40: fade(@color-black-100, 40); +@color-black-30: fade(@color-black-100, 30); +@color-black-20: fade(@color-black-100, 20); +@color-black-10: fade(@color-black-100, 10); +@color-black-5: fade(@color-black-100, 5); // white -@color-bi-white-100: #FFFFFF; -@color-bi-white-90: fade(@color-bi-white-100, 90); -@color-bi-white-80: fade(@color-bi-white-100, 80); -@color-bi-white-60: fade(@color-bi-white-100, 60); -@color-bi-white-50: fade(@color-bi-white-100, 50); -@color-bi-white-40: fade(@color-bi-white-100, 40); -@color-bi-white-30: fade(@color-bi-white-100, 30); -@color-bi-white-20: fade(@color-bi-white-100, 20); -@color-bi-white-10: fade(@color-bi-white-100, 10); -@color-bi-white-5: fade(@color-bi-white-100, 5); - -@color-bi-black: @color-bi-black-100; -@color-bi-black-theme-dark: #F7F9FC; -@color-bi-state-gray: #2E3A4D; -@color-bi-state-gray-theme-dark: #D6E0EC; -@color-bi-light-state-gray: #647185; -@color-bi-light-state-gray-theme-dark: #AFB7C6; -@color-bi-dim-gray: #9EA6B2; -@color-bi-dim-gray-theme-dark: #878d9f; -@color-bi-gray: #C4C9D1; -@color-bi-gray-theme-dark: #6B7084; -@color-bi-dark-gray: #D0D4DA; -@color-bi-dark-gray-theme-dark: #606479; -@color-bi-sliver: #E7E8EB; -@color-bi-sliver-theme-dark: #363E55; -@color-bi-light-gray: #647185; -@color-bi-light-gray-theme-dark: #afb7c6; -@color-bi-gainsboro: #F5F6F9; -@color-bi-gainsboro-theme-dark: #191F35; -@color-bi-white: @color-bi-white-100; -@color-bi-white-theme-dark: #20263B; - -@color-bi-transparent: transparent; - - - //font color -@font-color-black: @color-bi-black; +@color-white-100: #FFFFFF; +@color-white-90: fade(@color-white-100, 90); +@color-white-80: fade(@color-white-100, 80); +@color-white-60: fade(@color-white-100, 60); +@color-white-50: fade(@color-white-100, 50); +@color-white-40: fade(@color-white-100, 40); +@color-white-30: fade(@color-white-100, 30); +@color-white-20: fade(@color-white-100, 20); +@color-white-10: fade(@color-white-100, 10); +@color-white-5: fade(@color-white-100, 5); + +@color-black: @color-black-100; +@color-black-theme-dark: #F7F9FC; +@color-state-gray: #2E3A4D; +@color-state-gray-theme-dark: #D6E0EC; +@color-light-state-gray: #647185; +@color-light-state-gray-theme-dark: #AFB7C6; +@color-dim-gray: #9EA6B2; +@color-dim-gray-theme-dark: #878d9f; +@color-gray: #C4C9D1; +@color-gray-theme-dark: #6B7084; +@color-dark-gray: #D0D4DA; +@color-dark-gray-theme-dark: #606479; +@color-sliver: #E7E8EB; +@color-sliver-theme-dark: #363E55; +@color-light-gray: #647185; +@color-light-gray-theme-dark: #afb7c6; +@color-gainsboro: #F5F6F9; +@color-gainsboro-theme-dark: #191F35; +@color-white: @color-white-100; +@color-white-theme-dark: #20263B; + +@color-transparent: transparent; + + +//font color +@font-color-black: @color-black; @font-color-normal: #3d4d66; @font-color-normal-theme-dark: #d6e0dc; -@font-color-light-gray: @color-bi-light-gray; -@font-color-light-gray-theme-dark: @color-bi-light-gray-theme-dark; -@font-color-disabled: @color-bi-dim-gray; -@font-color-disabled-theme-dark: @color-bi-dim-gray-theme-dark; -@font-color-tips: @color-bi-dim-gray; -@font-color-tips-theme-dark: @color-bi-gray-theme-dark; -@font-color-light-disabled: @color-bi-dark-gray; -@font-color-light-disabled-theme-dark: @color-bi-dark-gray-theme-dark; +@font-color-light-gray: @color-light-gray; +@font-color-light-gray-theme-dark: @color-light-gray-theme-dark; +@font-color-disabled: @color-dim-gray; +@font-color-disabled-theme-dark: @color-dim-gray-theme-dark; +@font-color-tips: @color-dim-gray; +@font-color-tips-theme-dark: @color-gray-theme-dark; +@font-color-light-disabled: @color-dark-gray; +@font-color-light-disabled-theme-dark: @color-dark-gray-theme-dark; @font-color-gray: #999999; -@font-color-white: @color-bi-white; -@font-color-white-theme-dark: @color-bi-white-theme-dark; -@font-color-light-highlight: @color-bi-light-blue-100; +@font-color-white: @color-white; +@font-color-white-theme-dark: @color-white-theme-dark; +@font-color-light-highlight: @color-light-blue-100; @font-color-medium-highlight: #d7e7fc; -@font-color-highlight: @color-bi-blue-100; +@font-color-highlight: @color-blue-100; @font-color-blue: #23beef; @font-color-light-blue: #e9f8fd; -@font-color-success: @color-bi-green-100; -@font-color-warning: @color-bi-orange-100; -@font-color-negative: @color-bi-red-100; -@font-color-yellow: @font-color-yellow-100; +@font-color-success: @color-green-100; +@font-color-warning: @color-orange-100; +@font-color-negative: @color-red-100; +@font-color-yellow: @color-yellow-100; //background color -@background-color-black: @color-bi-black; -@background-color-black-theme-dark: @color-bi-dark-gray-theme-dark; +@background-color-black: @color-black; +@background-color-black-theme-dark: @color-dark-gray-theme-dark; @background-color-light-black: #3d4d66; @background-color-light-black-theme-dark: #d6e0dc; -@background-color-default: @color-bi-white; -@background-color-default-theme-dark: @color-bi-white-theme-dark; +@background-color-default: @color-white; +@background-color-default-theme-dark: @color-white-theme-dark; @background-color-normal: #f7f8fa; @background-color-normal-theme-dark: #191b2b; -@background-color-light-highlight: @color-bi-light-blue-100; +@background-color-light-highlight: @color-light-blue-100; @background-color-medium-highlight: #d7e7fc; -@background-color-highlight: @color-bi-blue-100; +@background-color-highlight: @color-blue-100; @background-color-blue: #23beef; @background-color-light-blue: #e9f8fd; @background-color-dark: #d4dadd; @background-color-light-gray: #f2f4f7; @background-color-light-gray-theme-dark: #292f45; @background-color-medium-gray: #e8eaed; -@background-color-medium-gray-theme-dark: @color-bi-sliver-theme-dark; -@background-color-dark-gray: @color-bi-dark-gray; -@background-color-dark-gray-theme-dark: @color-bi-dark-gray-theme-dark; +@background-color-medium-gray-theme-dark: @color-sliver-theme-dark; +@background-color-dark-gray: @color-dark-gray; +@background-color-dark-gray-theme-dark: @color-dark-gray-theme-dark; @background-color-disabled: #f2f4f7; @background-color-disabled-theme-dark: #292f45; -@background-color-light-disabled: @color-bi-dim-gray; -@background-color-light-disabled-theme-dark: @color-bi-dim-gray-theme-dark; -@background-color-yellow: @font-color-yellow-100; +@background-color-light-disabled: @color-dim-gray; +@background-color-light-disabled-theme-dark: @color-dim-gray-theme-dark; +@background-color-yellow: @color-yellow-100; -@background-color-negative: @color-bi-red-100; +@background-color-negative: @color-red-100; @background-color-light-negative: #ffecec; @background-color-dark-negative: #3A2940; @background-color-light-warning: #feeed7; -@background-color-warning: @color-bi-orange-100; +@background-color-warning: @color-orange-100; -@background-color-dark-success: @color-bi-green-100; +@background-color-dark-success: @color-green-100; @background-color-light-success: #e1f4e7; -@background-color-normal-success: @color-bi-light-gray; +@background-color-normal-success: @color-light-gray; //border color -@border-color-default: @color-bi-white; -@border-color-black: @color-bi-black; +@border-color-default: @color-white; +@border-color-black: @color-black; @border-color-line: #e8eaed; -@border-color-line-theme-dark: @color-bi-sliver-theme-dark; +@border-color-line-theme-dark: @color-sliver-theme-dark; @border-color-light-line: #f2f4f7; @border-color-light-line-theme-dark: #292f45; -@border-color-dark-gray-line: @color-bi-dark-gray; -@border-color-dark-gray-line-theme-dark: @color-bi-dark-gray-theme-dark; -@border-color-dark-line: @color-bi-dim-gray; -@border-color-dark-line-theme-dark: @color-bi-dim-gray-theme-dark; -@border-color-highlight: @color-bi-blue-100; +@border-color-dark-gray-line: @color-dark-gray; +@border-color-dark-gray-line-theme-dark: @color-dark-gray-theme-dark; +@border-color-dark-line: @color-dim-gray; +@border-color-dark-line-theme-dark: @color-dim-gray-theme-dark; +@border-color-highlight: @color-blue-100; -@border-color-success: @color-bi-green-100; +@border-color-success: @color-green-100; @border-color-warning: #fbb03b; -@border-color-negative: @color-bi-red-100; +@border-color-negative: @color-red-100; @border-color-light-negative: #f4cbcb; -@border-color-normal-success: @color-bi-light-gray; +@border-color-normal-success: @color-light-gray; //split color @border-color-disabled: #e8eaed; -@border-color-disabled-theme-dark: @color-bi-sliver-theme-dark; +@border-color-disabled-theme-dark: @color-sliver-theme-dark; //scroll color -@scroll-color: @color-bi-black; -@scroll-color-theme-dark: @color-bi-white; -@scroll-thumb-color: @color-bi-black; -@scroll-thumb-color-theme-dark: @color-bi-black; +@scroll-color: @color-black; +@scroll-color-theme-dark: @color-white; +@scroll-thumb-color: @color-black; +@scroll-thumb-color-theme-dark: @color-black; diff --git a/src/less/lib/icon.less b/src/less/lib/icon.less index 5c62fc736..dc228abce 100644 --- a/src/less/lib/icon.less +++ b/src/less/lib/icon.less @@ -41,6 +41,36 @@ @icon-tree-vertical-line-3-theme-dark: "icon/dark/tree_vertical_line_3.png"; @icon-tree-vertical-line-4-theme-dark: "icon/dark/tree_vertical_line_4.png"; +@icon-tree-solid-expand-type1: "icon/tree_solid_expand_1.png"; +@icon-tree-solid-expand-type2: "icon/tree_solid_expand_2.png"; +@icon-tree-solid-expand-type3: "icon/tree_solid_expand_3.png"; +@icon-tree-solid-expand-type4: "icon/tree_solid_expand_4.png"; + +@icon-tree-solid-collapse-type1: "icon/tree_solid_collapse_1.png"; +@icon-tree-solid-collapse-type2: "icon/tree_solid_collapse_2.png"; +@icon-tree-solid-collapse-type3: "icon/tree_solid_collapse_3.png"; +@icon-tree-solid-collapse-type4: "icon/tree_solid_collapse_4.png"; + +@icon-tree-solid-vertical-line-1: "icon/tree_solid_vertical_line_1.png"; +@icon-tree-solid-vertical-line-2: "icon/tree_solid_vertical_line_2.png"; +@icon-tree-solid-vertical-line-3: "icon/tree_solid_vertical_line_3.png"; +@icon-tree-solid-vertical-line-4: "icon/tree_solid_vertical_line_4.png"; + +@icon-tree-solid-expand-type1-theme-dark: "icon/dark/tree_solid_expand_1.png"; +@icon-tree-solid-expand-type2-theme-dark: "icon/dark/tree_solid_expand_2.png"; +@icon-tree-solid-expand-type3-theme-dark: "icon/dark/tree_solid_expand_3.png"; +@icon-tree-solid-expand-type4-theme-dark: "icon/dark/tree_solid_expand_4.png"; + +@icon-tree-solid-collapse-type1-theme-dark: "icon/dark/tree_solid_collapse_1.png"; +@icon-tree-solid-collapse-type2-theme-dark: "icon/dark/tree_solid_collapse_2.png"; +@icon-tree-solid-collapse-type3-theme-dark: "icon/dark/tree_solid_collapse_3.png"; +@icon-tree-solid-collapse-type4-theme-dark: "icon/dark/tree_solid_collapse_4.png"; + +@icon-tree-solid-vertical-line-1-theme-dark: "icon/dark/tree_solid_vertical_line_1.png"; +@icon-tree-solid-vertical-line-2-theme-dark: "icon/dark/tree_solid_vertical_line_2.png"; +@icon-tree-solid-vertical-line-3-theme-dark: "icon/dark/tree_solid_vertical_line_3.png"; +@icon-tree-solid-vertical-line-4-theme-dark: "icon/dark/tree_solid_vertical_line_4.png"; + @icon-loading: "icon/loading.gif"; @icon-wave-loading: "icon/wave_loading.gif"; diff --git a/src/less/lib/theme.less b/src/less/lib/theme.less index 6aa814374..9575a2ae1 100644 --- a/src/less/lib/theme.less +++ b/src/less/lib/theme.less @@ -16,7 +16,7 @@ @color-bi-background-button-mask: @color-bi-background-black; @color-bi-background-hover-button-mask: @color-bi-background-default; @color-bi-background-ignore-button-mask: @color-bi-background-highlight; -@color-bi-background-hover-ignore-button-mask: @color-bi-blue-10; +@color-bi-background-hover-ignore-button-mask: @color-blue-10; //水印字体颜色 @color-bi-text-water-mark: @color-bi-text-tips; @@ -73,8 +73,8 @@ @color-bi-border-ignore-button: @color-bi-border-highlight; @color-bi-background-ignore-button: @color-bi-background-default; @color-bi-background-ignore-button-theme-dark: @color-bi-background-default-theme-dark; -@color-bi-background-hover-ignore-button-theme-dark: @color-bi-blue-10; -@color-bi-background-active-ignore-button-theme-dark: @color-bi-blue-10; +@color-bi-background-hover-ignore-button-theme-dark: @color-blue-10; +@color-bi-background-active-ignore-button-theme-dark: @color-blue-10; @color-bi-text-success-button: @color-bi-text; @color-bi-background-success-button: @color-bi-background-success; @color-bi-border-success-button: @color-bi-border-success; @@ -115,7 +115,7 @@ @color-bi-border-hover-active-radio: @color-bi-border-highlight; @color-bi-border-hover-active-radio-theme-dark: @color-bi-border-highlight; @color-bi-background-active-radio-content-theme-dark: @color-bi-background-default; -@color-bi-background-disabled-active-radio-content-theme-dark: @color-bi-transparent; +@color-bi-background-disabled-active-radio-content-theme-dark: @color-transparent; @color-bi-background-radio: @color-bi-background-default; @color-bi-background-active-radio: @color-bi-background-highlight; @color-bi-background-active-radio-content: @color-bi-background-default; @@ -140,13 +140,13 @@ @color-bi-background-active-checkbox-content: @color-bi-background-default; @color-bi-background-disabled-active-checkbox-content: @color-bi-background-default; @color-bi-background-active-checkbox-content-theme-dark: @color-bi-background-default; -@color-bi-background-disabled-active-checkbox-content-theme-dark: @color-bi-transparent; +@color-bi-background-disabled-active-checkbox-content-theme-dark: @color-transparent; // 开关 @color-bi-background-switch: @color-bi-background-dark-gray; @color-bi-background-switch-theme-dark: @color-bi-background-dark-gray-theme-dark; @color-bi-background-active-switch: @color-bi-background-highlight; @color-bi-background-active-switch-content: @color-bi-background-default; -@color-bi-font-switch-tip: @color-bi-white; +@color-bi-font-switch-tip: @color-white; @color-bi-background-active-switch-theme-dark: @color-bi-background-highlight; @color-bi-background-disabled-switch: @color-bi-background-disabled; @color-bi-background-disabled-switch-theme-dark: @color-bi-background-disabled-theme-dark; @@ -197,6 +197,7 @@ // tree @color-bi-text-display-tree: @color-bi-text-gray; @color-bi-border-tree-expander-popup-line: @color-bi-border-dark-gray-line; +@color-bi-border-tree-expander-popup-line-theme-dark: @color-bi-border-dark-gray-line-theme-dark; // popup @color-bi-background-list-view-shadow: @color-bi-background-black; @color-bi-border-list-view-toolbar: @color-bi-border-line; @@ -208,7 +209,7 @@ // 复选下拉 @color-bi-text-multi-select-search-pane-toolbar: @color-bi-text-redmark; @color-bi-text-error-multi-select-trigger: @color-bi-text-failure; -@color-bi-background-multi-select-trigger-check-selected: @color-bi-blue-10; +@color-bi-background-multi-select-trigger-check-selected: @color-blue-10; // 复选树 @color-bi-text-multi-tree-check-pane-check-button: @color-bi-text-highlight; // 单选下拉 @@ -222,4 +223,4 @@ @color-bi-text-error-year-month-interval: @color-bi-text-failure; @color-bi-text-error-year-quarter-interval: @color-bi-text-failure; // 表单 -@color-bi-background-error-form: @color-bi-red-5; +@color-bi-background-error-form: @color-red-5; diff --git a/src/less/modern.less b/src/less/modern.less deleted file mode 100644 index a6b80bd1d..000000000 --- a/src/less/modern.less +++ /dev/null @@ -1,467 +0,0 @@ -////core -//@import "core/normalize.less"; -//@import "core/normalize2.less"; -//@import "core/utils/animation.less"; -//@import "core/utils/common.less"; -//@import "core/utils/cursor.less"; -//@import "core/utils/list-item.less"; -//@import "core/utils/position.less"; -//@import "core/utils/size.less"; -//@import "core/utils/sizing.less"; -//@import "core/utils/typographic.less"; -//@import "core/utils/motion/fade.less"; -//@import "core/utils/motion/move.less"; -//@import "core/utils/motion/slide.less"; -//@import "core/utils/motion/zoom.less"; -//@import "core/wrapper/flex.horizontal.less"; -//@import "core/wrapper/flex.vertical.less"; -//@import "core/wrapper/flex.wrapper.horizontal.less"; -//@import "core/wrapper/flex.wrapper.vertical.less"; -//@import "core/wrapper/float.absolute.less"; -//@import "core/wrapper/inline.less"; -// -////base case -//@import "base/pane.less"; -//@import "base/colorchooser/colorchooser.trigger.less"; -//@import "base/colorchooser/colorchooser.popup.less"; -//@import "base/colorchooser/colorpicker/button.colorpicker.less"; -//@import "base/colorchooser/colorpicker/button.colorshow.less"; -//@import "base/colorchooser/colorpicker/editor.colorpicker.less"; -//@import "base/colorchooser/farbtastic/farbtastic.less"; -//@import "base/combo/combo.bubble.less"; -//@import "base/combo/combo.less"; -//@import "base/combo/combo.searchtextvalue.less"; -//@import "base/combo/combo.textvalue.icon.less"; -//@import "base/combo/combo.textvalue.less"; -//@import "base/combo/combo.textvaluecheck.less"; -//@import "base/combo/combo.textvaluedownlist.less"; -//@import "base/combo/popup.bubble.bar.less"; -//@import "base/combo/popup.bubble.less"; -//@import "base/editor/editor.search.less"; -//@import "base/editor/editor.search.small.less"; -//@import "base/foundation/bi.message.less"; -//@import "base/layer/layer.multiselect.less"; -//@import "base/layer/panel.less"; -//@import "base/loader/sort.list.less"; -//@import "base/pager/pager.all.count.less"; -//@import "base/pager/pager.direction.less"; -//@import "base/pager/pager.less"; -//@import "base/segment/button.segment.less"; -//@import "base/segment/segment.less"; -//@import "base/single/html.less"; -//@import "base/single/label.less"; -//@import "base/single/text.less"; -//@import "base/single/button/button.half.less"; -//@import "base/single/button/button.less"; -//@import "base/single/button/item.singleselect.icontext.less"; -//@import "base/single/button/switch.less"; -//@import "base/single/editor/editor.multifile.less"; -//@import "base/single/editor/editor.textarea.less"; -//@import "base/single/input/checkbox.less"; -//@import "base/single/input/file.less"; -//@import "base/single/input/input.less"; -//@import "base/single/input/radio.less"; -//@import "base/single/tip/tip.bubble.less"; -//@import "base/single/tip/tip.less"; -//@import "base/single/tip/tip.toast.less"; -//@import "base/single/tip/tip.tooltip.less"; -//@import "base/tree/tree.branch.less"; -//@import "base/tree/tree.display.less"; -//@import "base/tree/tree.expander.less"; -//@import "base/tree/tree.list.display.less"; -//@import "base/tree/ztree.less"; -//@import "base/trigger/trigger.less"; -//@import "base/trigger/trigger.selecttext.less"; -//@import "base/trigger/trigger.selecttextsmall.less"; -//@import "base/view/popover.less"; -//@import "base/view/popupview.less"; -// -////widget -//@import "widget/date/trigger.date.less"; -//@import "widget/downlist/popup.downlist.less"; -//@import "widget/dynamicdatecombo/dynamicdatepopup.less"; -//@import "widget/dynamicdatecombo/dynamicdatetime.combo.less"; -//@import "widget/dynamicdatecombo/dynamicdatetimepopup.less"; -//@import "widget/interactivearrangement/interactivearrangement.less"; -//@import "widget/intervalslider/intervalslider.label.less"; -//@import "widget/intervalslider/intervalslider.less"; -//@import "widget/month/trigger.month.less"; -//@import "widget/multilayerselecttree/multilayerselecttree.combo.less"; -//@import "widget/multilayerselecttree/multilayerselecttree.leveltree.less"; -//@import "widget/multilayersingletree/multilayersingletree.combo.less"; -//@import "widget/multilayersingletree/multilayersingletree.leveltree.less"; -//@import "widget/multiselect/multiselect.combo.less"; -//@import "widget/multiselect/multiselect.insert.combo.less"; -//@import "widget/multiselect/check/multiselect.check.pane.less"; -//@import "widget/multiselect/search/multiselect.search.pane.less"; -//@import "widget/multiselect/trigger/button.checkselected.less"; -//@import "widget/multistringlist/multistringlist.insert.less"; -//@import "widget/multistringlist/multistringlist.less"; -//@import "widget/multitree/multi.tree.combo.less"; -//@import "widget/multitree/popup.multi.tree.less"; -//@import "widget/multitree/check/multi.tree.check.pane.less"; -//@import "widget/multitree/trigger/multi.tree.button.checkselected.less"; -//@import "widget/numbereditor/number.editor.less"; -//@import "widget/numberinterval/numberinterval.less"; -//@import "widget/quarter/trigger.quarter.less"; -//@import "widget/searchmultiselect/searchmultiselect.less"; -//@import "widget/singleselect/singleselect.combo.less"; -//@import "widget/singleselect/search/singleselect.search.pane.less"; -//@import "widget/singleslider/singlelider.label.less"; -//@import "widget/singleslider/singlelider.normal.less"; -//@import "widget/singleslider/singleslider.less"; -//@import "widget/singleslider/slider/widget.slider.less"; -//@import "widget/singleslider/track/widget.track.less"; -//@import "widget/timecombo/timecombo.less"; -//@import "widget/timeinterval/dateinterval.less"; -//@import "widget/timeinterval/timeinterval.less"; -//@import "widget/year/popup.year.less"; -//@import "widget/year/trigger.year.less"; -//@import "widget/yearinterval/yearinterval.less"; -//@import "widget/yearmonth/popup.yearmonth.less"; -//@import "widget/yearmonthinterval/yearmonthinterval.less"; -//@import "widget/yearquarter/popup.yearquarter.less"; -//@import "widget/yearquarterinterval/yearquarterinterval.less"; - -@import "lib/colors-modern"; -@import "lib/theme-modern"; - -:root{ - --font-size-12: 12px; - --font-size-13: 13px; - --font-size-14: 14px; - --font-size-15: 15px; - --font-size-16: 16px; - --font-size-18: 18px; - --font-size-20: 20px; - --font-size-22: 22px; - --font-size-24: 24px; - --font-size-30: 30px; - --font-size-40: 40px; - --font-size-50: 50px; - --font-size-60: 60px; - --font-size-70: 70px; - --radius-2: 2px; - --radius-6: 6px; - - --opacity-15: 0.15; - --opacity-20: 0.2; - - //font color - --font-color-black: #232e40; - --font-color-normal: #3d4d66; - --font-color-normal-theme-dark: #d6e0dc; - --font-color-light-gray: #647185; - --font-color-light-gray-theme-dark: #afb7c6; - --font-color-disabled: #9ea6b2; - --font-color-disabled-theme-dark: #878d9f; - --font-color-tips: #9ea6b2; - --font-color-tips-theme-dark: #6b7084; - --font-color-light-disabled: #d0d4da; - --font-color-light-disabled-theme-dark: #606479; - --font-color-gray: #999999; - --font-color-white: #ffffff; - --font-color-white-theme-dark: #20263b; - --font-color-light-highlight: #eaf2fd; - --font-color-medium-highlight: #d7e7fc; - --font-color-highlight: #3685f2; - --font-color-blue: #23beef; - --font-color-light-blue: #e9f8fd; - --font-color-success: #13cd66; - --font-color-warning: #faaa39; - --font-color-negative: #e65251; - --font-color-yellow: #ffc101; - - //background color - --background-color-black: #232E40; - --background-color-black-theme-dark: #606479; - --background-color-light-black: #3d4d66; - --background-color-light-black-theme-dark: #d6e0dc; - --background-color-default: #ffffff; - --background-color-default-theme-dark: #20263b; - --background-color-normal: #f7f8fa; - --background-color-normal-theme-dark: #191b2b; - --background-color-light-highlight: #eaf2fd; - --background-color-medium-highlight: #d7e7fc; - --background-color-highlight: #3685f2; - --background-color-blue: #23beef; - --background-color-light-blue: #e9f8fd; - --background-color-dark: #d4dadd; - --background-color-light-gray: #f2f4f7; - --background-color-light-gray-theme-dark: #292f45; - --background-color-medium-gray: #e8eaed; - --background-color-medium-gray-theme-dark: #363e55; - --background-color-dark-gray: #d0d4da; - --background-color-dark-gray-theme-dark: #606479; - --background-color-disabled: #f2f4f7; - --background-color-disabled-theme-dark: #292f45; - --background-color-light-disabled: #9ea6b2; - --background-color-light-disabled-theme-dark: #878d9f; - --background-color-yellow: #ffc101; - - --background-color-negative: #e65251; - --background-color-light-negative: #ffecec; - --background-color-dark-negative: #3A2940; - --background-color-light-warning: #feeed7; - --background-color-warning: #faaa39; - - --background-color-dark-success: #13cd66; - --background-color-light-success: #e1f4e7; - --background-color-normal-success: #647185; - - //border color - --border-color-default: #ffffff; - --border-color-black: #232e40; - --border-color-line: #e8eaed; - --border-color-line-theme-dark: #363e55; - --border-color-light-line: #f2f4f7; - --border-color-light-line-theme-dark: #292f45; - --border-color-dark-gray-line: #d0d4da; - --border-color-dark-gray-line-theme-dark: #606479; - --border-color-dark-line: #9ea6b2; - --border-color-dark-line-theme-dark: #878d9f; - --border-color-highlight: #3685f2; - - --border-color-warning: #fbb03b; - --border-color-negative: #e65251; - --border-color-success: #13cd66; - --border-color-light-negative: #f4cbcb; - --border-color-normal-success: #647185; - - //split color - --border-color-disabled: #e8eaed; - --border-color-disabled-theme-dark: #363e55; - - //scroll color - --scroll-color: #232e40; - --scroll-color-theme-dark: #ffffff; - --scroll-thumb-color: #232e40; - --scroll-thumb-color-theme-dark: #232e40; - - //默认字体颜色 - --color-bi-text-normal: var(--font-color-normal); - //深色主题默认字体颜色 - --color-bi-text-theme-dark: var(--font-color-normal-theme-dark); - --color-bi-text-normal-theme-dark: var(--font-color-normal-theme-dark); - //黑色字体颜色 - --color-bi-text-black: var(--font-color-black); - //深色主题黑色字体颜色 - --color-bi-text-black-theme-dark: var(--font-color-normal-theme-dark); - //灰色字体颜色 - --color-bi-text-gray: var(--font-color-gray); - //浅灰色字体 - --color-bi-text-light-gray: var(--font-color-light-gray); - //深色主题浅灰色字体 - --color-bi-text-light-gray-theme-dark: var(--font-color-light-gray-theme-dark); - //白色字体颜色 - --color-bi-text: var(--font-color-white); - --color-bi-text-white: var(--font-color-white); - //深色主题白色字体颜色 - --color-bi-text-white-theme-dark: var(--font-color-white-theme-dark); - //灰化字体颜色 - --color-bi-text-disabled: var(--font-color-disabled); - //深色主题灰化字体颜色 - --color-bi-text-disabled-theme-dark: var(--font-color-disabled-theme-dark); - //灰化图标色 - --color-bi-icon-disabled: var(--font-color-light-disabled); - //深色主题灰化图标颜色 - --color-bi-icon-disabled-theme-dark: var(--font-color-light-disabled-theme-dark); - //提示字体颜色 - --color-bi-text-tips: var(--font-color-tips); - //深色主题提示字体颜色 - --color-bi-text-tips-theme-dark: var(--font-color-tips-theme-dark); - //成功字体颜色 - --color-bi-text-success: var(--font-color-success); - //失败字体颜色 - --color-bi-text-failure: var(--font-color-negative); - //基本提亮颜色 - --color-bi-text-highlight: var(--font-color-highlight); - //标红色 - --color-bi-text-redmark: var(--font-color-warning); - - //普通背景 - --color-bi-background-normal: var(--background-color-normal); - //深色主题普通背景 - --color-bi-background-normal-theme-dark: var(--background-color-normal-theme-dark); - //默认背景 - --color-bi-background-default: var(--background-color-default); - //深色主题默认背景 - --color-bi-background-default-theme-dark: var(--background-color-default-theme-dark); - //黑色背景 - --color-bi-background-black: var(--background-color-black); - //深色主题黑色背景 - --color-bi-background-black-theme-dark: var(--background-color-black-theme-dark); - //浅黑色背景 - --color-bi-background-light-black: var(--background-color-light-black); - //深色主题浅黑色背景 - --color-bi-background-light-black-theme-dark: var(--background-color-light-black-theme-dark); - //深灰色背景 - --color-bi-background-dark-gray: var(--background-color-dark-gray); - //深色主题深灰色背景 - --color-bi-background-dark-gray-theme-dark: var(--background-color-dark-gray-theme-dark); - //灰色背景(浅) - --color-bi-background-light-gray: var(--background-color-light-gray); - //深色主题灰色背景(浅) - --color-bi-background-light-gray-theme-dark: var(--background-color-light-gray-theme-dark); - //灰色背景(中) - --color-bi-background-medium-gray: var(--background-color-medium-gray); - //深色主题灰色背景(中) - --color-bi-background-medium-gray-theme-dark: var(--background-color-medium-gray-theme-dark); - //灰化背景 - --color-bi-background-disabled: var(--background-color-disabled); - //深色主题灰化背景 - --color-bi-background-disabled-theme-dark: var(--background-color-disabled-theme-dark); - //浅灰化背景 - --color-bi-background-light-disabled: var(--background-color-light-disabled); - //深色主题浅灰化背景 - --color-bi-background-light-disabled-theme-dark: var(--background-color-light-disabled-theme-dark); - //成功背景色 - --color-bi-background-success: var(--background-color-dark-success); - //成功背景色(浅) - --color-bi-background-light-success: var(--background-color-light-success); - //失败背景色 - --color-bi-background-failure: var(--background-color-negative); - //失败背景色(浅) - --color-bi-background-light-failure: var(--background-color-light-negative); - //失败背景色(深) - --color-bi-background-dark-failure: var(--background-color-dark-negative); - //警示背景色 - --color-bi-background-warning: var(--background-color-warning); - //警示背景色(浅) - --color-bi-background-light-warning: var(--background-color-light-warning); - //背景提亮色 - --color-bi-background-highlight: var(--background-color-highlight); - //背景提亮色(浅) - --color-bi-background-light-highlight: var(--background-color-light-highlight); - - //黑色边框色 - --color-bi-border-black: var(--border-color-black); - //默认边框色 - --color-bi-border-default: var(--border-color-default); - //边框线色 - --color-bi-border-line: var(--border-color-line); - //深色主题边框线色 - --color-bi-border-line-theme-dark: var(--border-color-line-theme-dark); - //深灰色边框线 - --color-bi-border-dark-gray-line: var(--border-color-dark-gray-line); - //深灰色主题深色边框线 - --color-bi-border-dark-gray-line-theme-dark: var(--border-color-dark-gray-line-theme-dark); - //深色边框线 - --color-bi-border-dark-line: var(--border-color-dark-line); - //深色主题深色边框线 - --color-bi-border-dark-line-theme-dark: var(--border-color-dark-line-theme-dark); - //灰化边框 - --color-bi-border-disabled: var(--border-color-disabled); - //深色主题灰化边框 - --color-bi-border-disabled-theme-dark: var(--border-color-disabled-theme-dark); - //成功边框色 - --color-bi-border-success: var(--border-color-success); - //失败边框色 - --color-bi-border-failure: var(--border-color-negative); - //警示边框色 - --color-bi-border-warning: var(--border-color-warning); - //边框提亮 - --color-bi-border-highlight: var(--border-color-highlight); - - //颜色百分比 - //green - --color-bi-green-80: fade(@font-color-success, 80); - --color-bi-green-60: fade(@font-color-success, 60); - --color-bi-green-40: fade(@font-color-success, 40); - --color-bi-green-30: fade(@font-color-success, 30); - --color-bi-green-20: fade(@font-color-success, 20); - --color-bi-green-10: fade(@font-color-success, 10); - --color-bi-green-5: fade(@font-color-success, 5); - - //blue - --color-bi-blue-80: fade(@font-color-highlight, 80); - --color-bi-blue-60: fade(@font-color-highlight, 60); - --color-bi-blue-40: fade(@font-color-highlight, 40); - --color-bi-blue-30: fade(@font-color-highlight, 30); - --color-bi-blue-20: fade(@font-color-highlight, 20); - --color-bi-blue-10: fade(@font-color-highlight, 10); - --color-bi-blue-5: fade(@font-color-highlight, 5); - - //light-blue - --color-bi-light-blue-80: fade(@font-color-light-highlight, 80); - --color-bi-light-blue-60: fade(@font-color-light-highlight, 60); - --color-bi-light-blue-40: fade(@font-color-light-highlight, 40); - --color-bi-light-blue-30: fade(@font-color-light-highlight, 30); - --color-bi-light-blue-20: fade(@font-color-light-highlight, 20); - --color-bi-light-blue-10: fade(@font-color-light-highlight, 10); - --color-bi-light-blue-5: fade(@font-color-light-highlight, 5); - - // orange - --color-bi-orange-80: fade(@font-color-warning, 80); - --color-bi-orange-60: fade(@font-color-warning, 60); - --color-bi-orange-40: fade(@font-color-warning, 40); - --color-bi-orange-30: fade(@font-color-warning, 30); - --color-bi-orange-20: fade(@font-color-warning, 20); - --color-bi-orange-10: fade(@font-color-warning, 10); - --color-bi-orange-5: fade(@font-color-warning, 5); - - // red - --color-bi-red-80: fade(@font-color-negative, 80); - --color-bi-red-60: fade(@font-color-negative, 60); - --color-bi-red-40: fade(@font-color-negative, 40); - --color-bi-red-30: fade(@font-color-negative, 30); - --color-bi-red-20: fade(@font-color-negative, 20); - --color-bi-red-10: fade(@font-color-negative, 10); - --color-bi-red-5: fade(@font-color-negative, 5); - - // yellow - --color-bi-yellow-80: fade(@font-color-yellow, 90); - --color-bi-yellow-60: fade(@font-color-yellow, 60); - --color-bi-yellow-40: fade(@font-color-yellow, 40); - --color-bi-yellow-20: fade(@font-color-yellow, 20); - --color-bi-yellow-5: fade(@font-color-yellow, 5); - - - //tooltip - //成功背景(专属配色) - --color-bi-background-tooltip-success: var(--background-color-normal-success); - //成功边框(专属配色) - --color-bi-border-tooltip-success: var(--border-color-normal-success); - //失败背景 - --color-bi-background-tooltip-failure: var(--color-bi-background-failure); - //失败边框 - --color-bi-border-tooltip-failure: var(--color-bi-border-failure); - - //按钮的mask颜色 - --color-bi-background-button-mask: var(--color-bi-background-black); - - //水印字体颜色 - --color-bi-text-water-mark: var(--color-bi-text-tips); - --color-bi-text-water-mark-theme-dark: var(--color-bi-text-tips-theme-dark); - - //toast - --color-bi-background-toast-success: var(--color-bi-background-success); - --color-bi-background-toast-warning: var(--color-bi-background-warning); - --color-bi-background-toast-error: var(--color-bi-background-failure); - --color-bi-background-toast-normal: var(--color-bi-background-highlight); - - //bubble - --color-bi-background-bubble-success: var(--color-bi-background-light-success); - --color-bi-background-bubble-warning: var(--color-bi-background-light-warning); - --color-bi-background-bubble-error: var(--color-bi-background-light-failure); - --color-bi-background-bubble-error-theme-dark: var(--color-bi-background-dark-failure); - --color-bi-background-bubble-normal: var(--color-bi-background-light-highlight); - - //bi-background背景 - --color-bi-background-background: var(--color-bi-background-normal); - --color-bi-background-background-theme-dark: var(--color-bi-background-normal-theme-dark); - --color-bi-text-background: var(--color-bi-text-normal); - --color-bi-text-background-theme-dark: var(--color-bi-text-theme-dark); - - //bi-header-background背景 - --color-bi-background-header-background: var(--color-bi-background-light-gray); - --color-bi-background-header-background-theme-dark: var(--color-bi-background-light-gray-theme-dark); - --color-bi-text-header-background: var(--color-bi-text-light-gray); - --color-bi-text-header-background-theme-dark: var(--color-bi-text-light-gray-theme-dark); - - //bi-card卡片 - --color-bi-background-card: var(--color-bi-background-default); - --color-bi-background-card-theme-dark: var(--color-bi-background-default-theme-dark); - --color-bi-text-card: var(--color-bi-text-normal); - --color-bi-text-card-theme-dark: var(--color-bi-text-theme-dark); -} diff --git a/src/less/resource/background.less b/src/less/resource/background.less index 2edd575e8..28fd5f1c0 100644 --- a/src/less/resource/background.less +++ b/src/less/resource/background.less @@ -14,27 +14,19 @@ & .ztree li span.button.switch.bottom_open { .image2xPath(@icon-tree-vertical-line-4); } +} - & .ztree.hack li span.button.switch.center_open { - .imagePath(@icon-tree-vertical-line-3); - } - - & .ztree.hack li span.button.switch.roots_open { - .imagePath(@icon-tree-vertical-line-2); +.bi-display-tree { + & .ztree.solid li span.button.switch.center_open { + .image2xPath(@icon-tree-solid-vertical-line-3); } - & .ztree.hack li span.button.switch.bottom_open { - .imagePath(@icon-tree-vertical-line-4); + & .ztree.solid li span.button.switch.roots_open { + .image2xPath(@icon-tree-solid-vertical-line-2); } -} -.ztree.hack li ul.line { - .imagePath(@icon-tree-vertical-line-1, 0, 1px, repeat-y); -} - -.bi-theme-dark { - .ztree.hack li ul.line { - .imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 1px, repeat-y); + & .ztree.solid li span.button.switch.bottom_open { + .image2xPath(@icon-tree-solid-vertical-line-4); } } @@ -42,16 +34,16 @@ .image2xPath(@icon-tree-expand-type1); } -.ztree.hack li span.button.root_open { - .imagePath(@icon-tree-expand-type1); +.ztree.solid li span.button.root_open { + .image2xPath(@icon-tree-solid-expand-type1); } .bi-theme-dark { .ztree li span.button.root_open { .image2xPath(@icon-tree-expand-type1-theme-dark); } - .ztree.hack li span.button.root_open { - .imagePath(@icon-tree-expand-type1-theme-dark); + .ztree.solid li span.button.root_open { + .image2xPath(@icon-tree-solid-expand-type1-theme-dark); } } @@ -59,16 +51,16 @@ .image2xPath(@icon-tree-collapse-type1); } -.ztree.hack li span.button.root_close { - .imagePath(@icon-tree-collapse-type1); +.ztree.solid li span.button.root_close { + .image2xPath(@icon-tree-solid-collapse-type1); } .bi-theme-dark { .ztree li span.button.root_close { .image2xPath(@icon-tree-collapse-type1-theme-dark); } - .ztree.hack li span.button.root_close { - .imagePath(@icon-tree-collapse-type1-theme-dark); + .ztree.solid li span.button.root_close { + .image2xPath(@icon-tree-solid-collapse-type1-theme-dark); } } @@ -76,16 +68,16 @@ .image2xPath(@icon-tree-expand-type2); } -.ztree.hack li span.button.roots_open { - .imagePath(@icon-tree-expand-type2); +.ztree.solid li span.button.roots_open { + .image2xPath(@icon-tree-solid-expand-type2); } .bi-theme-dark { .ztree li span.button.roots_open { .image2xPath(@icon-tree-expand-type2-theme-dark); } - .ztree.hack li span.button.roots_open { - .imagePath(@icon-tree-expand-type2-theme-dark); + .ztree.solid li span.button.roots_open { + .image2xPath(@icon-tree-solid-expand-type2-theme-dark); } } @@ -93,16 +85,16 @@ .image2xPath(@icon-tree-collapse-type2); } -.ztree.hack li span.button.roots_close { - .imagePath(@icon-tree-collapse-type2); +.ztree.solid li span.button.roots_close { + .image2xPath(@icon-tree-solid-collapse-type2); } .bi-theme-dark { .ztree li span.button.roots_close { .image2xPath(@icon-tree-collapse-type2-theme-dark); } - .ztree.hack li span.button.roots_close { - .imagePath(@icon-tree-collapse-type2-theme-dark); + .ztree.solid li span.button.roots_close { + .image2xPath(@icon-tree-solid-collapse-type2-theme-dark); } } @@ -110,16 +102,16 @@ .image2xPath(@icon-tree-expand-type3); } -.ztree.hack li span.button.center_open { - .imagePath(@icon-tree-expand-type3); +.ztree.solid li span.button.center_open { + .image2xPath(@icon-tree-solid-expand-type3); } .bi-theme-dark { .ztree li span.button.center_open { .image2xPath(@icon-tree-expand-type3-theme-dark); } - .ztree.hack li span.button.center_open { - .imagePath(@icon-tree-expand-type3-theme-dark); + .ztree.solid li span.button.center_open { + .image2xPath(@icon-tree-solid-expand-type3-theme-dark); } } @@ -127,16 +119,16 @@ .image2xPath(@icon-tree-collapse-type3); } -.ztree.hack li span.button.center_close { - .imagePath(@icon-tree-collapse-type3); +.ztree.solid li span.button.center_close { + .image2xPath(@icon-tree-solid-collapse-type3); } .bi-theme-dark { .ztree li span.button.center_close { .image2xPath(@icon-tree-collapse-type3-theme-dark); } - .ztree.hack li span.button.center_close { - .imagePath(@icon-tree-collapse-type3-theme-dark); + .ztree.solid li span.button.center_close { + .image2xPath(@icon-tree-solid-collapse-type3-theme-dark); } } @@ -144,16 +136,16 @@ .image2xPath(@icon-tree-expand-type4); } -.ztree.hack li span.button.bottom_open { - .imagePath(@icon-tree-expand-type4); +.ztree.solid li span.button.bottom_open { + .image2xPath(@icon-tree-solid-expand-type4); } .bi-theme-dark { .ztree li span.button.bottom_open { .image2xPath(@icon-tree-expand-type4-theme-dark); } - .ztree.hack li span.button.bottom_open { - .imagePath(@icon-tree-expand-type4-theme-dark); + .ztree.solid li span.button.bottom_open { + .image2xPath(@icon-tree-solid-expand-type4-theme-dark); } } @@ -161,16 +153,16 @@ .image2xPath(@icon-tree-collapse-type4); } -.ztree.hack li span.button.bottom_close { - .imagePath(@icon-tree-collapse-type4); +.ztree.solid li span.button.bottom_close { + .image2xPath(@icon-tree-solid-collapse-type4); } .bi-theme-dark { .ztree li span.button.bottom_close { .image2xPath(@icon-tree-collapse-type4-theme-dark); } - .ztree.hack li span.button.bottom_close { - .imagePath(@icon-tree-collapse-type4-theme-dark); + .ztree.solid li span.button.bottom_close { + .image2xPath(@icon-tree-solid-collapse-type4-theme-dark); } } @@ -178,16 +170,16 @@ .image2xPath(@icon-tree-vertical-line-2); } -.ztree.hack li span.button.roots_docu { - .imagePath(@icon-tree-vertical-line-2); +.ztree.solid li span.button.roots_docu { + .image2xPath(@icon-tree-solid-vertical-line-2); } .bi-theme-dark { .ztree li span.button.roots_docu { .image2xPath(@icon-tree-vertical-line-2-theme-dark); } - .ztree.hack li span.button.roots_docu { - .imagePath(@icon-tree-vertical-line-2-theme-dark); + .ztree.solid li span.button.roots_docu { + .image2xPath(@icon-tree-solid-vertical-line-2-theme-dark); } } @@ -195,16 +187,16 @@ .image2xPath(@icon-tree-vertical-line-3); } -.ztree.hack li span.button.center_docu { - .imagePath(@icon-tree-vertical-line-3); +.ztree.solid li span.button.center_docu { + .image2xPath(@icon-tree-solid-vertical-line-3); } .bi-theme-dark { .ztree li span.button.center_docu { .image2xPath(@icon-tree-vertical-line-3-theme-dark); } - .ztree.hack li span.button.center_docu { - .imagePath(@icon-tree-vertical-line-3-theme-dark); + .ztree.solid li span.button.center_docu { + .image2xPath(@icon-tree-solid-vertical-line-3-theme-dark); } } @@ -212,16 +204,16 @@ .image2xPath(@icon-tree-vertical-line-4); } -.ztree.hack li span.button.bottom_docu { - .imagePath(@icon-tree-vertical-line-4); +.ztree.solid li span.button.bottom_docu { + .image2xPath(@icon-tree-solid-vertical-line-4); } .bi-theme-dark { .ztree li span.button.bottom_docu { .image2xPath(@icon-tree-vertical-line-4-theme-dark); } - .ztree.hack li span.button.bottom_docu { - .imagePath(@icon-tree-vertical-line-4-theme-dark); + .ztree.solid li span.button.bottom_docu { + .image2xPath(@icon-tree-solid-vertical-line-4-theme-dark); } } @@ -229,50 +221,86 @@ .image2xPath(@icon-loading); } -.ztree.hack li span.button.ico_loading { - .imagePath(@icon-loading); -} - .base-line-conn-background { .imagePath(@icon-tree-vertical-line-1, 0, 0, repeat-y); } +.base-solid-line-conn-background { + .image2xPath(@icon-tree-solid-vertical-line-1, 0, 0, repeat-y); +} + .bi-theme-dark { .base-line-conn-background { .imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 0, repeat-y); } } +.bi-theme-dark { + .base-solid-line-conn-background { + .image2xPath(@icon-tree-solid-vertical-line-1-theme-dark, 0, 0, repeat-y); + } +} + .first-line-conn-background { .imagePath(@icon-tree-vertical-line-2); } +.first-solid-line-conn-background { + .image2xPath(@icon-tree-solid-vertical-line-2); +} + .bi-theme-dark { .first-line-conn-background { .imagePath(@icon-tree-vertical-line-2-theme-dark); } } +.bi-theme-dark { + .first-solid-line-conn-background { + .image2xPath(@icon-tree-solid-vertical-line-2-theme-dark); + } +} + .mid-line-conn-background { .imagePath(@icon-tree-vertical-line-3); } +.mid-solid-line-conn-background { + .image2xPath(@icon-tree-solid-vertical-line-3); +} + .bi-theme-dark { .mid-line-conn-background { .imagePath(@icon-tree-vertical-line-3-theme-dark); } } +.bi-theme-dark { + .mid-solid-line-conn-background { + .image2xPath(@icon-tree-solid-vertical-line-3-theme-dark); + } +} + .last-line-conn-background { .imagePath(@icon-tree-vertical-line-4); } +.last-solid-line-conn-background { + .image2xPath(@icon-tree-solid-vertical-line-4); +} + .bi-theme-dark { .last-line-conn-background { .imagePath(@icon-tree-vertical-line-4-theme-dark); } } +.bi-theme-dark { + .last-solid-line-conn-background { + .image2xPath(@icon-tree-solid-vertical-line-4-theme-dark); + } +} + .loading-background { .image2xPath(@icon-loading); } diff --git a/src/less/resource/icon.less b/src/less/resource/icon.less index 1ca769404..a97b429da 100644 --- a/src/less/resource/icon.less +++ b/src/less/resource/icon.less @@ -13,6 +13,17 @@ .icon(tree-vertical-line-type2, @icon-tree-vertical-line-2); .icon(tree-vertical-line-type3, @icon-tree-vertical-line-3); .icon(tree-vertical-line-type4, @icon-tree-vertical-line-4); +.icon(tree-solid-collapse-icon-type1, @icon-tree-solid-collapse-type1); +.icon(tree-solid-collapse-icon-type2, @icon-tree-solid-collapse-type2); +.icon(tree-solid-collapse-icon-type3, @icon-tree-solid-collapse-type3); +.icon(tree-solid-collapse-icon-type4, @icon-tree-solid-collapse-type4); +.icon(tree-solid-expand-icon-type1, @icon-tree-solid-expand-type1); +.icon(tree-solid-expand-icon-type2, @icon-tree-solid-expand-type2); +.icon(tree-solid-expand-icon-type3, @icon-tree-solid-expand-type3); +.icon(tree-solid-expand-icon-type4, @icon-tree-solid-expand-type4); +.icon(tree-solid-vertical-line-type2, @icon-tree-solid-vertical-line-2); +.icon(tree-solid-vertical-line-type3, @icon-tree-solid-vertical-line-3); +.icon(tree-solid-vertical-line-type4, @icon-tree-solid-vertical-line-4); //CheckBox .icon_custom(check-box-icon, @icon-checkbox-normal, @icon-checkbox-normal, @icon-checkbox-normal, @icon-checkbox-active, @icon-checkbox-disable, @icon-checkbox-active-disable); @@ -43,6 +54,17 @@ .icon(tree-vertical-line-type2, @icon-tree-vertical-line-2-theme-dark); .icon(tree-vertical-line-type3, @icon-tree-vertical-line-3-theme-dark); .icon(tree-vertical-line-type4, @icon-tree-vertical-line-4-theme-dark); + .icon(tree-solid-collapse-icon-type1, @icon-tree-solid-collapse-type1-theme-dark); + .icon(tree-solid-collapse-icon-type2, @icon-tree-solid-collapse-type2-theme-dark); + .icon(tree-solid-collapse-icon-type3, @icon-tree-solid-collapse-type3-theme-dark); + .icon(tree-solid-collapse-icon-type4, @icon-tree-solid-collapse-type4-theme-dark); + .icon(tree-solid-expand-icon-type1, @icon-tree-solid-expand-type1-theme-dark); + .icon(tree-solid-expand-icon-type2, @icon-tree-solid-expand-type2-theme-dark); + .icon(tree-solid-expand-icon-type3, @icon-tree-solid-expand-type3-theme-dark); + .icon(tree-solid-expand-icon-type4, @icon-tree-solid-expand-type4-theme-dark); + .icon(tree-solid-vertical-line-type2, @icon-tree-solid-vertical-line-2-theme-dark); + .icon(tree-solid-vertical-line-type3, @icon-tree-solid-vertical-line-3-theme-dark); + .icon(tree-solid-vertical-line-type4, @icon-tree-solid-vertical-line-4-theme-dark); .icon_select(trans-color-icon, @icon-trans-normal-dark, @icon-trans-select-dark, @icon-trans-disable-dark); .icon(auto-square-color-icon, @icon-auto-square-normal-dark); diff --git a/src/widget/editor/editor.text.js b/src/widget/editor/editor.text.js index aa68dcd10..e74c16edf 100644 --- a/src/widget/editor/editor.text.js +++ b/src/widget/editor/editor.text.js @@ -80,6 +80,7 @@ BI.TextEditor = BI.inherit(BI.Widget, { this.editor.on(BI.Editor.EVENT_VALID, function () { + self.element.removeClass("error"); self.fireEvent(BI.TextEditor.EVENT_VALID); }); this.editor.on(BI.Editor.EVENT_CONFIRM, function () { @@ -101,6 +102,7 @@ BI.TextEditor = BI.inherit(BI.Widget, { self.fireEvent(BI.TextEditor.EVENT_STOP); }); this.editor.on(BI.Editor.EVENT_ERROR, function () { + self.element.addClass("error"); self.fireEvent(BI.TextEditor.EVENT_ERROR, arguments); }); this.editor.on(BI.Editor.EVENT_ENTER, function () { diff --git a/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js b/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js index c6030caff..02209b0d2 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.leveltree.js @@ -34,7 +34,8 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Pane, { BI.each(nodes, function (i, node) { var extend = { isFirstNode: i === 0, - isLastNode: i === nodes.length - 1 + isLastNode: i === nodes.length - 1, + height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT }; node.layer = layer; if (!BI.isKey(node.id)) { diff --git a/src/widget/multilayerselecttree/node/node.first.plus.js b/src/widget/multilayerselecttree/node/node.first.plus.js index 37e69704c..c187ab7a5 100644 --- a/src/widget/multilayerselecttree/node/node.first.plus.js +++ b/src/widget/multilayerselecttree/node/node.first.plus.js @@ -54,12 +54,12 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { // }); items.push({ el: this.node, - lgap: o.layer * 12 + lgap: o.layer * BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2 }); BI.createWidget({ type: "bi.horizontal_adapt", element: this, - columnSize: BI.makeArray(o.layer, 12), + columnSize: BI.makeArray(o.layer, BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2), items: items }); }, diff --git a/src/widget/multilayerselecttree/node/node.last.plus.js b/src/widget/multilayerselecttree/node/node.last.plus.js index 7fcaca78f..89f4a1efa 100644 --- a/src/widget/multilayerselecttree/node/node.last.plus.js +++ b/src/widget/multilayerselecttree/node/node.last.plus.js @@ -47,12 +47,12 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ el: this.node, - lgap: o.layer * 12 + lgap: o.layer * BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2 }); BI.createWidget({ type: "bi.horizontal_adapt", element: this, - columnSize: BI.makeArray(o.layer, 12), + columnSize: BI.makeArray(o.layer, BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2), items: items }); }, diff --git a/src/widget/multilayerselecttree/node/node.mid.plus.js b/src/widget/multilayerselecttree/node/node.mid.plus.js index 84f14bb8d..6dad3105f 100644 --- a/src/widget/multilayerselecttree/node/node.mid.plus.js +++ b/src/widget/multilayerselecttree/node/node.mid.plus.js @@ -47,12 +47,12 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ el: this.node, - lgap: o.layer * 12 + lgap: o.layer * BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2 }); BI.createWidget({ type: "bi.horizontal_adapt", element: this, - columnSize: BI.makeArray(o.layer, 12), + columnSize: BI.makeArray(o.layer, BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2), items: items }); }, diff --git a/src/widget/multilayerselecttree/node/node.plus.js b/src/widget/multilayerselecttree/node/node.plus.js index 911093fe2..d63d2d9d8 100644 --- a/src/widget/multilayerselecttree/node/node.plus.js +++ b/src/widget/multilayerselecttree/node/node.plus.js @@ -47,12 +47,12 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ el: this.node, - lgap: o.layer * 12 + lgap: o.layer * BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2 }); BI.createWidget({ type: "bi.horizontal_adapt", element: this, - columnSize: BI.makeArray(o.layer, 12), + columnSize: BI.makeArray(o.layer, BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2), items: items }); }, diff --git a/src/widget/multilayersingletree/multilayersingletree.leveltree.js b/src/widget/multilayersingletree/multilayersingletree.leveltree.js index da8bca702..186e2e0ae 100644 --- a/src/widget/multilayersingletree/multilayersingletree.leveltree.js +++ b/src/widget/multilayersingletree/multilayersingletree.leveltree.js @@ -34,7 +34,8 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Pane, { BI.each(nodes, function (i, node) { var extend = { isFirstNode: i === 0, - isLastNode: i === nodes.length - 1 + isLastNode: i === nodes.length - 1, + height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT }; node.layer = layer; if (!BI.isKey(node.id)) { diff --git a/src/widget/multilayersingletree/node/node.first.plus.js b/src/widget/multilayersingletree/node/node.first.plus.js index 9d5794bcb..51177bcce 100644 --- a/src/widget/multilayersingletree/node/node.first.plus.js +++ b/src/widget/multilayersingletree/node/node.first.plus.js @@ -26,12 +26,12 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ el: this.node, - lgap: o.layer * 12 + lgap: o.layer * BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2 }); BI.createWidget({ type: "bi.horizontal_adapt", element: this, - columnSize: BI.makeArray(o.layer, 12), + columnSize: BI.makeArray(o.layer, BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2), items: items }); }, diff --git a/src/widget/multilayersingletree/node/node.last.plus.js b/src/widget/multilayersingletree/node/node.last.plus.js index 18dd3eea7..007837f5c 100644 --- a/src/widget/multilayersingletree/node/node.last.plus.js +++ b/src/widget/multilayersingletree/node/node.last.plus.js @@ -26,12 +26,12 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ el: this.node, - lgap: o.layer * 12 + lgap: o.layer * BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2 }); BI.createWidget({ type: "bi.horizontal_adapt", element: this, - columnSize: BI.makeArray(o.layer, 12), + columnSize: BI.makeArray(o.layer, BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2), items: items }); }, diff --git a/src/widget/multilayersingletree/node/node.mid.plus.js b/src/widget/multilayersingletree/node/node.mid.plus.js index 9105de054..e8709cf78 100644 --- a/src/widget/multilayersingletree/node/node.mid.plus.js +++ b/src/widget/multilayersingletree/node/node.mid.plus.js @@ -26,7 +26,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { items.push({ el: this.node, - lgap: o.layer * 12 + lgap: o.layer * BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2 }); BI.createWidget({ type: "bi.horizontal_adapt", diff --git a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js index c10cbcd01..4cc5203e4 100644 --- a/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.first.treeleaf.js @@ -46,12 +46,12 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ el: this.item, - lgap: o.layer * 12 + lgap: o.layer * BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2 }); BI.createWidget({ type: "bi.horizontal_adapt", element: this, - columnSize: BI.makeArray(o.layer, 12), + columnSize: BI.makeArray(o.layer, BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2), items: items }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js index 4289108f0..9aa604737 100644 --- a/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.last.treeleaf.js @@ -46,12 +46,12 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ el: this.item, - lgap: o.layer * 12 + lgap: o.layer * BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2 }); BI.createWidget({ type: "bi.horizontal_adapt", element: this, - columnSize: BI.makeArray(o.layer, 12), + columnSize: BI.makeArray(o.layer, BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2), items: items }); }, diff --git a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js index 92a9a626a..eed7d553c 100644 --- a/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js +++ b/src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js @@ -46,12 +46,12 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, { items.push({ el: this.item, - lgap: o.layer * 12 + lgap: o.layer * BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2 }); BI.createWidget({ type: "bi.horizontal_adapt", element: this, - columnSize: BI.makeArray(o.layer, 12), + columnSize: BI.makeArray(o.layer, BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2), items: items }); }, diff --git a/src/widget/selecttree/selecttree.popup.js b/src/widget/selecttree/selecttree.popup.js index f2aeea428..1bd69a6cb 100644 --- a/src/widget/selecttree/selecttree.popup.js +++ b/src/widget/selecttree/selecttree.popup.js @@ -20,6 +20,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, { var extend = {layer: layer}; node.id = node.id || BI.UUID(); extend.pNode = pNode; + extend.height = BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT; if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) { extend.type = "bi.select_tree_mid_plus_group_node"; if (i === nodes.length - 1) { diff --git a/src/widget/singleselect/search/singleselect.search.loader.js b/src/widget/singleselect/search/singleselect.search.loader.js index a61ac843e..5625593dd 100644 --- a/src/widget/singleselect/search/singleselect.search.loader.js +++ b/src/widget/singleselect/search/singleselect.search.loader.js @@ -95,7 +95,7 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, { type: o.allowNoSelect ? "bi.single_select_item" : "bi.single_select_radio_item", logic: o.logic, cls: "bi-list-item-active", - height: 24, + height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, selected: false, iconWrapperWidth: 26, hgap: o.allowNoSelect ? 10 : 0, diff --git a/src/widget/singleselect/singleselect.loader.js b/src/widget/singleselect/singleselect.loader.js index 0cc2f6e60..1f27b6425 100644 --- a/src/widget/singleselect/singleselect.loader.js +++ b/src/widget/singleselect/singleselect.loader.js @@ -114,7 +114,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, { type: o.allowNoSelect ? "bi.single_select_item" : "bi.single_select_radio_item", logic: o.logic, cls: "bi-list-item-active", - height: 24, + height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, selected: false, iconWrapperWidth: 26, hgap: o.allowNoSelect ? 10 : 0, diff --git a/ui/modern/app.less b/ui/modern/app.less deleted file mode 100644 index d086387ac..000000000 --- a/ui/modern/app.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../src/less/resource/app"; -@import "var"; diff --git a/ui/modern/background.less b/ui/modern/background.less deleted file mode 100644 index 996147127..000000000 --- a/ui/modern/background.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../src/less/resource/background"; -@import "var"; diff --git a/ui/modern/font.less b/ui/modern/font.less deleted file mode 100644 index c236f82ed..000000000 --- a/ui/modern/font.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../src/less/resource/font"; -@import "var"; diff --git a/ui/modern/icon.less b/ui/modern/icon.less deleted file mode 100644 index 43e3123c5..000000000 --- a/ui/modern/icon.less +++ /dev/null @@ -1,5 +0,0 @@ -@import "../../src/less/resource/icon"; -@import "var"; - - - diff --git a/ui/modern/var.less b/ui/modern/var.less deleted file mode 100644 index 50a52a2ca..000000000 --- a/ui/modern/var.less +++ /dev/null @@ -1,6 +0,0 @@ -@import "../../src/less/index-modern"; -@webUrl: 'resources?path=/com/fr/web/ui/'; - -@fontUrl: '@{webUrl}font/'; //图片的基本地址 -@imageUrl: '@{webUrl}images/1x/'; //图片的基本地址 -@image2xUrl: '@{webUrl}images/2x/'; //2倍图片的基本地址 diff --git a/webpack/attachments.js b/webpack/attachments.js index df460167c..3b92c2714 100644 --- a/webpack/attachments.js +++ b/webpack/attachments.js @@ -77,6 +77,13 @@ const basicAttachmentMap = { ]), fix: [fixJs], fixProxy: [fixProxyJs], + less: sync([ + "src/less/core/**/*.less", + "src/less/theme/**/*.less", + "src/less/base/**/*.less", + "src/less/widget/**/*.less", + "src/less/component/**/*.less", + ]), }; const bundle = [].concat( @@ -93,11 +100,16 @@ const bundle = [].concat( basicAttachmentMap.ts, ); -const bundleModern = [].concat( - sync(["src/less/modern.less"]), - sync(["public/modern/app.less", "public/modern/**/*.less"]), +const bundleCss = [].concat( + basicAttachmentMap.less, + sync(["public/less/app.less", "public/less/**/*.less"]), ); +// const bundleModern = [].concat( +// sync(["src/less/modern.less"]), +// sync(["public/modern/app.less", "public/modern/**/*.less"]), +// ); + const coreJs = [].concat( basicAttachmentMap.polyfill, basicAttachmentMap.core, @@ -150,13 +162,13 @@ const fineui = [].concat( basicAttachmentMap.ts, ); -const fineuiModern = [].concat( - sync(["src/less/modern.less"]), - sync([ - 'ui/modern/app.less', - 'ui/modern/**/*.less', - ]), -); +// const fineuiModern = [].concat( +// sync(["src/less/modern.less"]), +// sync([ +// 'ui/modern/app.less', +// 'ui/modern/**/*.less', +// ]), +// ); const fineuiProxy = [].concat( basicAttachmentMap.polyfill, @@ -213,11 +225,9 @@ module.exports = { lodash: lodashJs, font: basicAttachmentMap.font, bundle: uniq(bundle), - bundleModern: uniq(bundleModern), fineuiWithoutNormalize: uniq(fineuiWithoutNormalize), bundleWithoutNormalize: uniq(bundleWithoutNormalize), fineui: uniq(fineui), - fineuiModern: uniq(fineuiModern), fineuiProxy: uniq(fineuiProxy), fineuiWithoutJqueryAndPolyfillJs: uniq(fineuiWithoutJqueryAndPolyfillJs), utils: uniq(basicAttachmentMap.utils), @@ -226,4 +236,5 @@ module.exports = { coreJs: uniq(coreJs), resource: uniq((resource)), config: uniq(config), + bundleCss: uniq(bundleCss), }; diff --git a/webpack/webpack.css.js b/webpack/webpack.css.js new file mode 100644 index 000000000..0028f7a26 --- /dev/null +++ b/webpack/webpack.css.js @@ -0,0 +1,20 @@ +const merge = require("webpack-merge"); + +const dirs = require("./dirs"); + +const common = require("./webpack.prod.js"); +common.entry = {}; + +const attachments = require("./attachments"); + +module.exports = merge.smart(common, { + mode: "production", + entry: { + [`2.0/${process.env.LESS_FILE_NAME}.min`]: attachments.bundleCss, + }, + + output: { + path: dirs.DEST, + filename: "[name].js", + }, +}); diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js index 7d6f3d371..7d8dd939c 100644 --- a/webpack/webpack.prod.js +++ b/webpack/webpack.prod.js @@ -18,7 +18,6 @@ module.exports = merge.smart(common, { font: attachments.font, "fineui.min": attachments.fineui, "fineui_without_normalize.min": attachments.fineuiWithoutNormalize, - "fineui.modern.min": attachments.fineuiModern, "fineui.proxy.min": attachments.fineuiProxy, "core_without_platform": attachments.coreWithoutPlatform, utils: attachments.utils, @@ -26,7 +25,6 @@ module.exports = merge.smart(common, { "fineui_without_jquery_polyfill": attachments.fineuiWithoutJqueryAndPolyfillJs, "2.0/fineui": attachments.bundle, "2.0/fineui.min": attachments.bundle, - "2.0/fineui.modern.min": attachments.bundleModern, "2.0/fineui_without_normalize": attachments.bundleWithoutNormalize, "2.0/fineui_without_normalize.min": attachments.bundleWithoutNormalize, "2.0/core_without_platform": attachments.coreWithoutPlatform,