Prechádzať zdrojové kódy

流程报表预览界面取消blob,直接预览源文件,blob违反CSP。

yangzhijie1488@163.com 3 rokov pred
rodič
commit
0670d75d65

+ 1 - 2
package.json

@@ -1,6 +1,6 @@
 {
   "name": "pc-component-v3",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "description": "",
   "main": "dist/pc-component-v3.js",
   "scripts": {
@@ -40,7 +40,6 @@
     "webpack-merge": "^5.8.0"
   },
   "peerDependencies": {
-    "amis": "^1.9.0",
     "v-tooltip": "^4.0.0-beta.17",
     "vue": "^3.2.31",
     "vue-i18n": "^9.1.9",

+ 3 - 0
packages/index.js

@@ -1,3 +1,6 @@
+// eslint-disable-next-line no-undef
+__webpack_nonce__ = '*NONCE_TOKEN*';
+
 import * as components from './components';
 
 import langZhCn from './i18n/zh-CN.js';

+ 8 - 36
packages/process/src/ProcessReportResultPreview.vue

@@ -198,47 +198,19 @@ export default {
 
   methods: {
     /**
-             * 根据id和url获取文件,请求头增加token
-             * @author GuoZhiBo 20200507
-             * @param {Object} url
-             * @param {Object} id
-             */
+     * 根据id和url获取文件,请求头增加token
+     * @author GuoZhiBo 20200507
+     * @param {Object} url
+     * @param {Object} id
+     */
     getReport: function (url, id) {
       var _self = this;
       var account = localStorage.getItem('account');
       var token = localStorage.getItem('token');
       let absoluteUrl = null;
-      if (url.indexOf('ureport') > 0) {
-        absoluteUrl = Common.getRootPath() + url;
-
-        _self.$nextTick(function () {
-          var iframe = document.querySelector(id);
-          iframe.src = absoluteUrl;
-        });
-      } else {
-        absoluteUrl = Common.getFileServerUrl() + 'Files/' + account + '/GeneratedReport/' + url;
-
-        _self.$nextTick(function () {
-          var iframe = document.querySelector(id);
-          var headers = [['token', token, 'account', account]];
-          var xhr = new XMLHttpRequest();
-          xhr.open('GET', absoluteUrl);
-          xhr.responseType = 'blob';
-          headers.forEach(function (header) {
-            xhr.setRequestHeader(header[0], header[1]);
-            xhr.setRequestHeader(header[2], header[3]);
-          });
-          xhr.onload = function () {// 请求完成处理函数
-            if (this.status === 200) {
-              //var blob = this.response;// 获取返回值
-              iframe.src = window.URL.createObjectURL(this.response);
-            }
-          };
-          xhr.send();
-        });
-      }
-
-
+      
+      absoluteUrl = Common.getFileServerUrl() + 'Files/' + account + '/GeneratedReport/' + url;
+      return absoluteUrl;
     },
     /**
              * 下载文件

+ 12 - 12
webpack.lib.js

@@ -16,22 +16,22 @@ module.exports = WebpackMerge.merge(baseConfig,{
     path: path.resolve(__dirname, './dist'),
     publicPath: '/dist/',
     filename: 'pc-component-v3.js',
-    library: {
-      type: 'module',
-    },
-    //library: 'pc-component-v3',
-    //libraryTarget: 'umd',
-    // 「devtool 中模块」的文件名模板(用于冲突)
-    //umdNamedDefine: false,
+    // library: {
+    //   type: 'module',
+    // },
+    library: 'pc-component-v3',
+    libraryTarget: 'umd',
+    //「devtool 中模块」的文件名模板(用于冲突)
+    umdNamedDefine: false,
   },
 
-  experiments: {
-    outputModule: true,
-  },
+  // experiments: {
+  //   outputModule: true,
+  // },
 
   
   optimization: {
-    minimize: true,    // 压缩 bundle
+    minimize: false,    // 压缩 bundle
     minimizer: [
       new TerserPlugin({
         parallel: true,
@@ -47,7 +47,7 @@ module.exports = WebpackMerge.merge(baseConfig,{
     ],
   },
   
-  //devtool: 'source-map',
+  devtool: 'source-map',
 
   plugins: (module.exports.plugins || []).concat([    
     // CSS 提取