@gingkoo/pandora-metabase 1.0.15 → 1.0.17

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 (9) hide show
  1. package/lib/cjs/components/modules/join-data.js +39 -71
  2. package/lib/cjs/hooks/patch.js +8 -8
  3. package/lib/cjs/locale/en.js +1 -1
  4. package/lib/cjs/locale/zh.js +1 -1
  5. package/lib/es/components/modules/join-data.js +40 -72
  6. package/lib/es/hooks/patch.js +8 -8
  7. package/lib/es/locale/en.js +1 -1
  8. package/lib/es/locale/zh.js +1 -1
  9. package/package.json +1 -1
package/lib/cjs/components/modules/join-data.js CHANGED
@@ -202,26 +202,6 @@ var JoinData = function JoinData(props) {
202
202
  var _ind = Number(node.getAttribute('v-index'));
203
203
  var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
204
204
  var table_type = FlagLocation.TABLE_1;
205
- var tableInfo = {
206
- name: meta[table_type].name,
207
- id: meta[table_type].id,
208
- table: meta[table_type].name,
209
- // fieldUuid: meta[table_type][_ind].fieldUuid || uuidv4('field'),
210
- // fieldAlias: meta[table_type].fieldAlias || '',
211
- tableId: meta[table_type].id,
212
- tableUuid: meta[table_type].tableUuid || (0, _helper.uuidv4)('table'),
213
- alias: meta[table_type].alias,
214
- database_type: '',
215
- datasourceId: meta[table_type].datasourceId,
216
- // 数据源id
217
- datasourceName: meta[table_type].datasourceName // 数据源名
218
- };
219
- // let value: MetaJoin_Field[] = [
220
- // {
221
- // fieldUuid: meta[table_type].fieldUuid || uuidv4('field'),
222
- // fieldAlias: meta[table_type].fieldAlias || '',
223
- // },
224
- // ];
225
205
  var data = [];
226
206
  var _getHelper2 = (0, _utils.getHelper)(store.metaList[groupIndex].list, meta),
227
207
  ExistAboveGroupBy = _getHelper2.ExistAboveGroupBy,
@@ -236,34 +216,40 @@ var JoinData = function JoinData(props) {
236
216
  name: prevGroupBy.alias,
237
217
  name_zh: prevGroupBy.alias,
238
218
  datasourceId: '',
239
- datasourceName: '',
240
- columns: []
219
+ datasourceName: ''
220
+ // columns: [],
241
221
  };
242
222
  if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group2 = prevGroupBy.group) !== null && _prevGroupBy$group2 !== void 0 && _prevGroupBy$group2.length) {
243
- _data.columns = _data.columns.concat(prevGroupBy.group.map(function (v) {
244
- return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
245
- name: v.name || v.quotes,
246
- name_zh: v.name_zh || v.quotes,
247
- id: v.id || v.fieldId,
248
- database_type: (v === null || v === void 0 ? void 0 : v.database_type) || _enum.SQL_COLUMN_TYPE.FLOAT,
249
- special_type: '',
250
- sql: v.sql,
251
- select: true
252
- });
253
- }));
223
+ // _data.columns = _data.columns.concat(
224
+ // prevGroupBy.group.map((v: MetaSummarize_Group) => {
225
+ // return {
226
+ // ...v,
227
+ // name: v.name || v.quotes,
228
+ // name_zh: v.name_zh || v.quotes,
229
+ // id: v.id || v.fieldId,
230
+ // database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
231
+ // special_type: '',
232
+ // sql: v.sql,
233
+ // select: true,
234
+ // };
235
+ // }),
236
+ // );
254
237
  }
255
238
  if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$by2 = prevGroupBy.by) !== null && _prevGroupBy$by2 !== void 0 && _prevGroupBy$by2.length) {
256
- _data.columns = _data.columns.concat(prevGroupBy.by.map(function (v) {
257
- return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
258
- name: v.name || v.quotes,
259
- name_zh: v.name_zh || v.quotes,
260
- id: v.id || v.fieldId,
261
- database_type: (v === null || v === void 0 ? void 0 : v.database_type) || _enum.SQL_COLUMN_TYPE.FLOAT,
262
- special_type: '',
263
- sql: v.sql,
264
- select: true
265
- });
266
- }));
239
+ // _data.columns = _data.columns.concat(
240
+ // prevGroupBy.by.map((v: MetaSummarize_By) => {
241
+ // return {
242
+ // ...v,
243
+ // name: v.name || v.quotes,
244
+ // name_zh: v.name_zh || v.quotes,
245
+ // id: v.id || v.fieldId,
246
+ // database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
247
+ // special_type: '',
248
+ // sql: v.sql,
249
+ // select: true,
250
+ // };
251
+ // }),
252
+ // );
267
253
  }
268
254
  data = [_data];
269
255
  var joinData = prevList.filter(function (v) {
@@ -325,31 +311,13 @@ var JoinData = function JoinData(props) {
325
311
  !meta.readonly && store.setPopup({
326
312
  visible: true,
327
313
  node: node,
328
- content: (0, _jsxRuntime.jsx)(_dialog.SelectColumnMultiple, {
314
+ content: (0, _jsxRuntime.jsx)(_dialog.SelectPermissionTable, {
329
315
  data: data,
330
- // tableInfo={tableInfo}
331
- value: [],
332
- isGroup: true,
333
- theme: _enum.ColumnsPopupThemeEnum.skyBlue,
334
- onSelect: function onSelect(fields, quotes) {
335
- var _data = fields[0];
316
+ value: newMeta[index][table_type],
317
+ onChange: function onChange(data) {
336
318
  if (table_type === FlagLocation.TABLE_1) {
337
- if (newMeta[index][table_type].alias !== _data.tableAlias) {
338
- // (newMeta[index] as MetaJoin)
339
- newMeta[index][table_type] = {
340
- name: _data.tableName,
341
- name_zh: _data.tableNameZh,
342
- // 表名
343
- id: _data.tableId,
344
- // 表名
345
- tableUuid: _data.tableUuid,
346
- // 表名
347
- alias: _data.tableAlias,
348
- // 表名
349
- datasourceName: _data.datasourceName,
350
- datasourceId: _data.datasourceId // 表名
351
- };
352
- // (newMeta[index] as MetaJoin).expressions = [];
319
+ if (newMeta[index][table_type].datasourceId !== data.datasourceId || newMeta[index][table_type].name !== data.name) {
320
+ newMeta[index][table_type] = data;
353
321
  initExpressions();
354
322
  }
355
323
  }
@@ -807,15 +775,15 @@ var JoinData = function JoinData(props) {
807
775
  }
808
776
  newMeta[index].subquery = newList;
809
777
  newMeta[index].table2 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newList[0].table), {}, {
810
- alias: newMeta[index].table2.alias || (0, _helper.getAlias)(newList[0].table.name, newMeta),
811
- fields: []
778
+ alias: newMeta[index].table2.alias || (0, _helper.getAlias)(newList[0].table.name, newMeta)
779
+ // fields: [],
812
780
  });
813
781
  var items = (0, _utils.getSubColumns)(newList);
814
782
  var newColumns = items.flatMap(function (item) {
815
783
  return item.columns;
816
784
  });
817
785
  newMeta[index].columns = newColumns;
818
- newMeta[index].expressions = [];
786
+ initExpressions();
819
787
  // 关联表变了 下面模块全部删除
820
788
  newMeta = newMeta.filter(function (v, i) {
821
789
  return i <= index;
@@ -1056,7 +1024,7 @@ var JoinData = function JoinData(props) {
1056
1024
  }).join(' || ') : (0, _locale.__)('SqlQueryBuilder.pickTable')
1057
1025
  }, type + i);
1058
1026
  } else {
1059
- return items.map(function (item, index) {
1027
+ return items === null || items === void 0 ? void 0 : items.map(function (item, index) {
1060
1028
  if (item.type === _types.AtomsTypeEnum.INPUT_NUMBER) {
1061
1029
  return (0, _jsxRuntime.jsx)(_pandora.InputNumber, {
1062
1030
  disabled: meta.readonly,
package/lib/cjs/hooks/patch.js CHANGED
@@ -10,7 +10,7 @@ var _helper = require("../utils/helper");
10
10
  var _types = require("../store/types");
11
11
  var joinDataPatch = exports.joinDataPatch = function joinDataPatch(newMeta) {
12
12
  var _newMeta$expressions, _fields, _fields2, _fields3, _fields4, _newMeta$expressions2, _expressions2;
13
- if ((_newMeta$expressions = newMeta.expressions) !== null && _newMeta$expressions !== void 0 && (_newMeta$expressions = _newMeta$expressions[0]) !== null && _newMeta$expressions !== void 0 && _newMeta$expressions.type && Object.keys(_types.AtomsTypeEnum).includes(newMeta.expressions[0].type)) {
13
+ if ((_newMeta$expressions = newMeta.expressions) !== null && _newMeta$expressions !== void 0 && (_newMeta$expressions = _newMeta$expressions[0]) !== null && _newMeta$expressions !== void 0 && _newMeta$expressions.type && Object.values(_types.AtomsTypeEnum).includes(newMeta.expressions[0].type)) {
14
14
  return newMeta;
15
15
  }
16
16
  var fields1 = newMeta.table1.fields || [];
@@ -98,9 +98,9 @@ var joinDataPatch = exports.joinDataPatch = function joinDataPatch(newMeta) {
98
98
  var _left_fields, _right_fields;
99
99
  var left_fields = v.left_fields || [];
100
100
  var right_fields = v.right_fields || [];
101
- if (v.type !== 'default') {
102
- return v;
103
- }
101
+ // if (v.type !== 'default') {
102
+ // return v;
103
+ // }
104
104
  // 先处理老数据的字段
105
105
  var left_field = {
106
106
  left_fieldAlias: v.left_fieldAlias || v.left_column,
@@ -227,7 +227,7 @@ var joinDataPatch = exports.joinDataPatch = function joinDataPatch(newMeta) {
227
227
  };
228
228
  var filterPatch = exports.filterPatch = function filterPatch(newMeta) {
229
229
  var _newMeta$filter, _newMeta$filter2;
230
- if ((_newMeta$filter = newMeta.filter) !== null && _newMeta$filter !== void 0 && (_newMeta$filter = _newMeta$filter[0]) !== null && _newMeta$filter !== void 0 && _newMeta$filter.type && Object.keys(_types.AtomsTypeEnum).includes(newMeta.filter[0].type)) {
230
+ if ((_newMeta$filter = newMeta.filter) !== null && _newMeta$filter !== void 0 && (_newMeta$filter = _newMeta$filter[0]) !== null && _newMeta$filter !== void 0 && _newMeta$filter.type && Object.values(_types.AtomsTypeEnum).includes(newMeta.filter[0].type)) {
231
231
  return newMeta;
232
232
  }
233
233
  var _filter = (_newMeta$filter2 = newMeta.filter) === null || _newMeta$filter2 === void 0 ? void 0 : _newMeta$filter2.map(function (v) {
@@ -315,7 +315,7 @@ var filterPatch = exports.filterPatch = function filterPatch(newMeta) {
315
315
  };
316
316
  var customColumnPatch = exports.customColumnPatch = function customColumnPatch(newMeta) {
317
317
  var _newMeta$customColumn, _newMeta$customColumn2;
318
- if ((_newMeta$customColumn = newMeta.customColumn[0].formulaList) !== null && _newMeta$customColumn !== void 0 && (_newMeta$customColumn = _newMeta$customColumn[0]) !== null && _newMeta$customColumn !== void 0 && _newMeta$customColumn.type && Object.keys(_types.AtomsTypeEnum).includes((_newMeta$customColumn2 = newMeta.customColumn[0].formulaList) === null || _newMeta$customColumn2 === void 0 || (_newMeta$customColumn2 = _newMeta$customColumn2[0]) === null || _newMeta$customColumn2 === void 0 ? void 0 : _newMeta$customColumn2.type)) {
318
+ if ((_newMeta$customColumn = newMeta.customColumn[0].formulaList) !== null && _newMeta$customColumn !== void 0 && (_newMeta$customColumn = _newMeta$customColumn[0]) !== null && _newMeta$customColumn !== void 0 && _newMeta$customColumn.type && Object.values(_types.AtomsTypeEnum).includes(((_newMeta$customColumn2 = newMeta.customColumn[0].formulaList) === null || _newMeta$customColumn2 === void 0 || (_newMeta$customColumn2 = _newMeta$customColumn2[0]) === null || _newMeta$customColumn2 === void 0 ? void 0 : _newMeta$customColumn2.type) || '')) {
319
319
  return newMeta;
320
320
  }
321
321
  newMeta.customColumn = newMeta.customColumn.map(function (v) {
@@ -435,8 +435,8 @@ var customColumnPatch = exports.customColumnPatch = function customColumnPatch(n
435
435
  return newMeta;
436
436
  };
437
437
  var sortPatch = exports.sortPatch = function sortPatch(newMeta) {
438
- var _newMeta$sort, _newMeta$sort2;
439
- if ((_newMeta$sort = newMeta.sort) !== null && _newMeta$sort !== void 0 && (_newMeta$sort = _newMeta$sort[0]) !== null && _newMeta$sort !== void 0 && _newMeta$sort.type && Object.keys(_types.AtomsTypeEnum).includes(newMeta.sort[0].type)) {
438
+ var _newMeta$sort, _newMeta$sort$, _newMeta$sort2;
439
+ if ((_newMeta$sort = newMeta.sort) !== null && _newMeta$sort !== void 0 && (_newMeta$sort = _newMeta$sort[0].expression) !== null && _newMeta$sort !== void 0 && (_newMeta$sort = _newMeta$sort[0]) !== null && _newMeta$sort !== void 0 && _newMeta$sort.type && Object.values(_types.AtomsTypeEnum).includes(((_newMeta$sort$ = newMeta.sort[0]) === null || _newMeta$sort$ === void 0 || (_newMeta$sort$ = _newMeta$sort$.expression) === null || _newMeta$sort$ === void 0 || (_newMeta$sort$ = _newMeta$sort$[0]) === null || _newMeta$sort$ === void 0 ? void 0 : _newMeta$sort$.type) || '')) {
440
440
  return newMeta;
441
441
  }
442
442
  var _sort = (_newMeta$sort2 = newMeta.sort) === null || _newMeta$sort2 === void 0 ? void 0 : _newMeta$sort2.map(function (v) {
package/lib/cjs/locale/en.js CHANGED
@@ -39,7 +39,7 @@ var _default = exports["default"] = (0, _index.register)('en', {
39
39
  'SqlQueryBuilder.customExpression': 'customExpression',
40
40
  'SqlQueryBuilder.pickTable': 'Select data table...',
41
41
  'SqlQueryBuilder.pickConstant': 'Select constant...',
42
- 'SqlQueryBuilder.input': 'String Input',
42
+ 'SqlQueryBuilder.input': 'Input',
43
43
  'SqlQueryBuilder.numberInput': 'Number Input',
44
44
  'SqlQueryBuilder.switchSubQuery': 'Open subquery',
45
45
  'SqlQueryBuilder.setSubQuery': 'Set Subquery...',
package/lib/cjs/locale/zh.js CHANGED
@@ -39,7 +39,7 @@ var _default = exports["default"] = (0, _index.register)('zh', {
39
39
  'SqlQueryBuilder.customExpression': '自定义表达方式',
40
40
  'SqlQueryBuilder.pickTable': '选择数据表...',
41
41
  'SqlQueryBuilder.pickConstant': '选择常量...',
42
- 'SqlQueryBuilder.input': '字符串输入框',
42
+ 'SqlQueryBuilder.input': '输入框',
43
43
  'SqlQueryBuilder.numberInput': '数字输入框',
44
44
  'SqlQueryBuilder.switchSubQuery': '切换子查询',
45
45
  'SqlQueryBuilder.setSubQuery': '设置子查询...',
package/lib/es/components/modules/join-data.js CHANGED
@@ -23,7 +23,7 @@ import NextDom from './components/meta-icon';
23
23
  import Header from './components/header';
24
24
  import SelectList from '../dialog/select-list';
25
25
  import { LeftJoinIcon, InnerJoinIcon } from '../icons';
26
- import { SelectTable, SelectJoin, SelectColumnMultiple, SelectColumn, Expression } from '../dialog';
26
+ import { SelectTable, SelectJoin, SelectColumnMultiple, SelectColumn, Expression, SelectPermissionTable } from '../dialog';
27
27
  import { useStore } from '../../hooks/use-provider';
28
28
  var PrevResult = 'Previous results';
29
29
  var operators = ['AND', 'OR', '(', ')', ',', '+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '='];
@@ -196,26 +196,6 @@ var JoinData = function JoinData(props) {
196
196
  var _ind = Number(node.getAttribute('v-index'));
197
197
  var index = findIndex(store.metaList[groupIndex].list, meta);
198
198
  var table_type = FlagLocation.TABLE_1;
199
- var tableInfo = {
200
- name: meta[table_type].name,
201
- id: meta[table_type].id,
202
- table: meta[table_type].name,
203
- // fieldUuid: meta[table_type][_ind].fieldUuid || uuidv4('field'),
204
- // fieldAlias: meta[table_type].fieldAlias || '',
205
- tableId: meta[table_type].id,
206
- tableUuid: meta[table_type].tableUuid || uuidv4('table'),
207
- alias: meta[table_type].alias,
208
- database_type: '',
209
- datasourceId: meta[table_type].datasourceId,
210
- // 数据源id
211
- datasourceName: meta[table_type].datasourceName // 数据源名
212
- };
213
- // let value: MetaJoin_Field[] = [
214
- // {
215
- // fieldUuid: meta[table_type].fieldUuid || uuidv4('field'),
216
- // fieldAlias: meta[table_type].fieldAlias || '',
217
- // },
218
- // ];
219
199
  var data = [];
220
200
  var _getHelper2 = getHelper(store.metaList[groupIndex].list, meta),
221
201
  ExistAboveGroupBy = _getHelper2.ExistAboveGroupBy,
@@ -230,34 +210,40 @@ var JoinData = function JoinData(props) {
230
210
  name: prevGroupBy.alias,
231
211
  name_zh: prevGroupBy.alias,
232
212
  datasourceId: '',
233
- datasourceName: '',
234
- columns: []
213
+ datasourceName: ''
214
+ // columns: [],
235
215
  };
236
216
  if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group2 = prevGroupBy.group) !== null && _prevGroupBy$group2 !== void 0 && _prevGroupBy$group2.length) {
237
- _data.columns = _data.columns.concat(prevGroupBy.group.map(function (v) {
238
- return _objectSpread(_objectSpread({}, v), {}, {
239
- name: v.name || v.quotes,
240
- name_zh: v.name_zh || v.quotes,
241
- id: v.id || v.fieldId,
242
- database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
243
- special_type: '',
244
- sql: v.sql,
245
- select: true
246
- });
247
- }));
217
+ // _data.columns = _data.columns.concat(
218
+ // prevGroupBy.group.map((v: MetaSummarize_Group) => {
219
+ // return {
220
+ // ...v,
221
+ // name: v.name || v.quotes,
222
+ // name_zh: v.name_zh || v.quotes,
223
+ // id: v.id || v.fieldId,
224
+ // database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
225
+ // special_type: '',
226
+ // sql: v.sql,
227
+ // select: true,
228
+ // };
229
+ // }),
230
+ // );
248
231
  }
249
232
  if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$by2 = prevGroupBy.by) !== null && _prevGroupBy$by2 !== void 0 && _prevGroupBy$by2.length) {
250
- _data.columns = _data.columns.concat(prevGroupBy.by.map(function (v) {
251
- return _objectSpread(_objectSpread({}, v), {}, {
252
- name: v.name || v.quotes,
253
- name_zh: v.name_zh || v.quotes,
254
- id: v.id || v.fieldId,
255
- database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
256
- special_type: '',
257
- sql: v.sql,
258
- select: true
259
- });
260
- }));
233
+ // _data.columns = _data.columns.concat(
234
+ // prevGroupBy.by.map((v: MetaSummarize_By) => {
235
+ // return {
236
+ // ...v,
237
+ // name: v.name || v.quotes,
238
+ // name_zh: v.name_zh || v.quotes,
239
+ // id: v.id || v.fieldId,
240
+ // database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
241
+ // special_type: '',
242
+ // sql: v.sql,
243
+ // select: true,
244
+ // };
245
+ // }),
246
+ // );
261
247
  }
262
248
  data = [_data];
263
249
  var joinData = prevList.filter(function (v) {
@@ -319,31 +305,13 @@ var JoinData = function JoinData(props) {
319
305
  !meta.readonly && store.setPopup({
320
306
  visible: true,
321
307
  node: node,
322
- content: _jsx(SelectColumnMultiple, {
308
+ content: _jsx(SelectPermissionTable, {
323
309
  data: data,
324
- // tableInfo={tableInfo}
325
- value: [],
326
- isGroup: true,
327
- theme: ColumnsPopupThemeEnum.skyBlue,
328
- onSelect: function onSelect(fields, quotes) {
329
- var _data = fields[0];
310
+ value: newMeta[index][table_type],
311
+ onChange: function onChange(data) {
330
312
  if (table_type === FlagLocation.TABLE_1) {
331
- if (newMeta[index][table_type].alias !== _data.tableAlias) {
332
- // (newMeta[index] as MetaJoin)
333
- newMeta[index][table_type] = {
334
- name: _data.tableName,
335
- name_zh: _data.tableNameZh,
336
- // 表名
337
- id: _data.tableId,
338
- // 表名
339
- tableUuid: _data.tableUuid,
340
- // 表名
341
- alias: _data.tableAlias,
342
- // 表名
343
- datasourceName: _data.datasourceName,
344
- datasourceId: _data.datasourceId // 表名
345
- };
346
- // (newMeta[index] as MetaJoin).expressions = [];
313
+ if (newMeta[index][table_type].datasourceId !== data.datasourceId || newMeta[index][table_type].name !== data.name) {
314
+ newMeta[index][table_type] = data;
347
315
  initExpressions();
348
316
  }
349
317
  }
@@ -801,15 +769,15 @@ var JoinData = function JoinData(props) {
801
769
  }
802
770
  newMeta[index].subquery = newList;
803
771
  newMeta[index].table2 = _objectSpread(_objectSpread({}, newList[0].table), {}, {
804
- alias: newMeta[index].table2.alias || getAlias(newList[0].table.name, newMeta),
805
- fields: []
772
+ alias: newMeta[index].table2.alias || getAlias(newList[0].table.name, newMeta)
773
+ // fields: [],
806
774
  });
807
775
  var items = getSubColumns(newList);
808
776
  var newColumns = items.flatMap(function (item) {
809
777
  return item.columns;
810
778
  });
811
779
  newMeta[index].columns = newColumns;
812
- newMeta[index].expressions = [];
780
+ initExpressions();
813
781
  // 关联表变了 下面模块全部删除
814
782
  newMeta = newMeta.filter(function (v, i) {
815
783
  return i <= index;
@@ -1050,7 +1018,7 @@ var JoinData = function JoinData(props) {
1050
1018
  }).join(' || ') : __('SqlQueryBuilder.pickTable')
1051
1019
  }, type + i);
1052
1020
  } else {
1053
- return items.map(function (item, index) {
1021
+ return items === null || items === void 0 ? void 0 : items.map(function (item, index) {
1054
1022
  if (item.type === AtomsTypeEnum.INPUT_NUMBER) {
1055
1023
  return _jsx(InputNumber, {
1056
1024
  disabled: meta.readonly,
package/lib/es/hooks/patch.js CHANGED
@@ -3,7 +3,7 @@ import { uuidv4 } from '../utils/helper';
3
3
  import { AtomsTypeEnum } from '../store/types';
4
4
  export var joinDataPatch = function joinDataPatch(newMeta) {
5
5
  var _newMeta$expressions, _fields, _fields2, _fields3, _fields4, _newMeta$expressions2, _expressions2;
6
- if ((_newMeta$expressions = newMeta.expressions) !== null && _newMeta$expressions !== void 0 && (_newMeta$expressions = _newMeta$expressions[0]) !== null && _newMeta$expressions !== void 0 && _newMeta$expressions.type && Object.keys(AtomsTypeEnum).includes(newMeta.expressions[0].type)) {
6
+ if ((_newMeta$expressions = newMeta.expressions) !== null && _newMeta$expressions !== void 0 && (_newMeta$expressions = _newMeta$expressions[0]) !== null && _newMeta$expressions !== void 0 && _newMeta$expressions.type && Object.values(AtomsTypeEnum).includes(newMeta.expressions[0].type)) {
7
7
  return newMeta;
8
8
  }
9
9
  var fields1 = newMeta.table1.fields || [];
@@ -91,9 +91,9 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
91
91
  var _left_fields, _right_fields;
92
92
  var left_fields = v.left_fields || [];
93
93
  var right_fields = v.right_fields || [];
94
- if (v.type !== 'default') {
95
- return v;
96
- }
94
+ // if (v.type !== 'default') {
95
+ // return v;
96
+ // }
97
97
  // 先处理老数据的字段
98
98
  var left_field = {
99
99
  left_fieldAlias: v.left_fieldAlias || v.left_column,
@@ -220,7 +220,7 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
220
220
  };
221
221
  export var filterPatch = function filterPatch(newMeta) {
222
222
  var _newMeta$filter, _newMeta$filter2;
223
- if ((_newMeta$filter = newMeta.filter) !== null && _newMeta$filter !== void 0 && (_newMeta$filter = _newMeta$filter[0]) !== null && _newMeta$filter !== void 0 && _newMeta$filter.type && Object.keys(AtomsTypeEnum).includes(newMeta.filter[0].type)) {
223
+ if ((_newMeta$filter = newMeta.filter) !== null && _newMeta$filter !== void 0 && (_newMeta$filter = _newMeta$filter[0]) !== null && _newMeta$filter !== void 0 && _newMeta$filter.type && Object.values(AtomsTypeEnum).includes(newMeta.filter[0].type)) {
224
224
  return newMeta;
225
225
  }
226
226
  var _filter = (_newMeta$filter2 = newMeta.filter) === null || _newMeta$filter2 === void 0 ? void 0 : _newMeta$filter2.map(function (v) {
@@ -308,7 +308,7 @@ export var filterPatch = function filterPatch(newMeta) {
308
308
  };
309
309
  export var customColumnPatch = function customColumnPatch(newMeta) {
310
310
  var _newMeta$customColumn, _newMeta$customColumn2;
311
- if ((_newMeta$customColumn = newMeta.customColumn[0].formulaList) !== null && _newMeta$customColumn !== void 0 && (_newMeta$customColumn = _newMeta$customColumn[0]) !== null && _newMeta$customColumn !== void 0 && _newMeta$customColumn.type && Object.keys(AtomsTypeEnum).includes((_newMeta$customColumn2 = newMeta.customColumn[0].formulaList) === null || _newMeta$customColumn2 === void 0 || (_newMeta$customColumn2 = _newMeta$customColumn2[0]) === null || _newMeta$customColumn2 === void 0 ? void 0 : _newMeta$customColumn2.type)) {
311
+ if ((_newMeta$customColumn = newMeta.customColumn[0].formulaList) !== null && _newMeta$customColumn !== void 0 && (_newMeta$customColumn = _newMeta$customColumn[0]) !== null && _newMeta$customColumn !== void 0 && _newMeta$customColumn.type && Object.values(AtomsTypeEnum).includes(((_newMeta$customColumn2 = newMeta.customColumn[0].formulaList) === null || _newMeta$customColumn2 === void 0 || (_newMeta$customColumn2 = _newMeta$customColumn2[0]) === null || _newMeta$customColumn2 === void 0 ? void 0 : _newMeta$customColumn2.type) || '')) {
312
312
  return newMeta;
313
313
  }
314
314
  newMeta.customColumn = newMeta.customColumn.map(function (v) {
@@ -428,8 +428,8 @@ export var customColumnPatch = function customColumnPatch(newMeta) {
428
428
  return newMeta;
429
429
  };
430
430
  export var sortPatch = function sortPatch(newMeta) {
431
- var _newMeta$sort, _newMeta$sort2;
432
- if ((_newMeta$sort = newMeta.sort) !== null && _newMeta$sort !== void 0 && (_newMeta$sort = _newMeta$sort[0]) !== null && _newMeta$sort !== void 0 && _newMeta$sort.type && Object.keys(AtomsTypeEnum).includes(newMeta.sort[0].type)) {
431
+ var _newMeta$sort, _newMeta$sort$, _newMeta$sort2;
432
+ if ((_newMeta$sort = newMeta.sort) !== null && _newMeta$sort !== void 0 && (_newMeta$sort = _newMeta$sort[0].expression) !== null && _newMeta$sort !== void 0 && (_newMeta$sort = _newMeta$sort[0]) !== null && _newMeta$sort !== void 0 && _newMeta$sort.type && Object.values(AtomsTypeEnum).includes(((_newMeta$sort$ = newMeta.sort[0]) === null || _newMeta$sort$ === void 0 || (_newMeta$sort$ = _newMeta$sort$.expression) === null || _newMeta$sort$ === void 0 || (_newMeta$sort$ = _newMeta$sort$[0]) === null || _newMeta$sort$ === void 0 ? void 0 : _newMeta$sort$.type) || '')) {
433
433
  return newMeta;
434
434
  }
435
435
  var _sort = (_newMeta$sort2 = newMeta.sort) === null || _newMeta$sort2 === void 0 ? void 0 : _newMeta$sort2.map(function (v) {
package/lib/es/locale/en.js CHANGED
@@ -33,7 +33,7 @@ export default register('en', {
33
33
  'SqlQueryBuilder.customExpression': 'customExpression',
34
34
  'SqlQueryBuilder.pickTable': 'Select data table...',
35
35
  'SqlQueryBuilder.pickConstant': 'Select constant...',
36
- 'SqlQueryBuilder.input': 'String Input',
36
+ 'SqlQueryBuilder.input': 'Input',
37
37
  'SqlQueryBuilder.numberInput': 'Number Input',
38
38
  'SqlQueryBuilder.switchSubQuery': 'Open subquery',
39
39
  'SqlQueryBuilder.setSubQuery': 'Set Subquery...',
package/lib/es/locale/zh.js CHANGED
@@ -33,7 +33,7 @@ export default register('zh', {
33
33
  'SqlQueryBuilder.customExpression': '自定义表达方式',
34
34
  'SqlQueryBuilder.pickTable': '选择数据表...',
35
35
  'SqlQueryBuilder.pickConstant': '选择常量...',
36
- 'SqlQueryBuilder.input': '字符串输入框',
36
+ 'SqlQueryBuilder.input': '输入框',
37
37
  'SqlQueryBuilder.numberInput': '数字输入框',
38
38
  'SqlQueryBuilder.switchSubQuery': '切换子查询',
39
39
  'SqlQueryBuilder.setSubQuery': '设置子查询...',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/pandora-metabase",
3
- "version": "1.0.15",
3
+ "version": "1.0.17",
4
4
  "description": "",
5
5
  "main": "lib/es/index.js",
6
6
  "module": "lib/es/index.js",