sh-view 2.9.17 → 2.9.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sh-view",
|
|
3
|
-
"version": "2.9.
|
|
3
|
+
"version": "2.9.18",
|
|
4
4
|
"description": "基于vxe-table二次封装,更包含Alert,Badge,Card,CodeEditor,Col,Corner,CountTo,Drawer,Empty,Form,Header,Icon,List,Loading,Modal,Noticebar,Poptip,Progress,PullRefresh,Query,Result,Row,Split,Grid,Table,Tabs,Tag,Toolbar,Tree,Upload,WaterFall,WaterMark等丰富组件库",
|
|
5
5
|
"main": "packages/index.js",
|
|
6
6
|
"typings": "types/index.d.ts",
|
|
@@ -92,8 +92,8 @@ export default defineComponent({
|
|
|
92
92
|
background-color: var(--bg-main-color);
|
|
93
93
|
.sh-card-head {
|
|
94
94
|
@include layoutFlex;
|
|
95
|
+
flex-wrap: nowrap;
|
|
95
96
|
.sh-card-head-title {
|
|
96
|
-
flex: 1;
|
|
97
97
|
display: block;
|
|
98
98
|
overflow: hidden;
|
|
99
99
|
text-overflow: ellipsis;
|
|
@@ -104,10 +104,13 @@ export default defineComponent({
|
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
106
|
.sh-card-head-extra {
|
|
107
|
-
@include layoutFlex;
|
|
108
|
-
flex: 0;
|
|
109
107
|
display: inline-flex;
|
|
108
|
+
align-items: center;
|
|
109
|
+
flex-wrap: nowrap;
|
|
110
|
+
overflow: hidden;
|
|
111
|
+
text-overflow: ellipsis;
|
|
110
112
|
white-space: nowrap;
|
|
113
|
+
margin-left: auto;
|
|
111
114
|
}
|
|
112
115
|
}
|
|
113
116
|
.sh-card-body {
|
|
@@ -111,23 +111,24 @@ export default defineComponent({
|
|
|
111
111
|
const inputValue = ref(props.modelValue)
|
|
112
112
|
const rangeValue = ref(Array.isArray(props.modelValue) ? props.modelValue : [])
|
|
113
113
|
|
|
114
|
+
const vmConfig = computed(() => ({ size: props.size }))
|
|
114
115
|
const inputConfig = computed(() => {
|
|
115
116
|
let defaultProps = {}
|
|
116
117
|
let vxeProps = $vUtils.omit(props, (val, key) => {
|
|
117
118
|
return omitProps.includes(key) || $vUtils.isNone(val)
|
|
118
119
|
})
|
|
119
120
|
let shProps = {}
|
|
120
|
-
return Object.assign(defaultProps, vxeProps, shProps)
|
|
121
|
+
return Object.assign(defaultProps, vxeProps, shProps, vmConfig)
|
|
121
122
|
})
|
|
122
123
|
const pulldownConfig = computed(() => {
|
|
123
|
-
return Object.assign({ transfer: true }, props.pulldown)
|
|
124
|
+
return Object.assign({ transfer: true }, props.pulldown, vmConfig)
|
|
124
125
|
})
|
|
125
126
|
const calendarFormat = computed(() => {
|
|
126
127
|
if (props.type === 'month') return 'yyyy-MM'
|
|
127
128
|
else if (props.type === 'year') return 'yyyy'
|
|
128
129
|
return props.format || 'yyyy-MM-dd'
|
|
129
130
|
})
|
|
130
|
-
const rangeInputConfig = computed(() => ({ type: 'text', readonly: true }))
|
|
131
|
+
const rangeInputConfig = computed(() => ({ type: 'text', readonly: true, ...vmConfig }))
|
|
131
132
|
const startInputConfig = computed(() => {
|
|
132
133
|
let startValue = rangeValue.value[0] || ''
|
|
133
134
|
let startLabel = $vUtils.toDateString(startValue, calendarFormat.value)
|