@gingkoo/pandora-metabase 1.0.118 → 1.0.120

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 (195) hide show
  1. package/lib/cjs/common/Portal/index.js +0 -2
  2. package/lib/cjs/common/SplitView/index.d.ts +0 -4
  3. package/lib/cjs/common/SplitView/index.js +0 -10
  4. package/lib/cjs/components/dialog/custom-column/config.js +4 -48
  5. package/lib/cjs/components/dialog/custom-column/expression-editor.js +3 -14
  6. package/lib/cjs/components/dialog/custom-column/expressions/suggest.d.ts +2 -34
  7. package/lib/cjs/components/dialog/custom-column/expressions/suggest.js +2 -43
  8. package/lib/cjs/components/dialog/custom-column/expressions/tokenizer.js +8 -65
  9. package/lib/cjs/components/dialog/custom-column/index.js +2 -4
  10. package/lib/cjs/components/dialog/custom-column/tokenized-expression.js +2 -3
  11. package/lib/cjs/components/dialog/custom-column/tokenizedI-input.js +1 -1
  12. package/lib/cjs/components/dialog/custom-editor/index.js +2 -7
  13. package/lib/cjs/components/dialog/diff-viewer/index copy.js +1 -16
  14. package/lib/cjs/components/dialog/expression/date-format-picker.js +2 -20
  15. package/lib/cjs/components/dialog/expression/date-format.js +2 -8
  16. package/lib/cjs/components/dialog/expression/index.d.ts +0 -3
  17. package/lib/cjs/components/dialog/expression/index.js +2 -83
  18. package/lib/cjs/components/dialog/formula/index.js +6 -31
  19. package/lib/cjs/components/dialog/formula/utils.js +2 -10
  20. package/lib/cjs/components/dialog/formula-list/CaseWhenGroup.d.ts +19 -0
  21. package/lib/cjs/components/dialog/formula-list/CaseWhenGroup.js +109 -0
  22. package/lib/cjs/components/dialog/formula-list/LogicGroup.d.ts +9 -0
  23. package/lib/cjs/components/dialog/formula-list/LogicGroup.js +43 -0
  24. package/lib/cjs/components/dialog/formula-list/index.d.ts +3 -0
  25. package/lib/cjs/components/dialog/formula-list/index.js +970 -504
  26. package/lib/cjs/components/dialog/formula-list/index.less +724 -0
  27. package/lib/cjs/components/dialog/formula-list/utils.d.ts +0 -7
  28. package/lib/cjs/components/dialog/formula-list/utils.js +117 -113
  29. package/lib/cjs/components/dialog/select-column/index.d.ts +0 -6
  30. package/lib/cjs/components/dialog/select-column/index.js +4 -15
  31. package/lib/cjs/components/dialog/select-column-multiple/index.d.ts +0 -8
  32. package/lib/cjs/components/dialog/select-column-multiple/index.js +6 -45
  33. package/lib/cjs/components/dialog/select-join/index.d.ts +0 -5
  34. package/lib/cjs/components/dialog/select-join/index.js +0 -6
  35. package/lib/cjs/components/dialog/select-join-column/index.d.ts +0 -8
  36. package/lib/cjs/components/dialog/select-join-column/index.js +7 -21
  37. package/lib/cjs/components/dialog/select-join-column-multiple/index.d.ts +0 -8
  38. package/lib/cjs/components/dialog/select-join-column-multiple/index.js +5 -35
  39. package/lib/cjs/components/dialog/select-permission-table/index.d.ts +0 -5
  40. package/lib/cjs/components/dialog/select-permission-table/index.js +0 -6
  41. package/lib/cjs/components/dialog/select-summarize/index.d.ts +7 -4
  42. package/lib/cjs/components/dialog/select-summarize/index.js +105 -18
  43. package/lib/cjs/components/dialog/select-summarize/index.less +23 -0
  44. package/lib/cjs/components/dialog/select-table/index.d.ts +0 -6
  45. package/lib/cjs/components/dialog/select-table/index.js +1 -9
  46. package/lib/cjs/components/metabase/index.js +72 -86
  47. package/lib/cjs/components/metabase/index.less +7 -7
  48. package/lib/cjs/components/modules/components/Wrapper.js +1 -1
  49. package/lib/cjs/components/modules/components/header.js +2 -2
  50. package/lib/cjs/components/modules/components/meta-icon.d.ts +0 -3
  51. package/lib/cjs/components/modules/components/meta-icon.js +2 -47
  52. package/lib/cjs/components/modules/custom-column.js +3 -29
  53. package/lib/cjs/components/modules/enum/filter-enum.js +9 -88
  54. package/lib/cjs/components/modules/filter.js +2 -20
  55. package/lib/cjs/components/modules/index.d.ts +4 -2
  56. package/lib/cjs/components/modules/index.js +24 -1
  57. package/lib/cjs/components/modules/join-data.js +13 -291
  58. package/lib/cjs/components/modules/row-limit.js +0 -1
  59. package/lib/cjs/components/modules/sort.js +1 -61
  60. package/lib/cjs/components/modules/summarize/group-by.d.ts +0 -5
  61. package/lib/cjs/components/modules/summarize/group-by.js +251 -89
  62. package/lib/cjs/components/modules/summarize/select-index.js +116 -59
  63. package/lib/cjs/components/modules/table-data.js +11 -64
  64. package/lib/cjs/components/popup.js +26 -32
  65. package/lib/cjs/hooks/patch.d.ts +1 -0
  66. package/lib/cjs/hooks/patch.js +104 -6
  67. package/lib/cjs/hooks/patch2.js +3 -165
  68. package/lib/cjs/hooks/use-provider.js +0 -3
  69. package/lib/cjs/hooks/use-state.js +55 -135
  70. package/lib/cjs/index.js +0 -15
  71. package/lib/cjs/locale/en.js +5 -0
  72. package/lib/cjs/locale/index.js +1 -4
  73. package/lib/cjs/locale/zh.js +5 -0
  74. package/lib/cjs/sql-formula.js +0 -1
  75. package/lib/cjs/store/enum.d.ts +6 -6
  76. package/lib/cjs/store/enum.js +0 -13
  77. package/lib/cjs/store/helper.d.ts +2 -1
  78. package/lib/cjs/store/helper.js +15 -225
  79. package/lib/cjs/store/types.d.ts +45 -67
  80. package/lib/cjs/store/types.js +3 -49
  81. package/lib/cjs/types.d.ts +1 -0
  82. package/lib/cjs/utils/cookies.js +0 -3
  83. package/lib/cjs/utils/event.js +1 -1
  84. package/lib/cjs/utils/helper-dom.d.ts +1 -0
  85. package/lib/cjs/utils/helper-dom.js +17 -10
  86. package/lib/cjs/utils/helper.js +1 -24
  87. package/lib/cjs/utils/keydown.js +4 -7
  88. package/lib/cjs/utils/platform.d.ts +0 -9
  89. package/lib/cjs/utils/platform.js +0 -10
  90. package/lib/cjs/utils/selection.js +0 -6
  91. package/lib/cjs/utils/storage.d.ts +0 -9
  92. package/lib/cjs/utils/storage.js +1 -11
  93. package/lib/cjs/utils/transformSql.d.ts +5 -0
  94. package/lib/cjs/utils/transformSql.js +40 -101
  95. package/lib/cjs/utils.d.ts +1 -6
  96. package/lib/cjs/utils.js +126 -255
  97. package/lib/es/common/Portal/index.js +0 -2
  98. package/lib/es/common/SplitView/index.d.ts +0 -4
  99. package/lib/es/common/SplitView/index.js +0 -10
  100. package/lib/es/components/dialog/custom-column/config.js +4 -48
  101. package/lib/es/components/dialog/custom-column/expression-editor.js +3 -14
  102. package/lib/es/components/dialog/custom-column/expressions/suggest.d.ts +2 -34
  103. package/lib/es/components/dialog/custom-column/expressions/suggest.js +2 -43
  104. package/lib/es/components/dialog/custom-column/expressions/tokenizer.js +8 -65
  105. package/lib/es/components/dialog/custom-column/index.js +2 -4
  106. package/lib/es/components/dialog/custom-column/tokenized-expression.js +1 -3
  107. package/lib/es/components/dialog/custom-column/tokenizedI-input.js +1 -1
  108. package/lib/es/components/dialog/custom-editor/index.js +1 -7
  109. package/lib/es/components/dialog/diff-viewer/index copy.js +1 -15
  110. package/lib/es/components/dialog/expression/date-format-picker.js +2 -20
  111. package/lib/es/components/dialog/expression/date-format.js +2 -8
  112. package/lib/es/components/dialog/expression/index.d.ts +0 -3
  113. package/lib/es/components/dialog/expression/index.js +2 -82
  114. package/lib/es/components/dialog/formula/index.js +5 -31
  115. package/lib/es/components/dialog/formula/utils.js +2 -10
  116. package/lib/es/components/dialog/formula-list/CaseWhenGroup.d.ts +19 -0
  117. package/lib/es/components/dialog/formula-list/CaseWhenGroup.js +102 -0
  118. package/lib/es/components/dialog/formula-list/LogicGroup.d.ts +9 -0
  119. package/lib/es/components/dialog/formula-list/LogicGroup.js +36 -0
  120. package/lib/es/components/dialog/formula-list/index.d.ts +3 -0
  121. package/lib/es/components/dialog/formula-list/index.js +969 -504
  122. package/lib/es/components/dialog/formula-list/index.less +724 -0
  123. package/lib/es/components/dialog/formula-list/utils.d.ts +0 -7
  124. package/lib/es/components/dialog/formula-list/utils.js +117 -113
  125. package/lib/es/components/dialog/index.js +3 -3
  126. package/lib/es/components/dialog/select-column/index.d.ts +0 -6
  127. package/lib/es/components/dialog/select-column/index.js +4 -14
  128. package/lib/es/components/dialog/select-column-multiple/index.d.ts +0 -8
  129. package/lib/es/components/dialog/select-column-multiple/index.js +7 -47
  130. package/lib/es/components/dialog/select-join/index.d.ts +0 -5
  131. package/lib/es/components/dialog/select-join/index.js +0 -5
  132. package/lib/es/components/dialog/select-join-column/index.d.ts +0 -8
  133. package/lib/es/components/dialog/select-join-column/index.js +7 -20
  134. package/lib/es/components/dialog/select-join-column-multiple/index.d.ts +0 -8
  135. package/lib/es/components/dialog/select-join-column-multiple/index.js +5 -34
  136. package/lib/es/components/dialog/select-permission-table/index.d.ts +0 -5
  137. package/lib/es/components/dialog/select-permission-table/index.js +0 -5
  138. package/lib/es/components/dialog/select-summarize/index.d.ts +7 -4
  139. package/lib/es/components/dialog/select-summarize/index.js +106 -18
  140. package/lib/es/components/dialog/select-summarize/index.less +23 -0
  141. package/lib/es/components/dialog/select-table/index.d.ts +0 -6
  142. package/lib/es/components/dialog/select-table/index.js +1 -8
  143. package/lib/es/components/metabase/index.js +72 -87
  144. package/lib/es/components/metabase/index.less +7 -7
  145. package/lib/es/components/modules/components/Wrapper.js +1 -1
  146. package/lib/es/components/modules/components/header.js +2 -2
  147. package/lib/es/components/modules/components/meta-icon.d.ts +0 -3
  148. package/lib/es/components/modules/components/meta-icon.js +2 -46
  149. package/lib/es/components/modules/custom-column.js +3 -29
  150. package/lib/es/components/modules/enum/filter-enum.js +9 -88
  151. package/lib/es/components/modules/filter.js +2 -19
  152. package/lib/es/components/modules/index.d.ts +4 -2
  153. package/lib/es/components/modules/index.js +24 -1
  154. package/lib/es/components/modules/join-data.js +13 -291
  155. package/lib/es/components/modules/row-limit.js +0 -1
  156. package/lib/es/components/modules/sort.js +1 -61
  157. package/lib/es/components/modules/summarize/group-by.d.ts +0 -5
  158. package/lib/es/components/modules/summarize/group-by.js +253 -91
  159. package/lib/es/components/modules/summarize/select-index.js +116 -59
  160. package/lib/es/components/modules/table-data.js +11 -64
  161. package/lib/es/components/popup.js +27 -33
  162. package/lib/es/hooks/patch.d.ts +1 -0
  163. package/lib/es/hooks/patch.js +103 -5
  164. package/lib/es/hooks/patch2.js +2 -164
  165. package/lib/es/hooks/use-provider.js +0 -3
  166. package/lib/es/hooks/use-state.js +55 -135
  167. package/lib/es/index.js +0 -14
  168. package/lib/es/locale/en.js +5 -0
  169. package/lib/es/locale/index.js +1 -4
  170. package/lib/es/locale/zh.js +5 -0
  171. package/lib/es/sql-formula.js +0 -1
  172. package/lib/es/store/enum.d.ts +6 -6
  173. package/lib/es/store/enum.js +0 -13
  174. package/lib/es/store/helper.d.ts +2 -1
  175. package/lib/es/store/helper.js +13 -224
  176. package/lib/es/store/types.d.ts +45 -67
  177. package/lib/es/store/types.js +3 -49
  178. package/lib/es/types.d.ts +1 -0
  179. package/lib/es/types.js +1 -18
  180. package/lib/es/utils/cookies.js +0 -3
  181. package/lib/es/utils/event.js +1 -1
  182. package/lib/es/utils/helper-dom.d.ts +1 -0
  183. package/lib/es/utils/helper-dom.js +16 -9
  184. package/lib/es/utils/helper.js +1 -24
  185. package/lib/es/utils/keydown.js +4 -7
  186. package/lib/es/utils/platform.d.ts +0 -9
  187. package/lib/es/utils/platform.js +0 -10
  188. package/lib/es/utils/selection.js +0 -6
  189. package/lib/es/utils/storage.d.ts +0 -9
  190. package/lib/es/utils/storage.js +1 -10
  191. package/lib/es/utils/transformSql.d.ts +5 -0
  192. package/lib/es/utils/transformSql.js +40 -100
  193. package/lib/es/utils.d.ts +1 -6
  194. package/lib/es/utils.js +127 -255
  195. package/package.json +1 -1
@@ -4,12 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.transformSql = void 0;
7
+ exports.transformSql = exports.handleBaseType2Sql = void 0;
8
8
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
9
9
  var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
10
10
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
11
11
  var _excluded = ["children"];
12
- // @ts-nocheck
13
12
  var procEnum = {
14
13
  mysql: 'mysql',
15
14
  oracle: 'oracle',
@@ -26,28 +25,17 @@ var MetabaseTypeEnum = {
26
25
  union: 'union',
27
26
  permissionTable: 'permissionTable'
28
27
  };
29
- // 数据基础类型
30
28
  var BlockTypeEnum = {
31
29
  joinDefault: 'joinDefault',
32
- // 简单的表达式
33
30
  expression: 'expression',
34
- // 表达式
35
31
  operator: 'operator',
36
- // 操作符
37
32
  field: 'field',
38
- // 字段
39
33
  inputNumber: 'inputNumber',
40
- // 数字输入框
41
34
  inputString: 'inputString',
42
- // 字符串输入框
43
35
  constant: 'constant',
44
- // 常量
45
36
  inputStringList: 'inputStringList',
46
- // 多个字符串输入框
47
37
  inputNumberList: 'inputNumberList',
48
- // 多个数字输入框
49
38
  unknown: 'unknown',
50
- // 未知
51
39
  notExists: 'notExists',
52
40
  exists: 'exists',
53
41
  FORMULA: 'FORMULA',
@@ -84,11 +72,11 @@ var _recursionArr2 = function _recursionArr(arr) {
84
72
  }
85
73
  return obj;
86
74
  };
87
- var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
75
+ var _handleBaseType2Sql8 = exports.handleBaseType2Sql = function handleBaseType2Sql(list) {
88
76
  var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
89
77
  var sql = '';
90
78
  var constants = [];
91
- var sql_items = []; // 这个是 给 list 单一类型用的,字符串输入框 类型也不加''
79
+ var sql_items = [];
92
80
  if (!Array.isArray(list)) {
93
81
  return {
94
82
  sql: sql,
@@ -130,19 +118,15 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
130
118
  constants.push(item.val);
131
119
  }
132
120
  if (type === BlockTypeEnum.inputStringList) {
133
- // 这个如果存在 list 数组中,那么 list 数组种 只能有他,因为他太特殊了,现在就表达式在用
134
121
  if (Array.isArray(item.val) && item.val.length) {
135
122
  item.val.forEach(function (v) {
136
- // 这里虽然是字符串 但是不加 ''了 因为他太特殊了 不通用
137
123
  sql_items.push("".concat(v));
138
124
  });
139
125
  }
140
126
  }
141
127
  if (type === BlockTypeEnum.inputNumberList) {
142
- // 这个如果存在 list 数组中,那么 list 数组种 只能有他,因为他太特殊了,现在就表达式在用
143
128
  if (Array.isArray(item.val) && item.val.length) {
144
129
  item.val.forEach(function (v) {
145
- // 这里虽然是字符串 但是不加 ''了 因为他太特殊了 不通用
146
130
  sql_items.push("".concat(v));
147
131
  });
148
132
  }
@@ -150,21 +134,19 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
150
134
  if (type === BlockTypeEnum.joinDefault) {
151
135
  var lhs = item.lhs,
152
136
  rhs = item.rhs;
153
- // 他很特殊 左边里面只有一种类型 右边面只有一种类型
154
- var _handleBaseType2Sql2 = _handleBaseType2Sql8(lhs, db),
155
- leftSql = _handleBaseType2Sql2.sql,
156
- leftSqlItems = _handleBaseType2Sql2.sql_items,
157
- joinDefaultLeftConstants = _handleBaseType2Sql2.constants;
158
- var _handleBaseType2Sql3 = _handleBaseType2Sql8(rhs, db),
159
- rightSql = _handleBaseType2Sql3.sql,
160
- rightSqlItems = _handleBaseType2Sql3.sql_items,
161
- joinDefaultRightConstants = _handleBaseType2Sql3.constants;
137
+ var _handleBaseType2Sql = _handleBaseType2Sql8(lhs, db),
138
+ leftSql = _handleBaseType2Sql.sql,
139
+ leftSqlItems = _handleBaseType2Sql.sql_items,
140
+ joinDefaultLeftConstants = _handleBaseType2Sql.constants;
141
+ var _handleBaseType2Sql2 = _handleBaseType2Sql8(rhs, db),
142
+ rightSql = _handleBaseType2Sql2.sql,
143
+ rightSqlItems = _handleBaseType2Sql2.sql_items,
144
+ joinDefaultRightConstants = _handleBaseType2Sql2.constants;
162
145
  constants.push.apply(constants, (0, _toConsumableArray2["default"])(joinDefaultLeftConstants));
163
146
  constants.push.apply(constants, (0, _toConsumableArray2["default"])(joinDefaultRightConstants));
164
147
  var left_condition = leftSql;
165
148
  var right_condition = rightSql;
166
149
  if (leftSqlItems.length > 1) {
167
- // 多个肯定是字段
168
150
  if (db === procEnum.mysql) {
169
151
  left_condition = "CONCAT(".concat(leftSqlItems.join(','), ")");
170
152
  }
@@ -176,7 +158,6 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
176
158
  }
177
159
  }
178
160
  if (rightSqlItems.length > 1) {
179
- // 多个肯定是字段
180
161
  if (db === procEnum.mysql) {
181
162
  right_condition = "CONCAT(".concat(rightSqlItems.join(','), ")");
182
163
  }
@@ -195,20 +176,19 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
195
176
  condition = item.condition,
196
177
  database_type = item.database_type,
197
178
  formula = item.formula;
198
- var _handleBaseType2Sql4 = _handleBaseType2Sql8(_lhs, db),
199
- _leftSql = _handleBaseType2Sql4.sql,
200
- _leftSqlItems = _handleBaseType2Sql4.sql_items,
201
- _joinDefaultLeftConstants = _handleBaseType2Sql4.constants;
202
- var _handleBaseType2Sql5 = _handleBaseType2Sql8(_rhs, db),
203
- _rightSql = _handleBaseType2Sql5.sql,
204
- _rightSqlItems = _handleBaseType2Sql5.sql_items,
205
- _joinDefaultRightConstants = _handleBaseType2Sql5.constants;
179
+ var _handleBaseType2Sql3 = _handleBaseType2Sql8(_lhs, db),
180
+ _leftSql = _handleBaseType2Sql3.sql,
181
+ _leftSqlItems = _handleBaseType2Sql3.sql_items,
182
+ _joinDefaultLeftConstants = _handleBaseType2Sql3.constants;
183
+ var _handleBaseType2Sql4 = _handleBaseType2Sql8(_rhs, db),
184
+ _rightSql = _handleBaseType2Sql4.sql,
185
+ _rightSqlItems = _handleBaseType2Sql4.sql_items,
186
+ _joinDefaultRightConstants = _handleBaseType2Sql4.constants;
206
187
  constants.push.apply(constants, (0, _toConsumableArray2["default"])(_joinDefaultLeftConstants));
207
188
  constants.push.apply(constants, (0, _toConsumableArray2["default"])(_joinDefaultRightConstants));
208
189
  var _left_condition = _leftSql;
209
190
  var _right_condition = '';
210
191
  if (_leftSqlItems.length > 1) {
211
- // 多个肯定是字段
212
192
  if (db === procEnum.mysql) {
213
193
  _left_condition = "CONCAT(".concat(_leftSqlItems.join(','), ")");
214
194
  }
@@ -220,14 +200,12 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
220
200
  }
221
201
  }
222
202
  if (formula && formula.type && formula.params) {
223
- // 目前只有一个 SUBSTR, 也不想再加函数了,函数不在这里加
224
203
  var formulaType = formula.type;
225
204
  if (db === procEnum.sqlserver && formulaType === 'SUBSTR') {
226
205
  formulaType = 'SUBSTRING';
227
206
  }
228
207
  _left_condition = "".concat(formulaType, "(").concat(formula.params.map(function (it, i) {
229
208
  if (!i) {
230
- // 字段
231
209
  return _left_condition;
232
210
  } else {
233
211
  return it;
@@ -248,7 +226,6 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
248
226
  if (group === SQL_GROUP_TYPE.STRING) {
249
227
  var condition_1 = (_rightSqlItems === null || _rightSqlItems === void 0 ? void 0 : _rightSqlItems[0]) || '';
250
228
  switch (condition) {
251
- // string
252
229
  case '等于':
253
230
  _right_condition = "= ".concat(_rightSql);
254
231
  break;
@@ -256,7 +233,6 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
256
233
  _right_condition = "!= ".concat(_rightSql);
257
234
  break;
258
235
  case '包含':
259
- // 去掉引号
260
236
  _right_condition = "LIKE '%".concat(condition_1, "%'");
261
237
  break;
262
238
  case '不包含':
@@ -284,7 +260,6 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
284
260
  condition_1 = (_condition_ = condition_1) === null || _condition_ === void 0 || (_condition_ = _condition_.split(',')) === null || _condition_ === void 0 || (_condition_ = _condition_.map(function (v) {
285
261
  var _v;
286
262
  v = (_v = v) === null || _v === void 0 ? void 0 : _v.trim();
287
- // 如果已经加了引号
288
263
  if (v && (/^'.*'$/.test(v) || /^".*"$/.test(v))) {
289
264
  return "".concat(v);
290
265
  } else {
@@ -324,7 +299,6 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
324
299
  var _condition_3 = (_rightSqlItems === null || _rightSqlItems === void 0 ? void 0 : _rightSqlItems[0]) || '';
325
300
  var condition_2 = (_rightSqlItems === null || _rightSqlItems === void 0 ? void 0 : _rightSqlItems[1]) || '';
326
301
  switch (condition) {
327
- // number
328
302
  case '等于':
329
303
  _right_condition = "= ".concat(_condition_3);
330
304
  break;
@@ -435,15 +409,12 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
435
409
  var _condition_4 = (_rightSqlItems === null || _rightSqlItems === void 0 ? void 0 : _rightSqlItems[0]) || '';
436
410
  var _condition_5 = (_rightSqlItems === null || _rightSqlItems === void 0 ? void 0 : _rightSqlItems[1]) || '';
437
411
  if (/^[\d- :]+$/.test(_condition_4)) {
438
- // 日期
439
412
  _condition_4 = "'".concat(transformDate(_condition_4), "'");
440
413
  }
441
414
  if (/^[\d- :]+$/.test(_condition_5)) {
442
- // 日期
443
415
  _condition_5 = "'".concat(transformDate(_condition_5), "'");
444
416
  }
445
417
  switch (condition) {
446
- // date
447
418
  case '等于':
448
419
  _right_condition = "= ".concat(_condition_4);
449
420
  break;
@@ -479,11 +450,21 @@ var _handleBaseType2Sql8 = function _handleBaseType2Sql(list) {
479
450
  }
480
451
  }
481
452
  if (type === BlockTypeEnum.FORMULA) {
482
- var _handleBaseType2Sql6 = _handleBaseType2Sql8(item.args, db),
483
- argSql = _handleBaseType2Sql6.sql,
484
- formulaConstants = _handleBaseType2Sql6.constants;
485
- sql += " ".concat(item.name, "(").concat(argSql, ")");
486
- constants.push.apply(constants, (0, _toConsumableArray2["default"])(formulaConstants));
453
+ var argSqlList = (Array.isArray(item.args) ? item.args : []).map(function (arg) {
454
+ if ((arg === null || arg === void 0 ? void 0 : arg.type) === BlockTypeEnum.collection) {
455
+ var _handleBaseType2Sql5 = _handleBaseType2Sql8(arg.list, db),
456
+ collectionSql = _handleBaseType2Sql5.sql,
457
+ collectionConstants = _handleBaseType2Sql5.constants;
458
+ constants.push.apply(constants, (0, _toConsumableArray2["default"])(collectionConstants));
459
+ return collectionSql.trim();
460
+ }
461
+ var _handleBaseType2Sql6 = _handleBaseType2Sql8([arg], db),
462
+ nestedSql = _handleBaseType2Sql6.sql,
463
+ nestedConstants = _handleBaseType2Sql6.constants;
464
+ constants.push.apply(constants, (0, _toConsumableArray2["default"])(nestedConstants));
465
+ return nestedSql.trim();
466
+ }).filter(Boolean);
467
+ sql += " ".concat(item.name, "(").concat(argSqlList.join(', '), ")");
487
468
  }
488
469
  if (type === BlockTypeEnum.collection) {
489
470
  var _handleBaseType2Sql7 = _handleBaseType2Sql8(item.list, db),
@@ -534,7 +515,6 @@ var _handleJoinData = function _handleJoinData(joinData) {
534
515
  return {
535
516
  field_sql: "".concat(tableAlias ? "".concat(tableAlias, ".").concat(o.name) : o.name, " as ").concat(fieldAlias),
536
517
  read_name: o.name,
537
- // 原字段名
538
518
  name: fieldAlias,
539
519
  name_zh: o.name_zh,
540
520
  id: o.id
@@ -547,7 +527,6 @@ var _handleJoinData = function _handleJoinData(joinData) {
547
527
  constants: constants
548
528
  };
549
529
  };
550
- // 处理数据格式 - (这里才是真正处理成后端需要的格式 前面两步都是准备工作)
551
530
  var _handleNesting = function handleNesting(data) {
552
531
  var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
553
532
  var hasInnerSql = Boolean(data.children);
@@ -569,7 +548,6 @@ var _handleNesting = function handleNesting(data) {
569
548
  obj.datasourceId = tableData.table.datasourceId;
570
549
  obj.datasourceName = tableData.table.datasourceName;
571
550
  if (tableData.isSubquery && Array.isArray(tableData.subquery)) {
572
- // 主表是子查询
573
551
  obj.tableSubQuery = tableData.subquery;
574
552
  }
575
553
  if (!summarize || !summarize.group.length && !summarize.by.length) {
@@ -581,14 +559,10 @@ var _handleNesting = function handleNesting(data) {
581
559
  var fieldAlias = v.fieldAlias || v.name;
582
560
  return {
583
561
  field_sql: "".concat(tableAlias ? "".concat(tableAlias, ".").concat(v.name) : v.name, " as ").concat(fieldAlias),
584
- // 生成 sql 放 select 后面的
585
562
  read_name: v.name,
586
- // 原字段名
587
563
  name: fieldAlias,
588
- // 输出字段名
589
564
  name_zh: v.name_zh,
590
- // 字段中文名
591
- id: v.id // 字段原 DATA_ID
565
+ id: v.id
592
566
  };
593
567
  });
594
568
  }
@@ -638,10 +612,8 @@ var _handleNesting = function handleNesting(data) {
638
612
  queryColumns.push({
639
613
  field_sql: "".concat(v.sql, " as ").concat(v.fieldAlias),
640
614
  read_name: '',
641
- // 原字段名
642
615
  name: v.fieldAlias,
643
616
  name_zh: v.fieldAlias,
644
- // v.quotes,
645
617
  id: ''
646
618
  });
647
619
  return v.sql;
@@ -649,16 +621,16 @@ var _handleNesting = function handleNesting(data) {
649
621
  }
650
622
  if (summarize.by.length) {
651
623
  obj.groupBy.groupColumns = summarize.by.map(function (v) {
624
+ var _v$atoms;
625
+ var fieldSql = (_v$atoms = v.atoms) !== null && _v$atoms !== void 0 && _v$atoms.length ? _handleBaseType2Sql8(v.atoms, db).sql.trim() || v.sql : v.sql || "".concat(v.alias, ".").concat(v.realName || v.name);
652
626
  queryColumns.push({
653
- field_sql: "".concat(v.sql, " as ").concat(v.fieldAlias),
627
+ field_sql: "".concat(fieldSql, " as ").concat(v.fieldAlias),
654
628
  read_name: '',
655
- // 原字段名
656
629
  name: v.fieldAlias,
657
630
  name_zh: v.fieldAlias,
658
- // v.name_zh,
659
631
  id: v.id
660
632
  });
661
- return "".concat(v.alias, ".").concat(v.realName || v.name);
633
+ return fieldSql;
662
634
  });
663
635
  }
664
636
  obj.queryColumns = queryColumns;
@@ -678,18 +650,15 @@ var _handleNesting = function handleNesting(data) {
678
650
  }
679
651
  return obj;
680
652
  };
681
- // 反转顺序 - (将原本嵌套的顺序完全反转 最内层变成最外层)别问为什么 问就是接口需要
682
653
  var reverseData = function reverseData(data) {
683
654
  var arr = [];
684
655
  _flatArr2(data, arr);
685
656
  return _recursionArr2(arr.reverse());
686
657
  };
687
- // 分层 - (将原本平铺的格式转成 嵌套的格式)
688
658
  var _layeredData = function layeredData(list) {
689
659
  var res = {};
690
660
  for (var i = 0; i < list.length; i++) {
691
661
  var meta = list[i];
692
- // @ts-ignore
693
662
  if (meta.type === MetabaseTypeEnum.joinData) {
694
663
  if (res[meta.type]) {
695
664
  res[meta.type].push(meta);
@@ -697,15 +666,12 @@ var _layeredData = function layeredData(list) {
697
666
  res[meta.type] = [meta];
698
667
  }
699
668
  } else {
700
- // @ts-ignore
701
669
  res[meta.type] = meta;
702
670
  }
703
671
  if (meta.type === MetabaseTypeEnum.summarize) {
704
672
  var nextMeta = list[i + 1];
705
673
  var nextNextMeta = list[i + 2];
706
674
  var nextNextNextMeta = list[i + 3];
707
- // 将sort 和 rowLimit 归到上一层 (虽然他们两在 summarize 后面)
708
- // 处理完 sort 和 rowLimit 之后 如果数组后面还有元素则进入下一层循环
709
675
  if (nextMeta) {
710
676
  if (nextMeta.type === MetabaseTypeEnum.rowLimit) {
711
677
  res[nextMeta.type] = nextMeta;
@@ -737,7 +703,6 @@ var handleSqlStruct = function handleSqlStruct(list) {
737
703
  var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
738
704
  return _handleNesting(reverseData(_layeredData(list)), db);
739
705
  };
740
- // 处理 union
741
706
  var handleSqlUnion = function handleSqlUnion(metas) {
742
707
  var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
743
708
  var noFields = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -753,7 +718,6 @@ var handleSqlUnion = function handleSqlUnion(metas) {
753
718
  fields = _sqlStruct2text.fields;
754
719
  var union_fields = [fields];
755
720
  if (unionMetas.length) {
756
- // 用到了 union
757
721
  unionMetas.forEach(function (it) {
758
722
  if (Array.isArray(it.subquery) && it.subquery.length) {
759
723
  var u_data = handleSqlStruct(it.subquery, db);
@@ -771,11 +735,6 @@ var handleSqlUnion = function handleSqlUnion(metas) {
771
735
  union_fields: union_fields
772
736
  };
773
737
  };
774
- /**
775
- * 拼 sql
776
- * @param {meta[]} data
777
- * @param {boolean} indent 0 是第一次进来 非 0 是第N次进来
778
- */
779
738
  var _sqlStruct2text3 = function sqlStruct2text(data) {
780
739
  var indent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
781
740
  var db = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : procEnum.mysql;
@@ -795,19 +754,14 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
795
754
  groupBy = data.groupBy;
796
755
  sql += "SELECT ";
797
756
  var firstEntry = !indent;
798
- // -------- 处理 fields --------
799
- // 情况一、一层 带聚合 字段是 聚合字段
800
- // 情况二、一层 不带聚合 字段是 主表和关联表的字段
801
- // 情况三、二层 带聚合 第一层 聚合字段 + 关联表字段 第二层 聚合字段 第三层 聚合字段
802
757
  if (noFields) {
803
758
  sql += '1 ';
804
759
  } else {
805
- var flag = false; // 是否加逗号
760
+ var flag = false;
806
761
  if (limit && db === procEnum.sqlserver) {
807
762
  sql += "TOP(".concat(limit, ") ");
808
763
  }
809
764
  if (hasInnerSql) {
810
- // 情况三 innerSqlStruct.queryColumns 是内层 聚合输出的字段,这种字段虽说是内层的,但是其实外层也需要
811
765
  if (innerSqlStruct.queryColumns && innerSqlStruct.queryColumns.length) {
812
766
  sql += innerSqlStruct.queryColumns.map(function (v) {
813
767
  return "".concat(alias, ".").concat(v.name, " as ").concat(v.name);
@@ -816,9 +770,6 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
816
770
  }
817
771
  } else {
818
772
  if (Array.isArray(queryColumns) && queryColumns.length) {
819
- // 情况一 queryColumns 是聚合字段
820
- // 情况二 queryColumns 是主表字段
821
- // 情况三 queryColumns 是聚合字段
822
773
  flag = true;
823
774
  sql += queryColumns.map(function (v) {
824
775
  return v.field_sql;
@@ -826,8 +777,6 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
826
777
  }
827
778
  }
828
779
  if (firstEntry && joinTables && !groupBy) {
829
- // 情况二 joinTables 是关联表字段
830
- // 情况三 joinTables 是关联表字段
831
780
  joinTables.forEach(function (it) {
832
781
  if (Array.isArray(it.queryColumns) && it.queryColumns.length) {
833
782
  if (flag) {
@@ -849,31 +798,26 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
849
798
  }).join(', ') + ' ';
850
799
  }
851
800
  }
852
- // -------- 处理 main table --------
853
801
  sql += 'FROM ';
854
802
  var as = db === procEnum.oracle ? '' : 'AS ';
855
803
  if (hasInnerSql) {
856
804
  sql += "(".concat(_sqlStruct2text3(innerSqlStruct, indent + 1, db).sql, ") ").concat(as).concat(alias, " ");
857
805
  } else {
858
806
  if (tableSubQuery) {
859
- // 子查询
860
807
  sql += "(".concat(handleSqlUnion(tableSubQuery, db).sql, ") ").concat(as).concat(alias, " ");
861
808
  } else {
862
809
  sql += "".concat(tableName, " ").concat(as).concat(alias, " ");
863
810
  }
864
811
  }
865
- // -------- 处理 left join --------
866
812
  if (joinTables) {
867
813
  joinTables.forEach(function (it) {
868
814
  if (it.subQuery) {
869
- // 子查询
870
815
  sql += "".concat(it.joinType, " (").concat(handleSqlUnion(it.subQuery, db).sql, ") ").concat(as).concat(it.alias, " ").concat(it.joinCondition, " ");
871
816
  } else {
872
817
  sql += "".concat(it.joinType, " ").concat(it.tableName, " ").concat(as).concat(it.alias, " ").concat(it.joinCondition, " ");
873
818
  }
874
819
  });
875
820
  }
876
- // -------- 处理 where --------
877
821
  if (filters) {
878
822
  sql += "".concat(filters, " ");
879
823
  if (limit && db === procEnum.oracle) {
@@ -884,21 +828,17 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
884
828
  }
885
829
  }
886
830
  }
887
- // -------- 处理 group by --------
888
831
  if (Array.isArray(groupBy === null || groupBy === void 0 ? void 0 : groupBy.groupColumns) && groupBy.groupColumns.length) {
889
832
  sql += "GROUP BY ".concat(groupBy.groupColumns.map(function (it) {
890
833
  return it;
891
834
  }).join(', '), " ");
892
835
  }
893
- // -------- 处理 orderby --------
894
836
  if (orderInfos) {
895
837
  sql += "".concat(orderInfos, " ");
896
838
  }
897
- // -------- 处理 limit --------
898
839
  if (limit && db === procEnum.mysql) {
899
840
  sql += "LIMIT ".concat(limit, " ");
900
841
  }
901
- // -------- 获取 字段列表 --------
902
842
  var fields = [];
903
843
  if (firstEntry && !noFields) {
904
844
  function addFields(data) {
@@ -947,7 +887,6 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
947
887
  };
948
888
  var transformSql = exports.transformSql = function transformSql(metas) {
949
889
  var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
950
- // let new_metas = upgradeLegacyData(metas);
951
890
  var _handleSqlUnion = handleSqlUnion(metas, db, true),
952
891
  sql = _handleSqlUnion.sql,
953
892
  fields = _handleSqlUnion.fields,
@@ -26,17 +26,12 @@ export declare function isValidSQLAlias(str: string): boolean;
26
26
  export declare const changeTableAlias: (list: MetaListType[] | [], curObj: Pick<MetaData_TableType, "tableUuid" | "alias">) => MetaListType[];
27
27
  export declare const changeFieldAlias: (list: MetaListType[], curObj: Pick<MetaData_ColumnsType, "fieldUuid" | "fieldAlias">) => MetaListType[];
28
28
  export declare function splitByUnion(data: any): any[];
29
+ export declare const normalizeLegacySummarizeForSave: (metas?: MetaListType[]) => MetaListType[];
29
30
  export declare const getObjTem: (arr: any[]) => any;
30
31
  export declare const patchData: (metas: MetaListType[], constantList?: any, formulaTemplates?: any) => MetaListType[];
31
32
  export declare function reassembleByUnion(target?: any[]): any[];
32
33
  export declare const buildSqlQuery: (data: MetaListType[] | undefined, type: string) => string;
33
34
  export declare const isError: (item: AtomsItem | AtomsItem[], data: DataType[]) => boolean;
34
- /**
35
- * 在嵌套结构 root 中查找是否存在一个对象,使得 target 是该对象的子集
36
- * @param root 可能包含任意层数组/对象的根数据
37
- * @param target 目标对象(可能只包含部分字段)
38
- * @returns 是否存在
39
- */
40
35
  export declare function containsSubset(root: unknown, target: Record<string, unknown>): boolean;
41
36
  export declare const isExistsError: (meta: any[], errorList: any[]) => boolean;
42
37
  export declare const changeCopyField: (items: AtomsItem[], data: any[]) => AtomsItem[];