@visactor/vrender-core 1.1.0-alpha.27 → 1.1.0-alpha.28

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 (76) hide show
  1. package/cjs/graphic/graphic.js +3 -3
  2. package/cjs/graphic/graphic.js.map +1 -1
  3. package/cjs/graphic/tools.js +3 -3
  4. package/cjs/graphic/tools.js.map +1 -1
  5. package/cjs/render/contributions/render/arc-module.js +4 -3
  6. package/cjs/render/contributions/render/arc-module.js.map +1 -1
  7. package/cjs/render/contributions/render/arc3d-module.js +2 -2
  8. package/cjs/render/contributions/render/arc3d-module.js.map +1 -1
  9. package/cjs/render/contributions/render/area-module.js +6 -6
  10. package/cjs/render/contributions/render/area-module.js.map +1 -1
  11. package/cjs/render/contributions/render/circle-module.js +3 -2
  12. package/cjs/render/contributions/render/circle-module.js.map +1 -1
  13. package/cjs/render/contributions/render/glyph-module.js +2 -2
  14. package/cjs/render/contributions/render/glyph-module.js.map +1 -1
  15. package/cjs/render/contributions/render/image-module.js +2 -1
  16. package/cjs/render/contributions/render/image-module.js.map +1 -1
  17. package/cjs/render/contributions/render/line-module.js +3 -5
  18. package/cjs/render/contributions/render/line-module.js.map +1 -1
  19. package/cjs/render/contributions/render/path-module.js +4 -3
  20. package/cjs/render/contributions/render/path-module.js.map +1 -1
  21. package/cjs/render/contributions/render/polygon-module.js +2 -1
  22. package/cjs/render/contributions/render/polygon-module.js.map +1 -1
  23. package/cjs/render/contributions/render/pyramid3d-module.js +2 -1
  24. package/cjs/render/contributions/render/pyramid3d-module.js.map +1 -1
  25. package/cjs/render/contributions/render/rect3d-module.js +2 -1
  26. package/cjs/render/contributions/render/rect3d-module.js.map +1 -1
  27. package/cjs/render/contributions/render/richtext-module.js +2 -1
  28. package/cjs/render/contributions/render/richtext-module.js.map +1 -1
  29. package/cjs/render/contributions/render/star-module.js +2 -1
  30. package/cjs/render/contributions/render/star-module.js.map +1 -1
  31. package/cjs/render/contributions/render/star-render.d.ts +2 -2
  32. package/cjs/render/contributions/render/star-render.js +3 -3
  33. package/cjs/render/contributions/render/star-render.js.map +1 -1
  34. package/cjs/render/contributions/render/symbol-module.js +3 -2
  35. package/cjs/render/contributions/render/symbol-module.js.map +1 -1
  36. package/cjs/render/contributions/render/text-module.js +2 -1
  37. package/cjs/render/contributions/render/text-module.js.map +1 -1
  38. package/dist/index.es.js +451 -423
  39. package/es/graphic/graphic.js +3 -3
  40. package/es/graphic/graphic.js.map +1 -1
  41. package/es/graphic/tools.js +2 -4
  42. package/es/graphic/tools.js.map +1 -1
  43. package/es/render/contributions/render/arc-module.js +3 -3
  44. package/es/render/contributions/render/arc-module.js.map +1 -1
  45. package/es/render/contributions/render/arc3d-module.js +2 -2
  46. package/es/render/contributions/render/arc3d-module.js.map +1 -1
  47. package/es/render/contributions/render/area-module.js +4 -6
  48. package/es/render/contributions/render/area-module.js.map +1 -1
  49. package/es/render/contributions/render/circle-module.js +3 -3
  50. package/es/render/contributions/render/circle-module.js.map +1 -1
  51. package/es/render/contributions/render/glyph-module.js +2 -2
  52. package/es/render/contributions/render/glyph-module.js.map +1 -1
  53. package/es/render/contributions/render/image-module.js +2 -2
  54. package/es/render/contributions/render/image-module.js.map +1 -1
  55. package/es/render/contributions/render/line-module.js +2 -5
  56. package/es/render/contributions/render/line-module.js.map +1 -1
  57. package/es/render/contributions/render/path-module.js +3 -3
  58. package/es/render/contributions/render/path-module.js.map +1 -1
  59. package/es/render/contributions/render/polygon-module.js +2 -2
  60. package/es/render/contributions/render/polygon-module.js.map +1 -1
  61. package/es/render/contributions/render/pyramid3d-module.js +2 -2
  62. package/es/render/contributions/render/pyramid3d-module.js.map +1 -1
  63. package/es/render/contributions/render/rect3d-module.js +2 -2
  64. package/es/render/contributions/render/rect3d-module.js.map +1 -1
  65. package/es/render/contributions/render/richtext-module.js +2 -2
  66. package/es/render/contributions/render/richtext-module.js.map +1 -1
  67. package/es/render/contributions/render/star-module.js +3 -2
  68. package/es/render/contributions/render/star-module.js.map +1 -1
  69. package/es/render/contributions/render/star-render.d.ts +2 -2
  70. package/es/render/contributions/render/star-render.js +3 -3
  71. package/es/render/contributions/render/star-render.js.map +1 -1
  72. package/es/render/contributions/render/symbol-module.js +3 -3
  73. package/es/render/contributions/render/symbol-module.js.map +1 -1
  74. package/es/render/contributions/render/text-module.js +2 -2
  75. package/es/render/contributions/render/text-module.js.map +1 -1
  76. package/package.json +3 -3
@@ -26,12 +26,10 @@ var __awaiter = this && this.__awaiter || function(thisArg, _arguments, P, gener
26
26
 
27
27
  import { application } from "../application";
28
28
 
29
- import { isXML } from "../common/xml/is-xml";
29
+ import { isXML, XMLParser } from "../common/xml";
30
30
 
31
31
  import { isArray } from "@visactor/vutils";
32
32
 
33
- const loadXMLParser = () => require("../common/xml/parser");
34
-
35
33
  export function incrementalAddTo(group, graphic) {
36
34
  group.incrementalAppendChild(graphic);
37
35
  }
@@ -113,7 +111,7 @@ export function xul(str) {
113
111
  const xmlStr = isArray(str) ? str[0] : str, config = [];
114
112
  if (!xmlStr) return config;
115
113
  if (!0 === isXML(xmlStr)) {
116
- const {XMLParser: XMLParser} = require("../common/xml/parser"), data = (new XMLParser).parse(xmlStr);
114
+ const data = (new XMLParser).parse(xmlStr);
117
115
  data.tc && Object.keys(data.tc).forEach((k => {
118
116
  "text" === k ? config.push(parseRTTextXML(data.tc[k])) : config.push(parseRTImageXML(data.tc[k]));
119
117
  }));
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/graphic/tools.ts"],"names":[],"mappings":"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","file":"tools.js","sourcesContent":["import { application } from '../application';\nimport { isXML } from '../common/xml/is-xml';\nimport type { IGraphic, IGroup, ILayer, IRichTextCharacter, IRichTextImageCharacter, IStage } from '../interface';\nimport { isArray, type IAABBBounds } from '@visactor/vutils';\n\ndeclare const require: (id: string) => unknown;\n\ntype TXMLParserModule = {\n XMLParser: new () => { parse: (xmlData: string) => any };\n};\nconst loadXMLParser = () => require('../common/xml/parser') as TXMLParserModule;\n\n// 不触发外部的render\nexport function incrementalAddTo(group: IGroup, graphic: IGraphic) {\n group.incrementalAppendChild(graphic);\n // if (group.layer && group.layer.subLayers) {\n // // const subLayer = group.layer.subLayers.get(group._uid);\n // }\n}\n\nexport async function waitForAllSubLayers(stage: IStage) {\n const promiseList: Promise<any>[] = [];\n const layers = stage.getChildren() as ILayer[];\n await new Promise(resolve => {\n application.global.getRequestAnimationFrame()(() => {\n resolve(null);\n });\n });\n layers.forEach(l => {\n if (l.subLayers.size) {\n l.subLayers.forEach(sl => {\n if (sl.drawContribution && sl.drawContribution.hooks && sl.drawContribution.rendering) {\n promiseList.push(\n new Promise(resolve => {\n sl.drawContribution!.hooks!.completeDraw.tap('outWait', () => {\n sl.drawContribution!.hooks!.completeDraw.taps = sl.drawContribution!.hooks!.completeDraw.taps.filter(\n i => {\n return i.name !== 'outWait';\n }\n );\n resolve(null);\n });\n })\n );\n }\n });\n }\n });\n await Promise.all(promiseList);\n}\n\nexport function boundStroke(bounds: IAABBBounds, halfW: number, miter: boolean, pad = 0) {\n bounds.expand(halfW + (pad / 2 + (miter ? miterAdjustment(miter, halfW) : 0)));\n return bounds;\n}\n\nfunction miterAdjustment(miter: boolean, strokeWidth: number) {\n return miter ? strokeWidth : 0;\n}\n\n// function attachShadow(graphic: Graphic) {\n// graphic.shadowRoot = createShadowRoot(graphic);\n// graphic.addUpdateBoundTag();\n// return graphic.shadowRoot;\n// }\n\n// function detachShadow(graphic: Graphic) {\n// if (graphic.shadowRoot) {\n// graphic.addUpdateBoundTag();\n// graphic.shadowRoot = null;\n// }\n// }\n\nlet NUMBER_TYPE: number = 0;\nexport function genNumberType() {\n return NUMBER_TYPE++;\n}\n\nexport enum TextDirection {\n HORIZONTAL = 0,\n VERTICAL = 1\n}\nexport function verticalLayout(text: string) {\n const nextCharacter: { text: string; direction: TextDirection }[] = [];\n let flag = 0; // 0: 竖排,1: 旋转\n let currStr = '';\n for (let i = 0; i < text.length; i++) {\n if (rotateText(text[i])) {\n if (flag) {\n currStr += text[i];\n } else {\n flag = 1;\n currStr = text[i];\n }\n } else {\n if (flag) {\n nextCharacter.push({\n text: currStr,\n direction: TextDirection.VERTICAL\n });\n currStr = '';\n flag = 0;\n }\n nextCharacter.push({\n text: text[i],\n direction: TextDirection.HORIZONTAL\n });\n }\n }\n\n if (currStr) {\n nextCharacter.push({\n text: currStr,\n direction: TextDirection.VERTICAL\n });\n }\n return nextCharacter;\n}\n\n// ——, ……, (, )\nconst rotateCharList = ['…', '(', ')', '—', '【', '】', '「', '」', '《', '》'];\nconst rotateCharMap = new Map();\nrotateCharList.forEach(c => rotateCharMap.set(c, true));\nconst noRotateCharList = [''];\nconst noRotateCharMap = new Map();\nnoRotateCharList.forEach(c => noRotateCharMap.set(c, true));\n\nfunction rotateText(c: string) {\n if (rotateCharMap.has(c)) {\n return true;\n }\n if (noRotateCharMap.has(c)) {\n return false;\n }\n const cp = c.codePointAt(0);\n let rotate = false;\n // 默认ascii码就旋转\n if (cp < 256) {\n rotate = true;\n }\n return rotate;\n}\n\nexport function xul(str: string | string[]): IRichTextCharacter[] {\n const xmlStr = isArray(str) ? str[0] : str;\n const config: IRichTextCharacter[] = [];\n if (!xmlStr) {\n return config;\n }\n const valid = isXML(xmlStr);\n if (valid === true) {\n const { XMLParser } = loadXMLParser();\n const parser = new XMLParser();\n const data = parser.parse(xmlStr);\n data.tc &&\n Object.keys(data.tc).forEach(k => {\n if (k === 'text') {\n config.push(parseRTTextXML(data.tc[k]));\n } else {\n config.push(parseRTImageXML(data.tc[k]));\n }\n });\n }\n return config;\n}\n\nfunction parseRTTextXML(str: string): IRichTextCharacter {\n const output: IRichTextCharacter = { text: '' };\n parseCommonXML(str, output);\n const inlineText = str['#text'];\n if (inlineText) {\n output.text = inlineText;\n }\n\n return output;\n}\n\nfunction parseCommonXML(str: string, output: IRichTextCharacter) {\n const attr = (str as any).attribute;\n if (attr) {\n const attrList = attr.split(';');\n attrList.forEach((attrItem: string) => {\n if (!attrItem) {\n return;\n }\n const kv = attrItem.split(':');\n\n if (kv.length === 2) {\n const val = parseFloat(kv[1]);\n output[kv[0].trim()] = isFinite(val) ? val : kv[1].trim();\n } else {\n let val = '';\n for (let i = 1; i < kv.length; i++) {\n if (i > 1) {\n val += ':';\n }\n val += kv[i].trim();\n }\n output[kv[0].trim()] = val;\n }\n });\n }\n}\n\nfunction parseRTImageXML(str: string): IRichTextCharacter {\n const output: IRichTextImageCharacter = { image: '', width: 0, height: 0 };\n parseCommonXML(str, output);\n const image = output.image as string;\n if (image) {\n output.image = (image as any).replaceAll('&quot', '\"').replaceAll('&lt', '<').replaceAll('&gt', '>');\n }\n return output;\n}\n"]}
1
+ {"version":3,"sources":["../src/graphic/tools.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,OAAO,EAAoB,MAAM,kBAAkB,CAAC;AAG7D,MAAM,UAAU,gBAAgB,CAAC,KAAa,EAAE,OAAiB;IAC/D,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;AAIxC,CAAC;AAED,MAAM,UAAgB,mBAAmB,CAAC,KAAa;;QACrD,MAAM,WAAW,GAAmB,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,EAAc,CAAC;QAC/C,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC1B,WAAW,CAAC,MAAM,CAAC,wBAAwB,EAAE,CAAC,GAAG,EAAE;gBACjD,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACjB,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE;gBACpB,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;oBACvB,IAAI,EAAE,CAAC,gBAAgB,IAAI,EAAE,CAAC,gBAAgB,CAAC,KAAK,IAAI,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE;wBACrF,WAAW,CAAC,IAAI,CACd,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;4BACpB,EAAE,CAAC,gBAAiB,CAAC,KAAM,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE;gCAC3D,EAAE,CAAC,gBAAiB,CAAC,KAAM,CAAC,YAAY,CAAC,IAAI,GAAG,EAAE,CAAC,gBAAiB,CAAC,KAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAClG,CAAC,CAAC,EAAE;oCACF,OAAO,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;gCAC9B,CAAC,CACF,CAAC;gCACF,OAAO,CAAC,IAAI,CAAC,CAAC;4BAChB,CAAC,CAAC,CAAC;wBACL,CAAC,CAAC,CACH,CAAC;qBACH;gBACH,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACjC,CAAC;CAAA;AAED,MAAM,UAAU,WAAW,CAAC,MAAmB,EAAE,KAAa,EAAE,KAAc,EAAE,GAAG,GAAG,CAAC;IACrF,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/E,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,eAAe,CAAC,KAAc,EAAE,WAAmB;IAC1D,OAAO,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;AACjC,CAAC;AAeD,IAAI,WAAW,GAAW,CAAC,CAAC;AAC5B,MAAM,UAAU,aAAa;IAC3B,OAAO,WAAW,EAAE,CAAC;AACvB,CAAC;AAED,MAAM,CAAN,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,6DAAc,CAAA;IACd,yDAAY,CAAA;AACd,CAAC,EAHW,aAAa,KAAb,aAAa,QAGxB;AACD,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,MAAM,aAAa,GAAiD,EAAE,CAAC;IACvE,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACpC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YACvB,IAAI,IAAI,EAAE;gBACR,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;aACpB;iBAAM;gBACL,IAAI,GAAG,CAAC,CAAC;gBACT,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;aACnB;SACF;aAAM;YACL,IAAI,IAAI,EAAE;gBACR,aAAa,CAAC,IAAI,CAAC;oBACjB,IAAI,EAAE,OAAO;oBACb,SAAS,EAAE,aAAa,CAAC,QAAQ;iBAClC,CAAC,CAAC;gBACH,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,GAAG,CAAC,CAAC;aACV;YACD,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;gBACb,SAAS,EAAE,aAAa,CAAC,UAAU;aACpC,CAAC,CAAC;SACJ;KACF;IAED,IAAI,OAAO,EAAE;QACX,aAAa,CAAC,IAAI,CAAC;YACjB,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,aAAa,CAAC,QAAQ;SAClC,CAAC,CAAC;KACJ;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAGD,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAC1E,MAAM,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;AAChC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AACxD,MAAM,gBAAgB,GAAG,CAAC,EAAE,CAAC,CAAC;AAC9B,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;AAClC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AAE5D,SAAS,UAAU,CAAC,CAAS;IAC3B,IAAI,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QACxB,OAAO,IAAI,CAAC;KACb;IACD,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAC1B,OAAO,KAAK,CAAC;KACd;IACD,MAAM,EAAE,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,MAAM,GAAG,KAAK,CAAC;IAEnB,IAAI,EAAE,GAAG,GAAG,EAAE;QACZ,MAAM,GAAG,IAAI,CAAC;KACf;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,GAAG,CAAC,GAAsB;IACxC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC3C,MAAM,MAAM,GAAyB,EAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,MAAM,CAAC;KACf;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5B,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,MAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClC,IAAI,CAAC,EAAE;YACL,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC/B,IAAI,CAAC,KAAK,MAAM,EAAE;oBAChB,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBACzC;qBAAM;oBACL,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC1C;YACH,CAAC,CAAC,CAAC;KACN;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,GAAW;IACjC,MAAM,MAAM,GAAuB,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;IAChD,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC5B,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;IAChC,IAAI,UAAU,EAAE;QACd,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC;KAC1B;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,cAAc,CAAC,GAAW,EAAE,MAA0B;IAC7D,MAAM,IAAI,GAAI,GAAW,CAAC,SAAS,CAAC;IACpC,IAAI,IAAI,EAAE;QACR,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAgB,EAAE,EAAE;YACpC,IAAI,CAAC,QAAQ,EAAE;gBACb,OAAO;aACR;YACD,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAE/B,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;gBACnB,MAAM,GAAG,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC9B,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aAC3D;iBAAM;gBACL,IAAI,GAAG,GAAG,EAAE,CAAC;gBACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAClC,IAAI,CAAC,GAAG,CAAC,EAAE;wBACT,GAAG,IAAI,GAAG,CAAC;qBACZ;oBACD,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;iBACrB;gBACD,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAED,SAAS,eAAe,CAAC,GAAW;IAClC,MAAM,MAAM,GAA4B,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAC3E,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAe,CAAC;IACrC,IAAI,KAAK,EAAE;QACT,MAAM,CAAC,KAAK,GAAI,KAAa,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;KACtG;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","file":"tools.js","sourcesContent":["import { application } from '../application';\nimport { isXML, XMLParser } from '../common/xml';\nimport type { IGraphic, IGroup, ILayer, IRichTextCharacter, IRichTextImageCharacter, IStage } from '../interface';\nimport { isArray, type IAABBBounds } from '@visactor/vutils';\n\n// 不触发外部的render\nexport function incrementalAddTo(group: IGroup, graphic: IGraphic) {\n group.incrementalAppendChild(graphic);\n // if (group.layer && group.layer.subLayers) {\n // // const subLayer = group.layer.subLayers.get(group._uid);\n // }\n}\n\nexport async function waitForAllSubLayers(stage: IStage) {\n const promiseList: Promise<any>[] = [];\n const layers = stage.getChildren() as ILayer[];\n await new Promise(resolve => {\n application.global.getRequestAnimationFrame()(() => {\n resolve(null);\n });\n });\n layers.forEach(l => {\n if (l.subLayers.size) {\n l.subLayers.forEach(sl => {\n if (sl.drawContribution && sl.drawContribution.hooks && sl.drawContribution.rendering) {\n promiseList.push(\n new Promise(resolve => {\n sl.drawContribution!.hooks!.completeDraw.tap('outWait', () => {\n sl.drawContribution!.hooks!.completeDraw.taps = sl.drawContribution!.hooks!.completeDraw.taps.filter(\n i => {\n return i.name !== 'outWait';\n }\n );\n resolve(null);\n });\n })\n );\n }\n });\n }\n });\n await Promise.all(promiseList);\n}\n\nexport function boundStroke(bounds: IAABBBounds, halfW: number, miter: boolean, pad = 0) {\n bounds.expand(halfW + (pad / 2 + (miter ? miterAdjustment(miter, halfW) : 0)));\n return bounds;\n}\n\nfunction miterAdjustment(miter: boolean, strokeWidth: number) {\n return miter ? strokeWidth : 0;\n}\n\n// function attachShadow(graphic: Graphic) {\n// graphic.shadowRoot = createShadowRoot(graphic);\n// graphic.addUpdateBoundTag();\n// return graphic.shadowRoot;\n// }\n\n// function detachShadow(graphic: Graphic) {\n// if (graphic.shadowRoot) {\n// graphic.addUpdateBoundTag();\n// graphic.shadowRoot = null;\n// }\n// }\n\nlet NUMBER_TYPE: number = 0;\nexport function genNumberType() {\n return NUMBER_TYPE++;\n}\n\nexport enum TextDirection {\n HORIZONTAL = 0,\n VERTICAL = 1\n}\nexport function verticalLayout(text: string) {\n const nextCharacter: { text: string; direction: TextDirection }[] = [];\n let flag = 0; // 0: 竖排,1: 旋转\n let currStr = '';\n for (let i = 0; i < text.length; i++) {\n if (rotateText(text[i])) {\n if (flag) {\n currStr += text[i];\n } else {\n flag = 1;\n currStr = text[i];\n }\n } else {\n if (flag) {\n nextCharacter.push({\n text: currStr,\n direction: TextDirection.VERTICAL\n });\n currStr = '';\n flag = 0;\n }\n nextCharacter.push({\n text: text[i],\n direction: TextDirection.HORIZONTAL\n });\n }\n }\n\n if (currStr) {\n nextCharacter.push({\n text: currStr,\n direction: TextDirection.VERTICAL\n });\n }\n return nextCharacter;\n}\n\n// ——, ……, (, )\nconst rotateCharList = ['…', '(', ')', '—', '【', '】', '「', '」', '《', '》'];\nconst rotateCharMap = new Map();\nrotateCharList.forEach(c => rotateCharMap.set(c, true));\nconst noRotateCharList = [''];\nconst noRotateCharMap = new Map();\nnoRotateCharList.forEach(c => noRotateCharMap.set(c, true));\n\nfunction rotateText(c: string) {\n if (rotateCharMap.has(c)) {\n return true;\n }\n if (noRotateCharMap.has(c)) {\n return false;\n }\n const cp = c.codePointAt(0);\n let rotate = false;\n // 默认ascii码就旋转\n if (cp < 256) {\n rotate = true;\n }\n return rotate;\n}\n\nexport function xul(str: string | string[]): IRichTextCharacter[] {\n const xmlStr = isArray(str) ? str[0] : str;\n const config: IRichTextCharacter[] = [];\n if (!xmlStr) {\n return config;\n }\n const valid = isXML(xmlStr);\n if (valid === true) {\n const parser = new XMLParser();\n const data = parser.parse(xmlStr);\n data.tc &&\n Object.keys(data.tc).forEach(k => {\n if (k === 'text') {\n config.push(parseRTTextXML(data.tc[k]));\n } else {\n config.push(parseRTImageXML(data.tc[k]));\n }\n });\n }\n return config;\n}\n\nfunction parseRTTextXML(str: string): IRichTextCharacter {\n const output: IRichTextCharacter = { text: '' };\n parseCommonXML(str, output);\n const inlineText = str['#text'];\n if (inlineText) {\n output.text = inlineText;\n }\n\n return output;\n}\n\nfunction parseCommonXML(str: string, output: IRichTextCharacter) {\n const attr = (str as any).attribute;\n if (attr) {\n const attrList = attr.split(';');\n attrList.forEach((attrItem: string) => {\n if (!attrItem) {\n return;\n }\n const kv = attrItem.split(':');\n\n if (kv.length === 2) {\n const val = parseFloat(kv[1]);\n output[kv[0].trim()] = isFinite(val) ? val : kv[1].trim();\n } else {\n let val = '';\n for (let i = 1; i < kv.length; i++) {\n if (i > 1) {\n val += ':';\n }\n val += kv[i].trim();\n }\n output[kv[0].trim()] = val;\n }\n });\n }\n}\n\nfunction parseRTImageXML(str: string): IRichTextCharacter {\n const output: IRichTextImageCharacter = { image: '', width: 0, height: 0 };\n parseCommonXML(str, output);\n const image = output.image as string;\n if (image) {\n output.image = (image as any).replaceAll('&quot', '\"').replaceAll('&lt', '<').replaceAll('&gt', '>');\n }\n return output;\n}\n"]}
@@ -1,4 +1,4 @@
1
- import { bindContributionProvider } from "../../../common/contribution-provider";
1
+ import { bindContributionProvider, createContributionProvider } from "../../../common/contribution-provider";
2
2
 
3
3
  import { isBindingContextLoaded } from "../../../common/module-guard";
4
4
 
@@ -13,8 +13,8 @@ import { ArcRender, GraphicRender } from "./symbol";
13
13
  const loadedArcModuleContexts = new WeakSet;
14
14
 
15
15
  export function bindArcRenderModule({bind: bind}) {
16
- isBindingContextLoaded(loadedArcModuleContexts, bind) || (bind(DefaultCanvasArcRender).toSelf().inSingletonScope(),
17
- bind(ArcRender).to(DefaultCanvasArcRender).inSingletonScope(), bind(GraphicRender).toService(ArcRender),
16
+ isBindingContextLoaded(loadedArcModuleContexts, bind) || (bind(DefaultCanvasArcRender).toDynamicValue((({container: container}) => new DefaultCanvasArcRender(createContributionProvider(ArcRenderContribution, container)))).inSingletonScope(),
17
+ bind(ArcRender).toService(DefaultCanvasArcRender), bind(GraphicRender).toService(ArcRender),
18
18
  bind(ArcRenderContribution).toService(DefaultBaseInteractiveRenderContribution),
19
19
  bindContributionProvider(bind, ArcRenderContribution));
20
20
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/arc-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEpD,MAAM,uBAAuB,GAAG,IAAI,OAAO,EAAU,CAAC;AACtD,MAAM,UAAU,mBAAmB,CAAC,EAAE,IAAI,EAAiB;IACzD,IAAI,sBAAsB,CAAC,uBAAuB,EAAE,IAAI,CAAC,EAAE;QACzD,OAAO;KACR;IAED,IAAI,CAAC,sBAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC9D,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACzC,IAAI,CAAC,qBAAqB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAEhF,wBAAwB,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,mBAAmB,CAAC","file":"arc-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasArcRender } from './arc-render';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { ArcRenderContribution } from './contributions/constants';\nimport { ArcRender, GraphicRender } from './symbol';\n\nconst loadedArcModuleContexts = new WeakSet<object>();\nexport function bindArcRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedArcModuleContexts, bind)) {\n return;\n }\n // arc 渲染器\n bind(DefaultCanvasArcRender).toSelf().inSingletonScope();\n bind(ArcRender).to(DefaultCanvasArcRender).inSingletonScope();\n bind(GraphicRender).toService(ArcRender);\n bind(ArcRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n // arc 渲染器注入contributions\n bindContributionProvider(bind, ArcRenderContribution);\n}\n\nexport const arcModule = bindArcRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/arc-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AAC7G,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEpD,MAAM,uBAAuB,GAAG,IAAI,OAAO,EAAU,CAAC;AACtD,MAAM,UAAU,mBAAmB,CAAC,EAAE,IAAI,EAAiB;IACzD,IAAI,sBAAsB,CAAC,uBAAuB,EAAE,IAAI,CAAC,EAAE;QACzD,OAAO;KACR;IAED,IAAI,CAAC,sBAAsB,CAAC;SACzB,cAAc,CACb,CAAC,EAAE,SAAS,EAAsB,EAAE,EAAE,CACpC,IAAI,sBAAsB,CAAC,0BAA0B,CAAC,qBAAqB,EAAE,SAAS,CAAC,CAAC,CAC3F;SACA,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAClD,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACzC,IAAI,CAAC,qBAAqB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAEhF,wBAAwB,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,mBAAmB,CAAC","file":"arc-module.js","sourcesContent":["import { bindContributionProvider, createContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasArcRender } from './arc-render';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { ArcRenderContribution } from './contributions/constants';\nimport { ArcRender, GraphicRender } from './symbol';\n\nconst loadedArcModuleContexts = new WeakSet<object>();\nexport function bindArcRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedArcModuleContexts, bind)) {\n return;\n }\n // arc 渲染器\n bind(DefaultCanvasArcRender)\n .toDynamicValue(\n ({ container }: { container: any }) =>\n new DefaultCanvasArcRender(createContributionProvider(ArcRenderContribution, container))\n )\n .inSingletonScope();\n bind(ArcRender).toService(DefaultCanvasArcRender);\n bind(GraphicRender).toService(ArcRender);\n bind(ArcRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n // arc 渲染器注入contributions\n bindContributionProvider(bind, ArcRenderContribution);\n}\n\nexport const arcModule = bindArcRenderModule;\n"]}
@@ -7,8 +7,8 @@ import { Arc3dRender, GraphicRender } from "./symbol";
7
7
  const loadedArc3dModuleContexts = new WeakSet;
8
8
 
9
9
  export function bindArc3dRenderModule({bind: bind}) {
10
- isBindingContextLoaded(loadedArc3dModuleContexts, bind) || (bind(Arc3dRender).to(DefaultCanvasArc3DRender).inSingletonScope(),
11
- bind(GraphicRender).toService(Arc3dRender));
10
+ isBindingContextLoaded(loadedArc3dModuleContexts, bind) || (bind(DefaultCanvasArc3DRender).toDynamicValue((() => new DefaultCanvasArc3DRender)).inSingletonScope(),
11
+ bind(Arc3dRender).toService(DefaultCanvasArc3DRender), bind(GraphicRender).toService(Arc3dRender));
12
12
  }
13
13
 
14
14
  export const arc3dModule = bindArc3dRenderModule;
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/arc3d-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEtD,MAAM,yBAAyB,GAAG,IAAI,OAAO,EAAU,CAAC;AACxD,MAAM,UAAU,qBAAqB,CAAC,EAAE,IAAI,EAAiB;IAC3D,IAAI,sBAAsB,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE;QAC3D,OAAO;KACR;IAED,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,qBAAqB,CAAC","file":"arc3d-module.js","sourcesContent":["import { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasArc3DRender } from './arc3d-render';\nimport { Arc3dRender, GraphicRender } from './symbol';\n\nconst loadedArc3dModuleContexts = new WeakSet<object>();\nexport function bindArc3dRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedArc3dModuleContexts, bind)) {\n return;\n }\n // arc3d 渲染器\n bind(Arc3dRender).to(DefaultCanvasArc3DRender).inSingletonScope();\n bind(GraphicRender).toService(Arc3dRender);\n}\n\nexport const arc3dModule = bindArc3dRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/arc3d-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEtD,MAAM,yBAAyB,GAAG,IAAI,OAAO,EAAU,CAAC;AACxD,MAAM,UAAU,qBAAqB,CAAC,EAAE,IAAI,EAAiB;IAC3D,IAAI,sBAAsB,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE;QAC3D,OAAO;KACR;IAED,IAAI,CAAC,wBAAwB,CAAC;SAC3B,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,wBAAwB,EAAE,CAAC;SACpD,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;IACtD,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,qBAAqB,CAAC","file":"arc3d-module.js","sourcesContent":["import { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasArc3DRender } from './arc3d-render';\nimport { Arc3dRender, GraphicRender } from './symbol';\n\nconst loadedArc3dModuleContexts = new WeakSet<object>();\nexport function bindArc3dRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedArc3dModuleContexts, bind)) {\n return;\n }\n // arc3d 渲染器\n bind(DefaultCanvasArc3DRender)\n .toDynamicValue(() => new DefaultCanvasArc3DRender())\n .inSingletonScope();\n bind(Arc3dRender).toService(DefaultCanvasArc3DRender);\n bind(GraphicRender).toService(Arc3dRender);\n}\n\nexport const arc3dModule = bindArc3dRenderModule;\n"]}
@@ -1,4 +1,4 @@
1
- import { bindContributionProvider } from "../../../common/contribution-provider";
1
+ import { bindContributionProvider, createContributionProvider } from "../../../common/contribution-provider";
2
2
 
3
3
  import { isBindingContextLoaded } from "../../../common/module-guard";
4
4
 
@@ -8,17 +8,15 @@ import { DefaultBaseInteractiveRenderContribution } from "./contributions";
8
8
 
9
9
  import { AreaRenderContribution } from "./contributions/constants";
10
10
 
11
- import { DefaultIncrementalCanvasAreaRender } from "./incremental-area-render";
12
-
13
11
  import { AreaRender, GraphicRender } from "./symbol";
14
12
 
15
13
  const loadedAreaModuleContexts = new WeakSet;
16
14
 
17
15
  export function bindAreaRenderModule({bind: bind}) {
18
- isBindingContextLoaded(loadedAreaModuleContexts, bind) || (bind(DefaultCanvasAreaRender).toSelf().inSingletonScope(),
19
- bind(AreaRender).to(DefaultCanvasAreaRender).inSingletonScope(), bind(GraphicRender).toService(AreaRender),
16
+ isBindingContextLoaded(loadedAreaModuleContexts, bind) || (bind(DefaultCanvasAreaRender).toDynamicValue((({container: container}) => new DefaultCanvasAreaRender(createContributionProvider(AreaRenderContribution, container)))).inSingletonScope(),
17
+ bind(AreaRender).toService(DefaultCanvasAreaRender), bind(GraphicRender).toService(AreaRender),
20
18
  bind(AreaRenderContribution).toService(DefaultBaseInteractiveRenderContribution),
21
- bindContributionProvider(bind, AreaRenderContribution), bind(DefaultIncrementalCanvasAreaRender).toSelf().inSingletonScope());
19
+ bindContributionProvider(bind, AreaRenderContribution));
22
20
  }
23
21
 
24
22
  export const areaModule = bindAreaRenderModule;
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/area-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,kCAAkC,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAErD,MAAM,wBAAwB,GAAG,IAAI,OAAO,EAAU,CAAC;AACvD,MAAM,UAAU,oBAAoB,CAAC,EAAE,IAAI,EAAiB;IAC1D,IAAI,sBAAsB,CAAC,wBAAwB,EAAE,IAAI,CAAC,EAAE;QAC1D,OAAO;KACR;IAED,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC1C,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAGjF,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;IAGvD,IAAI,CAAC,kCAAkC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAC","file":"area-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasAreaRender } from './area-render';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { AreaRenderContribution } from './contributions/constants';\nimport { DefaultIncrementalCanvasAreaRender } from './incremental-area-render';\nimport { AreaRender, GraphicRender } from './symbol';\n\nconst loadedAreaModuleContexts = new WeakSet<object>();\nexport function bindAreaRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedAreaModuleContexts, bind)) {\n return;\n }\n // area渲染器\n bind(DefaultCanvasAreaRender).toSelf().inSingletonScope();\n bind(AreaRender).to(DefaultCanvasAreaRender).inSingletonScope();\n bind(GraphicRender).toService(AreaRender);\n bind(AreaRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n\n // area 渲染器注入contributions\n bindContributionProvider(bind, AreaRenderContribution);\n\n // incremental-line渲染器\n bind(DefaultIncrementalCanvasAreaRender).toSelf().inSingletonScope();\n}\n\nexport const areaModule = bindAreaRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/area-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AAC7G,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAErD,MAAM,wBAAwB,GAAG,IAAI,OAAO,EAAU,CAAC;AACvD,MAAM,UAAU,oBAAoB,CAAC,EAAE,IAAI,EAAiB;IAC1D,IAAI,sBAAsB,CAAC,wBAAwB,EAAE,IAAI,CAAC,EAAE;QAC1D,OAAO;KACR;IAED,IAAI,CAAC,uBAAuB,CAAC;SAC1B,cAAc,CACb,CAAC,EAAE,SAAS,EAAsB,EAAE,EAAE,CACpC,IAAI,uBAAuB,CAAC,0BAA0B,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC,CAC7F;SACA,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;IACpD,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC1C,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAGjF,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAC","file":"area-module.js","sourcesContent":["import { bindContributionProvider, createContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasAreaRender } from './area-render';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { AreaRenderContribution } from './contributions/constants';\nimport { AreaRender, GraphicRender } from './symbol';\n\nconst loadedAreaModuleContexts = new WeakSet<object>();\nexport function bindAreaRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedAreaModuleContexts, bind)) {\n return;\n }\n // area渲染器\n bind(DefaultCanvasAreaRender)\n .toDynamicValue(\n ({ container }: { container: any }) =>\n new DefaultCanvasAreaRender(createContributionProvider(AreaRenderContribution, container))\n )\n .inSingletonScope();\n bind(AreaRender).toService(DefaultCanvasAreaRender);\n bind(GraphicRender).toService(AreaRender);\n bind(AreaRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n\n // area 渲染器注入contributions\n bindContributionProvider(bind, AreaRenderContribution);\n}\n\nexport const areaModule = bindAreaRenderModule;\n"]}
@@ -1,4 +1,4 @@
1
- import { bindContributionProvider } from "../../../common/contribution-provider";
1
+ import { bindContributionProvider, createContributionProvider } from "../../../common/contribution-provider";
2
2
 
3
3
  import { isBindingContextLoaded } from "../../../common/module-guard";
4
4
 
@@ -13,8 +13,8 @@ import { CircleRender, GraphicRender } from "./symbol";
13
13
  const loadedCircleModuleContexts = new WeakSet;
14
14
 
15
15
  export function bindCircleRenderModule({bind: bind}) {
16
- isBindingContextLoaded(loadedCircleModuleContexts, bind) || (bind(DefaultCanvasCircleRender).toSelf().inSingletonScope(),
17
- bind(CircleRender).to(DefaultCanvasCircleRender).inSingletonScope(), bind(GraphicRender).toService(CircleRender),
16
+ isBindingContextLoaded(loadedCircleModuleContexts, bind) || (bind(DefaultCanvasCircleRender).toDynamicValue((({container: container}) => new DefaultCanvasCircleRender(createContributionProvider(CircleRenderContribution, container)))).inSingletonScope(),
17
+ bind(CircleRender).toService(DefaultCanvasCircleRender), bind(GraphicRender).toService(CircleRender),
18
18
  bind(CircleRenderContribution).toService(DefaultBaseInteractiveRenderContribution),
19
19
  bindContributionProvider(bind, CircleRenderContribution));
20
20
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/circle-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,MAAM,0BAA0B,GAAG,IAAI,OAAO,EAAU,CAAC;AACzD,MAAM,UAAU,sBAAsB,CAAC,EAAE,IAAI,EAAiB;IAC5D,IAAI,sBAAsB,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE;QAC5D,OAAO;KACR;IAED,IAAI,CAAC,yBAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC5C,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAGnF,wBAAwB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,sBAAsB,CAAC","file":"circle-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasCircleRender } from './circle-render';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { CircleRenderContribution } from './contributions/constants';\nimport { CircleRender, GraphicRender } from './symbol';\n\nconst loadedCircleModuleContexts = new WeakSet<object>();\nexport function bindCircleRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedCircleModuleContexts, bind)) {\n return;\n }\n // circle 渲染器\n bind(DefaultCanvasCircleRender).toSelf().inSingletonScope();\n bind(CircleRender).to(DefaultCanvasCircleRender).inSingletonScope();\n bind(GraphicRender).toService(CircleRender);\n bind(CircleRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n\n // circle 渲染器注入contributions\n bindContributionProvider(bind, CircleRenderContribution);\n}\n\nexport const circleModule = bindCircleRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/circle-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AAC7G,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEvD,MAAM,0BAA0B,GAAG,IAAI,OAAO,EAAU,CAAC;AACzD,MAAM,UAAU,sBAAsB,CAAC,EAAE,IAAI,EAAiB;IAC5D,IAAI,sBAAsB,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE;QAC5D,OAAO;KACR;IAED,IAAI,CAAC,yBAAyB,CAAC;SAC5B,cAAc,CACb,CAAC,EAAE,SAAS,EAAsB,EAAE,EAAE,CACpC,IAAI,yBAAyB,CAAC,0BAA0B,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC,CACjG;SACA,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;IACxD,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC5C,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAGnF,wBAAwB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,sBAAsB,CAAC","file":"circle-module.js","sourcesContent":["import { bindContributionProvider, createContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasCircleRender } from './circle-render';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { CircleRenderContribution } from './contributions/constants';\nimport { CircleRender, GraphicRender } from './symbol';\n\nconst loadedCircleModuleContexts = new WeakSet<object>();\nexport function bindCircleRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedCircleModuleContexts, bind)) {\n return;\n }\n // circle 渲染器\n bind(DefaultCanvasCircleRender)\n .toDynamicValue(\n ({ container }: { container: any }) =>\n new DefaultCanvasCircleRender(createContributionProvider(CircleRenderContribution, container))\n )\n .inSingletonScope();\n bind(CircleRender).toService(DefaultCanvasCircleRender);\n bind(GraphicRender).toService(CircleRender);\n bind(CircleRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n\n // circle 渲染器注入contributions\n bindContributionProvider(bind, CircleRenderContribution);\n}\n\nexport const circleModule = bindCircleRenderModule;\n"]}
@@ -7,8 +7,8 @@ import { GlyphRender, GraphicRender } from "./symbol";
7
7
  const loadedGlyphModuleContexts = new WeakSet;
8
8
 
9
9
  export function bindGlyphRenderModule({bind: bind}) {
10
- isBindingContextLoaded(loadedGlyphModuleContexts, bind) || (bind(GlyphRender).to(DefaultCanvasGlyphRender).inSingletonScope(),
11
- bind(GraphicRender).toService(GlyphRender));
10
+ isBindingContextLoaded(loadedGlyphModuleContexts, bind) || (bind(DefaultCanvasGlyphRender).toDynamicValue((() => new DefaultCanvasGlyphRender)).inSingletonScope(),
11
+ bind(GlyphRender).toService(DefaultCanvasGlyphRender), bind(GraphicRender).toService(GlyphRender));
12
12
  }
13
13
 
14
14
  export const glyphModule = bindGlyphRenderModule;
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/glyph-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEtD,MAAM,yBAAyB,GAAG,IAAI,OAAO,EAAU,CAAC;AACxD,MAAM,UAAU,qBAAqB,CAAC,EAAE,IAAI,EAAiB;IAC3D,IAAI,sBAAsB,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE;QAC3D,OAAO;KACR;IAED,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,qBAAqB,CAAC","file":"glyph-module.js","sourcesContent":["import { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasGlyphRender } from './glyph-render';\nimport { GlyphRender, GraphicRender } from './symbol';\n\nconst loadedGlyphModuleContexts = new WeakSet<object>();\nexport function bindGlyphRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedGlyphModuleContexts, bind)) {\n return;\n }\n // glyph渲染器\n bind(GlyphRender).to(DefaultCanvasGlyphRender).inSingletonScope();\n bind(GraphicRender).toService(GlyphRender);\n}\n\nexport const glyphModule = bindGlyphRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/glyph-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEtD,MAAM,yBAAyB,GAAG,IAAI,OAAO,EAAU,CAAC;AACxD,MAAM,UAAU,qBAAqB,CAAC,EAAE,IAAI,EAAiB;IAC3D,IAAI,sBAAsB,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE;QAC3D,OAAO;KACR;IAED,IAAI,CAAC,wBAAwB,CAAC;SAC3B,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,wBAAwB,EAAE,CAAC;SACpD,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;IACtD,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,qBAAqB,CAAC","file":"glyph-module.js","sourcesContent":["import { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasGlyphRender } from './glyph-render';\nimport { GlyphRender, GraphicRender } from './symbol';\n\nconst loadedGlyphModuleContexts = new WeakSet<object>();\nexport function bindGlyphRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedGlyphModuleContexts, bind)) {\n return;\n }\n // glyph渲染器\n bind(DefaultCanvasGlyphRender)\n .toDynamicValue(() => new DefaultCanvasGlyphRender())\n .inSingletonScope();\n bind(GlyphRender).toService(DefaultCanvasGlyphRender);\n bind(GraphicRender).toService(GlyphRender);\n}\n\nexport const glyphModule = bindGlyphRenderModule;\n"]}
@@ -1,4 +1,4 @@
1
- import { bindContributionProvider } from "../../../common/contribution-provider";
1
+ import { bindContributionProvider, createContributionProvider } from "../../../common/contribution-provider";
2
2
 
3
3
  import { isBindingContextLoaded } from "../../../common/module-guard";
4
4
 
@@ -13,7 +13,7 @@ import { GraphicRender, ImageRender } from "./symbol";
13
13
  const loadedImageModuleContexts = new WeakSet;
14
14
 
15
15
  export function bindImageRenderModule({bind: bind}) {
16
- isBindingContextLoaded(loadedImageModuleContexts, bind) || (bind(ImageRender).to(DefaultCanvasImageRender).inSingletonScope(),
16
+ isBindingContextLoaded(loadedImageModuleContexts, bind) || (bind(ImageRender).toDynamicValue((({container: container}) => new DefaultCanvasImageRender(createContributionProvider(ImageRenderContribution, container)))).inSingletonScope(),
17
17
  bind(GraphicRender).toService(ImageRender), bind(ImageRenderContribution).toService(DefaultBaseInteractiveRenderContribution),
18
18
  bindContributionProvider(bind, ImageRenderContribution));
19
19
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/image-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEtD,MAAM,yBAAyB,GAAG,IAAI,OAAO,EAAU,CAAC;AACxD,MAAM,UAAU,qBAAqB,CAAC,EAAE,IAAI,EAAiB;IAC3D,IAAI,sBAAsB,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE;QAC3D,OAAO;KACR;IAED,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC3C,IAAI,CAAC,uBAAuB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAElF,wBAAwB,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,qBAAqB,CAAC","file":"image-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { ImageRenderContribution } from './contributions/constants';\nimport { DefaultCanvasImageRender } from './image-render';\nimport { GraphicRender, ImageRender } from './symbol';\n\nconst loadedImageModuleContexts = new WeakSet<object>();\nexport function bindImageRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedImageModuleContexts, bind)) {\n return;\n }\n // image渲染器\n bind(ImageRender).to(DefaultCanvasImageRender).inSingletonScope();\n bind(GraphicRender).toService(ImageRender);\n bind(ImageRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n // image 渲染器注入contributions\n bindContributionProvider(bind, ImageRenderContribution);\n}\n\nexport const imageModule = bindImageRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/image-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AAC7G,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEtD,MAAM,yBAAyB,GAAG,IAAI,OAAO,EAAU,CAAC;AACxD,MAAM,UAAU,qBAAqB,CAAC,EAAE,IAAI,EAAiB;IAC3D,IAAI,sBAAsB,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE;QAC3D,OAAO;KACR;IAED,IAAI,CAAC,WAAW,CAAC;SACd,cAAc,CACb,CAAC,EAAE,SAAS,EAAsB,EAAE,EAAE,CACpC,IAAI,wBAAwB,CAAC,0BAA0B,CAAC,uBAAuB,EAAE,SAAS,CAAC,CAAC,CAC/F;SACA,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC3C,IAAI,CAAC,uBAAuB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAElF,wBAAwB,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,qBAAqB,CAAC","file":"image-module.js","sourcesContent":["import { bindContributionProvider, createContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { ImageRenderContribution } from './contributions/constants';\nimport { DefaultCanvasImageRender } from './image-render';\nimport { GraphicRender, ImageRender } from './symbol';\n\nconst loadedImageModuleContexts = new WeakSet<object>();\nexport function bindImageRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedImageModuleContexts, bind)) {\n return;\n }\n // image渲染器\n bind(ImageRender)\n .toDynamicValue(\n ({ container }: { container: any }) =>\n new DefaultCanvasImageRender(createContributionProvider(ImageRenderContribution, container))\n )\n .inSingletonScope();\n bind(GraphicRender).toService(ImageRender);\n bind(ImageRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n // image 渲染器注入contributions\n bindContributionProvider(bind, ImageRenderContribution);\n}\n\nexport const imageModule = bindImageRenderModule;\n"]}
@@ -1,7 +1,5 @@
1
1
  import { isBindingContextLoaded } from "../../../common/module-guard";
2
2
 
3
- import { DefaultIncrementalCanvasLineRender } from "./incremental-line-render";
4
-
5
3
  import { DefaultCanvasLineRender } from "./line-render";
6
4
 
7
5
  import { GraphicRender, LineRender } from "./symbol";
@@ -9,9 +7,8 @@ import { GraphicRender, LineRender } from "./symbol";
9
7
  const loadedLineModuleContexts = new WeakSet;
10
8
 
11
9
  export function bindLineRenderModule({bind: bind}) {
12
- isBindingContextLoaded(loadedLineModuleContexts, bind) || (bind(DefaultCanvasLineRender).toSelf().inSingletonScope(),
13
- bind(DefaultIncrementalCanvasLineRender).toSelf().inSingletonScope(), bind(LineRender).to(DefaultCanvasLineRender).inSingletonScope(),
14
- bind(GraphicRender).toService(LineRender));
10
+ isBindingContextLoaded(loadedLineModuleContexts, bind) || (bind(DefaultCanvasLineRender).toDynamicValue((() => new DefaultCanvasLineRender)).inSingletonScope(),
11
+ bind(LineRender).toService(DefaultCanvasLineRender), bind(GraphicRender).toService(LineRender));
15
12
  }
16
13
 
17
14
  export const lineModule = bindLineRenderModule;
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/line-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,kCAAkC,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAErD,MAAM,wBAAwB,GAAG,IAAI,OAAO,EAAU,CAAC;AACvD,MAAM,UAAU,oBAAoB,CAAC,EAAE,IAAI,EAAiB;IAC1D,IAAI,sBAAsB,CAAC,wBAAwB,EAAE,IAAI,CAAC,EAAE;QAC1D,OAAO;KACR;IAED,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,kCAAkC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACrE,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAC","file":"line-module.js","sourcesContent":["import { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultIncrementalCanvasLineRender } from './incremental-line-render';\nimport { DefaultCanvasLineRender } from './line-render';\nimport { GraphicRender, LineRender } from './symbol';\n\nconst loadedLineModuleContexts = new WeakSet<object>();\nexport function bindLineRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedLineModuleContexts, bind)) {\n return;\n }\n // line渲染器\n bind(DefaultCanvasLineRender).toSelf().inSingletonScope();\n bind(DefaultIncrementalCanvasLineRender).toSelf().inSingletonScope();\n bind(LineRender).to(DefaultCanvasLineRender).inSingletonScope();\n bind(GraphicRender).toService(LineRender);\n}\n\nexport const lineModule = bindLineRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/line-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAErD,MAAM,wBAAwB,GAAG,IAAI,OAAO,EAAU,CAAC;AACvD,MAAM,UAAU,oBAAoB,CAAC,EAAE,IAAI,EAAiB;IAC1D,IAAI,sBAAsB,CAAC,wBAAwB,EAAE,IAAI,CAAC,EAAE;QAC1D,OAAO;KACR;IAED,IAAI,CAAC,uBAAuB,CAAC;SAC1B,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,uBAAuB,EAAE,CAAC;SACnD,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;IACpD,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAC","file":"line-module.js","sourcesContent":["import { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasLineRender } from './line-render';\nimport { GraphicRender, LineRender } from './symbol';\n\nconst loadedLineModuleContexts = new WeakSet<object>();\nexport function bindLineRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedLineModuleContexts, bind)) {\n return;\n }\n // line渲染器\n bind(DefaultCanvasLineRender)\n .toDynamicValue(() => new DefaultCanvasLineRender())\n .inSingletonScope();\n bind(LineRender).toService(DefaultCanvasLineRender);\n bind(GraphicRender).toService(LineRender);\n}\n\nexport const lineModule = bindLineRenderModule;\n"]}
@@ -1,4 +1,4 @@
1
- import { bindContributionProvider } from "../../../common/contribution-provider";
1
+ import { bindContributionProvider, createContributionProvider } from "../../../common/contribution-provider";
2
2
 
3
3
  import { isBindingContextLoaded } from "../../../common/module-guard";
4
4
 
@@ -13,8 +13,8 @@ import { GraphicRender, PathRender } from "./symbol";
13
13
  const loadedPathModuleContexts = new WeakSet;
14
14
 
15
15
  export function bindPathRenderModule({bind: bind}) {
16
- isBindingContextLoaded(loadedPathModuleContexts, bind) || (bind(DefaultCanvasPathRender).toSelf().inSingletonScope(),
17
- bind(PathRender).to(DefaultCanvasPathRender).inSingletonScope(), bind(GraphicRender).toService(PathRender),
16
+ isBindingContextLoaded(loadedPathModuleContexts, bind) || (bind(DefaultCanvasPathRender).toDynamicValue((({container: container}) => new DefaultCanvasPathRender(createContributionProvider(PathRenderContribution, container)))).inSingletonScope(),
17
+ bind(PathRender).toService(DefaultCanvasPathRender), bind(GraphicRender).toService(PathRender),
18
18
  bind(PathRenderContribution).toService(DefaultBaseInteractiveRenderContribution),
19
19
  bindContributionProvider(bind, PathRenderContribution));
20
20
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/path-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAErD,MAAM,wBAAwB,GAAG,IAAI,OAAO,EAAU,CAAC;AACvD,MAAM,UAAU,oBAAoB,CAAC,EAAE,IAAI,EAAiB;IAC1D,IAAI,sBAAsB,CAAC,wBAAwB,EAAE,IAAI,CAAC,EAAE;QAC1D,OAAO;KACR;IAED,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC1C,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAGjF,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAC","file":"path-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { PathRenderContribution } from './contributions/constants';\nimport { DefaultCanvasPathRender } from './path-render';\nimport { GraphicRender, PathRender } from './symbol';\n\nconst loadedPathModuleContexts = new WeakSet<object>();\nexport function bindPathRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedPathModuleContexts, bind)) {\n return;\n }\n // path 渲染器\n bind(DefaultCanvasPathRender).toSelf().inSingletonScope();\n bind(PathRender).to(DefaultCanvasPathRender).inSingletonScope();\n bind(GraphicRender).toService(PathRender);\n bind(PathRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n\n // path 渲染器注入contributions\n bindContributionProvider(bind, PathRenderContribution);\n}\n\nexport const pathModule = bindPathRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/path-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AAC7G,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAErD,MAAM,wBAAwB,GAAG,IAAI,OAAO,EAAU,CAAC;AACvD,MAAM,UAAU,oBAAoB,CAAC,EAAE,IAAI,EAAiB;IAC1D,IAAI,sBAAsB,CAAC,wBAAwB,EAAE,IAAI,CAAC,EAAE;QAC1D,OAAO;KACR;IAED,IAAI,CAAC,uBAAuB,CAAC;SAC1B,cAAc,CACb,CAAC,EAAE,SAAS,EAAsB,EAAE,EAAE,CACpC,IAAI,uBAAuB,CAAC,0BAA0B,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC,CAC7F;SACA,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;IACpD,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC1C,IAAI,CAAC,sBAAsB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAGjF,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAC","file":"path-module.js","sourcesContent":["import { bindContributionProvider, createContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { PathRenderContribution } from './contributions/constants';\nimport { DefaultCanvasPathRender } from './path-render';\nimport { GraphicRender, PathRender } from './symbol';\n\nconst loadedPathModuleContexts = new WeakSet<object>();\nexport function bindPathRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedPathModuleContexts, bind)) {\n return;\n }\n // path 渲染器\n bind(DefaultCanvasPathRender)\n .toDynamicValue(\n ({ container }: { container: any }) =>\n new DefaultCanvasPathRender(createContributionProvider(PathRenderContribution, container))\n )\n .inSingletonScope();\n bind(PathRender).toService(DefaultCanvasPathRender);\n bind(GraphicRender).toService(PathRender);\n bind(PathRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n\n // path 渲染器注入contributions\n bindContributionProvider(bind, PathRenderContribution);\n}\n\nexport const pathModule = bindPathRenderModule;\n"]}
@@ -1,4 +1,4 @@
1
- import { bindContributionProvider } from "../../../common/contribution-provider";
1
+ import { bindContributionProvider, createContributionProvider } from "../../../common/contribution-provider";
2
2
 
3
3
  import { isBindingContextLoaded } from "../../../common/module-guard";
4
4
 
@@ -13,7 +13,7 @@ import { GraphicRender, PolygonRender } from "./symbol";
13
13
  const loadedPolygonModuleContexts = new WeakSet;
14
14
 
15
15
  export function bindPolygonRenderModule({bind: bind}) {
16
- isBindingContextLoaded(loadedPolygonModuleContexts, bind) || (bind(PolygonRender).to(DefaultCanvasPolygonRender).inSingletonScope(),
16
+ isBindingContextLoaded(loadedPolygonModuleContexts, bind) || (bind(PolygonRender).toDynamicValue((({container: container}) => new DefaultCanvasPolygonRender(createContributionProvider(PolygonRenderContribution, container)))).inSingletonScope(),
17
17
  bind(GraphicRender).toService(PolygonRender), bind(PolygonRenderContribution).toService(DefaultBaseInteractiveRenderContribution),
18
18
  bindContributionProvider(bind, PolygonRenderContribution));
19
19
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/polygon-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAExD,MAAM,2BAA2B,GAAG,IAAI,OAAO,EAAU,CAAC;AAC1D,MAAM,UAAU,uBAAuB,CAAC,EAAE,IAAI,EAAiB;IAC7D,IAAI,sBAAsB,CAAC,2BAA2B,EAAE,IAAI,CAAC,EAAE;QAC7D,OAAO;KACR;IAED,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAC7C,IAAI,CAAC,yBAAyB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAGpF,wBAAwB,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,uBAAuB,CAAC","file":"polygon-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { PolygonRenderContribution } from './contributions/constants';\nimport { DefaultCanvasPolygonRender } from './polygon-render';\nimport { GraphicRender, PolygonRender } from './symbol';\n\nconst loadedPolygonModuleContexts = new WeakSet<object>();\nexport function bindPolygonRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedPolygonModuleContexts, bind)) {\n return;\n }\n // polygon渲染器\n bind(PolygonRender).to(DefaultCanvasPolygonRender).inSingletonScope();\n bind(GraphicRender).toService(PolygonRender);\n bind(PolygonRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n\n // polygon 渲染器注入contributions\n bindContributionProvider(bind, PolygonRenderContribution);\n}\n\nexport const polygonModule = bindPolygonRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/polygon-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AAC7G,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAExD,MAAM,2BAA2B,GAAG,IAAI,OAAO,EAAU,CAAC;AAC1D,MAAM,UAAU,uBAAuB,CAAC,EAAE,IAAI,EAAiB;IAC7D,IAAI,sBAAsB,CAAC,2BAA2B,EAAE,IAAI,CAAC,EAAE;QAC7D,OAAO;KACR;IAED,IAAI,CAAC,aAAa,CAAC;SAChB,cAAc,CACb,CAAC,EAAE,SAAS,EAAsB,EAAE,EAAE,CACpC,IAAI,0BAA0B,CAAC,0BAA0B,CAAC,yBAAyB,EAAE,SAAS,CAAC,CAAC,CACnG;SACA,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAC7C,IAAI,CAAC,yBAAyB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAGpF,wBAAwB,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,uBAAuB,CAAC","file":"polygon-module.js","sourcesContent":["import { bindContributionProvider, createContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { PolygonRenderContribution } from './contributions/constants';\nimport { DefaultCanvasPolygonRender } from './polygon-render';\nimport { GraphicRender, PolygonRender } from './symbol';\n\nconst loadedPolygonModuleContexts = new WeakSet<object>();\nexport function bindPolygonRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedPolygonModuleContexts, bind)) {\n return;\n }\n // polygon渲染器\n bind(PolygonRender)\n .toDynamicValue(\n ({ container }: { container: any }) =>\n new DefaultCanvasPolygonRender(createContributionProvider(PolygonRenderContribution, container))\n )\n .inSingletonScope();\n bind(GraphicRender).toService(PolygonRender);\n bind(PolygonRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n\n // polygon 渲染器注入contributions\n bindContributionProvider(bind, PolygonRenderContribution);\n}\n\nexport const polygonModule = bindPolygonRenderModule;\n"]}
@@ -7,8 +7,8 @@ import { GraphicRender, Pyramid3dRender } from "./symbol";
7
7
  const loadedPyramid3dModuleContexts = new WeakSet;
8
8
 
9
9
  export function bindPyramid3dRenderModule({bind: bind}) {
10
- isBindingContextLoaded(loadedPyramid3dModuleContexts, bind) || (bind(Pyramid3dRender).to(DefaultCanvasPyramid3dRender).inSingletonScope(),
11
- bind(GraphicRender).toService(Pyramid3dRender));
10
+ isBindingContextLoaded(loadedPyramid3dModuleContexts, bind) || (bind(DefaultCanvasPyramid3dRender).toDynamicValue((() => new DefaultCanvasPyramid3dRender)).inSingletonScope(),
11
+ bind(Pyramid3dRender).toService(DefaultCanvasPyramid3dRender), bind(GraphicRender).toService(Pyramid3dRender));
12
12
  }
13
13
 
14
14
  export const pyramid3dModule = bindPyramid3dRenderModule;
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/pyramid3d-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE1D,MAAM,6BAA6B,GAAG,IAAI,OAAO,EAAU,CAAC;AAC5D,MAAM,UAAU,yBAAyB,CAAC,EAAE,IAAI,EAAiB;IAC/D,IAAI,sBAAsB,CAAC,6BAA6B,EAAE,IAAI,CAAC,EAAE;QAC/D,OAAO;KACR;IAED,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,4BAA4B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC1E,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,yBAAyB,CAAC","file":"pyramid3d-module.js","sourcesContent":["import { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasPyramid3dRender } from './pyramid3d-render';\nimport { GraphicRender, Pyramid3dRender } from './symbol';\n\nconst loadedPyramid3dModuleContexts = new WeakSet<object>();\nexport function bindPyramid3dRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedPyramid3dModuleContexts, bind)) {\n return;\n }\n // pyramid3d 渲染器\n bind(Pyramid3dRender).to(DefaultCanvasPyramid3dRender).inSingletonScope();\n bind(GraphicRender).toService(Pyramid3dRender);\n}\n\nexport const pyramid3dModule = bindPyramid3dRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/pyramid3d-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE1D,MAAM,6BAA6B,GAAG,IAAI,OAAO,EAAU,CAAC;AAC5D,MAAM,UAAU,yBAAyB,CAAC,EAAE,IAAI,EAAiB;IAC/D,IAAI,sBAAsB,CAAC,6BAA6B,EAAE,IAAI,CAAC,EAAE;QAC/D,OAAO;KACR;IAED,IAAI,CAAC,4BAA4B,CAAC;SAC/B,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,4BAA4B,EAAE,CAAC;SACxD,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;IAC9D,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,yBAAyB,CAAC","file":"pyramid3d-module.js","sourcesContent":["import { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasPyramid3dRender } from './pyramid3d-render';\nimport { GraphicRender, Pyramid3dRender } from './symbol';\n\nconst loadedPyramid3dModuleContexts = new WeakSet<object>();\nexport function bindPyramid3dRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedPyramid3dModuleContexts, bind)) {\n return;\n }\n // pyramid3d 渲染器\n bind(DefaultCanvasPyramid3dRender)\n .toDynamicValue(() => new DefaultCanvasPyramid3dRender())\n .inSingletonScope();\n bind(Pyramid3dRender).toService(DefaultCanvasPyramid3dRender);\n bind(GraphicRender).toService(Pyramid3dRender);\n}\n\nexport const pyramid3dModule = bindPyramid3dRenderModule;\n"]}
@@ -7,8 +7,8 @@ import { GraphicRender, Rect3DRender } from "./symbol";
7
7
  const loadedRect3dModuleContexts = new WeakSet;
8
8
 
9
9
  export function bindRect3dRenderModule({bind: bind}) {
10
- isBindingContextLoaded(loadedRect3dModuleContexts, bind) || (bind(Rect3DRender).to(DefaultCanvasRect3dRender).inSingletonScope(),
11
- bind(GraphicRender).toService(Rect3DRender));
10
+ isBindingContextLoaded(loadedRect3dModuleContexts, bind) || (bind(DefaultCanvasRect3dRender).toDynamicValue((() => new DefaultCanvasRect3dRender)).inSingletonScope(),
11
+ bind(Rect3DRender).toService(DefaultCanvasRect3dRender), bind(GraphicRender).toService(Rect3DRender));
12
12
  }
13
13
 
14
14
  export const rect3dModule = bindRect3dRenderModule;
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/rect3d-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAEvD,MAAM,0BAA0B,GAAG,IAAI,OAAO,EAAU,CAAC;AACzD,MAAM,UAAU,sBAAsB,CAAC,EAAE,IAAI,EAAiB;IAC5D,IAAI,sBAAsB,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE;QAC5D,OAAO;KACR;IAED,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,sBAAsB,CAAC","file":"rect3d-module.js","sourcesContent":["import { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasRect3dRender } from './rect3d-render';\nimport { GraphicRender, Rect3DRender } from './symbol';\n\nconst loadedRect3dModuleContexts = new WeakSet<object>();\nexport function bindRect3dRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedRect3dModuleContexts, bind)) {\n return;\n }\n // rect3d 渲染器\n bind(Rect3DRender).to(DefaultCanvasRect3dRender).inSingletonScope();\n bind(GraphicRender).toService(Rect3DRender);\n}\n\nexport const rect3dModule = bindRect3dRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/rect3d-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAEvD,MAAM,0BAA0B,GAAG,IAAI,OAAO,EAAU,CAAC;AACzD,MAAM,UAAU,sBAAsB,CAAC,EAAE,IAAI,EAAiB;IAC5D,IAAI,sBAAsB,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE;QAC5D,OAAO;KACR;IAED,IAAI,CAAC,yBAAyB,CAAC;SAC5B,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,yBAAyB,EAAE,CAAC;SACrD,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;IACxD,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,sBAAsB,CAAC","file":"rect3d-module.js","sourcesContent":["import { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasRect3dRender } from './rect3d-render';\nimport { GraphicRender, Rect3DRender } from './symbol';\n\nconst loadedRect3dModuleContexts = new WeakSet<object>();\nexport function bindRect3dRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedRect3dModuleContexts, bind)) {\n return;\n }\n // rect3d 渲染器\n bind(DefaultCanvasRect3dRender)\n .toDynamicValue(() => new DefaultCanvasRect3dRender())\n .inSingletonScope();\n bind(Rect3DRender).toService(DefaultCanvasRect3dRender);\n bind(GraphicRender).toService(Rect3DRender);\n}\n\nexport const rect3dModule = bindRect3dRenderModule;\n"]}
@@ -7,8 +7,8 @@ import { GraphicRender, RichTextRender } from "./symbol";
7
7
  const loadedRichtextModuleContexts = new WeakSet;
8
8
 
9
9
  export function bindRichtextRenderModule({bind: bind}) {
10
- isBindingContextLoaded(loadedRichtextModuleContexts, bind) || (bind(RichTextRender).to(DefaultCanvasRichTextRender).inSingletonScope(),
11
- bind(GraphicRender).toService(RichTextRender));
10
+ isBindingContextLoaded(loadedRichtextModuleContexts, bind) || (bind(DefaultCanvasRichTextRender).toDynamicValue((() => new DefaultCanvasRichTextRender)).inSingletonScope(),
11
+ bind(RichTextRender).toService(DefaultCanvasRichTextRender), bind(GraphicRender).toService(RichTextRender));
12
12
  }
13
13
 
14
14
  export const richtextModule = bindRichtextRenderModule;
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/richtext-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAEzD,MAAM,4BAA4B,GAAG,IAAI,OAAO,EAAU,CAAC;AAC3D,MAAM,UAAU,wBAAwB,CAAC,EAAE,IAAI,EAAiB;IAC9D,IAAI,sBAAsB,CAAC,4BAA4B,EAAE,IAAI,CAAC,EAAE;QAC9D,OAAO;KACR;IAED,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACxE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,wBAAwB,CAAC","file":"richtext-module.js","sourcesContent":["import { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasRichTextRender } from './richtext-render';\nimport { GraphicRender, RichTextRender } from './symbol';\n\nconst loadedRichtextModuleContexts = new WeakSet<object>();\nexport function bindRichtextRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedRichtextModuleContexts, bind)) {\n return;\n }\n // richtext渲染器\n bind(RichTextRender).to(DefaultCanvasRichTextRender).inSingletonScope();\n bind(GraphicRender).toService(RichTextRender);\n}\n\nexport const richtextModule = bindRichtextRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/richtext-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAEzD,MAAM,4BAA4B,GAAG,IAAI,OAAO,EAAU,CAAC;AAC3D,MAAM,UAAU,wBAAwB,CAAC,EAAE,IAAI,EAAiB;IAC9D,IAAI,sBAAsB,CAAC,4BAA4B,EAAE,IAAI,CAAC,EAAE;QAC9D,OAAO;KACR;IAED,IAAI,CAAC,2BAA2B,CAAC;SAC9B,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,2BAA2B,EAAE,CAAC;SACvD,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,cAAc,CAAC,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;IAC5D,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,wBAAwB,CAAC","file":"richtext-module.js","sourcesContent":["import { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultCanvasRichTextRender } from './richtext-render';\nimport { GraphicRender, RichTextRender } from './symbol';\n\nconst loadedRichtextModuleContexts = new WeakSet<object>();\nexport function bindRichtextRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedRichtextModuleContexts, bind)) {\n return;\n }\n // richtext渲染器\n bind(DefaultCanvasRichTextRender)\n .toDynamicValue(() => new DefaultCanvasRichTextRender())\n .inSingletonScope();\n bind(RichTextRender).toService(DefaultCanvasRichTextRender);\n bind(GraphicRender).toService(RichTextRender);\n}\n\nexport const richtextModule = bindRichtextRenderModule;\n"]}
@@ -1,4 +1,4 @@
1
- import { createContributionProvider } from "../../../common/contribution-provider";
1
+ import { bindContributionProvider, createContributionProvider } from "../../../common/contribution-provider";
2
2
 
3
3
  import { isBindingContextLoaded } from "../../../common/module-guard";
4
4
 
@@ -12,7 +12,8 @@ const loadedStarModuleContexts = new WeakSet;
12
12
 
13
13
  export function bindStarRenderModule({bind: bind}) {
14
14
  isBindingContextLoaded(loadedStarModuleContexts, bind) || (bind(DefaultCanvasStarRender).toDynamicValue((({container: container}) => new DefaultCanvasStarRender(createContributionProvider(StarRenderContribution, container)))).inSingletonScope(),
15
- bind(StarRender).toService(DefaultCanvasStarRender), bind(GraphicRender).toService(StarRender));
15
+ bind(StarRender).toService(DefaultCanvasStarRender), bind(GraphicRender).toService(StarRender),
16
+ bindContributionProvider(bind, StarRenderContribution));
16
17
  }
17
18
 
18
19
  export const starModule = bindStarRenderModule;
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/star-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAErD,MAAM,wBAAwB,GAAG,IAAI,OAAO,EAAU,CAAC;AACvD,MAAM,UAAU,oBAAoB,CAAC,EAAE,IAAI,EAAiB;IAC1D,IAAI,sBAAsB,CAAC,wBAAwB,EAAE,IAAI,CAAC,EAAE;QAC1D,OAAO;KACR;IAED,IAAI,CAAC,uBAAuB,CAAC;SAC1B,cAAc,CACb,CAAC,EAAE,SAAS,EAAsB,EAAE,EAAE,CACpC,IAAI,uBAAuB,CAAC,0BAA0B,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC,CAC7F;SACA,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;IACpD,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAC","file":"star-module.js","sourcesContent":["import { createContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { StarRenderContribution } from './contributions/constants';\nimport { DefaultCanvasStarRender } from './star-render';\nimport { GraphicRender, StarRender } from './symbol';\n\nconst loadedStarModuleContexts = new WeakSet<object>();\nexport function bindStarRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedStarModuleContexts, bind)) {\n return;\n }\n // Star renderer\n bind(DefaultCanvasStarRender)\n .toDynamicValue(\n ({ container }: { container: any }) =>\n new DefaultCanvasStarRender(createContributionProvider(StarRenderContribution, container))\n )\n .inSingletonScope();\n bind(StarRender).toService(DefaultCanvasStarRender);\n bind(GraphicRender).toService(StarRender);\n}\n\nexport const starModule = bindStarRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/star-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AAC7G,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAErD,MAAM,wBAAwB,GAAG,IAAI,OAAO,EAAU,CAAC;AACvD,MAAM,UAAU,oBAAoB,CAAC,EAAE,IAAI,EAAiB;IAC1D,IAAI,sBAAsB,CAAC,wBAAwB,EAAE,IAAI,CAAC,EAAE;QAC1D,OAAO;KACR;IAED,IAAI,CAAC,uBAAuB,CAAC;SAC1B,cAAc,CACb,CAAC,EAAE,SAAS,EAAsB,EAAE,EAAE,CACpC,IAAI,uBAAuB,CAAC,0BAA0B,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC,CAC7F;SACA,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;IACpD,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC1C,wBAAwB,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAC","file":"star-module.js","sourcesContent":["import { bindContributionProvider, createContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { StarRenderContribution } from './contributions/constants';\nimport { DefaultCanvasStarRender } from './star-render';\nimport { GraphicRender, StarRender } from './symbol';\n\nconst loadedStarModuleContexts = new WeakSet<object>();\nexport function bindStarRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedStarModuleContexts, bind)) {\n return;\n }\n // Star renderer\n bind(DefaultCanvasStarRender)\n .toDynamicValue(\n ({ container }: { container: any }) =>\n new DefaultCanvasStarRender(createContributionProvider(StarRenderContribution, container))\n )\n .inSingletonScope();\n bind(StarRender).toService(DefaultCanvasStarRender);\n bind(GraphicRender).toService(StarRender);\n bindContributionProvider(bind, StarRenderContribution);\n}\n\nexport const starModule = bindStarRenderModule;\n"]}
@@ -1,10 +1,10 @@
1
1
  import type { IGraphicAttribute, IContext2d, IMarkAttribute, IStar, IThemeAttribute, IGraphicRender, IContributionProvider, IDrawContext, IGraphicRenderDrawParams, IRenderService, IStarRenderContribution } from '../../../interface';
2
2
  import { BaseRender } from './base-render';
3
3
  export declare class DefaultCanvasStarRender extends BaseRender<IStar> implements IGraphicRender {
4
- protected readonly starRenderContribitions: IContributionProvider<IStarRenderContribution>;
4
+ protected readonly graphicRenderContributions: IContributionProvider<IStarRenderContribution>;
5
5
  type: 'star';
6
6
  numberType: number;
7
- constructor(starRenderContribitions: IContributionProvider<IStarRenderContribution>);
7
+ constructor(graphicRenderContributions: IContributionProvider<IStarRenderContribution>);
8
8
  drawShape(star: IStar, context: IContext2d, x: number, y: number, drawContext: IDrawContext, params?: IGraphicRenderDrawParams, fillCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean, strokeCb?: (ctx: IContext2d, markAttribute: Partial<IMarkAttribute & IGraphicAttribute>, themeAttribute: IThemeAttribute) => boolean): void;
9
9
  draw(star: IStar, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams): void;
10
10
  }
@@ -7,10 +7,10 @@ import { BaseRender } from "./base-render";
7
7
  import { defaultStarBackgroundRenderContribution, defaultStarTextureRenderContribution } from "./contributions";
8
8
 
9
9
  export class DefaultCanvasStarRender extends BaseRender {
10
- constructor(starRenderContribitions) {
11
- super(), this.starRenderContribitions = starRenderContribitions, this.numberType = STAR_NUMBER_TYPE,
10
+ constructor(graphicRenderContributions) {
11
+ super(), this.graphicRenderContributions = graphicRenderContributions, this.numberType = STAR_NUMBER_TYPE,
12
12
  this.builtinContributions = [ defaultStarBackgroundRenderContribution, defaultStarTextureRenderContribution ],
13
- this.init(starRenderContribitions);
13
+ this.init(graphicRenderContributions);
14
14
  }
15
15
  drawShape(star, context, x, y, drawContext, params, fillCb, strokeCb) {
16
16
  const starAttribute = getTheme(star, null == params ? void 0 : params.theme).star, {x: originX = starAttribute.x, y: originY = starAttribute.y, fillStrokeOrder: fillStrokeOrder = starAttribute.fillStrokeOrder} = star.attribute, data = this.valid(star, starAttribute, fillCb, strokeCb);
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/star-render.ts"],"names":[],"mappings":"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","file":"star-render.js","sourcesContent":["import { getTheme } from '../../../graphic/theme';\nimport { STAR_NUMBER_TYPE } from '../../../graphic/constants';\nimport type {\n IGraphicAttribute,\n IContext2d,\n IMarkAttribute,\n IStar,\n IThemeAttribute,\n IGraphicRender,\n IContributionProvider,\n IDrawContext,\n IGraphicRenderDrawParams,\n IRenderService,\n IStarRenderContribution\n} from '../../../interface';\nimport { BaseRender } from './base-render';\nimport { defaultStarBackgroundRenderContribution, defaultStarTextureRenderContribution } from './contributions';\n\nexport class DefaultCanvasStarRender extends BaseRender<IStar> implements IGraphicRender {\n type: 'star';\n numberType: number = STAR_NUMBER_TYPE;\n\n constructor(protected readonly starRenderContribitions: IContributionProvider<IStarRenderContribution>) {\n super();\n this.builtinContributions = [defaultStarBackgroundRenderContribution, defaultStarTextureRenderContribution];\n this.init(starRenderContribitions);\n }\n\n drawShape(\n star: IStar,\n context: IContext2d,\n x: number,\n y: number,\n drawContext: IDrawContext,\n params?: IGraphicRenderDrawParams,\n fillCb?: (\n ctx: IContext2d,\n markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n themeAttribute: IThemeAttribute\n ) => boolean,\n strokeCb?: (\n ctx: IContext2d,\n markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n themeAttribute: IThemeAttribute\n ) => boolean\n ) {\n // Get theme attributes\n const starAttribute = getTheme(star, params?.theme).star;\n const {\n x: originX = starAttribute.x,\n y: originY = starAttribute.y,\n fillStrokeOrder = starAttribute.fillStrokeOrder\n } = star.attribute;\n\n const data = this.valid(star, starAttribute, fillCb, strokeCb);\n if (!data) {\n return;\n }\n const { fVisible, sVisible, doFill, doStroke } = data;\n\n // Get cached points for better performance\n const points = star.getCachedPoints();\n\n context.beginPath();\n\n // Draw the star using cached points\n if (points && points.length) {\n points.forEach((point, index) => {\n if (index === 0) {\n context.moveTo(x + point.x, y + point.y);\n } else {\n context.lineTo(x + point.x, y + point.y);\n }\n });\n }\n\n // Close the path\n context.closePath();\n\n // Shadow\n context.setShadowBlendStyle && context.setShadowBlendStyle(star, star.attribute, starAttribute);\n\n this.beforeRenderStep(\n star,\n context,\n x,\n y,\n doFill,\n doStroke,\n fVisible,\n sVisible,\n starAttribute,\n drawContext,\n fillCb,\n strokeCb\n );\n\n const _runFill = () => {\n if (doFill) {\n if (fillCb) {\n fillCb(context, star.attribute, starAttribute);\n } else if (fVisible) {\n // Apply fill\n context.setCommonStyle(star, star.attribute, originX - x, originY - y, starAttribute);\n context.fill();\n }\n }\n };\n const _runStroke = () => {\n if (doStroke) {\n if (strokeCb) {\n strokeCb(context, star.attribute, starAttribute);\n } else if (sVisible) {\n // Apply stroke\n context.setStrokeStyle(star, star.attribute, originX - x, originY - y, starAttribute);\n context.stroke();\n }\n }\n };\n\n if (!fillStrokeOrder) {\n _runFill();\n _runStroke();\n } else {\n _runStroke();\n _runFill();\n }\n\n this.afterRenderStep(\n star,\n context,\n x,\n y,\n doFill,\n doStroke,\n fVisible,\n sVisible,\n starAttribute,\n drawContext,\n fillCb,\n strokeCb\n );\n }\n\n draw(star: IStar, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n const starAttribute = getTheme(star, params?.theme).star;\n this._draw(star, starAttribute, false, drawContext, params);\n }\n}\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/star-render.ts"],"names":[],"mappings":"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","file":"star-render.js","sourcesContent":["import { getTheme } from '../../../graphic/theme';\nimport { STAR_NUMBER_TYPE } from '../../../graphic/constants';\nimport type {\n IGraphicAttribute,\n IContext2d,\n IMarkAttribute,\n IStar,\n IThemeAttribute,\n IGraphicRender,\n IContributionProvider,\n IDrawContext,\n IGraphicRenderDrawParams,\n IRenderService,\n IStarRenderContribution\n} from '../../../interface';\nimport { BaseRender } from './base-render';\nimport { defaultStarBackgroundRenderContribution, defaultStarTextureRenderContribution } from './contributions';\n\nexport class DefaultCanvasStarRender extends BaseRender<IStar> implements IGraphicRender {\n type: 'star';\n numberType: number = STAR_NUMBER_TYPE;\n\n constructor(protected readonly graphicRenderContributions: IContributionProvider<IStarRenderContribution>) {\n super();\n this.builtinContributions = [defaultStarBackgroundRenderContribution, defaultStarTextureRenderContribution];\n this.init(graphicRenderContributions);\n }\n\n drawShape(\n star: IStar,\n context: IContext2d,\n x: number,\n y: number,\n drawContext: IDrawContext,\n params?: IGraphicRenderDrawParams,\n fillCb?: (\n ctx: IContext2d,\n markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n themeAttribute: IThemeAttribute\n ) => boolean,\n strokeCb?: (\n ctx: IContext2d,\n markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n themeAttribute: IThemeAttribute\n ) => boolean\n ) {\n // Get theme attributes\n const starAttribute = getTheme(star, params?.theme).star;\n const {\n x: originX = starAttribute.x,\n y: originY = starAttribute.y,\n fillStrokeOrder = starAttribute.fillStrokeOrder\n } = star.attribute;\n\n const data = this.valid(star, starAttribute, fillCb, strokeCb);\n if (!data) {\n return;\n }\n const { fVisible, sVisible, doFill, doStroke } = data;\n\n // Get cached points for better performance\n const points = star.getCachedPoints();\n\n context.beginPath();\n\n // Draw the star using cached points\n if (points && points.length) {\n points.forEach((point, index) => {\n if (index === 0) {\n context.moveTo(x + point.x, y + point.y);\n } else {\n context.lineTo(x + point.x, y + point.y);\n }\n });\n }\n\n // Close the path\n context.closePath();\n\n // Shadow\n context.setShadowBlendStyle && context.setShadowBlendStyle(star, star.attribute, starAttribute);\n\n this.beforeRenderStep(\n star,\n context,\n x,\n y,\n doFill,\n doStroke,\n fVisible,\n sVisible,\n starAttribute,\n drawContext,\n fillCb,\n strokeCb\n );\n\n const _runFill = () => {\n if (doFill) {\n if (fillCb) {\n fillCb(context, star.attribute, starAttribute);\n } else if (fVisible) {\n // Apply fill\n context.setCommonStyle(star, star.attribute, originX - x, originY - y, starAttribute);\n context.fill();\n }\n }\n };\n const _runStroke = () => {\n if (doStroke) {\n if (strokeCb) {\n strokeCb(context, star.attribute, starAttribute);\n } else if (sVisible) {\n // Apply stroke\n context.setStrokeStyle(star, star.attribute, originX - x, originY - y, starAttribute);\n context.stroke();\n }\n }\n };\n\n if (!fillStrokeOrder) {\n _runFill();\n _runStroke();\n } else {\n _runStroke();\n _runFill();\n }\n\n this.afterRenderStep(\n star,\n context,\n x,\n y,\n doFill,\n doStroke,\n fVisible,\n sVisible,\n starAttribute,\n drawContext,\n fillCb,\n strokeCb\n );\n }\n\n draw(star: IStar, renderService: IRenderService, drawContext: IDrawContext, params?: IGraphicRenderDrawParams) {\n const starAttribute = getTheme(star, params?.theme).star;\n this._draw(star, starAttribute, false, drawContext, params);\n }\n}\n"]}
@@ -1,4 +1,4 @@
1
- import { bindContributionProvider } from "../../../common/contribution-provider";
1
+ import { bindContributionProvider, createContributionProvider } from "../../../common/contribution-provider";
2
2
 
3
3
  import { isBindingContextLoaded } from "../../../common/module-guard";
4
4
 
@@ -13,8 +13,8 @@ import { DefaultCanvasSymbolRender } from "./symbol-render";
13
13
  const loadedSymbolModuleContexts = new WeakSet;
14
14
 
15
15
  export function bindSymbolRenderModule({bind: bind}) {
16
- isBindingContextLoaded(loadedSymbolModuleContexts, bind) || (bind(DefaultCanvasSymbolRender).toSelf().inSingletonScope(),
17
- bind(SymbolRender).to(DefaultCanvasSymbolRender).inSingletonScope(), bind(GraphicRender).toService(SymbolRender),
16
+ isBindingContextLoaded(loadedSymbolModuleContexts, bind) || (bind(DefaultCanvasSymbolRender).toDynamicValue((({container: container}) => new DefaultCanvasSymbolRender(createContributionProvider(SymbolRenderContribution, container)))).inSingletonScope(),
17
+ bind(SymbolRender).toService(DefaultCanvasSymbolRender), bind(GraphicRender).toService(SymbolRender),
18
18
  bind(SymbolRenderContribution).toService(DefaultBaseInteractiveRenderContribution),
19
19
  bindContributionProvider(bind, SymbolRenderContribution));
20
20
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/render/contributions/render/symbol-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,MAAM,0BAA0B,GAAG,IAAI,OAAO,EAAU,CAAC;AACzD,MAAM,UAAU,sBAAsB,CAAC,EAAE,IAAI,EAAiB;IAC5D,IAAI,sBAAsB,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE;QAC5D,OAAO;KACR;IAED,IAAI,CAAC,yBAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACpE,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC5C,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAEnF,wBAAwB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,sBAAsB,CAAC","file":"symbol-module.js","sourcesContent":["import { bindContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { SymbolRenderContribution } from './contributions/constants';\nimport { GraphicRender, SymbolRender } from './symbol';\nimport { DefaultCanvasSymbolRender } from './symbol-render';\n\nconst loadedSymbolModuleContexts = new WeakSet<object>();\nexport function bindSymbolRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedSymbolModuleContexts, bind)) {\n return;\n }\n // symbol渲染器\n bind(DefaultCanvasSymbolRender).toSelf().inSingletonScope();\n bind(SymbolRender).to(DefaultCanvasSymbolRender).inSingletonScope();\n bind(GraphicRender).toService(SymbolRender);\n bind(SymbolRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n // symbol 渲染器注入contributions\n bindContributionProvider(bind, SymbolRenderContribution);\n}\n\nexport const symbolModule = bindSymbolRenderModule;\n"]}
1
+ {"version":3,"sources":["../src/render/contributions/render/symbol-module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AAC7G,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,wCAAwC,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,MAAM,0BAA0B,GAAG,IAAI,OAAO,EAAU,CAAC;AACzD,MAAM,UAAU,sBAAsB,CAAC,EAAE,IAAI,EAAiB;IAC5D,IAAI,sBAAsB,CAAC,0BAA0B,EAAE,IAAI,CAAC,EAAE;QAC5D,OAAO;KACR;IAED,IAAI,CAAC,yBAAyB,CAAC;SAC5B,cAAc,CACb,CAAC,EAAE,SAAS,EAAsB,EAAE,EAAE,CACpC,IAAI,yBAAyB,CAAC,0BAA0B,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC,CACjG;SACA,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;IACxD,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC5C,IAAI,CAAC,wBAAwB,CAAC,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAC;IAEnF,wBAAwB,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,sBAAsB,CAAC","file":"symbol-module.js","sourcesContent":["import { bindContributionProvider, createContributionProvider } from '../../../common/contribution-provider';\nimport { isBindingContextLoaded } from '../../../common/module-guard';\nimport { DefaultBaseInteractiveRenderContribution } from './contributions';\nimport { SymbolRenderContribution } from './contributions/constants';\nimport { GraphicRender, SymbolRender } from './symbol';\nimport { DefaultCanvasSymbolRender } from './symbol-render';\n\nconst loadedSymbolModuleContexts = new WeakSet<object>();\nexport function bindSymbolRenderModule({ bind }: { bind: any }) {\n if (isBindingContextLoaded(loadedSymbolModuleContexts, bind)) {\n return;\n }\n // symbol渲染器\n bind(DefaultCanvasSymbolRender)\n .toDynamicValue(\n ({ container }: { container: any }) =>\n new DefaultCanvasSymbolRender(createContributionProvider(SymbolRenderContribution, container))\n )\n .inSingletonScope();\n bind(SymbolRender).toService(DefaultCanvasSymbolRender);\n bind(GraphicRender).toService(SymbolRender);\n bind(SymbolRenderContribution).toService(DefaultBaseInteractiveRenderContribution);\n // symbol 渲染器注入contributions\n bindContributionProvider(bind, SymbolRenderContribution);\n}\n\nexport const symbolModule = bindSymbolRenderModule;\n"]}
@@ -1,4 +1,4 @@
1
- import { bindContributionProvider } from "../../../common/contribution-provider";
1
+ import { bindContributionProvider, createContributionProvider } from "../../../common/contribution-provider";
2
2
 
3
3
  import { isBindingContextLoaded } from "../../../common/module-guard";
4
4
 
@@ -13,7 +13,7 @@ import { DefaultCanvasTextRender } from "./text-render";
13
13
  const loadedTextModuleContexts = new WeakSet;
14
14
 
15
15
  export function bindTextRenderModule({bind: bind}) {
16
- isBindingContextLoaded(loadedTextModuleContexts, bind) || (bind(TextRender).to(DefaultCanvasTextRender).inSingletonScope(),
16
+ isBindingContextLoaded(loadedTextModuleContexts, bind) || (bind(TextRender).toDynamicValue((({container: container}) => new DefaultCanvasTextRender(createContributionProvider(TextRenderContribution, container)))).inSingletonScope(),
17
17
  bind(GraphicRender).toService(TextRender), bind(TextRenderContribution).toService(DefaultBaseInteractiveRenderContribution),
18
18
  bindContributionProvider(bind, TextRenderContribution));
19
19
  }