flameresttable 1.0.9 → 1.0.11
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 +14 -14
- package/src/Table/Table.vue +17 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "flameresttable",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.11",
|
|
4
4
|
"main": "./src/plugin.ts",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -16,12 +16,12 @@
|
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"@vuepic/vue-datepicker": "^3.6.8",
|
|
19
|
-
"flamerest": "^1.0.
|
|
19
|
+
"flamerest": "^1.0.80",
|
|
20
20
|
"lodash-es": "^4.17.21",
|
|
21
|
-
"pinia": "^2.0.
|
|
21
|
+
"pinia": "^2.0.34",
|
|
22
22
|
"pug": "github:FlameArt/pug-tailwind-only",
|
|
23
23
|
"pug-lexer": "github:FlameArt/pug-lexer-only",
|
|
24
|
-
"sass": "^1.
|
|
24
|
+
"sass": "^1.62.0",
|
|
25
25
|
"vue": "^3.2.45",
|
|
26
26
|
"vue-router": "^4.1.6"
|
|
27
27
|
},
|
|
@@ -29,23 +29,23 @@
|
|
|
29
29
|
"@capacitor/android": "^3.9.0",
|
|
30
30
|
"@capacitor/cli": "^3.9.0",
|
|
31
31
|
"@capacitor/core": "^3.9.0",
|
|
32
|
-
"@heroicons/vue": "^2.0.
|
|
33
|
-
"@types/lodash-es": "^4.17.
|
|
32
|
+
"@heroicons/vue": "^2.0.17",
|
|
33
|
+
"@types/lodash-es": "^4.17.7",
|
|
34
34
|
"@types/lodash.merge": "^4.6.7",
|
|
35
35
|
"@types/node": "18.8.0",
|
|
36
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
37
|
-
"@typescript-eslint/parser": "^5.
|
|
38
|
-
"@vitejs/plugin-vue": "^4.
|
|
36
|
+
"@typescript-eslint/eslint-plugin": "^5.59.0",
|
|
37
|
+
"@typescript-eslint/parser": "^5.59.0",
|
|
38
|
+
"@vitejs/plugin-vue": "^4.1.0",
|
|
39
39
|
"@volar/vue-language-plugin-pug": "^1.2.0",
|
|
40
40
|
"@vue/compiler-sfc": "^3.2.45",
|
|
41
|
-
"autoprefixer": "^10.4.
|
|
42
|
-
"eslint": "^8.
|
|
41
|
+
"autoprefixer": "^10.4.14",
|
|
42
|
+
"eslint": "^8.38.0",
|
|
43
43
|
"eslint-plugin-vue": "^8.7.1",
|
|
44
|
-
"postcss": "^8.4.
|
|
44
|
+
"postcss": "^8.4.23",
|
|
45
45
|
"postcss-import": "^14.1.0",
|
|
46
|
-
"tailwindcss": "^3.
|
|
46
|
+
"tailwindcss": "^3.3.1",
|
|
47
47
|
"typescript": "^4.9.5",
|
|
48
|
-
"vite": "^4.
|
|
48
|
+
"vite": "^4.2.2",
|
|
49
49
|
"vue-tsc": "^1.2.0",
|
|
50
50
|
"vue-universal-modal": "^1.1.4"
|
|
51
51
|
},
|
package/src/Table/Table.vue
CHANGED
|
@@ -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
|
<!-- Загрузчик-->
|
|
@@ -340,7 +340,7 @@ export default defineComponent({
|
|
|
340
340
|
// Получить строку с исходником
|
|
341
341
|
if (getSource) {
|
|
342
342
|
if (typeof thisArr[0].data === 'string') return thisArr[0].data;
|
|
343
|
-
if (typeof thisArr[0].file === 'string') return
|
|
343
|
+
if (typeof thisArr[0].file === 'string') return REST.SERVER + "/" + thisArr[0].file;
|
|
344
344
|
return "";
|
|
345
345
|
}
|
|
346
346
|
// Получить данные целиком
|
|
@@ -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
|
|