create-ssnode-cli 0.2.2 → 0.2.3

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 (203) hide show
  1. package/package.json +1 -1
  2. package/templates/backend/config/config.develop.yaml +6 -4
  3. package/templates/backend/data/template.dev.sqlite-shm +0 -0
  4. package/templates/backend/data/template.dev.sqlite-wal +0 -0
  5. package/templates/backend/dist/app.module.js +85 -1
  6. package/templates/backend/dist/app.module.js.map +1 -1
  7. package/templates/backend/dist/common/all-exceptions.filter.js +47 -1
  8. package/templates/backend/dist/common/all-exceptions.filter.js.map +1 -1
  9. package/templates/backend/dist/common/app-crypto.js +119 -1
  10. package/templates/backend/dist/common/app-crypto.js.map +1 -1
  11. package/templates/backend/dist/common/app-sign.guard.js +72 -1
  12. package/templates/backend/dist/common/app-sign.guard.js.map +1 -1
  13. package/templates/backend/dist/common/app-sign.module.js +20 -1
  14. package/templates/backend/dist/common/app-sign.module.js.map +1 -1
  15. package/templates/backend/dist/common/response.js +23 -1
  16. package/templates/backend/dist/common/response.js.map +1 -1
  17. package/templates/backend/dist/common/throttle.guard.js +42 -1
  18. package/templates/backend/dist/common/throttle.guard.js.map +1 -1
  19. package/templates/backend/dist/common/transform.interceptor.js +28 -1
  20. package/templates/backend/dist/common/transform.interceptor.js.map +1 -1
  21. package/templates/backend/dist/config/config.interface.js +2 -1
  22. package/templates/backend/dist/config/config.interface.js.map +1 -1
  23. package/templates/backend/dist/config/configuration.js +91 -1
  24. package/templates/backend/dist/config/configuration.js.map +1 -1
  25. package/templates/backend/dist/database/migrations/0001-init.migration.js +69 -1
  26. package/templates/backend/dist/database/migrations/0001-init.migration.js.map +1 -1
  27. package/templates/backend/dist/database/sqlite.config.js +32 -1
  28. package/templates/backend/dist/database/sqlite.config.js.map +1 -1
  29. package/templates/backend/dist/entities/audit-log.entity.js +49 -1
  30. package/templates/backend/dist/entities/audit-log.entity.js.map +1 -1
  31. package/templates/backend/dist/entities/image.entity.js +50 -1
  32. package/templates/backend/dist/entities/image.entity.js.map +1 -1
  33. package/templates/backend/dist/entities/page-data.entity.js +60 -1
  34. package/templates/backend/dist/entities/page-data.entity.js.map +1 -1
  35. package/templates/backend/dist/entities/screen-config.entity.js +74 -1
  36. package/templates/backend/dist/entities/screen-config.entity.js.map +1 -1
  37. package/templates/backend/dist/entities/user.entity.js +59 -1
  38. package/templates/backend/dist/entities/user.entity.js.map +1 -1
  39. package/templates/backend/dist/main.js +56 -1
  40. package/templates/backend/dist/main.js.map +1 -1
  41. package/templates/backend/dist/modules/audit/audit.controller.js +51 -1
  42. package/templates/backend/dist/modules/audit/audit.controller.js.map +1 -1
  43. package/templates/backend/dist/modules/audit/audit.module.js +25 -1
  44. package/templates/backend/dist/modules/audit/audit.module.js.map +1 -1
  45. package/templates/backend/dist/modules/audit/audit.service.js +57 -1
  46. package/templates/backend/dist/modules/audit/audit.service.js.map +1 -1
  47. package/templates/backend/dist/modules/auth/auth.controller.js +74 -1
  48. package/templates/backend/dist/modules/auth/auth.controller.js.map +1 -1
  49. package/templates/backend/dist/modules/auth/auth.module.js +45 -1
  50. package/templates/backend/dist/modules/auth/auth.module.js.map +1 -1
  51. package/templates/backend/dist/modules/auth/auth.service.js +151 -1
  52. package/templates/backend/dist/modules/auth/auth.service.js.map +1 -1
  53. package/templates/backend/dist/modules/auth/captcha.service.js +56 -1
  54. package/templates/backend/dist/modules/auth/captcha.service.js.map +1 -1
  55. package/templates/backend/dist/modules/auth/jwt-auth.guard.js +17 -1
  56. package/templates/backend/dist/modules/auth/jwt-auth.guard.js.map +1 -1
  57. package/templates/backend/dist/modules/auth/jwt.strategy.js +37 -1
  58. package/templates/backend/dist/modules/auth/jwt.strategy.js.map +1 -1
  59. package/templates/backend/dist/modules/image/image.controller.js +75 -1
  60. package/templates/backend/dist/modules/image/image.controller.js.map +1 -1
  61. package/templates/backend/dist/modules/image/image.module.js +26 -1
  62. package/templates/backend/dist/modules/image/image.module.js.map +1 -1
  63. package/templates/backend/dist/modules/image/image.service.js +94 -1
  64. package/templates/backend/dist/modules/image/image.service.js.map +1 -1
  65. package/templates/backend/dist/modules/ops/backend-version.probe.js +58 -1
  66. package/templates/backend/dist/modules/ops/backend-version.probe.js.map +1 -1
  67. package/templates/backend/dist/modules/ops/ops-probe.interface.js +4 -1
  68. package/templates/backend/dist/modules/ops/ops-probe.interface.js.map +1 -1
  69. package/templates/backend/dist/modules/ops/ops.controller.js +52 -1
  70. package/templates/backend/dist/modules/ops/ops.controller.js.map +1 -1
  71. package/templates/backend/dist/modules/ops/ops.module.js +39 -1
  72. package/templates/backend/dist/modules/ops/ops.module.js.map +1 -1
  73. package/templates/backend/dist/modules/ops/ops.service.js +72 -1
  74. package/templates/backend/dist/modules/ops/ops.service.js.map +1 -1
  75. package/templates/backend/dist/modules/ops/sqlite-backup-list.probe.js +105 -1
  76. package/templates/backend/dist/modules/ops/sqlite-backup-list.probe.js.map +1 -1
  77. package/templates/backend/dist/modules/ops/sqlite-backup-log.probe.js +67 -1
  78. package/templates/backend/dist/modules/ops/sqlite-backup-log.probe.js.map +1 -1
  79. package/templates/backend/dist/modules/ops/sqlite-backup.probe.js +115 -1
  80. package/templates/backend/dist/modules/ops/sqlite-backup.probe.js.map +1 -1
  81. package/templates/backend/dist/modules/ops/version.controller.js +52 -1
  82. package/templates/backend/dist/modules/ops/version.controller.js.map +1 -1
  83. package/templates/backend/dist/modules/page-data/page-data.controller.js +109 -1
  84. package/templates/backend/dist/modules/page-data/page-data.controller.js.map +1 -1
  85. package/templates/backend/dist/modules/page-data/page-data.module.js +25 -1
  86. package/templates/backend/dist/modules/page-data/page-data.module.js.map +1 -1
  87. package/templates/backend/dist/modules/page-data/page-data.service.js +69 -1
  88. package/templates/backend/dist/modules/page-data/page-data.service.js.map +1 -1
  89. package/templates/backend/dist/modules/screen-config/screen-config.controller.js +61 -1
  90. package/templates/backend/dist/modules/screen-config/screen-config.controller.js.map +1 -1
  91. package/templates/backend/dist/modules/screen-config/screen-config.module.js +25 -1
  92. package/templates/backend/dist/modules/screen-config/screen-config.module.js.map +1 -1
  93. package/templates/backend/dist/modules/screen-config/screen-config.service.js +41 -1
  94. package/templates/backend/dist/modules/screen-config/screen-config.service.js.map +1 -1
  95. package/templates/backend/dist/modules/upload/upload.controller.js +65 -1
  96. package/templates/backend/dist/modules/upload/upload.controller.js.map +1 -1
  97. package/templates/backend/dist/modules/upload/upload.module.js +22 -1
  98. package/templates/backend/dist/modules/upload/upload.module.js.map +1 -1
  99. package/templates/backend/dist/modules/upload/upload.service.js +75 -1
  100. package/templates/backend/dist/modules/upload/upload.service.js.map +1 -1
  101. package/templates/backend/dist/modules/user/user.controller.js +149 -1
  102. package/templates/backend/dist/modules/user/user.controller.js.map +1 -1
  103. package/templates/backend/dist/modules/user/user.module.js +26 -1
  104. package/templates/backend/dist/modules/user/user.module.js.map +1 -1
  105. package/templates/backend/dist/modules/user/user.service.js +249 -1
  106. package/templates/backend/dist/modules/user/user.service.js.map +1 -1
  107. package/templates/backend/dist/modules/websocket/websocket.gateway.js +33 -1
  108. package/templates/backend/dist/modules/websocket/websocket.gateway.js.map +1 -1
  109. package/templates/backend/dist/modules/websocket/websocket.module.js +19 -1
  110. package/templates/backend/dist/modules/websocket/websocket.module.js.map +1 -1
  111. package/templates/backend/dist/tsconfig.build.tsbuildinfo +1 -1
  112. package/templates/backend/package.json +1 -1
  113. package/templates/backend/src/modules/auth/captcha.service.ts +6 -5
  114. package/templates/web/dist/assets/{AuthLayout-bcf98efb.js → AuthLayout-f1e8d110.js} +1 -1
  115. package/templates/web/dist/assets/{AuthLayout-legacy-6e7a8ae1.js → AuthLayout-legacy-f871651c.js} +1 -1
  116. package/templates/web/dist/assets/{Background-eb77ef54.js → Background-955d549f.js} +1 -1
  117. package/templates/web/dist/assets/{Background-legacy-50457007.js → Background-legacy-fbad6e76.js} +1 -1
  118. package/templates/web/dist/assets/{Screen-318c3fc2.js → Screen-b14b0813.js} +1 -1
  119. package/templates/web/dist/assets/{Screen-legacy-af123b0f.js → Screen-legacy-154c8ee6.js} +1 -1
  120. package/templates/web/dist/assets/{api-beff4a3e.js → api-4d80e36e.js} +1 -1
  121. package/templates/web/dist/assets/{api-legacy-9fe41d4b.js → api-legacy-054fd569.js} +1 -1
  122. package/templates/web/dist/assets/{component-89b5253e.js → component-9d9f33fa.js} +1 -1
  123. package/templates/web/dist/assets/{component-legacy-8c5a28ef.js → component-legacy-4445386a.js} +1 -1
  124. package/templates/web/dist/assets/{index-a79e448b.js → index-107a0e80.js} +1 -1
  125. package/templates/web/dist/assets/{index-b60badf7.js → index-5afb70be.js} +1 -1
  126. package/templates/web/dist/assets/{index-cba19800.js → index-7b807c2d.js} +1 -1
  127. package/templates/web/dist/assets/{index-86214b19.js → index-ab64cd34.js} +1 -1
  128. package/templates/web/dist/assets/{index-7277cbfb.js → index-d8bfffb3.js} +1 -1
  129. package/templates/web/dist/assets/{index-d70eb540.js → index-db169639.js} +1 -1
  130. package/templates/web/dist/assets/{index-bd4ed808.js → index-e08dc495.js} +1 -1
  131. package/templates/web/dist/assets/index-e31f4b7c.js +1 -0
  132. package/templates/web/dist/assets/{index-legacy-783129a7.js → index-legacy-5cf7be80.js} +1 -1
  133. package/templates/web/dist/assets/index-legacy-6f112001.js +1 -0
  134. package/templates/web/dist/assets/{index-legacy-b3bd40c1.js → index-legacy-91e012ac.js} +1 -1
  135. package/templates/web/dist/assets/{index-legacy-0da8de82.js → index-legacy-aa61cf72.js} +1 -1
  136. package/templates/web/dist/assets/{index-legacy-06483318.js → index-legacy-afba9135.js} +1 -1
  137. package/templates/web/dist/assets/{index-legacy-d510e318.js → index-legacy-da51c769.js} +1 -1
  138. package/templates/web/dist/assets/{index-legacy-993ef005.js → index-legacy-eec0ca6e.js} +1 -1
  139. package/templates/web/dist/assets/{index-legacy-feb54578.js → index-legacy-f732db29.js} +1 -1
  140. package/templates/web/dist/index.html +2 -2
  141. package/templates/web/node_modules/.vite/deps/@ant-design_icons.js +4 -4
  142. package/templates/web/node_modules/.vite/deps/_metadata.json +57 -57
  143. package/templates/web/node_modules/.vite/deps/antd.js +6 -6
  144. package/templates/web/node_modules/.vite/deps/antd_locale_zh_CN.js +1 -1
  145. package/templates/web/node_modules/.vite/deps/axios.js +2793 -1104
  146. package/templates/web/node_modules/.vite/deps/axios.js.map +4 -4
  147. package/templates/web/node_modules/.vite/deps/{chunk-FADIZLW4.js → chunk-3EE4ABTD.js} +3 -3
  148. package/templates/web/node_modules/.vite/deps/{chunk-5JEEJ3ET.js → chunk-3KXTUEQ5.js} +2 -2
  149. package/templates/web/node_modules/.vite/deps/{chunk-DSEUD2VO.js → chunk-622VOE6C.js} +28 -237
  150. package/templates/web/node_modules/.vite/deps/chunk-622VOE6C.js.map +7 -0
  151. package/templates/web/node_modules/.vite/deps/{chunk-PCLWPLHU.js → chunk-AX2S74EI.js} +4 -4
  152. package/templates/web/node_modules/.vite/deps/{chunk-UX3FVGZU.js → chunk-DXNXWKU4.js} +1670 -1309
  153. package/templates/web/node_modules/.vite/deps/chunk-DXNXWKU4.js.map +7 -0
  154. package/templates/web/node_modules/.vite/deps/{chunk-OTDKR2HU.js → chunk-GT2UP6M4.js} +2 -2
  155. package/templates/web/node_modules/.vite/deps/{chunk-5WWUZCGV.js → chunk-HM4MQYWN.js} +10 -2
  156. package/templates/web/node_modules/.vite/deps/{chunk-Z4XTF2JV.js → chunk-NDUAOA7M.js} +2 -2
  157. package/templates/web/node_modules/.vite/deps/{chunk-PIIG5WB7.js → chunk-OKY2XKJX.js} +14406 -12416
  158. package/templates/web/node_modules/.vite/deps/chunk-OKY2XKJX.js.map +7 -0
  159. package/templates/web/node_modules/.vite/deps/{chunk-UIM57Q7Y.js → chunk-SC6QO7UO.js} +6086 -4354
  160. package/templates/web/node_modules/.vite/deps/chunk-SC6QO7UO.js.map +7 -0
  161. package/templates/web/node_modules/.vite/deps/classnames.js +2 -2
  162. package/templates/web/node_modules/.vite/deps/dayjs.js +2 -2
  163. package/templates/web/node_modules/.vite/deps/dayjs_locale_zh-cn.js +2 -2
  164. package/templates/web/node_modules/.vite/deps/echarts_charts.js +7172 -6102
  165. package/templates/web/node_modules/.vite/deps/echarts_charts.js.map +4 -4
  166. package/templates/web/node_modules/.vite/deps/echarts_components.js +3363 -1326
  167. package/templates/web/node_modules/.vite/deps/echarts_components.js.map +4 -4
  168. package/templates/web/node_modules/.vite/deps/echarts_core.js +57 -42
  169. package/templates/web/node_modules/.vite/deps/echarts_core.js.map +3 -3
  170. package/templates/web/node_modules/.vite/deps/echarts_renderers.js +432 -334
  171. package/templates/web/node_modules/.vite/deps/echarts_renderers.js.map +4 -4
  172. package/templates/web/node_modules/.vite/deps/exceljs.js +25762 -0
  173. package/templates/web/node_modules/.vite/deps/exceljs.js.map +7 -0
  174. package/templates/web/node_modules/.vite/deps/lodash.js +28 -10
  175. package/templates/web/node_modules/.vite/deps/lodash.js.map +3 -3
  176. package/templates/web/node_modules/.vite/deps/path-browserify.js +1 -1
  177. package/templates/web/node_modules/.vite/deps/prop-types.js +1 -1
  178. package/templates/web/node_modules/.vite/deps/qs.js +405 -138
  179. package/templates/web/node_modules/.vite/deps/qs.js.map +4 -4
  180. package/templates/web/node_modules/.vite/deps/react-dom.js +3 -3
  181. package/templates/web/node_modules/.vite/deps/react-dom_client.js +3 -3
  182. package/templates/web/node_modules/.vite/deps/react-router-dom.js +3445 -1283
  183. package/templates/web/node_modules/.vite/deps/react-router-dom.js.map +4 -4
  184. package/templates/web/node_modules/.vite/deps/react.js +2 -2
  185. package/templates/web/node_modules/.vite/deps/react_jsx-dev-runtime.js +2 -2
  186. package/templates/web/node_modules/.vite/deps/recoil.js +3 -3
  187. package/templates/web/src/pages/Login/index.tsx +8 -1
  188. package/templates/web/src/services/api.ts +6 -1
  189. package/templates/web/vite.config.js +5 -5
  190. package/templates/web/dist/assets/index-e6071630.js +0 -1
  191. package/templates/web/dist/assets/index-legacy-028ed5d5.js +0 -1
  192. package/templates/web/node_modules/.vite/deps/chunk-DSEUD2VO.js.map +0 -7
  193. package/templates/web/node_modules/.vite/deps/chunk-PIIG5WB7.js.map +0 -7
  194. package/templates/web/node_modules/.vite/deps/chunk-UIM57Q7Y.js.map +0 -7
  195. package/templates/web/node_modules/.vite/deps/chunk-UX3FVGZU.js.map +0 -7
  196. package/templates/web/node_modules/.vite/deps/xlsx.js +0 -33827
  197. package/templates/web/node_modules/.vite/deps/xlsx.js.map +0 -7
  198. /package/templates/web/node_modules/.vite/deps/{chunk-FADIZLW4.js.map → chunk-3EE4ABTD.js.map} +0 -0
  199. /package/templates/web/node_modules/.vite/deps/{chunk-5JEEJ3ET.js.map → chunk-3KXTUEQ5.js.map} +0 -0
  200. /package/templates/web/node_modules/.vite/deps/{chunk-PCLWPLHU.js.map → chunk-AX2S74EI.js.map} +0 -0
  201. /package/templates/web/node_modules/.vite/deps/{chunk-OTDKR2HU.js.map → chunk-GT2UP6M4.js.map} +0 -0
  202. /package/templates/web/node_modules/.vite/deps/{chunk-5WWUZCGV.js.map → chunk-HM4MQYWN.js.map} +0 -0
  203. /package/templates/web/node_modules/.vite/deps/{chunk-Z4XTF2JV.js.map → chunk-NDUAOA7M.js.map} +0 -0
@@ -5,21 +5,27 @@ import {
5
5
  DEFAULT_FONT_FAMILY,
6
6
  DEFAULT_PATH_STYLE,
7
7
  Eventful_default,
8
+ INCREMENTAL_ID_FALSE,
8
9
  Image_default,
9
10
  PathProxy_default,
10
11
  Path_default,
11
12
  REDRAW_BIT,
12
13
  TEXT_ALIGN_TO_ANCHOR,
13
14
  TSpan_default,
15
+ ZLEVEL2_INCREMENTAL,
16
+ ZLEVEL2_NORMAL_ABOVE,
17
+ ZLEVEL2_NORMAL_BELOW,
14
18
  __extends,
15
19
  adjustTextY,
16
20
  assert,
17
21
  brush,
22
+ brushLoopFinalize,
18
23
  brushSingle,
19
24
  clone,
20
25
  copyTransform,
21
26
  createCanvasPattern,
22
27
  createCubicEasingFunc,
28
+ createHashMap,
23
29
  createOrUpdateImage,
24
30
  devicePixelRatio,
25
31
  disableUserSelect,
@@ -41,7 +47,6 @@ import {
41
47
  getSize,
42
48
  hasSeparateFont,
43
49
  hasShadow,
44
- indexOf,
45
50
  isAroundZero,
46
51
  isArray,
47
52
  isFunction,
@@ -67,10 +72,10 @@ import {
67
72
  requestAnimationFrame_default,
68
73
  retrieve2,
69
74
  round4
70
- } from "./chunk-UX3FVGZU.js";
71
- import "./chunk-5WWUZCGV.js";
75
+ } from "./chunk-DXNXWKU4.js";
76
+ import "./chunk-HM4MQYWN.js";
72
77
 
73
- // ../../node_modules/.pnpm/zrender@5.5.0/node_modules/zrender/lib/svg/SVGPathRebuilder.js
78
+ // ../../node_modules/.pnpm/zrender@6.1.0/node_modules/zrender/lib/svg/SVGPathRebuilder.js
74
79
  var mathSin = Math.sin;
75
80
  var mathCos = Math.cos;
76
81
  var PI = Math.PI;
@@ -170,7 +175,7 @@ var SVGPathRebuilder = function() {
170
175
  }();
171
176
  var SVGPathRebuilder_default = SVGPathRebuilder;
172
177
 
173
- // ../../node_modules/.pnpm/zrender@5.5.0/node_modules/zrender/lib/svg/mapStyleToAttrs.js
178
+ // ../../node_modules/.pnpm/zrender@6.1.0/node_modules/zrender/lib/svg/mapStyleToAttrs.js
174
179
  var NONE = "none";
175
180
  var mathRound = Math.round;
176
181
  function pathHasFill(style) {
@@ -241,7 +246,7 @@ function mapStyleToAttrs(updateAttr, style, el, forceUpdate) {
241
246
  }
242
247
  }
243
248
 
244
- // ../../node_modules/.pnpm/zrender@5.5.0/node_modules/zrender/lib/svg/core.js
249
+ // ../../node_modules/.pnpm/zrender@6.1.0/node_modules/zrender/lib/svg/core.js
245
250
  var SVGNS = "http://www.w3.org/2000/svg";
246
251
  var XLINKNS = "http://www.w3.org/1999/xlink";
247
252
  var XMLNS = "http://www.w3.org/2000/xmlns/";
@@ -345,13 +350,13 @@ function createSVGVNode(width, height, children, useViewBox) {
345
350
  }, children);
346
351
  }
347
352
 
348
- // ../../node_modules/.pnpm/zrender@5.5.0/node_modules/zrender/lib/svg/cssClassId.js
353
+ // ../../node_modules/.pnpm/zrender@6.1.0/node_modules/zrender/lib/svg/cssClassId.js
349
354
  var cssClassIdx = 0;
350
355
  function getClassId() {
351
356
  return cssClassIdx++;
352
357
  }
353
358
 
354
- // ../../node_modules/.pnpm/zrender@5.5.0/node_modules/zrender/lib/svg/cssAnimation.js
359
+ // ../../node_modules/.pnpm/zrender@6.1.0/node_modules/zrender/lib/svg/cssAnimation.js
355
360
  var EASING_MAP = {
356
361
  cubicIn: "0.32,0,0.67,0",
357
362
  cubicOut: "0.33,1,0.68,1",
@@ -616,7 +621,7 @@ function createCSSAnimation(el, attrs, scope, onlyShape) {
616
621
  }
617
622
  }
618
623
 
619
- // ../../node_modules/.pnpm/zrender@5.5.0/node_modules/zrender/lib/svg/cssEmphasis.js
624
+ // ../../node_modules/.pnpm/zrender@6.1.0/node_modules/zrender/lib/svg/cssEmphasis.js
620
625
  function createCSSEmphasis(el, attrs, scope) {
621
626
  if (!el.ignore) {
622
627
  if (el.isSilent()) {
@@ -667,7 +672,7 @@ function setClassAttribute(style, attrs, scope, withHover) {
667
672
  attrs["class"] = attrs["class"] ? attrs["class"] + " " + className : className;
668
673
  }
669
674
 
670
- // ../../node_modules/.pnpm/zrender@5.5.0/node_modules/zrender/lib/svg/graphic.js
675
+ // ../../node_modules/.pnpm/zrender@6.1.0/node_modules/zrender/lib/svg/graphic.js
671
676
  var round = Math.round;
672
677
  function isImageLike(val) {
673
678
  return val && isString(val.src);
@@ -682,11 +687,12 @@ function setStyleAttrs(attrs, style, el, scope) {
682
687
  setGradient(style, attrs, key, scope);
683
688
  } else if (isFillStroke && isPattern(val)) {
684
689
  setPattern(el, attrs, key, scope);
685
- } else if (isFillStroke && val === "none") {
686
- attrs[key] = "transparent";
687
690
  } else {
688
691
  attrs[key] = val;
689
692
  }
693
+ if (isFillStroke && scope.ssr && val === "none") {
694
+ attrs["pointer-events"] = "visible";
695
+ }
690
696
  }, style, el, false);
691
697
  setShadow(el, attrs, scope);
692
698
  }
@@ -1102,7 +1108,7 @@ function setClipPath(clipPath, attrs, scope) {
1102
1108
  attrs["clip-path"] = getIdURL(clipPathId);
1103
1109
  }
1104
1110
 
1105
- // ../../node_modules/.pnpm/zrender@5.5.0/node_modules/zrender/lib/svg/domapi.js
1111
+ // ../../node_modules/.pnpm/zrender@6.1.0/node_modules/zrender/lib/svg/domapi.js
1106
1112
  function createTextNode(text) {
1107
1113
  return document.createTextNode(text);
1108
1114
  }
@@ -1125,7 +1131,7 @@ function setTextContent(node, text) {
1125
1131
  node.textContent = text;
1126
1132
  }
1127
1133
 
1128
- // ../../node_modules/.pnpm/zrender@5.5.0/node_modules/zrender/lib/svg/patch.js
1134
+ // ../../node_modules/.pnpm/zrender@6.1.0/node_modules/zrender/lib/svg/patch.js
1129
1135
  var colonChar = 58;
1130
1136
  var xChar = 120;
1131
1137
  var emptyNode = createVNode("", "");
@@ -1351,12 +1357,11 @@ function patch(oldVnode, vnode) {
1351
1357
  return vnode;
1352
1358
  }
1353
1359
 
1354
- // ../../node_modules/.pnpm/zrender@5.5.0/node_modules/zrender/lib/svg/Painter.js
1360
+ // ../../node_modules/.pnpm/zrender@6.1.0/node_modules/zrender/lib/svg/Painter.js
1355
1361
  var svgId = 0;
1356
1362
  var SVGPainter = function() {
1357
1363
  function SVGPainter2(root, storage, opts) {
1358
1364
  this.type = "svg";
1359
- this.refreshHover = createMethodNotSupport("refreshHover");
1360
1365
  this.configLayer = createMethodNotSupport("configLayer");
1361
1366
  this.storage = storage;
1362
1367
  this._opts = opts = extend({}, opts);
@@ -1414,6 +1419,7 @@ var SVGPainter = function() {
1414
1419
  scope.willUpdate = opts.willUpdate;
1415
1420
  scope.compress = opts.compress;
1416
1421
  scope.emphasis = opts.emphasis;
1422
+ scope.ssr = this._opts.ssr;
1417
1423
  var children = [];
1418
1424
  var bgVNode = this._bgVNode = createBackgroundVNode(width, height, this._backgroundColor, scope);
1419
1425
  bgVNode && children.push(bgVNode);
@@ -1593,12 +1599,12 @@ function createBackgroundVNode(width, height, backgroundColor, scope) {
1593
1599
  }
1594
1600
  var Painter_default = SVGPainter;
1595
1601
 
1596
- // ../../node_modules/.pnpm/echarts@5.5.0/node_modules/echarts/lib/renderer/installSVGRenderer.js
1602
+ // ../../node_modules/.pnpm/echarts@6.1.0/node_modules/echarts/lib/renderer/installSVGRenderer.js
1597
1603
  function install(registers) {
1598
1604
  registers.registerPainter("svg", Painter_default);
1599
1605
  }
1600
1606
 
1601
- // ../../node_modules/.pnpm/zrender@5.5.0/node_modules/zrender/lib/canvas/Layer.js
1607
+ // ../../node_modules/.pnpm/zrender@6.1.0/node_modules/zrender/lib/canvas/Layer.js
1602
1608
  function createDom(id, painter, dpr) {
1603
1609
  var newDom = platformApi.createCanvas();
1604
1610
  var width = painter.getWidth();
@@ -1616,6 +1622,16 @@ function createDom(id, painter, dpr) {
1616
1622
  newDom.height = height * dpr;
1617
1623
  return newDom;
1618
1624
  }
1625
+ function isIncrementalLayer(layer) {
1626
+ return !layer.__cursors.get(INCREMENTAL_ID_FALSE);
1627
+ }
1628
+ function getStartEndFromCursor(layer) {
1629
+ var cursor = layer.__cursors.get(INCREMENTAL_ID_FALSE);
1630
+ return {
1631
+ startIdx: cursor ? cursor.startIdx : 0,
1632
+ endIdx: cursor ? cursor.endIdx : 0
1633
+ };
1634
+ }
1619
1635
  var Layer = function(_super) {
1620
1636
  __extends(Layer2, _super);
1621
1637
  function Layer2(id, painter, dpr) {
@@ -1625,17 +1641,12 @@ var Layer = function(_super) {
1625
1641
  _this.dpr = 1;
1626
1642
  _this.virtual = false;
1627
1643
  _this.config = {};
1628
- _this.incremental = false;
1629
1644
  _this.zlevel = 0;
1645
+ _this.zlevel2 = ZLEVEL2_NORMAL_BELOW;
1630
1646
  _this.maxRepaintRectCount = 5;
1631
1647
  _this.__dirty = true;
1632
1648
  _this.__firstTimePaint = true;
1633
- _this.__used = false;
1634
- _this.__drawIndex = 0;
1635
- _this.__startIndex = 0;
1636
- _this.__endIndex = 0;
1637
- _this.__prevStartIndex = null;
1638
- _this.__prevEndIndex = null;
1649
+ _this.__prevIdx = { startIdx: 0, endIdx: 0 };
1639
1650
  var dom;
1640
1651
  dpr = dpr || devicePixelRatio;
1641
1652
  if (typeof id === "string") {
@@ -1660,12 +1671,8 @@ var Layer = function(_super) {
1660
1671
  _this.dpr = dpr;
1661
1672
  return _this;
1662
1673
  }
1663
- Layer2.prototype.getElementCount = function() {
1664
- return this.__endIndex - this.__startIndex;
1665
- };
1666
1674
  Layer2.prototype.afterBrush = function() {
1667
- this.__prevStartIndex = this.__startIndex;
1668
- this.__prevEndIndex = this.__endIndex;
1675
+ this.__prevIdx = getStartEndFromCursor(this);
1669
1676
  };
1670
1677
  Layer2.prototype.initContext = function() {
1671
1678
  this.ctx = this.dom.getContext("2d");
@@ -1739,7 +1746,8 @@ var Layer = function(_super) {
1739
1746
  }
1740
1747
  }
1741
1748
  }
1742
- for (var i = this.__startIndex; i < this.__endIndex; ++i) {
1749
+ var se = getStartEndFromCursor(this);
1750
+ for (var i = se.startIdx; i < se.endIdx; ++i) {
1743
1751
  var el = displayList[i];
1744
1752
  if (el) {
1745
1753
  var shouldPaint = el.shouldBePainted(viewWidth, viewHeight, true, true);
@@ -1753,7 +1761,8 @@ var Layer = function(_super) {
1753
1761
  }
1754
1762
  }
1755
1763
  }
1756
- for (var i = this.__prevStartIndex; i < this.__prevEndIndex; ++i) {
1764
+ var prevIdx = this.__prevIdx;
1765
+ for (var i = prevIdx.startIdx; i < prevIdx.endIdx; ++i) {
1757
1766
  var el = prevList[i];
1758
1767
  var shouldPaint = el && el.shouldBePainted(viewWidth, viewHeight, true, true);
1759
1768
  if (el && (!shouldPaint || !el.__zr) && el.__isRendered) {
@@ -1876,11 +1885,12 @@ var Layer = function(_super) {
1876
1885
  }(Eventful_default);
1877
1886
  var Layer_default = Layer;
1878
1887
 
1879
- // ../../node_modules/.pnpm/zrender@5.5.0/node_modules/zrender/lib/canvas/Painter.js
1888
+ // ../../node_modules/.pnpm/zrender@6.1.0/node_modules/zrender/lib/canvas/Painter.js
1880
1889
  var HOVER_LAYER_ZLEVEL = 1e5;
1881
1890
  var CANVAS_ZLEVEL = 314159;
1882
- var EL_AFTER_INCREMENTAL_INC = 0.01;
1883
- var INCREMENTAL_INC = 1e-3;
1891
+ var HOVER_LAYER_DIRTY_NO = void 0;
1892
+ var HOVER_LAYER_DIRTY_REPAINT_IF_EXISTING = 1;
1893
+ var HOVER_LAYER_DIRTY_REPAINT = 2;
1884
1894
  function isLayerValid(layer) {
1885
1895
  if (!layer) {
1886
1896
  return false;
@@ -1905,15 +1915,66 @@ function createRoot(width, height) {
1905
1915
  ].join(";") + ";";
1906
1916
  return domRoot;
1907
1917
  }
1918
+ function createBuiltinLayer(id, painter, zlevel, zlevel2) {
1919
+ var layer = new Layer_default(id, painter, painter.dpr);
1920
+ layer.zlevel = zlevel;
1921
+ layer.zlevel2 = zlevel2;
1922
+ layer.__builtin__ = true;
1923
+ resetLayerDrawCursors(layer);
1924
+ return layer;
1925
+ }
1926
+ function resetLayerDrawCursors(layer) {
1927
+ layer.__cursorStack = [];
1928
+ layer.__cursors = createHashMap();
1929
+ }
1930
+ function resetLayerDrawCursor(cursor) {
1931
+ cursor.startIdx = cursor.drawIdx = cursor.endIdx = cursor.endIdxNew = 0;
1932
+ cursor.used = false;
1933
+ cursor.first = cursor.last = NaN;
1934
+ cursor.notClearIdx = -1;
1935
+ return cursor;
1936
+ }
1937
+ function ensureLayerDrawCursor(layer, incrementalCompat) {
1938
+ var cursors = layer.__cursors;
1939
+ var incremental = +incrementalCompat;
1940
+ return cursors.get(incremental) || (layer.__cursorStack.push(incremental), cursors.set(incremental, resetLayerDrawCursor({ key: incremental })));
1941
+ }
1942
+ function eachCursorInLayer(layer, cb) {
1943
+ var cursorStack = layer.__cursorStack;
1944
+ for (var i = 0; i < cursorStack.length; i++) {
1945
+ cb(layer.__cursors.get(cursorStack[i]));
1946
+ }
1947
+ }
1948
+ function ensureLayerListInZLevel(internal, zlevel) {
1949
+ var layers = internal.layers;
1950
+ return layers[zlevel] || (layers[zlevel] = new Array(3));
1951
+ }
1952
+ function eachLayer(internal, cb, filter2) {
1953
+ var layerStack = internal.layerStack;
1954
+ for (var i = 0; i < layerStack.length; i++) {
1955
+ var zlevel = layerStack[i].zl;
1956
+ var zlevel2 = layerStack[i].zl2;
1957
+ var layer = internal.layers[zlevel][zlevel2];
1958
+ if (!filter2 || (!(filter2 & EACH_LAYER_BUILTIN) || layer.__builtin__) && (!(filter2 & EACH_LAYER_NOT_BUILTIN) || !layer.__builtin__) && (!(filter2 & EACH_LAYER_NOT_HOVER) || layer !== internal.hoverlayer)) {
1959
+ cb(layer, zlevel, zlevel2, i);
1960
+ }
1961
+ }
1962
+ }
1963
+ var EACH_LAYER_BUILTIN = 1;
1964
+ var EACH_LAYER_NOT_BUILTIN = 2;
1965
+ var EACH_LAYER_NOT_HOVER = 4;
1966
+ var EACH_LAYER_BUILTIN_NOT_HOVER = EACH_LAYER_BUILTIN | EACH_LAYER_NOT_HOVER;
1908
1967
  var CanvasPainter = function() {
1909
1968
  function CanvasPainter2(root, storage, opts, id) {
1910
1969
  this.type = "canvas";
1911
- this._zlevelList = [];
1912
1970
  this._prevDisplayList = [];
1913
- this._layers = {};
1914
1971
  this._layerConfig = {};
1915
1972
  this._needsManuallyCompositing = false;
1916
1973
  this.type = "canvas";
1974
+ this._i = {
1975
+ layerStack: [],
1976
+ layers: []
1977
+ };
1917
1978
  var singleCanvas = !root.nodeName || root.nodeName.toUpperCase() === "CANVAS";
1918
1979
  this._opts = opts = extend({}, opts || {});
1919
1980
  this.dpr = opts.devicePixelRatio || devicePixelRatio;
@@ -1925,9 +1986,7 @@ var CanvasPainter = function() {
1925
1986
  root.innerHTML = "";
1926
1987
  }
1927
1988
  this.storage = storage;
1928
- var zlevelList = this._zlevelList;
1929
1989
  this._prevDisplayList = [];
1930
- var layers = this._layers;
1931
1990
  if (!singleCanvas) {
1932
1991
  this._width = getSize(root, 0, opts);
1933
1992
  this._height = getSize(root, 1, opts);
@@ -1948,12 +2007,9 @@ var CanvasPainter = function() {
1948
2007
  rootCanvas.height = height * this.dpr;
1949
2008
  this._width = width;
1950
2009
  this._height = height;
1951
- var mainLayer = new Layer_default(rootCanvas, this, this.dpr);
1952
- mainLayer.__builtin__ = true;
1953
- mainLayer.initContext();
1954
- layers[CANVAS_ZLEVEL] = mainLayer;
1955
- mainLayer.zlevel = CANVAS_ZLEVEL;
1956
- zlevelList.push(CANVAS_ZLEVEL);
2010
+ var singleLayer = createBuiltinLayer(rootCanvas, this, CANVAS_ZLEVEL, ZLEVEL2_NORMAL_BELOW);
2011
+ singleLayer.initContext();
2012
+ this._insertLayer(singleLayer, CANVAS_ZLEVEL, ZLEVEL2_NORMAL_BELOW, true);
1957
2013
  this._domRoot = root;
1958
2014
  }
1959
2015
  }
@@ -1975,243 +2031,262 @@ var CanvasPainter = function() {
1975
2031
  };
1976
2032
  }
1977
2033
  };
1978
- CanvasPainter2.prototype.refresh = function(paintAll) {
2034
+ CanvasPainter2.prototype.refresh = function(optOrPaintAll) {
2035
+ var opt;
2036
+ if (optOrPaintAll && !isObject(optOrPaintAll)) {
2037
+ opt = { paintAll: !!optOrPaintAll };
2038
+ } else {
2039
+ opt = optOrPaintAll || {};
2040
+ }
2041
+ var refresh = retrieve2(opt.refresh, true);
2042
+ var refreshHover = retrieve2(opt.refreshHover, false);
2043
+ if (refreshHover) {
2044
+ this._hoverLayerDirty = HOVER_LAYER_DIRTY_REPAINT;
2045
+ }
2046
+ if (!refresh) {
2047
+ if (refreshHover) {
2048
+ this._paintHoverList(this.storage.getDisplayList(false));
2049
+ }
2050
+ return this;
2051
+ }
1979
2052
  var list = this.storage.getDisplayList(true);
1980
- var prevList = this._prevDisplayList;
1981
- var zlevelList = this._zlevelList;
2053
+ this._updateLayerStatus(list, opt.paintAll);
1982
2054
  this._redrawId = Math.random();
1983
- this._paintList(list, prevList, paintAll, this._redrawId);
1984
- for (var i = 0; i < zlevelList.length; i++) {
1985
- var z = zlevelList[i];
1986
- var layer = this._layers[z];
1987
- if (!layer.__builtin__ && layer.refresh) {
1988
- var clearColor = i === 0 ? this._backgroundColor : null;
1989
- layer.refresh(clearColor);
2055
+ var prevList = this._prevDisplayList;
2056
+ this._paintList(list, prevList, this._redrawId);
2057
+ var bgColor = this._backgroundColor;
2058
+ eachLayer(this._i, function(layer, zlevel, zlevel2, idx) {
2059
+ if (layer.refresh) {
2060
+ layer.refresh(idx === 0 ? bgColor : null);
1990
2061
  }
1991
- }
2062
+ }, EACH_LAYER_NOT_BUILTIN);
1992
2063
  if (this._opts.useDirtyRect) {
1993
2064
  this._prevDisplayList = list.slice();
1994
2065
  }
1995
2066
  return this;
1996
2067
  };
1997
- CanvasPainter2.prototype.refreshHover = function() {
1998
- this._paintHoverList(this.storage.getDisplayList(false));
1999
- };
2000
2068
  CanvasPainter2.prototype._paintHoverList = function(list) {
2001
- var len = list.length;
2002
- var hoverLayer = this._hoverlayer;
2003
- hoverLayer && hoverLayer.clear();
2004
- if (!len) {
2069
+ var hoverLayer = this._i.hoverlayer;
2070
+ var hoverLayerDirty = this._hoverLayerDirty;
2071
+ this._hoverLayerDirty = HOVER_LAYER_DIRTY_NO;
2072
+ if (hoverLayerDirty === HOVER_LAYER_DIRTY_NO) {
2073
+ return;
2074
+ }
2075
+ if (!hoverLayer && hoverLayerDirty === HOVER_LAYER_DIRTY_REPAINT) {
2076
+ hoverLayer = this._i.hoverlayer = this._ensureLayer(HOVER_LAYER_ZLEVEL);
2077
+ }
2078
+ if (!hoverLayer) {
2005
2079
  return;
2006
2080
  }
2081
+ hoverLayer.clear();
2007
2082
  var scope = {
2008
2083
  inHover: true,
2009
2084
  viewWidth: this._width,
2010
- viewHeight: this._height
2085
+ viewHeight: this._height,
2086
+ beforeBrushParam: {}
2011
2087
  };
2012
2088
  var ctx;
2013
- for (var i = 0; i < len; i++) {
2089
+ for (var i = 0, len = list.length; i < len; i++) {
2014
2090
  var el = list[i];
2015
- if (el.__inHover) {
2016
- if (!hoverLayer) {
2017
- hoverLayer = this._hoverlayer = this.getLayer(HOVER_LAYER_ZLEVEL);
2018
- }
2019
- if (!ctx) {
2020
- ctx = hoverLayer.ctx;
2021
- ctx.save();
2022
- }
2023
- brush(ctx, el, scope, i === len - 1);
2091
+ if (!el.__inHover) {
2092
+ continue;
2093
+ }
2094
+ if (!ctx) {
2095
+ ctx = hoverLayer.ctx;
2096
+ ctx.save();
2097
+ }
2098
+ var hoverStyle = el.__hoverStyle;
2099
+ var originalStyle = void 0;
2100
+ if (hoverStyle) {
2101
+ originalStyle = el.style;
2102
+ el.style = hoverStyle;
2103
+ }
2104
+ brush(ctx, el, scope);
2105
+ if (hoverStyle) {
2106
+ el.style = originalStyle;
2024
2107
  }
2025
2108
  }
2026
2109
  if (ctx) {
2110
+ brushLoopFinalize(ctx, scope);
2027
2111
  ctx.restore();
2028
2112
  }
2029
2113
  };
2030
2114
  CanvasPainter2.prototype.getHoverLayer = function() {
2031
- return this.getLayer(HOVER_LAYER_ZLEVEL);
2115
+ return this._ensureLayer(HOVER_LAYER_ZLEVEL);
2032
2116
  };
2033
2117
  CanvasPainter2.prototype.paintOne = function(ctx, el) {
2034
2118
  brushSingle(ctx, el);
2035
2119
  };
2036
- CanvasPainter2.prototype._paintList = function(list, prevList, paintAll, redrawId) {
2120
+ CanvasPainter2.prototype._paintList = function(list, prevList, redrawId) {
2037
2121
  if (this._redrawId !== redrawId) {
2038
2122
  return;
2039
2123
  }
2040
- paintAll = paintAll || false;
2041
- this._updateLayerStatus(list);
2042
- var _a = this._doPaintList(list, prevList, paintAll), finished = _a.finished, needsRefreshHover = _a.needsRefreshHover;
2124
+ var finished = this._doPaintList(list, prevList);
2043
2125
  if (this._needsManuallyCompositing) {
2044
2126
  this._compositeManually();
2045
2127
  }
2046
- if (needsRefreshHover) {
2047
- this._paintHoverList(list);
2048
- }
2049
2128
  if (!finished) {
2050
2129
  var self_1 = this;
2051
2130
  requestAnimationFrame_default(function() {
2052
- self_1._paintList(list, prevList, paintAll, redrawId);
2131
+ self_1._paintList(list, prevList, redrawId);
2053
2132
  });
2054
2133
  } else {
2055
- this.eachLayer(function(layer) {
2134
+ eachLayer(this._i, function(layer) {
2056
2135
  layer.afterBrush && layer.afterBrush();
2057
- });
2136
+ }, EACH_LAYER_BUILTIN_NOT_HOVER);
2137
+ this._paintHoverList(list);
2058
2138
  }
2059
2139
  };
2060
2140
  CanvasPainter2.prototype._compositeManually = function() {
2061
- var ctx = this.getLayer(CANVAS_ZLEVEL).ctx;
2141
+ var ctx = this._ensureLayer(CANVAS_ZLEVEL).ctx;
2062
2142
  var width = this._domRoot.width;
2063
2143
  var height = this._domRoot.height;
2064
2144
  ctx.clearRect(0, 0, width, height);
2065
- this.eachBuiltinLayer(function(layer) {
2145
+ eachLayer(this._i, function(layer) {
2066
2146
  if (layer.virtual) {
2067
2147
  ctx.drawImage(layer.dom, 0, 0, width, height);
2068
2148
  }
2069
- });
2149
+ }, EACH_LAYER_BUILTIN);
2070
2150
  };
2071
- CanvasPainter2.prototype._doPaintList = function(list, prevList, paintAll) {
2072
- var _this = this;
2073
- var layerList = [];
2074
- var useDirtyRect = this._opts.useDirtyRect;
2075
- for (var zi = 0; zi < this._zlevelList.length; zi++) {
2076
- var zlevel = this._zlevelList[zi];
2077
- var layer = this._layers[zlevel];
2078
- if (layer.__builtin__ && layer !== this._hoverlayer && (layer.__dirty || paintAll)) {
2079
- layerList.push(layer);
2080
- }
2081
- }
2151
+ CanvasPainter2.prototype._doPaintList = function(list, prevList) {
2152
+ var painter = this;
2082
2153
  var finished = true;
2083
- var needsRefreshHover = false;
2084
- var _loop_1 = function(k2) {
2085
- var layer2 = layerList[k2];
2086
- var ctx = layer2.ctx;
2087
- var repaintRects = useDirtyRect && layer2.createRepaintRects(list, prevList, this_1._width, this_1._height);
2088
- var start = paintAll ? layer2.__startIndex : layer2.__drawIndex;
2089
- var useTimer = !paintAll && layer2.incremental && Date.now;
2090
- var startTime = useTimer && Date.now();
2091
- var clearColor = layer2.zlevel === this_1._zlevelList[0] ? this_1._backgroundColor : null;
2092
- if (layer2.__startIndex === layer2.__endIndex) {
2093
- layer2.clear(false, clearColor, repaintRects);
2094
- } else if (start === layer2.__startIndex) {
2095
- var firstEl = list[start];
2096
- if (!firstEl.incremental || !firstEl.notClear || paintAll) {
2097
- layer2.clear(false, clearColor, repaintRects);
2154
+ eachLayer(this._i, function(layer) {
2155
+ var needDraw = false;
2156
+ eachCursorInLayer(layer, function(cursor) {
2157
+ if (cursor.drawIdx < cursor.endIdx || cursor.notClearIdx >= 0) {
2158
+ needDraw = true;
2098
2159
  }
2160
+ });
2161
+ if (!needDraw && !layer.__dirty) {
2162
+ return;
2099
2163
  }
2100
- if (start === -1) {
2101
- console.error("For some unknown reason. drawIndex is -1");
2102
- start = layer2.__startIndex;
2103
- }
2104
- var i;
2105
- var repaint = function(repaintRect) {
2106
- var scope = {
2107
- inHover: false,
2108
- allClipped: false,
2109
- prevEl: null,
2110
- viewWidth: _this._width,
2111
- viewHeight: _this._height
2112
- };
2113
- for (i = start; i < layer2.__endIndex; i++) {
2114
- var el = list[i];
2115
- if (el.__inHover) {
2116
- needsRefreshHover = true;
2117
- }
2118
- _this._doPaintEl(el, layer2, useDirtyRect, repaintRect, scope, i === layer2.__endIndex - 1);
2119
- if (useTimer) {
2120
- var dTime = Date.now() - startTime;
2121
- if (dTime > 15) {
2122
- break;
2123
- }
2124
- }
2164
+ var repaintRects = painter._opts.useDirtyRect && !isIncrementalLayer(layer) ? layer.createRepaintRects(list, prevList, painter._width, painter._height) : null;
2165
+ var firstLayerKey = painter._i.layerStack[0];
2166
+ var contentRetained = true;
2167
+ if (layer.__dirty) {
2168
+ contentRetained = false;
2169
+ layer.__dirty = false;
2170
+ var clearColor = layer.zlevel === firstLayerKey.zl && layer.zlevel2 === firstLayerKey.zl2 ? painter._backgroundColor : null;
2171
+ layer.clear(false, clearColor, repaintRects);
2172
+ }
2173
+ eachCursorInLayer(layer, function(cursor) {
2174
+ var cursorFinished = painter._paintPerCursor(layer, cursor, list, repaintRects, contentRetained);
2175
+ finished = finished && cursorFinished;
2176
+ });
2177
+ }, EACH_LAYER_BUILTIN_NOT_HOVER);
2178
+ if (env_default.wxa) {
2179
+ eachLayer(this._i, function(layer) {
2180
+ if (layer && layer.ctx && layer.ctx.draw) {
2181
+ layer.ctx.draw();
2125
2182
  }
2126
- if (scope.prevElClipPaths) {
2183
+ });
2184
+ }
2185
+ return finished;
2186
+ };
2187
+ CanvasPainter2.prototype._paintPerCursor = function(layer, layerCursor, list, repaintRects, contentRetained) {
2188
+ var ctx = layer.ctx;
2189
+ if (repaintRects) {
2190
+ if (!repaintRects.length) {
2191
+ layerCursor.drawIdx = layerCursor.endIdx;
2192
+ } else {
2193
+ var dpr = this.dpr;
2194
+ for (var r = 0; r < repaintRects.length; ++r) {
2195
+ var rect = repaintRects[r];
2196
+ ctx.save();
2197
+ ctx.beginPath();
2198
+ ctx.rect(rect.x * dpr, rect.y * dpr, rect.width * dpr, rect.height * dpr);
2199
+ ctx.clip();
2200
+ this._paintPerCursorInRect(layer, layerCursor, list, rect, contentRetained);
2127
2201
  ctx.restore();
2128
2202
  }
2129
- };
2130
- if (repaintRects) {
2131
- if (repaintRects.length === 0) {
2132
- i = layer2.__endIndex;
2133
- } else {
2134
- var dpr = this_1.dpr;
2135
- for (var r = 0; r < repaintRects.length; ++r) {
2136
- var rect = repaintRects[r];
2137
- ctx.save();
2138
- ctx.beginPath();
2139
- ctx.rect(rect.x * dpr, rect.y * dpr, rect.width * dpr, rect.height * dpr);
2140
- ctx.clip();
2141
- repaint(rect);
2142
- ctx.restore();
2143
- }
2203
+ }
2204
+ } else {
2205
+ ctx.save();
2206
+ this._paintPerCursorInRect(layer, layerCursor, list, null, contentRetained);
2207
+ ctx.restore();
2208
+ }
2209
+ return layerCursor.drawIdx >= layerCursor.endIdx;
2210
+ };
2211
+ CanvasPainter2.prototype._paintPerCursorInRect = function(layer, layerCursor, list, repaintRect, contentRetained) {
2212
+ var scope = {
2213
+ inHover: false,
2214
+ allClipped: false,
2215
+ prevEl: null,
2216
+ viewWidth: this._width,
2217
+ viewHeight: this._height,
2218
+ beforeBrushParam: { contentRetained }
2219
+ };
2220
+ var ctx = layer.ctx;
2221
+ var useTimer = isIncrementalLayer(layer);
2222
+ var startTime = useTimer && platformApi.getTime();
2223
+ var drawIdxBegin = layerCursor.drawIdx;
2224
+ var notClearIdx = layerCursor.notClearIdx;
2225
+ var idx = notClearIdx >= 0 ? Math.min(notClearIdx, drawIdxBegin) : drawIdxBegin;
2226
+ for (; idx < layerCursor.endIdx; idx++) {
2227
+ var el = list[idx];
2228
+ if (idx < drawIdxBegin && !el.notClear) {
2229
+ continue;
2230
+ }
2231
+ if (el.__inHover) {
2232
+ this._hoverLayerDirty = HOVER_LAYER_DIRTY_REPAINT;
2233
+ }
2234
+ if (repaintRect != null) {
2235
+ var paintRect = el.getPaintRect();
2236
+ if (paintRect && paintRect.intersect(repaintRect)) {
2237
+ brush(ctx, el, scope);
2238
+ el.setPrevPaintRect(paintRect);
2144
2239
  }
2145
2240
  } else {
2146
- ctx.save();
2147
- repaint();
2148
- ctx.restore();
2149
- }
2150
- layer2.__drawIndex = i;
2151
- if (layer2.__drawIndex < layer2.__endIndex) {
2152
- finished = false;
2241
+ brush(ctx, el, scope);
2153
2242
  }
2154
- };
2155
- var this_1 = this;
2156
- for (var k = 0; k < layerList.length; k++) {
2157
- _loop_1(k);
2158
- }
2159
- if (env_default.wxa) {
2160
- each(this._layers, function(layer2) {
2161
- if (layer2 && layer2.ctx && layer2.ctx.draw) {
2162
- layer2.ctx.draw();
2243
+ if (useTimer) {
2244
+ var dTime = platformApi.getTime() - startTime;
2245
+ if (dTime > 15) {
2246
+ idx++;
2247
+ break;
2163
2248
  }
2164
- });
2165
- }
2166
- return {
2167
- finished,
2168
- needsRefreshHover
2169
- };
2170
- };
2171
- CanvasPainter2.prototype._doPaintEl = function(el, currentLayer, useDirtyRect, repaintRect, scope, isLast) {
2172
- var ctx = currentLayer.ctx;
2173
- if (useDirtyRect) {
2174
- var paintRect = el.getPaintRect();
2175
- if (!repaintRect || paintRect && paintRect.intersect(repaintRect)) {
2176
- brush(ctx, el, scope, isLast);
2177
- el.setPrevPaintRect(paintRect);
2178
2249
  }
2179
- } else {
2180
- brush(ctx, el, scope, isLast);
2181
2250
  }
2251
+ brushLoopFinalize(ctx, scope);
2252
+ layerCursor.drawIdx = Math.max(idx, drawIdxBegin);
2182
2253
  };
2183
2254
  CanvasPainter2.prototype.getLayer = function(zlevel, virtual) {
2184
- if (this._singleCanvas && !this._needsManuallyCompositing) {
2255
+ return this._ensureLayer(zlevel, 0, virtual);
2256
+ };
2257
+ CanvasPainter2.prototype._ensureLayer = function(zlevel, zlevel2, virtual) {
2258
+ zlevel2 = zlevel2 || 0;
2259
+ var singleCanvas = this._singleCanvas;
2260
+ if (singleCanvas && !this._needsManuallyCompositing) {
2185
2261
  zlevel = CANVAS_ZLEVEL;
2262
+ zlevel2 = 0;
2186
2263
  }
2187
- var layer = this._layers[zlevel];
2264
+ var layer = ensureLayerListInZLevel(this._i, zlevel)[zlevel2];
2188
2265
  if (!layer) {
2189
- layer = new Layer_default("zr_" + zlevel, this, this.dpr);
2190
- layer.zlevel = zlevel;
2191
- layer.__builtin__ = true;
2266
+ layer = createBuiltinLayer("zr_" + zlevel + "." + zlevel2, this, zlevel, zlevel2);
2192
2267
  if (this._layerConfig[zlevel]) {
2193
2268
  merge(layer, this._layerConfig[zlevel], true);
2194
- } else if (this._layerConfig[zlevel - EL_AFTER_INCREMENTAL_INC]) {
2195
- merge(layer, this._layerConfig[zlevel - EL_AFTER_INCREMENTAL_INC], true);
2196
2269
  }
2197
- if (virtual) {
2198
- layer.virtual = virtual;
2270
+ if (virtual || singleCanvas && zlevel !== CANVAS_ZLEVEL) {
2271
+ layer.virtual = true;
2199
2272
  }
2200
- this.insertLayer(zlevel, layer);
2273
+ this._insertLayer(layer, zlevel, zlevel2, false);
2201
2274
  layer.initContext();
2202
2275
  }
2203
2276
  return layer;
2204
2277
  };
2205
2278
  CanvasPainter2.prototype.insertLayer = function(zlevel, layer) {
2206
- var layersMap = this._layers;
2207
- var zlevelList = this._zlevelList;
2208
- var len = zlevelList.length;
2279
+ this._insertLayer(layer, zlevel, 0, false);
2280
+ };
2281
+ CanvasPainter2.prototype._insertLayer = function(layer, zlevel, zlevel2, suppressDOMInsert) {
2282
+ var internal = this._i;
2283
+ var layersMap = internal.layers;
2284
+ var layerStack = internal.layerStack;
2209
2285
  var domRoot = this._domRoot;
2210
2286
  var prevLayer = null;
2211
- var i = -1;
2212
- if (layersMap[zlevel]) {
2287
+ if (layersMap[zlevel] && layersMap[zlevel][zlevel2]) {
2213
2288
  if (true) {
2214
- logError("ZLevel " + zlevel + " has been used already");
2289
+ logError("ZLevel " + zlevel + "." + zlevel2 + " has been used already");
2215
2290
  }
2216
2291
  return;
2217
2292
  }
@@ -2221,17 +2296,17 @@ var CanvasPainter = function() {
2221
2296
  }
2222
2297
  return;
2223
2298
  }
2224
- if (len > 0 && zlevel > zlevelList[0]) {
2225
- for (i = 0; i < len - 1; i++) {
2226
- if (zlevelList[i] < zlevel && zlevelList[i + 1] > zlevel) {
2227
- break;
2228
- }
2229
- }
2230
- prevLayer = layersMap[zlevelList[i]];
2299
+ var len = layerStack.length;
2300
+ var i = 0;
2301
+ while (i < len && (layerStack[i].zl < zlevel || layerStack[i].zl === zlevel && layerStack[i].zl2 < zlevel2)) {
2302
+ i++;
2231
2303
  }
2232
- zlevelList.splice(i + 1, 0, zlevel);
2233
- layersMap[zlevel] = layer;
2234
- if (!layer.virtual) {
2304
+ if (i > 0) {
2305
+ prevLayer = ensureLayerListInZLevel(internal, layerStack[i - 1].zl)[layerStack[i - 1].zl2];
2306
+ }
2307
+ layerStack.splice(i, 0, { zl: zlevel, zl2: zlevel2 });
2308
+ ensureLayerListInZLevel(internal, zlevel)[zlevel2] = layer;
2309
+ if (!suppressDOMInsert && !layer.virtual) {
2235
2310
  if (prevLayer) {
2236
2311
  var prevDom = prevLayer.dom;
2237
2312
  if (prevDom.nextSibling) {
@@ -2250,150 +2325,172 @@ var CanvasPainter = function() {
2250
2325
  layer.painter || (layer.painter = this);
2251
2326
  };
2252
2327
  CanvasPainter2.prototype.eachLayer = function(cb, context) {
2253
- var zlevelList = this._zlevelList;
2254
- for (var i = 0; i < zlevelList.length; i++) {
2255
- var z = zlevelList[i];
2256
- cb.call(context, this._layers[z], z);
2257
- }
2328
+ return eachLayer(this._i, function(layer, zlevel) {
2329
+ cb.call(context, layer, zlevel);
2330
+ });
2258
2331
  };
2259
2332
  CanvasPainter2.prototype.eachBuiltinLayer = function(cb, context) {
2260
- var zlevelList = this._zlevelList;
2261
- for (var i = 0; i < zlevelList.length; i++) {
2262
- var z = zlevelList[i];
2263
- var layer = this._layers[z];
2264
- if (layer.__builtin__) {
2265
- cb.call(context, layer, z);
2266
- }
2267
- }
2333
+ return eachLayer(this._i, function(layer, zlevel) {
2334
+ cb.call(context, layer, zlevel);
2335
+ }, EACH_LAYER_BUILTIN);
2268
2336
  };
2269
2337
  CanvasPainter2.prototype.eachOtherLayer = function(cb, context) {
2270
- var zlevelList = this._zlevelList;
2271
- for (var i = 0; i < zlevelList.length; i++) {
2272
- var z = zlevelList[i];
2273
- var layer = this._layers[z];
2274
- if (!layer.__builtin__) {
2275
- cb.call(context, layer, z);
2276
- }
2277
- }
2338
+ return eachLayer(this._i, function(layer, zlevel) {
2339
+ cb.call(context, layer, zlevel);
2340
+ }, EACH_LAYER_NOT_BUILTIN);
2278
2341
  };
2279
2342
  CanvasPainter2.prototype.getLayers = function() {
2280
- return this._layers;
2281
- };
2282
- CanvasPainter2.prototype._updateLayerStatus = function(list) {
2283
- this.eachBuiltinLayer(function(layer2, z) {
2284
- layer2.__dirty = layer2.__used = false;
2343
+ var layers = {};
2344
+ eachLayer(this._i, function(layer, zlevel, zlevel2) {
2345
+ layers[layer.id] = layer;
2285
2346
  });
2286
- function updatePrevLayer(idx) {
2287
- if (prevLayer) {
2288
- if (prevLayer.__endIndex !== idx) {
2289
- prevLayer.__dirty = true;
2290
- }
2291
- prevLayer.__endIndex = idx;
2292
- }
2293
- }
2294
- if (this._singleCanvas) {
2295
- for (var i_1 = 1; i_1 < list.length; i_1++) {
2296
- var el = list[i_1];
2297
- if (el.zlevel !== list[i_1 - 1].zlevel || el.incremental) {
2298
- this._needsManuallyCompositing = true;
2347
+ return layers;
2348
+ };
2349
+ CanvasPainter2.prototype._updateLayerStatus = function(list, paintAll) {
2350
+ var painter = this;
2351
+ if (painter._singleCanvas) {
2352
+ for (var i = 1; i < list.length; i++) {
2353
+ var el = list[i];
2354
+ if (el.zlevel !== list[i - 1].zlevel || el.incremental) {
2355
+ painter._needsManuallyCompositing = true;
2299
2356
  break;
2300
2357
  }
2301
2358
  }
2302
2359
  }
2303
- var prevLayer = null;
2304
- var incrementalLayerCount = 0;
2305
- var prevZlevel;
2306
- var i;
2307
- for (i = 0; i < list.length; i++) {
2308
- var el = list[i];
2360
+ eachLayer(painter._i, function(layer) {
2361
+ layer.__dirty = false;
2362
+ eachCursorInLayer(layer, function(cursor) {
2363
+ cursor.used = false;
2364
+ cursor.endIdxNew = 0;
2365
+ cursor.notClearIdx = -1;
2366
+ });
2367
+ }, EACH_LAYER_BUILTIN_NOT_HOVER);
2368
+ var prevZLevel;
2369
+ var currLayer = null;
2370
+ var currCursor = null;
2371
+ var aboveIncrementalInCurrZLevel = false;
2372
+ for (var idx = 0, len = list.length; idx < len; idx++) {
2373
+ var el = list[idx];
2309
2374
  var zlevel = el.zlevel;
2310
- var layer = void 0;
2311
- if (prevZlevel !== zlevel) {
2312
- prevZlevel = zlevel;
2313
- incrementalLayerCount = 0;
2314
- }
2315
- if (el.incremental) {
2316
- layer = this.getLayer(zlevel + INCREMENTAL_INC, this._needsManuallyCompositing);
2317
- layer.incremental = true;
2318
- incrementalLayerCount = 1;
2375
+ var elIncremental = el.incremental;
2376
+ var zlevel2 = void 0;
2377
+ if (prevZLevel !== zlevel) {
2378
+ prevZLevel = zlevel;
2379
+ aboveIncrementalInCurrZLevel = false;
2380
+ }
2381
+ if (elIncremental) {
2382
+ aboveIncrementalInCurrZLevel = true;
2383
+ zlevel2 = ZLEVEL2_INCREMENTAL;
2319
2384
  } else {
2320
- layer = this.getLayer(zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0), this._needsManuallyCompositing);
2321
- }
2322
- if (!layer.__builtin__) {
2323
- logError("ZLevel " + zlevel + " has been used by unkown layer " + layer.id);
2385
+ zlevel2 = aboveIncrementalInCurrZLevel ? ZLEVEL2_NORMAL_ABOVE : ZLEVEL2_NORMAL_BELOW;
2324
2386
  }
2325
- if (layer !== prevLayer) {
2326
- layer.__used = true;
2327
- if (layer.__startIndex !== i) {
2328
- layer.__dirty = true;
2387
+ if (!currLayer || zlevel !== currLayer.zlevel || zlevel2 !== currLayer.zlevel2) {
2388
+ currLayer = painter._ensureLayer(zlevel, zlevel2);
2389
+ currCursor = null;
2390
+ if (!currLayer.__builtin__) {
2391
+ logError("ZLevel " + zlevel + " has been used by unknown layer " + currLayer.id);
2392
+ continue;
2329
2393
  }
2330
- layer.__startIndex = i;
2331
- if (!layer.incremental) {
2332
- layer.__drawIndex = i;
2333
- } else {
2334
- layer.__drawIndex = -1;
2394
+ }
2395
+ if (!currCursor || elIncremental !== currCursor.key) {
2396
+ currCursor = ensureLayerDrawCursor(currLayer, elIncremental);
2397
+ if (!currCursor.used) {
2398
+ currCursor.used = true;
2399
+ if (!paintAll && currCursor.first === el.id) {
2400
+ var idxShift = idx - currCursor.startIdx;
2401
+ currCursor.startIdx = idx;
2402
+ currCursor.drawIdx += idxShift;
2403
+ currCursor.endIdx += idxShift;
2404
+ } else {
2405
+ currLayer.__dirty = true;
2406
+ currCursor.first = el.id;
2407
+ currCursor.startIdx = currCursor.drawIdx = idx;
2408
+ currCursor.endIdx = idx + 1;
2409
+ }
2335
2410
  }
2336
- updatePrevLayer(i);
2337
- prevLayer = layer;
2338
2411
  }
2412
+ currCursor.endIdxNew = idx + 1;
2339
2413
  if (el.__dirty & REDRAW_BIT && !el.__inHover) {
2340
- layer.__dirty = true;
2341
- if (layer.incremental && layer.__drawIndex < 0) {
2342
- layer.__drawIndex = i;
2414
+ if (!elIncremental || !el.notClear && idx < currCursor.drawIdx) {
2415
+ currLayer.__dirty = true;
2416
+ }
2417
+ if (elIncremental && el.notClear && currCursor.notClearIdx < 0) {
2418
+ currCursor.notClearIdx = idx;
2343
2419
  }
2344
2420
  }
2345
2421
  }
2346
- updatePrevLayer(i);
2347
- this.eachBuiltinLayer(function(layer2, z) {
2348
- if (!layer2.__used && layer2.getElementCount() > 0) {
2349
- layer2.__dirty = true;
2350
- layer2.__startIndex = layer2.__endIndex = layer2.__drawIndex = 0;
2422
+ eachLayer(painter._i, function(layer) {
2423
+ var cursorStack = layer.__cursorStack;
2424
+ var cursors = layer.__cursors;
2425
+ for (var i2 = cursorStack.length - 1; i2 >= 0; i2--) {
2426
+ var cursor = cursors.get(cursorStack[i2]);
2427
+ if (!cursor.used) {
2428
+ layer.__dirty = true;
2429
+ cursors.removeKey(cursorStack[i2]);
2430
+ cursorStack.splice(i2, 1);
2431
+ } else {
2432
+ var endIdxNew = cursor.endIdxNew;
2433
+ if (isIncrementalLayer(layer) ? endIdxNew < cursor.drawIdx : endIdxNew !== cursor.endIdx || !endIdxNew || list[endIdxNew - 1].id !== cursor.last) {
2434
+ layer.__dirty = true;
2435
+ }
2436
+ cursor.endIdx = cursor.endIdxNew;
2437
+ cursor.last = endIdxNew ? list[endIdxNew - 1].id : NaN;
2438
+ }
2351
2439
  }
2352
- if (layer2.__dirty && layer2.__drawIndex < 0) {
2353
- layer2.__drawIndex = layer2.__startIndex;
2440
+ if (layer.__dirty) {
2441
+ eachCursorInLayer(layer, function(cursor2) {
2442
+ cursor2.drawIdx = cursor2.startIdx;
2443
+ });
2444
+ if (painter._hoverLayerDirty === HOVER_LAYER_DIRTY_NO) {
2445
+ painter._hoverLayerDirty = HOVER_LAYER_DIRTY_REPAINT_IF_EXISTING;
2446
+ }
2354
2447
  }
2355
- });
2448
+ }, EACH_LAYER_BUILTIN_NOT_HOVER);
2356
2449
  };
2357
2450
  CanvasPainter2.prototype.clear = function() {
2358
- this.eachBuiltinLayer(this._clearLayer);
2451
+ eachLayer(this._i, function(layer) {
2452
+ layer.clear();
2453
+ resetLayerDrawCursors(layer);
2454
+ }, EACH_LAYER_BUILTIN);
2359
2455
  return this;
2360
2456
  };
2361
- CanvasPainter2.prototype._clearLayer = function(layer) {
2362
- layer.clear();
2363
- };
2364
2457
  CanvasPainter2.prototype.setBackgroundColor = function(backgroundColor) {
2365
2458
  this._backgroundColor = backgroundColor;
2366
- each(this._layers, function(layer) {
2459
+ eachLayer(this._i, function(layer) {
2367
2460
  layer.setUnpainted();
2368
2461
  });
2369
2462
  };
2370
2463
  CanvasPainter2.prototype.configLayer = function(zlevel, config) {
2371
2464
  if (config) {
2372
- var layerConfig = this._layerConfig;
2373
- if (!layerConfig[zlevel]) {
2374
- layerConfig[zlevel] = config;
2465
+ var layerConfig_1 = this._layerConfig;
2466
+ if (!layerConfig_1[zlevel]) {
2467
+ layerConfig_1[zlevel] = config;
2375
2468
  } else {
2376
- merge(layerConfig[zlevel], config, true);
2377
- }
2378
- for (var i = 0; i < this._zlevelList.length; i++) {
2379
- var _zlevel = this._zlevelList[i];
2380
- if (_zlevel === zlevel || _zlevel === zlevel + EL_AFTER_INCREMENTAL_INC) {
2381
- var layer = this._layers[_zlevel];
2382
- merge(layer, layerConfig[zlevel], true);
2383
- }
2469
+ merge(layerConfig_1[zlevel], config, true);
2384
2470
  }
2471
+ eachLayer(this._i, function(layer, zlevel2) {
2472
+ merge(layer, layerConfig_1[zlevel2], true);
2473
+ });
2385
2474
  }
2386
2475
  };
2387
2476
  CanvasPainter2.prototype.delLayer = function(zlevel) {
2388
- var layers = this._layers;
2389
- var zlevelList = this._zlevelList;
2390
- var layer = layers[zlevel];
2391
- if (!layer) {
2392
- return;
2477
+ var layerStack = this._i.layerStack;
2478
+ var layersMap = this._i.layers;
2479
+ for (var i = layerStack.length - 1; i >= 0; i--) {
2480
+ var key = layerStack[i];
2481
+ if (key.zl === zlevel) {
2482
+ var layer = layersMap[zlevel][key.zl2];
2483
+ if (layer.__builtin__) {
2484
+ continue;
2485
+ }
2486
+ layerStack.splice(i, 1);
2487
+ layersMap[zlevel][key.zl2] = void 0;
2488
+ if (!layer.virtual) {
2489
+ var parentNode2 = layer.dom.parentNode;
2490
+ parentNode2 && parentNode2.removeChild(layer.dom);
2491
+ }
2492
+ }
2393
2493
  }
2394
- layer.dom.parentNode.removeChild(layer.dom);
2395
- delete layers[zlevel];
2396
- zlevelList.splice(indexOf(zlevelList, zlevel), 1);
2397
2494
  };
2398
2495
  CanvasPainter2.prototype.resize = function(width, height) {
2399
2496
  if (!this._domRoot.style) {
@@ -2402,7 +2499,7 @@ var CanvasPainter = function() {
2402
2499
  }
2403
2500
  this._width = width;
2404
2501
  this._height = height;
2405
- this.getLayer(CANVAS_ZLEVEL).resize(width, height);
2502
+ this._ensureLayer(CANVAS_ZLEVEL).resize(width, height);
2406
2503
  } else {
2407
2504
  var domRoot = this._domRoot;
2408
2505
  domRoot.style.display = "none";
@@ -2416,12 +2513,10 @@ var CanvasPainter = function() {
2416
2513
  if (this._width !== width || height !== this._height) {
2417
2514
  domRoot.style.width = width + "px";
2418
2515
  domRoot.style.height = height + "px";
2419
- for (var id in this._layers) {
2420
- if (this._layers.hasOwnProperty(id)) {
2421
- this._layers[id].resize(width, height);
2422
- }
2423
- }
2424
- this.refresh(true);
2516
+ eachLayer(this._i, function(layer) {
2517
+ layer.resize(width, height);
2518
+ });
2519
+ this.refresh({ paintAll: true });
2425
2520
  }
2426
2521
  this._width = width;
2427
2522
  this._height = height;
@@ -2429,19 +2524,20 @@ var CanvasPainter = function() {
2429
2524
  return this;
2430
2525
  };
2431
2526
  CanvasPainter2.prototype.clearLayer = function(zlevel) {
2432
- var layer = this._layers[zlevel];
2433
- if (layer) {
2434
- layer.clear();
2435
- }
2527
+ each(this._i.layers[zlevel], function(layer) {
2528
+ if (layer && !layer.__builtin__) {
2529
+ layer.clear();
2530
+ }
2531
+ });
2436
2532
  };
2437
2533
  CanvasPainter2.prototype.dispose = function() {
2438
2534
  this.root.innerHTML = "";
2439
- this.root = this.storage = this._domRoot = this._layers = null;
2535
+ this.root = this.storage = this._domRoot = this._i = null;
2440
2536
  };
2441
2537
  CanvasPainter2.prototype.getRenderedCanvas = function(opts) {
2442
2538
  opts = opts || {};
2443
2539
  if (this._singleCanvas && !this._compositeManually) {
2444
- return this._layers[CANVAS_ZLEVEL].dom;
2540
+ return this._i.layers[CANVAS_ZLEVEL][0].dom;
2445
2541
  }
2446
2542
  var imageLayer = new Layer_default("image", this, opts.pixelRatio || this.dpr);
2447
2543
  imageLayer.initContext();
@@ -2451,7 +2547,7 @@ var CanvasPainter = function() {
2451
2547
  this.refresh();
2452
2548
  var width_1 = imageLayer.dom.width;
2453
2549
  var height_1 = imageLayer.dom.height;
2454
- this.eachLayer(function(layer) {
2550
+ eachLayer(this._i, function(layer) {
2455
2551
  if (layer.__builtin__) {
2456
2552
  ctx.drawImage(layer.dom, 0, 0, width_1, height_1);
2457
2553
  } else if (layer.renderToCanvas) {
@@ -2464,13 +2560,15 @@ var CanvasPainter = function() {
2464
2560
  var scope = {
2465
2561
  inHover: false,
2466
2562
  viewWidth: this._width,
2467
- viewHeight: this._height
2563
+ viewHeight: this._height,
2564
+ beforeBrushParam: {}
2468
2565
  };
2469
2566
  var displayList = this.storage.getDisplayList(true);
2470
2567
  for (var i = 0, len = displayList.length; i < len; i++) {
2471
2568
  var el = displayList[i];
2472
- brush(ctx, el, scope, i === len - 1);
2569
+ brush(ctx, el, scope);
2473
2570
  }
2571
+ brushLoopFinalize(ctx, scope);
2474
2572
  }
2475
2573
  return imageLayer.dom;
2476
2574
  };
@@ -2484,7 +2582,7 @@ var CanvasPainter = function() {
2484
2582
  }();
2485
2583
  var Painter_default2 = CanvasPainter;
2486
2584
 
2487
- // ../../node_modules/.pnpm/echarts@5.5.0/node_modules/echarts/lib/renderer/installCanvasRenderer.js
2585
+ // ../../node_modules/.pnpm/echarts@6.1.0/node_modules/echarts/lib/renderer/installCanvasRenderer.js
2488
2586
  function install2(registers) {
2489
2587
  registers.registerPainter("canvas", Painter_default2);
2490
2588
  }