evui 3.4.79 → 3.4.80
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/evui.common.js +79 -62
- package/dist/evui.common.js.map +1 -1
- package/dist/evui.umd.js +79 -62
- package/dist/evui.umd.js.map +1 -1
- package/dist/evui.umd.min.js +1 -1
- package/dist/evui.umd.min.js.map +1 -1
- package/package.json +1 -1
- package/src/components/timePicker/TimePicker.vue +21 -3
- package/src/components/treeGrid/uses.js +1 -1
package/package.json
CHANGED
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
class="ev-input"
|
|
19
19
|
:disabled="disabled"
|
|
20
20
|
:readonly="readonly"
|
|
21
|
-
placeholder="
|
|
21
|
+
:placeholder="placeholders[0]"
|
|
22
22
|
@focus="focusInputStartTime"
|
|
23
23
|
@blur="blurInputStartTime"
|
|
24
24
|
@change="changeStartTime"
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
class="ev-input"
|
|
50
50
|
:disabled="disabled"
|
|
51
51
|
:readonly="readonly"
|
|
52
|
-
placeholder="
|
|
52
|
+
:placeholder="placeholders[1]"
|
|
53
53
|
@focus="focusInputEndTime"
|
|
54
54
|
@blur="blurInputEndTime"
|
|
55
55
|
@change="changeEndTime"
|
|
@@ -84,7 +84,7 @@
|
|
|
84
84
|
class="ev-input"
|
|
85
85
|
:disabled="disabled"
|
|
86
86
|
:readonly="readonly"
|
|
87
|
-
placeholder="Enter time"
|
|
87
|
+
:placeholder="typeof placeholder === 'string' ? placeholder : 'Enter time'"
|
|
88
88
|
@focus="focusInputTime"
|
|
89
89
|
@blur="blurInputTime"
|
|
90
90
|
@change="changeTime"
|
|
@@ -144,6 +144,11 @@ export default {
|
|
|
144
144
|
type: Boolean,
|
|
145
145
|
default: false,
|
|
146
146
|
},
|
|
147
|
+
placeholder: {
|
|
148
|
+
type: [String, Array],
|
|
149
|
+
required: false,
|
|
150
|
+
default: undefined,
|
|
151
|
+
},
|
|
147
152
|
},
|
|
148
153
|
emits: {
|
|
149
154
|
'update:modelValue': null,
|
|
@@ -168,6 +173,18 @@ export default {
|
|
|
168
173
|
},
|
|
169
174
|
}); // <string | string[]>
|
|
170
175
|
|
|
176
|
+
const placeholders = computed(() => {
|
|
177
|
+
const defaultValue = ['start time', 'end time'];
|
|
178
|
+
if (Array.isArray(props.placeholder)) {
|
|
179
|
+
return [
|
|
180
|
+
typeof props.placeholder[0] === 'string' ? props.placeholder[0] : defaultValue[0],
|
|
181
|
+
typeof props.placeholder[1] === 'string' ? props.placeholder[1] : defaultValue[1],
|
|
182
|
+
];
|
|
183
|
+
}
|
|
184
|
+
if (typeof props.placeholder === 'string') return [props.placeholder, props.placeholder];
|
|
185
|
+
return defaultValue;
|
|
186
|
+
});
|
|
187
|
+
|
|
171
188
|
const previousValue = ref(
|
|
172
189
|
Array.isArray(time.value) ? [`${time.value[0]}`, `${time.value[1]}`] : `${time.value}`,
|
|
173
190
|
); // <string | string[]>
|
|
@@ -290,6 +307,7 @@ export default {
|
|
|
290
307
|
focusInputEndTime,
|
|
291
308
|
blurInputEndTime,
|
|
292
309
|
changeEndTime,
|
|
310
|
+
placeholders,
|
|
293
311
|
};
|
|
294
312
|
},
|
|
295
313
|
};
|
|
@@ -641,7 +641,7 @@ export const contextMenuEvent = (params) => {
|
|
|
641
641
|
{
|
|
642
642
|
text: contextInfo.columnMenuTextInfo?.hide ?? 'Hide',
|
|
643
643
|
iconClass: 'ev-icon-visibility-off',
|
|
644
|
-
disabled: !useGridSetting.value || stores.orderedColumns.length === 1,
|
|
644
|
+
disabled: !useGridSetting.value || stores.orderedColumns.length === 1 || !!column.fixed,
|
|
645
645
|
hidden: contextInfo.hiddenColumnMenuItem?.hide || !useGridSetting.value,
|
|
646
646
|
click: () => {
|
|
647
647
|
setColumnHidden(column.field);
|