zova-ui-vuetify 5.1.49 → 5.1.51
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/env/.env +1 -2
- package/env/.env.spa.cabloyStartAdmin +1 -2
- package/env/.env.spa.cabloyStartWeb +1 -2
- package/env/.env.ssr.admin +1 -2
- package/env/.env.ssr.cabloyStartAdmin +1 -2
- package/env/.env.ssr.cabloyStartWeb +1 -2
- package/env/.env.ssr.web +1 -2
- package/package.json +13 -13
- package/package.original.json +4 -4
- package/src/front/config/config/config.ts +5 -1
- package/src/suite/a-home/modules/home-base/src/service/ssr.ts +2 -3
- package/src/suite/a-home/modules/home-layouttabs/src/component/layoutTabs/render.header.tsx +1 -1
- package/src/suite/a-vuetify/modules/vuetify-adapter/src/bean/meta.themeHandler.ts +1 -1
package/env/.env
CHANGED
|
@@ -51,8 +51,7 @@ PROXY_API_ENABLED = true
|
|
|
51
51
|
PROXY_API_BASE_URL = http://localhost:$MOCK_BUILD_PORT
|
|
52
52
|
PROXY_API_PREFIX = $API_PREFIX
|
|
53
53
|
|
|
54
|
-
|
|
55
|
-
SSR_COOKIE_THEME = false
|
|
54
|
+
SSR_COOKIE = false
|
|
56
55
|
SSR_COOKIE_THEMEDARK_DEFAULT = true
|
|
57
56
|
SSR_BODYREADYOBSERVER = false
|
|
58
57
|
SSR_API_BASE_URL = $API_BASE_URL
|
package/env/.env.ssr.admin
CHANGED
package/env/.env.ssr.web
CHANGED
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zova-ui-vuetify",
|
|
3
|
-
"version": "5.1.
|
|
4
|
-
"gitHead": "
|
|
3
|
+
"version": "5.1.51",
|
|
4
|
+
"gitHead": "04cba5d859f4138ff9fa24d5d28a121782fcf049",
|
|
5
5
|
"description": "A vue3 vuetify framework with ioc",
|
|
6
6
|
"keywords": [
|
|
7
7
|
"ioc",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"@cabloy/json5": "^1.1.4",
|
|
61
61
|
"@cabloy/logger": "^1.1.9",
|
|
62
62
|
"@cabloy/module-info": "^2.0.0",
|
|
63
|
-
"@cabloy/utils": "^2.1.
|
|
63
|
+
"@cabloy/utils": "^2.1.6",
|
|
64
64
|
"@cabloy/vue-router": "^4.4.16",
|
|
65
65
|
"@cabloy/word-utils": "^2.1.8",
|
|
66
66
|
"@cabloy/zod-openapi": "^1.1.5",
|
|
@@ -88,8 +88,8 @@
|
|
|
88
88
|
"vue-router": "npm:@cabloy/vue-router@^4.4.16",
|
|
89
89
|
"vuetify": "^4.0.5",
|
|
90
90
|
"zod": "^4.3.6",
|
|
91
|
-
"zova": "^5.1.
|
|
92
|
-
"zova-jsx": "^1.1.
|
|
91
|
+
"zova": "^5.1.32",
|
|
92
|
+
"zova-jsx": "^1.1.17",
|
|
93
93
|
"zova-module-a-action": "^5.1.11",
|
|
94
94
|
"zova-module-a-actions": "^5.1.9",
|
|
95
95
|
"zova-module-a-api": "^5.1.8",
|
|
@@ -103,22 +103,22 @@
|
|
|
103
103
|
"zova-module-a-fetch": "^5.1.8",
|
|
104
104
|
"zova-module-a-form": "^5.1.9",
|
|
105
105
|
"zova-module-a-icon": "^5.1.11",
|
|
106
|
-
"zova-module-a-interceptor": "^5.1.
|
|
106
|
+
"zova-module-a-interceptor": "^5.1.11",
|
|
107
107
|
"zova-module-a-logger": "^5.1.9",
|
|
108
108
|
"zova-module-a-meta": "^5.1.8",
|
|
109
|
-
"zova-module-a-model": "^5.1.
|
|
109
|
+
"zova-module-a-model": "^5.1.10",
|
|
110
110
|
"zova-module-a-openapi": "^5.1.9",
|
|
111
111
|
"zova-module-a-pinia": "^5.1.8",
|
|
112
112
|
"zova-module-a-router": "^5.1.11",
|
|
113
113
|
"zova-module-a-routerstack": "^5.1.9",
|
|
114
114
|
"zova-module-a-routertabs": "^5.1.12",
|
|
115
|
-
"zova-module-a-ssr": "^5.1.
|
|
115
|
+
"zova-module-a-ssr": "^5.1.10",
|
|
116
116
|
"zova-module-a-ssrhmr": "^5.1.8",
|
|
117
117
|
"zova-module-a-ssrserver": "^5.1.8",
|
|
118
|
-
"zova-module-a-style": "^5.1.
|
|
118
|
+
"zova-module-a-style": "^5.1.10",
|
|
119
119
|
"zova-module-a-table": "^5.1.9",
|
|
120
120
|
"zova-module-a-zod": "^5.1.11",
|
|
121
|
-
"zova-module-a-zova": "^5.1.
|
|
121
|
+
"zova-module-a-zova": "^5.1.21",
|
|
122
122
|
"zova-module-demo-basic": "workspace:^",
|
|
123
123
|
"zova-module-home-api": "workspace:^",
|
|
124
124
|
"zova-module-home-base": "workspace:^",
|
|
@@ -136,7 +136,7 @@
|
|
|
136
136
|
"zova-suite-a-cabloy": "^5.1.11"
|
|
137
137
|
},
|
|
138
138
|
"devDependencies": {
|
|
139
|
-
"@cabloy/cli": "^3.1.
|
|
139
|
+
"@cabloy/cli": "^3.1.8",
|
|
140
140
|
"@cabloy/lint": "^5.1.7",
|
|
141
141
|
"@cabloy/openapi-typescript": "^7.9.2",
|
|
142
142
|
"@quasar/app-vite": "npm:@cabloy/quasar-app-vite@^2.5.9",
|
|
@@ -149,7 +149,7 @@
|
|
|
149
149
|
"less": "^4.6.4",
|
|
150
150
|
"oxfmt": "^0.45.0",
|
|
151
151
|
"oxlint": "^1.60.0",
|
|
152
|
-
"quasar-app-extension-zova": "^1.2.
|
|
152
|
+
"quasar-app-extension-zova": "^1.2.18",
|
|
153
153
|
"sass-embedded": "^1.99.0",
|
|
154
154
|
"typescript": "^5.9.3",
|
|
155
155
|
"unplugin-fonts": "^1.4.0",
|
|
@@ -158,7 +158,7 @@
|
|
|
158
158
|
"vite-plugin-vuetify": "^2.1.3",
|
|
159
159
|
"vue-tsc": "^3.2.6",
|
|
160
160
|
"zova-openapi": "^1.1.8",
|
|
161
|
-
"zova-vite": "^1.1.
|
|
161
|
+
"zova-vite": "^1.1.18"
|
|
162
162
|
},
|
|
163
163
|
"packageManager": "pnpm@10.19.0",
|
|
164
164
|
"pnpm": {
|
package/package.original.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "zova-ui-vuetify",
|
|
3
|
-
"version": "5.1.
|
|
3
|
+
"version": "5.1.50",
|
|
4
4
|
"description": "A vue3 vuetify framework with ioc",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"vue": "^3.5.32",
|
|
60
60
|
"vuetify": "^4.0.5",
|
|
61
61
|
"vue-router": "npm:@cabloy/vue-router@^4.4.16",
|
|
62
|
-
"zova": "^5.1.
|
|
62
|
+
"zova": "^5.1.32",
|
|
63
63
|
"zova-suite-a-cabloy": "^5.1.11"
|
|
64
64
|
},
|
|
65
65
|
"devDependencies": {
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"oxfmt": "^0.45.0",
|
|
74
74
|
"oxlint": "^1.60.0",
|
|
75
75
|
"less": "^4.6.4",
|
|
76
|
-
"quasar-app-extension-zova": "^1.2.
|
|
76
|
+
"quasar-app-extension-zova": "^1.2.18",
|
|
77
77
|
"sass-embedded": "^1.99.0",
|
|
78
78
|
"typescript": "^5.9.3",
|
|
79
79
|
"unplugin-fonts": "^1.4.0",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
"vite-plugin-fake-server-turbo": "^3.0.18",
|
|
82
82
|
"vite-plugin-vuetify": "^2.1.3",
|
|
83
83
|
"vue-tsc": "^3.2.6",
|
|
84
|
-
"zova-vite": "^1.1.
|
|
84
|
+
"zova-vite": "^1.1.18"
|
|
85
85
|
},
|
|
86
86
|
"license": "MIT",
|
|
87
87
|
"gitHead": "4d11b0fed7af50b828971785af3c014046be6afa",
|
|
@@ -32,6 +32,11 @@ export default function (sys: ZovaSys) {
|
|
|
32
32
|
jwt: env.API_JWT !== 'false',
|
|
33
33
|
};
|
|
34
34
|
|
|
35
|
+
// ssr
|
|
36
|
+
config.ssr = {
|
|
37
|
+
cookie: sys.env.SSR_COOKIE === 'true',
|
|
38
|
+
};
|
|
39
|
+
|
|
35
40
|
// ws
|
|
36
41
|
config.ws = {
|
|
37
42
|
baseURL: config.api.baseURL?.replace('https://', 'wss://').replace('http://', 'ws://'),
|
|
@@ -41,7 +46,6 @@ export default function (sys: ZovaSys) {
|
|
|
41
46
|
// locale
|
|
42
47
|
config.locale = {
|
|
43
48
|
default: env.APP_LOCALE_DEFAULT as keyof ILocaleRecord,
|
|
44
|
-
cookieLocale: sys.env.SSR_COOKIE_LOCALE === 'true',
|
|
45
49
|
storeKey: 'locale',
|
|
46
50
|
items: {
|
|
47
51
|
'en-us': 'LanguageEnglish',
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
+
import { checkErrorJwtExpired } from '@cabloy/utils';
|
|
1
2
|
import { BeanBase } from 'zova';
|
|
2
3
|
import { Service } from 'zova-module-a-bean';
|
|
3
4
|
|
|
4
|
-
export const ErrorMessageJwtExpired = 'jwt expired';
|
|
5
|
-
|
|
6
5
|
@Service()
|
|
7
6
|
export class ServiceSsr extends BeanBase {
|
|
8
7
|
public async initialize() {
|
|
@@ -21,7 +20,7 @@ export class ServiceSsr extends BeanBase {
|
|
|
21
20
|
if (!process.env.SERVER) return;
|
|
22
21
|
const _eventErrorHandler = this.app.meta.event.on('app:errorHandler', ({ err }, next) => {
|
|
23
22
|
if (err.code === 401) {
|
|
24
|
-
if (err
|
|
23
|
+
if (checkErrorJwtExpired(err)) {
|
|
25
24
|
try {
|
|
26
25
|
this.app.$gotoPage('/home/base/errorExpired', { returnTo: true });
|
|
27
26
|
} catch (err: any) {
|
|
@@ -23,7 +23,7 @@ export class RenderHeader extends BeanRenderBase {
|
|
|
23
23
|
<VSpacer></VSpacer>
|
|
24
24
|
{this.$$r.$$renderLocale.render()}
|
|
25
25
|
{this.$$r.$$renderTheme.renderThemeDark()}
|
|
26
|
-
{this
|
|
26
|
+
{this.sys.config.ssr.cookie && this.$$r.$$renderTheme.renderThemeName()}
|
|
27
27
|
{this.$$r.$$renderUser.render()}
|
|
28
28
|
</VAppBar>
|
|
29
29
|
);
|