diff --git a/package/component/src/component/select/index.vue b/package/component/src/component/select/index.vue
index 014403df..2ce7eee3 100644
--- a/package/component/src/component/select/index.vue
+++ b/package/component/src/component/select/index.vue
@@ -17,6 +17,7 @@ import {
Component,
watch,
onUnmounted,
+StyleValue,
} from "vue";
import { LayIcon } from "@layui/icons-vue";
import LayInput from "../input/index.vue";
@@ -40,6 +41,8 @@ export interface SelectProps {
minCollapsedNum?: number;
allowClear?: boolean;
showSearch?: boolean;
+ contentClass?: string | Array
| object;
+ contentStyle?: StyleValue;
}
export interface SelectEmits {
@@ -179,6 +182,8 @@ provide("multiple", multiple);
+
+
\ No newline at end of file
diff --git a/package/component/src/component/table/index.vue b/package/component/src/component/table/index.vue
index 2318246e..cf17676c 100644
--- a/package/component/src/component/table/index.vue
+++ b/package/component/src/component/table/index.vue
@@ -32,7 +32,7 @@ export interface TableProps {
page?: Recordable;
columns: Recordable[];
dataSource: Recordable[];
- defaultToolbar?: boolean;
+ defaultToolbar?: boolean | Recordable[];
selectedKey?: string;
selectedKeys?: Recordable[];
indentSize?: number;
diff --git a/package/component/src/utils/uuidUtil.ts b/package/component/src/utils/uuidUtil.ts
new file mode 100644
index 00000000..649c2e38
--- /dev/null
+++ b/package/component/src/utils/uuidUtil.ts
@@ -0,0 +1,12 @@
+export function nextId() {
+ var s: any = [];
+ var hexDigits = "0123456789abcdef";
+ for (var i = 0; i < 36; i++) {
+ s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+ }
+ s[14] = "4";
+ s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+ s[8] = s[13] = s[18] = s[23] = "-";
+ var uuid = s.join("");
+ return uuid;
+}
\ No newline at end of file
diff --git a/package/document-component/src/document/zh-CN/components/colorPicker.md b/package/document-component/src/document/zh-CN/components/colorPicker.md
index 2716263d..ab1c88e5 100644
--- a/package/document-component/src/document/zh-CN/components/colorPicker.md
+++ b/package/document-component/src/document/zh-CN/components/colorPicker.md
@@ -26,6 +26,31 @@ export default {
:::
+::: title 禁止选择
+:::
+
+::: demo 使用 `lay-color-picker` 标签, 创建颜色选择器。
+
+
+
+
+
+
+
+:::
+
::: title 预设颜色
:::
diff --git a/package/document-component/src/document/zh-CN/components/iconPicker.md b/package/document-component/src/document/zh-CN/components/iconPicker.md
index 2e1c33de..e627d512 100644
--- a/package/document-component/src/document/zh-CN/components/iconPicker.md
+++ b/package/document-component/src/document/zh-CN/components/iconPicker.md
@@ -33,6 +33,32 @@ export default {
:::
+::: title 禁用选择
+:::
+
+::: demo 使用 lay-icon-picker 标签, 创建图标选择器
+
+
+
+
+
+
+
+:::
+
::: title 开启分页
:::
diff --git a/package/document-component/src/document/zh-CN/guide/changelog.md b/package/document-component/src/document/zh-CN/guide/changelog.md
index d588829d..b7bdd486 100644
--- a/package/document-component/src/document/zh-CN/guide/changelog.md
+++ b/package/document-component/src/document/zh-CN/guide/changelog.md
@@ -11,6 +11,27 @@
+
+
+ -
+
1.6.10 2022-10-21
+
+ - [新增] select 组件 contentClass 属性, 用于自定义内容区域 class 属性。
+ - [新增] select 组件 contentStyle 属性, 用于自定义内容区域 style 属性。
+ - [新增] icon-picker 组件 disabled 属性, 禁用图标选择。
+ - [新增] icon-picker 组件 contentClass 属性, 用于自定义内容区域 class 属性。
+ - [新增] icon-picker 组件 contentStyle 属性, 用于自定义内容区域 style 属性。
+ - [新增] color-picker 组件 disabled 属性, 禁用图标选择。
+ - [新增] color-picker 组件 contentClass 属性, 用于自定义内容区域 class 属性。
+ - [新增] color-picker 组件 contentStyle 属性, 用于自定义内容区域 style 属性。
+ - [新增] cascader 组件 contentClass 属性, 用于自定义内容区域 class 属性。
+ - [新增] cascader 组件 contentStyle 属性, 用于自定义内容区域 style 属性。
+ - [新增] date-picker 组件 contentClass 属性, 用于自定义内容区域 class 属性。
+ - [新增] date-picker 组件 contentStyle 属性, 用于自定义内容区域 style 属性。
+ - [修复] date-picker 组件 type 属性为 date 值, range 属性为 true 时, 结束月份出现 13 月的问题。
+
+
+