@gingkoo/pandora-metabase 1.0.126 → 1.0.128

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

@@ -67,6 +67,7 @@ export var insertTemplateAt = function insertTemplateAt(oldType, type, list, ind
       tableUuid: '',
       datasourceName: '',
       datasourceId: '',
+      datasourceType: '',
       type: AtomsTypeEnum.FIELD
     }, {
       val: 'ORDER BY',
@@ -84,6 +85,7 @@ export var insertTemplateAt = function insertTemplateAt(oldType, type, list, ind
       tableUuid: '',
       datasourceName: '',
       datasourceId: '',
+      datasourceType: '',
       type: AtomsTypeEnum.FIELD
     }, {
       val: ')',
@@ -100,6 +102,12 @@ export var customTypes = [{
 }, {
   value: AtomsTypeEnum.EXPRESSION,
   label: __('customColumn.expression')
+}, {
+  value: AtomsTypeEnum.CASE_WHEN,
+  label: __('customColumn.caseWhen')
+}, {
+  value: AtomsTypeEnum.AND_OR,
+  label: __('customColumn.andOr')
 }, {
   value: AtomsTypeEnum.INPUT_STRING,
   label: __('customColumn.input')
@@ -143,6 +151,7 @@ export var getTemplateItem = function getTemplateItem(type, item) {
       tableUuid: '',
       datasourceName: '',
       datasourceId: '',
+      datasourceType: '',
       type: AtomsTypeEnum.FIELD
     };
   } else if (type === AtomsTypeEnum.EXPRESSION || type === AtomsTypeEnum.JOIN_DEFAULT) {
@@ -189,25 +198,29 @@ export var getTemplateItem = function getTemplateItem(type, item) {
     };
   } else if (type === AtomsTypeEnum.CASE_WHEN) {
     return {
-      caseValue: [],
-      branches: [{
-        when: [{
+      caseAtoms: [],
+      whenClauses: [{
+        whenAtoms: [{
           val: '',
           type: AtomsTypeEnum.UNKNOWN
         }],
-        then: [{
+        thenAtoms: [{
           val: '',
           type: AtomsTypeEnum.UNKNOWN
         }]
       }],
-      elseValue: [],
+      elseAtoms: [],
       quotes: '',
       type: type
     };
   } else if (type === AtomsTypeEnum.AND_OR) {
     return {
       operator: 'and',
-      list: [{
+      leftAtoms: [{
+        val: '',
+        type: AtomsTypeEnum.UNKNOWN
+      }],
+      rightAtoms: [{
         val: '',
         type: AtomsTypeEnum.UNKNOWN
       }],
@@ -256,11 +269,16 @@ var _isOk = function isOk(rhsVal) {
     } else if (v.type === AtomsTypeEnum.COLLECTION) {
       return _isOk(v.list || []);
     } else if (v.type === AtomsTypeEnum.CASE_WHEN) {
-      return (v.branches || []).length > 0 && (v.branches || []).every(function (branch) {
-        return _isOk(branch.when || []) && _isOk(branch.then || []);
-      }) && _isOk(v.caseValue || []) && _isOk(v.elseValue || []);
+      return (v.whenClauses || []).length > 0 && (v.whenClauses || []).every(function (clause) {
+        return _isOk(clause.whenAtoms || []) && _isOk(clause.thenAtoms || []);
+      }) && _isOk(v.caseAtoms || []) && _isOk(v.elseAtoms || []);
     } else if (v.type === AtomsTypeEnum.AND_OR) {
-      return Boolean(v.operator) && _isOk(v.list || []);
+      var hasBinarySides = Array.isArray(v.leftAtoms) || Array.isArray(v.rightAtoms);
+      if (hasBinarySides) {
+        var _v$leftAtoms, _v$rightAtoms;
+        return Boolean(v.operator) && Boolean((_v$leftAtoms = v.leftAtoms) === null || _v$leftAtoms === void 0 ? void 0 : _v$leftAtoms.length) && Boolean((_v$rightAtoms = v.rightAtoms) === null || _v$rightAtoms === void 0 ? void 0 : _v$rightAtoms.length) && _isOk(v.leftAtoms || []) && _isOk(v.rightAtoms || []);
+      }
+      return Boolean(v.operator) && _isOk(v.atoms || []);
     } else if (v.type === AtomsTypeEnum.FORMULA) {
       if (!v.quotes) {
         return false;
@@ -392,33 +410,46 @@ export function validateExpressionIntegrity(list) {
             error: 'AND / OR 结构缺少操作符'
           };
         }
-        var nestedError = validateExpressionIntegrity(item.list || []);
+        var hasBinarySides = Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms);
+        if (hasBinarySides) {
+          var leftError = validateExpressionIntegrity(item.leftAtoms || []);
+          if (leftError.isError) {
+            return leftError;
+          }
+          var rightError = validateExpressionIntegrity(item.rightAtoms || []);
+          if (rightError.isError) {
+            return rightError;
+          }
+          continue;
+        }
+        var nestedError = validateExpressionIntegrity(item.atoms || []);
         if (nestedError.isError) {
           return nestedError;
         }
       }
       if (item.type === AtomsTypeEnum.CASE_WHEN) {
-        if ((item.branches || []).length < 1) {
+        var whenClauses = item.whenClauses || [];
+        if (whenClauses.length < 1) {
           return {
             isError: true,
             error: 'CASE WHEN 至少需要一个 when / then 分支',
             isCase: true
           };
         }
-        var caseValueError = validateExpressionIntegrity(item.caseValue || []);
-        if (caseValueError.isError) {
-          return caseValueError;
+        var caseAtomsError = validateExpressionIntegrity(item.caseAtoms || []);
+        if (caseAtomsError.isError) {
+          return caseAtomsError;
         }
-        var _iterator3 = _createForOfIteratorHelper(item.branches || []),
+        var _iterator3 = _createForOfIteratorHelper(whenClauses),
           _step3;
         try {
           for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
             var branch = _step3.value;
-            var whenError = validateExpressionIntegrity(branch.when || []);
+            var whenError = validateExpressionIntegrity(branch.whenAtoms || []);
             if (whenError.isError) {
               return whenError;
             }
-            var thenError = validateExpressionIntegrity(branch.then || []);
+            var thenError = validateExpressionIntegrity(branch.thenAtoms || []);
             if (thenError.isError) {
               return thenError;
             }
@@ -428,7 +459,7 @@ export function validateExpressionIntegrity(list) {
         } finally {
           _iterator3.f();
         }
-        var elseError = validateExpressionIntegrity(item.elseValue || []);
+        var elseError = validateExpressionIntegrity(item.elseAtoms || []);
         if (elseError.isError) {
           return elseError;
         }

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

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

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

@@ -80,9 +80,22 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   useEffect(function () {
     setValue(_value);
   }, [_value]);
+  var getSelectedFieldKey = function getSelectedFieldKey(field) {
+    if (!field) return '';
+    if (field.tableId === SummarizeAlias) {
+      return field.fieldAlias || '';
+    }
+    return "".concat(field.fieldId).concat(field.fieldAlias || '');
+  };
+  var getColumnKey = function getColumnKey(column, isSummarizeColumn) {
+    if (isSummarizeColumn) {
+      return column.fieldAlias || column.name || '';
+    }
+    return "".concat(column.id || column.name).concat(column.fieldAlias || '');
+  };
   var isActive = function isActive(id_alias) {
     return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
-      return v.fieldId + (v.fieldAlias || '') === id_alias;
+      return getSelectedFieldKey(v) === id_alias;
     }).length) > 0;
   };
   useEffect(function () {
@@ -123,11 +136,10 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   }
   var getQuotes = function getQuotes(items) {
     return items.map(function (v) {
-      return v.fieldName;
+      return v.tableId === SummarizeAlias ? v.fieldAlias : v.fieldName;
     }).join(' || ');
   };
   var changeValue = function changeValue(tableUuid, val) {
-    var _value$filter;
     if (!multiple) {
       var _data = val ? [val] : [];
       setValue(_data);
@@ -135,10 +147,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       onSelect === null || onSelect === void 0 || onSelect(_data, getQuotes(_data));
       return;
     }
-    var isHas = (value === null || value === void 0 || (_value$filter = value.filter(function (v) {
-      return v.fieldId === (val === null || val === void 0 ? void 0 : val.fieldId);
-    })) === null || _value$filter === void 0 ? void 0 : _value$filter.length) > 0;
-    var _value = value;
+    var selectedKey = getSelectedFieldKey(val);
+    var isHas = (value === null || value === void 0 ? void 0 : value.filter(function (v) {
+      return getSelectedFieldKey(v) === selectedKey;
+    }).length) > 0;
+    var _value = value.slice();
     if (tableUuid != curTable) {
       _value = [];
     }
@@ -146,7 +159,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       _value.push(val);
     } else {
       _value = _value.filter(function (v) {
-        return v.fieldId != (val === null || val === void 0 ? void 0 : val.fieldId);
+        return getSelectedFieldKey(v) !== selectedKey;
       });
     }
     var curTableColumn = data.filter(function (v) {
@@ -156,6 +169,9 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     });
     _value = _value.filter(function (item2) {
       return curTableColumn.some(function (item1) {
+        if (item2.tableId === SummarizeAlias) {
+          return (item1.fieldAlias || item1.name) === item2.fieldAlias;
+        }
         return item1.name === item2.fieldName;
       });
     });
@@ -225,12 +241,14 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
             _tableItem$datasource2 = tableItem.datasourceId,
             datasourceId = _tableItem$datasource2 === void 0 ? '' : _tableItem$datasource2,
             _tableItem$tableUuid = tableItem.tableUuid,
-            tableUuid = _tableItem$tableUuid === void 0 ? '' : _tableItem$tableUuid;
+            tableUuid = _tableItem$tableUuid === void 0 ? '' : _tableItem$tableUuid,
+            _tableItem$id = tableItem.id,
+            tableId = _tableItem$id === void 0 ? '' : _tableItem$id;
           var isMultiple = tableList.length > 1;
           if (!isMultiple) {
             open = true;
           }
-          var isSummarize = tableAlias === SummarizeAlias;
+          var isSummarize = tableId === SummarizeAlias;
           return _jsxs("div", {
             children: [!isSummarize && _jsx("div", {
               className: cx("Sqb-List-section"),
@@ -254,7 +272,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   } else {
                     setTableList(newTables.map(function (v) {
                       return _objectSpread(_objectSpread({}, v), {}, {
-                        open: tableUuid === v.tableUuid || v.alias === SummarizeAlias
+                        open: tableUuid === v.tableUuid || v.id === SummarizeAlias
                       });
                     }));
                   }
@@ -302,10 +320,12 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                 var special_type = v.special_type,
                   _v$database_type = v.database_type,
                   database_type = _v$database_type === void 0 ? '' : _v$database_type,
-                  name = v.name,
-                  _v$realName = v.realName,
-                  realName = _v$realName === void 0 ? '' : _v$realName,
-                  fieldId = v.id;
+                  name = v.name;
+                var columnKey = getColumnKey(v, isSummarize);
+                var fieldAlias = isSummarize ? v.fieldAlias || name || '' : v.fieldAlias || '';
+                var fieldName = isSummarize ? '' : name || '';
+                var fieldId = isSummarize ? '' : v.id || name || '';
+                var fieldNameZh = isSummarize ? '' : v.name_zh || '';
                 var groupe = SQL_GROUP_TYPE.STRING;
                 if (~NUMBER_GROUP.indexOf(database_type)) {
                   groupe = SQL_GROUP_TYPE.NUMBER;
@@ -317,22 +337,22 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   className: cx("Sqb-List-section"),
                   children: _jsx("div", {
                     className: cx("Sqb-List-item mx-2", {
-                      active: isActive((v.id || v.name) + (v.fieldAlias || ''))
+                      active: isActive(columnKey)
                     }),
                     onClick: function onClick() {
-                      if (isSummarize) {}
                       changeValue(tableUuid, {
                         tableName: tableItem.name || '',
-                        tableId: tableItem.id || '',
+                        tableId: tableId || '',
                         tableNameZh: tableItem.name_zh || '',
                         tableAlias: tableItem.alias || '',
                         tableUuid: tableItem.tableUuid || '',
                         datasourceName: tableItem.datasourceName || '',
                         datasourceId: tableItem.datasourceId || '',
-                        fieldName: v.name || '',
-                        fieldId: v.id || v.name || '',
-                        fieldNameZh: v.name_zh || '',
-                        fieldAlias: v.fieldAlias || '',
+                        datasourceType: tableItem.datasourceType || '',
+                        fieldName: fieldName,
+                        fieldId: fieldId,
+                        fieldNameZh: fieldNameZh,
+                        fieldAlias: fieldAlias,
                         fieldUuid: v.fieldUuid || '',
                         type: AtomsTypeEnum.FIELD
                       });

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

@@ -103,6 +103,7 @@ var SelectSummarize = function SelectSummarize(_ref) {
           tableUuid: value.tableUuid || '',
           datasourceName: value.datasourceName || '',
           datasourceId: value.datasourceId || '',
+          datasourceType: value.datasourceType || '',
           type: AtomsTypeEnum.FIELD
         };
         return [fieldAtom];
@@ -133,7 +134,13 @@ var SelectSummarize = function SelectSummarize(_ref) {
         return [lhs, item.condition, rhs].filter(Boolean).join(' ').trim();
       }
       if (item.type === AtomsTypeEnum.AND_OR) {
-        return "".concat(item.operator || 'and', " ( ").concat(getFormulaSummary(item.list || []), " )").replace(/\s+/g, ' ').trim();
+        var hasBinarySides = Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms);
+        if (hasBinarySides) {
+          var leftText = getFormulaSummary(item.leftAtoms || []);
+          var rightText = getFormulaSummary(item.rightAtoms || []);
+          return "( ".concat(leftText, " ").concat(item.operator || 'and', " ").concat(rightText, " )").replace(/\s+/g, ' ').trim();
+        }
+        return "".concat(item.operator || 'and', " ( ").concat(getFormulaSummary(item.atoms || []), " )").replace(/\s+/g, ' ').trim();
       }
       if (item.type === AtomsTypeEnum.CASE_WHEN) {
         return item.quotes || 'case when';
@@ -163,7 +170,8 @@ var SelectSummarize = function SelectSummarize(_ref) {
       fieldAlias: '',
       fieldUuid: '',
       datasourceId: '',
-      datasourceName: ''
+      datasourceName: '',
+      datasourceType: ''
     } : {}), record), {}, {
       condition: condition,
       quotes: quotes

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

@@ -6,8 +6,9 @@ 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, didUpdate, tableFlat, }: PropsType) => import("react/jsx-runtime").JSX.Element;
+declare const SelectTable: ({ data, sourceTable, value, onChange, onDatasourceTypeChange, didUpdate, tableFlat, }: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default SelectTable;