Skip to content

Commit

Permalink
change
Browse files Browse the repository at this point in the history
  • Loading branch information
ZengXiangJun committed Jun 6, 2021
1 parent 5fa15d5 commit aed1bb4
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 12 deletions.
12 changes: 9 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "xlsx-parser",
"version": "0.0.11",
"configuratorVersion": "0.0.11",
"version": "0.0.12",
"configuratorVersion": "0.0.12",
"description": "解析生成Excel",
"keywords": [],
"author": {
Expand Down Expand Up @@ -51,6 +51,6 @@
"webpack": "^3.10.0"
},
"dependencies": {
"xlsx": "^0.16.8"
"xlsx": "^0.17.0"
}
}
}
2 changes: 1 addition & 1 deletion src/configurator/configurator.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
-->

<!-- Common widget configurator SDK -->
<script type="text/javascript" src="//assets.wuyuan.io/enhancer/workbench-assets/1.5.0/widget-configurator-sdk.js"></script>
<script type="text/javascript" src="//assets.wuyuan.io/enhancer/workbench-assets/1.7.0/widget-configurator-sdk.js"></script>
<!-- 没有网络的时候可以用本地资源。如果启用请注释掉上面一行。发布时一定不要使用本地资源。
<script type="text/javascript" src="/preview/lib/js/widget-configurator-sdk.js"></script>
-->
Expand Down
29 changes: 25 additions & 4 deletions src/widget/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,19 +225,40 @@ Enhancer.registerWidget({
var that = this;
that.excelName = f.name;
var reader = new FileReader();
var rABS = typeof FileReader !== 'undefined' && FileReader.prototype && FileReader.prototype.readAsBinaryString;
reader.onload = function (e) {
that.workbook = that.XLSX.read(new Uint8Array(e.target.result), {
type: 'array',
var d = e.target.result;
var arr;
var readtype = rABS ? 'binary' : 'base64';

function fixdata(data) {
var o = "", l = 0, w = 10240;
for(; l<data.byteLength/w; ++l)
o+=String.fromCharCode.apply(null,new Uint8Array(data.slice(l*w,l*w+w)));
o+=String.fromCharCode.apply(null, new Uint8Array(data.slice(o.length)));
return o;
}

if(!rABS) {
arr = fixdata(d);
d = btoa(arr);
}
that.workbook = that.XLSX.read(d, {
type: readtype,
cellFormula: false,
cellHTML: true,
cellText: false,
// cellText: false,
cellStyles: true,
cellDates: true,
dateNF: 'h:mm AM/PM',
sheetStubs: true
});
that.__initSheet();
}
reader.readAsArrayBuffer(f);
if (rABS) {
reader.readAsBinaryString(f);
} else {
reader.readAsArrayBuffer(f);
};
}
});
7 changes: 7 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@ const BUILD_PATH = path.resolve(__dirname, 'build');
const prod = process.env.NODE_ENV === "production";
const package = require('./package.json');

try {
fs.accessSync('./preview');
} catch (e) {
console.log('检测到组件根目录下没有 preview 目录, 请执行 ewtool preview 来重新生成 preview 目录')
process.exit(0)
}


let mobileEnv = '';
let ret = [];
Expand Down

0 comments on commit aed1bb4

Please sign in to comment.