Skip to content

Commit

Permalink
releases 4.0.16
Browse files Browse the repository at this point in the history
  • Loading branch information
@xuliangzhan
xuliangzhan committed Jun 17, 2024
1 parent 3e0149e commit acbbf6f
Show file tree
Hide file tree
Showing 14 changed files with 365 additions and 488 deletions.
2 changes: 1 addition & 1 deletion examples/views/icon/IconTest.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import { ref } from 'vue'
const iconList = ref([
'add', 'add-user', 'add-users', 'align-center', 'align-left', 'align-right', 'alipay', 'arrow-double-left', 'arrow-double-right', 'arrow-down', 'arrow-left', 'arrow-right', 'arrow-up', 'association-form', 'bell', 'bell-fill', 'calendar', 'caret-down', 'caret-left', 'caret-right', 'caret-up', 'chart-bar-x', 'chart-bar-y', 'chart-line', 'chart-pie', 'chart-radar', 'chat', 'chat-fill', 'check', 'checkbox-checked', 'checkbox-checked-fill', 'checkbox-indeterminate-fill', 'checkbox-unchecked', 'click-button', 'close', 'cloud-download', 'cloud-upload', 'cloudy', 'comment', 'company', 'copy', 'custom-column', 'cut', 'delete', 'delete-fill', 'dot', 'download', 'drag-handle', 'edit', 'ellipsis-h', 'ellipsis-v', 'end-page', 'envelope', 'envelope-fill', 'envelope-open', 'envelope-open-fill', 'error-circle', 'error-circle-fill', 'exclamation', 'eye-fill', 'eye-fill-close', 'feedback', 'file', 'file-excel', 'file-image', 'file-markdown', 'file-pdf', 'file-ppt', 'file-txt', 'file-word', 'file-zip', 'fixed-left', 'fixed-left-fill', 'fixed-right', 'fixed-right-fill', 'flag', 'flag-fill', 'flow-branch', 'folder', 'folder-open', 'fullscreen', 'funnel', 'funnel-clear', 'goods', 'goods-fill', 'heavy-rain', 'home', 'home-fill', 'home-page', 'indicator', 'info-circle', 'info-circle-fill', 'information', 'input', 'layout', 'lightning', 'link', 'location', 'location-fill', 'lock', 'lock-fill', 'maximize', 'menu', 'merge-cells', 'message-fill', 'microphone', 'microphone-fill', 'minimize', 'minus', 'mobile', 'moon', 'num-list', 'number', 'paste', 'pc', 'pct-1-1', 'pct-full', 'picture', 'picture-fill', 'platform', 'print', 'print-batch', 'question', 'question-circle', 'question-circle-fill', 'radio-checked', 'radio-checked-fill', 'radio-unchecked', 'recover', 'refresh', 'repeat', 'rotate-left', 'rotate-right', 'row-col', 'save', 'search', 'search-zoom-in', 'search-zoom-out', 'select', 'send', 'send-fill', 'setting', 'setting-fill', 'share', 'share-fill', 'signature', 'sort', 'sort-alpha-asc', 'sort-alpha-desc', 'sort-asc', 'sort-desc', 'sort-numeric-asc', 'sort-numeric-desc', 'spinner', 'square', 'square-caret-right', 'square-caret-right-fill', 'square-checked', 'square-checked-fill', 'square-close', 'square-close-fill', 'square-down', 'square-down-fill', 'square-fill', 'square-left', 'square-left-fill', 'square-minus', 'square-minus-fill', 'square-plus', 'square-plus-fill', 'square-plus-square', 'square-right', 'square-right-fill', 'square-square', 'square-up', 'square-up-fill', 'star', 'star-fill', 'star-half', 'subtable', 'success-circle', 'success-circle-fill', 'sunny', 'swap', 'swap-down', 'swap-left', 'swap-right', 'swap-up', 'switch', 'table', 'tabs', 'textarea', 'time', 'title', 'undo', 'unlock', 'unlock-fill', 'upload', 'user', 'user-fill', 'voice', 'voice-fill', 'warning-circle', 'warning-circle-fill', 'warning-triangle', 'warning-triangle-fill', 'wechat', 'zoom-in', 'zoom-out'
'add', 'add-user', 'add-users', 'align-center', 'align-left', 'align-right', 'alipay', 'arrow-double-left', 'arrow-double-right', 'arrow-down', 'arrow-left', 'arrow-right', 'arrow-up', 'association-form', 'bell', 'bell-fill', 'calendar', 'caret-down', 'caret-left', 'caret-right', 'caret-up', 'chart-bar-x', 'chart-bar-y', 'chart-line', 'chart-pie', 'chart-radar', 'chat', 'chat-fill', 'check', 'checkbox-checked', 'checkbox-checked-fill', 'checkbox-indeterminate-fill', 'checkbox-unchecked', 'click-button', 'close', 'cloud-download', 'cloud-upload', 'cloudy', 'comment', 'company', 'copy', 'custom-column', 'cut', 'delete', 'delete-fill', 'dot', 'download', 'drag-handle', 'edit', 'ellipsis-h', 'ellipsis-v', 'end-page', 'envelope', 'envelope-fill', 'envelope-open', 'envelope-open-fill', 'error-circle', 'error-circle-fill', 'exclamation', 'eye-fill', 'eye-fill-close', 'feedback', 'file', 'file-excel', 'file-image', 'file-markdown', 'file-pdf', 'file-ppt', 'file-txt', 'file-word', 'file-zip', 'fixed-left', 'fixed-left-fill', 'fixed-right', 'fixed-right-fill', 'flag', 'flag-fill', 'flow-branch', 'folder', 'folder-open', 'fullscreen', 'funnel', 'funnel-clear', 'goods', 'goods-fill', 'heavy-rain', 'home', 'home-fill', 'home-page', 'indicator', 'info-circle', 'info-circle-fill', 'information', 'input', 'layout', 'lightning', 'link', 'location', 'location-fill', 'lock', 'lock-fill', 'maximize', 'menu', 'merge-cells', 'message-fill', 'microphone', 'microphone-fill', 'minimize', 'minus', 'mobile', 'moon', 'num-list', 'number', 'paste', 'pc', 'pct-1-1', 'pct-full', 'picture', 'picture-fill', 'platform', 'print', 'print-batch', 'question', 'question-circle', 'question-circle-fill', 'radio-checked', 'radio-checked-fill', 'radio-unchecked', 'recover', 'refresh', 'repeat', 'rmb', 'rotate-left', 'rotate-right', 'row-col', 'save', 'search', 'search-zoom-in', 'search-zoom-out', 'select', 'send', 'send-fill', 'setting', 'setting-fill', 'share', 'share-fill', 'signature', 'sort', 'sort-alpha-asc', 'sort-alpha-desc', 'sort-asc', 'sort-desc', 'sort-numeric-asc', 'sort-numeric-desc', 'spinner', 'square', 'square-caret-right', 'square-caret-right-fill', 'square-checked', 'square-checked-fill', 'square-close', 'square-close-fill', 'square-down', 'square-down-fill', 'square-fill', 'square-left', 'square-left-fill', 'square-minus', 'square-minus-fill', 'square-plus', 'square-plus-fill', 'square-plus-square', 'square-right', 'square-right-fill', 'square-square', 'square-up', 'square-up-fill', 'star', 'star-fill', 'star-half', 'subtable', 'success-circle', 'success-circle-fill', 'sunny', 'swap', 'swap-down', 'swap-left', 'swap-right', 'swap-up', 'switch', 'table', 'tabs', 'textarea', 'time', 'title', 'undo', 'unlock', 'unlock-fill', 'upload', 'usd', 'user', 'user-fill', 'voice', 'voice-fill', 'warning-circle', 'warning-circle-fill', 'warning-triangle', 'warning-triangle-fill', 'wechat', 'zoom-in', 'zoom-out'
])
</script>

Expand Down
49 changes: 8 additions & 41 deletions examples/views/input/InputTest.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<vxe-input v-model="demo1.value200" placeholder="可清除" showWordCount></vxe-input>
<vxe-input v-model="demo1.value200" placeholder="可清除" showWordCount maxlength="20"></vxe-input>
<vxe-input v-model="demo1.value200" placeholder="可清除" showWordCount clearable></vxe-input>
<vxe-input v-model="demo1.value201" placeholder="带图标" prefix-icon="fa fa-user" suffix-icon="fa fa-search" clearable></vxe-input>
<vxe-input v-model="demo1.value202" placeholder="只读的" suffix-icon="fa fa-search" readonly></vxe-input>
<vxe-input v-model="demo1.value203" placeholder="禁用的" prefix-icon="fa fa-user-o" disabled></vxe-input>
<vxe-input v-model="demo1.value201" placeholder="带图标" prefix-icon="vxe-icon-time" suffix-icon="vxe-icon-time" clearable></vxe-input>
<vxe-input v-model="demo1.value202" placeholder="只读的" suffix-icon="vxe-icon-time" readonly></vxe-input>
<vxe-input v-model="demo1.value203" placeholder="禁用的" prefix-icon="vxe-icon-time" disabled></vxe-input>
</p>

<p>
Expand Down Expand Up @@ -71,22 +71,22 @@
<p>
<vxe-input v-model="demo1.value600" placeholder="自定义前缀图标">
<template #prefix>
<i class="fa fa-search my-red"></i>
<i class="vxe-icon-time my-red"></i>
</template>
</vxe-input>
<vxe-input v-model="demo1.value601" placeholder="自定义后缀图标">
<template #suffix>
<i class="fa fa-search my-green"></i>
<i class="vxe-icon-time my-green"></i>
</template>
</vxe-input>
<vxe-input v-model="demo1.value602" class="my-domain" placeholder="自定义前缀模板">
<vxe-input v-model="demo1.value602" placeholder="自定义前缀模板">
<template #prefix>
<span>Http://</span>
</template>
</vxe-input>
<vxe-input v-model="demo1.value603" class="my-search" placeholder="自定义后缀模板">
<vxe-input v-model="demo1.value603" placeholder="自定义后缀模板">
<template #suffix>
<i class="fa fa-search"></i>
<i class="vxe-icon-time"></i>
</template>
</vxe-input>
</p>
Expand Down Expand Up @@ -251,37 +251,4 @@ const festivalCalendarMethod: VxeInputPropTypes.FestivalMethod = (params) => {
.my-green {
color: green;
}
.my-domain.vxe-input {
height: 34px;
width: 300px;
}
.my-domain.vxe-input:deep() .vxe-input--prefix {
width: 60px;
height: 32px;
top: 1px;
text-align: center;
border-right: 1px solid #dcdfe6;
background-color: #f5f7fa;
}
.my-domain.vxe-input:deep() .vxe-input--inner {
padding-left: 72px;
border: 1px solid #dcdfe6;
}
.my-search.vxe-input {
height: 34px;
width: 300px;
}
.my-search.vxe-input:deep() .vxe-input--suffix {
width: 60px;
height: 32px;
top: 1px;
text-align: center;
border-left: 1px solid #dcdfe6;
background-color: #f5f7fa;
cursor: pointer;
}
.my-search.vxe-input:deep() .vxe-input--inner {
padding-right: 72px;
border: 1px solid #dcdfe6;
}
</style>
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vxe-pc-ui",
"version": "4.0.15",
"version": "4.0.16",
"description": "A vue based PC side component library",
"scripts": {
"update": "npm install --legacy-peer-deps",
Expand Down
5 changes: 3 additions & 2 deletions packages/form/src/form-item.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,11 @@ export default defineComponent({
}
}
let contentVNs: VxeComponentSlotType[] = []
const rftContent = compConf ? (compConf.renderFormItemContent || compConf.renderItemContent) : null
if (defaultSlot) {
contentVNs = $xeForm.callSlot(defaultSlot, params)
} else if (compConf && compConf.renderItemContent) {
contentVNs = getSlotVNs(compConf.renderItemContent(itemRender, params))
} else if (rftContent) {
contentVNs = getSlotVNs(rftContent(itemRender, params))
} else if (field) {
contentVNs = [`${XEUtils.get(data, field)}`]
}
Expand Down
Loading

0 comments on commit acbbf6f

Please sign in to comment.