flameresttable 1.0.10 → 1.0.12
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 +1 -1
- package/src/Table/Table.vue +19 -4
package/package.json
CHANGED
package/src/Table/Table.vue
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div class="mt-0">
|
|
2
|
+
<div class="mt-0 overflow-x-scroll">
|
|
3
3
|
|
|
4
4
|
<!-- "ДОБАВИТЬ" И ЧИСЛО ЗАПИСЕЙ-->
|
|
5
5
|
<div class="flex items-center justify-between">
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
</div>
|
|
27
27
|
|
|
28
28
|
<!-- ТАБЛИЦА-->
|
|
29
|
-
<div class="mt-2 table w-full">
|
|
29
|
+
<div class="mt-2 table w-full ">
|
|
30
30
|
|
|
31
31
|
<!-- ЗАГОЛОВКИ СТОЛБЦОВ-->
|
|
32
32
|
<div class="table-header-group">
|
|
@@ -147,7 +147,7 @@
|
|
|
147
147
|
class="flex-1 border border-slate-100 mr-5 w-full flex self-stretch">
|
|
148
148
|
|
|
149
149
|
<div class="flex-1">
|
|
150
|
-
{{
|
|
150
|
+
{{ getFileName(Table.columns[column].Popup.model) }}
|
|
151
151
|
</div>
|
|
152
152
|
|
|
153
153
|
<!-- Загрузчик-->
|
|
@@ -176,7 +176,7 @@
|
|
|
176
176
|
</div>
|
|
177
177
|
<div
|
|
178
178
|
class="cursor-pointer ml-2 text-lg py-2 mr-3 text-white block bg-blue-600 font-medium rounded text-sm px-4 text-center hover:bg-blue-700 focus:ring-4 focus:ring-blue-200 dark:focus:ring-blue-900"
|
|
179
|
-
@click="SaveTable()">
|
|
179
|
+
@click=" SaveTable() ">
|
|
180
180
|
{{ Table.mode === 'add' ? 'Добавить' : 'Сохранить' }}
|
|
181
181
|
</div>
|
|
182
182
|
</div>
|
|
@@ -349,6 +349,21 @@ export default defineComponent({
|
|
|
349
349
|
|
|
350
350
|
return null
|
|
351
351
|
|
|
352
|
+
},
|
|
353
|
+
|
|
354
|
+
getFileName(fileModel: any) {
|
|
355
|
+
const res = this.fileGetData(fileModel, false)
|
|
356
|
+
if (res?.name) {
|
|
357
|
+
if (typeof res.name === 'string' && res.name !== '') {
|
|
358
|
+
return res.name;
|
|
359
|
+
}
|
|
360
|
+
else {
|
|
361
|
+
if (res.file) {
|
|
362
|
+
const splitted = res.file.split('.');
|
|
363
|
+
return 'File.' + splitted[splitted.length - 1];
|
|
364
|
+
}
|
|
365
|
+
}
|
|
366
|
+
}
|
|
352
367
|
}
|
|
353
368
|
},
|
|
354
369
|
|