@gingkoo/pandora-metabase 1.0.121 → 1.0.122

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

@@ -607,10 +607,13 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     return item.type === _types.AtomsTypeEnum.OPERATOR && LOGIC_REQUIRED_OPERATORS.includes(item.val || '');
   };
   var canDeleteItem = function canDeleteItem(item, groupType) {
+    if (groupType === 'caseWhen') {
+      return !isFixedCaseOperator(item);
+    }
     if (groupType === 'logic') {
       return !isRequiredLogicOperator(item);
     }
-    return !isFixedCaseOperator(item);
+    return true;
   };
   var canShowInsertArrows = function canShowInsertArrows(item, groupType) {
     if (groupType === 'caseWhen') {
@@ -619,7 +622,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     if (groupType === 'logic') {
       return !isRequiredLogicOperator(item);
     }
-    return !(item.type === _types.AtomsTypeEnum.OPERATOR && ['case', 'end'].includes(item.val));
+    return true;
   };
   (0, _react.useEffect)(function () {
     var _errorInfo = (0, _utils3.validateExpressionIntegrity)(caseList);
@@ -1207,45 +1210,9 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       };
     }
     if (type === _types.AtomsTypeEnum.OPERATOR) {
-      if (isFixedCaseOperator(v)) {
-        return {
-          raw: true,
-          node: (0, _jsxRuntime.jsx)("span", {
-            className: 'Sqb-CaseKeyword',
-            children: v.val
-          })
-        };
-      }
-      if (groupType === 'logic' && isFixedLogicOperator(v)) {
-        return {
-          raw: true,
-          node: (0, _jsxRuntime.jsx)("span", {
-            className: 'Sqb-CaseKeyword',
-            children: v.val
-          })
-        };
-      }
-      if (groupType === 'logic' && ['and', 'or'].includes(v.val)) {
-        var nextLogicOperator = v.val === 'and' ? 'or' : 'and';
-        return {
-          className: (0, _classnames["default"])({
-            'logic-operator': true,
-            'logic-and': v.val === 'and',
-            'logic-or': v.val === 'or'
-          }),
-          onClick: function onClick() {
-            handleConstant(nextLogicOperator, index);
-          },
-          node: renderTokenContent(v.val)
-        };
-      }
       return {
         className: (0, _classnames["default"])('operator-trigger', {
-          notSelected: !v.val,
-          'flow-operator': ['case', 'when', 'then', 'else', 'end'].includes(v.val),
-          'logic-operator': ['and', 'or'].includes(v.val),
-          'logic-and': v.val === 'and',
-          'logic-or': v.val === 'or'
+          notSelected: !v.val
         }),
         node: (0, _jsxRuntime.jsx)(_pandora.Select, {
           triggerProps: getSelectTriggerProps(),
@@ -1346,9 +1313,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     if (type === _types.AtomsTypeEnum.SELECT) {
       return {
         className: (0, _classnames["default"])('operator-trigger', {
-          notSelected: !v.val,
-          'flow-operator': v.val === 'caseWhen',
-          'logic-operator': v.val === 'andOr'
+          notSelected: !v.val
         }),
         node: (0, _jsxRuntime.jsx)(_pandora.Select, {
           triggerProps: getSelectTriggerProps(),
@@ -1437,7 +1402,6 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     var showCheckbox = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
     var itemContent = itemDom(v, i, groupType);
     var isCompositeAtom = v.type === _types.AtomsTypeEnum.CASE_WHEN || v.type === _types.AtomsTypeEnum.AND_OR;
-    var isPassiveCaseKeyword = groupType === 'caseWhen' && isFixedCaseOperator(v) || groupType === 'logic' && isFixedLogicOperator(v);
     return (0, _jsxRuntime.jsx)(_react["default"].Fragment, {
       children: (0, _jsxRuntime.jsxs)("div", {
         className: (0, _classnames["default"])('Sqb-Filter-item', (0, _defineProperty2["default"])({
@@ -1450,11 +1414,11 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           'group-logic-child': groupType === 'logic'
         }, extraClassName || '', !!extraClassName)),
         onMouseEnter: function onMouseEnter(e) {
-          if (isCheck || isPassiveCaseKeyword) return;
+          if (isCheck) return;
           setInd(i);
         },
         onMouseLeave: function onMouseLeave() {
-          if (isCheck || isPassiveCaseKeyword) return;
+          if (isCheck) return;
           setInd(-1);
         },
         children: [copyDom(i), canShowInsertArrows(v, groupType) && selectOperator({

package/lib/cjs/components/dialog/formula-list/index.less

@@ -26,6 +26,8 @@
   --sqb-item-gap-y: 8px;
   --sqb-arrow-offset-left: -30px;
   --sqb-arrow-offset-right: -20px;
+  --sqb-check-offset: 28px;
+  --sqb-check-inner-offset: 20px;
   position: relative;
   margin: 0 var(--sqb-item-shell-margin-x) var(--sqb-item-gap-y);
   &-content {
@@ -49,15 +51,24 @@
   }
   .openCheck {
     .Sqb-TableName {
-      padding-left: 28px;
+      padding-left: var(--sqb-check-offset);
 
       .item-del {
         display: none;
       }
     }
 
+    .Sqb-TableName.operator-trigger {
+      padding-left: 8px;
+    }
+
+    .Sqb-TableName.operator-trigger > * {
+      padding-left: var(--sqb-check-inner-offset);
+      box-sizing: border-box;
+    }
+
     .formula-node-group {
-      padding-left: 28px;
+      padding-left: var(--sqb-check-offset);
     }
 
     .formula-node-group {
@@ -227,6 +238,33 @@
     border: 0;
     pointer-events: none;
   }
+
+  .Sqb-TableName.operator-trigger {
+    padding: 8px;
+  }
+
+  .Sqb-TableName.operator-trigger > * {
+    display: inline-flex;
+    align-items: center;
+    min-height: 0;
+    width: 100%;
+  }
+
+  .Sqb-TokenContent {
+    display: inline-flex;
+    align-items: center;
+    min-height: 0;
+    width: 100%;
+    padding: 0;
+    line-height: 1.2;
+    box-sizing: border-box;
+  }
+
+  .Sqb-TokenContent .item-del {
+    display: inline-flex;
+    align-items: center;
+    margin-left: 8px;
+  }
 }
 .Sqb-NotebookCell {
   position: relative;
@@ -533,7 +571,7 @@
 
   .Sqb-FormulaGroup-row.row-case {
     margin-bottom: 4px;
-    align-items: flex-start;
+    align-items: center;
     gap: 6px;
   }
 
@@ -543,14 +581,14 @@
     margin-left: 12px;
     padding-left: 10px;
     border-left: 2px solid rgba(80, 158, 227, 0.22);
-    align-items: flex-start;
+    align-items: center;
     gap: 6px;
   }
 
   .Sqb-FormulaGroup-row.row-when {
     display: flex;
     flex-wrap: wrap;
-    align-items: flex-start;
+    align-items: center;
   }
 
   .Sqb-CaseRow-actions {
@@ -626,7 +664,10 @@
 
   .Sqb-FormulaGroup.flow-group .Sqb-CaseKeyword {
     flex: 0 0 auto;
-    line-height: 24px;
+    display: inline-flex;
+    align-items: center;
+    min-height: 28px;
+    line-height: 1;
     padding: 0;
     font-size: 11px;
     font-weight: 500;
@@ -698,10 +739,20 @@
   }
 
   .Sqb-FormulaGroup.logic-group .Sqb-CaseKeyword {
-    line-height: 28px;
+    display: inline-flex;
+    align-items: center;
+    min-height: 28px;
+    line-height: 1;
     padding: 0;
   }
 
+  .Sqb-FormulaGroup.flow-group .Sqb-NestedFormulaList,
+  .Sqb-FormulaGroup.flow-group .Sqb-NestedFormulaList .Sqb-NotebookCell,
+  .Sqb-LogicGroup-content .Sqb-NestedFormulaList,
+  .Sqb-LogicGroup-content .Sqb-NestedFormulaList .Sqb-NotebookCell {
+    vertical-align: middle;
+  }
+
   .Sqb-FormulaGroup.logic-group .Sqb-TableName.logic-operator {
     min-height: 28px;
     padding: 0 10px;

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

@@ -108,6 +108,12 @@ var customTypes = exports.customTypes = [{
 }, {
   value: _types.AtomsTypeEnum.EXPRESSION,
   label: (0, _locale.__)('customColumn.expression')
+}, {
+  value: _types.AtomsTypeEnum.CASE_WHEN,
+  label: (0, _locale.__)('customColumn.caseWhen')
+}, {
+  value: _types.AtomsTypeEnum.AND_OR,
+  label: (0, _locale.__)('customColumn.andOr')
 }, {
   value: _types.AtomsTypeEnum.INPUT_STRING,
   label: (0, _locale.__)('customColumn.input')

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

@@ -90,6 +90,9 @@ var SelectSummarize = function SelectSummarize(_ref) {
     condition = _useState2[0],
     setCondition = _useState2[1];
   var _useState3 = (0, _react.useState)(function () {
+      if (Special.includes(value.condition)) {
+        return [];
+      }
       if (Array.isArray(value.atoms) && value.atoms.length) {
         return value.atoms;
       }
@@ -150,10 +153,25 @@ var SelectSummarize = function SelectSummarize(_ref) {
     }).filter(Boolean).join(' ').replace(/\s+/g, ' ').trim();
   }
   function handleSelect(condition, record) {
+    var isSpecialCondition = Special.includes(condition);
     var quotesPrefix = (0, _locale.__)(localeMap[QuotesMap.get(condition)]);
-    var formulaSummary = getFormulaSummary(record.atoms || atoms);
+    var formulaSummary = isSpecialCondition ? '' : getFormulaSummary(record.atoms || atoms);
     var quotes = [quotesPrefix, formulaSummary].filter(Boolean).join(' ').trim();
-    onChange((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, record), {}, {
+    onChange((0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, isSpecialCondition ? {
+      atoms: undefined,
+      name: '',
+      id: '',
+      realName: '',
+      name_zh: '',
+      table: '',
+      tableId: '',
+      tableUuid: '',
+      alias: '',
+      fieldAlias: '',
+      fieldUuid: '',
+      datasourceId: '',
+      datasourceName: ''
+    } : {}), record), {}, {
       condition: condition,
       quotes: quotes
     }));
@@ -250,6 +268,7 @@ var SelectSummarize = function SelectSummarize(_ref) {
               }),
               onClick: function onClick() {
                 if (~Special.indexOf(v.name)) {
+                  setAtoms([]);
                   handleSelect(v.name, {});
                 } else {
                   var _value$atoms;

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

@@ -33,6 +33,16 @@ var SelectIndex = function SelectIndex(props) {
   var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
   var notGroupSelected = !group.length;
   var summarizeWithoutArgument = ['总行数', '累积行数'];
+  var summarizeWithoutArgumentMessage = '该基础指标已存在';
+  var isNoArgumentMetric = function isNoArgumentMetric(condition) {
+    return !!condition && summarizeWithoutArgument.includes(condition);
+  };
+  var hasDuplicateNoArgumentMetric = function hasDuplicateNoArgumentMetric(nextGroup, condition, excludeIndex) {
+    if (!isNoArgumentMetric(condition)) return false;
+    return nextGroup.some(function (item, itemIndex) {
+      return itemIndex !== excludeIndex && item.condition === condition;
+    });
+  };
   function getColumns() {
     var _getHelper = (0, _utils.getHelper)(store.metaList[groupIndex].list, meta),
       ExistAboveGroupBy = _getHelper.ExistAboveGroupBy,
@@ -147,6 +157,10 @@ var SelectIndex = function SelectIndex(props) {
         value: value,
         ignoreGroupByType: store.ignoreGroupByType,
         onChange: function onChange(data) {
+          if (hasDuplicateNoArgumentMetric(newMeta[index].group, data.condition, i)) {
+            _pandora.Toast.warning(summarizeWithoutArgumentMessage);
+            return;
+          }
           newMeta[index].group.splice(i, 1, normalizeGroupRecord(data));
           newMeta[index].group = newMeta[index].group.map(function (v) {
             var _summarizeToSql = (0, _helper.summarizeToSql)(newMeta[index].group, v),
@@ -195,6 +209,10 @@ var SelectIndex = function SelectIndex(props) {
         value: value,
         ignoreGroupByType: store.ignoreGroupByType,
         onChange: function onChange(data) {
+          if (hasDuplicateNoArgumentMetric(newMeta[index].group, data.condition)) {
+            _pandora.Toast.warning(summarizeWithoutArgumentMessage);
+            return;
+          }
           newMeta[index].group.push(normalizeGroupRecord(data));
           newMeta[index].group = newMeta[index].group.map(function (v) {
             var _summarizeToSql2 = (0, _helper.summarizeToSql)(newMeta[index].group, v),
@@ -356,8 +374,8 @@ var SelectIndex = function SelectIndex(props) {
   };
   var getAtomsValue = function getAtomsValue(record) {
     var _record$atoms;
-    if ((_record$atoms = record.atoms) !== null && _record$atoms !== void 0 && _record$atoms.length) return record.atoms;
     if (!isFormulaMetric(record)) return [];
+    if ((_record$atoms = record.atoms) !== null && _record$atoms !== void 0 && _record$atoms.length) return record.atoms;
     var field = getField(record);
     return field.fieldName ? [field] : [];
   };

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

@@ -598,10 +598,13 @@ var FormulaList = forwardRef(function (props, ref) {
     return item.type === AtomsTypeEnum.OPERATOR && LOGIC_REQUIRED_OPERATORS.includes(item.val || '');
   };
   var canDeleteItem = function canDeleteItem(item, groupType) {
+    if (groupType === 'caseWhen') {
+      return !isFixedCaseOperator(item);
+    }
     if (groupType === 'logic') {
       return !isRequiredLogicOperator(item);
     }
-    return !isFixedCaseOperator(item);
+    return true;
   };
   var canShowInsertArrows = function canShowInsertArrows(item, groupType) {
     if (groupType === 'caseWhen') {
@@ -610,7 +613,7 @@ var FormulaList = forwardRef(function (props, ref) {
     if (groupType === 'logic') {
       return !isRequiredLogicOperator(item);
     }
-    return !(item.type === AtomsTypeEnum.OPERATOR && ['case', 'end'].includes(item.val));
+    return true;
   };
   useEffect(function () {
     var _errorInfo = validateExpressionIntegrity(caseList);
@@ -1198,45 +1201,9 @@ var FormulaList = forwardRef(function (props, ref) {
       };
     }
     if (type === AtomsTypeEnum.OPERATOR) {
-      if (isFixedCaseOperator(v)) {
-        return {
-          raw: true,
-          node: _jsx("span", {
-            className: 'Sqb-CaseKeyword',
-            children: v.val
-          })
-        };
-      }
-      if (groupType === 'logic' && isFixedLogicOperator(v)) {
-        return {
-          raw: true,
-          node: _jsx("span", {
-            className: 'Sqb-CaseKeyword',
-            children: v.val
-          })
-        };
-      }
-      if (groupType === 'logic' && ['and', 'or'].includes(v.val)) {
-        var nextLogicOperator = v.val === 'and' ? 'or' : 'and';
-        return {
-          className: cx({
-            'logic-operator': true,
-            'logic-and': v.val === 'and',
-            'logic-or': v.val === 'or'
-          }),
-          onClick: function onClick() {
-            handleConstant(nextLogicOperator, index);
-          },
-          node: renderTokenContent(v.val)
-        };
-      }
       return {
         className: cx('operator-trigger', {
-          notSelected: !v.val,
-          'flow-operator': ['case', 'when', 'then', 'else', 'end'].includes(v.val),
-          'logic-operator': ['and', 'or'].includes(v.val),
-          'logic-and': v.val === 'and',
-          'logic-or': v.val === 'or'
+          notSelected: !v.val
         }),
         node: _jsx(Select, {
           triggerProps: getSelectTriggerProps(),
@@ -1337,9 +1304,7 @@ var FormulaList = forwardRef(function (props, ref) {
     if (type === AtomsTypeEnum.SELECT) {
       return {
         className: cx('operator-trigger', {
-          notSelected: !v.val,
-          'flow-operator': v.val === 'caseWhen',
-          'logic-operator': v.val === 'andOr'
+          notSelected: !v.val
         }),
         node: _jsx(Select, {
           triggerProps: getSelectTriggerProps(),
@@ -1428,7 +1393,6 @@ var FormulaList = forwardRef(function (props, ref) {
     var showCheckbox = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
     var itemContent = itemDom(v, i, groupType);
     var isCompositeAtom = v.type === AtomsTypeEnum.CASE_WHEN || v.type === AtomsTypeEnum.AND_OR;
-    var isPassiveCaseKeyword = groupType === 'caseWhen' && isFixedCaseOperator(v) || groupType === 'logic' && isFixedLogicOperator(v);
     return _jsx(React.Fragment, {
       children: _jsxs("div", {
         className: cx('Sqb-Filter-item', _defineProperty({
@@ -1441,11 +1405,11 @@ var FormulaList = forwardRef(function (props, ref) {
           'group-logic-child': groupType === 'logic'
         }, extraClassName || '', !!extraClassName)),
         onMouseEnter: function onMouseEnter(e) {
-          if (isCheck || isPassiveCaseKeyword) return;
+          if (isCheck) return;
           setInd(i);
         },
         onMouseLeave: function onMouseLeave() {
-          if (isCheck || isPassiveCaseKeyword) return;
+          if (isCheck) return;
           setInd(-1);
         },
         children: [copyDom(i), canShowInsertArrows(v, groupType) && selectOperator({

package/lib/es/components/dialog/formula-list/index.less

@@ -26,6 +26,8 @@
   --sqb-item-gap-y: 8px;
   --sqb-arrow-offset-left: -30px;
   --sqb-arrow-offset-right: -20px;
+  --sqb-check-offset: 28px;
+  --sqb-check-inner-offset: 20px;
   position: relative;
   margin: 0 var(--sqb-item-shell-margin-x) var(--sqb-item-gap-y);
   &-content {
@@ -49,15 +51,24 @@
   }
   .openCheck {
     .Sqb-TableName {
-      padding-left: 28px;
+      padding-left: var(--sqb-check-offset);
 
       .item-del {
         display: none;
       }
     }
 
+    .Sqb-TableName.operator-trigger {
+      padding-left: 8px;
+    }
+
+    .Sqb-TableName.operator-trigger > * {
+      padding-left: var(--sqb-check-inner-offset);
+      box-sizing: border-box;
+    }
+
     .formula-node-group {
-      padding-left: 28px;
+      padding-left: var(--sqb-check-offset);
     }
 
     .formula-node-group {
@@ -227,6 +238,33 @@
     border: 0;
     pointer-events: none;
   }
+
+  .Sqb-TableName.operator-trigger {
+    padding: 8px;
+  }
+
+  .Sqb-TableName.operator-trigger > * {
+    display: inline-flex;
+    align-items: center;
+    min-height: 0;
+    width: 100%;
+  }
+
+  .Sqb-TokenContent {
+    display: inline-flex;
+    align-items: center;
+    min-height: 0;
+    width: 100%;
+    padding: 0;
+    line-height: 1.2;
+    box-sizing: border-box;
+  }
+
+  .Sqb-TokenContent .item-del {
+    display: inline-flex;
+    align-items: center;
+    margin-left: 8px;
+  }
 }
 .Sqb-NotebookCell {
   position: relative;
@@ -533,7 +571,7 @@
 
   .Sqb-FormulaGroup-row.row-case {
     margin-bottom: 4px;
-    align-items: flex-start;
+    align-items: center;
     gap: 6px;
   }
 
@@ -543,14 +581,14 @@
     margin-left: 12px;
     padding-left: 10px;
     border-left: 2px solid rgba(80, 158, 227, 0.22);
-    align-items: flex-start;
+    align-items: center;
     gap: 6px;
   }
 
   .Sqb-FormulaGroup-row.row-when {
     display: flex;
     flex-wrap: wrap;
-    align-items: flex-start;
+    align-items: center;
   }
 
   .Sqb-CaseRow-actions {
@@ -626,7 +664,10 @@
 
   .Sqb-FormulaGroup.flow-group .Sqb-CaseKeyword {
     flex: 0 0 auto;
-    line-height: 24px;
+    display: inline-flex;
+    align-items: center;
+    min-height: 28px;
+    line-height: 1;
     padding: 0;
     font-size: 11px;
     font-weight: 500;
@@ -698,10 +739,20 @@
   }
 
   .Sqb-FormulaGroup.logic-group .Sqb-CaseKeyword {
-    line-height: 28px;
+    display: inline-flex;
+    align-items: center;
+    min-height: 28px;
+    line-height: 1;
     padding: 0;
   }
 
+  .Sqb-FormulaGroup.flow-group .Sqb-NestedFormulaList,
+  .Sqb-FormulaGroup.flow-group .Sqb-NestedFormulaList .Sqb-NotebookCell,
+  .Sqb-LogicGroup-content .Sqb-NestedFormulaList,
+  .Sqb-LogicGroup-content .Sqb-NestedFormulaList .Sqb-NotebookCell {
+    vertical-align: middle;
+  }
+
   .Sqb-FormulaGroup.logic-group .Sqb-TableName.logic-operator {
     min-height: 28px;
     padding: 0 10px;

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

@@ -100,6 +100,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')

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

@@ -83,6 +83,9 @@ var SelectSummarize = function SelectSummarize(_ref) {
     condition = _useState2[0],
     setCondition = _useState2[1];
   var _useState3 = useState(function () {
+      if (Special.includes(value.condition)) {
+        return [];
+      }
       if (Array.isArray(value.atoms) && value.atoms.length) {
         return value.atoms;
       }
@@ -143,10 +146,25 @@ var SelectSummarize = function SelectSummarize(_ref) {
     }).filter(Boolean).join(' ').replace(/\s+/g, ' ').trim();
   }
   function handleSelect(condition, record) {
+    var isSpecialCondition = Special.includes(condition);
     var quotesPrefix = __(localeMap[QuotesMap.get(condition)]);
-    var formulaSummary = getFormulaSummary(record.atoms || atoms);
+    var formulaSummary = isSpecialCondition ? '' : getFormulaSummary(record.atoms || atoms);
     var quotes = [quotesPrefix, formulaSummary].filter(Boolean).join(' ').trim();
-    onChange(_objectSpread(_objectSpread({}, record), {}, {
+    onChange(_objectSpread(_objectSpread(_objectSpread({}, isSpecialCondition ? {
+      atoms: undefined,
+      name: '',
+      id: '',
+      realName: '',
+      name_zh: '',
+      table: '',
+      tableId: '',
+      tableUuid: '',
+      alias: '',
+      fieldAlias: '',
+      fieldUuid: '',
+      datasourceId: '',
+      datasourceName: ''
+    } : {}), record), {}, {
       condition: condition,
       quotes: quotes
     }));
@@ -243,6 +261,7 @@ var SelectSummarize = function SelectSummarize(_ref) {
               }),
               onClick: function onClick() {
                 if (~Special.indexOf(v.name)) {
+                  setAtoms([]);
                   handleSelect(v.name, {});
                 } else {
                   var _value$atoms;

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

@@ -27,6 +27,16 @@ var SelectIndex = function SelectIndex(props) {
   var index = findIndex(store.metaList[groupIndex].list, meta);
   var notGroupSelected = !group.length;
   var summarizeWithoutArgument = ['总行数', '累积行数'];
+  var summarizeWithoutArgumentMessage = '该基础指标已存在';
+  var isNoArgumentMetric = function isNoArgumentMetric(condition) {
+    return !!condition && summarizeWithoutArgument.includes(condition);
+  };
+  var hasDuplicateNoArgumentMetric = function hasDuplicateNoArgumentMetric(nextGroup, condition, excludeIndex) {
+    if (!isNoArgumentMetric(condition)) return false;
+    return nextGroup.some(function (item, itemIndex) {
+      return itemIndex !== excludeIndex && item.condition === condition;
+    });
+  };
   function getColumns() {
     var _getHelper = getHelper(store.metaList[groupIndex].list, meta),
       ExistAboveGroupBy = _getHelper.ExistAboveGroupBy,
@@ -141,6 +151,10 @@ var SelectIndex = function SelectIndex(props) {
         value: value,
         ignoreGroupByType: store.ignoreGroupByType,
         onChange: function onChange(data) {
+          if (hasDuplicateNoArgumentMetric(newMeta[index].group, data.condition, i)) {
+            Toast.warning(summarizeWithoutArgumentMessage);
+            return;
+          }
           newMeta[index].group.splice(i, 1, normalizeGroupRecord(data));
           newMeta[index].group = newMeta[index].group.map(function (v) {
             var _summarizeToSql = summarizeToSql(newMeta[index].group, v),
@@ -189,6 +203,10 @@ var SelectIndex = function SelectIndex(props) {
         value: value,
         ignoreGroupByType: store.ignoreGroupByType,
         onChange: function onChange(data) {
+          if (hasDuplicateNoArgumentMetric(newMeta[index].group, data.condition)) {
+            Toast.warning(summarizeWithoutArgumentMessage);
+            return;
+          }
           newMeta[index].group.push(normalizeGroupRecord(data));
           newMeta[index].group = newMeta[index].group.map(function (v) {
             var _summarizeToSql2 = summarizeToSql(newMeta[index].group, v),
@@ -350,8 +368,8 @@ var SelectIndex = function SelectIndex(props) {
   };
   var getAtomsValue = function getAtomsValue(record) {
     var _record$atoms;
-    if ((_record$atoms = record.atoms) !== null && _record$atoms !== void 0 && _record$atoms.length) return record.atoms;
     if (!isFormulaMetric(record)) return [];
+    if ((_record$atoms = record.atoms) !== null && _record$atoms !== void 0 && _record$atoms.length) return record.atoms;
     var field = getField(record);
     return field.fieldName ? [field] : [];
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.121",
+  "version": "1.0.122",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",