fix: bug#10822

This commit is contained in:
xieyonghong 2023-03-27 17:49:21 +08:00
parent 4e8c6dfe9d
commit 4778b558d7
4 changed files with 12 additions and 5 deletions

View File

@ -3,7 +3,7 @@
:columns="columns" :columns="columns"
type='simple' type='simple'
@search="handleSearch" @search="handleSearch"
class='search' class='scene-search'
target="scene-triggrt-device-category" target="scene-triggrt-device-category"
/> />
<j-divider style='margin: 0' /> <j-divider style='margin: 0' />

View File

@ -171,7 +171,13 @@ const columns = [
hideInTable: true, hideInTable: true,
search: { search: {
type: 'treeSelect', type: 'treeSelect',
options: queryTree({ paging: false }).then(resp => resp.result), options: () => {
return new Promise((res => {
queryTree({ paging: false }).then(resp => {
res(resp.result)
})
}))
},
componentProps: { componentProps: {
fieldNames: { fieldNames: {
label: 'name', label: 'name',

View File

@ -53,8 +53,9 @@
</span> </span>
</Ellipsis> </Ellipsis>
<div class="subTitle"> <div class="subTitle">
说明
<Ellipsis :lineClamp="2"> <Ellipsis :lineClamp="2">
说明{{ {{
slotProps?.description || slotProps?.description ||
typeMap.get(slotProps.triggerType)?.tip typeMap.get(slotProps.triggerType)?.tip
}} }}

View File

@ -3700,8 +3700,8 @@ jetlinks-store@^0.0.3:
jetlinks-ui-components@^1.0.5: jetlinks-ui-components@^1.0.5:
version "1.0.5" version "1.0.5"
resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#27312836506c4833dcaaef075e1d3c694d75ae4d" resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#b4a660205c347de7f873ab656cf69f495c449212"
integrity sha512-oum7zipoDUVkm/tPd7yu+mw9mR5NmfBcvBf49ebf55s+nz4zyArFOITzldQJ3Wx6BwaUUH/BiDwskHH+KgBVyg== integrity sha512-OGIVtCMNpztUtbrqMte6g4GuFrr+CFS1F1Kapu8rhGNn/gk6Ag28kKPY2epkCh8aEmo/Imi0slhT5M0QCyToRQ==
dependencies: dependencies:
"@vueuse/core" "^9.12.0" "@vueuse/core" "^9.12.0"
ant-design-vue "^3.2.15" ant-design-vue "^3.2.15"