Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -5886,7 +5886,11 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                     "style": { "width": "100%", "height": "100%", "overflow": 'hidden' , "display":"none"},
                     "onresize": function () { }
                 }, {
-                    closecallback: function () { },"isnarrow": false, "isenlarge": false
+                    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;

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: '20d7a50001a19066d91119URlWAB4ACghRCQsBDgICAFUDCA9V', 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: '20d7a50001a19066d91119URlWAB4ACghRCQsBDgICAFUDCA9V', 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: '20cad1001f563f2aeafb85Vk9TBB4AC1RUVANRBVdVU1VUWgBa', 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: '20cad1001f563f2aeafb85Vk9TBB4AC1RUVANRBVdVU1VUWgBa', 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: '204bd8966afa56384d19d5AUxTDRcGDFVQBAACBw0DAlBaUQRS', 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: '204bd8966afa56384d19d5AUxTDRcGDFVQBAACBw0DAlBaUQRS', 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: '2093818cf94c717db37810DB0PBBZTXFoAVwIAVAYDUg8JAlRa', 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: '2093818cf94c717db37810DB0PBBZTXFoAVwIAVAYDUg8JAlRa', 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: '204bd8966afa56384d19d5AUxTDRcGDFVQBAACBw0DAlBaUQRS', 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: '204bd8966afa56384d19d5AUxTDRcGDFVQBAACBw0DAlBaUQRS', 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: '2093818cf94c717db37810DB0PBBZTXFoAVwIAVAYDUg8JAlRa', 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: '2093818cf94c717db37810DB0PBBZTXFoAVwIAVAYDUg8JAlRa', 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