amis-core 2.7.2 → 2.8.0

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 (233) hide show
  1. package/esm/Root.js +1 -1
  2. package/esm/RootRenderer.js +4 -4
  3. package/esm/SchemaRenderer.js +23 -12
  4. package/esm/Scoped.js +49 -30
  5. package/esm/WithRootStore.js +1 -1
  6. package/esm/WithStore.js +1 -1
  7. package/esm/actions/Action.js +32 -17
  8. package/esm/actions/AjaxAction.js +1 -1
  9. package/esm/actions/BreakAction.js +1 -1
  10. package/esm/actions/BroadcastAction.js +1 -1
  11. package/esm/actions/CmptAction.js +1 -1
  12. package/esm/actions/ContinueAction.js +1 -1
  13. package/esm/actions/CopyAction.js +1 -1
  14. package/esm/actions/CustomAction.js +1 -1
  15. package/esm/actions/DialogAction.js +1 -1
  16. package/esm/actions/DrawerAction.js +1 -1
  17. package/esm/actions/EmailAction.js +1 -1
  18. package/esm/actions/LinkAction.js +1 -1
  19. package/esm/actions/LoopAction.js +63 -34
  20. package/esm/actions/PageAction.js +1 -1
  21. package/esm/actions/ParallelAction.js +1 -1
  22. package/esm/actions/SwitchAction.js +25 -12
  23. package/esm/actions/ToastAction.js +1 -1
  24. package/esm/components/LazyComponent.js +1 -1
  25. package/esm/components/Overlay.js +1 -1
  26. package/esm/components/PopOver.js +1 -1
  27. package/esm/env.js +1 -1
  28. package/esm/envOverwrite.js +29 -9
  29. package/esm/factory.js +1 -1
  30. package/esm/index.js +2 -2
  31. package/esm/locale.js +3 -3
  32. package/esm/renderers/Form.js +5 -36
  33. package/esm/renderers/Item.js +4 -4
  34. package/esm/renderers/Options.js +4 -4
  35. package/esm/renderers/Placeholder.js +1 -1
  36. package/esm/renderers/builtin.js +1 -1
  37. package/esm/renderers/register.js +3 -6
  38. package/esm/renderers/wrapControl.js +8 -4
  39. package/esm/store/app.js +1 -1
  40. package/esm/store/combo.d.ts +2335 -239
  41. package/esm/store/combo.js +1 -1
  42. package/esm/store/crud.js +54 -35
  43. package/esm/store/form.d.ts +1033 -16
  44. package/esm/store/form.js +27 -7
  45. package/esm/store/formItem.d.ts +9 -1
  46. package/esm/store/formItem.js +83 -45
  47. package/esm/store/iRenderer.js +1 -1
  48. package/esm/store/index.js +1 -1
  49. package/esm/store/list.js +1 -1
  50. package/esm/store/manager.js +1 -1
  51. package/esm/store/modal.js +1 -1
  52. package/esm/store/node.js +1 -1
  53. package/esm/store/pagination.js +1 -1
  54. package/esm/store/root.js +1 -1
  55. package/esm/store/service.js +1 -1
  56. package/esm/store/table.d.ts +2180 -148
  57. package/esm/store/table.js +27 -17
  58. package/esm/store/table2.js +1 -1
  59. package/esm/theme.js +3 -3
  60. package/esm/utils/Animation.js +1 -1
  61. package/esm/utils/ColorScale.js +4 -3
  62. package/esm/utils/DataSchema.js +4 -3
  63. package/esm/utils/DataScope.js +36 -16
  64. package/esm/utils/RootClose.js +3 -3
  65. package/esm/utils/SimpleMap.js +1 -1
  66. package/esm/utils/api.js +4 -4
  67. package/esm/utils/attachmentAdpator.js +1 -1
  68. package/esm/utils/autobind.js +1 -1
  69. package/esm/utils/columnsSplit.js +3 -5
  70. package/esm/utils/dataMapping.js +16 -6
  71. package/esm/utils/date.js +1 -1
  72. package/esm/utils/debug.js +28 -18
  73. package/esm/utils/decodeEntity.js +1 -1
  74. package/esm/utils/dom.js +4 -3
  75. package/esm/utils/errors.js +1 -1
  76. package/esm/utils/escapeHtml.js +1 -1
  77. package/esm/utils/filter-schema.js +1 -1
  78. package/esm/utils/filter.js +5 -7
  79. package/esm/utils/formatDuration.js +1 -1
  80. package/esm/utils/formula.js +1 -1
  81. package/esm/utils/getVariable.js +1 -1
  82. package/esm/utils/grammar.js +1 -1
  83. package/esm/utils/handleAction.js +1 -1
  84. package/esm/utils/helper.js +7 -7
  85. package/esm/utils/highlight.js +1 -1
  86. package/esm/utils/icon.js +1 -1
  87. package/esm/utils/image.js +1 -1
  88. package/esm/utils/isPureVariable.js +1 -1
  89. package/esm/utils/json-schema-2-amis-schema.js +1 -1
  90. package/esm/utils/keyToPath.js +1 -1
  91. package/esm/utils/makeSorter.js +1 -1
  92. package/esm/utils/normalizeLink.js +1 -1
  93. package/esm/utils/normalizeOptions.js +1 -1
  94. package/esm/utils/object.js +1 -1
  95. package/esm/utils/offset.js +1 -1
  96. package/esm/utils/offsetParent.js +1 -1
  97. package/esm/utils/optionValueCompare.js +1 -1
  98. package/esm/utils/position.js +1 -1
  99. package/esm/utils/prettyBytes.js +8 -1
  100. package/esm/utils/renderer-event.js +54 -29
  101. package/esm/utils/replaceText.js +16 -8
  102. package/esm/utils/resize-sensor.js +4 -2
  103. package/esm/utils/resolveVariable.js +1 -1
  104. package/esm/utils/resolveVariableAndFilter.js +1 -1
  105. package/esm/utils/scrollPosition.js +1 -1
  106. package/esm/utils/string2regExp.js +1 -1
  107. package/esm/utils/stripNumber.js +1 -1
  108. package/esm/utils/style-helper.js +96 -75
  109. package/esm/utils/style.js +1 -1
  110. package/esm/utils/toNumber.js +1 -1
  111. package/esm/utils/tokenize.js +1 -1
  112. package/esm/utils/tpl-builtin.js +1 -1
  113. package/esm/utils/tpl-lodash.js +1 -1
  114. package/esm/utils/tpl.js +3 -3
  115. package/esm/utils/uncontrollable.js +1 -1
  116. package/esm/utils/validations.js +4 -4
  117. package/lib/Root.js +1 -1
  118. package/lib/RootRenderer.js +3 -3
  119. package/lib/SchemaRenderer.js +22 -11
  120. package/lib/Scoped.js +48 -29
  121. package/lib/WithRootStore.js +1 -1
  122. package/lib/WithStore.js +1 -1
  123. package/lib/actions/Action.js +31 -16
  124. package/lib/actions/AjaxAction.js +1 -1
  125. package/lib/actions/BreakAction.js +1 -1
  126. package/lib/actions/BroadcastAction.js +1 -1
  127. package/lib/actions/CmptAction.js +1 -1
  128. package/lib/actions/ContinueAction.js +1 -1
  129. package/lib/actions/CopyAction.js +1 -1
  130. package/lib/actions/CustomAction.js +1 -1
  131. package/lib/actions/DialogAction.js +1 -1
  132. package/lib/actions/DrawerAction.js +1 -1
  133. package/lib/actions/EmailAction.js +1 -1
  134. package/lib/actions/LinkAction.js +1 -1
  135. package/lib/actions/LoopAction.js +62 -33
  136. package/lib/actions/PageAction.js +1 -1
  137. package/lib/actions/ParallelAction.js +1 -1
  138. package/lib/actions/SwitchAction.js +24 -11
  139. package/lib/actions/ToastAction.js +1 -1
  140. package/lib/components/LazyComponent.js +1 -1
  141. package/lib/components/Overlay.js +1 -1
  142. package/lib/components/PopOver.js +1 -1
  143. package/lib/env.js +1 -1
  144. package/lib/envOverwrite.js +29 -9
  145. package/lib/factory.js +1 -1
  146. package/lib/index.js +2 -2
  147. package/lib/locale.js +2 -2
  148. package/lib/renderers/Form.js +5 -36
  149. package/lib/renderers/Item.js +3 -3
  150. package/lib/renderers/Options.js +3 -3
  151. package/lib/renderers/Placeholder.js +1 -1
  152. package/lib/renderers/builtin.js +1 -1
  153. package/lib/renderers/register.js +3 -6
  154. package/lib/renderers/wrapControl.js +8 -4
  155. package/lib/store/app.js +1 -1
  156. package/lib/store/combo.d.ts +2335 -239
  157. package/lib/store/combo.js +1 -1
  158. package/lib/store/crud.js +53 -34
  159. package/lib/store/form.d.ts +1033 -16
  160. package/lib/store/form.js +26 -6
  161. package/lib/store/formItem.d.ts +9 -1
  162. package/lib/store/formItem.js +81 -43
  163. package/lib/store/iRenderer.js +1 -1
  164. package/lib/store/index.js +1 -1
  165. package/lib/store/list.js +1 -1
  166. package/lib/store/manager.js +1 -1
  167. package/lib/store/modal.js +1 -1
  168. package/lib/store/node.js +1 -1
  169. package/lib/store/pagination.js +1 -1
  170. package/lib/store/root.js +1 -1
  171. package/lib/store/service.js +1 -1
  172. package/lib/store/table.d.ts +2180 -148
  173. package/lib/store/table.js +26 -16
  174. package/lib/store/table2.js +1 -1
  175. package/lib/theme.js +2 -2
  176. package/lib/utils/Animation.js +1 -1
  177. package/lib/utils/ColorScale.js +4 -3
  178. package/lib/utils/DataSchema.js +4 -3
  179. package/lib/utils/DataScope.js +35 -15
  180. package/lib/utils/RootClose.js +2 -2
  181. package/lib/utils/SimpleMap.js +1 -1
  182. package/lib/utils/api.js +3 -3
  183. package/lib/utils/attachmentAdpator.js +1 -1
  184. package/lib/utils/autobind.js +1 -1
  185. package/lib/utils/columnsSplit.js +3 -5
  186. package/lib/utils/dataMapping.js +15 -5
  187. package/lib/utils/date.js +1 -1
  188. package/lib/utils/debug.js +27 -17
  189. package/lib/utils/decodeEntity.js +1 -1
  190. package/lib/utils/dom.js +4 -3
  191. package/lib/utils/errors.js +1 -1
  192. package/lib/utils/escapeHtml.js +1 -1
  193. package/lib/utils/filter-schema.js +1 -1
  194. package/lib/utils/filter.js +4 -6
  195. package/lib/utils/formatDuration.js +1 -1
  196. package/lib/utils/formula.js +1 -1
  197. package/lib/utils/getVariable.js +1 -1
  198. package/lib/utils/grammar.js +1 -1
  199. package/lib/utils/handleAction.js +1 -1
  200. package/lib/utils/helper.js +6 -6
  201. package/lib/utils/highlight.js +1 -1
  202. package/lib/utils/icon.js +1 -1
  203. package/lib/utils/image.js +1 -1
  204. package/lib/utils/isPureVariable.js +1 -1
  205. package/lib/utils/json-schema-2-amis-schema.js +1 -1
  206. package/lib/utils/keyToPath.js +1 -1
  207. package/lib/utils/makeSorter.js +1 -1
  208. package/lib/utils/normalizeLink.js +1 -1
  209. package/lib/utils/normalizeOptions.js +1 -1
  210. package/lib/utils/object.js +1 -1
  211. package/lib/utils/offset.js +1 -1
  212. package/lib/utils/offsetParent.js +1 -1
  213. package/lib/utils/optionValueCompare.js +1 -1
  214. package/lib/utils/position.js +1 -1
  215. package/lib/utils/prettyBytes.js +8 -1
  216. package/lib/utils/renderer-event.js +53 -28
  217. package/lib/utils/replaceText.js +16 -8
  218. package/lib/utils/resize-sensor.js +4 -2
  219. package/lib/utils/resolveVariable.js +1 -1
  220. package/lib/utils/resolveVariableAndFilter.js +1 -1
  221. package/lib/utils/scrollPosition.js +1 -1
  222. package/lib/utils/string2regExp.js +1 -1
  223. package/lib/utils/stripNumber.js +1 -1
  224. package/lib/utils/style-helper.js +96 -75
  225. package/lib/utils/style.js +1 -1
  226. package/lib/utils/toNumber.js +1 -1
  227. package/lib/utils/tokenize.js +1 -1
  228. package/lib/utils/tpl-builtin.js +1 -1
  229. package/lib/utils/tpl-lodash.js +1 -1
  230. package/lib/utils/tpl.js +2 -2
  231. package/lib/utils/uncontrollable.js +1 -1
  232. package/lib/utils/validations.js +3 -3
  233. package/package.json +3 -3
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -30,9 +30,10 @@ var LoopAction = /** @class */ (function () {
30
30
  LoopAction.prototype.run = function (action, renderer, event, mergeData) {
31
31
  var _a, _b;
32
32
  return tslib.__awaiter(this, void 0, void 0, function () {
33
- var loopName, loopData, protoData, _i, loopData_1, data, _c, _d, subAction;
34
- return tslib.__generator(this, function (_e) {
35
- switch (_e.label) {
33
+ var loopName, loopData, protoData, loopData_1, loopData_1_1, data, _c, _d, subAction, e_1_1, e_2_1;
34
+ var e_2, _e, e_1, _f;
35
+ return tslib.__generator(this, function (_g) {
36
+ switch (_g.label) {
36
37
  case 0:
37
38
  loopName = (_a = action.args) === null || _a === void 0 ? void 0 : _a.loopName;
38
39
  if (typeof loopName !== 'string') {
@@ -42,60 +43,88 @@ var LoopAction = /** @class */ (function () {
42
43
  loopData = resolveVariable.resolveVariable(loopName, mergeData) || [];
43
44
  if (!!loopData) return [3 /*break*/, 1];
44
45
  console.error("\u6CA1\u6709\u627E\u5230\u6570\u636E ".concat(loopName));
45
- return [3 /*break*/, 10];
46
+ return [3 /*break*/, 18];
46
47
  case 1:
47
48
  if (!!Array.isArray(loopData)) return [3 /*break*/, 2];
48
49
  console.error("".concat(loopName, " \u6570\u636E\u4E0D\u662F\u6570\u7EC4"));
49
- return [3 /*break*/, 10];
50
+ return [3 /*break*/, 18];
50
51
  case 2:
51
- if (!((_b = action.children) === null || _b === void 0 ? void 0 : _b.length)) return [3 /*break*/, 10];
52
+ if (!((_b = action.children) === null || _b === void 0 ? void 0 : _b.length)) return [3 /*break*/, 18];
52
53
  protoData = event.data;
53
- _i = 0, loopData_1 = loopData;
54
- _e.label = 3;
54
+ _g.label = 3;
55
55
  case 3:
56
- if (!(_i < loopData_1.length)) return [3 /*break*/, 9];
57
- data = loopData_1[_i];
56
+ _g.trys.push([3, 15, 16, 17]);
57
+ loopData_1 = tslib.__values(loopData), loopData_1_1 = loopData_1.next();
58
+ _g.label = 4;
59
+ case 4:
60
+ if (!!loopData_1_1.done) return [3 /*break*/, 14];
61
+ data = loopData_1_1.value;
58
62
  renderer.loopStatus = Action.LoopStatus.NORMAL;
59
63
  // 追加逻辑处理中的数据,事件数据优先,用完还要还原
60
64
  event.setData(object.createObject(event.data, data));
61
- _c = 0, _d = action.children;
62
- _e.label = 4;
63
- case 4:
64
- if (!(_c < _d.length)) return [3 /*break*/, 7];
65
- subAction = _d[_c];
65
+ _g.label = 5;
66
+ case 5:
67
+ _g.trys.push([5, 10, 11, 12]);
68
+ _c = (e_1 = void 0, tslib.__values(action.children)), _d = _c.next();
69
+ _g.label = 6;
70
+ case 6:
71
+ if (!!_d.done) return [3 /*break*/, 9];
72
+ subAction = _d.value;
66
73
  // @ts-ignore
67
74
  if (renderer.loopStatus === Action.LoopStatus.CONTINUE) {
68
- return [3 /*break*/, 6];
75
+ return [3 /*break*/, 8];
69
76
  }
70
77
  return [4 /*yield*/, Action.runActions(subAction, renderer, event)];
71
- case 5:
72
- _e.sent();
78
+ case 7:
79
+ _g.sent();
73
80
  // @ts-ignore
74
81
  if (renderer.loopStatus === Action.LoopStatus.BREAK || event.stoped) {
75
82
  // 还原事件数据
76
83
  event.setData(protoData);
77
84
  event.stopPropagation();
78
- return [3 /*break*/, 7];
85
+ return [3 /*break*/, 9];
79
86
  }
80
- _e.label = 6;
81
- case 6:
82
- _c++;
83
- return [3 /*break*/, 4];
84
- case 7:
87
+ _g.label = 8;
88
+ case 8:
89
+ _d = _c.next();
90
+ return [3 /*break*/, 6];
91
+ case 9: return [3 /*break*/, 12];
92
+ case 10:
93
+ e_1_1 = _g.sent();
94
+ e_1 = { error: e_1_1 };
95
+ return [3 /*break*/, 12];
96
+ case 11:
97
+ try {
98
+ if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
99
+ }
100
+ finally { if (e_1) throw e_1.error; }
101
+ return [7 /*endfinally*/];
102
+ case 12:
85
103
  if (event.stoped) {
86
104
  // 还原事件数据
87
105
  event.setData(protoData);
88
- return [3 /*break*/, 9];
106
+ return [3 /*break*/, 14];
89
107
  }
90
- _e.label = 8;
91
- case 8:
92
- _i++;
93
- return [3 /*break*/, 3];
94
- case 9:
108
+ _g.label = 13;
109
+ case 13:
110
+ loopData_1_1 = loopData_1.next();
111
+ return [3 /*break*/, 4];
112
+ case 14: return [3 /*break*/, 17];
113
+ case 15:
114
+ e_2_1 = _g.sent();
115
+ e_2 = { error: e_2_1 };
116
+ return [3 /*break*/, 17];
117
+ case 16:
118
+ try {
119
+ if (loopData_1_1 && !loopData_1_1.done && (_e = loopData_1.return)) _e.call(loopData_1);
120
+ }
121
+ finally { if (e_2) throw e_2.error; }
122
+ return [7 /*endfinally*/];
123
+ case 17:
95
124
  renderer.loopStatus = Action.LoopStatus.NORMAL;
96
125
  event.setData(protoData);
97
- _e.label = 10;
98
- case 10: return [2 /*return*/];
126
+ _g.label = 18;
127
+ case 18: return [2 /*return*/];
99
128
  }
100
129
  });
101
130
  });
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -19,28 +19,41 @@ var SwitchAction = /** @class */ (function () {
19
19
  }
20
20
  SwitchAction.prototype.run = function (action, renderer, event, mergeData) {
21
21
  return tslib.__awaiter(this, void 0, void 0, function () {
22
- var _i, _a, branch;
23
- return tslib.__generator(this, function (_b) {
24
- switch (_b.label) {
22
+ var _a, _b, branch, e_1_1;
23
+ var e_1, _c;
24
+ return tslib.__generator(this, function (_d) {
25
+ switch (_d.label) {
25
26
  case 0:
26
- _i = 0, _a = action.children || [];
27
- _b.label = 1;
27
+ _d.trys.push([0, 5, 6, 7]);
28
+ _a = tslib.__values(action.children || []), _b = _a.next();
29
+ _d.label = 1;
28
30
  case 1:
29
- if (!(_i < _a.length)) return [3 /*break*/, 4];
30
- branch = _a[_i];
31
+ if (!!_b.done) return [3 /*break*/, 4];
32
+ branch = _b.value;
31
33
  if (!branch.expression) {
32
34
  return [3 /*break*/, 3];
33
35
  }
34
36
  if (!tpl.evalExpression(branch.expression, mergeData)) return [3 /*break*/, 3];
35
37
  return [4 /*yield*/, Action.runActions(branch, renderer, event)];
36
38
  case 2:
37
- _b.sent();
39
+ _d.sent();
38
40
  // 去掉runAllMatch,这里只做排他,多个可以直接通过expression
39
41
  return [3 /*break*/, 4];
40
42
  case 3:
41
- _i++;
43
+ _b = _a.next();
42
44
  return [3 /*break*/, 1];
43
- case 4: return [2 /*return*/];
45
+ case 4: return [3 /*break*/, 7];
46
+ case 5:
47
+ e_1_1 = _d.sent();
48
+ e_1 = { error: e_1_1 };
49
+ return [3 /*break*/, 7];
50
+ case 6:
51
+ try {
52
+ if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
53
+ }
54
+ finally { if (e_1) throw e_1.error; }
55
+ return [7 /*endfinally*/];
56
+ case 7: return [2 /*return*/];
44
57
  }
45
58
  });
46
59
  });
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/lib/env.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -7,6 +7,7 @@
7
7
 
8
8
  Object.defineProperty(exports, '__esModule', { value: true });
9
9
 
10
+ var tslib = require('tslib');
10
11
  var helper = require('./utils/helper.js');
11
12
 
12
13
  /**
@@ -18,24 +19,43 @@ var isMobile = ((_b = (_a = window).matchMedia) === null || _b === void 0 ? void
18
19
  : false;
19
20
  // 这里不能用 addSchemaFilter 是因为还需要更深层的替换,比如 select 里的 options
20
21
  var envOverwrite = function (schema, locale) {
22
+ var e_1, _a, e_2, _b;
21
23
  if (schema.mobile && isMobile) {
22
24
  Object.assign(schema, schema.mobile);
23
25
  delete schema.mobile;
24
26
  }
25
27
  if (locale) {
26
28
  var schemaNodes = helper.findObjectsWithKey(schema, locale);
27
- for (var _i = 0, schemaNodes_1 = schemaNodes; _i < schemaNodes_1.length; _i++) {
28
- var schemaNode = schemaNodes_1[_i];
29
- Object.assign(schemaNode, schemaNode[locale]);
30
- delete schemaNode[locale];
29
+ try {
30
+ for (var schemaNodes_1 = tslib.__values(schemaNodes), schemaNodes_1_1 = schemaNodes_1.next(); !schemaNodes_1_1.done; schemaNodes_1_1 = schemaNodes_1.next()) {
31
+ var schemaNode = schemaNodes_1_1.value;
32
+ Object.assign(schemaNode, schemaNode[locale]);
33
+ delete schemaNode[locale];
34
+ }
35
+ }
36
+ catch (e_1_1) { e_1 = { error: e_1_1 }; }
37
+ finally {
38
+ try {
39
+ if (schemaNodes_1_1 && !schemaNodes_1_1.done && (_a = schemaNodes_1.return)) _a.call(schemaNodes_1);
40
+ }
41
+ finally { if (e_1) throw e_1.error; }
31
42
  }
32
43
  }
33
44
  if (isMobile) {
34
45
  var schemaNodes = helper.findObjectsWithKey(schema, 'mobile');
35
- for (var _a = 0, schemaNodes_2 = schemaNodes; _a < schemaNodes_2.length; _a++) {
36
- var schemaNode = schemaNodes_2[_a];
37
- Object.assign(schemaNode, schemaNode['mobile']);
38
- delete schemaNode['mobile'];
46
+ try {
47
+ for (var schemaNodes_2 = tslib.__values(schemaNodes), schemaNodes_2_1 = schemaNodes_2.next(); !schemaNodes_2_1.done; schemaNodes_2_1 = schemaNodes_2.next()) {
48
+ var schemaNode = schemaNodes_2_1.value;
49
+ Object.assign(schemaNode, schemaNode['mobile']);
50
+ delete schemaNode['mobile'];
51
+ }
52
+ }
53
+ catch (e_2_1) { e_2 = { error: e_2_1 }; }
54
+ finally {
55
+ try {
56
+ if (schemaNodes_2_1 && !schemaNodes_2_1.done && (_b = schemaNodes_2.return)) _b.call(schemaNodes_2);
57
+ }
58
+ finally { if (e_2) throw e_2.error; }
39
59
  }
40
60
  }
41
61
  };
package/lib/factory.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
package/lib/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -127,7 +127,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
127
127
  */
128
128
  var classPrefix = theme.getClassPrefix();
129
129
  // @ts-ignore
130
- var version = '2.7.2';
130
+ var version = '2.8.0';
131
131
  function render(schema, props, options, pathPrefix) {
132
132
  if (props === void 0) { props = {}; }
133
133
  if (options === void 0) { options = {}; }
package/lib/locale.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -69,7 +69,7 @@ function makeTranslator(locale) {
69
69
  ((_b = locales[defaultLocale]) === null || _b === void 0 ? void 0 : _b[str]) ||
70
70
  ((_c = locales['zh-CN']) === null || _c === void 0 ? void 0 : _c[str]) ||
71
71
  str;
72
- return format.apply(void 0, tslib.__spreadArray([value], args, false));
72
+ return format.apply(void 0, tslib.__spreadArray([value], tslib.__read(args), false));
73
73
  };
74
74
  locale && (fns[locale] = fn);
75
75
  return fn;
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -872,47 +872,16 @@ var Form = /** @class */ (function (_super) {
872
872
  }
873
873
  var props = tslib.__assign(tslib.__assign({}, this.props), otherProps);
874
874
  var form = this.props.store;
875
- var render = props.render, mode = props.mode, horizontal = props.horizontal, store = props.store, disabled = props.disabled, controlWidth = props.controlWidth, resolveDefinitions = props.resolveDefinitions, lazyChange = props.lazyChange; props.formLazyChange; var dispatchEvent = props.dispatchEvent, labelAlign = props.labelAlign, labelWidth = props.labelWidth, _a = props.static, isStatic = _a === void 0 ? false : _a;
876
- var subProps = {
877
- formStore: form,
878
- data: store.data,
879
- key: "".concat(control.name || '', "-").concat(control.type, "-").concat(key),
880
- formInited: form.inited,
881
- formSubmited: form.submited,
882
- formMode: mode,
883
- formHorizontal: horizontal,
884
- formLabelAlign: labelAlign !== 'left' ? 'right' : labelAlign,
885
- formLabelWidth: labelWidth,
886
- controlWidth: controlWidth,
875
+ var render = props.render, mode = props.mode, horizontal = props.horizontal, store = props.store, disabled = props.disabled, controlWidth = props.controlWidth, resolveDefinitions = props.resolveDefinitions, lazyChange = props.lazyChange; props.formLazyChange; var dispatchEvent = props.dispatchEvent, labelAlign = props.labelAlign, labelWidth = props.labelWidth, isStatic = props.static;
876
+ var subProps = tslib.__assign(tslib.__assign({ formStore: form, data: store.data, key: "".concat(control.name || '', "-").concat(control.type, "-").concat(key), formInited: form.inited, formSubmited: form.submited, formMode: mode, formHorizontal: horizontal, formLabelAlign: labelAlign !== 'left' ? 'right' : labelAlign, formLabelWidth: labelWidth, controlWidth: controlWidth,
887
877
  /**
888
878
  * form.loading有为true时才下发disabled属性,否则不显性设置disbaled为false
889
879
  * Form中包含容器类组件时,这些组件会将此处的disbaled继续下发至子组件,导致SchemaRenderer中props.disabled覆盖schema.disabled
890
880
  */
891
881
  disabled: disabled ||
892
882
  control.disabled ||
893
- (form.loading ? true : undefined),
894
- /**
895
- * 静态展示 优先级逻辑
896
- * 1. 表单子项 static: true 始终保持静态
897
- * 2. 表单子项 static: false 或 不配置,跟随父表单
898
- * 3. 动作控制 表单子项 时,无视配置,优先级最高
899
- */
900
- static: control.static || isStatic,
901
- btnDisabled: disabled || form.loading || form.validating,
902
- onAction: this.handleAction,
903
- onQuery: this.handleQuery,
904
- onChange: this.handleChange,
905
- onBulkChange: this.handleBulkChange,
906
- addHook: this.addHook,
907
- removeHook: this.removeHook,
908
- renderFormItems: this.renderFormItems,
909
- formItemDispatchEvent: this.formItemDispatchEvent(dispatchEvent),
910
- formPristine: form.pristine
911
- // value: (control as any)?.name
912
- // ? getVariable(form.data, (control as any)?.name, canAccessSuperData)
913
- // : (control as any)?.value,
914
- // defaultValue: (control as any)?.value
915
- };
883
+ (form.loading ? true : undefined) }, control.static || isStatic
884
+ ? { static: true } : {}), { btnDisabled: disabled || form.loading || form.validating, onAction: this.handleAction, onQuery: this.handleQuery, onChange: this.handleChange, onBulkChange: this.handleBulkChange, addHook: this.addHook, removeHook: this.removeHook, renderFormItems: this.renderFormItems, formItemDispatchEvent: this.formItemDispatchEvent(dispatchEvent), formPristine: form.pristine });
916
885
  var subSchema = tslib.__assign({}, control);
917
886
  if (subSchema.$ref) {
918
887
  subSchema = tslib.__assign(tslib.__assign({}, resolveDefinitions(subSchema.$ref)), subSchema);
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -318,7 +318,7 @@ var FormItemWrap = /** @class */ (function (_super) {
318
318
  });
319
319
  };
320
320
  FormItemWrap.prototype.handleDialogConfirm = function (_a) {
321
- var values = _a[0];
321
+ var _b = tslib.__read(_a, 1), values = _b[0];
322
322
  var model = this.props.formItem;
323
323
  if (!model) {
324
324
  return;
@@ -866,7 +866,7 @@ function asFormItem(config) {
866
866
  'setPrinstineValue',
867
867
  'readOnly',
868
868
  'strictMode'
869
- ], (Control.propsList || []), true),
869
+ ], tslib.__read((Control.propsList || [])), false),
870
870
  _a.displayName = "FormItem".concat(config.type ? "(".concat(config.type, ")") : ''),
871
871
  _a.ComposedComponent = Control,
872
872
  _a), Control));
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -564,7 +564,7 @@ function registerOptionsControl(config) {
564
564
  name: 'parent',
565
565
  value: parent
566
566
  }
567
- ], (addControls || []), true)
567
+ ], tslib.__read((addControls || [])), false)
568
568
  } }), ctx)];
569
569
  case 2:
570
570
  _d = _f.sent();
@@ -806,7 +806,7 @@ function registerOptionsControl(config) {
806
806
  FormOptionsItem.displayName = "OptionsControl(".concat(config.type, ")");
807
807
  FormOptionsItem.defaultProps = tslib.__assign({ delimiter: ',', labelField: 'label', valueField: 'value', joinValues: true, extractValue: false, multiple: false, placeholder: 'Select.placeholder', resetValue: '', deleteConfirmText: 'deleteConfirm' }, Control.defaultProps);
808
808
  FormOptionsItem.propsList = Control.propsList
809
- ? tslib.__spreadArray([], Control.propsList, true) : [];
809
+ ? tslib.__spreadArray([], tslib.__read(Control.propsList), false) : [];
810
810
  FormOptionsItem.ComposedComponent = Control;
811
811
  tslib.__decorate([
812
812
  helper.autobind,
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -7,6 +7,7 @@
7
7
 
8
8
  Object.defineProperty(exports, '__esModule', { value: true });
9
9
 
10
+ var tslib = require('tslib');
10
11
  var factory = require('../factory.js');
11
12
  var Options = require('./Options.js');
12
13
  var Item = require('./Item.js');
@@ -72,11 +73,7 @@ function registerAmisRendererByUsage(curUsage, curAmisRenderer) {
72
73
  if (curAmisRendererComponent &&
73
74
  ['renderer', 'formitem', 'options'].includes(curUsage) &&
74
75
  registerMap[curUsage]) {
75
- registerMap[curUsage]({
76
- type: curAmisRenderer.type,
77
- weight: curAmisRenderer.weight || 0,
78
- autoVar: curAmisRenderer.autoVar || false,
79
- })(curAmisRendererComponent);
76
+ registerMap[curUsage](tslib.__assign(tslib.__assign({}, (curAmisRenderer.config || {})), { type: curAmisRenderer.type, weight: curAmisRenderer.weight || 0, autoVar: curAmisRenderer.autoVar || false }))(curAmisRendererComponent);
80
77
  }
81
78
  }
82
79
 
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5
 
@@ -43,7 +43,7 @@ function wrapControl(ComposedComponent) {
43
43
  trailing: true,
44
44
  leading: false
45
45
  });
46
- var _c = _this.props, form = _c.formStore, formItem$1 = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, _d = _c.$schema, name = _d.name, id = _d.id, type = _d.type, required = _d.required, validations = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, multiple = _d.multiple, delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label;
46
+ var _c = _this.props, form = _c.formStore, formItem$1 = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, _d = _c.$schema, name = _d.name, id = _d.id, type = _d.type, required = _d.required, validations = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, multiple = _d.multiple, delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label;
47
47
  _this.getValue = _this.getValue.bind(_this);
48
48
  _this.setValue = _this.setValue.bind(_this);
49
49
  _this.handleChange = _this.handleChange.bind(_this);
@@ -80,6 +80,7 @@ function wrapControl(ComposedComponent) {
80
80
  required: required,
81
81
  unique: unique,
82
82
  value: value,
83
+ isValueSchemaExp: formula.isExpression(value),
83
84
  rules: validations,
84
85
  messages: validationErrors,
85
86
  multiple: multiple,
@@ -95,7 +96,8 @@ function wrapControl(ComposedComponent) {
95
96
  minLength: minLength,
96
97
  maxLength: maxLength,
97
98
  validateOnChange: validateOnChange,
98
- label: label
99
+ label: label,
100
+ inputGroupControl: inputGroupControl
99
101
  });
100
102
  // issue 这个逻辑应该在 combo 里面自己实现。
101
103
  if (_this.model.unique &&
@@ -187,6 +189,7 @@ function wrapControl(ComposedComponent) {
187
189
  id: props.$schema.id,
188
190
  unique: props.$schema.unique,
189
191
  value: props.$schema.value,
192
+ isValueSchemaExp: formula.isExpression(props.$schema.value),
190
193
  rules: props.$schema.validations,
191
194
  multiple: props.$schema.multiple,
192
195
  delimiter: props.$schema.delimiter,
@@ -201,7 +204,8 @@ function wrapControl(ComposedComponent) {
201
204
  validateApi: props.$schema.validateApi,
202
205
  minLength: props.$schema.minLength,
203
206
  maxLength: props.$schema.maxLength,
204
- label: props.$schema.label
207
+ label: props.$schema.label,
208
+ inputGroupControl: props === null || props === void 0 ? void 0 : props.inputGroupControl
205
209
  });
206
210
  }
207
211
  // 此处需要同时考虑 defaultValue 和 value
package/lib/store/app.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * amis-core v2.7.2
2
+ * amis-core v2.8.0
3
3
  * Copyright 2018-2023 fex
4
4
  */
5
5