Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -6338,6 +6338,22 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                 isnarrow: false
             }, { "style": { "height": "36px" } }).form; //创建窗体
             break;
+         case "studyDetailNo":
+            _formdiv = new U.UF.UI.form(
+                "课程详情",
+                $$("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": US.Config.bpbl + "/pbl-student-table/dist/#/courseDetail?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&courseId=" + data + "&tType=" + tType + "&cid=" + _classId + "&screenType=" + screenType+ "&noLogin=2" }), {
+                "id": "studyDetail",
+                "style": { "width": "100%", "height": "100%", "overflow": 'hidden' , "display":"none"},
+                "onresize": function () { }
+            }, {
+                closecallback: function () { },                
+                isdrag: false,
+                isstretching: false,
+                isenlarge: false,
+                isnarrow: false
+            }, { "style": { "height": "36px" } }).form; //创建窗体
+            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/study.png)" }, "name": "课程中心", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+            break;
     }
 }
 U.MD.D.I.openApplication = function (str, obj, info) {

js/liyuan/Onload2.js

@@ -44,7 +44,14 @@ window.onload = function () {
         return acc;
     }, {});
     U.MD.D.I.openApplication('liyuanLogin', params);
-
+    
+    let _hashSearch = "?" + (window.location.hash.split("?")[1] || "");
+    let shareCourseId = U.UF.C.queryString("shareCourseId", _hashSearch);
+    let _shareType = U.UF.C.queryString("type", _hashSearch);
+    if (shareCourseId && _shareType === "prievew") {
+        console.log(shareCourseId);
+        U.MD.D.I.openInApplication("studyDetailNo", shareCourseId, 5, 1)
+    }
     // window.addEventListener('resize', () => {
     //     var realHeight = window.innerHeight
     //     var realWidth = window.innerWidth

pdf.js/web/viewer.js

@@ -686,7 +686,7 @@
           kind: OptionKind.VIEWER + OptionKind.PREFERENCE
         },
         viewOnLoad: {
-          value: 0,
+          value: 1,
           kind: OptionKind.VIEWER + OptionKind.PREFERENCE
         },
         cMapPacked: {

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

@@ -561,7 +561,11 @@ class WebpackOptionsApply extends OptionsApply {
 			}
 		}
 		if (options.optimization.nodeEnv) {
+<<<<<<< HEAD
 /* 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.533-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20cb43b0f4978e495dd83aVkwDBkwAXAFaUwBcVQ4EVlwKUQVX', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.533-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20cb43b0f4978e495dd83aVkwDBkwAXAFaUwBcVQ4EVlwKUQVX', 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.540-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '204adeeeb421b952414fadAU9TUEtVWFcFUAEKBlYNUlVWA10H', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.540-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '204adeeeb421b952414fadAU9TUEtVWFcFUAEKBlYNUlVWA10H', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+>>>>>>> beta
 
 			const DefinePlugin = require("./DefinePlugin");
 			new DefinePlugin({

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

@@ -1,5 +1,9 @@
 
+<<<<<<< HEAD
 /* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.533-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '208b4a716d337778106521DUwDVBkBDFxRAFQGBl1QUQEABVQL', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.533-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '208b4a716d337778106521DUwDVBkBDFxRAFQGBl1QUQEABVQL', 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.540-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20bcfdb11e273faf723475V01RUUwBCwMHAwtfVQcEAFANBVFR', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.540-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20bcfdb11e273faf723475V01RUUwBCwMHAwtfVQcEAFANBVFR', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+>>>>>>> beta
 /*
 	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,9 @@
 
+<<<<<<< HEAD
 /* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.533-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '208b4a716d337778106521DUwDVBkBDFxRAFQGBl1QUQEABVQL', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.533-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '208b4a716d337778106521DUwDVBkBDFxRAFQGBl1QUQEABVQL', 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.540-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20bcfdb11e273faf723475V01RUUwBCwMHAwtfVQcEAFANBVFR', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.540-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20bcfdb11e273faf723475V01RUUwBCwMHAwtfVQcEAFANBVFR', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+>>>>>>> beta
 /*
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra