Domů Procházet Nápověda
Registrovat se Přihlásit se
Apq
/
semi-design
zrcadlo https://github.com/DouyinFE/semi-design.git
1
0
Rozštěpit 0
Soubory Úkoly 0 Wiki
Procházet zdrojové kódy

Merge branch 'main' into release

pointhalo před 2 roky
rodič
882a37d88c e8e8561eef
revize
108c4118e8
10 změnil soubory, kde provedl 107 přidání a 12 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 5 0
      content/start/changelog/index-en-US.md
  2. 4 0
      content/start/changelog/index.md
  3. 2 2
      package.json
  4. 0 1
      packages/semi-foundation/button/button.scss
  5. 1 1
      packages/semi-foundation/image/variables.scss
  6. 2 2
      packages/semi-foundation/skeleton/variables.scss
  7. 2 2
      packages/semi-ui/upload/_story/upload.stories.jsx
  8. 1 0
      src/html.js
  9. 2 0
      static/robots.txt
  10. 88 4
      yarn.lock

+ 5 - 0
content/start/changelog/index-en-US.md
Zobrazit soubor 

@@ -16,6 +16,11 @@ Version：Major.Minor.Patch (follow the **Semver** specification)
 
 
 ---
 
 
+#### 🎉 2.40.0 (2023-07-28)
 
+- 【Style】
 
+    - Remove unnecessary margin in button component [#1732](https://github.com/DouyinFE/semi-design/pull/1732)
 
+    - Skeleton's default rounded corners changed from 4px to --semi-border-radius-small(3px) [#1739](https://github.com/DouyinFE/semi-design/pull/1739)
 
+
 
 #### 🎉 2.40.0-beta.0 (2023-07-25)
 
 - 【Feat】
 
     - Form onSubmit, onSubmitFail add event parameters to reveal [#1728](https://github.com/DouyinFE/semi-design/issues/1728)

+ 4 - 0
content/start/changelog/index.md
Zobrazit soubor 

@@ -13,6 +13,10 @@ Semi 版本号遵循 **Semver** 规范（主版本号-次版本号-修订版本
 
 -   修订版本号（patch）：仅会进行 bugfix，发布时间不限
 
 -   不同版本间的详细关系，可查阅 [FAQ](/zh-CN/start/faq)
 
 
+#### 🎉 2.40.0 (2023-07-28)
 
+- 【Style】
 
+    - 删除 Button 组件中的不必要的 margin [#1732](https://github.com/DouyinFE/semi-design/pull/1732)
 
+    - Skeleton 的默认圆角从 4px 修改为 --semi-border-radius-small(3px) [#1739](https://github.com/DouyinFE/semi-design/pull/1739)
 
 
 #### 🎉 2.40.0-beta.0 (2023-07-25)
 
 - 【Feat】

+ 2 - 2
package.json
Zobrazit soubor 

@@ -47,7 +47,7 @@
 
     "dependencies": {
 
         "@douyinfe/semi-site-banner": "^0.1.0",
 
         "@douyinfe/semi-site-doc-style": "0.0.1",
 
-        "@douyinfe/semi-site-header": "^0.0.22",
 
+        "@douyinfe/semi-site-header": "^0.0.27",
 
         "@douyinfe/semi-site-markdown-blocks": "^0.0.9",
 
         "@mdx-js/mdx": "1.6.22",
 
         "@mdx-js/react": "^1.6.22",
 
@@ -232,4 +232,4 @@
 
         ]
 
     },
 
     "license": "MIT"
 
-}
 
+}

+ 0 - 1
packages/semi-foundation/button/button.scss
Zobrazit soubor 

@@ -11,7 +11,6 @@ $module: #{$prefix}-button;
 
     display: inline-flex;
 
     align-items: center;
 
     justify-content: center;
 
-    margin: 0;
 
     cursor: pointer;
 
     user-select: none;
 
     border: $width-button-border $color-button_primary-border-default solid;

+ 1 - 1
packages/semi-foundation/image/variables.scss
Zobrazit soubor 

@@ -27,7 +27,7 @@ $height-image_preview_icon: 40px; // 图像预览footer操作区icon高度
 
 $height-image_preview_header_close: 30px; // 图像预览header部分的关闭热区高度
 
 
 $radius-image: var(--semi-border-radius-small); // 图像圆角
 
-$radius-image_preview_footer: 6px; // 图像预览footer操作区圆角
 
+$radius-image_preview_footer: var(--semi-border-radius-medium); // 图像预览footer操作区圆角
 
 
 $color-image_mask-bg: var(--semi-color-overlay-bg); // 图像蒙层背景色
 
 $color-image_mask_info_text: var(--semi-color-white); // 图像蒙层文字颜色

+ 2 - 2
packages/semi-foundation/skeleton/variables.scss
Zobrazit soubor 

@@ -15,6 +15,6 @@ $height-skeleton_button: $height-control-default; // 按钮骨架屏高度
 
 
 $spacing-skeleton_li-marginBottom: 10px; // 按钮骨架屏高度
 
 
-$radius-skeleton_item: 4px; // 骨架屏圆角
 
-$radius-skeleton_li: 4px; // 骨架屏圆角
 
+$radius-skeleton_item: var(--semi-border-radius-small); // 骨架屏圆角
 
+$radius-skeleton_li: var(--semi-border-radius-small); // 骨架屏圆角

+ 2 - 2
packages/semi-ui/upload/_story/upload.stories.jsx
Zobrazit soubor 

@@ -12,8 +12,8 @@ export default {
 
 // let action = 'https://run.mocky.io/v3/d6ac5c9e-4d39-4309-a747-7ed3b5694859';
 
 let action = 'https://api.semi.design/upload';
 
 // action = 'https://jsonplaceholder.typicode.com/posts/';
 
-// let actionFail = 'https://run.mocky.io/v3/d6ac5c9e-4d39-4309-a747-7ed3b5694859';
 
-// let apiNotExist = 'https://run.mocky.io/v3/d6ac5c9e-4d39-4309-a747-7ed3b5694859';
 
+let actionFail = 'https://run.mocky.io/v3/d6ac5c9e-4d39-4309-a747-7ed3b5694859';
 
+let apiNotExist = 'https://run.mocky.io/v3/d6ac5c9e-4d39-4309-a747-7ed3b5694859';
 
 
 let commonProps = {
 
   action: action,

+ 1 - 0
src/html.js
Zobrazit soubor 

@@ -154,6 +154,7 @@ export default function HTML(props) {
 
             <head>
 
                 <meta charSet="utf-8" />
 
                 <meta httpEquiv="x-ua-compatible" content="ie=edge" />
 
+                <meta name="google-site-verification" content="K9ajinpeafHOSSuts14tlwJswGvmgE8rRmuq8uvkaJQ" />
 
                 <meta name="viewport" content="width=1440, initial-scale=0, shrink-to-fit=no" />
 
                 <script src="https://lf1-cdn-tos.bytescm.com/goofy/semi_convenience/semi-analyze.js" />
 
                 {

+ 2 - 0
static/robots.txt
Zobrazit soubor 

@@ -0,0 +1,2 @@
 
+User-agent: *
 
+Disallow:

+ 88 - 4
yarn.lock
Zobrazit soubor 

@@ -1488,11 +1488,25 @@
 
     "@douyinfe/semi-animation-styled" "2.23.2"
 
     classnames "^2.2.6"
 
 
+"@douyinfe/[email protected]":
 
+  version "2.39.3"
 
+  resolved "https://registry.yarnpkg.com/@douyinfe/semi-animation-react/-/semi-animation-react-2.39.3.tgz#b46cc2a9db9f489e52f62965bb9857708f37f73e"
 
+  integrity sha512-sMf2cKmFIMVWFdQlTyMXO917oOvjDq+KOTGLyO9rVIZDK0mFU9VM/jToYngKaUU+f6kvNZcLdx+PUxKQEfZ7hQ==
 
+  dependencies:
 
+    "@douyinfe/semi-animation" "2.39.3"
 
+    "@douyinfe/semi-animation-styled" "2.39.3"
 
+    classnames "^2.2.6"
 
+
 
 "@douyinfe/[email protected]":
 
   version "2.23.2"
 
   resolved "https://registry.npmjs.org/@douyinfe/semi-animation-styled/-/semi-animation-styled-2.23.2.tgz#f18bc074515441c297cc636ed98521e249d093c9"
 
   integrity sha512-cKaA1yGHPF76Rx7EZDZicj+1oX1su2wnqb/UGFOTquAwqWmkTfgQ+EKxCd/N704WH+RtmGf4xbrJKpBvvcEdSQ==
 
 
+"@douyinfe/[email protected]":
 
+  version "2.39.3"
 
+  resolved "https://registry.yarnpkg.com/@douyinfe/semi-animation-styled/-/semi-animation-styled-2.39.3.tgz#4818e43b9fc646e9a3304ec2081f50c84a168aa1"
 
+  integrity sha512-mMExH5PXvCW2D8rtbG8pk53L9pYyBa8QNDoB2nNMrFlGSvHU+o/1UJ0Y504rUZ0LMsi2QJChP8Ry4mqzINN2sg==
 
+
 
 "@douyinfe/[email protected]":
 
   version "2.12.0"
 
   resolved "https://registry.npmjs.org/@douyinfe/semi-animation/-/semi-animation-2.12.0.tgz#51fe52d3911c2591a80a6e9fe96e6809c1511f13"
 
@@ -1508,6 +1522,13 @@
 
   dependencies:
 
     bezier-easing "^2.1.0"
 
 
+"@douyinfe/[email protected]":
 
+  version "2.39.3"
 
+  resolved "https://registry.yarnpkg.com/@douyinfe/semi-animation/-/semi-animation-2.39.3.tgz#d8c21be360431b48a8ea8856920cf4d534e68c93"
 
+  integrity sha512-KI8O8mvuZiZPNwiK+OUSO/DjPcXLs7sdopPdN3g9WSR7ipPJKmorOZzAG2OTUDH0b4diQYd8gs/YIiFfU+UoOw==
 
+  dependencies:
 
+    bezier-easing "^2.1.0"
 
+
 
 "@douyinfe/[email protected]":
 
   version "2.33.1"
 
   resolved "https://registry.npmjs.org/@douyinfe/semi-foundation/-/semi-foundation-2.33.1.tgz#1dfe6233e35a4ed768cb580b0c9a677d1c34ffba"
 
@@ -1522,6 +1543,20 @@
 
     memoize-one "^5.2.1"
 
     scroll-into-view-if-needed "^2.2.24"
 
 
+"@douyinfe/[email protected]":
 
+  version "2.39.3"
 
+  resolved "https://registry.yarnpkg.com/@douyinfe/semi-foundation/-/semi-foundation-2.39.3.tgz#6490340494d8ea40981c41123b02fd4ab64cbe2c"
 
+  integrity sha512-yTjJYd4BiTdbxt0tCLPJCe3IDCdOEuMjaslDU2TLE3oVs5aTfEcnS2HjioSFgsLPSqEgk8jCdwQDD7eaf+pruA==
 
+  dependencies:
 
+    "@douyinfe/semi-animation" "2.39.3"
 
+    async-validator "^3.5.0"
 
+    classnames "^2.2.6"
 
+    date-fns "^2.29.3"
 
+    date-fns-tz "^1.3.8"
 
+    lodash "^4.17.21"
 
+    memoize-one "^5.2.1"
 
+    scroll-into-view-if-needed "^2.2.24"
 
+
 
 "@douyinfe/[email protected]", "@douyinfe/semi-icons@latest":
 
   version "2.33.1"
 
   resolved "https://registry.yarnpkg.com/@douyinfe/semi-icons/-/semi-icons-2.33.1.tgz#8e2871d9bc0ab7e12df74e3c71802d53d69b7425"
 
@@ -1529,11 +1564,23 @@
 
   dependencies:
 
     classnames "^2.2.6"
 
 
+"@douyinfe/[email protected]", "@douyinfe/semi-icons@^2.0.0":
 
+  version "2.39.3"
 
+  resolved "https://registry.yarnpkg.com/@douyinfe/semi-icons/-/semi-icons-2.39.3.tgz#0e21bbcdd3705b8f1570935b0096ee3847bed34f"
 
+  integrity sha512-l/Wq0ytYecSO1AbNIuLgDdlJfi1nOMLm5aZoPCJRLU6qRASPjQhpgV1inf050FlVFVfK1ocIiyOyjkTP9sEpNg==
 
+  dependencies:
 
+    classnames "^2.2.6"
 
+
 
 "@douyinfe/[email protected]":
 
   version "2.33.1"
 
   resolved "https://registry.npmjs.org/@douyinfe/semi-illustrations/-/semi-illustrations-2.33.1.tgz#530ab851f4dc32a52221c4067c778c800b9b55d7"
 
   integrity sha512-tTTUN8QwnQiF++sk4VBNzfkG87aYZ4iUeqk2ys8/ymVUmCZQ7y46ys020GO1MfPHRR47OMFPI82FVcH1WQtE3g==
 
 
+"@douyinfe/[email protected]":
 
+  version "2.39.3"
 
+  resolved "https://registry.yarnpkg.com/@douyinfe/semi-illustrations/-/semi-illustrations-2.39.3.tgz#1a0d7bd523e16244efa08004ad6169994cd13bf2"
 
+  integrity sha512-/bZNcAMRKk4cigH+ltAmTIxltR8aWrsiVUXdvBkf0txzv/NSXMRFNGehE3JFxiw728iE5P6B6AbJdDi64dKYqA==
 
+
 
 "@douyinfe/[email protected]":
 
   version "2.23.2"
 
   resolved "https://registry.npmjs.org/@douyinfe/semi-scss-compile/-/semi-scss-compile-2.23.2.tgz#30884bb194ee9ae1e81877985e5663c3297c1ced"
 
@@ -1561,10 +1608,10 @@
 
   resolved "https://registry.npmjs.org/@douyinfe/semi-site-doc-style/-/semi-site-doc-style-0.0.1.tgz#c3c803014218ec00441dac32db9a875f6222ed0b"
 
   integrity sha512-y7Jc1i9q/O2idfaqckSJvghpt4AboQJgZ4iTEK8UMqjQkyWmb5I/NRzVWjOP9S0LEbJNs76OKfZil7DwsOmY/A==
 
 
-"@douyinfe/semi-site-header@^0.0.22":
 
-  version "0.0.22"
 
-  resolved "https://registry.yarnpkg.com/@douyinfe/semi-site-header/-/semi-site-header-0.0.22.tgz#19ab186b9e496ee43ca2394201e3c75628828613"
 
-  integrity sha512-NCbCQ0S5u2dpctwiFMx9HFRFv64Nvo/CMszuO4NDDXPCG9rrL4+H4Zde6R7XpxqJBnWC4sZ41XjDaQOuYLfQVA==
 
+"@douyinfe/semi-site-header@^0.0.27":
 
+  version "0.0.27"
 
+  resolved "https://registry.yarnpkg.com/@douyinfe/semi-site-header/-/semi-site-header-0.0.27.tgz#f1142b2fa32f43a3ef0f61ee2dc3b1f2e1e67f67"
 
+  integrity sha512-2qb24bhTxVvTPLK8qphu68YvVRW0u6ScEnUK/7tvFXJO2Fxdyopc+QMyamUIoND0Z7qQNtreA+Zn0eHcs8VhwQ==
 
   dependencies:
 
     "@douyinfe/semi-icons" "^2.0.0"
 
     "@douyinfe/semi-ui" "^2.0.0"
 
@@ -1607,6 +1654,38 @@
 
   dependencies:
 
     glob "^7.1.6"
 
 
+"@douyinfe/[email protected]":
 
+  version "2.39.3"
 
+  resolved "https://registry.yarnpkg.com/@douyinfe/semi-theme-default/-/semi-theme-default-2.39.3.tgz#a02a5b20890587c674eb7c3b2550551f42b933a0"
 
+  integrity sha512-dTTD8nkzM0ad1Lli9cFYLqvmTsSvKp5NSIc35UQBZcvi7OvmUA7qaSMentEMgl15bVWKInwCvp+mSFJsDtDPlg==
 
+  dependencies:
 
+    glob "^7.1.6"
 
+
 
+"@douyinfe/semi-ui@^2.0.0":
 
+  version "2.39.3"
 
+  resolved "https://registry.yarnpkg.com/@douyinfe/semi-ui/-/semi-ui-2.39.3.tgz#081297781163882882e501686c76356804bd9555"
 
+  integrity sha512-xrQ9Xd1B4vhDK41RjN4AFxDD/ILuR9HTctJZ0Be+mio8xIifINtD2jD5xXB1pV+DE/43jtu30VzNlvLm/0TQbw==
 
+  dependencies:
 
+    "@douyinfe/semi-animation" "2.39.3"
 
+    "@douyinfe/semi-animation-react" "2.39.3"
 
+    "@douyinfe/semi-foundation" "2.39.3"
 
+    "@douyinfe/semi-icons" "2.39.3"
 
+    "@douyinfe/semi-illustrations" "2.39.3"
 
+    "@douyinfe/semi-theme-default" "2.39.3"
 
+    async-validator "^3.5.0"
 
+    classnames "^2.2.6"
 
+    copy-text-to-clipboard "^2.1.1"
 
+    date-fns "^2.29.3"
 
+    date-fns-tz "^1.3.8"
 
+    lodash "^4.17.21"
 
+    prop-types "^15.7.2"
 
+    react-resizable "^1.8.0"
 
+    react-sortable-hoc "^2.0.0"
 
+    react-window "^1.8.2"
 
+    resize-observer-polyfill "^1.5.1"
 
+    scroll-into-view-if-needed "^2.2.24"
 
+    utility-types "^3.10.0"
 
+
 
 "@douyinfe/semi-ui@latest":
 
   version "2.33.1"
 
   resolved "https://registry.yarnpkg.com/@douyinfe/semi-ui/-/semi-ui-2.33.1.tgz#3234ca96eb3560b8299bc9750fbe59446522d9bb"
 
@@ -11470,6 +11549,11 @@ eslint-plugin-react@^7.20.6, eslint-plugin-react@^7.24.0:
 
     semver "^6.3.0"
 
     string.prototype.matchall "^4.0.8"
 
 
+eslint-plugin-semi-design@^2.33.0:
 
+  version "2.39.3"
 
+  resolved "https://registry.yarnpkg.com/eslint-plugin-semi-design/-/eslint-plugin-semi-design-2.39.3.tgz#ceab48928648acd0fef41ea5ef97b17268aec70b"
 
+  integrity sha512-9oX8xdmLR9IZPZ4JpMd/1V+e2ebQ7gcqax2kgzl0ICY0iWvb40WrF+tvnkI92OVlD7OLqMlxv//Q83vkKoZ2fA==
 
+
 
 eslint-rule-composer@^0.3.0:
 
   version "0.3.0"
 
   resolved "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"