@gingkoo/pandora-metabase 1.0.130 → 1.0.131

package/lib/cjs/components/dialog/expression/index.js

@@ -644,7 +644,6 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
               tableUuid: '',
               datasourceName: '',
               datasourceId: '',
-              datasourceType: '',
               type: _types.AtomsTypeEnum.FIELD
             }]);
           }

package/lib/cjs/components/dialog/formula-list/utils.js

@@ -75,7 +75,6 @@ var insertTemplateAt = exports.insertTemplateAt = function insertTemplateAt(oldT
       tableUuid: '',
       datasourceName: '',
       datasourceId: '',
-      datasourceType: '',
       type: _types.AtomsTypeEnum.FIELD
     }, {
       val: 'ORDER BY',
@@ -93,7 +92,6 @@ var insertTemplateAt = exports.insertTemplateAt = function insertTemplateAt(oldT
       tableUuid: '',
       datasourceName: '',
       datasourceId: '',
-      datasourceType: '',
       type: _types.AtomsTypeEnum.FIELD
     }, {
       val: ')',
@@ -153,7 +151,6 @@ var getTemplateItem = exports.getTemplateItem = function getTemplateItem(type, i
       tableUuid: '',
       datasourceName: '',
       datasourceId: '',
-      datasourceType: '',
       type: _types.AtomsTypeEnum.FIELD
     };
   } else if (type === _types.AtomsTypeEnum.EXPRESSION || type === _types.AtomsTypeEnum.JOIN_DEFAULT) {

package/lib/cjs/components/dialog/select-column/index.js

@@ -79,7 +79,7 @@ var SelectColumn = function SelectColumn(_ref) {
     var originalData = (0, _cloneDeep["default"])(originList);
     var mergedColumns = originalData.map(function (item) {
       var match = columns.find(function (col) {
-        return col.fieldUuid === item.fieldUuid;
+        return (0, _helper.isSameColumnByIdFirst)(col, item);
       });
       return match ? (0, _cloneDeep["default"])(match) : item;
     });
@@ -203,7 +203,7 @@ var SelectColumn = function SelectColumn(_ref) {
                 }
               })
             })]
-          }, v.name);
+          }, (0, _helper.getColumnIdFirstKey)(v));
         })
       })]
     })

package/lib/cjs/components/dialog/select-column-multiple/index.d.ts

@@ -14,7 +14,6 @@ export interface ColumnType {
     id: string;
     datasourceId: string;
     datasourceName: string;
-    datasourceType?: string;
     table2?: Omit<MetaJoin_TalbeType, 'column' | 'column_id'> | null;
 }
 export interface ColumnGroupType {

package/lib/cjs/components/dialog/select-column-multiple/index.js

@@ -85,22 +85,34 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   (0, _react.useEffect)(function () {
     setValue(_value);
   }, [_value]);
+  var getFieldTableKey = function getFieldTableKey(tableId, tableUuid) {
+    return tableId || tableUuid || '';
+  };
+  var isSameSelectedTable = function isSameSelectedTable(field, tableId, tableUuid) {
+    if (field.tableId && tableId) {
+      return field.tableId === tableId;
+    }
+    if (field.tableUuid && tableUuid) {
+      return field.tableUuid === tableUuid;
+    }
+    return false;
+  };
   var getSelectedFieldKey = function getSelectedFieldKey(field) {
     if (!field) return '';
-    if (field.tableId === _helper.SummarizeAlias) {
-      return field.fieldAlias || '';
-    }
-    return "".concat(field.fieldId).concat(field.fieldAlias || '');
+    var tableKey = getFieldTableKey(field.tableId, field.tableUuid);
+    var fieldKey = field.tableId === _helper.SummarizeAlias ? field.fieldAlias || '' : "".concat(field.fieldId).concat(field.fieldAlias || '');
+    return "".concat(tableKey, "|").concat(fieldKey);
   };
-  var getColumnKey = function getColumnKey(column, isSummarizeColumn) {
+  var getColumnKey = function getColumnKey(column, isSummarizeColumn, tableId, tableUuid) {
+    var tableKey = getFieldTableKey(tableId, tableUuid);
     if (isSummarizeColumn) {
-      return column.fieldAlias || column.name || '';
+      return "".concat(tableKey, "|").concat(column.fieldAlias || column.name || '');
     }
-    return "".concat(column.id || column.name).concat(column.fieldAlias || '');
+    return "".concat(tableKey, "|").concat(column.id || column.name).concat(column.fieldAlias || '');
   };
-  var isActive = function isActive(id_alias) {
+  var isActive = function isActive(id_alias, tableId, tableUuid) {
     return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
-      return getSelectedFieldKey(v) === id_alias;
+      return isSameSelectedTable(v, tableId, tableUuid) && getSelectedFieldKey(v) === id_alias;
     }).length) > 0;
   };
   (0, _react.useEffect)(function () {
@@ -154,30 +166,39 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     }
     var selectedKey = getSelectedFieldKey(val);
     var isHas = (value === null || value === void 0 ? void 0 : value.filter(function (v) {
-      return getSelectedFieldKey(v) === selectedKey;
+      return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && getSelectedFieldKey(v) === selectedKey;
     }).length) > 0;
     var _value = value.slice();
     if (tableUuid != curTable) {
       _value = [];
     }
     if (!isHas && val) {
+      _value = _value.filter(function (v) {
+        var hasTableKey = getFieldTableKey(v.tableId, v.tableUuid);
+        var isLegacySameField = !hasTableKey && (v.fieldId && v.fieldId === val.fieldId || v.fieldName && v.fieldName === val.fieldName);
+        return !isLegacySameField;
+      });
       _value.push(val);
     } else {
       _value = _value.filter(function (v) {
-        return getSelectedFieldKey(v) !== selectedKey;
+        return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && getSelectedFieldKey(v) === selectedKey);
       });
     }
-    var curTableColumn = data.filter(function (v) {
+    var curTableItem = data.find(function (v) {
       return v.tableUuid === tableUuid;
-    }).flatMap(function (v) {
-      return v.columns;
     });
+    var curTableId = (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.id) || '';
+    var curTableColumn = (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.columns) || [];
     _value = _value.filter(function (item2) {
-      return curTableColumn.some(function (item1) {
+      return isSameSelectedTable(item2, curTableId, tableUuid) && curTableColumn.some(function (item1) {
         if (item2.tableId === _helper.SummarizeAlias) {
           return (item1.fieldAlias || item1.name) === item2.fieldAlias;
         }
-        return item1.name === item2.fieldName;
+        return (0, _helper2.isSameColumnByIdFirst)((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, item1), {}, {
+          tableId: curTableId,
+          tableUuid: tableUuid,
+          datasourceId: (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.datasourceId) || ''
+        }), item2);
       });
     });
     setValue(_value);
@@ -266,6 +287,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   if (isGroup) {
                     changeValue(tableUuid);
                   }
+                  if (tableUuid !== curTable) {
+                    setCurTable(tableUuid);
+                    setValue([]);
+                    onSelect === null || onSelect === void 0 || onSelect([], '');
+                  }
                   if (!isMultiple) return void 0;
                   var newTables = (0, _cloneDeep["default"])(tableList);
                   if (open) {
@@ -326,7 +352,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   _v$database_type = v.database_type,
                   database_type = _v$database_type === void 0 ? '' : _v$database_type,
                   name = v.name;
-                var columnKey = getColumnKey(v, isSummarize);
+                var columnKey = getColumnKey(v, isSummarize, tableId || '', tableUuid);
                 var fieldAlias = isSummarize ? v.fieldAlias || name || '' : v.fieldAlias || '';
                 var fieldName = isSummarize ? '' : name || '';
                 var fieldId = isSummarize ? '' : v.id || name || '';
@@ -342,7 +368,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   className: (0, _classnames["default"])("Sqb-List-section"),
                   children: (0, _jsxRuntime.jsx)("div", {
                     className: (0, _classnames["default"])("Sqb-List-item mx-2", {
-                      active: isActive(columnKey)
+                      active: isActive(columnKey, tableId || '', tableUuid)
                     }),
                     onClick: function onClick() {
                       changeValue(tableUuid, {
@@ -353,7 +379,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                         tableUuid: tableItem.tableUuid || '',
                         datasourceName: tableItem.datasourceName || '',
                         datasourceId: tableItem.datasourceId || '',
-                        datasourceType: tableItem.datasourceType || '',
                         fieldName: fieldName,
                         fieldId: fieldId,
                         fieldNameZh: fieldNameZh,

package/lib/cjs/components/dialog/select-join-column/index.js

@@ -56,7 +56,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     curTable = _useState4[0],
     setCurTable = _useState4[1];
-  var _useState5 = (0, _react.useState)(_value.name),
+  var _useState5 = (0, _react.useState)(_value),
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
     curColumn = _useState6[0],
     setCurColumn = _useState6[1];
@@ -77,7 +77,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     setTableList = _useState0[1];
   (0, _react.useEffect)(function () {
     setValue(_value);
-    setCurColumn(_value.name);
+    setCurColumn(_value);
   }, [_value]);
   (0, _react.useEffect)(function () {
     var tableUuid = _value === null || _value === void 0 ? void 0 : _value.tableUuid;
@@ -251,12 +251,20 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
               if (~_const.DATE_GROUP.indexOf(database_type)) {
                 groupe = _enum.SQL_GROUP_TYPE.DATE;
               }
-              var showCondition = curColumn === name && curTable === tableUuid && _condition;
+              var showCondition = (0, _helper2.isSameColumnByIdFirst)(curColumn, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+                tableId: tableId,
+                tableUuid: tableUuid,
+                datasourceId: datasourceId
+              })) && curTable === tableUuid && _condition;
               return (0, _jsxRuntime.jsx)("div", {
                 className: (0, _classnames["default"])("Sqb-List-section"),
                 children: (0, _jsxRuntime.jsxs)("div", {
                   className: (0, _classnames["default"])("Sqb-List-item mx-2", {
-                    active: curColumn === name && curTable === tableUuid
+                    active: curTable === tableUuid && (0, _helper2.isSameColumnByIdFirst)(value, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+                      tableId: tableId,
+                      tableUuid: tableUuid,
+                      datasourceId: datasourceId
+                    }))
                   }),
                   onClick: function onClick() {
                     if (isGroup && typeof onGroup === 'function') {
@@ -318,11 +326,15 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                     onVisibleChange: function onVisibleChange(visible) {
                       if (visible) {
                         setCurTable(tableUuid);
-                        setCurColumn(name);
+                        setCurColumn((0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, value), v), {}, {
+                          tableId: tableId,
+                          tableUuid: tableUuid,
+                          datasourceId: datasourceId
+                        }));
                         store.setClosable(false);
                       } else {
                         setCurTable(tableUuid);
-                        setCurColumn(value.name);
+                        setCurColumn(value);
                         setTimeout(function () {
                           return store.setClosable(true);
                         }, 300);
@@ -379,7 +391,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                     })
                   })]
                 })
-              }, name);
+              }, (0, _helper2.getColumnIdFirstKey)((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+                tableId: tableId,
+                tableUuid: tableUuid,
+                datasourceId: datasourceId
+              })));
             })]
           })]
         }, tableUuid || tableAlias);

package/lib/cjs/components/dialog/select-join-column-multiple/index.js

@@ -74,9 +74,9 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   (0, _react.useEffect)(function () {
     setValue(_value);
   }, [_value]);
-  var isActive = function isActive(fieldUuid) {
+  var isActive = function isActive(field) {
     return value.filter(function (v) {
-      return v.fieldUuid === fieldUuid;
+      return (0, _helper2.isSameColumnByIdFirst)(v, field);
     }).length > 0;
   };
   (0, _react.useEffect)(function () {
@@ -109,7 +109,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   }
   var changeValue = function changeValue(table, val) {
     var isHas = value.filter(function (v) {
-      return v.fieldUuid === val.fieldUuid;
+      return (0, _helper2.isSameColumnByIdFirst)(v, val);
     }).length > 0;
     var _value = (0, _toConsumableArray2["default"])(value);
     if (table.tableUuid != curTable.tableUuid) {
@@ -119,7 +119,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       _value.push(val);
     } else {
       _value = _value.filter(function (v) {
-        return v.fieldUuid != val.fieldUuid;
+        return !(0, _helper2.isSameColumnByIdFirst)(v, val);
       });
     }
     setValue(_value);
@@ -230,7 +230,12 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                 className: (0, _classnames["default"])("Sqb-List-section"),
                 children: (0, _jsxRuntime.jsx)("div", {
                   className: (0, _classnames["default"])("Sqb-List-item mx-2", {
-                    active: isActive(v.fieldUuid)
+                    active: isActive((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+                      fieldId: fieldId || v.id,
+                      tableId: tableId,
+                      tableUuid: tableUuid,
+                      datasourceId: datasourceId
+                    }))
                   }),
                   onClick: function onClick() {
                     changeValue(tableItem, {
@@ -253,7 +258,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                     })]
                   })
                 })
-              }, name);
+              }, (0, _helper2.getColumnIdFirstKey)((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+                tableId: tableId,
+                tableUuid: tableUuid,
+                datasourceId: datasourceId
+              })));
             })]
           })]
         }, tableUuid || tableAlias);

package/lib/cjs/components/dialog/select-permission-table/index.js

@@ -67,7 +67,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
             className: (0, _classnames["default"])("Sqb-List-section"),
             children: (0, _jsxRuntime.jsx)("div", {
               className: (0, _classnames["default"])("Sqb-List-item mx-2", {
-                active: value.alias + '' + value.id === v.alias + '' + v.id
+                active: (0, _helper.isSameTableByIdFirst)(value, v)
               }),
               onClick: function onClick() {
                 onChange(v);
@@ -85,7 +85,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
                 })]
               })
             })
-          }, v.alias || v.name);
+          }, (0, _helper.getTableIdFirstKey)(v));
         })]
       })
     })

package/lib/cjs/components/dialog/select-summarize/index.js

@@ -110,7 +110,6 @@ var SelectSummarize = function SelectSummarize(_ref) {
           tableUuid: value.tableUuid || '',
           datasourceName: value.datasourceName || '',
           datasourceId: value.datasourceId || '',
-          datasourceType: value.datasourceType || '',
           type: _types.AtomsTypeEnum.FIELD
         };
         return [fieldAtom];
@@ -177,8 +176,7 @@ var SelectSummarize = function SelectSummarize(_ref) {
       fieldAlias: '',
       fieldUuid: '',
       datasourceId: '',
-      datasourceName: '',
-      datasourceType: ''
+      datasourceName: ''
     } : {}), record), {}, {
       condition: condition,
       quotes: quotes

package/lib/cjs/components/dialog/select-table/index.d.ts

@@ -6,9 +6,8 @@ interface PropsType {
     sourceTable: any[];
     value: MetaData_TableType;
     onChange: (reocrd: MetaData_TableType) => void;
-    onDatasourceTypeChange?: (record: MetaData_TableType) => void;
     didUpdate?: Function;
     tableFlat?: boolean;
 }
-declare const SelectTable: ({ data, sourceTable, value, onChange, onDatasourceTypeChange, didUpdate, tableFlat, }: PropsType) => import("react/jsx-runtime").JSX.Element;
+declare const SelectTable: ({ data, sourceTable, value, onChange, didUpdate, tableFlat, }: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default SelectTable;