@ganwei-web/ganwei-pc-cli 6.3.6 → 6.3.7
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/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/fonts/font/iconfont.css +7 -3
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/fonts/font/iconfont.js +1 -1
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/fonts/font/iconfont.json +7 -0
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/fonts/font/iconfont.ttf +0 -0
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/fonts/font/iconfont.woff +0 -0
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/fonts/font/iconfont.woff2 +0 -0
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/themes/dark-6-1.css +885 -877
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/themes/green-6-1.css +8 -0
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-index/public/static/themes/light-6-1.css +8 -0
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-login/src/views/ssoLogin.vue +15 -11
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-template/env.d.ts +6 -0
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-template/public/static/themes/dark-6-1.css +887 -454
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-template/public/static/themes/light-6-1.css +427 -0
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-template/src/main.ts +2 -2
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-template/src/utils/signalr.ts +49 -22
- package/ganwei-iotcenter-index-6.2.3/packages/ganwei-iotcenter-template/vite.config.ts +10 -0
- package/package.json +1 -1
|
@@ -84,11 +84,19 @@
|
|
|
84
84
|
--frame-main-background-3: var(--gw-color-Neutrals22);
|
|
85
85
|
/* 任务库 popover 背景 */
|
|
86
86
|
--frame-main-background-4: var(--gw-color-Neutrals20);
|
|
87
|
+
--frame-main-background-primary: var(--gw-color-primary);
|
|
88
|
+
--frame-main-background-success: var(--gw-color-success);
|
|
89
|
+
--frame-main-background-waning: var(--gw-color-waning);
|
|
90
|
+
--frame-main-background-danger: var(--gw-color-danger);
|
|
87
91
|
/* 主要字体色 */
|
|
88
92
|
--frame-main-color: var(--gw-color-Neutrals2);
|
|
89
93
|
/* 稍浅字体色 */
|
|
90
94
|
--frame-main-color-1: var(--gw-color-Neutrals12);
|
|
91
95
|
--frame-main-color-2: var(--gw-color-waning4);
|
|
96
|
+
--frame-main-color-primary: var(--gw-color-primary);
|
|
97
|
+
--frame-main-color-success: var(--gw-color-success);
|
|
98
|
+
--frame-main-color-waning: var(--gw-color-waning);
|
|
99
|
+
--frame-main-color-danger: var(--gw-color-danger);
|
|
92
100
|
/* 主要边框色 */
|
|
93
101
|
/* --bor-default => --border-color-2 =>*/
|
|
94
102
|
--frame-main-border: var(--gw-color-Neutrals18);
|
|
@@ -94,11 +94,19 @@
|
|
|
94
94
|
--frame-main-background-3: var(--gw-color-Neutrals22);
|
|
95
95
|
/* 任务库 popover 背景 */
|
|
96
96
|
--frame-main-background-4: var(--gw-color-Neutrals20);
|
|
97
|
+
--frame-main-background-primary: var(--gw-color-primary);
|
|
98
|
+
--frame-main-background-success: var(--gw-color-success);
|
|
99
|
+
--frame-main-background-waning: var(--gw-color-waning);
|
|
100
|
+
--frame-main-background-danger: var(--gw-color-danger);
|
|
97
101
|
/* 主要字体色 */
|
|
98
102
|
--frame-main-color: var(--gw-color-Neutrals2);
|
|
99
103
|
/* 稍浅字体色 */
|
|
100
104
|
--frame-main-color-1: var(--gw-color-Neutrals12);
|
|
101
105
|
--frame-main-color-2: var(--gw-color-waning4);
|
|
106
|
+
--frame-main-color-primary: var(--gw-color-primary);
|
|
107
|
+
--frame-main-color-success: var(--gw-color-success);
|
|
108
|
+
--frame-main-color-waning: var(--gw-color-waning);
|
|
109
|
+
--frame-main-color-danger: var(--gw-color-danger);
|
|
102
110
|
/* 主要边框色 */
|
|
103
111
|
/* --bor-default => --border-color-2 =>*/
|
|
104
112
|
--frame-main-border: var(--gw-color-Neutrals18);
|
|
@@ -138,17 +138,21 @@ export default {
|
|
|
138
138
|
}
|
|
139
139
|
})
|
|
140
140
|
} else {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
141
|
+
if (this.urlConfig.api) {
|
|
142
|
+
window.location.href = this.urlConfig.api;
|
|
143
|
+
} else {
|
|
144
|
+
let url = new URL(window.location.origin);
|
|
145
|
+
const search = url.href.indexOf('?') > -1 ? url.href.split('?')[1] : ''
|
|
146
|
+
const urlSearchParams = new URLSearchParams(search)
|
|
147
|
+
const searchParams = new URLSearchParams(this.query)
|
|
148
|
+
const mergedParams = this.mergeURLSearchParams(searchParams, urlSearchParams)
|
|
149
|
+
mergedParams.delete('url')
|
|
150
|
+
mergedParams.delete('code')
|
|
151
|
+
mergedParams.delete('state')
|
|
152
|
+
let urlString = url.origin + '/#/Index' + url.hash.split('?')[0] + '?' + mergedParams.toString()
|
|
153
|
+
|
|
154
|
+
window.location.href = urlString;
|
|
155
|
+
}
|
|
152
156
|
}
|
|
153
157
|
}
|
|
154
158
|
|