@gingkoo/pandora-metabase 1.0.77 → 1.0.79

package/lib/cjs/components/dialog/custom-editor/index.js

@@ -17,6 +17,7 @@ var _locale = require("../../../locale");
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _types = require("../../../store/types");
 var _pandora = require("@gingkoo/pandora");
+var _utils2 = require("../../../utils");
 var _templateObject; // import { getTemplate } from './utils';
 // import { OptionsTypeEnum, customTypes, otherList, operatorList, functionList } from './enum';
 var VisualBox = _styledComponents["default"].div.attrs({
@@ -48,6 +49,10 @@ var CaseEditor = function CaseEditor(props) {
   };
   // 确定
   var _onOk = function _onOk() {
+    if (!(0, _utils2.isValidSQLAlias)(name)) {
+      _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.nameForRules'));
+      return false;
+    }
     typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk({
       name: name,
       formulaList: caseList

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

@@ -38,6 +38,12 @@ var insertTemplateAt = exports.insertTemplateAt = function insertTemplateAt(oldT
     }, {
       val: '',
       type: _types.AtomsTypeEnum.UNKNOWN
+    }, {
+      val: 'else',
+      type: _types.AtomsTypeEnum.OPERATOR
+    }, {
+      val: '',
+      type: _types.AtomsTypeEnum.UNKNOWN
     }, {
       val: 'end',
       type: _types.AtomsTypeEnum.OPERATOR
@@ -326,30 +332,45 @@ function validateParentheses(list) {
 // CASE 语句不完整（缺少 END 或 WHEN/THEN）
 function validateCaseStructure(list) {
   for (var i = 0; i < list.length; i++) {
-    if (list[i].type === _types.AtomsTypeEnum.OPERATOR && list[i].val === 'case') {
-      var foundWhen = false;
-      var foundThen = false;
-      var endFound = false;
-      var depth = 1; // 支持简单嵌套
+    var item = list[i];
+    if (item.type === _types.AtomsTypeEnum.OPERATOR && item.val === 'case') {
+      var depth = 1;
+      var hasValidWhenThen = false;
+      var lastWasWhen = false; // 用于确保 then 前是 when
       for (var j = i + 1; j < list.length; j++) {
-        var item = list[j];
-        if (item.type !== _types.AtomsTypeEnum.OPERATOR) continue;
-        if (item.val === 'case') {
+        var token = list[j];
+        if (token.type !== _types.AtomsTypeEnum.OPERATOR) continue;
+        var val = token.val;
+        if (val === 'case') {
           depth++;
-        } else if (item.val === 'end') {
+        } else if (val === 'end') {
+          depth--;
           if (depth === 0) {
-            endFound = true;
-            break;
+            // 当前 case 块结束
+            if (!hasValidWhenThen) {
+              return false; // 至少需要一个 when-then
+            }
+            break; // 成功找到匹配的 end
+          }
+          // 如果 depth < 0，说明 end 多余，但这里我们只关心当前 case，可忽略或报错
+        } else if (val === 'when') {
+          if (depth === 1) {
+            lastWasWhen = true;
+          }
+        } else if (val === 'then') {
+          if (depth === 1) {
+            if (!lastWasWhen) {
+              return false; // then 前没有 when
+            }
+            hasValidWhenThen = true;
+            lastWasWhen = false; // then 消费掉 when
           }
-        } else if (item.val === 'when' && depth === 1) {
-          foundWhen = true;
-        } else if (item.val === 'then' && depth === 1) {
-          if (!foundWhen) return false; // then 前无 when
-          foundThen = true;
         }
+        // 注意：其他操作符（如 else）可在此扩展
       }
-      if (!endFound || !foundThen) {
-        return false; // 缺少 end 或 when-then 对
+      // 如果循环结束还没找到匹配的 end（即 depth > 0）
+      if (depth > 0) {
+        return false; // 缺少 end
       }
     }
   }

package/lib/cjs/locale/en.js

@@ -56,6 +56,7 @@ var _default = exports["default"] = (0, _index.register)('en', {
   'SqlQueryBuilder.selectColumnAll': 'select all',
   'SqlQueryBuilder.alias': 'alias',
   'SqlQueryBuilder.aliasForRules': 'The alias only supports a combination of letters, numbers, and underscores. It must start with a letter and cannot exceed 30 bytes',
+  'SqlQueryBuilder.nameForRules': 'The name only supports a combination of letters, numbers, and underscores. It must start with a letter and cannot exceed 30 bytes',
   'SqlQueryBuilder.pleaseSelectTable': 'The currently dependent table is empty or has been deleted',
   'SqlQueryBuilder.repeatAlias': 'If there are duplicate names, please modify them',
   'customColumn.operator': 'operator',
@@ -167,8 +168,8 @@ var _default = exports["default"] = (0, _index.register)('en', {
   'metabase.nextOk': 'ok',
   'metabase.verify': 'The table has been modified. Please select again',
   'metabase.validationFailed': 'Validation failed. Do you still want to save?',
-  'metabase.validationFilter': 'The filter configuration is incorrect due to a missing closing parenthesis. Saving is prohibited!',
-  'metabase.validationFormula': 'The formula configuration is incorrect due to a missing closing parenthesis. Saving is prohibited!',
+  'metabase.validationFilter': 'The filter configuration is incorrect. Saving is prohibited!',
+  'metabase.validationFormula': 'The formula configuration is incorrect. Saving is prohibited!',
   'metabase.prompt': 'Prompt',
   'metabase.copy': 'Copy',
   'metabase.copySuccess': 'Copy success',

package/lib/cjs/locale/zh.js

@@ -52,6 +52,7 @@ var _default = exports["default"] = (0, _index.register)('zh', {
   'SqlQueryBuilder.selectColumnAll': '全选',
   'SqlQueryBuilder.alias': '别名',
   'SqlQueryBuilder.aliasForRules': '别名只支持字母 + 数字 + 下划线组合，必须是字母开头，且不能超过30个字节',
+  'SqlQueryBuilder.nameForRules': '名字只支持字母 + 数字 + 下划线组合，必须是字母开头，且不能超过30个字节',
   'SqlQueryBuilder.pleaseSelectTable': '当前依赖的表为空或被删除',
   'SqlQueryBuilder.repeatAlias': '有重名请修改',
   'customColumn.operator': '操作符',
@@ -167,8 +168,8 @@ var _default = exports["default"] = (0, _index.register)('zh', {
   'metabase.nextOk': '确定',
   'metabase.verify': '表已修改，请重新选择',
   'metabase.validationFailed': '校验未通过，是否依然保存？',
-  'metabase.validationFilter': '过滤器配置有误，缺少反括号，禁止保存！',
-  'metabase.validationFormula': '公式配置有误，缺少反括号，禁止保存！',
+  'metabase.validationFilter': '过滤器配置有误，禁止保存！',
+  'metabase.validationFormula': '公式配置有误，禁止保存！',
   'metabase.prompt': '提示',
   'metabase.copy': '复制',
   'metabase.copySuccess': '复制成功',

package/lib/es/components/dialog/custom-editor/index.js

@@ -12,7 +12,8 @@ import { __ } from '../../../locale';
 import Styled from 'styled-components';
 // import { OptionsTypeEnum, customTypes, otherList, operatorList, functionList } from './enum';
 import { FormulaTypeEnum } from '../../../store/types';
-import { Input } from '@gingkoo/pandora';
+import { Input, Toast } from '@gingkoo/pandora';
+import { isValidSQLAlias } from '../../../utils';
 var VisualBox = Styled.div.attrs({
   className: 'visual-box'
 })(_templateObject || (_templateObject = _taggedTemplateLiteral([""])));
@@ -42,6 +43,10 @@ var CaseEditor = function CaseEditor(props) {
   };
   // 确定
   var _onOk = function _onOk() {
+    if (!isValidSQLAlias(name)) {
+      Toast.warning(__('SqlQueryBuilder.nameForRules'));
+      return false;
+    }
     typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk({
       name: name,
       formulaList: caseList

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

@@ -30,6 +30,12 @@ export var insertTemplateAt = function insertTemplateAt(oldType, type, list, ind
     }, {
       val: '',
       type: AtomsTypeEnum.UNKNOWN
+    }, {
+      val: 'else',
+      type: AtomsTypeEnum.OPERATOR
+    }, {
+      val: '',
+      type: AtomsTypeEnum.UNKNOWN
     }, {
       val: 'end',
       type: AtomsTypeEnum.OPERATOR
@@ -319,30 +325,45 @@ function validateParentheses(list) {
 // CASE 语句不完整（缺少 END 或 WHEN/THEN）
 function validateCaseStructure(list) {
   for (var i = 0; i < list.length; i++) {
-    if (list[i].type === AtomsTypeEnum.OPERATOR && list[i].val === 'case') {
-      var foundWhen = false;
-      var foundThen = false;
-      var endFound = false;
-      var depth = 1; // 支持简单嵌套
+    var item = list[i];
+    if (item.type === AtomsTypeEnum.OPERATOR && item.val === 'case') {
+      var depth = 1;
+      var hasValidWhenThen = false;
+      var lastWasWhen = false; // 用于确保 then 前是 when
       for (var j = i + 1; j < list.length; j++) {
-        var item = list[j];
-        if (item.type !== AtomsTypeEnum.OPERATOR) continue;
-        if (item.val === 'case') {
+        var token = list[j];
+        if (token.type !== AtomsTypeEnum.OPERATOR) continue;
+        var val = token.val;
+        if (val === 'case') {
           depth++;
-        } else if (item.val === 'end') {
+        } else if (val === 'end') {
+          depth--;
           if (depth === 0) {
-            endFound = true;
-            break;
+            // 当前 case 块结束
+            if (!hasValidWhenThen) {
+              return false; // 至少需要一个 when-then
+            }
+            break; // 成功找到匹配的 end
+          }
+          // 如果 depth < 0，说明 end 多余，但这里我们只关心当前 case，可忽略或报错
+        } else if (val === 'when') {
+          if (depth === 1) {
+            lastWasWhen = true;
+          }
+        } else if (val === 'then') {
+          if (depth === 1) {
+            if (!lastWasWhen) {
+              return false; // then 前没有 when
+            }
+            hasValidWhenThen = true;
+            lastWasWhen = false; // then 消费掉 when
           }
-        } else if (item.val === 'when' && depth === 1) {
-          foundWhen = true;
-        } else if (item.val === 'then' && depth === 1) {
-          if (!foundWhen) return false; // then 前无 when
-          foundThen = true;
         }
+        // 注意：其他操作符（如 else）可在此扩展
       }
-      if (!endFound || !foundThen) {
-        return false; // 缺少 end 或 when-then 对
+      // 如果循环结束还没找到匹配的 end（即 depth > 0）
+      if (depth > 0) {
+        return false; // 缺少 end
       }
     }
   }

package/lib/es/locale/en.js

@@ -50,6 +50,7 @@ export default register('en', {
   'SqlQueryBuilder.selectColumnAll': 'select all',
   'SqlQueryBuilder.alias': 'alias',
   'SqlQueryBuilder.aliasForRules': 'The alias only supports a combination of letters, numbers, and underscores. It must start with a letter and cannot exceed 30 bytes',
+  'SqlQueryBuilder.nameForRules': 'The name only supports a combination of letters, numbers, and underscores. It must start with a letter and cannot exceed 30 bytes',
   'SqlQueryBuilder.pleaseSelectTable': 'The currently dependent table is empty or has been deleted',
   'SqlQueryBuilder.repeatAlias': 'If there are duplicate names, please modify them',
   'customColumn.operator': 'operator',
@@ -161,8 +162,8 @@ export default register('en', {
   'metabase.nextOk': 'ok',
   'metabase.verify': 'The table has been modified. Please select again',
   'metabase.validationFailed': 'Validation failed. Do you still want to save?',
-  'metabase.validationFilter': 'The filter configuration is incorrect due to a missing closing parenthesis. Saving is prohibited!',
-  'metabase.validationFormula': 'The formula configuration is incorrect due to a missing closing parenthesis. Saving is prohibited!',
+  'metabase.validationFilter': 'The filter configuration is incorrect. Saving is prohibited!',
+  'metabase.validationFormula': 'The formula configuration is incorrect. Saving is prohibited!',
   'metabase.prompt': 'Prompt',
   'metabase.copy': 'Copy',
   'metabase.copySuccess': 'Copy success',

package/lib/es/locale/zh.js

@@ -46,6 +46,7 @@ export default register('zh', {
   'SqlQueryBuilder.selectColumnAll': '全选',
   'SqlQueryBuilder.alias': '别名',
   'SqlQueryBuilder.aliasForRules': '别名只支持字母 + 数字 + 下划线组合，必须是字母开头，且不能超过30个字节',
+  'SqlQueryBuilder.nameForRules': '名字只支持字母 + 数字 + 下划线组合，必须是字母开头，且不能超过30个字节',
   'SqlQueryBuilder.pleaseSelectTable': '当前依赖的表为空或被删除',
   'SqlQueryBuilder.repeatAlias': '有重名请修改',
   'customColumn.operator': '操作符',
@@ -161,8 +162,8 @@ export default register('zh', {
   'metabase.nextOk': '确定',
   'metabase.verify': '表已修改，请重新选择',
   'metabase.validationFailed': '校验未通过，是否依然保存？',
-  'metabase.validationFilter': '过滤器配置有误，缺少反括号，禁止保存！',
-  'metabase.validationFormula': '公式配置有误，缺少反括号，禁止保存！',
+  'metabase.validationFilter': '过滤器配置有误，禁止保存！',
+  'metabase.validationFormula': '公式配置有误，禁止保存！',
   'metabase.prompt': '提示',
   'metabase.copy': '复制',
   'metabase.copySuccess': '复制成功',

package/package.json

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