diff --git a/package/component/package.json b/package/component/package.json index 3bada062..e823c95c 100644 --- a/package/component/package.json +++ b/package/component/package.json @@ -1,6 +1,6 @@ { "name": "@layui/layui-vue", - "version": "1.3.6", + "version": "1.3.7", "author": "就眠儀式", "license": "MIT", "description": "a component library for Vue 3 base on layui-vue", diff --git a/package/component/src/component/formItem/index.vue b/package/component/src/component/formItem/index.vue index 61055d30..bac2e15d 100644 --- a/package/component/src/component/formItem/index.vue +++ b/package/component/src/component/formItem/index.vue @@ -166,16 +166,19 @@ onMounted(() => { }); const getMarginLeft = computed(() => { - if (props.mode === "block") { - let labelWidth = - typeof props.labelWidth === "string" - ? parseFloat(props.labelWidth) - : props.labelWidth; - labelWidth += 15; - return { - marginLeft: labelWidth + "px", - }; - } + if (props.mode == "block") { + if(props.labelPosition != "top") { + let labelWidth = typeof props.labelWidth === "string" ? parseFloat(props.labelWidth) : props.labelWidth; + labelWidth += 15; + return { + "margin-left": `${labelWidth}px`, + }; + } else { + return { + "margin-left": "0px", + } + } + } }); diff --git a/package/component/src/component/select/index.less b/package/component/src/component/select/index.less index 9c72b1b2..5b6bbb01 100644 --- a/package/component/src/component/select/index.less +++ b/package/component/src/component/select/index.less @@ -222,8 +222,9 @@ dl.layui-anim-upbit > dd .layui-form-checkbox, padding: 0 10px; cursor: pointer; - .layui-input-wrapper:focus-within { - border-color: var(--input-border-color); + .layui-input { + height: 30px !important; + line-height: 30px !important; } } .layui-form-select{ diff --git a/package/component/src/component/select/index.vue b/package/component/src/component/select/index.vue index bd8f9719..5c725e55 100644 --- a/package/component/src/component/select/index.vue +++ b/package/component/src/component/select/index.vue @@ -68,11 +68,7 @@ const open = function () { const emit = defineEmits(["update:modelValue", "change", "search", "create"]); const selectItem = ref({ - value: !props.multiple - ? props.modelValue - : props.modelValue - ? ([] as any[]).concat(props.modelValue) - : [], + value: !props.multiple? props.modelValue : props.modelValue ? ([] as any[]).concat(props.modelValue) : [], label: props.multiple ? [] : null, multiple: props.multiple, } as SelectItem); diff --git a/package/document-component/src/document/zh-CN/components/select.md b/package/document-component/src/document/zh-CN/components/select.md index c8c5e546..fe40eecf 100644 --- a/package/document-component/src/document/zh-CN/components/select.md +++ b/package/document-component/src/document/zh-CN/components/select.md @@ -101,7 +101,7 @@ export default { ::: -::: title 关键词变化事件,可作为远程搜索处理算法 +::: title 检索回调 ::: ::: demo @@ -132,7 +132,7 @@ export default { ::: -::: title 选择项自定义搜索内容,可以在keyword属性中传入拼音用于支持拼音搜索 +::: title 定义标识 ::: ::: demo @@ -160,7 +160,7 @@ export default { ::: -::: title 传入items属性进行选项渲染 +::: title 传入选项 ::: ::: demo @@ -182,7 +182,8 @@ export default { {label:'选项3',value:3,keyword:'选项xuanxiang3',disabled:true}, ]) return { - selected,items + items, + selected, } } } @@ -191,15 +192,13 @@ export default { ::: -::: title 传入create属性和接收create事件用于开启创建子项功能 +::: title 创建回调 ::: ::: demo - ::: ::: 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 cfff7647..ae752897 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,16 @@