aldehyde 0.2.478 → 0.2.480

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 (250) hide show
  1. package/lib/controls/2dEditor/components/card.js +2 -2
  2. package/lib/controls/2dEditor/components/card.js.map +1 -1
  3. package/lib/controls/2dEditor/components/image.js +1 -1
  4. package/lib/controls/2dEditor/components/image.js.map +1 -1
  5. package/lib/controls/entity-select/entity-select.js +3 -3
  6. package/lib/controls/entity-select/entity-select.js.map +1 -1
  7. package/lib/controls/upload/index.js +1 -1
  8. package/lib/controls/upload/index.js.map +1 -1
  9. package/lib/controls/upload/mult-file-upload.js +2 -2
  10. package/lib/controls/upload/mult-file-upload.js.map +1 -1
  11. package/lib/draw-canvas-edit/components/asset-bar/index.d.ts +1 -0
  12. package/lib/draw-canvas-edit/components/asset-bar/index.d.ts.map +1 -1
  13. package/lib/draw-canvas-edit/components/asset-bar/index.js +9 -7
  14. package/lib/draw-canvas-edit/components/asset-bar/index.js.map +1 -1
  15. package/lib/draw-canvas-edit/components/main-header/index.less +3 -0
  16. package/lib/draw-canvas-edit/components/render/draws/bg-draw.d.ts.map +1 -1
  17. package/lib/draw-canvas-edit/components/render/draws/bg-draw.js +14 -1
  18. package/lib/draw-canvas-edit/components/render/draws/bg-draw.js.map +1 -1
  19. package/lib/draw-canvas-edit/components/render/draws/contextmenu-draw.d.ts.map +1 -1
  20. package/lib/draw-canvas-edit/components/render/draws/contextmenu-draw.js +30 -6
  21. package/lib/draw-canvas-edit/components/render/draws/contextmenu-draw.js.map +1 -1
  22. package/lib/draw-canvas-edit/components/render/graphs/bezier.js +3 -3
  23. package/lib/draw-canvas-edit/components/render/graphs/bezier.js.map +1 -1
  24. package/lib/draw-canvas-edit/components/render/graphs/circle.js +2 -2
  25. package/lib/draw-canvas-edit/components/render/graphs/circle.js.map +1 -1
  26. package/lib/draw-canvas-edit/components/render/graphs/curve.js +3 -3
  27. package/lib/draw-canvas-edit/components/render/graphs/curve.js.map +1 -1
  28. package/lib/draw-canvas-edit/components/render/graphs/line.js +3 -3
  29. package/lib/draw-canvas-edit/components/render/graphs/line.js.map +1 -1
  30. package/lib/draw-canvas-edit/components/render/graphs/rect.js +2 -2
  31. package/lib/draw-canvas-edit/components/render/graphs/rect.js.map +1 -1
  32. package/lib/draw-canvas-edit/components/render/handlers/drag-outside-handlers.d.ts +1 -1
  33. package/lib/draw-canvas-edit/components/render/handlers/drag-outside-handlers.d.ts.map +1 -1
  34. package/lib/draw-canvas-edit/components/render/handlers/drag-outside-handlers.js +58 -122
  35. package/lib/draw-canvas-edit/components/render/handlers/drag-outside-handlers.js.map +1 -1
  36. package/lib/draw-canvas-edit/components/render/handlers/graph-handlers.d.ts.map +1 -1
  37. package/lib/draw-canvas-edit/components/render/handlers/graph-handlers.js +2 -1
  38. package/lib/draw-canvas-edit/components/render/handlers/graph-handlers.js.map +1 -1
  39. package/lib/draw-canvas-edit/components/render/handlers/selection-handlers.d.ts.map +1 -1
  40. package/lib/draw-canvas-edit/components/render/handlers/selection-handlers.js +11 -4
  41. package/lib/draw-canvas-edit/components/render/handlers/selection-handlers.js.map +1 -1
  42. package/lib/draw-canvas-edit/components/render/index.d.ts +3 -1
  43. package/lib/draw-canvas-edit/components/render/index.d.ts.map +1 -1
  44. package/lib/draw-canvas-edit/components/render/index.js +38 -27
  45. package/lib/draw-canvas-edit/components/render/index.js.map +1 -1
  46. package/lib/draw-canvas-edit/components/render/tools/attract-tool.d.ts +2 -1
  47. package/lib/draw-canvas-edit/components/render/tools/attract-tool.d.ts.map +1 -1
  48. package/lib/draw-canvas-edit/components/render/tools/attract-tool.js +33 -8
  49. package/lib/draw-canvas-edit/components/render/tools/attract-tool.js.map +1 -1
  50. package/lib/draw-canvas-edit/components/render/tools/component-factory.d.ts +62 -0
  51. package/lib/draw-canvas-edit/components/render/tools/component-factory.d.ts.map +1 -0
  52. package/lib/draw-canvas-edit/components/render/tools/component-factory.js +289 -0
  53. package/lib/draw-canvas-edit/components/render/tools/component-factory.js.map +1 -0
  54. package/lib/draw-canvas-edit/components/render/tools/copy-tool.d.ts +0 -2
  55. package/lib/draw-canvas-edit/components/render/tools/copy-tool.d.ts.map +1 -1
  56. package/lib/draw-canvas-edit/components/render/tools/copy-tool.js +23 -45
  57. package/lib/draw-canvas-edit/components/render/tools/copy-tool.js.map +1 -1
  58. package/lib/draw-canvas-edit/components/render/tools/import-export-tool.d.ts.map +1 -1
  59. package/lib/draw-canvas-edit/components/render/tools/import-export-tool.js +20 -41
  60. package/lib/draw-canvas-edit/components/render/tools/import-export-tool.js.map +1 -1
  61. package/lib/draw-canvas-edit/components/render/tools/index.d.ts +1 -0
  62. package/lib/draw-canvas-edit/components/render/tools/index.d.ts.map +1 -1
  63. package/lib/draw-canvas-edit/components/render/tools/index.js +1 -0
  64. package/lib/draw-canvas-edit/components/render/tools/index.js.map +1 -1
  65. package/lib/draw-canvas-edit/components/render/tools/selection-tool.d.ts.map +1 -1
  66. package/lib/draw-canvas-edit/components/render/tools/selection-tool.js +32 -19
  67. package/lib/draw-canvas-edit/components/render/tools/selection-tool.js.map +1 -1
  68. package/lib/draw-canvas-edit/components/render/types.d.ts +8 -6
  69. package/lib/draw-canvas-edit/components/render/types.d.ts.map +1 -1
  70. package/lib/draw-canvas-edit/components/render/types.js.map +1 -1
  71. package/lib/draw-canvas-edit/components/setting-form/imag-upload.d.ts.map +1 -1
  72. package/lib/draw-canvas-edit/components/setting-form/imag-upload.js +3 -3
  73. package/lib/draw-canvas-edit/components/setting-form/imag-upload.js.map +1 -1
  74. package/lib/draw-canvas-edit/components/setting-form/index.d.ts.map +1 -1
  75. package/lib/draw-canvas-edit/components/setting-form/index.js +3 -5
  76. package/lib/draw-canvas-edit/components/setting-form/index.js.map +1 -1
  77. package/lib/draw-canvas-edit/index.d.ts.map +1 -1
  78. package/lib/draw-canvas-edit/index.js +6 -2
  79. package/lib/draw-canvas-edit/index.js.map +1 -1
  80. package/lib/draw-canvas-view/index.d.ts.map +1 -1
  81. package/lib/draw-canvas-view/index.js +4 -2
  82. package/lib/draw-canvas-view/index.js.map +1 -1
  83. package/lib/draw-canvas-view/view.d.ts +2 -0
  84. package/lib/draw-canvas-view/view.d.ts.map +1 -1
  85. package/lib/draw-canvas-view/view.js +46 -35
  86. package/lib/draw-canvas-view/view.js.map +1 -1
  87. package/lib/export/export-frame.d.ts.map +1 -1
  88. package/lib/export/export-frame.js +1 -1
  89. package/lib/export/export-frame.js.map +1 -1
  90. package/lib/export/select-code-export-frame.js +1 -1
  91. package/lib/export/select-code-export-frame.js.map +1 -1
  92. package/lib/form/criteria-form.js +17 -17
  93. package/lib/form/criteria-form.js.map +1 -1
  94. package/lib/form/dtmpl-form.d.ts.map +1 -1
  95. package/lib/form/dtmpl-form.js +9 -0
  96. package/lib/form/dtmpl-form.js.map +1 -1
  97. package/lib/form/form-Item-group.js +2 -2
  98. package/lib/form/form-Item-group.js.map +1 -1
  99. package/lib/import/excel-import.d.ts.map +1 -1
  100. package/lib/import/excel-import.js +1 -1
  101. package/lib/import/excel-import.js.map +1 -1
  102. package/lib/layout2/page.d.ts +1 -1
  103. package/lib/layout2/page.d.ts.map +1 -1
  104. package/lib/layout2/page.js +17 -4
  105. package/lib/layout2/page.js.map +1 -1
  106. package/lib/layout3/page.js +1 -1
  107. package/lib/layout3/page.js.map +1 -1
  108. package/lib/layout4/page.js +1 -1
  109. package/lib/layout4/page.js.map +1 -1
  110. package/lib/layout5/page.js +1 -1
  111. package/lib/layout5/page.js.map +1 -1
  112. package/lib/login/login.d.ts +1 -0
  113. package/lib/login/login.d.ts.map +1 -1
  114. package/lib/login/login.js +8 -6
  115. package/lib/login/login.js.map +1 -1
  116. package/lib/login2/login.d.ts +1 -0
  117. package/lib/login2/login.d.ts.map +1 -1
  118. package/lib/login2/login.js +10 -9
  119. package/lib/login2/login.js.map +1 -1
  120. package/lib/lowcode-components/base-button/index.js +1 -1
  121. package/lib/lowcode-components/base-button/index.js.map +1 -1
  122. package/lib/lowcode-components/base-image/index.js +1 -1
  123. package/lib/lowcode-components/base-image/index.js.map +1 -1
  124. package/lib/lowcode-components/base-map/index.js +1 -1
  125. package/lib/lowcode-components/base-map/index.js.map +1 -1
  126. package/lib/lowcode-components/base-tabs/index.js +1 -1
  127. package/lib/lowcode-components/base-tabs/index.js.map +1 -1
  128. package/lib/lowcode-components/carousel/index.js +1 -1
  129. package/lib/lowcode-components/carousel/index.js.map +1 -1
  130. package/lib/lowcode-components/effectScatter-map/index.js +1 -1
  131. package/lib/lowcode-components/effectScatter-map/index.js.map +1 -1
  132. package/lib/lowcode-components/effectScatter-map-3d/index.js +1 -1
  133. package/lib/lowcode-components/effectScatter-map-3d/index.js.map +1 -1
  134. package/lib/lowcode-components/lowcode-view/index.js +1 -1
  135. package/lib/lowcode-components/lowcode-view/index.js.map +1 -1
  136. package/lib/lowcode-components/radar-chart/index.js +3 -3
  137. package/lib/lowcode-components/radar-chart/index.js.map +1 -1
  138. package/lib/module/dtmpl-edit-card.js +4 -4
  139. package/lib/module/dtmpl-edit-card.js.map +1 -1
  140. package/lib/module/dtmpl-edit-page.d.ts.map +1 -1
  141. package/lib/module/dtmpl-edit-page.js +7 -4
  142. package/lib/module/dtmpl-edit-page.js.map +1 -1
  143. package/lib/sso-Login/index.d.ts.map +1 -1
  144. package/lib/sso-Login/index.js +4 -3
  145. package/lib/sso-Login/index.js.map +1 -1
  146. package/lib/sso-Login/service/index.d.ts.map +1 -1
  147. package/lib/sso-Login/service/index.js +2 -1
  148. package/lib/sso-Login/service/index.js.map +1 -1
  149. package/lib/sso-Login/service/login.js +8 -7
  150. package/lib/sso-Login/service/login.js.map +1 -1
  151. package/lib/table/act-table.js +8 -8
  152. package/lib/table/act-table.js.map +1 -1
  153. package/lib/table/modal-select-table.d.ts +2 -2
  154. package/lib/table/modal-select-table.d.ts.map +1 -1
  155. package/lib/table/modal-select-table.js +10 -10
  156. package/lib/table/modal-select-table.js.map +1 -1
  157. package/lib/table/relation-table.d.ts +2 -2
  158. package/lib/table/relation-table.js +1 -1
  159. package/lib/table/relation-table.js.map +1 -1
  160. package/lib/table/select-table.js +2 -2
  161. package/lib/table/select-table.js.map +1 -1
  162. package/lib/tmpl/hc-data-source.js +2 -2
  163. package/lib/tmpl/hc-data-source.js.map +1 -1
  164. package/lib/tmpl/hcservice-v3.d.ts +7 -7
  165. package/lib/tmpl/hcservice-v3.d.ts.map +1 -1
  166. package/lib/tmpl/hcservice-v3.js +22 -17
  167. package/lib/tmpl/hcservice-v3.js.map +1 -1
  168. package/lib/tmpl/interface.d.ts +8 -7
  169. package/lib/tmpl/interface.d.ts.map +1 -1
  170. package/lib/tmpl/superagent.d.ts +1 -0
  171. package/lib/tmpl/superagent.d.ts.map +1 -1
  172. package/lib/tmpl/superagent.js +7 -3
  173. package/lib/tmpl/superagent.js.map +1 -1
  174. package/lib/tmpl/tmpl-config-analysis.d.ts.map +1 -1
  175. package/lib/tmpl/tmpl-config-analysis.js +23 -23
  176. package/lib/tmpl/tmpl-config-analysis.js.map +1 -1
  177. package/lib/units/index.d.ts +7 -4
  178. package/lib/units/index.d.ts.map +1 -1
  179. package/lib/units/index.js +66 -24
  180. package/lib/units/index.js.map +1 -1
  181. package/lib/welcome/HCWelcome.js +4 -2
  182. package/lib/welcome/HCWelcome.js.map +1 -1
  183. package/package.json +1 -1
  184. package/src/aldehyde/controls/2dEditor/components/card.tsx +2 -2
  185. package/src/aldehyde/controls/2dEditor/components/image.tsx +1 -1
  186. package/src/aldehyde/controls/entity-select/entity-select.tsx +3 -3
  187. package/src/aldehyde/controls/upload/index.tsx +1 -1
  188. package/src/aldehyde/controls/upload/mult-file-upload.tsx +2 -2
  189. package/src/aldehyde/draw-canvas-edit/components/asset-bar/index.tsx +9 -7
  190. package/src/aldehyde/draw-canvas-edit/components/main-header/index.less +3 -0
  191. package/src/aldehyde/draw-canvas-edit/components/render/draws/bg-draw.ts +17 -1
  192. package/src/aldehyde/draw-canvas-edit/components/render/draws/contextmenu-draw.ts +30 -6
  193. package/src/aldehyde/draw-canvas-edit/components/render/graphs/bezier.ts +3 -3
  194. package/src/aldehyde/draw-canvas-edit/components/render/graphs/circle.ts +2 -2
  195. package/src/aldehyde/draw-canvas-edit/components/render/graphs/curve.ts +3 -3
  196. package/src/aldehyde/draw-canvas-edit/components/render/graphs/line.ts +3 -3
  197. package/src/aldehyde/draw-canvas-edit/components/render/graphs/rect.ts +2 -2
  198. package/src/aldehyde/draw-canvas-edit/components/render/handlers/drag-outside-handlers.ts +45 -130
  199. package/src/aldehyde/draw-canvas-edit/components/render/handlers/graph-handlers.ts +7 -1
  200. package/src/aldehyde/draw-canvas-edit/components/render/handlers/selection-handlers.ts +11 -5
  201. package/src/aldehyde/draw-canvas-edit/components/render/index.ts +39 -30
  202. package/src/aldehyde/draw-canvas-edit/components/render/tools/attract-tool.ts +30 -10
  203. package/src/aldehyde/draw-canvas-edit/components/render/tools/component-factory.ts +302 -0
  204. package/src/aldehyde/draw-canvas-edit/components/render/tools/copy-tool.ts +24 -46
  205. package/src/aldehyde/draw-canvas-edit/components/render/tools/import-export-tool.ts +22 -46
  206. package/src/aldehyde/draw-canvas-edit/components/render/tools/index.ts +1 -0
  207. package/src/aldehyde/draw-canvas-edit/components/render/tools/selection-tool.ts +34 -23
  208. package/src/aldehyde/draw-canvas-edit/components/render/types.ts +6 -6
  209. package/src/aldehyde/draw-canvas-edit/components/setting-form/imag-upload.tsx +3 -2
  210. package/src/aldehyde/draw-canvas-edit/components/setting-form/index.tsx +3 -5
  211. package/src/aldehyde/draw-canvas-edit/index.tsx +6 -2
  212. package/src/aldehyde/draw-canvas-view/index.tsx +3 -1
  213. package/src/aldehyde/draw-canvas-view/view.tsx +228 -212
  214. package/src/aldehyde/export/export-frame.tsx +27 -27
  215. package/src/aldehyde/export/select-code-export-frame.tsx +1 -1
  216. package/src/aldehyde/form/criteria-form.tsx +18 -18
  217. package/src/aldehyde/form/dtmpl-form.tsx +9 -0
  218. package/src/aldehyde/form/form-Item-group.tsx +2 -2
  219. package/src/aldehyde/import/excel-import.tsx +9 -9
  220. package/src/aldehyde/layout2/page.tsx +16 -4
  221. package/src/aldehyde/layout3/page.tsx +1 -1
  222. package/src/aldehyde/layout4/page.tsx +1 -1
  223. package/src/aldehyde/layout5/page.tsx +1 -1
  224. package/src/aldehyde/login/login.tsx +113 -110
  225. package/src/aldehyde/login2/login.tsx +14 -8
  226. package/src/aldehyde/lowcode-components/base-button/index.tsx +1 -1
  227. package/src/aldehyde/lowcode-components/base-image/index.tsx +1 -1
  228. package/src/aldehyde/lowcode-components/base-map/index.tsx +1 -1
  229. package/src/aldehyde/lowcode-components/base-tabs/index.tsx +1 -1
  230. package/src/aldehyde/lowcode-components/carousel/index.tsx +1 -1
  231. package/src/aldehyde/lowcode-components/effectScatter-map/index.tsx +1 -1
  232. package/src/aldehyde/lowcode-components/effectScatter-map-3d/index.tsx +1 -1
  233. package/src/aldehyde/lowcode-components/lowcode-view/index.tsx +1 -1
  234. package/src/aldehyde/lowcode-components/radar-chart/index.tsx +3 -3
  235. package/src/aldehyde/module/dtmpl-edit-card.tsx +4 -4
  236. package/src/aldehyde/module/dtmpl-edit-page.tsx +7 -4
  237. package/src/aldehyde/sso-Login/index.tsx +4 -3
  238. package/src/aldehyde/sso-Login/service/index.js +2 -1
  239. package/src/aldehyde/sso-Login/service/login.js +8 -7
  240. package/src/aldehyde/table/act-table.tsx +8 -8
  241. package/src/aldehyde/table/modal-select-table.tsx +10 -10
  242. package/src/aldehyde/table/relation-table.tsx +1 -1
  243. package/src/aldehyde/table/select-table.tsx +2 -2
  244. package/src/aldehyde/tmpl/hc-data-source.tsx +2 -2
  245. package/src/aldehyde/tmpl/hcservice-v3.tsx +23 -16
  246. package/src/aldehyde/tmpl/interface.tsx +8 -7
  247. package/src/aldehyde/tmpl/superagent.js +6 -2
  248. package/src/aldehyde/tmpl/tmpl-config-analysis.tsx +23 -24
  249. package/src/aldehyde/units/index.tsx +67 -30
  250. package/src/aldehyde/welcome/HCWelcome.js +3 -2
@@ -293,9 +293,9 @@ TmplConfigAnalysis.buildInFuncFields = (dtmplConfig) => {
293
293
  let buildInFuncFields = [];
294
294
  for (let group of dtmplConfig.groups) {
295
295
  for (let field of group.fields) {
296
- if ((field.requiredRuleCriterias &&
297
- field.requiredRuleCriterias.length > 0) ||
298
- (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
296
+ if ((field.requiredRuleCriteria &&
297
+ field.requiredRuleCriteria.length > 0) ||
298
+ (field.usableRuleCriteria && field.usableRuleCriteria.length > 0)
299
299
  || field.relValueField || field.relValueField3) {
300
300
  field.shouldUpdate = true;
301
301
  buildInFuncFields.push(field);
@@ -314,18 +314,18 @@ TmplConfigAnalysis.buildInDtmplConfig = (dtmplConfig, dtmplData, props) => {
314
314
  function setConfig(changedValues, allValues, formInstance) {
315
315
  var _a, _b;
316
316
  for (let field of dtmplConfig.buildInFuncFields) {
317
- if (field.requiredRuleCriterias != null &&
318
- field.requiredRuleCriterias.length > 0) {
319
- if (ActionUtils.isMatch(field.requiredRuleCriterias, [allValues], formInstance, dtmplConfig)) {
317
+ if (field.requiredRuleCriteria != null &&
318
+ field.requiredRuleCriteria.length > 0) {
319
+ if (ActionUtils.isMatch(field.requiredRuleCriteria, [allValues], formInstance, dtmplConfig)) {
320
320
  field.required = true;
321
321
  }
322
322
  else {
323
323
  field.required = false;
324
324
  }
325
325
  }
326
- if (field.usableRuleCriterias != null &&
327
- field.usableRuleCriterias.length > 0) {
328
- if (ActionUtils.isMatch(field.usableRuleCriterias, [allValues], formInstance, dtmplConfig)) {
326
+ if (field.usableRuleCriteria != null &&
327
+ field.usableRuleCriteria.length > 0) {
328
+ if (ActionUtils.isMatch(field.usableRuleCriteria, [allValues], formInstance, dtmplConfig)) {
329
329
  if (field.unusableMode === "hidden") {
330
330
  field.hidden = false;
331
331
  }
@@ -345,11 +345,11 @@ TmplConfigAnalysis.buildInDtmplConfig = (dtmplConfig, dtmplData, props) => {
345
345
  if (!changedValues) {
346
346
  continue;
347
347
  }
348
- const requireValue = (_a = field.requiredRuleCriterias) === null || _a === void 0 ? void 0 : _a.find(r => {
348
+ const requireValue = (_a = field.requiredRuleCriteria) === null || _a === void 0 ? void 0 : _a.find(r => {
349
349
  const id = TmplConfigAnalysis.getFieldId(dtmplConfig, r.mstrucId);
350
350
  return changedValues.hasOwnProperty(id);
351
351
  });
352
- const usableValue = (_b = field.usableRuleCriterias) === null || _b === void 0 ? void 0 : _b.some(r => {
352
+ const usableValue = (_b = field.usableRuleCriteria) === null || _b === void 0 ? void 0 : _b.some(r => {
353
353
  const id = TmplConfigAnalysis.getFieldId(dtmplConfig, r.mstrucId);
354
354
  return changedValues.hasOwnProperty(id);
355
355
  });
@@ -436,13 +436,13 @@ TmplConfigAnalysis.getRules = (fieldConfig, translate) => {
436
436
  };
437
437
  TmplConfigAnalysis.buildInCtmplConfig = (ltmplConfig, criteriaData, props) => {
438
438
  if (!ltmplConfig.buildInFuncFields) {
439
- const { commonCriterias, criterias } = ltmplConfig;
439
+ const { commonCriteria, criteria } = ltmplConfig;
440
440
  //先找到有业务的
441
441
  let buildInFuncFields = [];
442
- for (let field of ((commonCriterias === null || commonCriterias === void 0 ? void 0 : commonCriterias.length) ? commonCriterias : criterias)) {
443
- if ((field.requiredRuleCriterias &&
444
- field.requiredRuleCriterias.length > 0) ||
445
- (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
442
+ for (let field of ((commonCriteria === null || commonCriteria === void 0 ? void 0 : commonCriteria.length) ? commonCriteria : criteria)) {
443
+ if ((field.requiredRuleCriteria &&
444
+ field.requiredRuleCriteria.length > 0) ||
445
+ (field.usableRuleCriteria && field.usableRuleCriteria.length > 0)
446
446
  || field.relValueField) {
447
447
  field.shouldUpdate = true;
448
448
  buildInFuncFields.push(field);
@@ -450,9 +450,9 @@ TmplConfigAnalysis.buildInCtmplConfig = (ltmplConfig, criteriaData, props) => {
450
450
  }
451
451
  if (ltmplConfig['drillingParams']) {
452
452
  for (let field of ltmplConfig['drillingParams']) {
453
- if ((field.requiredRuleCriterias &&
454
- field.requiredRuleCriterias.length > 0) ||
455
- (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
453
+ if ((field.requiredRuleCriteria &&
454
+ field.requiredRuleCriteria.length > 0) ||
455
+ (field.usableRuleCriteria && field.usableRuleCriteria.length > 0)
456
456
  || field.relValueField) {
457
457
  field.shouldUpdate = true;
458
458
  buildInFuncFields.push(field);
@@ -468,11 +468,11 @@ TmplConfigAnalysis.buildInCtmplConfig = (ltmplConfig, criteriaData, props) => {
468
468
  if (!field.baseCriteria) {
469
469
  field.baseCriteria = {};
470
470
  }
471
- let secondCriteria = changedValues["c_" + field.relValueField.id];
472
- if ((secondCriteria === null || secondCriteria === void 0 ? void 0 : secondCriteria.includes("@R@")) || (secondCriteria === null || secondCriteria === void 0 ? void 0 : secondCriteria.includes("@,@"))) { // 处理关系字段多选
473
- secondCriteria = secondCriteria.split("@,@").map(r => r.split("@R@")[0]).join(",");
471
+ let secondCriterion = changedValues["c_" + field.relValueField.id];
472
+ if ((secondCriterion === null || secondCriterion === void 0 ? void 0 : secondCriterion.includes("@R@")) || (secondCriterion === null || secondCriterion === void 0 ? void 0 : secondCriterion.includes("@,@"))) { // 处理关系字段多选
473
+ secondCriterion = secondCriterion.split("@,@").map(r => r.split("@R@")[0]).join(",");
474
474
  }
475
- field.baseCriteria = Object.assign(Object.assign({}, field.baseCriteria), { "secondCriteria": secondCriteria });
475
+ field.baseCriteria = Object.assign(Object.assign({}, field.baseCriteria), { "secondCriterion": secondCriterion });
476
476
  field.configChanged = true;
477
477
  if (clearCurrent) { // 是否清除关联项(搜索表单初始化设置不可清除)
478
478
  if (formInstance.getFieldValue(field.id)) {
@@ -1 +1 @@
1
- {"version":3,"file":"tmpl-config-analysis.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/tmpl-config-analysis.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tmpl-config-analysis.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/tmpl-config-analysis.tsx"],"names":[],"mappings":"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"}
@@ -22,17 +22,20 @@ declare const _default: {
22
22
  setProgramCode(programCode_: string, key?: string): void;
23
23
  setSessionProgramCode(programCode_: string): void;
24
24
  programCode(key?: string): any;
25
+ setApplicationCode(applicationCode_: string, key?: string): void;
26
+ setSessionApplicationCode(applicationCode_: string): void;
27
+ applicationCode(key?: string): any;
25
28
  setHydrocarbonServer(url: string, key?: string): void;
26
29
  setProgramName_Logo(logo1: string): void;
27
30
  api(key?: string): any;
28
- hydrocarbonToken(programCode_?: string): string;
31
+ hydrocarbonToken(programCode_?: string, applicationCode_?: string): string;
29
32
  setServerHydrocarbonToken(serverkey: string, token: string): void;
30
33
  serverHydrocarbonToken(serverKey: string): string;
31
34
  putExtendServers(extendServers: any): void;
32
35
  getExtendServers(serverKey: any): any;
33
36
  setHydrocarbonToken(token: string, serverkey?: string): void;
34
- setLocalHydrocarbonToken(token: string, programCode_?: string): void;
35
- setSessionHydrocarbonToken(token: string, programCode_?: string): void;
37
+ setLocalHydrocarbonToken(token: string, programCode_?: string, applicationCode_?: string): void;
38
+ setSessionHydrocarbonToken(token: string, programCode_?: string, applicationCode_?: string): void;
36
39
  setProgramName(programName_: string): void;
37
40
  programName(): string;
38
41
  setProgramName_sub(programName_sub_: string): void;
@@ -94,7 +97,7 @@ declare const _default: {
94
97
  setProgramCode4RoutePath(pathParams: any): void;
95
98
  setSessionProgramCode4RoutePath(pathParams: any): void;
96
99
  getReactKey(): string;
97
- getUserInfo(programCode?: string, token?: string): Promise<any>;
100
+ getUserInfo(programCode?: string, token?: string, applicationCode?: string): Promise<any>;
98
101
  getCurrentUserInfo(): any;
99
102
  setCustomComponent(key_: string, name: object): void;
100
103
  getCustomComponent(key: string): any;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/units/index.tsx"],"names":[],"mappings":"AACA,OAAO,EACW,kBAAkB,EAClC,WAAW,EACX,SAAS,EACT,cAAc,EACd,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;;;;+BAoDjD,MAAM,QACL,CAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,KAAK,WAAW;;;;;mCAyBxD,WAAW,aACb,SAAS,SACb,cAAc;+BAsBhB,MAAM,UACH,kBAAkB;+BAMrB,MAAM;+BAMN,MAAM,QACL,CAAC,WAAW,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,KAAK,YAAY;mCAMlD,YAAY,gBACX,MAAM,SACb,iBAAiB;sCAqBQ,WAAW;wBAOzB,MAAM,QAAQ,MAAM;2BAUjB,MAAM,QAAQ,MAAM,QAAQ,MAAM;8BAQ/B,MAAM;8BAUN,MAAM;uBAUb,MAAM;iCAUI,MAAM,QAAQ,MAAM;wCAUb,MAAM;sBAKxB,MAAM;8BAiBE,MAAM,QAAQ,MAAM;+BAYnB,MAAM;cAUvB,MAAM;oCAoCgB,MAAM;yCAqBD,MAAM,SAAS,MAAM;sCAMxB,MAAM;;;+BA0Bb,MAAM,cAAc,MAAM;oCAKrB,MAAM,iBAAiB,MAAM;sCAkB3B,MAAM,iBAAiB,MAAM;iCAkBlC,MAAM;;yCAiBE,MAAM;;iDAmBE,MAAM;;;sBAmCjC,MAAM,EAAE;;2BAyBH,MAAM;;;;;;;;;;;;;;;;;;IA+J7B;;;;;OAKG;;;;;;;uBA2HgB,MAAM,SAAS,MAAM,eAAe,WAAW;iDA8B1B,WAAW;;4BA0C3B,MAAM,YAAY,MAAM;;;;4BAgFxB,QAAQ,EAAE;;;;;;;;;;;;;;;8BA4NF,MAAM,UAAU,MAAM;;6BAqB7B,MAAM,QAAQ,MAAM;4BAOrB,MAAM;;;;;;;;;;;;;;;;;;;8BAeJ,MAAM;+BAaC,MAAM;;iCAeV;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;2BAO5B,MAAM,WAAW;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;2BAgBjC,MAAM;6BAaV,MAAM;kCAcK,MAAM,SAAS,SAAS,GAAG,SAAS;;gCAkB5C,GAAG,EAAE,SAAS,MAAM,GAAG,MAAM;2BAiB5B,MAAM,EAAE;+BAaV,MAAM;;AAlvCnC,wBAyvCE"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/units/index.tsx"],"names":[],"mappings":"AACA,OAAO,EACW,kBAAkB,EAClC,WAAW,EACX,SAAS,EACT,cAAc,EACd,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;;;;+BAoDjD,MAAM,QACL,CAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,KAAK,WAAW;;;;;mCAyBxD,WAAW,aACb,SAAS,SACb,cAAc;+BAsBhB,MAAM,UACH,kBAAkB;+BAMrB,MAAM;+BAMN,MAAM,QACL,CAAC,WAAW,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,KAAK,YAAY;mCAMlD,YAAY,gBACX,MAAM,SACb,iBAAiB;sCAqBQ,WAAW;wBAOzB,MAAM,QAAQ,MAAM;2BAUjB,MAAM,QAAQ,MAAM,QAAQ,MAAM;8BAQ/B,MAAM;8BAUN,MAAM;uBAUb,MAAM;iCAUI,MAAM,QAAQ,MAAM;wCAUb,MAAM;sBAKxB,MAAM;yCAiBa,MAAM,QAAQ,MAAM;gDAUb,MAAM;0BAK5B,MAAM;8BAcF,MAAM,QAAQ,MAAM;+BAYnB,MAAM;cAUvB,MAAM;oCAoCgB,MAAM,qBAAqB,MAAM;yCAsB5B,MAAM,SAAS,MAAM;sCAMxB,MAAM;;;+BAsBb,MAAM,cAAc,MAAM;oCAMrB,MAAM,iBAAiB,MAAM,qBAAqB,MAAM;sCAmBtD,MAAM,iBAAiB,MAAM,qBAAqB,MAAM;iCAmB7D,MAAM;;yCAiBE,MAAM;;iDAmBE,MAAM;;;sBAmCjC,MAAM,EAAE;;2BAyBH,MAAM;;;;;;;;;;;;;;;;;;IAgK7B;;;;;OAKG;;;;;;;uBA2HgB,MAAM,SAAS,MAAM,eAAe,WAAW;iDA8B1B,WAAW;;4BA0C3B,MAAM,YAAY,MAAM;;;;4BAgFxB,QAAQ,EAAE;;;;;;;;;;;;;;;8BA8NF,MAAM,UAAU,MAAM,oBAAoB,MAAM;;6BAqBvD,MAAM,QAAQ,MAAM;4BAOrB,MAAM;;;;;;;;;;;;;;;;;;;8BAeJ,MAAM;+BAaC,MAAM;;iCAgBV;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;2BAQ5B,MAAM,WAAW;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;2BAiBjC,MAAM;6BAcV,MAAM;kCAeK,MAAM,SAAS,SAAS,GAAG,SAAS;;gCAkB5C,GAAG,EAAE,SAAS,MAAM,GAAG,MAAM;2BAiB5B,MAAM,EAAE;+BAaV,MAAM;;AAvxCnC,wBA8xCE"}
@@ -180,6 +180,36 @@ export default {
180
180
  }
181
181
  return programCode;
182
182
  },
183
+ setApplicationCode(applicationCode_, key) {
184
+ if (applicationCode_) {
185
+ if (key) {
186
+ window.localStorage.setItem(key + "applicationCode", applicationCode_);
187
+ }
188
+ else {
189
+ window.localStorage.setItem("applicationCode", applicationCode_);
190
+ window.sessionStorage.setItem("applicationCode", applicationCode_);
191
+ }
192
+ }
193
+ },
194
+ setSessionApplicationCode(applicationCode_) {
195
+ if (applicationCode_) {
196
+ window.sessionStorage.setItem("applicationCode", applicationCode_);
197
+ }
198
+ },
199
+ applicationCode(key) {
200
+ let applicationCode = null;
201
+ if (key) {
202
+ applicationCode = window.localStorage.getItem(key + "applicationCode");
203
+ }
204
+ else {
205
+ applicationCode = window.sessionStorage.getItem("applicationCode");
206
+ }
207
+ if (!applicationCode) {
208
+ applicationCode = window.localStorage.getItem("applicationCode");
209
+ this.setSessionProgramCode(applicationCode);
210
+ }
211
+ return applicationCode;
212
+ },
183
213
  setHydrocarbonServer(url, key) {
184
214
  if (key) {
185
215
  window.localStorage.setItem(key + "hydrocarbonServer", url);
@@ -237,19 +267,20 @@ export default {
237
267
  }
238
268
  return appi;
239
269
  },
240
- hydrocarbonToken(programCode_) {
270
+ hydrocarbonToken(programCode_, applicationCode_) {
241
271
  let programCode = programCode_ ? programCode_ : this.programCode();
242
- let hydrocarbonToken = window.sessionStorage.getItem(programCode + "hydrocarbonToken");
272
+ let applicationCode = applicationCode_ || this.applicationCode() || "";
273
+ let hydrocarbonToken = window.sessionStorage.getItem(programCode + applicationCode + "hydrocarbonToken");
243
274
  if (!hydrocarbonToken) {
244
275
  hydrocarbonToken = window.sessionStorage.getItem("hydrocarbonToken");
245
276
  }
246
277
  if (!hydrocarbonToken) {
247
- hydrocarbonToken = window.localStorage.getItem(programCode + "hydrocarbonToken");
278
+ hydrocarbonToken = window.localStorage.getItem(programCode + applicationCode + "hydrocarbonToken");
248
279
  if (!hydrocarbonToken) {
249
280
  hydrocarbonToken = window.localStorage.getItem("hydrocarbonToken");
250
281
  }
251
282
  if (hydrocarbonToken) {
252
- this.setSessionHydrocarbonToken(hydrocarbonToken, programCode);
283
+ this.setSessionHydrocarbonToken(hydrocarbonToken, programCode, applicationCode);
253
284
  }
254
285
  }
255
286
  return hydrocarbonToken;
@@ -265,7 +296,7 @@ export default {
265
296
  if (!hydrocarbonToken) {
266
297
  hydrocarbonToken = window.localStorage.getItem(serverKey + "hydrocarbonToken");
267
298
  }
268
- if (!hydrocarbonToken) {
299
+ if (!serverKey || !hydrocarbonToken) { // serverKey不存在
269
300
  hydrocarbonToken = this.hydrocarbonToken();
270
301
  }
271
302
  return hydrocarbonToken;
@@ -284,18 +315,20 @@ export default {
284
315
  },
285
316
  setHydrocarbonToken(token, serverkey) {
286
317
  let programCode = this.programCode(serverkey);
287
- this.setLocalHydrocarbonToken(token, programCode);
288
- this.setSessionHydrocarbonToken(token, programCode);
318
+ let applicationCode = this.applicationCode(serverkey);
319
+ this.setLocalHydrocarbonToken(token, programCode, applicationCode);
320
+ this.setSessionHydrocarbonToken(token, programCode, applicationCode);
289
321
  },
290
- setLocalHydrocarbonToken(token, programCode_) {
322
+ setLocalHydrocarbonToken(token, programCode_, applicationCode_) {
291
323
  if (!programCode_) {
292
324
  // if(!window.localStorage.getItem('hydrocarbonToken')){
293
325
  window.localStorage.setItem("hydrocarbonToken", token);
294
326
  //}
295
327
  }
296
328
  let programCode = programCode_ ? programCode_ : this.programCode();
329
+ let applicationCode = applicationCode_ || this.applicationCode() || "";
297
330
  if (programCode) {
298
- window.localStorage.setItem(programCode + "hydrocarbonToken", token);
331
+ window.localStorage.setItem(programCode + applicationCode + "hydrocarbonToken", token);
299
332
  //初次设为默认
300
333
  if (!window.localStorage.getItem("hydrocarbonToken")) {
301
334
  window.localStorage.setItem("hydrocarbonToken", token);
@@ -305,7 +338,7 @@ export default {
305
338
  // window.localStorage.setItem('hydrocarbonToken',token);
306
339
  // }
307
340
  },
308
- setSessionHydrocarbonToken(token, programCode_) {
341
+ setSessionHydrocarbonToken(token, programCode_, applicationCode_) {
309
342
  if (!programCode_) {
310
343
  //初次设为默认
311
344
  //if(!window.sessionStorage.getItem('hydrocarbonToken')){
@@ -313,8 +346,9 @@ export default {
313
346
  // }
314
347
  }
315
348
  let programCode = programCode_ ? programCode_ : this.programCode();
349
+ let applicationCode = applicationCode_ || this.applicationCode() || "";
316
350
  if (programCode) {
317
- window.sessionStorage.setItem(programCode + "hydrocarbonToken", token);
351
+ window.sessionStorage.setItem(programCode + applicationCode + "hydrocarbonToken", token);
318
352
  if (!window.sessionStorage.getItem("hydrocarbonToken")) {
319
353
  window.sessionStorage.setItem("hydrocarbonToken", token);
320
354
  }
@@ -498,11 +532,12 @@ export default {
498
532
  toLogin() {
499
533
  var _a;
500
534
  let programCode = this.programCode();
535
+ let applicationCode = this.applicationCode();
501
536
  const version = localStorage.getItem("version");
502
537
  const themes = this.getAllThemes();
503
538
  const loginPath = ((_a = themes[version]) === null || _a === void 0 ? void 0 : _a.loginPath) || "login2";
504
539
  if (programCode && programCode != "null" && programCode != "undefined") {
505
- window.location.hash = `#/${loginPath}/${programCode}`;
540
+ window.location.hash = applicationCode && applicationCode != "null" && applicationCode != "undefined" ? `#/${loginPath}/${programCode}/${applicationCode}` : `#/${loginPath}/${programCode}`;
506
541
  }
507
542
  else {
508
543
  window.location.hash = `#/${loginPath}`;
@@ -706,8 +741,8 @@ export default {
706
741
  name = name.substring(2);
707
742
  }
708
743
  let cs = [];
709
- if (ltmplConfig.criterias) {
710
- cs.push(...ltmplConfig.criterias);
744
+ if (ltmplConfig.criteria) {
745
+ cs.push(...ltmplConfig.criteria);
711
746
  }
712
747
  if (ltmplConfig.updrillButtonConfigs) {
713
748
  cs.push(...ltmplConfig.updrillButtonConfigs);
@@ -1056,23 +1091,25 @@ export default {
1056
1091
  // }
1057
1092
  // },
1058
1093
  setProgramCode4RoutePath(pathParams) {
1059
- let programCode = pathParams.programCode;
1094
+ const { programCode, applicationCode } = pathParams;
1060
1095
  this.setProgramCode(programCode);
1096
+ this.setApplicationCode(applicationCode);
1061
1097
  },
1062
1098
  setSessionProgramCode4RoutePath(pathParams) {
1063
- let programCode = pathParams.programCode;
1099
+ const { programCode, applicationCode } = pathParams;
1064
1100
  this.setSessionProgramCode(programCode);
1101
+ this.setSessionApplicationCode(applicationCode);
1065
1102
  },
1066
1103
  getReactKey() {
1067
1104
  return new Date().getTime().toString();
1068
1105
  },
1069
- getUserInfo(programCode, token) {
1106
+ getUserInfo(programCode, token, applicationCode) {
1070
1107
  return __awaiter(this, void 0, void 0, function* () {
1071
1108
  var _a, _b, _c, _d, _e, _f, _g, _h;
1072
1109
  if (currentUser === null || currentUser === void 0 ? void 0 : currentUser.name) {
1073
1110
  return currentUser;
1074
1111
  }
1075
- let user = yield HcserviceV3.getUser(programCode, token);
1112
+ let user = yield HcserviceV3.getUser(programCode, token, applicationCode);
1076
1113
  if ((user === null || user === void 0 ? void 0 : user.orgGtmplSourceId) && !["null"].includes(user.orgGtmplSourceId)) {
1077
1114
  const { ltmplConfig } = (yield HcserviceV3.requestLtmplConfig(null, user.orgGtmplSourceId)) || {};
1078
1115
  const { entities } = (yield HcserviceV3.requestLtmplQueryTop(null, user.orgGtmplSourceId, { top: 1 })) || {};
@@ -1132,10 +1169,11 @@ export default {
1132
1169
  return themeConfig;
1133
1170
  }
1134
1171
  const programCode = this.programCode();
1172
+ const applicationCode = this.applicationCode();
1135
1173
  const server = this.api(serverKey);
1136
1174
  const { themeConfig: temConfig } = (yield HcserviceV3.getThemeConfig(serverKey, programCode)) || {};
1137
- const loginMainPicture = (temConfig === null || temConfig === void 0 ? void 0 : temConfig.loginMainPicture) ? this.joinPath(server, `/v3/theme-files/${temConfig === null || temConfig === void 0 ? void 0 : temConfig.loginMainPicture}?@programToken=${programCode}`) : null;
1138
- const programIcon = (temConfig === null || temConfig === void 0 ? void 0 : temConfig.programIcon) ? this.joinPath(server, `/v3/theme-files/${temConfig === null || temConfig === void 0 ? void 0 : temConfig.programIcon}?@programToken=${programCode}`) : null;
1175
+ const loginMainPicture = (temConfig === null || temConfig === void 0 ? void 0 : temConfig.loginMainPicture) ? this.joinPath(server, `/v3/theme-files/${temConfig === null || temConfig === void 0 ? void 0 : temConfig.loginMainPicture}?@programToken=${programCode}&@applicationToken=${applicationCode}`) : null;
1176
+ const programIcon = (temConfig === null || temConfig === void 0 ? void 0 : temConfig.programIcon) ? this.joinPath(server, `/v3/theme-files/${temConfig === null || temConfig === void 0 ? void 0 : temConfig.programIcon}?@programToken=${programCode}&@applicationToken=${applicationCode}`) : null;
1139
1177
  themeConfig = Object.assign(Object.assign({}, temConfig), { loginMainPicture, programIcon });
1140
1178
  return themeConfig;
1141
1179
  });
@@ -1148,7 +1186,8 @@ export default {
1148
1186
  if (!setting || !currentUser)
1149
1187
  return;
1150
1188
  const programCode = this.programCode();
1151
- const localKey = `${currentUser.id}-${programCode}-userPageConfig`;
1189
+ const applicationCode = this.applicationCode();
1190
+ const localKey = `${currentUser.id}-${programCode}${applicationCode ? `-${applicationCode}` : ""}-userPageConfig`;
1152
1191
  localStorage.setItem(localKey, JSON.stringify(setting));
1153
1192
  },
1154
1193
  setUserPageConfig(key, setting) {
@@ -1156,7 +1195,8 @@ export default {
1156
1195
  if (!key || !setting || !currentUser)
1157
1196
  return;
1158
1197
  const programCode = this.programCode();
1159
- const localKey = `${currentUser.id}-${programCode}-userPageConfig`;
1198
+ const applicationCode = this.applicationCode();
1199
+ const localKey = `${currentUser.id}-${programCode}${applicationCode ? `-${applicationCode}` : ""}-userPageConfig`;
1160
1200
  const userPageConfig = localStorage.getItem(localKey) || "{}";
1161
1201
  let config = {};
1162
1202
  try {
@@ -1175,7 +1215,8 @@ export default {
1175
1215
  if (!key || !currentUser)
1176
1216
  return;
1177
1217
  const programCode = this.programCode();
1178
- const localKey = `${currentUser.id}-${programCode}-userPageConfig`;
1218
+ const applicationCode = this.applicationCode();
1219
+ const localKey = `${currentUser.id}-${programCode}${applicationCode ? `-${applicationCode}` : ""}-userPageConfig`;
1179
1220
  const userPageConfig = localStorage.getItem(localKey) || "{}";
1180
1221
  try {
1181
1222
  const config = JSON.parse(userPageConfig);
@@ -1191,7 +1232,8 @@ export default {
1191
1232
  if (!key || !currentUser)
1192
1233
  return;
1193
1234
  const programCode = this.programCode();
1194
- const localKey = `${currentUser.id}-${programCode}-userPageConfig`;
1235
+ const applicationCode = this.applicationCode();
1236
+ const localKey = `${currentUser.id}-${programCode}${applicationCode ? `-${applicationCode}` : ""}-userPageConfig`;
1195
1237
  const userPageConfig = localStorage.getItem(localKey) || "{}";
1196
1238
  try {
1197
1239
  const config = JSON.parse(userPageConfig);