@gingkoo/pandora-metabase 1.0.57 → 1.0.58

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

@@ -188,7 +188,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         tableName = v.name,
         _v$datasourceName = v.datasourceName,
         datasourceName = _v$datasourceName === void 0 ? '' : _v$datasourceName;
-      var fullName = datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || tableName) : tableAlias || tableName;
+      var fullName = datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(tableName, tableAlias)) : (0, _helper2.mergeNameAlias)(tableName, tableAlias);
       if (val === '' || ~fullName.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())) {
         // let open = tableList.filter((vv) => vv.tableUuid === v.tableUuid)?.[0]?.open || false;
         return (0, _objectSpread2["default"])({}, v);
@@ -281,8 +281,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                     },
                     children: (0, _jsxRuntime.jsx)("h3", {
                       className: 'List-item-title ml-2',
-                      title: datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || tableName) : tableAlias || tableName,
-                      children: datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || tableName) : tableAlias || tableName
+                      title: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(tableName, tableAlias)) : (0, _helper2.mergeNameAlias)(tableName, tableAlias),
+                      children: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(tableName, tableAlias)) : (0, _helper2.mergeNameAlias)(tableName, tableAlias)
                     })
                   }), isMultiple && !isGroup && (0, _jsxRuntime.jsx)("span", {
                     className: 'List-title-arrow',

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

@@ -130,7 +130,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         tableName = v.name,
         _v$datasourceName = v.datasourceName,
         datasourceName = _v$datasourceName === void 0 ? '' : _v$datasourceName;
-      var fullName = datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || tableName) : tableAlias || tableName;
+      var fullName = datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(tableName, tableAlias)) : (0, _helper2.mergeNameAlias)(tableName, tableAlias);
       if (val === '' || ~fullName.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())) {
         // let open = tableList.filter((vv) => vv.tableUuid === v.tableUuid)?.[0]?.open || false;
         return (0, _objectSpread2["default"])({}, v);
@@ -220,8 +220,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   },
                   children: (0, _jsxRuntime.jsx)("h3", {
                     className: 'List-item-title ml-2',
-                    title: datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || table) : tableAlias || table,
-                    children: datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || table) : tableAlias || table
+                    title: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(table, tableAlias)) : (0, _helper2.mergeNameAlias)(table, tableAlias),
+                    children: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(table, tableAlias)) : (0, _helper2.mergeNameAlias)(table, tableAlias)
                   })
                 }), isMultiple && (0, _jsxRuntime.jsx)("span", {
                   className: 'List-title-arrow',

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

@@ -195,8 +195,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   },
                   children: (0, _jsxRuntime.jsx)("h3", {
                     className: 'List-item-title ml-2',
-                    title: datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || table) : tableAlias || table,
-                    children: datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || table) : tableAlias || table
+                    title: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(table, tableAlias)) : (0, _helper2.mergeNameAlias)(table, tableAlias),
+                    children: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(table, tableAlias)) : (0, _helper2.mergeNameAlias)(table, tableAlias)
                   })
                 }), isMultiple && (0, _jsxRuntime.jsx)("span", {
                   className: 'List-title-arrow',

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

@@ -13,6 +13,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _locale = require("../../../locale");
 var _icons = require("../../icons");
+var _helper = require("../../../utils/helper");
 /**
  * 选择表弹框
  * 谁在用？
@@ -38,7 +39,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
     var val = e.target.value;
     var newList = (0, _cloneDeep["default"])(data.slice());
     setDatasource(newList.filter(function (v) {
-      return ~(v.datasourceName + '.' + (v.alias || v.name)).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
+      return ~(v.datasourceName + '.' + (0, _helper.mergeNameAlias)(v.name, v.alias)).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
     }));
   }
   return (0, _jsxRuntime.jsx)("div", {
@@ -84,7 +85,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
                 }), (0, _jsxRuntime.jsx)("div", {
                   children: (0, _jsxRuntime.jsxs)("h4", {
                     className: 'List-item-title ml-2',
-                    children: [v.datasourceName ? "".concat(v.datasourceName, ".") : '', v.name === 'source' ? PrevResult : v.alias || v.name]
+                    children: [v.datasourceName ? "".concat(v.datasourceName, ".") : '', v.name === 'source' ? PrevResult : (0, _helper.mergeNameAlias)(v.name, v.alias)]
                   })
                 })]
               })

package/lib/cjs/components/modules/join-data.js

@@ -1347,7 +1347,7 @@ var JoinData = function JoinData(props) {
       if (meta.table1.name === _helper2.SummarizeAlias) {
         return PrevResult;
       } else {
-        return "".concat(meta.table1.datasourceName, ".").concat(meta.table1.alias || meta.table1.name);
+        return "".concat(meta.table1.datasourceName, ".").concat((0, _helper.mergeNameAlias)(meta.table1.name, meta.table1.alias));
       }
     } else {
       return '';

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

@@ -205,6 +205,9 @@ var GroupBy = function GroupBy(props) {
           newMeta[index].by = newMeta[index].by.map(function (v) {
             var _store$preProps;
             var fieldAlias = "".concat((0, _helper.getAlias)(v.alias, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []), "__").concat(v.name);
+            if (!(0, _utils.isValidSQLAlias)(fieldAlias)) {
+              _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasForRules'));
+            }
             return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
               sql: "".concat(v.alias, ".").concat(v.realName || v.name),
               fieldAlias: fieldAlias,

package/lib/cjs/components/modules/table-data.js

@@ -90,7 +90,6 @@ var TableData = function TableData(props) {
         data: store.sourceList,
         value: meta.table,
         onChange: function onChange(data) {
-          console.log('🚀 ~ selectTable ~ data:', data);
           if (meta.table.datasourceId !== data.datasourceId || meta.table.name !== data.name) {
             var _store$preProps;
             var newMetaList = store.metaList[groupIndex].list.slice()[0];

package/lib/cjs/utils/helper.d.ts

@@ -17,3 +17,4 @@ export declare const replaceTpl: (inputString: string, values: {
 }) => string;
 export declare const uuidv4: (prefix?: string) => string;
 export declare const getAlias: (name: string | undefined, list: MetaListType[], columns?: any[]) => string;
+export declare const mergeNameAlias: (name: string, alias: string) => string;

package/lib/cjs/utils/helper.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.uuidv4 = exports.throttle = exports.sleep = exports.replaceTpl = exports.mobx2Object = exports.getUrlParams = exports.getScreenInfo = exports.getAlias = exports.fullScreen = exports.flatArray = exports.exitFullscreen = exports.debounce = void 0;
+exports.uuidv4 = exports.throttle = exports.sleep = exports.replaceTpl = exports.mobx2Object = exports.mergeNameAlias = exports.getUrlParams = exports.getScreenInfo = exports.getAlias = exports.fullScreen = exports.flatArray = exports.exitFullscreen = exports.debounce = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _enum = require("../store/enum");
 // 节流
@@ -188,4 +188,7 @@ var getAlias = exports.getAlias = function getAlias() {
   // 获取下一个可用编号
   var nextIndex = Math.max.apply(Math, (0, _toConsumableArray2["default"])(uniqueIndexes)) + 1;
   return "".concat(name, "_").concat(nextIndex);
+};
+var mergeNameAlias = exports.mergeNameAlias = function mergeNameAlias(name, alias) {
+  return name + (alias ? "\uFF08".concat(alias, "\uFF09") : '');
 };

package/lib/cjs/utils.js

@@ -302,7 +302,7 @@ var _changeAlias = function changeAlias(items, val, type) {
 };
 function isValidSQLAlias(str) {
   if (!str) return false;
-  var regex = /^[a-zA-Z][a-zA-Z0-9_]{0,30}$/;
+  var regex = /^[a-zA-Z][a-zA-Z0-9_]{0,29}$/;
   return regex.test(str);
 }
 var changeTableAlias = exports.changeTableAlias = function changeTableAlias(list, curObj) {

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

@@ -22,7 +22,7 @@ AtomsTypeEnum } from '../../../store/types';
 import { __ } from '../../../locale';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { useStore } from '../../../hooks/use-provider';
-import { replaceTpl } from '../../../utils/helper';
+import { replaceTpl, mergeNameAlias } from '../../../utils/helper';
 import { uuidv4 } from '../../../utils/helper';
 import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2 } from '../../icons';
 export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
@@ -183,7 +183,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         tableName = v.name,
         _v$datasourceName = v.datasourceName,
         datasourceName = _v$datasourceName === void 0 ? '' : _v$datasourceName;
-      var fullName = datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || tableName) : tableAlias || tableName;
+      var fullName = datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias)) : mergeNameAlias(tableName, tableAlias);
       if (val === '' || ~fullName.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())) {
         // let open = tableList.filter((vv) => vv.tableUuid === v.tableUuid)?.[0]?.open || false;
         return _objectSpread({}, v);
@@ -276,8 +276,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                     },
                     children: _jsx("h3", {
                       className: 'List-item-title ml-2',
-                      title: datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || tableName) : tableAlias || tableName,
-                      children: datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || tableName) : tableAlias || tableName
+                      title: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias)) : mergeNameAlias(tableName, tableAlias),
+                      children: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias)) : mergeNameAlias(tableName, tableAlias)
                     })
                   }), isMultiple && !isGroup && _jsx("span", {
                     className: 'List-title-arrow',

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

@@ -19,7 +19,7 @@ import { SummarizeAlias } from '../../../store/helper';
 import { __ } from '../../../locale';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { useStore } from '../../../hooks/use-provider';
-import { replaceTpl } from '../../../utils/helper';
+import { replaceTpl, mergeNameAlias } from '../../../utils/helper';
 import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2, RightArrowIcon } from '../../icons';
 export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
 export var NUMBER_GROUP_MAP = new Map([['自动间隔', '自动分组'], ['10个刻度间隔', '10 刻度间隔'], ['间隔50', '50 刻度间隔'], ['间隔100', '100 刻度间隔'], ['无间隔', '']]);
@@ -122,7 +122,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         tableName = v.name,
         _v$datasourceName = v.datasourceName,
         datasourceName = _v$datasourceName === void 0 ? '' : _v$datasourceName;
-      var fullName = datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || tableName) : tableAlias || tableName;
+      var fullName = datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias)) : mergeNameAlias(tableName, tableAlias);
       if (val === '' || ~fullName.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())) {
         // let open = tableList.filter((vv) => vv.tableUuid === v.tableUuid)?.[0]?.open || false;
         return _objectSpread({}, v);
@@ -212,8 +212,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   },
                   children: _jsx("h3", {
                     className: 'List-item-title ml-2',
-                    title: datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || table) : tableAlias || table,
-                    children: datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || table) : tableAlias || table
+                    title: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(table, tableAlias)) : mergeNameAlias(table, tableAlias),
+                    children: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(table, tableAlias)) : mergeNameAlias(table, tableAlias)
                   })
                 }), isMultiple && _jsx("span", {
                   className: 'List-title-arrow',

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

@@ -19,7 +19,7 @@ import { SummarizeAlias } from '../../../store/helper';
 import { __ } from '../../../locale';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { useStore } from '../../../hooks/use-provider';
-import { replaceTpl } from '../../../utils/helper';
+import { replaceTpl, mergeNameAlias } from '../../../utils/helper';
 import { SearchIcon, TableIcon, CircleIcon, LetterAaIcon, CalendarIcon, WellIcon, ForeignKeyIcon, UpArrowIcon2, DownArrowIcon2 } from '../../icons';
 export var DATE_GROUP_MAP = new Map([['分', '分'], ['时', '时'], ['天', '天'], ['周', '周'], ['月', '月'], ['季度', '季度'], ['一小时内的分钟数', '一小时内的分钟数'], ['一天内的小时数', '一天内的小时数'], ['一周内的天数', '一周内的天数'], ['一月内的天数', '一月内的天数'], ['一年内的天数', '一年内的天数'], ['一年的星期数', '一年的星期数'], ['一年的月数', '一年的月数']]);
 export var NUMBER_GROUP_MAP = new Map([['自动间隔', '自动分组'], ['10个刻度间隔', '10 刻度间隔'], ['间隔50', '50 刻度间隔'], ['间隔100', '100 刻度间隔'], ['无间隔', '']]);
@@ -187,8 +187,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   },
                   children: _jsx("h3", {
                     className: 'List-item-title ml-2',
-                    title: datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || table) : tableAlias || table,
-                    children: datasourceName ? "".concat(datasourceName, ".").concat(tableAlias || table) : tableAlias || table
+                    title: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(table, tableAlias)) : mergeNameAlias(table, tableAlias),
+                    children: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(table, tableAlias)) : mergeNameAlias(table, tableAlias)
                   })
                 }), isMultiple && _jsx("span", {
                   className: 'List-title-arrow',

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

@@ -11,6 +11,7 @@ import cx from 'classnames';
 import cloneDeep from 'lodash/cloneDeep';
 import { __ } from '../../../locale';
 import { TableIcon, SearchIcon } from '../../icons';
+import { mergeNameAlias } from '../../../utils/helper';
 var PrevResult = 'Previous results';
 var SelectPermissionTable = function SelectPermissionTable(_ref) {
   var _ref$data = _ref.data,
@@ -30,7 +31,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
     var val = e.target.value;
     var newList = cloneDeep(data.slice());
     setDatasource(newList.filter(function (v) {
-      return ~(v.datasourceName + '.' + (v.alias || v.name)).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
+      return ~(v.datasourceName + '.' + mergeNameAlias(v.name, v.alias)).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
     }));
   }
   return _jsx("div", {
@@ -76,7 +77,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
                 }), _jsx("div", {
                   children: _jsxs("h4", {
                     className: 'List-item-title ml-2',
-                    children: [v.datasourceName ? "".concat(v.datasourceName, ".") : '', v.name === 'source' ? PrevResult : v.alias || v.name]
+                    children: [v.datasourceName ? "".concat(v.datasourceName, ".") : '', v.name === 'source' ? PrevResult : mergeNameAlias(v.name, v.alias)]
                   })
                 })]
               })

package/lib/es/components/modules/join-data.js

@@ -13,7 +13,7 @@ import { FfPlus, FfLine, Repeat, RelatedWork } from '@gingkoo/pandora-icons';
 import Metabase from '../../index';
 import isEqual from 'lodash/isEqual';
 import cloneDeep from 'lodash/cloneDeep';
-import { uuidv4, getAlias } from '../../utils/helper';
+import { uuidv4, getAlias, mergeNameAlias } from '../../utils/helper';
 import { __ } from '../../locale';
 import { findIndex, getSubColumns } from '../../utils';
 import { TypeEnum, ColumnsPopupThemeEnum, JoinEnum, SQL_COLUMN_TYPE } from '../../store/enum';
@@ -1342,7 +1342,7 @@ var JoinData = function JoinData(props) {
       if (meta.table1.name === SummarizeAlias) {
         return PrevResult;
       } else {
-        return "".concat(meta.table1.datasourceName, ".").concat(meta.table1.alias || meta.table1.name);
+        return "".concat(meta.table1.datasourceName, ".").concat(mergeNameAlias(meta.table1.name, meta.table1.alias));
       }
     } else {
       return '';

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

@@ -199,6 +199,9 @@ var GroupBy = function GroupBy(props) {
           newMeta[index].by = newMeta[index].by.map(function (v) {
             var _store$preProps;
             var fieldAlias = "".concat(getAlias(v.alias, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []), "__").concat(v.name);
+            if (!isValidSQLAlias(fieldAlias)) {
+              Toast.warning(__('SqlQueryBuilder.aliasForRules'));
+            }
             return _objectSpread(_objectSpread({}, v), {}, {
               sql: "".concat(v.alias, ".").concat(v.realName || v.name),
               fieldAlias: fieldAlias,

package/lib/es/components/modules/table-data.js

@@ -84,7 +84,6 @@ var TableData = function TableData(props) {
         data: store.sourceList,
         value: meta.table,
         onChange: function onChange(data) {
-          console.log('🚀 ~ selectTable ~ data:', data);
           if (meta.table.datasourceId !== data.datasourceId || meta.table.name !== data.name) {
             var _store$preProps;
             var newMetaList = store.metaList[groupIndex].list.slice()[0];

package/lib/es/utils/helper.d.ts

@@ -17,3 +17,4 @@ export declare const replaceTpl: (inputString: string, values: {
 }) => string;
 export declare const uuidv4: (prefix?: string) => string;
 export declare const getAlias: (name: string | undefined, list: MetaListType[], columns?: any[]) => string;
+export declare const mergeNameAlias: (name: string, alias: string) => string;

package/lib/es/utils/helper.js

@@ -181,4 +181,7 @@ export var getAlias = function getAlias() {
   // 获取下一个可用编号
   var nextIndex = Math.max.apply(Math, _toConsumableArray(uniqueIndexes)) + 1;
   return "".concat(name, "_").concat(nextIndex);
+};
+export var mergeNameAlias = function mergeNameAlias(name, alias) {
+  return name + (alias ? "\uFF08".concat(alias, "\uFF09") : '');
 };

package/lib/es/utils.js

@@ -291,7 +291,7 @@ var _changeAlias = function changeAlias(items, val, type) {
 };
 export function isValidSQLAlias(str) {
   if (!str) return false;
-  var regex = /^[a-zA-Z][a-zA-Z0-9_]{0,30}$/;
+  var regex = /^[a-zA-Z][a-zA-Z0-9_]{0,29}$/;
   return regex.test(str);
 }
 export var changeTableAlias = function changeTableAlias(list, curObj) {

package/package.json

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