Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -6331,7 +6331,11 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                 "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                 "onresize": function () { }
             }, {
-                closecallback: function () { }
+                closecallback: function () { },
+                isdrag: false,
+                isstretching: false,
+                isenlarge: false,
+                isnarrow: false
             }, { "style": { "height": "36px" } }).form; //创建窗体
             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: '201afcf3981233b3f805c2BE9RVkgDAwoFBFFXUVZRWVEHBwtT', 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: '201afcf3981233b3f805c2BE9RVkgDAwoFBFFXUVZRWVEHBwtT', 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: '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 */
 
 			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: '207ce9d70107a4ef000b06Ak1SDEoHCgMCVFQHBwIJCAJbVlQA', 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: '207ce9d70107a4ef000b06Ak1SDEoHCgMCVFQHBwIJCAJbVlQA', 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: '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 */
 /*
 	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: '207ce9d70107a4ef000b06Ak1SDEoHCgMCVFQHBwIJCAJbVlQA', 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: '207ce9d70107a4ef000b06Ak1SDEoHCgMCVFQHBwIJCAJbVlQA', 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: '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 */
 /*
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra