@gingkoo/pandora-metabase 1.0.54 → 1.0.56
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/components/dialog/select-column/index.js +6 -2
- package/lib/cjs/components/modules/custom-column.js +13 -3
- package/lib/cjs/components/modules/filter.js +5 -1
- package/lib/cjs/components/modules/join-data.js +191 -69
- package/lib/cjs/components/modules/summarize/group-by.js +27 -16
- package/lib/cjs/components/modules/summarize/select-index.js +27 -16
- package/lib/cjs/components/modules/table-data.js +123 -55
- package/lib/cjs/hooks/use-state.js +74 -14
- package/lib/cjs/index.js +17 -4
- package/lib/cjs/store/types.d.ts +18 -0
- package/lib/cjs/store/types.js +21 -1
- package/lib/cjs/types.d.ts +5 -0
- package/lib/es/components/dialog/select-column/index.js +6 -2
- package/lib/es/components/modules/custom-column.js +13 -3
- package/lib/es/components/modules/filter.js +5 -1
- package/lib/es/components/modules/join-data.js +192 -70
- package/lib/es/components/modules/summarize/group-by.js +29 -18
- package/lib/es/components/modules/summarize/select-index.js +29 -18
- package/lib/es/components/modules/table-data.js +123 -55
- package/lib/es/hooks/use-state.js +75 -14
- package/lib/es/index.js +17 -4
- package/lib/es/store/types.d.ts +18 -0
- package/lib/es/store/types.js +20 -0
- package/lib/es/types.d.ts +5 -0
- package/package.json +1 -1
|
@@ -15,6 +15,7 @@ var _react = require("react");
|
|
|
15
15
|
var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
|
|
16
16
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
17
17
|
var _pandora = require("@gingkoo/pandora");
|
|
18
|
+
var _types = require("../../../store/types");
|
|
18
19
|
var _locale = require("../../../locale");
|
|
19
20
|
var _icons = require("../../icons");
|
|
20
21
|
var _useProvider = require("../../../hooks/use-provider");
|
|
@@ -123,7 +124,10 @@ var SelectColumn = function SelectColumn(_ref) {
|
|
|
123
124
|
newColumns[i].fieldAlias = fieldAlias;
|
|
124
125
|
newColumns[i].fieldUuid = newColumns[i].fieldUuid || (0, _helper.uuidv4)('field');
|
|
125
126
|
newMetaList = (0, _utils.changeFieldAlias)(newMetaList, newColumns[i]);
|
|
126
|
-
store.setMeta(newMetaList, groupIndex
|
|
127
|
+
store.setMeta(newMetaList, groupIndex, {
|
|
128
|
+
obj: newColumns[i],
|
|
129
|
+
type: _types.ChangeType.fieldAlias
|
|
130
|
+
});
|
|
127
131
|
onSelect(newColumns);
|
|
128
132
|
setTimeout(function () {
|
|
129
133
|
store.setClosable(true);
|
|
@@ -192,7 +196,7 @@ var SelectColumn = function SelectColumn(_ref) {
|
|
|
192
196
|
children: (0, _jsxRuntime.jsx)(_icons.SelectIcon, {})
|
|
193
197
|
}) : (0, _jsxRuntime.jsx)("div", {
|
|
194
198
|
className: 'no-select mr-2'
|
|
195
|
-
}), v.name, v.name_zh ? " \uFF08".concat(v.name_zh, "\uFF09") : '', v.fieldAlias ? " as ".concat(v.fieldAlias) : '', (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
|
|
199
|
+
}), v.name, v.name_zh ? " \uFF08".concat(v.name_zh, "\uFF09") : '', v.fieldAlias ? " as ".concat(v.fieldAlias) : '', store.fieldEnableAlias && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
|
|
196
200
|
title: (0, _locale.__)('SqlQueryBuilder.alias'),
|
|
197
201
|
children: (0, _jsxRuntime.jsx)(_pandora.Button, {
|
|
198
202
|
className: ':Sqb-TableName-as',
|
|
@@ -16,6 +16,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
|
|
|
16
16
|
var _locale = require("../../locale");
|
|
17
17
|
var _utils = require("../../utils");
|
|
18
18
|
var _helper = require("../../utils/helper");
|
|
19
|
+
var _types = require("../../store/types");
|
|
19
20
|
var _enum = require("../../store/enum");
|
|
20
21
|
var _customEditor = _interopRequireDefault(require("../../components/dialog/custom-editor"));
|
|
21
22
|
var _icons = require("../icons");
|
|
@@ -99,7 +100,10 @@ var CustomColumn = function CustomColumn(props) {
|
|
|
99
100
|
// if(data.name !== value.name){
|
|
100
101
|
// newMeta = newMeta.filter((v: MetaListType, _i: number)=> _i<=index)
|
|
101
102
|
// }
|
|
102
|
-
store.setMeta(newMeta, groupIndex
|
|
103
|
+
store.setMeta(newMeta, groupIndex, {
|
|
104
|
+
obj: data,
|
|
105
|
+
type: _types.ChangeType.customColumn
|
|
106
|
+
});
|
|
103
107
|
closePopup();
|
|
104
108
|
},
|
|
105
109
|
onClose: closePopup
|
|
@@ -250,7 +254,10 @@ var CustomColumn = function CustomColumn(props) {
|
|
|
250
254
|
} else {
|
|
251
255
|
newMeta[index].customColumn[i] = data;
|
|
252
256
|
}
|
|
253
|
-
store.setMeta(newMeta, groupIndex
|
|
257
|
+
store.setMeta(newMeta, groupIndex, {
|
|
258
|
+
obj: data,
|
|
259
|
+
type: _types.ChangeType.customColumn
|
|
260
|
+
});
|
|
254
261
|
try {
|
|
255
262
|
o.close();
|
|
256
263
|
} catch (e) {
|
|
@@ -278,7 +285,10 @@ var CustomColumn = function CustomColumn(props) {
|
|
|
278
285
|
meta: meta,
|
|
279
286
|
onChange: function onChange(data) {
|
|
280
287
|
newMeta[index].customColumn.push(data);
|
|
281
|
-
store.setMeta(newMeta, groupIndex
|
|
288
|
+
store.setMeta(newMeta, groupIndex, {
|
|
289
|
+
obj: data,
|
|
290
|
+
type: _types.ChangeType.customColumn
|
|
291
|
+
});
|
|
282
292
|
closePopup();
|
|
283
293
|
},
|
|
284
294
|
onClose: closePopup
|
|
@@ -14,6 +14,7 @@ var _helper = require("../../utils/helper");
|
|
|
14
14
|
var _utils = require("../../utils");
|
|
15
15
|
var _enum = require("../../store/enum");
|
|
16
16
|
var _formulaList = _interopRequireDefault(require("../dialog/formula-list"));
|
|
17
|
+
var _types = require("../../store/types");
|
|
17
18
|
var _Wrapper = _interopRequireDefault(require("./components/Wrapper"));
|
|
18
19
|
var _metaIcon = _interopRequireDefault(require("./components/meta-icon"));
|
|
19
20
|
var _header = _interopRequireDefault(require("./components/header"));
|
|
@@ -148,7 +149,10 @@ var Filter = function Filter(props) {
|
|
|
148
149
|
var selectFilter = function selectFilter(val) {
|
|
149
150
|
var newMeta = store.metaList[groupIndex].list.slice();
|
|
150
151
|
newMeta[index].filter = val;
|
|
151
|
-
store.setMeta(newMeta, groupIndex
|
|
152
|
+
store.setMeta(newMeta, groupIndex, {
|
|
153
|
+
obj: val,
|
|
154
|
+
type: _types.ChangeType.formula
|
|
155
|
+
});
|
|
152
156
|
};
|
|
153
157
|
var getPreColumns = function getPreColumns() {
|
|
154
158
|
var data = [].concat((0, _toConsumableArray2["default"])(getColumns()), (0, _toConsumableArray2["default"])((0, _cloneDeep["default"])(notExistsColumns || [])));
|
|
@@ -382,7 +382,10 @@ var JoinData = function JoinData(props) {
|
|
|
382
382
|
onChange: function onChange(data) {
|
|
383
383
|
var newMetaList = store.metaList[groupIndex].list.slice();
|
|
384
384
|
newMetaList[index].columns = data;
|
|
385
|
-
store.setMeta(newMetaList, groupIndex
|
|
385
|
+
store.setMeta(newMetaList, groupIndex, {
|
|
386
|
+
obj: data,
|
|
387
|
+
type: _types.ChangeType.field
|
|
388
|
+
});
|
|
386
389
|
}
|
|
387
390
|
})
|
|
388
391
|
});
|
|
@@ -491,7 +494,7 @@ var JoinData = function JoinData(props) {
|
|
|
491
494
|
}, []);
|
|
492
495
|
}
|
|
493
496
|
// // 过滤为table1选中的表
|
|
494
|
-
var newMeta = store.metaList[groupIndex].list
|
|
497
|
+
var newMeta = (0, _cloneDeep["default"])(store.metaList[groupIndex].list);
|
|
495
498
|
// if (((newMeta[index] as MetaJoin)[FlagLocation.TABLE_1] as MetaJoin_TalbeType).name) {
|
|
496
499
|
// data = data.filter((v) => {
|
|
497
500
|
// return (
|
|
@@ -518,8 +521,11 @@ var JoinData = function JoinData(props) {
|
|
|
518
521
|
// }
|
|
519
522
|
// }
|
|
520
523
|
newMeta[index][table_type] = data;
|
|
521
|
-
initExpressions();
|
|
522
|
-
store.setMeta(newMeta, groupIndex
|
|
524
|
+
initExpressions(newMeta);
|
|
525
|
+
store.setMeta(newMeta, groupIndex, {
|
|
526
|
+
obj: data,
|
|
527
|
+
type: _types.ChangeType[table_type]
|
|
528
|
+
});
|
|
523
529
|
store.setPopup({
|
|
524
530
|
visible: false
|
|
525
531
|
});
|
|
@@ -547,7 +553,7 @@ var JoinData = function JoinData(props) {
|
|
|
547
553
|
var tableName = data.name;
|
|
548
554
|
if (meta.table2.name !== tableName || meta.table2.datasourceId !== data.datasourceId) {
|
|
549
555
|
var _store$preProps;
|
|
550
|
-
var newMeta = store.metaList[groupIndex].list
|
|
556
|
+
var newMeta = (0, _cloneDeep["default"])(store.metaList[groupIndex].list);
|
|
551
557
|
var alias = (0, _helper.getAlias)(tableName, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []);
|
|
552
558
|
var _table2 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, data), {}, {
|
|
553
559
|
name: tableName,
|
|
@@ -560,12 +566,15 @@ var JoinData = function JoinData(props) {
|
|
|
560
566
|
datasourceName: data.datasourceName
|
|
561
567
|
});
|
|
562
568
|
newMeta[index].table2 = _table2;
|
|
563
|
-
initExpressions();
|
|
569
|
+
initExpressions(newMeta);
|
|
564
570
|
store.fetchColumns(_table2, data.datasourceId, [], function (columns) {
|
|
565
571
|
newMeta[index].columns = columns;
|
|
566
572
|
// 关联表变了 下面模块全部删除
|
|
567
573
|
// newMeta = newMeta.filter((v: MetaListType, i: number) => i <= index);
|
|
568
|
-
|
|
574
|
+
store.setMeta(newMeta, groupIndex, {
|
|
575
|
+
obj: data,
|
|
576
|
+
type: _types.ChangeType.table2
|
|
577
|
+
});
|
|
569
578
|
});
|
|
570
579
|
}
|
|
571
580
|
setIsDel(false);
|
|
@@ -577,8 +586,8 @@ var JoinData = function JoinData(props) {
|
|
|
577
586
|
});
|
|
578
587
|
}
|
|
579
588
|
// 切换表后重置数据
|
|
580
|
-
function initExpressions() {
|
|
581
|
-
|
|
589
|
+
function initExpressions(newMeta) {
|
|
590
|
+
// let newMeta: MetaListType[] = store.metaList[groupIndex].list.slice();
|
|
582
591
|
if (newMeta[index].expressions && newMeta[index].expressions.length > 0) {
|
|
583
592
|
return;
|
|
584
593
|
}
|
|
@@ -660,7 +669,10 @@ var JoinData = function JoinData(props) {
|
|
|
660
669
|
onChange: function onChange(type) {
|
|
661
670
|
var newMeta = store.metaList[groupIndex].list.slice();
|
|
662
671
|
newMeta[index].joinType = type;
|
|
663
|
-
store.setMeta(newMeta, groupIndex
|
|
672
|
+
store.setMeta(newMeta, groupIndex, {
|
|
673
|
+
obj: type,
|
|
674
|
+
type: _types.ChangeType.joinType
|
|
675
|
+
});
|
|
664
676
|
store.setPopup({
|
|
665
677
|
visible: false
|
|
666
678
|
});
|
|
@@ -946,7 +958,10 @@ var JoinData = function JoinData(props) {
|
|
|
946
958
|
// _ind2
|
|
947
959
|
// ] as AtomsField
|
|
948
960
|
// ).quotes = quotes;
|
|
949
|
-
store.setMeta(newMeta, groupIndex
|
|
961
|
+
store.setMeta(newMeta, groupIndex, {
|
|
962
|
+
obj: fields,
|
|
963
|
+
type: _types.ChangeType[_position]
|
|
964
|
+
});
|
|
950
965
|
}
|
|
951
966
|
})
|
|
952
967
|
});
|
|
@@ -971,7 +986,10 @@ var JoinData = function JoinData(props) {
|
|
|
971
986
|
var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
|
|
972
987
|
var newMeta = store.metaList[groupIndex].list.slice();
|
|
973
988
|
newMeta[index].expressions[_ind][_position][_ind2].val = curObj.value;
|
|
974
|
-
store.setMeta(newMeta, groupIndex
|
|
989
|
+
store.setMeta(newMeta, groupIndex, {
|
|
990
|
+
obj: val,
|
|
991
|
+
type: _types.ChangeType[_position]
|
|
992
|
+
});
|
|
975
993
|
}
|
|
976
994
|
})
|
|
977
995
|
});
|
|
@@ -1077,7 +1095,7 @@ var JoinData = function JoinData(props) {
|
|
|
1077
1095
|
isExit = _store$preProps2.isExit,
|
|
1078
1096
|
toolbar = _store$preProps2.toolbar,
|
|
1079
1097
|
other = (0, _objectWithoutProperties2["default"])(_store$preProps2, _excluded);
|
|
1080
|
-
var newMeta = store.metaList[groupIndex].list
|
|
1098
|
+
var newMeta = (0, _cloneDeep["default"])(store.metaList[groupIndex].list);
|
|
1081
1099
|
var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
|
|
1082
1100
|
var oldList = (0, _cloneDeep["default"])(newMeta[index].subquery);
|
|
1083
1101
|
var _toolbar = subToolbar || toolbar;
|
|
@@ -1118,13 +1136,20 @@ var JoinData = function JoinData(props) {
|
|
|
1118
1136
|
return oldCol.name === newCol.name;
|
|
1119
1137
|
});
|
|
1120
1138
|
// 如果存在,返回旧列;否则返回新列
|
|
1121
|
-
return existingCol ? existingCol : newCol;
|
|
1139
|
+
// return existingCol ? existingCol : newCol;
|
|
1140
|
+
var _column = existingCol ? existingCol : newCol;
|
|
1141
|
+
_column.select = store.isSelectFields || _column.select;
|
|
1142
|
+
// 如果存在,返回旧列;否则返回新列
|
|
1143
|
+
return _column;
|
|
1122
1144
|
});
|
|
1123
1145
|
// (newMeta[index] as MetaJoin).columns = newColumns;
|
|
1124
|
-
initExpressions();
|
|
1146
|
+
initExpressions(newMeta);
|
|
1125
1147
|
// 关联表变了 下面模块全部删除
|
|
1126
1148
|
// newMeta = newMeta.filter((v: MetaListType, i: number) => i <= index);
|
|
1127
|
-
store.setMeta(newMeta, groupIndex
|
|
1149
|
+
store.setMeta(newMeta, groupIndex, {
|
|
1150
|
+
obj: newList,
|
|
1151
|
+
type: _types.ChangeType.subQuery
|
|
1152
|
+
});
|
|
1128
1153
|
o.close();
|
|
1129
1154
|
} catch (e) {
|
|
1130
1155
|
console.warn(e);
|
|
@@ -1185,7 +1210,10 @@ var JoinData = function JoinData(props) {
|
|
|
1185
1210
|
newMeta = store.metaList[groupIndex].list.slice();
|
|
1186
1211
|
newMeta[index].table2.alias = alias;
|
|
1187
1212
|
newMeta = (0, _utils.changeTableAlias)(newMeta, newMeta[index].table2);
|
|
1188
|
-
store.setMeta(newMeta, groupIndex
|
|
1213
|
+
store.setMeta(newMeta, groupIndex, {
|
|
1214
|
+
obj: newMeta[index].table2,
|
|
1215
|
+
type: _types.ChangeType.tableAlias
|
|
1216
|
+
});
|
|
1189
1217
|
case 2:
|
|
1190
1218
|
case "end":
|
|
1191
1219
|
return _context2.stop();
|
|
@@ -1221,7 +1249,10 @@ var JoinData = function JoinData(props) {
|
|
|
1221
1249
|
value: value,
|
|
1222
1250
|
onChange: function onChange(data) {
|
|
1223
1251
|
newMeta[index].expressions.splice(i, 1, data);
|
|
1224
|
-
store.setMeta(newMeta, groupIndex
|
|
1252
|
+
store.setMeta(newMeta, groupIndex, {
|
|
1253
|
+
obj: newMeta[index].expressions,
|
|
1254
|
+
type: _types.ChangeType.expressions
|
|
1255
|
+
});
|
|
1225
1256
|
closePopup();
|
|
1226
1257
|
}
|
|
1227
1258
|
})
|
|
@@ -1466,61 +1497,149 @@ var JoinData = function JoinData(props) {
|
|
|
1466
1497
|
onClick: function onClick() {
|
|
1467
1498
|
showSubQuery(meta.subquery);
|
|
1468
1499
|
},
|
|
1469
|
-
children: [subQuerySelected && (0, _jsxRuntime.jsx)(
|
|
1470
|
-
|
|
1471
|
-
|
|
1472
|
-
|
|
1473
|
-
|
|
1474
|
-
|
|
1475
|
-
|
|
1476
|
-
|
|
1477
|
-
|
|
1478
|
-
|
|
1479
|
-
|
|
1480
|
-
|
|
1481
|
-
|
|
1482
|
-
|
|
1483
|
-
|
|
1484
|
-
|
|
1485
|
-
|
|
1486
|
-
|
|
1487
|
-
|
|
1488
|
-
|
|
1489
|
-
|
|
1490
|
-
|
|
1491
|
-
|
|
1492
|
-
|
|
1493
|
-
|
|
1500
|
+
children: [subQuerySelected && (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
|
1501
|
+
children: function () {
|
|
1502
|
+
var showButton = store.tableEnableAlias || tableIsError() && isDel;
|
|
1503
|
+
var icon = isDel ? (0, _jsxRuntime.jsx)(_pandoraIcons.ExclamationCircleFill, {}) : store.tableEnableAlias ? 'As' : '';
|
|
1504
|
+
return showButton ? (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
|
|
1505
|
+
title: (0, _locale.__)(tableIsError() ? isDel ? 'metabase.verify' : 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
|
|
1506
|
+
children: (0, _jsxRuntime.jsx)(_pandora.Button, {
|
|
1507
|
+
danger: tableIsError(),
|
|
1508
|
+
className: (0, _classnames["default"])(':Sqb-TableName-as', {
|
|
1509
|
+
isError: tableIsError()
|
|
1510
|
+
}),
|
|
1511
|
+
shape: 'circle',
|
|
1512
|
+
style: isDel ? {
|
|
1513
|
+
fontSize: 18,
|
|
1514
|
+
backgroundColor: '#fff',
|
|
1515
|
+
width: 'auto',
|
|
1516
|
+
height: 'auto'
|
|
1517
|
+
} : {},
|
|
1518
|
+
iconOnly: true,
|
|
1519
|
+
primary: !isDel,
|
|
1520
|
+
icon: icon,
|
|
1521
|
+
size: 'small',
|
|
1522
|
+
onClick: function onClick(e) {
|
|
1523
|
+
if (store.tableEnableAlias) {
|
|
1524
|
+
var _meta$table4;
|
|
1525
|
+
e.stopPropagation();
|
|
1526
|
+
onChangeTableAlias(((_meta$table4 = meta.table2) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
|
|
1527
|
+
}
|
|
1528
|
+
}
|
|
1529
|
+
})
|
|
1530
|
+
}) : null;
|
|
1531
|
+
}()
|
|
1532
|
+
})
|
|
1533
|
+
// <Tooltip
|
|
1534
|
+
// title={__(
|
|
1535
|
+
// tableIsError()
|
|
1536
|
+
// ? isDel
|
|
1537
|
+
// ? 'metabase.verify'
|
|
1538
|
+
// : 'SqlQueryBuilder.repeatAlias'
|
|
1539
|
+
// : 'SqlQueryBuilder.alias',
|
|
1540
|
+
// )}
|
|
1541
|
+
// >
|
|
1542
|
+
// <Button
|
|
1543
|
+
// danger={tableIsError()}
|
|
1544
|
+
// className={cx(':Sqb-TableName-as', {
|
|
1545
|
+
// isError: tableIsError(),
|
|
1546
|
+
// })}
|
|
1547
|
+
// shape='circle'
|
|
1548
|
+
// style={
|
|
1549
|
+
// isDel
|
|
1550
|
+
// ? {
|
|
1551
|
+
// fontSize: 18,
|
|
1552
|
+
// backgroundColor: '#fff',
|
|
1553
|
+
// width: 'auto',
|
|
1554
|
+
// height: 'auto',
|
|
1555
|
+
// }
|
|
1556
|
+
// : {}
|
|
1557
|
+
// }
|
|
1558
|
+
// iconOnly
|
|
1559
|
+
// primary={!isDel}
|
|
1560
|
+
// icon={isDel ? <ExclamationCircleFill /> : 'As'}
|
|
1561
|
+
// size='small'
|
|
1562
|
+
// onClick={(e) => {
|
|
1563
|
+
// e.stopPropagation();
|
|
1564
|
+
// onChangeTableAlias(meta.table2?.alias || '');
|
|
1565
|
+
// }}
|
|
1566
|
+
// ></Button>
|
|
1567
|
+
// </Tooltip>
|
|
1568
|
+
, subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table5 = meta.table2) !== null && _meta$table5 !== void 0 && _meta$table5.alias && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table2) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : (0, _locale.__)('SqlQueryBuilder.setSubQuery')]
|
|
1494
1569
|
}) : (0, _jsxRuntime.jsxs)("div", {
|
|
1495
1570
|
className: (0, _classnames["default"])("Sqb-TableName", {
|
|
1496
1571
|
notSelected: !table2Selected
|
|
1497
1572
|
}),
|
|
1498
1573
|
onClick: selectTable,
|
|
1499
|
-
children: [table2Selected && (0, _jsxRuntime.jsx)(
|
|
1500
|
-
|
|
1501
|
-
|
|
1502
|
-
|
|
1503
|
-
|
|
1504
|
-
|
|
1505
|
-
|
|
1506
|
-
|
|
1507
|
-
|
|
1508
|
-
|
|
1509
|
-
|
|
1510
|
-
|
|
1511
|
-
|
|
1512
|
-
|
|
1513
|
-
|
|
1514
|
-
|
|
1515
|
-
|
|
1516
|
-
|
|
1517
|
-
|
|
1518
|
-
|
|
1519
|
-
|
|
1520
|
-
|
|
1521
|
-
|
|
1522
|
-
|
|
1523
|
-
|
|
1574
|
+
children: [table2Selected && (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
|
1575
|
+
children: function () {
|
|
1576
|
+
var showButton = store.tableEnableAlias || tableIsError() && isDel;
|
|
1577
|
+
var icon = isDel ? (0, _jsxRuntime.jsx)(_pandoraIcons.ExclamationCircleFill, {}) : store.tableEnableAlias ? 'As' : '';
|
|
1578
|
+
return showButton ? (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
|
|
1579
|
+
title: (0, _locale.__)(tableIsError() ? isDel ? 'metabase.verify' : 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
|
|
1580
|
+
children: (0, _jsxRuntime.jsx)(_pandora.Button, {
|
|
1581
|
+
danger: tableIsError(),
|
|
1582
|
+
className: (0, _classnames["default"])(':Sqb-TableName-as', {
|
|
1583
|
+
isError: tableIsError()
|
|
1584
|
+
}),
|
|
1585
|
+
shape: 'circle',
|
|
1586
|
+
style: isDel ? {
|
|
1587
|
+
fontSize: 18,
|
|
1588
|
+
backgroundColor: '#fff',
|
|
1589
|
+
width: 'auto',
|
|
1590
|
+
height: 'auto'
|
|
1591
|
+
} : {},
|
|
1592
|
+
iconOnly: true,
|
|
1593
|
+
primary: !isDel,
|
|
1594
|
+
icon: icon,
|
|
1595
|
+
size: 'small',
|
|
1596
|
+
onClick: function onClick(e) {
|
|
1597
|
+
if (store.tableEnableAlias) {
|
|
1598
|
+
var _meta$table7;
|
|
1599
|
+
e.stopPropagation();
|
|
1600
|
+
onChangeTableAlias(((_meta$table7 = meta.table2) === null || _meta$table7 === void 0 ? void 0 : _meta$table7.alias) || '');
|
|
1601
|
+
}
|
|
1602
|
+
}
|
|
1603
|
+
})
|
|
1604
|
+
}) : null;
|
|
1605
|
+
}()
|
|
1606
|
+
})
|
|
1607
|
+
// <Tooltip
|
|
1608
|
+
// title={__(
|
|
1609
|
+
// tableIsError()
|
|
1610
|
+
// ? isDel
|
|
1611
|
+
// ? 'metabase.verify'
|
|
1612
|
+
// : 'SqlQueryBuilder.repeatAlias'
|
|
1613
|
+
// : 'SqlQueryBuilder.alias',
|
|
1614
|
+
// )}
|
|
1615
|
+
// >
|
|
1616
|
+
// <Button
|
|
1617
|
+
// danger={tableIsError()}
|
|
1618
|
+
// className={cx(':Sqb-TableName-as', {
|
|
1619
|
+
// isError: tableIsError(),
|
|
1620
|
+
// })}
|
|
1621
|
+
// shape='circle'
|
|
1622
|
+
// style={
|
|
1623
|
+
// isDel
|
|
1624
|
+
// ? {
|
|
1625
|
+
// fontSize: 18,
|
|
1626
|
+
// backgroundColor: '#fff',
|
|
1627
|
+
// width: 'auto',
|
|
1628
|
+
// height: 'auto',
|
|
1629
|
+
// }
|
|
1630
|
+
// : {}
|
|
1631
|
+
// }
|
|
1632
|
+
// iconOnly
|
|
1633
|
+
// primary={!isDel}
|
|
1634
|
+
// icon={isDel ? <ExclamationCircleFill /> : 'As'}
|
|
1635
|
+
// size='small'
|
|
1636
|
+
// onClick={(e) => {
|
|
1637
|
+
// e.stopPropagation();
|
|
1638
|
+
// onChangeTableAlias(meta.table2?.alias || '');
|
|
1639
|
+
// }}
|
|
1640
|
+
// ></Button>
|
|
1641
|
+
// </Tooltip>
|
|
1642
|
+
, table2Selected ? "".concat(meta.table2.datasourceName, ".").concat(meta.table2.name, " ").concat((_meta$table8 = meta.table2) !== null && _meta$table8 !== void 0 && _meta$table8.alias && store.tableEnableAlias ? "as ".concat((_meta$table9 = meta.table2) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.alias) : '') : (0, _locale.__)('SqlQueryBuilder.pickTable')]
|
|
1524
1643
|
}), store.showSubquery && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
|
|
1525
1644
|
title: (0, _locale.__)('SqlQueryBuilder.switchSubQuery'),
|
|
1526
1645
|
children: (0, _jsxRuntime.jsx)(_pandora.Button, {
|
|
@@ -1723,7 +1842,10 @@ var JoinData = function JoinData(props) {
|
|
|
1723
1842
|
var newMeta = store.metaList[groupIndex].list.slice();
|
|
1724
1843
|
newMeta[index].expressions[i].list = data;
|
|
1725
1844
|
newMeta[index].expressions[i].quotes = _quotes;
|
|
1726
|
-
store.setMeta(newMeta, groupIndex
|
|
1845
|
+
store.setMeta(newMeta, groupIndex, {
|
|
1846
|
+
obj: newMeta[index].expressions,
|
|
1847
|
+
type: _types.ChangeType.expressions
|
|
1848
|
+
});
|
|
1727
1849
|
}
|
|
1728
1850
|
}), (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
|
|
1729
1851
|
title: (0, _locale.__)('SqlQueryBuilder.add'),
|
|
@@ -157,7 +157,10 @@ var GroupBy = function GroupBy(props) {
|
|
|
157
157
|
// if (value.quotes !== data.quotes) {
|
|
158
158
|
// newMeta = newMeta.filter((_: MetaListType, _i: number) => _i <= index);
|
|
159
159
|
// }
|
|
160
|
-
store.setMeta(newMeta, groupIndex
|
|
160
|
+
store.setMeta(newMeta, groupIndex, {
|
|
161
|
+
obj: newMeta[index].by,
|
|
162
|
+
type: _types.ChangeType.by
|
|
163
|
+
});
|
|
161
164
|
closePopup();
|
|
162
165
|
}
|
|
163
166
|
})
|
|
@@ -209,7 +212,10 @@ var GroupBy = function GroupBy(props) {
|
|
|
209
212
|
summarizeType: _types.MetaSummarize_Enum.BY
|
|
210
213
|
});
|
|
211
214
|
});
|
|
212
|
-
store.setMeta(newMeta, groupIndex
|
|
215
|
+
store.setMeta(newMeta, groupIndex, {
|
|
216
|
+
obj: newMeta[index].by,
|
|
217
|
+
type: _types.ChangeType.by
|
|
218
|
+
});
|
|
213
219
|
closePopup();
|
|
214
220
|
}
|
|
215
221
|
})
|
|
@@ -259,7 +265,10 @@ var GroupBy = function GroupBy(props) {
|
|
|
259
265
|
newMeta[index].by[i].sql = newMeta[index].by[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
|
|
260
266
|
newMeta[index].by[i].fieldAlias = fieldAlias;
|
|
261
267
|
newMeta = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].by[i]);
|
|
262
|
-
store.setMeta(newMeta, groupIndex
|
|
268
|
+
store.setMeta(newMeta, groupIndex, {
|
|
269
|
+
obj: newMeta[index].by,
|
|
270
|
+
type: _types.ChangeType.by
|
|
271
|
+
});
|
|
263
272
|
case 2:
|
|
264
273
|
case "end":
|
|
265
274
|
return _context.stop();
|
|
@@ -328,19 +337,21 @@ var GroupBy = function GroupBy(props) {
|
|
|
328
337
|
onClick: function onClick(e) {
|
|
329
338
|
return handleUpdate(e, i);
|
|
330
339
|
},
|
|
331
|
-
children: [v.quotes && (0, _jsxRuntime.jsx)(
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
e
|
|
342
|
-
|
|
343
|
-
|
|
340
|
+
children: [v.quotes && (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
|
341
|
+
children: store.fieldEnableAlias && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
|
|
342
|
+
title: (0, _locale.__)('SqlQueryBuilder.alias'),
|
|
343
|
+
children: (0, _jsxRuntime.jsx)(_pandora.Button, {
|
|
344
|
+
className: ':Sqb-TableName-as :Sqb-TableName green-name',
|
|
345
|
+
shape: 'circle',
|
|
346
|
+
iconOnly: true,
|
|
347
|
+
primary: true,
|
|
348
|
+
icon: 'As',
|
|
349
|
+
size: 'small',
|
|
350
|
+
onClick: function onClick(e) {
|
|
351
|
+
e.stopPropagation();
|
|
352
|
+
onChangeFieldAlias((v === null || v === void 0 ? void 0 : v.fieldAlias) || '', i);
|
|
353
|
+
}
|
|
354
|
+
})
|
|
344
355
|
})
|
|
345
356
|
}), "".concat(v.quotes, " ").concat(v.fieldAlias ? "as ".concat(v.fieldAlias) : ''), (0, _jsxRuntime.jsx)("span", {
|
|
346
357
|
style: {
|
|
@@ -158,7 +158,10 @@ var SelectIndex = function SelectIndex(props) {
|
|
|
158
158
|
// if (value.quotes !== data.quotes) {
|
|
159
159
|
// newMeta = newMeta.filter((_: MetaListType, _i: number) => _i <= index);
|
|
160
160
|
// }
|
|
161
|
-
store.setMeta(newMeta, groupIndex
|
|
161
|
+
store.setMeta(newMeta, groupIndex, {
|
|
162
|
+
obj: newMeta[index].group,
|
|
163
|
+
type: _types.ChangeType.group
|
|
164
|
+
});
|
|
162
165
|
closePopup();
|
|
163
166
|
}
|
|
164
167
|
})
|
|
@@ -209,7 +212,10 @@ var SelectIndex = function SelectIndex(props) {
|
|
|
209
212
|
summarizeType: _types.MetaSummarize_Enum.GROUP
|
|
210
213
|
});
|
|
211
214
|
});
|
|
212
|
-
store.setMeta(newMeta, groupIndex
|
|
215
|
+
store.setMeta(newMeta, groupIndex, {
|
|
216
|
+
obj: newMeta[index].group,
|
|
217
|
+
type: _types.ChangeType.group
|
|
218
|
+
});
|
|
213
219
|
closePopup();
|
|
214
220
|
}
|
|
215
221
|
})
|
|
@@ -260,7 +266,10 @@ var SelectIndex = function SelectIndex(props) {
|
|
|
260
266
|
newMeta[index].group[i].fieldAlias = fieldAlias;
|
|
261
267
|
newMeta[index].group[i].sql = newMeta[index].group[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
|
|
262
268
|
newMeta = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].group[i]);
|
|
263
|
-
store.setMeta(newMeta, groupIndex
|
|
269
|
+
store.setMeta(newMeta, groupIndex, {
|
|
270
|
+
obj: newMeta[index].group,
|
|
271
|
+
type: _types.ChangeType.group
|
|
272
|
+
});
|
|
264
273
|
case 2:
|
|
265
274
|
case "end":
|
|
266
275
|
return _context.stop();
|
|
@@ -329,19 +338,21 @@ var SelectIndex = function SelectIndex(props) {
|
|
|
329
338
|
onClick: function onClick(e) {
|
|
330
339
|
return handleUpdate(e, i);
|
|
331
340
|
},
|
|
332
|
-
children: [v.quotes && (0, _jsxRuntime.jsx)(
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
e
|
|
343
|
-
|
|
344
|
-
|
|
341
|
+
children: [v.quotes && (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
|
|
342
|
+
children: store.fieldEnableAlias && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
|
|
343
|
+
title: (0, _locale.__)('SqlQueryBuilder.alias'),
|
|
344
|
+
children: (0, _jsxRuntime.jsx)(_pandora.Button, {
|
|
345
|
+
className: ':Sqb-TableName-as :Sqb-TableName green-name',
|
|
346
|
+
shape: 'circle',
|
|
347
|
+
iconOnly: true,
|
|
348
|
+
primary: true,
|
|
349
|
+
icon: 'As',
|
|
350
|
+
size: 'small',
|
|
351
|
+
onClick: function onClick(e) {
|
|
352
|
+
e.stopPropagation();
|
|
353
|
+
onChangeFieldAlias((v === null || v === void 0 ? void 0 : v.fieldAlias) || '', i);
|
|
354
|
+
}
|
|
355
|
+
})
|
|
345
356
|
})
|
|
346
357
|
}), "".concat(v.quotes, " ").concat(v.fieldAlias ? "as ".concat(v.fieldAlias) : ''), (0, _jsxRuntime.jsx)("span", {
|
|
347
358
|
style: {
|