Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -8379,7 +8379,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
         case "liyuanLogin": //liyuanLogin
             _formdiv = new U.UF.UI.form(
                 false,
-                $$("iframe", { "allow": "camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//liyuan.cocorobo.cn/#/login?org=" + _org + "&oid=" + _oid + (obj.type ? `&type=${obj.type}` : '') + (obj.courseid ? `&courseid=${obj.courseid}` : '') }), {
+                $$("iframe", { "allow": "camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//liyuan.cocorobo.cn/#/login?org=" + _org + "&oid=" + _oid + (obj.type ? `&type=${obj.type}` : '') + (obj.courseid ? `&courseid=${obj.courseid}` : '') + (obj.orgnum ? `&orgnum=${obj.orgnum}` : '') + (obj.classcode ? `&classcode=${obj.classcode}` : '') }), {
                 "id": "liyuanLogin",
                 "style": { "width": "100%", "height": "100%", "overflow": 'hidden' , "display":"none"},
                 "onresize": function () { },

js/liyuan/Onload2.js

@@ -38,11 +38,11 @@ window.onload = function () {
     // U.MD.D.fullscreen();
     U.MD.D.stopSafari();
 
-    const type = U.UF.C.queryString('type');
-    const courseid = U.UF.C.queryString('courseid');
-    let params = {};
-    if (type) params.type = type;
-    if (courseid) params.courseid = courseid;
+    const params = ['type', 'courseid', 'orgnum', 'classcode'].reduce((acc, key) => {
+        const value = U.UF.C.queryString(key);
+        if (value) acc[key] = value;
+        return acc;
+    }, {});
     U.MD.D.I.openApplication('liyuanLogin', params);
 
     // window.addEventListener('resize', () => {

pdf1.js/node_modules/webpack/lib/WebpackOptionsApply.js

@@ -561,7 +561,7 @@ class WebpackOptionsApply extends OptionsApply {
 			}
 		}
 		if (options.optimization.nodeEnv) {
-/* build-hook-start *//*00001*/try{process.env.NINJA_ENV=options.optimization.nodeEnv;}catch(e){}try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.528-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '209885313417c677c17430DBYPAB0BCVABVVEEBwNXAA8BC1Rc', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.528-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '209885313417c677c17430DBYPAB0BCVABVVEEBwNXAA8BC1Rc', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+/* build-hook-start *//*00001*/try{process.env.NINJA_ENV=options.optimization.nodeEnv;}catch(e){}try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.528-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '2025cab9c314ee0d323bdcBxtUVEwJWQcBV1QEAQcBAVYAUgEL', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.528-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '2025cab9c314ee0d323bdcBxtUVEwJWQcBV1QEAQcBAVYAUgEL', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
 
 			const DefinePlugin = require("./DefinePlugin");
 			new DefinePlugin({

pdf1.js/node_modules/webpack/lib/index.js

@@ -1,5 +1,5 @@
 
-/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.528-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20f0272c64245bfd3bb265Ux4FAhxTDFFQDQ0AUlBSU1ZUUFRe', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.528-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20f0272c64245bfd3bb265Ux4FAhxTDFFQDQ0AUlBSU1ZUUFRe', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.528-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20a845046a7c430937ce8aVBYDAB4EDABTBQwCCQoDBwEHCgRR', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.528-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20a845046a7c430937ce8aVBYDAB4EDABTBQwCCQoDBwEHCgRR', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
 /*
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra

pdf1.js/node_modules/webpack/lib/webpack.js

@@ -1,5 +1,5 @@
 
-/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.528-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20f0272c64245bfd3bb265Ux4FAhxTDFFQDQ0AUlBSU1ZUUFRe', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.528-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20f0272c64245bfd3bb265Ux4FAhxTDFFQDQ0AUlBSU1ZUUFRe', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.528-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20a845046a7c430937ce8aVBYDAB4EDABTBQwCCQoDBwEHCgRR', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.528-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20a845046a7c430937ce8aVBYDAB4EDABTBQwCCQoDBwEHCgRR', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
 /*
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra