@gingkoo/pandora-metabase 1.0.14 → 1.0.16
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.
- package/lib/cjs/common/SplitView/index.js +11 -12
- package/lib/cjs/components/dialog/custom-column/expression-editor.js +1 -2
- package/lib/cjs/components/dialog/custom-column/expressions/suggest.js +1 -1
- package/lib/cjs/components/dialog/custom-column/tokenizedI-input.js +1 -2
- package/lib/cjs/components/dialog/{select-filter → expression}/index.d.ts +4 -4
- package/lib/cjs/components/dialog/{select-filter → expression}/index.js +345 -206
- package/lib/cjs/components/dialog/formula-list/enum.d.ts +9 -13
- package/lib/cjs/components/dialog/formula-list/enum.js +83 -39
- package/lib/cjs/components/dialog/formula-list/index.d.ts +4 -1
- package/lib/cjs/components/dialog/formula-list/index.js +110 -126
- package/lib/cjs/components/dialog/formula-list/utils.js +77 -46
- package/lib/cjs/components/dialog/index.d.ts +2 -2
- package/lib/cjs/components/dialog/index.js +20 -20
- package/lib/cjs/components/dialog/select-column/index.js +43 -12
- package/lib/cjs/components/dialog/select-column-multiple/index.d.ts +54 -0
- package/lib/cjs/components/dialog/select-column-multiple/index.js +341 -0
- package/lib/cjs/components/dialog/select-column-multiple/index.less +246 -0
- package/lib/cjs/components/dialog/select-table/index.js +9 -7
- package/lib/cjs/components/icons.js +36 -36
- package/lib/cjs/components/metabase/index.js +6 -6
- package/lib/cjs/components/metabase/index.less +12 -1
- package/lib/cjs/components/modules/components/Wrapper.js +6 -6
- package/lib/cjs/components/modules/custom-column.js +12 -14
- package/lib/cjs/components/modules/enum/filter-enum.d.ts +34 -0
- package/lib/cjs/components/modules/enum/filter-enum.js +137 -0
- package/lib/cjs/components/modules/filter.js +43 -460
- package/lib/cjs/components/modules/join-data.js +863 -525
- package/lib/cjs/components/modules/permission-table.js +4 -0
- package/lib/cjs/components/modules/sort.js +102 -91
- package/lib/cjs/components/modules/summarize/group-by.js +47 -16
- package/lib/cjs/components/modules/summarize/select-index.js +48 -17
- package/lib/cjs/components/modules/table-data.js +13 -4
- package/lib/cjs/components/popup.js +1 -2
- package/lib/cjs/hooks/patch.d.ts +4 -0
- package/lib/cjs/hooks/patch.js +464 -0
- package/lib/cjs/hooks/use-state.js +73 -138
- package/lib/cjs/index.d.ts +0 -1
- package/lib/cjs/index.js +3 -21
- package/lib/cjs/locale/en.js +9 -2
- package/lib/cjs/locale/zh.js +11 -4
- package/lib/cjs/store/helper.d.ts +2 -3
- package/lib/cjs/store/helper.js +288 -233
- package/lib/cjs/store/types.d.ts +94 -71
- package/lib/cjs/store/types.js +17 -12
- package/lib/cjs/utils.d.ts +3 -3
- package/lib/cjs/utils.js +152 -187
- package/lib/es/common/SplitView/index.js +10 -10
- package/lib/es/components/dialog/custom-column/expressions/suggest.js +1 -1
- package/lib/es/components/dialog/{select-filter → expression}/index.d.ts +4 -4
- package/lib/es/components/dialog/{select-filter → expression}/index.js +343 -206
- package/lib/es/components/dialog/formula-list/enum.d.ts +9 -13
- package/lib/es/components/dialog/formula-list/enum.js +82 -38
- package/lib/es/components/dialog/formula-list/index.d.ts +4 -1
- package/lib/es/components/dialog/formula-list/index.js +115 -131
- package/lib/es/components/dialog/formula-list/utils.js +77 -46
- package/lib/es/components/dialog/index.d.ts +2 -2
- package/lib/es/components/dialog/index.js +3 -3
- package/lib/es/components/dialog/select-column/index.js +44 -13
- package/lib/es/components/dialog/select-column-multiple/index.d.ts +54 -0
- package/lib/es/components/dialog/select-column-multiple/index.js +335 -0
- package/lib/es/components/dialog/select-column-multiple/index.less +246 -0
- package/lib/es/components/dialog/select-table/index.js +9 -7
- package/lib/es/components/icons.js +36 -36
- package/lib/es/components/metabase/index.js +6 -6
- package/lib/es/components/metabase/index.less +12 -1
- package/lib/es/components/modules/components/Wrapper.js +6 -6
- package/lib/es/components/modules/custom-column.js +12 -14
- package/lib/es/components/modules/enum/filter-enum.d.ts +34 -0
- package/lib/es/components/modules/enum/filter-enum.js +131 -0
- package/lib/es/components/modules/filter.js +45 -463
- package/lib/es/components/modules/join-data.js +865 -527
- package/lib/es/components/modules/permission-table.js +4 -0
- package/lib/es/components/modules/sort.js +102 -91
- package/lib/es/components/modules/summarize/group-by.js +48 -17
- package/lib/es/components/modules/summarize/select-index.js +49 -18
- package/lib/es/components/modules/table-data.js +13 -4
- package/lib/es/hooks/patch.d.ts +4 -0
- package/lib/es/hooks/patch.js +457 -0
- package/lib/es/hooks/use-state.js +73 -138
- package/lib/es/index.d.ts +0 -1
- package/lib/es/index.js +1 -1
- package/lib/es/locale/en.js +9 -2
- package/lib/es/locale/zh.js +11 -4
- package/lib/es/store/helper.d.ts +2 -3
- package/lib/es/store/helper.js +288 -233
- package/lib/es/store/types.d.ts +94 -71
- package/lib/es/store/types.js +16 -11
- package/lib/es/utils.d.ts +3 -3
- package/lib/es/utils.js +154 -190
- package/package.json +1 -1
- package/lib/cjs/components/modules/filter copy.d.ts +0 -7
- package/lib/cjs/components/modules/filter copy.js +0 -178
- package/lib/es/components/modules/filter copy.d.ts +0 -7
- package/lib/es/components/modules/filter copy.js +0 -171
- /package/lib/cjs/components/dialog/{select-filter → expression}/index.less +0 -0
- /package/lib/es/components/dialog/{select-filter → expression}/index.less +0 -0
|
@@ -15,7 +15,8 @@ var _react = require("react");
|
|
|
15
15
|
var _helper = require("../utils/helper");
|
|
16
16
|
var _enum = require("../store/enum");
|
|
17
17
|
var _utils = require("../utils");
|
|
18
|
-
var
|
|
18
|
+
var _patch = require("./patch");
|
|
19
|
+
var _excluded = ["alias", "datasourceName", "datasourceId", "column"];
|
|
19
20
|
var metaKey = 1;
|
|
20
21
|
var SummarizeAlias = exports.SummarizeAlias = 'source';
|
|
21
22
|
var useStore = function useStore() {
|
|
@@ -25,6 +26,7 @@ var useStore = function useStore() {
|
|
|
25
26
|
type: _enum.TypeEnum.data,
|
|
26
27
|
table: {
|
|
27
28
|
name: '',
|
|
29
|
+
name_zh: '',
|
|
28
30
|
id: '',
|
|
29
31
|
alias: '',
|
|
30
32
|
datasourceId: '',
|
|
@@ -61,65 +63,65 @@ var useStore = function useStore() {
|
|
|
61
63
|
toolbar = _useState8[0],
|
|
62
64
|
setToolbar = _useState8[1]; //工具列表
|
|
63
65
|
var _useState9 = (0, _react.useState)('${name}'),
|
|
64
|
-
|
|
65
|
-
fieldNameTpl =
|
|
66
|
-
setFieldNameTpl =
|
|
67
|
-
var
|
|
66
|
+
_useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
|
|
67
|
+
fieldNameTpl = _useState0[0],
|
|
68
|
+
setFieldNameTpl = _useState0[1]; //显示字段
|
|
69
|
+
var _useState1 = (0, _react.useState)('${name}'),
|
|
70
|
+
_useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
|
|
71
|
+
tableNameTpl = _useState10[0],
|
|
72
|
+
setTableNameTpl = _useState10[1]; //显示字段
|
|
73
|
+
var _useState11 = (0, _react.useState)([]),
|
|
68
74
|
_useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
|
|
69
|
-
|
|
70
|
-
|
|
75
|
+
sourceList = _useState12[0],
|
|
76
|
+
setSourceList = _useState12[1]; //数据源列表
|
|
71
77
|
var _useState13 = (0, _react.useState)([]),
|
|
72
78
|
_useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
var _useState15 = (0, _react.useState)(
|
|
79
|
+
constantList = _useState14[0],
|
|
80
|
+
setConstantList = _useState14[1]; //常量列表
|
|
81
|
+
var _useState15 = (0, _react.useState)(false),
|
|
76
82
|
_useState16 = (0, _slicedToArray2["default"])(_useState15, 2),
|
|
77
|
-
|
|
78
|
-
|
|
83
|
+
ignoreGroupByType = _useState16[0],
|
|
84
|
+
setIgnoreGroupByType = _useState16[1]; // 忽略groupBy类型
|
|
79
85
|
var _useState17 = (0, _react.useState)(false),
|
|
80
86
|
_useState18 = (0, _slicedToArray2["default"])(_useState17, 2),
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
var _useState19 = (0, _react.useState)(
|
|
87
|
+
filterCustomType = _useState18[0],
|
|
88
|
+
setfilterCustomType = _useState18[1]; // 过滤器自定义类型
|
|
89
|
+
var _useState19 = (0, _react.useState)({}),
|
|
84
90
|
_useState20 = (0, _slicedToArray2["default"])(_useState19, 2),
|
|
85
|
-
|
|
86
|
-
|
|
91
|
+
_cacheSource2TableMap = _useState20[0],
|
|
92
|
+
set_cacheSource2TableMap = _useState20[1]; //数据源id 对应数据集列表
|
|
87
93
|
var _useState21 = (0, _react.useState)({}),
|
|
88
94
|
_useState22 = (0, _slicedToArray2["default"])(_useState21, 2),
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
var _useState23 = (0, _react.useState)(
|
|
95
|
+
_cacheColumnsMap = _useState22[0],
|
|
96
|
+
set_cacheColumnsMap = _useState22[1]; //数据源id 对应数据集列表
|
|
97
|
+
var _useState23 = (0, _react.useState)(defaultMeta),
|
|
92
98
|
_useState24 = (0, _slicedToArray2["default"])(_useState23, 2),
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
var _useState25 = (0, _react.useState)(
|
|
96
|
-
_useState26 = (0, _slicedToArray2["default"])(_useState25, 2),
|
|
97
|
-
metaList = _useState26[0],
|
|
98
|
-
_setMeta = _useState26[1]; //数据源id 对应数据集列表
|
|
99
|
-
var _useState27 = (0, _react.useState)({
|
|
99
|
+
metaList = _useState24[0],
|
|
100
|
+
_setMeta = _useState24[1]; //数据源id 对应数据集列表
|
|
101
|
+
var _useState25 = (0, _react.useState)({
|
|
100
102
|
visible: false,
|
|
101
103
|
node: null,
|
|
102
104
|
content: null
|
|
103
105
|
}),
|
|
104
|
-
|
|
105
|
-
popupData =
|
|
106
|
-
setPopup =
|
|
107
|
-
var
|
|
106
|
+
_useState26 = (0, _slicedToArray2["default"])(_useState25, 2),
|
|
107
|
+
popupData = _useState26[0],
|
|
108
|
+
setPopup = _useState26[1]; //弹窗
|
|
109
|
+
var _useState27 = (0, _react.useState)({
|
|
108
110
|
visible: false,
|
|
109
111
|
node: null,
|
|
110
112
|
content: null
|
|
111
113
|
}),
|
|
114
|
+
_useState28 = (0, _slicedToArray2["default"])(_useState27, 2),
|
|
115
|
+
popupData2 = _useState28[0],
|
|
116
|
+
setPopup2 = _useState28[1]; //弹窗
|
|
117
|
+
var _useState29 = (0, _react.useState)(true),
|
|
112
118
|
_useState30 = (0, _slicedToArray2["default"])(_useState29, 2),
|
|
113
|
-
|
|
114
|
-
|
|
119
|
+
popupClosable = _useState30[0],
|
|
120
|
+
setClosable = _useState30[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
|
|
115
121
|
var _useState31 = (0, _react.useState)(true),
|
|
116
122
|
_useState32 = (0, _slicedToArray2["default"])(_useState31, 2),
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
var _useState33 = (0, _react.useState)(true),
|
|
120
|
-
_useState34 = (0, _slicedToArray2["default"])(_useState33, 2),
|
|
121
|
-
popupClosable2 = _useState34[0],
|
|
122
|
-
setClosable2 = _useState34[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
|
|
123
|
+
popupClosable2 = _useState32[0],
|
|
124
|
+
setClosable2 = _useState32[1]; //是否可关闭 如果弹框里面再弹框 则不可关闭
|
|
123
125
|
// 外层ref
|
|
124
126
|
var popupContainer = (0, _react.useRef)();
|
|
125
127
|
// const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
|
|
@@ -172,23 +174,23 @@ var useStore = function useStore() {
|
|
|
172
174
|
var fetchDataset = /*#__PURE__*/function () {
|
|
173
175
|
var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(datasourceId) {
|
|
174
176
|
var tables, _tables;
|
|
175
|
-
return _regenerator["default"].wrap(function
|
|
177
|
+
return _regenerator["default"].wrap(function (_context) {
|
|
176
178
|
while (1) switch (_context.prev = _context.next) {
|
|
177
179
|
case 0:
|
|
178
180
|
tables = getDataset(datasourceId);
|
|
179
181
|
if (!tables.length) {
|
|
180
|
-
_context.next =
|
|
182
|
+
_context.next = 1;
|
|
181
183
|
break;
|
|
182
184
|
}
|
|
183
185
|
return _context.abrupt("return", tables);
|
|
184
|
-
case
|
|
185
|
-
_context.next =
|
|
186
|
+
case 1:
|
|
187
|
+
_context.next = 2;
|
|
186
188
|
return fetchDatasetFn.current(datasourceId);
|
|
187
|
-
case
|
|
189
|
+
case 2:
|
|
188
190
|
_tables = _context.sent;
|
|
189
191
|
setDataset(datasourceId, _tables);
|
|
190
192
|
return _context.abrupt("return", _tables);
|
|
191
|
-
case
|
|
193
|
+
case 3:
|
|
192
194
|
case "end":
|
|
193
195
|
return _context.stop();
|
|
194
196
|
}
|
|
@@ -204,30 +206,30 @@ var useStore = function useStore() {
|
|
|
204
206
|
var fetchColumns = /*#__PURE__*/function () {
|
|
205
207
|
var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(table, datasourceId, callback) {
|
|
206
208
|
var _columns2;
|
|
207
|
-
var _table$alias, alias, datasourceName, did, column,
|
|
208
|
-
return _regenerator["default"].wrap(function
|
|
209
|
+
var _table$alias, alias, datasourceName, did, column, extra, tableName, columns, _columns;
|
|
210
|
+
return _regenerator["default"].wrap(function (_context2) {
|
|
209
211
|
while (1) switch (_context2.prev = _context2.next) {
|
|
210
212
|
case 0:
|
|
211
|
-
_table$alias = table.alias, alias = _table$alias === void 0 ? '' : _table$alias, datasourceName = table.datasourceName, did = table.datasourceId, column = table.column,
|
|
213
|
+
_table$alias = table.alias, alias = _table$alias === void 0 ? '' : _table$alias, datasourceName = table.datasourceName, did = table.datasourceId, column = table.column, extra = (0, _objectWithoutProperties2["default"])(table, _excluded);
|
|
212
214
|
tableName = table.name;
|
|
213
215
|
columns = getColumns(tableName);
|
|
214
216
|
if (columns.length) {
|
|
215
|
-
_context2.next =
|
|
217
|
+
_context2.next = 2;
|
|
216
218
|
break;
|
|
217
219
|
}
|
|
218
|
-
_context2.next =
|
|
220
|
+
_context2.next = 1;
|
|
219
221
|
return fetchColumnsFn.current(extra, datasourceId);
|
|
220
|
-
case
|
|
222
|
+
case 1:
|
|
221
223
|
columns = _context2.sent;
|
|
222
224
|
setColumns(tableName, columns);
|
|
223
|
-
case
|
|
225
|
+
case 2:
|
|
224
226
|
_columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
|
|
225
227
|
return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
|
|
226
228
|
fieldUuid: v.fieldAlias || (0, _helper.uuidv4)('field')
|
|
227
229
|
});
|
|
228
230
|
});
|
|
229
231
|
typeof callback === 'function' && callback(_columns);
|
|
230
|
-
case
|
|
232
|
+
case 3:
|
|
231
233
|
case "end":
|
|
232
234
|
return _context2.stop();
|
|
233
235
|
}
|
|
@@ -243,86 +245,6 @@ var useStore = function useStore() {
|
|
|
243
245
|
_setMeta(newMeta);
|
|
244
246
|
};
|
|
245
247
|
// 回显
|
|
246
|
-
// 设置column
|
|
247
|
-
var setQuotes = function setQuotes(newMeta) {
|
|
248
|
-
var _newMeta$expressions;
|
|
249
|
-
var fields1 = newMeta.table1.fields || [];
|
|
250
|
-
var fields2 = newMeta.table2.fields || [];
|
|
251
|
-
// 处理老字段
|
|
252
|
-
var field1 = {
|
|
253
|
-
fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column,
|
|
254
|
-
fieldUuid: newMeta.table1.fieldUuid || (0, _helper.uuidv4)('field'),
|
|
255
|
-
fieldId: newMeta.table1.id,
|
|
256
|
-
quotes: newMeta.table1.quotes || newMeta.table1.column
|
|
257
|
-
};
|
|
258
|
-
var field2 = {
|
|
259
|
-
fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column,
|
|
260
|
-
fieldUuid: newMeta.table2.fieldUuid || (0, _helper.uuidv4)('field'),
|
|
261
|
-
fieldId: newMeta.table2.id,
|
|
262
|
-
quotes: newMeta.table2.quotes || newMeta.table2.column
|
|
263
|
-
};
|
|
264
|
-
// 处理多选
|
|
265
|
-
if (field1.fieldAlias && fields1.length < 1) {
|
|
266
|
-
fields1 = [{
|
|
267
|
-
quotes: field1.quotes,
|
|
268
|
-
fieldUuid: field1.fieldUuid,
|
|
269
|
-
fieldAlias: field1.fieldAlias,
|
|
270
|
-
fieldId: field1.fieldId
|
|
271
|
-
}];
|
|
272
|
-
}
|
|
273
|
-
if (field2.fieldAlias && fields2.length < 1) {
|
|
274
|
-
fields2 = [{
|
|
275
|
-
quotes: field2.quotes,
|
|
276
|
-
fieldUuid: field2.fieldUuid,
|
|
277
|
-
fieldAlias: field2.fieldAlias,
|
|
278
|
-
fieldId: field2.fieldId
|
|
279
|
-
}];
|
|
280
|
-
}
|
|
281
|
-
newMeta.table1 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newMeta.table1), field1), {}, {
|
|
282
|
-
tableUuid: newMeta.table1.tableUuid || (0, _helper.uuidv4)('table'),
|
|
283
|
-
fields: fields1
|
|
284
|
-
});
|
|
285
|
-
newMeta.table2 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newMeta.table2), field2), {}, {
|
|
286
|
-
tableUuid: newMeta.table2.tableUuid || (0, _helper.uuidv4)('table'),
|
|
287
|
-
fields: fields2
|
|
288
|
-
});
|
|
289
|
-
newMeta.expressions = (_newMeta$expressions = newMeta.expressions) === null || _newMeta$expressions === void 0 ? void 0 : _newMeta$expressions.map(function (v) {
|
|
290
|
-
var left_fields = v.left_fields || [];
|
|
291
|
-
var right_fields = v.right_fields || [];
|
|
292
|
-
// 先处理老数据的字段
|
|
293
|
-
var left_field = {
|
|
294
|
-
left_fieldAlias: v.left_fieldAlias || v.left_column,
|
|
295
|
-
left_fieldUuid: v.left_fieldUuid || (0, _helper.uuidv4)('field'),
|
|
296
|
-
left_quotes: v.left_quotes || v.left_column
|
|
297
|
-
};
|
|
298
|
-
var right_field = {
|
|
299
|
-
right_fieldAlias: v.right_fieldAlias || v.right_column,
|
|
300
|
-
right_fieldUuid: v.right_fieldUuid || (0, _helper.uuidv4)('field'),
|
|
301
|
-
right_quotes: v.right_quotes || v.right_column
|
|
302
|
-
};
|
|
303
|
-
// 再处理多选
|
|
304
|
-
if (left_field.left_fieldAlias && left_fields.length < 1) {
|
|
305
|
-
left_fields = [{
|
|
306
|
-
fieldAlias: left_field.left_fieldAlias,
|
|
307
|
-
fieldUuid: left_field.left_fieldUuid,
|
|
308
|
-
quotes: left_field.left_quotes
|
|
309
|
-
}];
|
|
310
|
-
}
|
|
311
|
-
if (right_field.right_fieldAlias && right_fields.length < 1) {
|
|
312
|
-
right_fields = [{
|
|
313
|
-
fieldAlias: right_field.right_fieldAlias,
|
|
314
|
-
fieldUuid: right_field.right_fieldUuid,
|
|
315
|
-
quotes: right_field.right_quotes
|
|
316
|
-
}];
|
|
317
|
-
}
|
|
318
|
-
return (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), left_field), {}, {
|
|
319
|
-
left_fields: left_fields
|
|
320
|
-
}, right_field), {}, {
|
|
321
|
-
right_fields: right_fields
|
|
322
|
-
});
|
|
323
|
-
});
|
|
324
|
-
return newMeta;
|
|
325
|
-
};
|
|
326
248
|
var setFilterQuotes = function setFilterQuotes(newMeta) {
|
|
327
249
|
newMeta.filter = newMeta.filter.map(function (v) {
|
|
328
250
|
if (!v.expression) {
|
|
@@ -347,7 +269,16 @@ var useStore = function useStore() {
|
|
|
347
269
|
v.table.tableUuid = v.table.tableUuid || (0, _helper.uuidv4)('table');
|
|
348
270
|
}
|
|
349
271
|
if (v.type === _enum.TypeEnum.joinData) {
|
|
350
|
-
newMeta[i] =
|
|
272
|
+
newMeta[i] = (0, _patch.joinDataPatch)(newMeta[i]);
|
|
273
|
+
}
|
|
274
|
+
if (v.type === _enum.TypeEnum.filter) {
|
|
275
|
+
v = (0, _patch.filterPatch)(v);
|
|
276
|
+
}
|
|
277
|
+
if (v.type === _enum.TypeEnum.sort) {
|
|
278
|
+
newMeta[i] = (0, _patch.sortPatch)(newMeta[i]);
|
|
279
|
+
}
|
|
280
|
+
if (v.type === _enum.TypeEnum.customColumn) {
|
|
281
|
+
newMeta[i] = (0, _patch.customColumnPatch)(newMeta[i]);
|
|
351
282
|
}
|
|
352
283
|
// if (v.type === TypeEnum.filter) {
|
|
353
284
|
// newMeta[i] = setFilterQuotes(newMeta[i]);
|
|
@@ -422,6 +353,7 @@ var useStore = function useStore() {
|
|
|
422
353
|
var table1 = {
|
|
423
354
|
id: '',
|
|
424
355
|
name: '',
|
|
356
|
+
name_zh: '',
|
|
425
357
|
alias: '',
|
|
426
358
|
tableUuid: '',
|
|
427
359
|
datasourceId: '',
|
|
@@ -434,6 +366,7 @@ var useStore = function useStore() {
|
|
|
434
366
|
table1 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, mainTable.table), {}, {
|
|
435
367
|
name: mainTable.table.name,
|
|
436
368
|
alias: mainTable.table.alias,
|
|
369
|
+
name_zh: mainTable.table.name_zh,
|
|
437
370
|
datasourceId: mainTable.table.datasourceId,
|
|
438
371
|
datasourceName: mainTable.table.datasourceName,
|
|
439
372
|
fieldAlias: '',
|
|
@@ -448,14 +381,15 @@ var useStore = function useStore() {
|
|
|
448
381
|
table1: table1,
|
|
449
382
|
table2: {
|
|
450
383
|
name: '',
|
|
384
|
+
name_zh: '',
|
|
451
385
|
id: '',
|
|
452
386
|
alias: '',
|
|
453
387
|
tableUuid: '',
|
|
454
388
|
datasourceId: '',
|
|
455
|
-
datasourceName: ''
|
|
456
|
-
fieldAlias: '',
|
|
457
|
-
fieldUuid: '',
|
|
458
|
-
fields: []
|
|
389
|
+
datasourceName: ''
|
|
390
|
+
// fieldAlias: '',
|
|
391
|
+
// fieldUuid: '',
|
|
392
|
+
// fields: [],
|
|
459
393
|
},
|
|
460
394
|
columns: [],
|
|
461
395
|
expressions: []
|
|
@@ -505,6 +439,7 @@ var useStore = function useStore() {
|
|
|
505
439
|
type: _enum.TypeEnum.permissionTable,
|
|
506
440
|
table: {
|
|
507
441
|
name: '',
|
|
442
|
+
name_zh: '',
|
|
508
443
|
id: '',
|
|
509
444
|
alias: '',
|
|
510
445
|
tableUuid: '',
|
package/lib/cjs/index.d.ts
CHANGED
package/lib/cjs/index.js
CHANGED
|
@@ -5,39 +5,21 @@ var _typeof = require("@babel/runtime/helpers/typeof");
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
|
-
Object.defineProperty(exports, "compressionStructure", {
|
|
9
|
-
enumerable: true,
|
|
10
|
-
get: function get() {
|
|
11
|
-
return _helper.compressionStructure;
|
|
12
|
-
}
|
|
13
|
-
});
|
|
14
8
|
exports["default"] = void 0;
|
|
15
|
-
Object.defineProperty(exports, "handleSqlStruct", {
|
|
16
|
-
enumerable: true,
|
|
17
|
-
get: function get() {
|
|
18
|
-
return _helper.handleSqlStruct;
|
|
19
|
-
}
|
|
20
|
-
});
|
|
21
|
-
Object.defineProperty(exports, "restoreStructure", {
|
|
22
|
-
enumerable: true,
|
|
23
|
-
get: function get() {
|
|
24
|
-
return _helper.restoreStructure;
|
|
25
|
-
}
|
|
26
|
-
});
|
|
27
9
|
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
28
10
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
29
11
|
var _react = _interopRequireWildcard(require("react"));
|
|
30
12
|
var _useProvider = require("./hooks/use-provider");
|
|
31
13
|
var _useState = _interopRequireDefault(require("./hooks/use-state"));
|
|
32
|
-
var _helper = require("./store/helper");
|
|
33
14
|
require("./locale/en");
|
|
34
15
|
require("./locale/zh");
|
|
35
16
|
var _locale = require("./locale");
|
|
36
17
|
var _Loading = _interopRequireDefault(require("./common/Loading"));
|
|
37
18
|
var _metabase = _interopRequireDefault(require("./components/metabase"));
|
|
38
19
|
var _utils = require("./utils");
|
|
39
|
-
function
|
|
40
|
-
|
|
20
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
21
|
+
// export { restoreStructure, handleSqlStruct, compressionStructure } from './store/helper';
|
|
22
|
+
|
|
41
23
|
/**
|
|
42
24
|
* 规则
|
|
43
25
|
* 1、主表一换 下面全部删除
|
package/lib/cjs/locale/en.js
CHANGED
|
@@ -40,6 +40,7 @@ var _default = exports["default"] = (0, _index.register)('en', {
|
|
|
40
40
|
'SqlQueryBuilder.pickTable': 'Select data table...',
|
|
41
41
|
'SqlQueryBuilder.pickConstant': 'Select constant...',
|
|
42
42
|
'SqlQueryBuilder.input': 'Input',
|
|
43
|
+
'SqlQueryBuilder.numberInput': 'Number Input',
|
|
43
44
|
'SqlQueryBuilder.switchSubQuery': 'Open subquery',
|
|
44
45
|
'SqlQueryBuilder.setSubQuery': 'Set Subquery...',
|
|
45
46
|
'SqlQueryBuilder.subquery': 'Subquery',
|
|
@@ -57,7 +58,7 @@ var _default = exports["default"] = (0, _index.register)('en', {
|
|
|
57
58
|
'customColumn.field': 'field',
|
|
58
59
|
'customColumn.constant': 'constant',
|
|
59
60
|
'customColumn.str': 'string',
|
|
60
|
-
'customColumn.
|
|
61
|
+
'customColumn.operatorMore': 'operator more',
|
|
61
62
|
'customColumn.update': 'update',
|
|
62
63
|
'customColumn.complete': 'complete',
|
|
63
64
|
'customColumn.fieldFormula': 'field formula',
|
|
@@ -109,6 +110,10 @@ var _default = exports["default"] = (0, _index.register)('en', {
|
|
|
109
110
|
'joinData.automaticGrouping': 'automatic grouping',
|
|
110
111
|
'joinData.byTheHour': '[[timestamp]]by the hour',
|
|
111
112
|
'joinData.search': 'search...',
|
|
113
|
+
'joinData.selectExpression': 'select expression',
|
|
114
|
+
'joinData.default': 'default',
|
|
115
|
+
'joinData.expression': 'expression',
|
|
116
|
+
'joinData.operator': 'operator',
|
|
112
117
|
'summarize.basicIndicators': 'basic indicators',
|
|
113
118
|
'summarize.selectTheColumnsForGrouping': 'select columns for grouping',
|
|
114
119
|
'summarize.selectTheMetricsYouWantToView': 'select the metrics you want to view',
|
|
@@ -151,5 +156,7 @@ var _default = exports["default"] = (0, _index.register)('en', {
|
|
|
151
156
|
'result.inProgress': 'in progress',
|
|
152
157
|
'result.yourResultsWillAppearHere': 'your results will appear here',
|
|
153
158
|
'result.queryResult': 'query result',
|
|
154
|
-
'result.fieldOperations': 'field operations'
|
|
159
|
+
'result.fieldOperations': 'field operations',
|
|
160
|
+
'metabase.nextBtn': 'next step',
|
|
161
|
+
'metabase.nextOk': 'ok'
|
|
155
162
|
});
|
package/lib/cjs/locale/zh.js
CHANGED
|
@@ -40,6 +40,7 @@ var _default = exports["default"] = (0, _index.register)('zh', {
|
|
|
40
40
|
'SqlQueryBuilder.pickTable': '选择数据表...',
|
|
41
41
|
'SqlQueryBuilder.pickConstant': '选择常量...',
|
|
42
42
|
'SqlQueryBuilder.input': '输入框',
|
|
43
|
+
'SqlQueryBuilder.numberInput': '数字输入框',
|
|
43
44
|
'SqlQueryBuilder.switchSubQuery': '切换子查询',
|
|
44
45
|
'SqlQueryBuilder.setSubQuery': '设置子查询...',
|
|
45
46
|
'SqlQueryBuilder.subquery': '子查询',
|
|
@@ -53,11 +54,11 @@ var _default = exports["default"] = (0, _index.register)('zh', {
|
|
|
53
54
|
'SqlQueryBuilder.selectColumnAll': '全选',
|
|
54
55
|
'SqlQueryBuilder.alias': '别名',
|
|
55
56
|
'SqlQueryBuilder.aliasCannotEmpty': '别名不能为空',
|
|
56
|
-
'customColumn.operator': '
|
|
57
|
+
'customColumn.operator': '操作符',
|
|
57
58
|
'customColumn.field': '字段',
|
|
58
59
|
'customColumn.constant': '常量',
|
|
59
60
|
'customColumn.str': '字符串',
|
|
60
|
-
'customColumn.
|
|
61
|
+
'customColumn.operatorMore': '更多连接符',
|
|
61
62
|
'customColumn.update': '更新',
|
|
62
63
|
'customColumn.complete': '完成',
|
|
63
64
|
'customColumn.fieldFormula': '字段公式',
|
|
@@ -66,7 +67,7 @@ var _default = exports["default"] = (0, _index.register)('zh', {
|
|
|
66
67
|
'customColumn.somethingAwesomeToDocument': '一些超棒的、值得记录的东西',
|
|
67
68
|
'customColumn.expression': '表达式',
|
|
68
69
|
'customColumn.selectField': '选择列',
|
|
69
|
-
'customColumn.selectOperator': '
|
|
70
|
+
'customColumn.selectOperator': '选择操作符',
|
|
70
71
|
'customColumn.selectExpression': '选择表达式',
|
|
71
72
|
'customColumn.selectOtherSyntax': '选择其他语法',
|
|
72
73
|
'customColumn.selectCustomInput': '选择自定义输入框',
|
|
@@ -109,6 +110,10 @@ var _default = exports["default"] = (0, _index.register)('zh', {
|
|
|
109
110
|
'joinData.automaticGrouping': '自动分组',
|
|
110
111
|
'joinData.byTheHour': '[[时间戳]]按小时计数',
|
|
111
112
|
'joinData.search': '查找...',
|
|
113
|
+
'joinData.selectExpression': '选择表达式',
|
|
114
|
+
'joinData.default': '常规',
|
|
115
|
+
'joinData.expression': '表达式',
|
|
116
|
+
'joinData.operator': '连接符',
|
|
112
117
|
'summarize.basicIndicators': '基础指标',
|
|
113
118
|
'summarize.selectTheColumnsForGrouping': '选择分组的列',
|
|
114
119
|
'summarize.selectTheMetricsYouWantToView': '选择你要查看的指标',
|
|
@@ -151,5 +156,7 @@ var _default = exports["default"] = (0, _index.register)('zh', {
|
|
|
151
156
|
'result.inProgress': '执行中',
|
|
152
157
|
'result.yourResultsWillAppearHere': '您的结果将会在这出现',
|
|
153
158
|
'result.queryResult': '查询结果',
|
|
154
|
-
'result.fieldOperations': '字段操作'
|
|
159
|
+
'result.fieldOperations': '字段操作',
|
|
160
|
+
'metabase.nextBtn': '下一步',
|
|
161
|
+
'metabase.nextOk': '确定'
|
|
155
162
|
});
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { MetaListType,
|
|
1
|
+
import { MetaListType, MetaSummarize_Group, AtomsTypeEnum, AtomsItem } from './types';
|
|
2
2
|
export declare const SummarizeAlias = "source";
|
|
3
|
-
export declare const filterToSql: (record: MetaFilter_Item) => string;
|
|
4
3
|
export declare const summarizeToSql: (arr: MetaSummarize_Group[], record: MetaSummarize_Group) => {
|
|
5
4
|
sql: string;
|
|
6
5
|
fieldAlias: string;
|
|
7
6
|
};
|
|
8
|
-
export declare const handleSqlStruct: (list: MetaListType[]) => ParamsStruct;
|
|
9
7
|
export declare const compressionStructure: (data: MetaListType[]) => string;
|
|
10
8
|
export declare const restoreStructure: (data: string) => MetaListType[];
|
|
9
|
+
export declare const getTemItem: (type: AtomsTypeEnum) => AtomsItem;
|