resolver-egretimp-plus 0.1.37 → 0.1.38
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/dist/theme/element/index.css +1 -1
- package/dist/theme/element/src/components/collapse.scss +2 -2
- package/dist/web/index.js +2 -2
- package/package.json +1 -1
- package/src/components/packages-web/CustomComponentCollapse.vue +1 -1
- package/src/components/packages-web/ElDatePicker.vue +4 -1
- package/src/components/packages-web/ElSelect.jsx +18 -2
- package/src/theme/element/components/collapse.scss +2 -2
package/package.json
CHANGED
|
@@ -53,7 +53,10 @@ const value = computed({
|
|
|
53
53
|
if (isNaN(Number(modeValue.value))) {
|
|
54
54
|
return modeValue.value
|
|
55
55
|
} else {
|
|
56
|
-
|
|
56
|
+
if (datePickerProps.valueFormat === 'timestamp') {
|
|
57
|
+
return Number(modeValue.value)
|
|
58
|
+
}
|
|
59
|
+
return modeValue.value
|
|
57
60
|
}
|
|
58
61
|
},
|
|
59
62
|
set(val) {
|
|
@@ -152,8 +152,20 @@ export default {
|
|
|
152
152
|
}
|
|
153
153
|
|
|
154
154
|
const getRenderSlots = function () {
|
|
155
|
+
const optionsSlotKeys = {
|
|
156
|
+
optionDefault: 'default'
|
|
157
|
+
}
|
|
158
|
+
const optionsSlots = {}
|
|
159
|
+
const selectSlots = {}
|
|
160
|
+
Object.keys(slots).forEach(key => {
|
|
161
|
+
if (Object.keys(optionsSlotKeys).includes(key)) {
|
|
162
|
+
optionsSlots[optionsSlotKeys[key]] = slots[key]
|
|
163
|
+
} else {
|
|
164
|
+
selectSlots[key] = slots[key]
|
|
165
|
+
}
|
|
166
|
+
})
|
|
155
167
|
return {
|
|
156
|
-
...
|
|
168
|
+
...selectSlots,
|
|
157
169
|
default: () => options.value?.map(option => {
|
|
158
170
|
return (
|
|
159
171
|
<ElOption
|
|
@@ -161,7 +173,11 @@ export default {
|
|
|
161
173
|
label={lang?.value?.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc}
|
|
162
174
|
value={option.columnValue}
|
|
163
175
|
disabled={option.columnStatus == '0' || option.columnStatus == '2'}
|
|
164
|
-
|
|
176
|
+
>
|
|
177
|
+
{
|
|
178
|
+
optionsSlots?.default?.(option)
|
|
179
|
+
}
|
|
180
|
+
</ElOption>
|
|
165
181
|
)
|
|
166
182
|
})
|
|
167
183
|
}
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
}
|
|
95
95
|
|
|
96
96
|
.show-segment {
|
|
97
|
-
.el-collapse-item__header {
|
|
97
|
+
& > .el-collapse-item__header {
|
|
98
98
|
position: relative;
|
|
99
99
|
&::after {
|
|
100
100
|
display: block;
|
|
@@ -106,7 +106,7 @@
|
|
|
106
106
|
bottom: 0px;
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
|
-
.el-collapse-item__wrap {
|
|
109
|
+
& > .el-collapse-item__wrap {
|
|
110
110
|
margin-top: 16px;
|
|
111
111
|
}
|
|
112
112
|
}
|