@gingkoo/pandora-metabase 1.0.147 → 1.0.149

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 (5) hide show
  1. package/lib/cjs/components/dialog/select-column-multiple/index.js +19 -0
  2. package/lib/cjs/utils.js +1 -1
  3. package/lib/es/components/dialog/select-column-multiple/index.js +19 -0
  4. package/lib/es/utils.js +1 -1
  5. package/package.json +1 -1
package/lib/cjs/components/dialog/select-column-multiple/index.js CHANGED
@@ -134,6 +134,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
134
134
  if (fieldTableAlias && tableAlias) {
135
135
  return fieldTableAlias === tableAlias;
136
136
  }
137
+ var fieldTableName = normalizeIdentityValue(field.tableName);
138
+ var tableName = normalizeIdentityValue(tableItem.name);
139
+ if (!fieldTableAlias && !tableAlias && fieldTableName && tableName) {
140
+ return fieldTableName === tableName;
141
+ }
137
142
  return true;
138
143
  }
139
144
  var fieldTableUuid = normalizeIdentityValue(field.tableUuid);
@@ -151,6 +156,20 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
151
156
  return [column.id, column.fieldId, column.fieldName, column.name, column.realName].concat((0, _toConsumableArray2["default"])(includeAlias ? [column.fieldAlias] : [])).map(normalizeIdentityValue).filter(Boolean);
152
157
  };
153
158
  var isSameSelectedField = function isSameSelectedField(field, column) {
159
+ var fieldAlias = normalizeIdentityValue(field.fieldAlias);
160
+ var columnAlias = normalizeIdentityValue(column.fieldAlias);
161
+ var fieldIds = [field.fieldId, field.id].map(normalizeIdentityValue).filter(Boolean);
162
+ var columnIds = [column.id, column.fieldId].map(normalizeIdentityValue).filter(Boolean);
163
+ var isSameId = fieldIds.some(function (value) {
164
+ return columnIds.includes(value);
165
+ });
166
+ if (isSameId && !fieldAlias && !columnAlias) {
167
+ var fieldName = normalizeIdentityValue(field.fieldName);
168
+ var columnName = normalizeIdentityValue(column.name || column.fieldName);
169
+ if (fieldName && columnName && fieldName !== columnName) {
170
+ return false;
171
+ }
172
+ }
154
173
  var includeAlias = Boolean(column.summarizeType);
155
174
  var fieldValues = getFieldStableValues(field, includeAlias);
156
175
  var columnValues = getColumnStableValues(column, includeAlias);
package/lib/cjs/utils.js CHANGED
@@ -239,7 +239,7 @@ var mergeSubQueryColumns = exports.mergeSubQueryColumns = function mergeSubQuery
239
239
  name_zh: existingCol ? existingCol.name_zh || '' : newColumn.name_zh || '',
240
240
  fieldAlias: getOuterSubQueryFieldAlias(existingCol, newCol),
241
241
  fieldUuid: newCol.fieldUuid || (existingCol === null || existingCol === void 0 ? void 0 : existingCol.fieldUuid) || (0, _helper2.uuidv4)('field'),
242
- select: isSelectFields || Boolean(existingCol === null || existingCol === void 0 ? void 0 : existingCol.select) || Boolean(newCol.select)
242
+ select: existingCol ? Boolean(existingCol.select) : isSelectFields || Boolean(newCol.select)
243
243
  }, newColumn.summarizeType ? (0, _defineProperty2["default"])({}, SUB_QUERY_OUTPUT_COLUMN_KEY, true) : {});
244
244
  return nextCol;
245
245
  });
package/lib/es/components/dialog/select-column-multiple/index.js CHANGED
@@ -128,6 +128,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
128
128
  if (fieldTableAlias && tableAlias) {
129
129
  return fieldTableAlias === tableAlias;
130
130
  }
131
+ var fieldTableName = normalizeIdentityValue(field.tableName);
132
+ var tableName = normalizeIdentityValue(tableItem.name);
133
+ if (!fieldTableAlias && !tableAlias && fieldTableName && tableName) {
134
+ return fieldTableName === tableName;
135
+ }
131
136
  return true;
132
137
  }
133
138
  var fieldTableUuid = normalizeIdentityValue(field.tableUuid);
@@ -145,6 +150,20 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
145
150
  return [column.id, column.fieldId, column.fieldName, column.name, column.realName].concat(_toConsumableArray(includeAlias ? [column.fieldAlias] : [])).map(normalizeIdentityValue).filter(Boolean);
146
151
  };
147
152
  var isSameSelectedField = function isSameSelectedField(field, column) {
153
+ var fieldAlias = normalizeIdentityValue(field.fieldAlias);
154
+ var columnAlias = normalizeIdentityValue(column.fieldAlias);
155
+ var fieldIds = [field.fieldId, field.id].map(normalizeIdentityValue).filter(Boolean);
156
+ var columnIds = [column.id, column.fieldId].map(normalizeIdentityValue).filter(Boolean);
157
+ var isSameId = fieldIds.some(function (value) {
158
+ return columnIds.includes(value);
159
+ });
160
+ if (isSameId && !fieldAlias && !columnAlias) {
161
+ var fieldName = normalizeIdentityValue(field.fieldName);
162
+ var columnName = normalizeIdentityValue(column.name || column.fieldName);
163
+ if (fieldName && columnName && fieldName !== columnName) {
164
+ return false;
165
+ }
166
+ }
148
167
  var includeAlias = Boolean(column.summarizeType);
149
168
  var fieldValues = getFieldStableValues(field, includeAlias);
150
169
  var columnValues = getColumnStableValues(column, includeAlias);
package/lib/es/utils.js CHANGED
@@ -225,7 +225,7 @@ export var mergeSubQueryColumns = function mergeSubQueryColumns(columns) {
225
225
  name_zh: existingCol ? existingCol.name_zh || '' : newColumn.name_zh || '',
226
226
  fieldAlias: getOuterSubQueryFieldAlias(existingCol, newCol),
227
227
  fieldUuid: newCol.fieldUuid || (existingCol === null || existingCol === void 0 ? void 0 : existingCol.fieldUuid) || uuidv4('field'),
228
- select: isSelectFields || Boolean(existingCol === null || existingCol === void 0 ? void 0 : existingCol.select) || Boolean(newCol.select)
228
+ select: existingCol ? Boolean(existingCol.select) : isSelectFields || Boolean(newCol.select)
229
229
  }, newColumn.summarizeType ? _defineProperty({}, SUB_QUERY_OUTPUT_COLUMN_KEY, true) : {});
230
230
  return nextCol;
231
231
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/pandora-metabase",
3
- "version": "1.0.147",
3
+ "version": "1.0.149",
4
4
  "description": "",
5
5
  "main": "lib/es/index.js",
6
6
  "module": "lib/es/index.js",