Просмотр исходного кода

feat(webclient): Web client to 1.4.0

lejianwen месяцев назад: 8
Родитель
Сommit
ece3328e94

+ 0 - 0
resources/public/upload/.gitkeep


+ 16 - 0
resources/web2/assets/FontManifest.json

@@ -38,5 +38,21 @@
38 38
         "asset": "assets/address_book.ttf"
39 39
       }
40 40
     ]
41
+  },
42
+  {
43
+    "family": "DeviceGroup",
44
+    "fonts": [
45
+      {
46
+        "asset": "assets/device_group.ttf"
47
+      }
48
+    ]
49
+  },
50
+  {
51
+    "family": "More",
52
+    "fonts": [
53
+      {
54
+        "asset": "assets/more.ttf"
55
+      }
56
+    ]
41 57
   }
42 58
 ]

BIN
resources/web2/assets/assets/device_group.ttf


BIN
resources/web2/assets/assets/more.ttf


BIN
resources/web2/assets/fonts/MaterialIcons-Regular.otf


+ 260 - 257
resources/web2/index.html

@@ -1,6 +1,6 @@
1 1
 <!DOCTYPE html>
2 2
 <html>
3
-  <head>
3
+<head>
4 4
     <!--
5 5
     If you are serving your web app in a path other than the root, change the
6 6
     href value below to reflect the base path you are serving from.
@@ -16,195 +16,196 @@
16 16
   -->
17 17
     <base href="/webclient2/" />
18 18
 
19
-    <meta charset="UTF-8" />
20
-    <meta content="IE=Edge" http-equiv="X-UA-Compatible" />
21
-    <meta name="description" content="Remote Desktop." />
19
+    <meta charset="UTF-8"/>
20
+    <meta content="IE=Edge" http-equiv="X-UA-Compatible"/>
21
+    <meta name="description" content="Remote Desktop."/>
22 22
 
23 23
     <!-- iOS meta tags & icons -->
24
-    <meta name="apple-mobile-web-app-capable" content="yes" />
25
-    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
26
-    <meta name="apple-mobile-web-app-title" content="RustDesk" />
27
-    <link rel="apple-touch-icon" href="icons/Icon-192.png?v=1a7ad736" />
24
+    <meta name="apple-mobile-web-app-capable" content="yes"/>
25
+    <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
26
+    <meta name="apple-mobile-web-app-title" content="RustDesk"/>
27
+    <link rel="apple-touch-icon" href="icons/Icon-192.png?v=1a7ad736"/>
28 28
 
29 29
     <!-- Favicon -->
30
-    <link rel="icon" type="image/svg+xml" href="favicon.svg?v=8fcccd9a" />
30
+    <link rel="icon" type="image/svg+xml" href="favicon.svg?v=8fcccd9a"/>
31 31
 
32 32
     <title>RustDesk</title>
33 33
     <script src="/webclient-config/index.js"></script>
34
-    <link rel="manifest" href="manifest.json" />
35
-    <script type="module" crossorigin src="js/dist/index.js?v=cabfd933"></script>
36
-    <link rel="modulepreload" href="js/dist/vendor.js?v=0b990c6e" />
34
+    <link rel="manifest" href="manifest.json"/>
35
+    <script type="module" crossorigin src="js/dist/index.js?v=ddbe54f1"></script>
36
+    <link rel="modulepreload" href="js/dist/vendor.js?v=0b990c6e"/>
37 37
     <style>
38
-      html,
39
-      body,
40
-      #root {
41
-        height: 100%;
42
-        margin: 0;
43
-        padding: 0;
44
-      }
45
-      #root {
46
-        background-repeat: no-repeat;
47
-        background-size: 100% auto;
48
-      }
49
-
50
-      .loading-title {
51
-        font-size: 1.1rem;
52
-      }
53
-
54
-      .loading-sub-title {
55
-        margin-top: 20px;
56
-        font-size: 1rem;
57
-        color: #888;
58
-      }
59
-
60
-      .page-loading-warp {
61
-        display: flex;
62
-        align-items: center;
63
-        justify-content: center;
64
-        padding: 26px;
65
-      }
66
-      .ant-spin {
67
-        position: absolute;
68
-        display: none;
69
-        -webkit-box-sizing: border-box;
70
-        box-sizing: border-box;
71
-        margin: 0;
72
-        padding: 0;
73
-        color: rgba(0, 0, 0, 0.65);
74
-        color: #1890ff;
75
-        font-size: 14px;
76
-        font-variant: tabular-nums;
77
-        line-height: 1.5;
78
-        text-align: center;
79
-        list-style: none;
80
-        opacity: 0;
81
-        -webkit-transition: -webkit-transform 0.3s
82
-          cubic-bezier(0.78, 0.14, 0.15, 0.86);
83
-        transition: -webkit-transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
84
-        transition: transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
85
-        transition: transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86),
86
-          -webkit-transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
87
-        -webkit-font-feature-settings: "tnum";
88
-        font-feature-settings: "tnum";
89
-      }
90
-
91
-      .ant-spin-spinning {
92
-        position: static;
93
-        display: inline-block;
94
-        opacity: 1;
95
-      }
96
-
97
-      .ant-spin-dot {
98
-        position: relative;
99
-        display: inline-block;
100
-        width: 20px;
101
-        height: 20px;
102
-        font-size: 20px;
103
-      }
104
-
105
-      .ant-spin-dot-item {
106
-        position: absolute;
107
-        display: block;
108
-        width: 9px;
109
-        height: 9px;
110
-        background-color: #1890ff;
111
-        border-radius: 100%;
112
-        -webkit-transform: scale(0.75);
113
-        -ms-transform: scale(0.75);
114
-        transform: scale(0.75);
115
-        -webkit-transform-origin: 50% 50%;
116
-        -ms-transform-origin: 50% 50%;
117
-        transform-origin: 50% 50%;
118
-        opacity: 0.3;
119
-        -webkit-animation: antspinmove 1s infinite linear alternate;
120
-        animation: antSpinMove 1s infinite linear alternate;
121
-      }
122
-
123
-      .ant-spin-dot-item:nth-child(1) {
124
-        top: 0;
125
-        left: 0;
126
-      }
127
-
128
-      .ant-spin-dot-item:nth-child(2) {
129
-        top: 0;
130
-        right: 0;
131
-        -webkit-animation-delay: 0.4s;
132
-        animation-delay: 0.4s;
133
-      }
134
-
135
-      .ant-spin-dot-item:nth-child(3) {
136
-        right: 0;
137
-        bottom: 0;
138
-        -webkit-animation-delay: 0.8s;
139
-        animation-delay: 0.8s;
140
-      }
141
-
142
-      .ant-spin-dot-item:nth-child(4) {
143
-        bottom: 0;
144
-        left: 0;
145
-        -webkit-animation-delay: 1.2s;
146
-        animation-delay: 1.2s;
147
-      }
148
-
149
-      .ant-spin-dot-spin {
150
-        -webkit-transform: rotate(45deg);
151
-        -ms-transform: rotate(45deg);
152
-        transform: rotate(45deg);
153
-        -webkit-animation: antrotate 1.2s infinite linear;
154
-        animation: antRotate 1.2s infinite linear;
155
-      }
156
-
157
-      .ant-spin-lg .ant-spin-dot {
158
-        width: 32px;
159
-        height: 32px;
160
-        font-size: 32px;
161
-      }
162
-
163
-      .ant-spin-lg .ant-spin-dot i {
164
-        width: 14px;
165
-        height: 14px;
166
-      }
167
-
168
-      @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
169
-        .ant-spin-blur {
170
-          background: #fff;
171
-          opacity: 0.5;
38
+        html,
39
+        body,
40
+        #root {
41
+            height: 100%;
42
+            margin: 0;
43
+            padding: 0;
172 44
         }
173
-      }
174 45
 
175
-      @-webkit-keyframes antSpinMove {
176
-        to {
177
-          opacity: 1;
46
+        #root {
47
+            background-repeat: no-repeat;
48
+            background-size: 100% auto;
178 49
         }
179
-      }
180 50
 
181
-      @keyframes antSpinMove {
182
-        to {
183
-          opacity: 1;
51
+        .loading-title {
52
+            font-size: 1.1rem;
184 53
         }
185
-      }
186 54
 
187
-      @-webkit-keyframes antRotate {
188
-        to {
189
-          -webkit-transform: rotate(405deg);
190
-          transform: rotate(405deg);
55
+        .loading-sub-title {
56
+            margin-top: 20px;
57
+            font-size: 1rem;
58
+            color: #888;
191 59
         }
192
-      }
193 60
 
194
-      @keyframes antRotate {
195
-        to {
196
-          -webkit-transform: rotate(405deg);
197
-          transform: rotate(405deg);
61
+        .page-loading-warp {
62
+            display: flex;
63
+            align-items: center;
64
+            justify-content: center;
65
+            padding: 26px;
66
+        }
67
+
68
+        .ant-spin {
69
+            position: absolute;
70
+            display: none;
71
+            -webkit-box-sizing: border-box;
72
+            box-sizing: border-box;
73
+            margin: 0;
74
+            padding: 0;
75
+            color: rgba(0, 0, 0, 0.65);
76
+            color: #1890ff;
77
+            font-size: 14px;
78
+            font-variant: tabular-nums;
79
+            line-height: 1.5;
80
+            text-align: center;
81
+            list-style: none;
82
+            opacity: 0;
83
+            -webkit-transition: -webkit-transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
84
+            transition: -webkit-transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
85
+            transition: transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
86
+            transition: transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86),
87
+            -webkit-transform 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
88
+            -webkit-font-feature-settings: "tnum";
89
+            font-feature-settings: "tnum";
90
+        }
91
+
92
+        .ant-spin-spinning {
93
+            position: static;
94
+            display: inline-block;
95
+            opacity: 1;
96
+        }
97
+
98
+        .ant-spin-dot {
99
+            position: relative;
100
+            display: inline-block;
101
+            width: 20px;
102
+            height: 20px;
103
+            font-size: 20px;
104
+        }
105
+
106
+        .ant-spin-dot-item {
107
+            position: absolute;
108
+            display: block;
109
+            width: 9px;
110
+            height: 9px;
111
+            background-color: #1890ff;
112
+            border-radius: 100%;
113
+            -webkit-transform: scale(0.75);
114
+            -ms-transform: scale(0.75);
115
+            transform: scale(0.75);
116
+            -webkit-transform-origin: 50% 50%;
117
+            -ms-transform-origin: 50% 50%;
118
+            transform-origin: 50% 50%;
119
+            opacity: 0.3;
120
+            -webkit-animation: antspinmove 1s infinite linear alternate;
121
+            animation: antSpinMove 1s infinite linear alternate;
122
+        }
123
+
124
+        .ant-spin-dot-item:nth-child(1) {
125
+            top: 0;
126
+            left: 0;
127
+        }
128
+
129
+        .ant-spin-dot-item:nth-child(2) {
130
+            top: 0;
131
+            right: 0;
132
+            -webkit-animation-delay: 0.4s;
133
+            animation-delay: 0.4s;
134
+        }
135
+
136
+        .ant-spin-dot-item:nth-child(3) {
137
+            right: 0;
138
+            bottom: 0;
139
+            -webkit-animation-delay: 0.8s;
140
+            animation-delay: 0.8s;
141
+        }
142
+
143
+        .ant-spin-dot-item:nth-child(4) {
144
+            bottom: 0;
145
+            left: 0;
146
+            -webkit-animation-delay: 1.2s;
147
+            animation-delay: 1.2s;
148
+        }
149
+
150
+        .ant-spin-dot-spin {
151
+            -webkit-transform: rotate(45deg);
152
+            -ms-transform: rotate(45deg);
153
+            transform: rotate(45deg);
154
+            -webkit-animation: antrotate 1.2s infinite linear;
155
+            animation: antRotate 1.2s infinite linear;
156
+        }
157
+
158
+        .ant-spin-lg .ant-spin-dot {
159
+            width: 32px;
160
+            height: 32px;
161
+            font-size: 32px;
162
+        }
163
+
164
+        .ant-spin-lg .ant-spin-dot i {
165
+            width: 14px;
166
+            height: 14px;
167
+        }
168
+
169
+        @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
170
+            .ant-spin-blur {
171
+                background: #fff;
172
+                opacity: 0.5;
173
+            }
174
+        }
175
+
176
+        @-webkit-keyframes antSpinMove {
177
+            to {
178
+                opacity: 1;
179
+            }
180
+        }
181
+
182
+        @keyframes antSpinMove {
183
+            to {
184
+                opacity: 1;
185
+            }
186
+        }
187
+
188
+        @-webkit-keyframes antRotate {
189
+            to {
190
+                -webkit-transform: rotate(405deg);
191
+                transform: rotate(405deg);
192
+            }
193
+        }
194
+
195
+        @keyframes antRotate {
196
+            to {
197
+                -webkit-transform: rotate(405deg);
198
+                transform: rotate(405deg);
199
+            }
198 200
         }
199
-      }
200 201
     </style>
201
-  </head>
202
+</head>
202 203
 
203
-  <body>
204
-    <div id="root">
205
-      <div
206
-        id="div-background"
207
-        style="
204
+<body>
205
+<div id="root">
206
+    <div
207
+            id="div-background"
208
+            style="
208 209
           display: flex;
209 210
           flex-direction: column;
210 211
           align-items: center;
@@ -212,117 +213,119 @@
212 213
           height: 100%;
213 214
           min-height: 420px;
214 215
         "
215
-      >
216
-        <img src="./favicon.svg?v=8fcccd9a" alt="logo" width="256" />
216
+    >
217
+        <img src="./favicon.svg?v=8fcccd9a" alt="logo" width="256"/>
217 218
         <div class="page-loading-warp">
218
-          <div class="ant-spin ant-spin-lg ant-spin-spinning">
219
+            <div class="ant-spin ant-spin-lg ant-spin-spinning">
219 220
             <span class="ant-spin-dot ant-spin-dot-spin">
220 221
               <i class="ant-spin-dot-item"></i>
221 222
               <i class="ant-spin-dot-item"></i>
222 223
               <i class="ant-spin-dot-item"></i><i class="ant-spin-dot-item"></i>
223 224
             </span>
224
-          </div>
225
+            </div>
225 226
         </div>
226 227
         <div
227
-          style="display: flex; align-items: center; justify-content: center"
228
+                style="display: flex; align-items: center; justify-content: center"
228 229
         >
229
-          <img src="./favicon.svg?v=8fcccd9a" width="32" style="margin-right: 8px" />
230
-          <span id="span-text">RustDesk Web Client V2 Preview</span>
230
+            <img src="./favicon.svg?v=8fcccd9a" width="32" style="margin-right: 8px"/>
231
+            <span id="span-text">RustDesk Web Client V2 Preview</span>
231 232
         </div>
232
-      </div>
233 233
     </div>
234
-    <!-- This script installs service_worker.js to provide PWA functionality to
235
-       application. For more information, see:
236
-       https://developers.google.com/web/fundamentals/primers/service-workers -->
237
-    <script>
238
-      const systemTheme = window.matchMedia("(prefers-color-scheme: dark)")
234
+</div>
235
+<!-- This script installs service_worker.js to provide PWA functionality to
236
+   application. For more information, see:
237
+   https://developers.google.com/web/fundamentals/primers/service-workers -->
238
+<script>
239
+    const systemTheme = window.matchMedia("(prefers-color-scheme: dark)")
239 240
         .matches
240 241
         ? "dark"
241 242
         : "light";
242
-      const myTheme = localStorage.getItem("wc-option:local:theme");
243
-      const them = myTheme || systemTheme;
243
+    const myTheme = localStorage.getItem("wc-option:local:theme");
244
+    const them = myTheme || systemTheme;
244 245
 
245
-      const divBackground = document.querySelector("#div-background");
246
-      if (divBackground) {
246
+    const divBackground = document.querySelector("#div-background");
247
+    if (divBackground) {
247 248
         divBackground.style.backgroundColor = them === "dark" ? "#000" : "#fff";
248
-      }
249
-      const spanConsole = document.querySelector("#span-text");
250
-      if (spanConsole) {
249
+    }
250
+    const spanConsole = document.querySelector("#span-text");
251
+    if (spanConsole) {
251 252
         spanConsole.style.color = them === "dark" ? "#fff" : "#000";
252
-      }
253
+    }
254
+
255
+    const serviceWorkerVersion = "461457302";
256
+    var scriptLoaded = false;
253 257
 
254
-      const serviceWorkerVersion = "3267265270";
255
-      var scriptLoaded = false;
256
-      function loadMainDartJs() {
258
+    function loadMainDartJs() {
257 259
         if (scriptLoaded) {
258
-          return;
260
+            return;
259 261
         }
260 262
         scriptLoaded = true;
261 263
         var scriptTag = document.createElement("script");
262
-        scriptTag.src = "main.dart.js?v=060a626e";
264
+        scriptTag.src = "main.dart.js?v=6d16cb80";
263 265
         scriptTag.type = "application/javascript";
264 266
         document.body.append(scriptTag);
265
-      }
267
+    }
266 268
 
267
-      if ("serviceWorker" in navigator) {
269
+    if ("serviceWorker" in navigator) {
268 270
         // Service workers are supported. Use them.
269 271
         window.addEventListener("load", function () {
270
-          // Wait for registration to finish before dropping the <script> tag.
271
-          // Otherwise, the browser will load the script multiple times,
272
-          // potentially different versions.
273
-          var serviceWorkerUrl =
274
-            "flutter_service_worker.js?v=" + serviceWorkerVersion;
275
-          navigator.serviceWorker.register(serviceWorkerUrl).then((reg) => {
276
-            function waitForActivation(serviceWorker) {
277
-              serviceWorker.addEventListener("statechange", () => {
278
-                if (serviceWorker.state == "activated") {
279
-                  console.log("Installed new service worker.");
280
-                  loadMainDartJs();
272
+            // Wait for registration to finish before dropping the <script> tag.
273
+            // Otherwise, the browser will load the script multiple times,
274
+            // potentially different versions.
275
+            var serviceWorkerUrl =
276
+                "flutter_service_worker.js?v=" + serviceWorkerVersion;
277
+            navigator.serviceWorker.register(serviceWorkerUrl).then((reg) => {
278
+                function waitForActivation(serviceWorker) {
279
+                    serviceWorker.addEventListener("statechange", () => {
280
+                        if (serviceWorker.state == "activated") {
281
+                            console.log("Installed new service worker.");
282
+                            loadMainDartJs();
283
+                        }
284
+                    });
281 285
                 }
282
-              });
283
-            }
284
-            if (!reg.active && (reg.installing || reg.waiting)) {
285
-              // No active web worker and we have installed or are installing
286
-              // one for the first time. Simply wait for it to activate.
287
-              waitForActivation(reg.installing || reg.waiting);
288
-            } else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
289
-              // When the app updates the serviceWorkerVersion changes, so we
290
-              // need to ask the service worker to update.
291
-              console.log("New service worker available.");
292
-              reg.update();
293
-              waitForActivation(reg.installing);
294
-            } else {
295
-              // Existing service worker is still good.
296
-              console.log("Loading app from service worker.");
297
-              loadMainDartJs();
298
-            }
299
-          });
300
-
301
-          // If service worker doesn't succeed in a reasonable amount of time,
302
-          // fallback to plaint <script> tag.
303
-          setTimeout(() => {
304
-            if (!scriptLoaded) {
305
-              console.warn(
306
-                "Failed to load app from service worker. Falling back to plain <script> tag."
307
-              );
308
-              loadMainDartJs();
309
-            }
310
-          }, 4000);
286
+
287
+                if (!reg.active && (reg.installing || reg.waiting)) {
288
+                    // No active web worker and we have installed or are installing
289
+                    // one for the first time. Simply wait for it to activate.
290
+                    waitForActivation(reg.installing || reg.waiting);
291
+                } else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
292
+                    // When the app updates the serviceWorkerVersion changes, so we
293
+                    // need to ask the service worker to update.
294
+                    console.log("New service worker available.");
295
+                    reg.update();
296
+                    waitForActivation(reg.installing);
297
+                } else {
298
+                    // Existing service worker is still good.
299
+                    console.log("Loading app from service worker.");
300
+                    loadMainDartJs();
301
+                }
302
+            });
303
+
304
+            // If service worker doesn't succeed in a reasonable amount of time,
305
+            // fallback to plaint <script> tag.
306
+            setTimeout(() => {
307
+                if (!scriptLoaded) {
308
+                    console.warn(
309
+                        "Failed to load app from service worker. Falling back to plain <script> tag."
310
+                    );
311
+                    loadMainDartJs();
312
+                }
313
+            }, 4000);
311 314
         });
312
-      } else {
315
+    } else {
313 316
         // Service workers not supported. Just drop the <script> tag.
314 317
         loadMainDartJs();
315
-      }
316
-    </script>
317
-    <script src="libs/stream/ponyfill.min.js"></script>
318
-    <script src="libs/stream/StreamSaver.min.js"></script>
319
-    <script src="libs/firebase-app.js?8.10.1"></script>
320
-    <script src="libs/firebase-analytics.js?8.10.1"></script>
321
-
322
-    <script>
323
-      // Your web app's Firebase configuration
324
-      // For Firebase JS SDK v7.20.0 and later, measurementId is optional
325
-      const firebaseConfig = {
318
+    }
319
+</script>
320
+<script src="libs/stream/ponyfill.min.js"></script>
321
+<script src="libs/stream/StreamSaver.min.js"></script>
322
+<script src="libs/firebase-app.js?8.10.1"></script>
323
+<script src="libs/firebase-analytics.js?8.10.1"></script>
324
+
325
+<script>
326
+    // Your web app's Firebase configuration
327
+    // For Firebase JS SDK v7.20.0 and later, measurementId is optional
328
+    const firebaseConfig = {
326 329
         apiKey: "AIzaSyCgehIZk1aFP0E7wZtYRRqrfvNiNAF39-A",
327 330
         authDomain: "rustdesk.firebaseapp.com",
328 331
         databaseURL: "https://rustdesk.firebaseio.com",
@@ -331,11 +334,11 @@
331 334
         messagingSenderId: "768133699366",
332 335
         appId: "1:768133699366:web:d50faf0792cb208d7993e7",
333 336
         measurementId: "G-9PEH85N6ZQ",
334
-      };
337
+    };
335 338
 
336
-      // Initialize Firebase
337
-      firebase.initializeApp(firebaseConfig);
338
-      firebase.analytics();
339
-    </script>
340
-  </body>
339
+    // Initialize Firebase
340
+    firebase.initializeApp(firebaseConfig);
341
+    firebase.analytics();
342
+</script>
343
+</body>
341 344
 </html>

Разница между файлами не показана из-за своего большого размера
+ 3400 - 3042
resources/web2/js/dist/index.js


Разница между файлами не показана из-за своего большого размера
+ 5685 - 1734
resources/web2/js/dist/lang.js


+ 6 - 0
resources/web2/js/dist/ljw.js

@@ -1,5 +1,11 @@
1 1
 window._gwen = {}
2 2
 window._gwen.kv = {}
3
+
4
+//fix 语言
5
+if(!localStorage.getItem('wc-option:local:lang') && navigator.language){
6
+    localStorage.setItem('wc-option:local:lang', navigator.language.toLowerCase())
7
+}
8
+
3 9
 const storage_prefix = 'wc-'
4 10
 const apiserver = localStorage.getItem('wc-api-server')
5 11
 

Разница между файлами не показана из-за своего большого размера
+ 81993 - 80515
resources/web2/main.dart.js