ztxkui 3.5.18 → 3.5.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/DemoCom/PrintContainerDemo.js +28 -5
  2. package/dist/components/PrintContainer/PrintModal.js +5 -3
  3. package/dist/components/PrintContainer/print-container.js +9 -1
  4. package/dist/components/PrintContainer/utils.js +10 -8
  5. package/package.json +1 -1
package/dist/DemoCom/PrintContainerDemo.js CHANGED
@@ -27,9 +27,9 @@ import water from '../assets/img/water.png';
27
27
  import './print.scss';
28
28
  function request(options) {
29
29
  return axios({
30
- baseURL: options.baseURL ? options.baseURL : 'https://dz-prod.zmd.com.cn',
30
+ baseURL: options.baseURL ? options.baseURL : 'http://192.168.0.83:8000',
31
31
  url: options.url,
32
- headers: __assign({ 'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoi6ZmI5Lqa6ZuEIiwiZW1wX25hbWUiOiLpmYjkuprpm4QiLCJlbXBfbnVtYmVyIjoiMTAwMDIyNzQiLCJpbXRfaWQiOm51bGwsInJlYWxfbmFtZSI6IumZiOS6mumbhCIsImNsaWVudF90eXBlIjoid2ViIiwiZGF0YV9yb2xlX2lkIjoiMTQ5MTk1MjI0MDcyNjk0OTg5MCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjE0OTE5NTE4NTkzMjIxMDk5NTMsMTU0NjY4MDIzMjQzODIwMjM2OSIsInBvc3RfbmFtZSI6bnVsbCwic2NvcGUiOlsiYWxsIl0sImludGVydmlld19pZCI6bnVsbCwiZXhwIjoxNjYwODkxNjM4LCJvcmdfbmFtZSI6IuS4reaLk-S_oeaBr-enkeaKgC3noJTlj5Hpg6giLCJqdGkiOiIzZWJkZTk3NC05OTRkLTQ0MjctOGNhZS1kOWRkNTUzNTM1NTQiLCJtZW1iZXJfaWQiOjE0NjI0MzMwNTEyMDg3NjI5MTIsImNvbXBhbnlfaWQiOjEyOTU5MDg4NDI1MDIzNDg4MDEsInN5c3RlbV9pZCI6bnVsbCwiZGVwdF9uYW1lIjoi5rmW5YyX5Lit5ouTLea5luWMl-W3peeoi-mDqCIsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiXSwicm9sZV9uYW1lIjoiYWRtaW4sdXNlciIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE1MzY1MjI3NTgzNjMwMTMxMjIiLCJvcmdfaWQiOjE0NTc1Mjc3NjU5MTg1MTU1MzksIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6Iua1meWVhuS4reaLk-mbhuWbou-8iOa5luWMl--8ieaciemZkOWFrOWPuCIsImRlcHRfaWQiOiIxMjk1OTEwMDMxMzQ0MjYzMTY5IiwiaGFuZGxlX2hyX25hbWUiOm51bGwsImFjY291bnQiOiLpmYjkuprpm4QiLCJyZXN1bWVfaWQiOm51bGx9.74sooLelR-eVH1pWPNaXJm_GMa-So2kWo6kJTrLi5KU' }, options.headers),
32
+ headers: __assign({ 'Zmdms-Auth': 'bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQ1OTc4NTA1MzAyMDU2OTYyLDE0NjgwMzUzNTE2MjUyODU2MzQsMTU0MjA3NjMwODU3ODAyNTQ3NCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2NzAxNTk3NTQ4NDc2MDA2NiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTciLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY2MTQxNTk5NSwib3JnX25hbWUiOm51bGwsImp0aSI6IjYxZTc2ZjI3LTc1YTYtNDY1Yi05OWY2LWNmMjVhOWU4NTUyNyIsIm1lbWJlcl9pZCI6MSwiY29tcGFueV9pZCI6bnVsbCwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlcixhZG1pbixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjpudWxsfQ.bVscr9rQI4z7neBnNw7DCT2vj4F-3qf9rr_RKNptb6Q' }, options.headers),
33
33
  method: options.method,
34
34
  data: options.data,
35
35
  params: options.params,
@@ -80,7 +80,30 @@ var PrintContainerDemo = function () {
80
80
  setDataSource(dataSource1);
81
81
  }, 1000);
82
82
  }, []);
83
- return (React.createElement(PrintContainer, { isAddExportPage: true, loading: loading, request: request, deptId: "1527122794329313281", flowId: "scm_print_thd", fileId: "1551837561144905730", keywordList: keywordList, imgWaterBg: water, showPrintMessage: true,
83
+ function getBase64(blob) {
84
+ return new Promise(function (resolve, reject) {
85
+ var reader = new FileReader();
86
+ reader.readAsDataURL(blob);
87
+ reader.onload = function () { return resolve(reader.result); };
88
+ reader.onerror = function (error) { return reject(error); };
89
+ });
90
+ }
91
+ var _c = useState(''), base64Img = _c[0], setBase64Img = _c[1];
92
+ useEffect(function () {
93
+ var xhr = new XMLHttpRequest();
94
+ var token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0ZW5hbnRfaWQiOiIwMDAwMDAiLCJtZW1iZXJfdHlwZSI6MSwiaGFuZGxlX2hyX3Bob25lIjpudWxsLCJyZXN1bWVfZGF0ZSI6bnVsbCwidXNlcl9uYW1lIjoiY2hlbnl4IiwiZW1wX25hbWUiOm51bGwsImVtcF9udW1iZXIiOm51bGwsImltdF9pZCI6bnVsbCwicmVhbF9uYW1lIjoi6ZmI5Lqa6ZuEIiwiY2xpZW50X3R5cGUiOiJ3ZWIiLCJkYXRhX3JvbGVfaWQiOiIxMzQ1OTc4NTA1MzAyMDU2OTYyLDE0NjgwMzUzNTE2MjUyODU2MzQsMTU0MjA3NjMwODU3ODAyNTQ3NCIsImNsaWVudF9pZCI6InN3b3JkIiwidXNlcl90eXBlIjoid2ViIiwicm9sZV9pZCI6IjExMjM1OTg4MTY3Mzg2NzUyMDEsMTQ2NzAxNTk3NTQ4NDc2MDA2NiwxNDY4MDM0NDM3MTU3OTYxNzI5LDE0ODA4MjkzMzc5MzkxMzI0MTciLCJwb3N0X25hbWUiOm51bGwsInNjb3BlIjpbImFsbCJdLCJpbnRlcnZpZXdfaWQiOm51bGwsImV4cCI6MTY2MTQxNTk5NSwib3JnX25hbWUiOm51bGwsImp0aSI6IjYxZTc2ZjI3LTc1YTYtNDY1Yi05OWY2LWNmMjVhOWU4NTUyNyIsIm1lbWJlcl9pZCI6MSwiY29tcGFueV9pZCI6bnVsbCwic3lzdGVtX2lkIjpudWxsLCJkZXB0X25hbWUiOm51bGwsImF2YXRhciI6IiIsImRhdGFfcm9sZV9uYW1lIjoiYWRtaW4sYWRtaW4sYWRtaW4iLCJhdXRob3JpdGllcyI6WyJhZG1pbiIsInVzZXIiLCJhZG1pbmlzdHJhdG9yIl0sInJvbGVfbmFtZSI6ImFkbWluaXN0cmF0b3IsdXNlcixhZG1pbixhZG1pbiIsInJlc3VtZV90ZW1wbGF0ZSI6bnVsbCwibGljZW5zZSI6InBvd2VyZWQgYnkgem1kbXMiLCJwb3N0X2lkIjoiIiwidXNlcl9pZCI6IjE0MTI5NTM4MDQzMzM1NTU3MTQiLCJvcmdfaWQiOm51bGwsIm5pY2tfbmFtZSI6IumZiOS6mumbhCIsImNvbXBhbnlfbmFtZSI6bnVsbCwiZGVwdF9pZCI6IiIsImhhbmRsZV9ocl9uYW1lIjpudWxsLCJhY2NvdW50IjoiY2hlbnl4IiwicmVzdW1lX2lkIjpudWxsfQ.bVscr9rQI4z7neBnNw7DCT2vj4F-3qf9rr_RKNptb6Q';
95
+ xhr.open('GET', "http://192.168.0.83:8000/api/zmdms-resource/oss/endpoint/download-file/1559472632642387969?Zmdms-Auth=bearer " + token, true);
96
+ xhr.responseType = 'blob';
97
+ xhr.onload = function () {
98
+ if (xhr.status === 200 || xhr.status === 201) {
99
+ getBase64(xhr.response).then(function (res) {
100
+ setBase64Img(res);
101
+ });
102
+ }
103
+ };
104
+ xhr.send();
105
+ }, []);
106
+ return (React.createElement(PrintContainer, { isAddExportPage: true, loading: loading, request: request, deptId: "1527122794329313281", flowId: "scm_print_thd", fileId: "1551733945007517697", keywordList: keywordList, imgWaterBg: water, showPrintMessage: true,
84
107
  // onPrintBeforeCallback={() => {
85
108
  // setLoading(true);
86
109
  // return new Promise((resolve, reject) => {
@@ -108,7 +131,7 @@ var PrintContainerDemo = function () {
108
131
  React.createElement("div", null,
109
132
  React.createElement("div", { className: "html2canvas-container-page simple-print" },
110
133
  React.createElement("div", { className: "print-header" },
111
- React.createElement("img", { src: "https://dz-prod.zmd.com.cn/static/media/print_logo_2.1e599190.png", alt: "" }),
134
+ React.createElement("img", { src: base64Img, alt: "" }),
112
135
  React.createElement("h3", { className: "print-title" }, "\u63D0\u8D27\u5355"),
113
136
  React.createElement("div", { className: "right-info" },
114
137
  React.createElement("div", { className: "info-item" },
@@ -230,7 +253,7 @@ var PrintContainerDemo = function () {
230
253
  React.createElement("span", null, "chenyx"))))))),
231
254
  React.createElement("div", { className: "html2canvas-container-page simple-print" },
232
255
  React.createElement("div", { className: "print-header" },
233
- React.createElement("img", { src: "https://dz-prod.zmd.com.cn/static/media/print_logo_2.1e599190.png", alt: "" }),
256
+ React.createElement("img", { src: base64Img, alt: "" }),
234
257
  React.createElement("h3", { className: "print-title" }, "\u63D0\u8D27\u5355"),
235
258
  React.createElement("div", { className: "right-info" },
236
259
  React.createElement("div", { className: "info-item" },
package/dist/components/PrintContainer/PrintModal.js CHANGED
@@ -26,9 +26,11 @@ var PrintModal = function (_a) {
26
26
  if (!loading) {
27
27
  setTimeout(function () {
28
28
  var printDom = document.querySelectorAll('.html2canvas-container-page');
29
- setVhtml({
30
- __html: printDom[0].outerHTML,
31
- });
29
+ if (printDom && printDom.length > 0) {
30
+ setVhtml({
31
+ __html: printDom[0].outerHTML,
32
+ });
33
+ }
32
34
  }, 1000);
33
35
  }
34
36
  }, [loading]);
package/dist/components/PrintContainer/print-container.js CHANGED
@@ -430,13 +430,21 @@ var PrintContainer = function (_a) {
430
430
  for (var i = 0, len = styleTag.length; i < len; i++) {
431
431
  style += '<style>' + styleTag[i].innerText + '</style>';
432
432
  }
433
+ var strStyleCSS = '';
434
+ var styleSheetTag = window.document.querySelectorAll('link[rel="stylesheet"]');
435
+ for (var i = 0; i < styleSheetTag.length; i++) {
436
+ var item = styleSheetTag[i];
437
+ var href = item.getAttribute('href');
438
+ item.setAttribute('href', "http://192.168.0.83:18885" + href);
439
+ strStyleCSS += item.outerHTML;
440
+ }
433
441
  // 获取所有打印对象
434
442
  var printDom = document.querySelectorAll('.html2canvas-container-page');
435
443
  for (var i = 0; i < printDom.length; i++) {
436
444
  var item = printDom[i];
437
445
  var outerHTML = item.outerHTML;
438
446
  LODOP.NewPage();
439
- var strFormHtml = style + "<body>" + outerHTML + "</body>";
447
+ var strFormHtml = "" + strStyleCSS + style + "<body>" + outerHTML + "</body>";
440
448
  LODOP.ADD_PRINT_HTM(
441
449
  // `${value?.top}%`,
442
450
  // `${value?.left}%`,
package/dist/components/PrintContainer/utils.js CHANGED
@@ -186,10 +186,12 @@ function getLodop() {
186
186
  if (strAlertMessage) {
187
187
  strAlertMessage = strAlertMessage + strInstallOK;
188
188
  console.log('提示更新对应版本!', strAlertMessage);
189
- Modal.confirm({
190
- title: '提示更新对应版本',
191
- content: (React.createElement("div", { dangerouslySetInnerHTML: { __html: strAlertMessage } })),
192
- });
189
+ // Modal.confirm({
190
+ // title: '提示更新对应版本',
191
+ // content: (
192
+ // <div dangerouslySetInnerHTML={{ __html: strAlertMessage }}></div>
193
+ // ),
194
+ // });
193
195
  }
194
196
  }
195
197
  }
@@ -228,10 +230,10 @@ function getLodop() {
228
230
  if (LODOP.VERSION < '6.2.2.6') {
229
231
  var updateStr = (isWinIE64 ? strLodop64Update : strLodopUpdate) + strInstallOK;
230
232
  console.log('需要更新对应版本', updateStr);
231
- Modal.confirm({
232
- title: '需要更新对应版本',
233
- content: React.createElement("div", { dangerouslySetInnerHTML: { __html: updateStr } }),
234
- });
233
+ // Modal.confirm({
234
+ // title: '需要更新对应版本',
235
+ // content: <div dangerouslySetInnerHTML={{ __html: updateStr }}></div>,
236
+ // });
235
237
  }
236
238
  }
237
239
  //===如下空白位置适合调用统一功能(如注册语句、语言选择等):=======================
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ztxkui",
3
- "version": "3.5.18",
3
+ "version": "3.5.21",
4
4
  "private": false,
5
5
  "description": "React components library",
6
6
  "author": "zt-front-end",