diff --git a/example/components/changelog/readme.md b/example/components/changelog/readme.md
index ee07372..e682080 100644
--- a/example/components/changelog/readme.md
+++ b/example/components/changelog/readme.md
@@ -8,6 +8,15 @@
+### 2.5.8-beta.1 {page=#/changelog}
+
+* **[add]**:
+ - [DatePicker 日期选择器](#/date-picker) 年/月选择器新增 `cell-class` 配置项以支持自定义日期样式
+* **[update]**:
+ - [Form 表单](#/form) 验证时错误信息样式调整
+
+---
+
### 2.5.7 {page=#/changelog}
###### 2023.07.24
diff --git a/example/components/date-picker/readme.md b/example/components/date-picker/readme.md
index 3fada4b..56bd9cc 100644
--- a/example/components/date-picker/readme.md
+++ b/example/components/date-picker/readme.md
@@ -630,41 +630,41 @@
```
:::
@@ -677,11 +677,11 @@
+
```
:::
diff --git a/package.json b/package.json
index ea082b8..653c84c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "bk-magic-vue",
- "version": "2.5.7",
+ "version": "2.5.8-beta.1",
"description": "基于蓝鲸 Magicbox 和 Vue 的前端组件库",
"main": "dist/bk-magic-vue.min.js",
"files": [
diff --git a/src/components/date-picker/base/month-table.vue b/src/components/date-picker/base/month-table.vue
index 5f379ad..aeeb8b9 100644
--- a/src/components/date-picker/base/month-table.vue
+++ b/src/components/date-picker/base/month-table.vue
@@ -73,6 +73,13 @@ export default {
}
},
methods: {
+ getExternalCellClass (cell) {
+ if (typeof this.cellClass === 'function') {
+ return this.cellClass(cell)
+ }
+
+ return ''
+ },
getCellCls (cell) {
return [
`bk-date-picker-cells-cell`,
@@ -81,7 +88,8 @@ export default {
[`bk-date-picker-cells-cell-disabled`]: cell.disabled,
// [`bk-date-picker-cells-cell-focused`]: cell.focused,
[`bk-date-picker-cells-cell-range`]: cell.range && !cell.start && !cell.end
- }
+ },
+ this.getExternalCellClass(cell)
]
},
tCell (nr) {
diff --git a/src/components/date-picker/base/year-table.vue b/src/components/date-picker/base/year-table.vue
index 2f7e671..7ac780c 100644
--- a/src/components/date-picker/base/year-table.vue
+++ b/src/components/date-picker/base/year-table.vue
@@ -72,6 +72,13 @@ export default {
}
},
methods: {
+ getExternalCellClass (cell) {
+ if (typeof this.cellClass === 'function') {
+ return this.cellClass(cell)
+ }
+
+ return ''
+ },
getCellCls (cell) {
return [
'bk-date-picker-cells-cell',
@@ -80,7 +87,8 @@ export default {
'bk-date-picker-cells-cell-disabled': cell.disabled,
// ['bk-date-picker-cells-cell-focused']: cell.focused,
'bk-date-picker-cells-cell-range': cell.range && !cell.start && !cell.end
- }
+ },
+ this.getExternalCellClass(cell)
]
}
}
diff --git a/src/ui/form.css b/src/ui/form.css
index 346956d..2a2037e 100644
--- a/src/ui/form.css
+++ b/src/ui/form.css
@@ -269,36 +269,36 @@
input[type="url"],
textarea,
select {
- border-color: $dangerColor;
- color: $dangerColor;
+ border-color: $newRedColor;
+ color: $newRedColor;
/*&::placeholder {
- color: $dangerColor;
+ color: $newRedColor;
}*/
}
.bk-textarea-wrapper {
- border-color: $dangerColor;
+ border-color: $newRedColor;
}
.bk-tag-selector .bk-tag-input {
- border-color: $dangerColor;
+ border-color: $newRedColor;
/*.placeholder {
- color: $dangerColor;
+ color: $newRedColor;
}*/
}
.bk-form-tip {
.bk-tip-text {
- color: $dangerColor;
+ color: $newRedColor;
}
}
.bk-select {
- border-color: $dangerColor;
+ border-color: $newRedColor;
/*&.is-default-trigger.is-unselected:before {
- color: $dangerColor;
+ color: $newRedColor;
}*/
}
}