resolver-egretimp-plus 0.0.196 → 0.0.198
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
|
@@ -141,7 +141,7 @@ const getTableColumnProps = (config) => {
|
|
|
141
141
|
return {
|
|
142
142
|
label,
|
|
143
143
|
prop: config.metaCode,
|
|
144
|
-
width: config.columnWidth,
|
|
144
|
+
width: config.columnWidth || props.config.columnWidth,
|
|
145
145
|
ellipsis: config.ellipsis === '1',
|
|
146
146
|
showexpand: config.showexpand === '1',
|
|
147
147
|
fixed: config.fixed,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<ElDatePicker v-bind="{ ...attrs, ...datePickerProps}" :disabledDate="disabledDate" v-model="
|
|
2
|
+
<ElDatePicker v-bind="{ ...attrs, ...datePickerProps}" :disabledDate="disabledDate" v-model="value"></ElDatePicker>
|
|
3
3
|
</template>
|
|
4
4
|
<script setup>
|
|
5
5
|
import { ElDatePicker } from 'element-plus'
|
|
@@ -35,6 +35,18 @@ const datePickerProps = computed(() => {
|
|
|
35
35
|
const attrs = useAttrs()
|
|
36
36
|
const modeValue = defineModel()
|
|
37
37
|
|
|
38
|
+
const value = computed({
|
|
39
|
+
get() {
|
|
40
|
+
if (isNaN(Number(modeValue.value))) {
|
|
41
|
+
return modeValue.value
|
|
42
|
+
} else {
|
|
43
|
+
return Number(modeValue.value)
|
|
44
|
+
}
|
|
45
|
+
},
|
|
46
|
+
set(val) {
|
|
47
|
+
modeValue.value = val
|
|
48
|
+
}
|
|
49
|
+
})
|
|
38
50
|
|
|
39
51
|
const disabledDate = (date) => {
|
|
40
52
|
let dateTime = formatDate(date, 'yyyy-MM-dd')
|