diff --git a/.eslintrc.js b/.eslintrc.js index dd5602dc823904f1148aa0d937e8bf1daa0b59a3..cb60877ca7b6eeebcb518bb6901466d4892564c8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,9 +1,13 @@ module.exports = { extends: require.resolve('@reskript/config-lint/config/eslint'), + plugins: [ + 'import', + ], rules: { 'react/jsx-uses-react': 'error', 'linebreak-style': [0, 'error', 'windows'], 'no-use-before-define': 'off', + 'import/no-extraneous-dependencies': 'error', }, overrides: [{ 'files': ['*.stories.tsx', '*.stories.jsx', '*.stories.mdx'], diff --git a/package.json b/package.json index 2acf93907a3ec3aedb0085eb19b48c56f1dd440f..c8d8eceabb0d7435a3e5a0415d47206aa3664d39 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "cz-conventional-changelog": "^3.2.0", "enzyme-adapter-react-16": "^1.15.6", "enzyme-to-json": "^3.6.2", + "eslint-plugin-import": "^2.24.0", "husky": "^4.2.5", "lerna": "^3.22.1", "mkdirp": "^1.0.4", diff --git a/packages/ui/alert/package.json b/packages/ui/alert/package.json index d0c6e9ea856bdd6db482df8e6fafacef4fcf8c0d..01e0181db87dd9950d41d150f9a43a8498963ad4 100644 --- a/packages/ui/alert/package.json +++ b/packages/ui/alert/package.json @@ -62,6 +62,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" diff --git a/packages/ui/auto-complete/package.json b/packages/ui/auto-complete/package.json index 9854b719035d21321ad3a5861e0729e1b4e0d0a6..d3072768cc52fee3bf5249ba8ec6c03968e31e47 100644 --- a/packages/ui/auto-complete/package.json +++ b/packages/ui/auto-complete/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" @@ -84,6 +85,7 @@ "@huse/derived-state": "^1.1.0", "@osui/highlight-text": "^1.1.1", "@osui/select": "^1.1.1", + "classnames": "^2.2.6", "hoist-non-react-statics": "^3.3.2" } } diff --git a/packages/ui/avatar/package.json b/packages/ui/avatar/package.json index f55235ff970bcf288d0aa17fdf4a8e03dacdea87..d03ef642241465d4b89d95d477ee51ec445b65e9 100644 --- a/packages/ui/avatar/package.json +++ b/packages/ui/avatar/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" diff --git a/packages/ui/back-top/package.json b/packages/ui/back-top/package.json index a8e32fa051b4b5b27f2a1568523fa426c07ef37e..0c81c16eaffe38a688d35b189c3dde7b2654bd43 100644 --- a/packages/ui/back-top/package.json +++ b/packages/ui/back-top/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" diff --git a/packages/ui/branch-dropdown/package.json b/packages/ui/branch-dropdown/package.json index e7b4d481382db5f0be7a2f05576b28993eff62d6..212eaeb6429a89f11aa165d43983fdb75f3688c2 100644 --- a/packages/ui/branch-dropdown/package.json +++ b/packages/ui/branch-dropdown/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" @@ -78,7 +79,8 @@ }, "dependencies": { "@osui/button": "^1.1.1", - "@osui/icons": "^1.1.1" + "classnames": "^2.2.6" + }, "publishConfig": { "access": "public", diff --git a/packages/ui/breadcrumb/package.json b/packages/ui/breadcrumb/package.json index 133622a920f7b836eeb78a454e4e9ee5271bf47a..3967cb4ea99983cbc430817435ee4903f70d9cc5 100644 --- a/packages/ui/breadcrumb/package.json +++ b/packages/ui/breadcrumb/package.json @@ -65,6 +65,9 @@ "react": ">=16.9.0", "react-dom": ">=16.9.0" }, + "dependencies": { + "classnames": "^2.2.6" + }, "repository": { "type": "git", "url": "https://gitee.com/gitee-fe/osui/tree/master" diff --git a/packages/ui/button/package.json b/packages/ui/button/package.json index d606863e611412d9ec6ab10d0d9ca3c6f6d3d247..46537c5836ea7821c2c7a0bd489974283a64a1d7 100644 --- a/packages/ui/button/package.json +++ b/packages/ui/button/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" diff --git a/packages/ui/cascader/package.json b/packages/ui/cascader/package.json index f20c4b480a40f6a86ce8251fb3f32819e8b8e78b..2d07b0d319f7eef89bbdf7976dc4a830ac683bf9 100644 --- a/packages/ui/cascader/package.json +++ b/packages/ui/cascader/package.json @@ -61,10 +61,14 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" }, + "dependencies": { + "classnames": "^2.2.6" + }, "repository": { "type": "git", "url": "https://gitee.com/gitee-fe/osui/tree/master" diff --git a/packages/ui/collapse/package.json b/packages/ui/collapse/package.json index ddfbaaff7f683be77f80c22dac9dd9df3b9388e6..0c126e7ca4a26bcb0dadc0e0d21eff5fc184e022 100644 --- a/packages/ui/collapse/package.json +++ b/packages/ui/collapse/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" @@ -73,7 +74,8 @@ "license": "MIT", "dependencies": { "@osui/brand-provider": "^1.1.1", - "classnames": "^2.2.6" + "classnames": "^2.2.6", + "hoist-non-react-statics": "^3.3.2" }, "publishConfig": { "access": "public", diff --git a/packages/ui/drawer/package.json b/packages/ui/drawer/package.json index 411ed80aa97e82eb4ecfeef3ccafa34a00913e12..375a0c35c10facb74a3a88b9fbd54c8511ea08e5 100644 --- a/packages/ui/drawer/package.json +++ b/packages/ui/drawer/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" diff --git a/packages/ui/dropdown/package.json b/packages/ui/dropdown/package.json index b414c227ddaa26d58cdc26204980a2348958282a..3dbbad92c2a97c433ab434c7fd35805364810ab4 100644 --- a/packages/ui/dropdown/package.json +++ b/packages/ui/dropdown/package.json @@ -81,6 +81,7 @@ "registry": "https://registry.npmjs.com" }, "dependencies": { + "classnames": "^2.2.6", "hoist-non-react-statics": "^3.3.2" } } diff --git a/packages/ui/empty/package.json b/packages/ui/empty/package.json index 5842b98eac69672d52076bdd04dfd3b01012c499..a68dbc80cdce5b0e1d7f3d5b0503b5c92ef02528 100644 --- a/packages/ui/empty/package.json +++ b/packages/ui/empty/package.json @@ -65,6 +65,9 @@ "react": ">=16.9.0", "react-dom": ">=16.9.0" }, + "dependencies": { + "classnames": "^2.2.6" + }, "repository": { "type": "git", "url": "https://gitee.com/gitee-fe/osui/tree/master" diff --git a/packages/ui/form/package.json b/packages/ui/form/package.json index fae5ae799e25d363723f7da90e80f05b6942c598..cfbebd9566170968849c37872f3f5b3449603bc7 100644 --- a/packages/ui/form/package.json +++ b/packages/ui/form/package.json @@ -82,6 +82,7 @@ }, "gitHead": "904178b6c0bb86963017122daa529580decb66e8", "dependencies": { - "@osui/brand-provider": "^1.1.1" + "@osui/brand-provider": "^1.1.1", + "classnames": "^2.2.6" } } diff --git a/packages/ui/input-number/package.json b/packages/ui/input-number/package.json index 6344494d4be9ba4c22117f09f353f41c9920c500..571ad77382e50d312c1ed6d30be0941fa789401d 100644 --- a/packages/ui/input-number/package.json +++ b/packages/ui/input-number/package.json @@ -65,6 +65,9 @@ "react": ">=16.9.0", "react-dom": ">=16.9.0" }, + "dependencies": { + "classnames": "^2.2.6" + }, "repository": { "type": "git", "url": "https://gitee.com/gitee-fe/osui/tree/master" diff --git a/packages/ui/input/package.json b/packages/ui/input/package.json index 547558bd82f7b9ac49f7baf87a4ffd712bfbe536..18d9efacc8a0f540841a2514c2a7ba9c6265c5a2 100644 --- a/packages/ui/input/package.json +++ b/packages/ui/input/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" @@ -78,6 +79,8 @@ }, "dependencies": { "@osui/brand-provider": "^1.1.1", + "@osui/button": "^1.1.1", + "@osui/input": "^1.1.1", "classnames": "^2.2.6", "hoist-non-react-statics": "^3.3.2", "rc-util": "^5.9.8" diff --git a/packages/ui/joyride/package.json b/packages/ui/joyride/package.json index d3d2d6b8819f8ec1f0e053f075c5ac620d3f7d5f..cef96bb403a25d806d5850de59c1086ad9a5b78a 100644 --- a/packages/ui/joyride/package.json +++ b/packages/ui/joyride/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "react": ">=16.9.0", "react-dom": ">=16.9.0" }, @@ -81,6 +82,8 @@ }, "dependencies": { "@huse/derived-state": "^1.0.3", + "@osui/button": "^1.1.1", + "classnames": "^2.2.6", "lodash.merge": "^4.6.2", "react-joyride": "^2.3.0" } diff --git a/packages/ui/menu-dropdown/package.json b/packages/ui/menu-dropdown/package.json index 7d5fbaaa6e2f8878fe3a4b042c20cfb9981bf93a..cddb5d7f38ca6da7d8d17f2a550b291d4364c386 100644 --- a/packages/ui/menu-dropdown/package.json +++ b/packages/ui/menu-dropdown/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" diff --git a/packages/ui/menu/package.json b/packages/ui/menu/package.json index 179b7a8ea61861964c22b41d8e6d408bf4003874..f68677b93cf160b6c5373931f11e5e1040269ded 100644 --- a/packages/ui/menu/package.json +++ b/packages/ui/menu/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" @@ -81,6 +82,7 @@ "registry": "https://registry.npmjs.com" }, "dependencies": { + "classnames": "^2.2.6", "hoist-non-react-statics": "^3.3.2" } } diff --git a/packages/ui/menu/src/index.less b/packages/ui/menu/src/index.less index bc623de25a361c988e710a1125115b3f15266023..15fd1060b88a9b4f32bb9b2dc7f1bc3eb1d1ac38 100644 --- a/packages/ui/menu/src/index.less +++ b/packages/ui/menu/src/index.less @@ -1,6 +1,8 @@ @osui-menu-class-prefix: osui-menu; -.ant-menu-vertical.ant-menu-sub, .ant-menu-vertical-left.ant-menu-sub, .ant-menu-vertical-right.ant-menu-sub { +.ant-menu-vertical.ant-menu-sub, +.ant-menu-vertical-left.ant-menu-sub, +.ant-menu-vertical-right.ant-menu-sub { max-height: ~'calc(100vh - 100px)'; } diff --git a/packages/ui/message/package.json b/packages/ui/message/package.json index 14b7bab52b7972bfd30609bbf711abb869b820ab..fdf38b2d5ffbae65cf9bde879251034b7225bcb6 100644 --- a/packages/ui/message/package.json +++ b/packages/ui/message/package.json @@ -62,6 +62,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" diff --git a/packages/ui/modal/package.json b/packages/ui/modal/package.json index 67ae6c9e0cefb5ba86a035c8e2bf9eb6d0613827..d7fcc3439acc0c8befb576e9ccba5973e5ab8bf1 100644 --- a/packages/ui/modal/package.json +++ b/packages/ui/modal/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" diff --git a/packages/ui/page-header/package.json b/packages/ui/page-header/package.json index bb19ec995608b8ef3524863a0a9ac4ebbc0c24f8..1d3a8e0d9d61f34f21d088246d85457b709255c3 100644 --- a/packages/ui/page-header/package.json +++ b/packages/ui/page-header/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" @@ -81,6 +82,6 @@ "registry": "https://registry.npmjs.com" }, "dependencies": { - "@osui/icons": "^1.1.1" + "classnames": "^2.2.6" } } diff --git a/packages/ui/page-header/src/index.less b/packages/ui/page-header/src/index.less index 99d7b422630004644a0e3a923e9dd6f6ac4910e7..76b42bedba177d3b7db8ac97021399bd26f66cb7 100644 --- a/packages/ui/page-header/src/index.less +++ b/packages/ui/page-header/src/index.less @@ -12,4 +12,4 @@ svg.osui-icon { height: var(--page-header-title-font-size); } -} \ No newline at end of file +} diff --git a/packages/ui/pagination/package.json b/packages/ui/pagination/package.json index ec416de76cebe9a410649ba9a65a3d5ccf08f710..76d6c426271bf44987321d697cf4cb99c040f43a 100644 --- a/packages/ui/pagination/package.json +++ b/packages/ui/pagination/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" @@ -77,6 +78,7 @@ } }, "dependencies": { + "@osui/brand-provider": "^1.1.1", "@osui/button": "^1.1.1", "classnames": "^2.2.6" }, diff --git a/packages/ui/popover/package.json b/packages/ui/popover/package.json index 0a88c54085bce5d95b7920e6c3fa4c4687f63dba..26b26665decd3b553b690cf65a1f64d585a7bf36 100644 --- a/packages/ui/popover/package.json +++ b/packages/ui/popover/package.json @@ -65,6 +65,9 @@ "react": ">=16.9.0", "react-dom": ">=16.9.0" }, + "dependencies": { + "classnames": "^2.2.6" + }, "repository": { "type": "git", "url": "https://gitee.com/gitee-fe/osui/tree/master" diff --git a/packages/ui/progress/package.json b/packages/ui/progress/package.json index 36b7df5d49f64f613640abbe18b91b1d6f095ee5..9e6ae7fac4f4291ea6c0325b2028f540490449bd 100644 --- a/packages/ui/progress/package.json +++ b/packages/ui/progress/package.json @@ -72,6 +72,7 @@ "author": "huoyuxuan,liushaozhen", "license": "MIT", "dependencies": { + "@osui/brand-provider": "^1.1.1", "classnames": "^2.2.6" }, "publishConfig": { diff --git a/packages/ui/quick-edit/package.json b/packages/ui/quick-edit/package.json index 2bd4e20ec8cc3f3414d826fbf767a2cdeedb39ad..1cf7cef9962d3082d1bff291e72822e518d9f47a 100644 --- a/packages/ui/quick-edit/package.json +++ b/packages/ui/quick-edit/package.json @@ -82,6 +82,9 @@ }, "dependencies": { "@huse/derived-state": "^1.1.0", + "@osui/input": "^1.1.1", + "@osui/select": "^1.1.1", + "classnames": "^2.2.6", "hoist-non-react-statics": "^3.3.2", "react-abstract-quick-edit": "^0.0.7" } diff --git a/packages/ui/rate/package.json b/packages/ui/rate/package.json index eec2069288d714991a7108bc21bf258a02a2ef0c..310bf4b4102673032bcd2043011bbc2bf6154ba2 100644 --- a/packages/ui/rate/package.json +++ b/packages/ui/rate/package.json @@ -81,6 +81,7 @@ "registry": "https://registry.npmjs.com" }, "dependencies": { + "classnames": "^2.2.6", "hoist-non-react-statics": "^3.3.2" } } diff --git a/packages/ui/search-select-list/package.json b/packages/ui/search-select-list/package.json index 0600a5c531f573f929d083e921f08bc25b611594..a676b755dec4782f8d410ce6d34cffe6b183491c 100644 --- a/packages/ui/search-select-list/package.json +++ b/packages/ui/search-select-list/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" @@ -77,6 +78,8 @@ } }, "dependencies": { + "@osui/button": "^1.1.1", + "@osui/input": "^1.1.1", "classnames": "^2.2.6" }, "publishConfig": { diff --git a/packages/ui/select/package.json b/packages/ui/select/package.json index 5c2c641d6abe58c6a85e47631c1f546547f531a6..38a532b98ca716833d336658f44def8830a179e8 100644 --- a/packages/ui/select/package.json +++ b/packages/ui/select/package.json @@ -61,11 +61,13 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" }, "dependencies": { + "@osui/brand-provider": "^1.1.1", "classnames": "^2.2.6" }, "repository": { diff --git a/packages/ui/slider/package.json b/packages/ui/slider/package.json index 2bcc8198f70db51da1595ba43b11010ef3d024b0..3f63ecc260bbd912195ee3d3cebe9bd02975377d 100644 --- a/packages/ui/slider/package.json +++ b/packages/ui/slider/package.json @@ -65,6 +65,10 @@ "react": ">=16.9.0", "react-dom": ">=16.9.0" }, + "dependencies": { + "@osui/brand-provider": "^1.1.1", + "classnames": "^2.2.6" + }, "repository": { "type": "git", "url": "https://gitee.com/gitee-fe/osui/tree/master" diff --git a/packages/ui/space/package.json b/packages/ui/space/package.json index bd089111be60b853eb66d5b8297b2a4da8d3fd22..9bca8b850d9f1b8b93b08e0636be0e3001105cde 100644 --- a/packages/ui/space/package.json +++ b/packages/ui/space/package.json @@ -65,6 +65,9 @@ "react": ">=16.9.0", "react-dom": ">=16.9.0" }, + "dependencies": { + "classnames": "^2.2.6" + }, "repository": { "type": "git", "url": "https://gitee.com/gitee-fe/osui/tree/master" diff --git a/packages/ui/steps/package.json b/packages/ui/steps/package.json index 955259eb1ad9eb1aea921016e436d336d6941867..3721cd049c7cd4a6984926e1268a0b5c48c7eec3 100644 --- a/packages/ui/steps/package.json +++ b/packages/ui/steps/package.json @@ -65,6 +65,9 @@ "react": ">=16.9.0", "react-dom": ">=16.9.0" }, + "dependencies": { + "classnames": "^2.2.6" + }, "repository": { "type": "git", "url": "https://gitee.com/gitee-fe/osui/tree/master" diff --git a/packages/ui/table/package.json b/packages/ui/table/package.json index cc5dd1e55c98150ae637ebddad671f90258ba343..bf5d99bb6a33091c0afa04a594e8c6db6bca1927 100644 --- a/packages/ui/table/package.json +++ b/packages/ui/table/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" @@ -77,6 +78,7 @@ } }, "dependencies": { + "@osui/brand-provider": "^1.1.1", "@osui/pagination": "^1.1.1", "classnames": "^2.2.6", "hoist-non-react-statics": "^3.3.2" diff --git a/packages/ui/tabs/package.json b/packages/ui/tabs/package.json index 536c53c00251e23ed00b802bf352c23e8c90972e..f2c5cf0ece114edd3b247064d2a31c38e0a71f2d 100644 --- a/packages/ui/tabs/package.json +++ b/packages/ui/tabs/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" @@ -82,6 +83,7 @@ }, "gitHead": "904178b6c0bb86963017122daa529580decb66e8", "dependencies": { + "classnames": "^2.2.6", "hoist-non-react-statics": "^3.3.2" } } diff --git a/packages/ui/tag/package.json b/packages/ui/tag/package.json index 30ba3638f122aaa61f26dc71b910229ad872d43c..7f5269c895377b12742bec32efdb9fe9d8bc8d25 100644 --- a/packages/ui/tag/package.json +++ b/packages/ui/tag/package.json @@ -61,6 +61,7 @@ "typescript": "^3.9.6" }, "peerDependencies": { + "@osui/icons": "^1.1.1", "antd": ">=4.4.0 <4.17.0", "react": ">=16.9.0", "react-dom": ">=16.9.0" diff --git a/packages/ui/text-overflow-tooltip/src/index.less b/packages/ui/text-overflow-tooltip/src/index.less index 9f9f98f1e50050cadbb7533f7b54c4726ee6f5ea..1daf65d91c0c087d5a6b57e8f6892ccc71fa15ff 100644 --- a/packages/ui/text-overflow-tooltip/src/index.less +++ b/packages/ui/text-overflow-tooltip/src/index.less @@ -7,4 +7,4 @@ white-space: nowrap; text-overflow: ellipsis; } -} \ No newline at end of file +} diff --git a/packages/ui/toggle-button/package.json b/packages/ui/toggle-button/package.json index 5b7aadf656d0d188b9569836abd7152bbe3b8410..372f8ce8be8bf76e4fb1de7498ec3c3c43832e5e 100644 --- a/packages/ui/toggle-button/package.json +++ b/packages/ui/toggle-button/package.json @@ -78,7 +78,8 @@ }, "dependencies": { "@huse/derived-state": "^1.0.1", - "@osui/icons": "^1.1.1" + "@osui/icons": "^1.1.1", + "classnames": "^2.2.6" }, "publishConfig": { "access": "public", diff --git a/packages/ui/tree-select/package.json b/packages/ui/tree-select/package.json index fa9f63ae6563cfaccaa0d44f43c145e36fe9df38..dd30f6b78e5656d37a1c5376ab52b090e8c04b4d 100644 --- a/packages/ui/tree-select/package.json +++ b/packages/ui/tree-select/package.json @@ -52,6 +52,7 @@ "identity-obj-proxy": "^3.0.0", "jest": "^27.0.6", "prop-types": "^15.7.2", + "rc-tree-select": "^4.4.0-alpha.2", "react": "^16.13.1", "react-dom": "^16.13.1", "react-is": "^16.13.1", @@ -81,6 +82,7 @@ "registry": "https://registry.npmjs.com" }, "dependencies": { + "classnames": "^2.2.6", "hoist-non-react-statics": "^3.3.2" } } diff --git a/packages/ui/tree/package.json b/packages/ui/tree/package.json index 4b572a9704b98dfa85899e419b6264a8065f65a0..e152a535b2080a5f4578ebcd37b38971ee89771c 100644 --- a/packages/ui/tree/package.json +++ b/packages/ui/tree/package.json @@ -65,6 +65,9 @@ "react": ">=16.9.0", "react-dom": ">=16.9.0" }, + "dependencies": { + "classnames": "^2.2.6" + }, "repository": { "type": "git", "url": "https://gitee.com/gitee-fe/osui/tree/master" diff --git a/packages/ui/typography/package.json b/packages/ui/typography/package.json index 1c0749463c9d482b2274973d4fbaca1165189fda..c2e4356cbd955df76c78ee6d57e18615f2e80cbc 100644 --- a/packages/ui/typography/package.json +++ b/packages/ui/typography/package.json @@ -65,6 +65,9 @@ "react": ">=16.9.0", "react-dom": ">=16.9.0" }, + "dependencies": { + "classnames": "^2.2.6" + }, "repository": { "type": "git", "url": "https://gitee.com/gitee-fe/osui/tree/master" diff --git a/packages/ui/typography/src/index.less b/packages/ui/typography/src/index.less index 8038c5a7459aa36d35a451cf01715ced72f3e579..932853b41a836ea35763820abbfb54a5500235db 100644 --- a/packages/ui/typography/src/index.less +++ b/packages/ui/typography/src/index.less @@ -5,4 +5,4 @@ h3 { font-weight: var(--page-header-title-font-weight); } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 2e4b3a50a04010bc24e7a15ca89c4540a00dc4a4..534d805a1f04573a7b7fe04056f2047c20678b39 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4864,6 +4864,17 @@ array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.2: get-intrinsic "^1.0.1" is-string "^1.0.5" +array-includes@^3.1.3: + version "3.1.3" + resolved "https://registry.nlark.com/array-includes/download/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a" + integrity sha1-x/YZs4KtKvr1Mmzd/cCvxhr3aQo= + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.2" + get-intrinsic "^1.1.1" + is-string "^1.0.5" + array-tree-filter@^2.1.0: version "2.1.0" resolved "https://registry.npm.taobao.org/array-tree-filter/download/array-tree-filter-2.1.0.tgz#873ac00fec83749f255ac8dd083814b4f6329190" @@ -4910,7 +4921,7 @@ array.prototype.find@^2.1.1: define-properties "^1.1.3" es-abstract "^1.17.4" -array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.3: +array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.3, array.prototype.flat@^1.2.4: version "1.2.4" resolved "https://registry.npm.taobao.org/array.prototype.flat/download/array.prototype.flat-1.2.4.tgz?cache=0&sync_timestamp=1605688488654&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Farray.prototype.flat%2Fdownload%2Farray.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" integrity sha1-bvY4tDMSvUAbTGGZ/ex+LcnpoSM= @@ -7339,7 +7350,7 @@ debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: dependencies: ms "2.1.2" -debug@^3.0.0, debug@^3.1.0: +debug@^3.0.0, debug@^3.1.0, debug@^3.2.7: version "3.2.7" resolved "https://registry.npm.taobao.org/debug/download/debug-3.2.7.tgz?cache=0&sync_timestamp=1607566517339&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha1-clgLfpFF+zm2Z2+cXl+xALk0F5o= @@ -8224,6 +8235,14 @@ eslint-formatter-pretty@^4.0.0: string-width "^4.2.0" supports-hyperlinks "^2.0.0" +eslint-import-resolver-node@^0.3.5: + version "0.3.6" + resolved "https://registry.nlark.com/eslint-import-resolver-node/download/eslint-import-resolver-node-0.3.6.tgz?cache=0&sync_timestamp=1629046428620&other_urls=https%3A%2F%2Fregistry.nlark.com%2Feslint-import-resolver-node%2Fdownload%2Feslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" + integrity sha1-QEi5WDldqJZoJSAB29nsprg7rL0= + dependencies: + debug "^3.2.7" + resolve "^1.20.0" + eslint-loader@^4.0.2: version "4.0.2" resolved "https://registry.npm.taobao.org/eslint-loader/download/eslint-loader-4.0.2.tgz?cache=0&sync_timestamp=1601214436656&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-loader%2Fdownload%2Feslint-loader-4.0.2.tgz#386a1e21bcb613b3cf2d252a3b708023ccfb41ec" @@ -8235,6 +8254,14 @@ eslint-loader@^4.0.2: object-hash "^2.0.3" schema-utils "^2.6.5" +eslint-module-utils@^2.6.2: + version "2.6.2" + resolved "https://registry.nlark.com/eslint-module-utils/download/eslint-module-utils-2.6.2.tgz?cache=0&sync_timestamp=1628456039535&other_urls=https%3A%2F%2Fregistry.nlark.com%2Feslint-module-utils%2Fdownload%2Feslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534" + integrity sha1-lOVUDdFf4VIuj/o+yNs7f6fnpTQ= + dependencies: + debug "^3.2.7" + pkg-dir "^2.0.0" + eslint-plugin-babel@^5.3.1: version "5.3.1" resolved "https://registry.npm.taobao.org/eslint-plugin-babel/download/eslint-plugin-babel-5.3.1.tgz?cache=0&sync_timestamp=1593484894602&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Feslint-plugin-babel%2Fdownload%2Feslint-plugin-babel-5.3.1.tgz#75a2413ffbf17e7be57458301c60291f2cfbf560" @@ -8242,6 +8269,27 @@ eslint-plugin-babel@^5.3.1: dependencies: eslint-rule-composer "^0.3.0" +eslint-plugin-import@^2.24.0: + version "2.24.0" + resolved "https://registry.nlark.com/eslint-plugin-import/download/eslint-plugin-import-2.24.0.tgz?cache=0&sync_timestamp=1628458245337&other_urls=https%3A%2F%2Fregistry.nlark.com%2Feslint-plugin-import%2Fdownload%2Feslint-plugin-import-2.24.0.tgz#697ffd263e24da5e84e03b282f5fb62251777177" + integrity sha1-aX/9Jj4k2l6E4DsoL1+2IlF3cXc= + dependencies: + array-includes "^3.1.3" + array.prototype.flat "^1.2.4" + debug "^2.6.9" + doctrine "^2.1.0" + eslint-import-resolver-node "^0.3.5" + eslint-module-utils "^2.6.2" + find-up "^2.0.0" + has "^1.0.3" + is-core-module "^2.4.0" + minimatch "^3.0.4" + object.values "^1.1.3" + pkg-up "^2.0.0" + read-pkg-up "^3.0.0" + resolve "^1.20.0" + tsconfig-paths "^3.9.0" + eslint-plugin-jest@^23.20.0: version "23.20.0" resolved "https://registry.npm.taobao.org/eslint-plugin-jest/download/eslint-plugin-jest-23.20.0.tgz#e1d69c75f639e99d836642453c4e75ed22da4099" @@ -8882,7 +8930,7 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" -find-up@^2.0.0: +find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.npm.taobao.org/find-up/download/find-up-2.1.0.tgz?cache=0&sync_timestamp=1597170240264&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-up%2Fdownload%2Ffind-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= @@ -10620,6 +10668,13 @@ is-core-module@^2.2.0: dependencies: has "^1.0.3" +is-core-module@^2.4.0: + version "2.6.0" + resolved "https://registry.nlark.com/is-core-module/download/is-core-module-2.6.0.tgz?cache=0&sync_timestamp=1629224656971&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-core-module%2Fdownload%2Fis-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19" + integrity sha1-11U7JSb+Wbkro+QMjfdX7Ipwnhk= + dependencies: + has "^1.0.3" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -11756,7 +11811,7 @@ json2mq@^0.2.0: dependencies: string-convert "^0.2.0" -json5@2.x, json5@^2.1.1, json5@^2.1.2: +json5@2.x, json5@^2.1.1, json5@^2.1.2, json5@^2.2.0: version "2.2.0" resolved "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM= @@ -13546,7 +13601,7 @@ object.values@^1.1.0, object.values@^1.1.1: es-abstract "^1.18.0-next.1" has "^1.0.3" -object.values@^1.1.2: +object.values@^1.1.2, object.values@^1.1.3: version "1.1.4" resolved "https://registry.nlark.com/object.values/download/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30" integrity sha1-DSc3YoM+gWtpOmN9MAc+cFFTWzA= @@ -14151,6 +14206,13 @@ pirates@^4.0.0, pirates@^4.0.1: dependencies: node-modules-regexp "^1.0.0" +pkg-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" + integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= + dependencies: + find-up "^2.1.0" + pkg-dir@^3.0.0: version "3.0.0" resolved "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz?cache=0&sync_timestamp=1602861195578&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpkg-dir%2Fdownload%2Fpkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" @@ -14179,6 +14241,13 @@ pkg-up@3.1.0, pkg-up@^3.1.0: dependencies: find-up "^3.0.0" +pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.npm.taobao.org/pkg-up/download/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" + integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= + dependencies: + find-up "^2.1.0" + please-upgrade-node@^3.2.0: version "3.2.0" resolved "https://registry.npm.taobao.org/please-upgrade-node/download/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" @@ -15483,6 +15552,17 @@ rc-tooltip@~5.1.1: "@babel/runtime" "^7.11.2" rc-trigger "^5.0.0" +rc-tree-select@^4.4.0-alpha.2: + version "4.4.0-alpha.2" + resolved "https://registry.nlark.com/rc-tree-select/download/rc-tree-select-4.4.0-alpha.2.tgz?cache=0&sync_timestamp=1624361120564&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frc-tree-select%2Fdownload%2Frc-tree-select-4.4.0-alpha.2.tgz#b96019bd401084076bedac4e49ea50321709b273" + integrity sha1-uWAZvUAQhAdr7axOSepQMhcJsnM= + dependencies: + "@babel/runtime" "^7.10.1" + classnames "2.x" + rc-select "^12.0.0" + rc-tree "^4.0.0" + rc-util "^5.0.5" + rc-tree-select@~4.3.0: version "4.3.0" resolved "https://registry.npm.taobao.org/rc-tree-select/download/rc-tree-select-4.3.0.tgz?cache=0&sync_timestamp=1608802663774&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-tree-select%2Fdownload%2Frc-tree-select-4.3.0.tgz#714a4fe658aa73f2a7b0aa4bd6e43be63194a6ce" @@ -18437,6 +18517,15 @@ ts-pnp@^1.1.6: resolved "https://registry.npm.taobao.org/ts-pnp/download/ts-pnp-1.2.0.tgz?cache=0&sync_timestamp=1585245674012&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fts-pnp%2Fdownload%2Fts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" integrity sha1-pQCtCEsHmPHDBxrzkeZZEshrypI= +tsconfig-paths@^3.9.0: + version "3.10.1" + resolved "https://registry.nlark.com/tsconfig-paths/download/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7" + integrity sha1-ea5npowVKJ/fXFHLdPOXUi15Xtc= + dependencies: + json5 "^2.2.0" + minimist "^1.2.0" + strip-bom "^3.0.0" + tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.npm.taobao.org/tslib/download/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"