diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000000000000000000000000000000000..0b3779e53d03e4e3ef029ca132067f1eba7138d2 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,5 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml index 627620042f6474a4eb12ae6406211ede5bda1b44..baaba25b801ec4e74b22a26e0edd0238310a871e 100644 --- a/.gitee/ISSUE_TEMPLATE/bug.yml +++ b/.gitee/ISSUE_TEMPLATE/bug.yml @@ -41,8 +41,10 @@ body: - type: input attributes: label: 演示地址 - description: 我们强烈推荐使用Sandbox-Vue(https://layui-vue.gitee.io/sandbox-vue)提供一个演示地址用于复现您的问题。或者您也可以提供Stackblitz, CodePen地址。 + description: 为了我们能尽快定位到问题,我们强烈推荐使用Sandbox-Vue(https://layui-vue.gitee.io/sandbox-vue)提供一个演示地址用于复现您的问题。或者您也可以提供Stackblitz, CodePen地址。 placeholder: URL + validations: + required: true - type: textarea attributes: label: 业务代码 diff --git a/package.json b/package.json index 87e089341ab004da85741e04ddaede9c0c5fa0e0..93346525dbe7288207c6194950ac721f6155c42c 100644 --- a/package.json +++ b/package.json @@ -80,4 +80,4 @@ "commit-msg": "commitlint -E HUSKY_GIT_PARAMS" } } -} \ No newline at end of file +} diff --git a/package/component/package.json b/package/component/package.json index 92f273c769abb78c1a38d9da185afeb0478b087e..8be18d97dde3d6cb2408ce5b6c51e93f8e0a7dc9 100644 --- a/package/component/package.json +++ b/package/component/package.json @@ -1,6 +1,6 @@ { "name": "@layui/layui-vue", - "version": "2.13.2", + "version": "2.13.3", "author": "就眠儀式", "license": "MIT", "description": "a component library for Vue 3 base on layui-vue", diff --git a/package/component/src/component/form/index.vue b/package/component/src/component/form/index.vue index b0185e7a64d61699a528630eac92750934ffed13..aedc5f778295dd161b06727dbf6a1584e4b81c43 100644 --- a/package/component/src/component/form/index.vue +++ b/package/component/src/component/form/index.vue @@ -9,6 +9,7 @@ import "./index.less"; import { toRefs, provide, reactive, onMounted, nextTick } from "vue"; import { Rules, ValidateError, ValidateMessages } from "async-validator"; import { LayFormItemContext, FormCallback, modelType } from "../../types/form"; +import { LayTooltipContext } from "../../types/tooltip"; export interface FormProps { model?: modelType; @@ -24,6 +25,7 @@ export interface FormProps { useCN?: boolean; size?: string; mode?: string; + tooltipProps?: LayTooltipContext; } const props = withDefaults(defineProps(), { diff --git a/package/component/src/component/formItem/index.hooks.ts b/package/component/src/component/formItem/index.hooks.ts index 3116ee9e14ea8b3b4cbc1160855c7e1535f6b89d..1c86457a6fe76c14919ae1d20dee82a25a4774bd 100644 --- a/package/component/src/component/formItem/index.hooks.ts +++ b/package/component/src/component/formItem/index.hooks.ts @@ -29,5 +29,10 @@ export default function useProps(props: any) { return props.required || formContext.required; }); - return { size, mode, labelWidth, labelPosition, isRequired }; + const tooltipProps = computed(() => { + const formContext = inject("LayForm", {} as LayFormContext); + return props.tooltipProps || formContext.tooltipProps; + }); + + return { size, mode, labelWidth, labelPosition, isRequired, tooltipProps }; } diff --git a/package/component/src/component/formItem/index.vue b/package/component/src/component/formItem/index.vue index ee7f4f4305f6b4594836bbc0fbf6cf9e92972939..443d826a1b1f1ed5f4f9a897a7419ec56f029d25 100644 --- a/package/component/src/component/formItem/index.vue +++ b/package/component/src/component/formItem/index.vue @@ -5,6 +5,7 @@ export default { + +::: + ::: title 对齐方式 ::: @@ -842,6 +872,7 @@ const submit10 = function(isValidate, model, errors) { | size | 全局控件尺寸 | -- | -- | -- | | labelWidth | 全局标签宽度 | `string` | -- | -- | | mode | 全局表单项显示的模式,`块元素` / `行元素` | `string` | `block` `inline` | `block` | +| tooltipProps | 可查看[tooltip组件](http://www.layui-vue.com/zh-CN/components/tooltip) | `object` | | | ::: diff --git a/package/document-component/src/document/zh-CN/components/treeSelect.md b/package/document-component/src/document/zh-CN/components/treeSelect.md index 59eba1875799e8cd6d61d4a4813bef2cb5164d11..16b13aa2ef0dc8917cc5d4ea29f89852b5cf47a3 100644 --- a/package/document-component/src/document/zh-CN/components/treeSelect.md +++ b/package/document-component/src/document/zh-CN/components/treeSelect.md @@ -689,18 +689,25 @@ const data4 = ref([{ ::: title 启用搜索 ::: -::: demo 通过 `allow-clear` 属性开启清空操作。 +::: demo 通过 `search` 属性开启搜索,`searchNodeMethod` 设置对树过滤方法