@gingkoo/pandora-metabase 1.0.151 → 1.0.152

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

@@ -293,7 +293,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     return map;
   }, [otherTypes]);
   var normalizedValue = (0, _react.useMemo)(function () {
-    return (0, _utils2.normalizeAndOrStructure)(value || []);
+    return (0, _utils2.normalizeAndOrStructure)(value || []).map(_utils2.syncAtomQuotes);
   }, [value]);
   var caseList = normalizedValue;
   var initialValueRef = (0, _react.useRef)((0, _cloneDeep["default"])(caseList));
@@ -406,6 +406,9 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       if (visited.has(v)) return v.quotes || '';
       visited.add(v);
     }
+    if (v.type === _types.AtomsTypeEnum.FIELD || v.type === _types.AtomsTypeEnum.EXPRESSION || v.type === _types.AtomsTypeEnum.FORMULA || v.type === _types.AtomsTypeEnum.COLLECTION || v.type === _types.AtomsTypeEnum.CASE_WHEN || v.type === _types.AtomsTypeEnum.AND_OR || v.type === _types.AtomsTypeEnum.SELECT) {
+      return (0, _utils2.getAtomDisplayText)(v);
+    }
     if (v.quotes) return v.quotes;
     if (v.type === _types.AtomsTypeEnum.FIELD) return getFieldDisplayName(v);
     if (v.fieldName) return v.fieldName;
@@ -1981,22 +1984,23 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       };
     }
     if (type === _types.AtomsTypeEnum.EXPRESSION) {
+      var quotes = (0, _utils2.getAtomDisplayText)(v);
       if (~['早于', '晚于', '在'].indexOf(v.condition) && v.rhs.length > 1) {
-        var _nextList$index$quote;
+        var _getAtomDisplayText$s;
         var nextList = caseList.slice();
         nextList[index].rhs = [nextList[index].rhs[0]];
-        nextList[index].quotes = (_nextList$index$quote = nextList[index].quotes.split(' || ')) === null || _nextList$index$quote === void 0 ? void 0 : _nextList$index$quote[0];
+        nextList[index].quotes = (_getAtomDisplayText$s = (0, _utils2.getAtomDisplayText)(nextList[index]).split(' || ')) === null || _getAtomDisplayText$s === void 0 ? void 0 : _getAtomDisplayText$s[0];
         setCaseList(nextList);
       }
       return {
         className: (0, _classnames["default"])('purple-name', {
-          notSelected: !v.quotes
+          notSelected: !quotes
         }),
         onClick: function onClick(e) {
           return handleExpression(e, index, v);
         },
         node: (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-          children: [v.quotes ? v.quotes : (0, _locale.__)('customColumn.selectExpression'), renderDeleteIcon(v, index, groupType)]
+          children: [quotes || (0, _locale.__)('customColumn.selectExpression'), renderDeleteIcon(v, index, groupType)]
         })
       };
     }

package/lib/cjs/components/modules/summarize/group-by.js

@@ -32,6 +32,9 @@ var _getSummaryText = function getSummaryText() {
   var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var itemToText = function itemToText(item) {
     if (!item) return '';
+    if (item.type === _types.AtomsTypeEnum.FIELD || item.type === _types.AtomsTypeEnum.EXPRESSION || item.type === _types.AtomsTypeEnum.FORMULA || item.type === _types.AtomsTypeEnum.COLLECTION || item.type === _types.AtomsTypeEnum.CASE_WHEN || item.type === _types.AtomsTypeEnum.AND_OR) {
+      return (0, _utils.getAtomDisplayText)(item);
+    }
     if (item.quotes) return item.quotes;
     if (item.fieldName) return item.fieldAlias || item.fieldName;
     if (item.type === _types.AtomsTypeEnum.FORMULA) {

package/lib/cjs/utils.d.ts

@@ -25,7 +25,9 @@ export declare const getHelper: (list: MetaListType[], item: MetaListType) => He
 export declare const mergeSubQueryColumns: (columns: MetaData_ColumnsType[], oldColumns?: MetaData_ColumnsType[], isSelectFields?: boolean) => MetaData_ColumnsType[];
 export declare const syncSubQueryFieldReferences: (list: MetaListType[], table: MetaData_TableType, columns: MetaData_ColumnsType[], oldColumns?: MetaData_ColumnsType[]) => MetaListType[];
 export declare const getSubColumns: (metaList: any) => DataType[];
+export declare const getAtomDisplayText: (item?: AtomsItem) => string;
 export declare const normalizeAndOrStructure: <T>(data: T) => T;
+export declare const syncAtomQuotes: (item: AtomsItem) => AtomsItem;
 export declare function isValidSQLAlias(str: string): boolean;
 export declare const changeTableAlias: (list: MetaListType[] | [], curObj: Pick<MetaData_TableType, "tableUuid" | "alias">) => MetaListType[];
 export declare const changeFieldAlias: (list: MetaListType[], curObj: Pick<MetaData_ColumnsType, "fieldUuid" | "fieldAlias"> & Partial<Pick<MetaData_ColumnsType, "id" | "name" | "datasourceId">> & Partial<Pick<MetaSummarize_Group | MetaSummarize_By, "table" | "tableId" | "tableUuid" | "fieldId" | "name">>) => MetaListType[];

package/lib/cjs/utils.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.changeTableAlias = exports.changeFieldAlias = exports.changeExistsCopyField = exports.changeCopyField = exports.buildSqlQuery = void 0;
 exports.containsSubset = containsSubset;
-exports.isExistsError = exports.isError = exports.isCanPaste = exports.getSubQueryColumnInstanceUuid = exports.getSubColumns = exports.getObjTem = exports.getMetaTabels = exports.getHelper = exports.getColumnsTables = exports.findMetaKey = exports.findIndex = void 0;
+exports.isExistsError = exports.isError = exports.isCanPaste = exports.getSubQueryColumnInstanceUuid = exports.getSubColumns = exports.getObjTem = exports.getMetaTabels = exports.getHelper = exports.getColumnsTables = exports.getAtomDisplayText = exports.findMetaKey = exports.findIndex = void 0;
 exports.isValidSQLAlias = isValidSQLAlias;
 exports.patchData = exports.normalizeLegacySummarizeForSave = exports.normalizeAndOrStructure = exports.metaIsCheck = exports.mergeSubQueryColumns = void 0;
 exports.reassembleByUnion = reassembleByUnion;
 exports.splitByUnion = splitByUnion;
-exports.syncSubQueryFieldReferences = void 0;
+exports.syncSubQueryFieldReferences = exports.syncAtomQuotes = void 0;
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/typeof"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
@@ -598,7 +598,7 @@ var getSelectAtomText = function getSelectAtomText(item) {
   }
   return getOptionText(String(item.val || ''));
 };
-var _getAtomDisplayText = function getAtomDisplayText(item) {
+var _getAtomDisplayText = exports.getAtomDisplayText = function getAtomDisplayText(item) {
   if (!item) return '';
   if (item.type === _types.AtomsTypeEnum.FIELD) {
     if (item.tableId === _helper.SummarizeAlias) {
@@ -968,7 +968,7 @@ var buildExpressionQuotes = function buildExpressionQuotes(item) {
   }
   return normalizeAtomQuotes("".concat(lhsText, " ").concat(getExpressionConditionText(condition), " ").concat(rhsText || firstVal));
 };
-var syncAtomQuotes = function syncAtomQuotes(item) {
+var syncAtomQuotes = exports.syncAtomQuotes = function syncAtomQuotes(item) {
   if (item.type === _types.AtomsTypeEnum.JOIN_DEFAULT) {
     return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, item), {}, {
       lhs: syncAtomQuotesList(item.lhs || []),

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

@@ -23,7 +23,7 @@ import { AtomsTypeEnum, FormulaTypeEnum } from '../../../store/types';
 import { ColumnsPopupThemeEnum } from '../../../store/enum';
 import { Select, Input, Modal2, Modal, InputNumber, Space, Button, Checkbox, Tooltip, Toast, Editor } from '@gingkoo/pandora';
 import cloneDeep from 'lodash/cloneDeep';
-import { buildSqlQuery, isError, changeCopyField, isExistsError, normalizeAndOrStructure } from '../../../utils';
+import { buildSqlQuery, getAtomDisplayText, isError, changeCopyField, isExistsError, normalizeAndOrStructure, syncAtomQuotes } from '../../../utils';
 import Formula from '../formula';
 import { AddIcon, CloseIcon } from '../../icons';
 import { Expression, SelectColumnMultiple } from '../../dialog';
@@ -284,7 +284,7 @@ var FormulaList = forwardRef(function (props, ref) {
     return map;
   }, [otherTypes]);
   var normalizedValue = useMemo(function () {
-    return normalizeAndOrStructure(value || []);
+    return normalizeAndOrStructure(value || []).map(syncAtomQuotes);
   }, [value]);
   var caseList = normalizedValue;
   var initialValueRef = useRef(cloneDeep(caseList));
@@ -397,6 +397,9 @@ var FormulaList = forwardRef(function (props, ref) {
       if (visited.has(v)) return v.quotes || '';
       visited.add(v);
     }
+    if (v.type === AtomsTypeEnum.FIELD || v.type === AtomsTypeEnum.EXPRESSION || v.type === AtomsTypeEnum.FORMULA || v.type === AtomsTypeEnum.COLLECTION || v.type === AtomsTypeEnum.CASE_WHEN || v.type === AtomsTypeEnum.AND_OR || v.type === AtomsTypeEnum.SELECT) {
+      return getAtomDisplayText(v);
+    }
     if (v.quotes) return v.quotes;
     if (v.type === AtomsTypeEnum.FIELD) return getFieldDisplayName(v);
     if (v.fieldName) return v.fieldName;
@@ -1972,22 +1975,23 @@ var FormulaList = forwardRef(function (props, ref) {
       };
     }
     if (type === AtomsTypeEnum.EXPRESSION) {
+      var quotes = getAtomDisplayText(v);
       if (~['早于', '晚于', '在'].indexOf(v.condition) && v.rhs.length > 1) {
-        var _nextList$index$quote;
+        var _getAtomDisplayText$s;
         var nextList = caseList.slice();
         nextList[index].rhs = [nextList[index].rhs[0]];
-        nextList[index].quotes = (_nextList$index$quote = nextList[index].quotes.split(' || ')) === null || _nextList$index$quote === void 0 ? void 0 : _nextList$index$quote[0];
+        nextList[index].quotes = (_getAtomDisplayText$s = getAtomDisplayText(nextList[index]).split(' || ')) === null || _getAtomDisplayText$s === void 0 ? void 0 : _getAtomDisplayText$s[0];
         setCaseList(nextList);
       }
       return {
         className: cx('purple-name', {
-          notSelected: !v.quotes
+          notSelected: !quotes
         }),
         onClick: function onClick(e) {
           return handleExpression(e, index, v);
         },
         node: _jsxs(_Fragment, {
-          children: [v.quotes ? v.quotes : __('customColumn.selectExpression'), renderDeleteIcon(v, index, groupType)]
+          children: [quotes || __('customColumn.selectExpression'), renderDeleteIcon(v, index, groupType)]
         })
       };
     }

package/lib/es/components/modules/summarize/group-by.js

@@ -9,7 +9,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { useState } from 'react';
 import cx from 'classnames';
 import { __ } from '../../../locale';
-import { findIndex, getHelper } from '../../../utils';
+import { findIndex, getAtomDisplayText, getHelper } from '../../../utils';
 import { TypeEnum, SQL_COLUMN_TYPE } from '../../../store/enum';
 import { MetaSummarize_Enum, AtomsTypeEnum, ChangeType } from '../../../store/types';
 import { Tooltip, Button, Modal, Input, Toast } from '@gingkoo/pandora';
@@ -26,6 +26,9 @@ var _getSummaryText = function getSummaryText() {
   var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var itemToText = function itemToText(item) {
     if (!item) return '';
+    if (item.type === AtomsTypeEnum.FIELD || item.type === AtomsTypeEnum.EXPRESSION || item.type === AtomsTypeEnum.FORMULA || item.type === AtomsTypeEnum.COLLECTION || item.type === AtomsTypeEnum.CASE_WHEN || item.type === AtomsTypeEnum.AND_OR) {
+      return getAtomDisplayText(item);
+    }
     if (item.quotes) return item.quotes;
     if (item.fieldName) return item.fieldAlias || item.fieldName;
     if (item.type === AtomsTypeEnum.FORMULA) {

package/lib/es/utils.d.ts

@@ -25,7 +25,9 @@ export declare const getHelper: (list: MetaListType[], item: MetaListType) => He
 export declare const mergeSubQueryColumns: (columns: MetaData_ColumnsType[], oldColumns?: MetaData_ColumnsType[], isSelectFields?: boolean) => MetaData_ColumnsType[];
 export declare const syncSubQueryFieldReferences: (list: MetaListType[], table: MetaData_TableType, columns: MetaData_ColumnsType[], oldColumns?: MetaData_ColumnsType[]) => MetaListType[];
 export declare const getSubColumns: (metaList: any) => DataType[];
+export declare const getAtomDisplayText: (item?: AtomsItem) => string;
 export declare const normalizeAndOrStructure: <T>(data: T) => T;
+export declare const syncAtomQuotes: (item: AtomsItem) => AtomsItem;
 export declare function isValidSQLAlias(str: string): boolean;
 export declare const changeTableAlias: (list: MetaListType[] | [], curObj: Pick<MetaData_TableType, "tableUuid" | "alias">) => MetaListType[];
 export declare const changeFieldAlias: (list: MetaListType[], curObj: Pick<MetaData_ColumnsType, "fieldUuid" | "fieldAlias"> & Partial<Pick<MetaData_ColumnsType, "id" | "name" | "datasourceId">> & Partial<Pick<MetaSummarize_Group | MetaSummarize_By, "table" | "tableId" | "tableUuid" | "fieldId" | "name">>) => MetaListType[];

package/lib/es/utils.js

@@ -617,6 +617,7 @@ var _getAtomDisplayText = function getAtomDisplayText(item) {
   if (Array.isArray(val)) return val.join(', ');
   return val || val === 0 ? String(val) : '';
 };
+export { _getAtomDisplayText as getAtomDisplayText };
 var buildFormulaQuotes = function buildFormulaQuotes(item) {
   var argsText = (item.args || []).map(_getAtomDisplayText).join(' , ');
   return normalizeAtomQuotes("".concat(item.name || '', " ( ").concat(argsText, " )"));
@@ -954,7 +955,7 @@ var buildExpressionQuotes = function buildExpressionQuotes(item) {
   }
   return normalizeAtomQuotes("".concat(lhsText, " ").concat(getExpressionConditionText(condition), " ").concat(rhsText || firstVal));
 };
-var syncAtomQuotes = function syncAtomQuotes(item) {
+export var syncAtomQuotes = function syncAtomQuotes(item) {
   if (item.type === AtomsTypeEnum.JOIN_DEFAULT) {
     return _objectSpread(_objectSpread({}, item), {}, {
       lhs: syncAtomQuotesList(item.lhs || []),

package/package.json

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