Commit c5009cb8286ad373176560a1397844b84fce9fd4

Authored by 田强
1 parent b850d0bd

refactor: 同步代码

Showing 2 changed files with 39 additions and 17 deletions
@@ -53,6 +53,7 @@ @@ -53,6 +53,7 @@
53 "react-dom": "^16.14.0", 53 "react-dom": "^16.14.0",
54 "react-draggable": "^4.4.5", 54 "react-draggable": "^4.4.5",
55 "react-grid-layout": "^1.3.4", 55 "react-grid-layout": "^1.3.4",
  56 + "react-pdf-js": "^5.1.0",
56 "react-resizable": "^3.0.4", 57 "react-resizable": "^3.0.4",
57 "umi": "^3.5.35", 58 "umi": "^3.5.35",
58 "umi-request": "^1.4.0", 59 "umi-request": "^1.4.0",
@@ -6,11 +6,11 @@ specifiers: @@ -6,11 +6,11 @@ specifiers:
6 '@antv/x6': ^1.34.6 6 '@antv/x6': ^1.34.6
7 '@antv/x6-react-shape': ^1.6.0 7 '@antv/x6-react-shape': ^1.6.0
8 '@formulajs/formulajs': ^3.1.7 8 '@formulajs/formulajs': ^3.1.7
9 - '@qx/common': 0.2.12-beta.5 9 + '@qx/common': ^0.2.13
10 '@qx/form-design': ^0.0.35 10 '@qx/form-design': ^0.0.35
11 - '@qx/form-render': 0.0.51 11 + '@qx/form-render': ^0.0.60
12 '@qx/utils': ^0.0.37 12 '@qx/utils': ^0.0.37
13 - '@qx/view-render': 0.1.9-beta.19 13 + '@qx/view-render': 0.1.19
14 '@tinymce/tinymce-react': ^4.2.0 14 '@tinymce/tinymce-react': ^4.2.0
15 '@types/lodash': ^4.14.188 15 '@types/lodash': ^4.14.188
16 '@types/moment': ^2.13.0 16 '@types/moment': ^2.13.0
@@ -49,6 +49,7 @@ specifiers: @@ -49,6 +49,7 @@ specifiers:
49 react-dom: ^16.14.0 49 react-dom: ^16.14.0
50 react-draggable: ^4.4.5 50 react-draggable: ^4.4.5
51 react-grid-layout: ^1.3.4 51 react-grid-layout: ^1.3.4
  52 + react-pdf-js: ^5.1.0
52 react-resizable: ^3.0.4 53 react-resizable: ^3.0.4
53 typescript: ^4.1.2 54 typescript: ^4.1.2
54 umi: ^3.5.35 55 umi: ^3.5.35
@@ -62,11 +63,11 @@ dependencies: @@ -62,11 +63,11 @@ dependencies:
62 '@antv/x6': registry.npmmirror.com/@antv/x6/1.34.6 63 '@antv/x6': registry.npmmirror.com/@antv/x6/1.34.6
63 '@antv/x6-react-shape': registry.npmmirror.com/@antv/x6-react-shape/1.6.3_ysc4oecrqgyf3w2kwyquivct2q 64 '@antv/x6-react-shape': registry.npmmirror.com/@antv/x6-react-shape/1.6.3_ysc4oecrqgyf3w2kwyquivct2q
64 '@formulajs/formulajs': registry.npmmirror.com/@formulajs/formulajs/3.1.7 65 '@formulajs/formulajs': registry.npmmirror.com/@formulajs/formulajs/3.1.7
65 - '@qx/common': 0.2.12-beta.5_vuxv5lywvptasozi6gtxezsvhe  
66 - '@qx/form-design': 0.0.35_pfxj2qwiqsspy3eqiv6qumulvq  
67 - '@qx/form-render': 0.0.51_bp7d5ikdj36vzltcjkgntncamq 66 + '@qx/common': 0.2.13_vuxv5lywvptasozi6gtxezsvhe
  67 + '@qx/form-design': 0.0.35_4a5agioxd64yyhkl2al6dx7j3e
  68 + '@qx/form-render': 0.0.60_bp7d5ikdj36vzltcjkgntncamq
68 '@qx/utils': 0.0.37_syb5nydo34zio3bjbraubobgim 69 '@qx/utils': 0.0.37_syb5nydo34zio3bjbraubobgim
69 - '@qx/view-render': 0.1.9-beta.19_ungio2osuo3zzkvv3eeqxcshym 70 + '@qx/view-render': 0.1.19_b4uzj5t2htlqmmxgqvgthr5rmi
70 '@tinymce/tinymce-react': registry.npmmirror.com/@tinymce/tinymce-react/4.2.0_wcqkhtmu7mswc6yz4uyexck3ty 71 '@tinymce/tinymce-react': registry.npmmirror.com/@tinymce/tinymce-react/4.2.0_wcqkhtmu7mswc6yz4uyexck3ty
71 ahooks: registry.npmmirror.com/ahooks/3.7.2_react@16.14.0 72 ahooks: registry.npmmirror.com/ahooks/3.7.2_react@16.14.0
72 antd: registry.npmmirror.com/antd/4.24.1_wcqkhtmu7mswc6yz4uyexck3ty 73 antd: registry.npmmirror.com/antd/4.24.1_wcqkhtmu7mswc6yz4uyexck3ty
@@ -87,6 +88,7 @@ dependencies: @@ -87,6 +88,7 @@ dependencies:
87 react-dom: registry.npmmirror.com/react-dom/16.14.0_react@16.14.0 88 react-dom: registry.npmmirror.com/react-dom/16.14.0_react@16.14.0
88 react-draggable: registry.npmmirror.com/react-draggable/4.4.5_wcqkhtmu7mswc6yz4uyexck3ty 89 react-draggable: registry.npmmirror.com/react-draggable/4.4.5_wcqkhtmu7mswc6yz4uyexck3ty
89 react-grid-layout: registry.npmmirror.com/react-grid-layout/1.3.4_wcqkhtmu7mswc6yz4uyexck3ty 90 react-grid-layout: registry.npmmirror.com/react-grid-layout/1.3.4_wcqkhtmu7mswc6yz4uyexck3ty
  91 + react-pdf-js: registry.npmmirror.com/react-pdf-js/5.1.0_react@16.14.0
90 react-resizable: registry.npmmirror.com/react-resizable/3.0.4_wcqkhtmu7mswc6yz4uyexck3ty 92 react-resizable: registry.npmmirror.com/react-resizable/3.0.4_wcqkhtmu7mswc6yz4uyexck3ty
91 umi: registry.npmmirror.com/umi/3.5.35 93 umi: registry.npmmirror.com/umi/3.5.35
92 umi-request: registry.npmmirror.com/umi-request/1.4.0 94 umi-request: registry.npmmirror.com/umi-request/1.4.0
@@ -116,8 +118,8 @@ devDependencies: @@ -116,8 +118,8 @@ devDependencies:
116 118
117 packages: 119 packages:
118 120
119 - /@qx/common/0.2.12-beta.5_vuxv5lywvptasozi6gtxezsvhe:  
120 - resolution: {integrity: sha1-FH/WdPwnh+PDdyjiRISYrc/Uy6k=, tarball: '@qx/common/download/@qx/common-0.2.12-beta.5.tgz'} 121 + /@qx/common/0.2.13_vuxv5lywvptasozi6gtxezsvhe:
  122 + resolution: {integrity: sha1-DAXTh/qpeUjBupOSLOGSlZgv9AM=, tarball: '@qx/common/download/@qx/common-0.2.13.tgz'}
121 peerDependencies: 123 peerDependencies:
122 '@ant-design/icons': ^4.2.2 124 '@ant-design/icons': ^4.2.2
123 antd: 4.x 125 antd: 4.x
@@ -130,7 +132,7 @@ packages: @@ -130,7 +132,7 @@ packages:
130 react: registry.npmmirror.com/react/16.14.0 132 react: registry.npmmirror.com/react/16.14.0
131 dev: false 133 dev: false
132 134
133 - /@qx/form-design/0.0.35_pfxj2qwiqsspy3eqiv6qumulvq: 135 + /@qx/form-design/0.0.35_4a5agioxd64yyhkl2al6dx7j3e:
134 resolution: {integrity: sha1-zkfXh3AWxIUvzA/lFDLcHfIF9JI=, tarball: '@qx/form-design/download/@qx/form-design-0.0.35.tgz'} 136 resolution: {integrity: sha1-zkfXh3AWxIUvzA/lFDLcHfIF9JI=, tarball: '@qx/form-design/download/@qx/form-design-0.0.35.tgz'}
135 peerDependencies: 137 peerDependencies:
136 '@ant-design/icons': ^4.2.2 138 '@ant-design/icons': ^4.2.2
@@ -139,7 +141,7 @@ packages: @@ -139,7 +141,7 @@ packages:
139 react: '>=16.8.0' 141 react: '>=16.8.0'
140 dependencies: 142 dependencies:
141 '@ant-design/icons': registry.npmmirror.com/@ant-design/icons/4.7.0_wcqkhtmu7mswc6yz4uyexck3ty 143 '@ant-design/icons': registry.npmmirror.com/@ant-design/icons/4.7.0_wcqkhtmu7mswc6yz4uyexck3ty
142 - '@qx/form-render': 0.0.51_bp7d5ikdj36vzltcjkgntncamq 144 + '@qx/form-render': 0.0.60_bp7d5ikdj36vzltcjkgntncamq
143 antd: registry.npmmirror.com/antd/4.24.1_wcqkhtmu7mswc6yz4uyexck3ty 145 antd: registry.npmmirror.com/antd/4.24.1_wcqkhtmu7mswc6yz4uyexck3ty
144 clone: registry.npmmirror.com/clone/2.1.2 146 clone: registry.npmmirror.com/clone/2.1.2
145 nanoid: registry.npmmirror.com/nanoid/3.3.4 147 nanoid: registry.npmmirror.com/nanoid/3.3.4
@@ -154,8 +156,8 @@ packages: @@ -154,8 +156,8 @@ packages:
154 - react-dom 156 - react-dom
155 dev: false 157 dev: false
156 158
157 - /@qx/form-render/0.0.51_bp7d5ikdj36vzltcjkgntncamq:  
158 - resolution: {integrity: sha1-dSMmKLNqWzNTWI3KT5t3qNrHS2c=, tarball: '@qx/form-render/download/@qx/form-render-0.0.51.tgz'} 159 + /@qx/form-render/0.0.60_bp7d5ikdj36vzltcjkgntncamq:
  160 + resolution: {integrity: sha1-0ftaJFP46soj3RCc6MG6xJrmT8c=, tarball: '@qx/form-render/download/@qx/form-render-0.0.60.tgz'}
159 peerDependencies: 161 peerDependencies:
160 antd: 4.x 162 antd: 4.x
161 react: '>=16.8.0' 163 react: '>=16.8.0'
@@ -195,18 +197,18 @@ packages: @@ -195,18 +197,18 @@ packages:
195 react: registry.npmmirror.com/react/16.14.0 197 react: registry.npmmirror.com/react/16.14.0
196 dev: false 198 dev: false
197 199
198 - /@qx/view-render/0.1.9-beta.19_ungio2osuo3zzkvv3eeqxcshym:  
199 - resolution: {integrity: sha1-oHlJQvPkQ2pxae+R4iYe7H+SIoo=, tarball: '@qx/view-render/download/@qx/view-render-0.1.9-beta.19.tgz'} 200 + /@qx/view-render/0.1.19_b4uzj5t2htlqmmxgqvgthr5rmi:
  201 + resolution: {integrity: sha1-jq+8WAA1QUjsEEi9i6VCRIyeSPI=, tarball: '@qx/view-render/download/@qx/view-render-0.1.19.tgz'}
200 peerDependencies: 202 peerDependencies:
201 '@ant-design/icons': ^4.2.2 203 '@ant-design/icons': ^4.2.2
202 '@qx/form-render': ^0.0.28 204 '@qx/form-render': ^0.0.28
203 - '@qx/utils': 0.0.37-beta.1 205 + '@qx/utils': 0.0.37
204 antd: 4.x 206 antd: 4.x
205 lodash: ^4.17.21 207 lodash: ^4.17.21
206 react: '>=16.8.0' 208 react: '>=16.8.0'
207 dependencies: 209 dependencies:
208 '@ant-design/icons': registry.npmmirror.com/@ant-design/icons/4.7.0_wcqkhtmu7mswc6yz4uyexck3ty 210 '@ant-design/icons': registry.npmmirror.com/@ant-design/icons/4.7.0_wcqkhtmu7mswc6yz4uyexck3ty
209 - '@qx/form-render': 0.0.51_bp7d5ikdj36vzltcjkgntncamq 211 + '@qx/form-render': 0.0.60_bp7d5ikdj36vzltcjkgntncamq
210 '@qx/icon-btn': 0.0.1 212 '@qx/icon-btn': 0.0.1
211 '@qx/utils': 0.0.37_syb5nydo34zio3bjbraubobgim 213 '@qx/utils': 0.0.37_syb5nydo34zio3bjbraubobgim
212 antd: registry.npmmirror.com/antd/4.24.1_wcqkhtmu7mswc6yz4uyexck3ty 214 antd: registry.npmmirror.com/antd/4.24.1_wcqkhtmu7mswc6yz4uyexck3ty
@@ -801,6 +803,12 @@ packages: @@ -801,6 +803,12 @@ packages:
801 name: '@bloomberg/record-tuple-polyfill' 803 name: '@bloomberg/record-tuple-polyfill'
802 version: 0.0.3 804 version: 0.0.3
803 805
  806 + registry.npmmirror.com/@bundled-es-modules/pdfjs-dist/2.1.266-rc:
  807 + resolution: {integrity: sha512-idli/i9GA7hUW8uRIs2Y48m5QHKRv3PaVxlM1VEoOuzWoF2qLdtOepOpIy3BTblakDNt2f/gINPN7X/v9DBKoQ==, registry: http://registry.npm.qgutech.com/, tarball: https://registry.npmmirror.com/@bundled-es-modules/pdfjs-dist/-/pdfjs-dist-2.1.266-rc.tgz}
  808 + name: '@bundled-es-modules/pdfjs-dist'
  809 + version: 2.1.266-rc
  810 + dev: false
  811 +
804 registry.npmmirror.com/@cnakazawa/watch/1.0.4: 812 registry.npmmirror.com/@cnakazawa/watch/1.0.4:
805 resolution: {integrity: sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==, registry: http://registry.npm.qgutech.com/, tarball: https://registry.npmmirror.com/@cnakazawa/watch/-/watch-1.0.4.tgz} 813 resolution: {integrity: sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==, registry: http://registry.npm.qgutech.com/, tarball: https://registry.npmmirror.com/@cnakazawa/watch/-/watch-1.0.4.tgz}
806 name: '@cnakazawa/watch' 814 name: '@cnakazawa/watch'
@@ -9290,6 +9298,19 @@ packages: @@ -9290,6 +9298,19 @@ packages:
9290 react-tween-state: registry.npmmirror.com/react-tween-state/0.1.5 9298 react-tween-state: registry.npmmirror.com/react-tween-state/0.1.5
9291 dev: true 9299 dev: true
9292 9300
  9301 + registry.npmmirror.com/react-pdf-js/5.1.0_react@16.14.0:
  9302 + resolution: {integrity: sha512-l/norbM4BocUJcD0o46b5U4XWTZI1FN1+wfhosPKGy0cJ3T7Ck7GGfr3KXsH5ljc8lyifZPMAm6Rvsbe8OzBbQ==, registry: http://registry.npm.qgutech.com/, tarball: https://registry.npmmirror.com/react-pdf-js/-/react-pdf-js-5.1.0.tgz}
  9303 + id: registry.npmmirror.com/react-pdf-js/5.1.0
  9304 + name: react-pdf-js
  9305 + version: 5.1.0
  9306 + deprecated: Please move to our namespaced package at @mikecousins/react-pdf
  9307 + peerDependencies:
  9308 + react: '>=16'
  9309 + dependencies:
  9310 + '@bundled-es-modules/pdfjs-dist': registry.npmmirror.com/@bundled-es-modules/pdfjs-dist/2.1.266-rc
  9311 + react: registry.npmmirror.com/react/16.14.0
  9312 + dev: false
  9313 +
9293 registry.npmmirror.com/react-redux/7.2.9_wcqkhtmu7mswc6yz4uyexck3ty: 9314 registry.npmmirror.com/react-redux/7.2.9_wcqkhtmu7mswc6yz4uyexck3ty:
9294 resolution: {integrity: sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==, registry: http://registry.npm.qgutech.com/, tarball: https://registry.npmmirror.com/react-redux/-/react-redux-7.2.9.tgz} 9315 resolution: {integrity: sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==, registry: http://registry.npm.qgutech.com/, tarball: https://registry.npmmirror.com/react-redux/-/react-redux-7.2.9.tgz}
9295 id: registry.npmmirror.com/react-redux/7.2.9 9316 id: registry.npmmirror.com/react-redux/7.2.9