Skip to content

Commit 1529f8b

Browse files
liyuan-mengliyuan-meng
committed
Merge branch 'v1-master' of github.com:ShuyunFF2E/cloud-react into feat-drawer-0529
2 parents 07f39f3 + 4b4a5e2 commit 1529f8b

39 files changed

Lines changed: 1034 additions & 342 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@
2525

2626
# jest
2727
/coverage
28+
/src/components/index.js

‎docs/color.less‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
.color-palette-title {
1919
margin: 0 0 24px;
20-
color: rgba(0, 0, 0, 0.85);
20+
color: rgba(0, 0, 0, 0.88);
2121
font-weight: 500;
2222
font-size: 22px;
2323
text-transform: capitalize;
2424
}
2525

2626
.color-palette-sub-title {
2727
margin: 0 0 24px;
28-
color: rgba(0, 0, 0, 0.65);
28+
color: rgba(0, 0, 0, 0.60);
2929
font-size: 18px;
3030
text-transform: capitalize;
3131
}

‎docs/default.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,11 +310,11 @@ const theme = [
310310
},
311311
{
312312
name: 'grey-8',
313-
text: ' rgba(0, 0, 0, 0.65)',
313+
text: ' rgba(0, 0, 0, 0.60)',
314314
},
315315
{
316316
name: 'grey-9',
317-
text: ' rgba(0, 0, 0, 0.85)',
317+
text: ' rgba(0, 0, 0, 0.88)',
318318
},
319319
{
320320
name: 'grey-0',
@@ -348,7 +348,7 @@ class ButtonDemo extends React.Component {
348348
background: item.text,
349349
color:
350350
index < 3
351-
? 'rgba(0, 0, 0, 0.85)'
351+
? 'rgba(0, 0, 0, 0.88)'
352352
: 'rgb(255, 255, 255)',
353353
}}
354354
onClick={() => onClickHandler(item.text)}

‎docs/log.md‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,61 @@
1+
---
2+
title: 组件(v1版)更新日志
3+
nav:
4+
title: 指南
5+
path: /guide
6+
group:
7+
title: 组件(v1版)更新日志
8+
path: /log
9+
order: 3
10+
---
11+
12+
## 2.0.11
13+
14+
### Features
15+
* feat: [slider]增加滑动选择 ([6bcc7f2](https://github.com/ShuyunFF2E/cloud-react/commit/6bcc7f2))
16+
* feat: [icon]添加 AI 主题图标 ([61ae9e7](https://github.com/ShuyunFF2E/cloud-react/commit/61ae9e7))
17+
18+
19+
## 2.0.10
20+
21+
### Bug Fixes
22+
* fix: 解决列固定阴影，偶发性不展示，滚动列才展示 ([642d9cb](https://github.com/ShuyunFF2E/cloud-react/commit/642d9cb))
23+
24+
## 2.0.9
25+
26+
### Features
27+
* feat: [CTable]添加设置列弹窗 ([1f3f0fa](https://github.com/ShuyunFF2E/cloud-react/commit/1f3f0fa))
28+
* feat: [CTable]设置列弹窗添加按钮反转配置 ([ebb0ca7](https://github.com/ShuyunFF2E/cloud-react/commit/ebb0ca7))
29+
* feat: [Modal]添加新配置outerClassName和isReverseBtn ([0cc30b8](https://github.com/ShuyunFF2E/cloud-react/commit/0cc30b8))
30+
* feat: [Popover] 添加新配isReverseBtn ([258f2ba](https://github.com/ShuyunFF2E/cloud-react/commit/258f2ba))
31+
32+
33+
## 2.0.7
34+
35+
### Features
36+
* feat: [inputTag] 修复赋值 ([29808d5](https://github.com/ShuyunFF2E/cloud-react/commit/29808d5))
37+
* feat: [inputTag] 修改样式及替换icon ([eacdc70](https://github.com/ShuyunFF2E/cloud-react/commit/eacdc70))
38+
* feat: [CTable] 多选表格，支持外部调用函数回显已选数据 this.tableRef.current.init(this.state.checkedGoodsData) ([b81e91f](https://github.com/ShuyunFF2E/cloud-react/commit/b81e91f))
39+
40+
### Bug Fixes
41+
* fix: [Tree] 解决搜索节点，若匹配到的节点有多级，应全部展示，实际上只展示了匹配到节点的下一级的问题 ([58ad498](https://github.com/ShuyunFF2E/cloud-react/commit/58ad498))
42+
* fix: [TreeSelect] 解决树下拉样式异常的问题 ([b90efd7](https://github.com/ShuyunFF2E/cloud-react/commit/b90efd7))
43+
* fix: [TreeSelect][Select] 多选TreeSelect 和 多选 Select下拉，多次点击输入框区域，输入框失焦 ([61a114f](https://github.com/ShuyunFF2E/cloud-react/commit/61a114f))
44+
45+
## 2.0.6
46+
47+
### Features
48+
* feat: [Tooltip]新增control参数，结合visible使用，实现手动控制浮层显隐 ([83fbd34](https://github.com/ShuyunFF2E/cloud-react/commit/83fbd34))
49+
* feat: [CTable]表格支持配置列的展示和隐藏（复杂模式，支持拖拽和重置） ([675dff7](https://github.com/ShuyunFF2E/cloud-react/commit/675dff7))
50+
* feat: [Radio] 给Radio添加radioClassName参数,设置自定义类 ([c823a7a](https://github.com/ShuyunFF2E/cloud-react/commit/c823a7a))
51+
52+
### Bug Fixes
53+
* docs: [CTable] 添加 DEMO，解决 columnData 中 render 闭包问题 ([b55532d](https://github.com/ShuyunFF2E/cloud-react/commit/b55532d))
54+
* fix: [Radio] 解决给 ComplexRadio 设置 className 后，所有类被覆盖的问题 ([2dfc096](https://github.com/ShuyunFF2E/cloud-react/commit/2dfc096))
55+
* fix: [Radio] 解决卡片式radio，设置定高后，radio按钮和文案不对齐的问题 ([054dbd1](https://github.com/ShuyunFF2E/cloud-react/commit/054dbd1))
56+
* fix: [Radio] 解决卡片式radio，设置定宽后，radio按钮被右侧文本挤压的问题 ([86381c2](https://github.com/ShuyunFF2E/cloud-react/commit/86381c2))
57+
58+
159
## 2.0.5 (2024-12-09)
260

361
### Features

‎docs/setColor.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ class ButtonDemo extends React.Component {
209209
style={{
210210
background: item,
211211
color:
212-
index < 4 ? 'rgba(0, 0, 0, 0.85)' : 'rgb(255, 255, 255)',
212+
index < 4 ? 'rgba(0, 0, 0, 0.88)' : 'rgb(255, 255, 255)',
213213
}}
214214
onClick={() => onClickHandler(item)}
215215
>
@@ -247,7 +247,7 @@ class ButtonDemo extends React.Component {
247247
background: item.text,
248248
color:
249249
index < 3
250-
? 'rgba(0, 0, 0, 0.85)'
250+
? 'rgba(0, 0, 0, 0.88)'
251251
: 'rgb(255, 255, 255)',
252252
}}
253253
onClick={(evt) => onClickHandler(evt, item.text)}
@@ -270,5 +270,5 @@ class ButtonDemo extends React.Component {
270270
);
271271
}
272272
}
273-
export default ButtonDemo
273+
export default ButtonDemo;
274274
```

‎package.json‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cloud-react",
3-
"version": "2.0.5",
3+
"version": "2.0.12-3",
44
"description": "数据赢家 react 组件",
55
"scripts": {
66
"gen:index": "node ./scripts/generate-index.js",
@@ -21,7 +21,7 @@
2121
"new:component": "cp -r tpls/new-component src/components/new-component",
2222
"cli-version": "node ./scripts/generate-version.js",
2323
"postinstall": "patch-package",
24-
"changelog": "conventional-changelog -p angular -i docs/log.md -s && git add docs/log.md",
24+
"changelog": "npm version patch && conventional-changelog -p angular -i docs/log.md -s && git add docs/log.md",
2525
"changelog-all": "conventional-changelog --config -i docs/log1.md -s"
2626
},
2727
"auto-changelog": {
@@ -114,9 +114,6 @@
114114
"glob": "7.2.3",
115115
"husky": "4",
116116
"identity-obj-proxy": "3.0.0",
117-
"jest": "27.5.1",
118-
"jest-environment-jsdom": "27.5.1",
119-
"jest-transform-css": "2.0.0",
120117
"lint-staged": "10.5.4",
121118
"markdown-it": "12.3.2",
122119
"postcss-font-base64": "1.0.5",

‎src/components/avatar/index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ nav:
44
title: Avatar 头像
55
path: /cloud-react
66
group:
7-
order: 4
8-
title: 导航
7+
order: 3
8+
title: 数据
99
path: /data
1010
---
1111

‎src/components/badge/index.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ nav:
44
title: Badge 徽标
55
path: /cloud-react
66
group:
7-
order: 4
8-
title: 导航
9-
path: /nav
7+
order: 3
8+
title: 数据
9+
path: /data
1010
---
1111

1212
### 何时使用

‎src/components/c-cascader/index.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ input::-webkit-search-cancel-button {
292292
overflow: hidden;
293293
white-space: pre;
294294
text-overflow: ellipsis;
295-
color: rgba(0, 0, 0, 0.65);
295+
color: rgba(0, 0, 0, 0.60);
296296
max-width: 120px;
297297
}
298298

‎src/components/c-dropdown/index.less‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
font-size: 14px;
7878
font-family: PingFangSC-Regular, PingFang SC;
7979
font-weight: 400;
80-
color: rgba(0, 0, 0, 0.85);
80+
color: rgba(0, 0, 0, 0.88);
8181
line-height: 20px;
8282
padding: 6px 12px;
8383
min-width: 60px;

0 commit comments

Comments
 (0)