@gingkoo/pandora-metabase 1.0.144 → 1.0.145

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

@@ -1,9 +1,11 @@
 import './index.less';
-import { MetaData_ColumnsType } from '../../../store/types';
+import { MetaData_ColumnsType, MetaData_TableType } from '../../../store/types';
 interface PropsType {
     data: MetaData_ColumnsType[];
+    table?: Partial<MetaData_TableType>;
+    metaIndex?: number;
     groupIndex: number;
     onChange: (record: MetaData_ColumnsType[], newMetaList?: any[]) => void;
 }
-declare const SelectColumn: ({ data, groupIndex, onChange }: PropsType) => import("react/jsx-runtime").JSX.Element;
+declare const SelectColumn: ({ data, table, metaIndex, groupIndex, onChange }: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default SelectColumn;

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

@@ -16,6 +16,7 @@ var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _pandora = require("@gingkoo/pandora");
 var _types = require("../../../store/types");
+var _enum = require("../../../store/enum");
 var _locale = require("../../../locale");
 var _icons = require("../../icons");
 var _useProvider = require("../../../hooks/use-provider");
@@ -24,6 +25,8 @@ var _utils = require("../../../utils");
 var SelectColumn = function SelectColumn(_ref) {
   var _ref$data = _ref.data,
     data = _ref$data === void 0 ? [] : _ref$data,
+    table = _ref.table,
+    metaIndex = _ref.metaIndex,
     groupIndex = _ref.groupIndex,
     onChange = _ref.onChange;
   var _useState = (0, _react.useState)([]),
@@ -104,6 +107,7 @@ var SelectColumn = function SelectColumn(_ref) {
   }
   var onChangeFieldAlias = function onChangeFieldAlias(val, i) {
     var fieldAlias = val || '';
+    var currentColumn = columns[i];
     _pandora.Modal.confirm({
       title: (0, _locale.__)('SqlQueryBuilder.alias'),
       content: (0, _jsxRuntime.jsx)(_pandora.Input, {
@@ -114,7 +118,7 @@ var SelectColumn = function SelectColumn(_ref) {
       }),
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee() {
-          var newColumns, newMetaList;
+          var newColumns, newMetaList, changedColumn, targetMetaIndex, targetMeta;
           return _regenerator["default"].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -129,9 +133,29 @@ var SelectColumn = function SelectColumn(_ref) {
                 newMetaList = store.metaList[groupIndex].list.slice();
                 newColumns[i].fieldAlias = fieldAlias;
                 newColumns[i].fieldUuid = newColumns[i].fieldUuid || (0, _helper.uuidv4)('field');
-                newMetaList = (0, _utils.changeFieldAlias)(newMetaList, newColumns[i]);
+                changedColumn = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newColumns[i]), {}, {
+                  datasourceId: newColumns[i].datasourceId || (table === null || table === void 0 ? void 0 : table.datasourceId) || '',
+                  datasourceName: newColumns[i].datasourceName || (table === null || table === void 0 ? void 0 : table.datasourceName) || '',
+                  tableId: newColumns[i].tableId || (table === null || table === void 0 ? void 0 : table.id) || '',
+                  tableUuid: newColumns[i].tableUuid || (table === null || table === void 0 ? void 0 : table.tableUuid) || '',
+                  table: (table === null || table === void 0 ? void 0 : table.name) || ''
+                });
+                newColumns = originList.map(function (item) {
+                  return (0, _helper.isSameColumnByIdFirst)(item, currentColumn) ? changedColumn : item;
+                });
+                newMetaList = (0, _utils.changeFieldAlias)(newMetaList, changedColumn);
+                targetMetaIndex = typeof metaIndex === 'number' ? metaIndex : newMetaList.findIndex(function (item) {
+                  return item.type === _enum.TypeEnum.data;
+                });
+                targetMeta = newMetaList[targetMetaIndex];
+                if ((targetMeta === null || targetMeta === void 0 ? void 0 : targetMeta.type) === _enum.TypeEnum.data) {
+                  targetMeta.columns = newColumns;
+                }
+                if ((targetMeta === null || targetMeta === void 0 ? void 0 : targetMeta.type) === _enum.TypeEnum.joinData) {
+                  targetMeta.columns = newColumns;
+                }
                 store.setMeta(newMetaList, groupIndex, {
-                  obj: newColumns[i],
+                  obj: changedColumn,
                   type: _types.ChangeType.fieldAlias
                 });
                 onSelect(newColumns, newMetaList, true);

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

@@ -374,6 +374,8 @@ var JoinData = function JoinData(props) {
       node: e.currentTarget,
       content: (0, _jsxRuntime.jsx)(_dialog.SelectColumn, {
         data: columns,
+        table: meta.table2,
+        metaIndex: index,
         groupIndex: groupIndex,
         onChange: function onChange(data, newMetaList) {
           var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();

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

@@ -125,6 +125,8 @@ var TableData = function TableData(props) {
       node: e.currentTarget || e.target,
       content: (0, _jsxRuntime.jsx)(_dialog.SelectColumn, {
         groupIndex: groupIndex,
+        table: meta.table,
+        metaIndex: 0,
         data: columns,
         onChange: function onChange(data, newMetaList) {
           var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();

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

@@ -1,9 +1,11 @@
 import './index.less';
-import { MetaData_ColumnsType } from '../../../store/types';
+import { MetaData_ColumnsType, MetaData_TableType } from '../../../store/types';
 interface PropsType {
     data: MetaData_ColumnsType[];
+    table?: Partial<MetaData_TableType>;
+    metaIndex?: number;
     groupIndex: number;
     onChange: (record: MetaData_ColumnsType[], newMetaList?: any[]) => void;
 }
-declare const SelectColumn: ({ data, groupIndex, onChange }: PropsType) => import("react/jsx-runtime").JSX.Element;
+declare const SelectColumn: ({ data, table, metaIndex, groupIndex, onChange }: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default SelectColumn;

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

@@ -9,6 +9,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import cx from 'classnames';
 import { Button, Modal, Input, Tooltip, Toast } from '@gingkoo/pandora';
 import { ChangeType } from '../../../store/types';
+import { TypeEnum } from '../../../store/enum';
 import { __ } from '../../../locale';
 import { NotSelectIcon, SelectIcon } from '../../icons';
 import { useStore } from '../../../hooks/use-provider';
@@ -18,6 +19,8 @@ import { SearchIcon } from '../../icons';
 var SelectColumn = function SelectColumn(_ref) {
   var _ref$data = _ref.data,
     data = _ref$data === void 0 ? [] : _ref$data,
+    table = _ref.table,
+    metaIndex = _ref.metaIndex,
     groupIndex = _ref.groupIndex,
     onChange = _ref.onChange;
   var _useState = useState([]),
@@ -98,6 +101,7 @@ var SelectColumn = function SelectColumn(_ref) {
   }
   var onChangeFieldAlias = function onChangeFieldAlias(val, i) {
     var fieldAlias = val || '';
+    var currentColumn = columns[i];
     Modal.confirm({
       title: __('SqlQueryBuilder.alias'),
       content: _jsx(Input, {
@@ -108,7 +112,7 @@ var SelectColumn = function SelectColumn(_ref) {
       }),
       onOk: function () {
         var _onOk = _asyncToGenerator(_regeneratorRuntime.mark(function _callee() {
-          var newColumns, newMetaList;
+          var newColumns, newMetaList, changedColumn, targetMetaIndex, targetMeta;
           return _regeneratorRuntime.wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -123,9 +127,29 @@ var SelectColumn = function SelectColumn(_ref) {
                 newMetaList = store.metaList[groupIndex].list.slice();
                 newColumns[i].fieldAlias = fieldAlias;
                 newColumns[i].fieldUuid = newColumns[i].fieldUuid || uuidv4('field');
-                newMetaList = changeFieldAlias(newMetaList, newColumns[i]);
+                changedColumn = _objectSpread(_objectSpread({}, newColumns[i]), {}, {
+                  datasourceId: newColumns[i].datasourceId || (table === null || table === void 0 ? void 0 : table.datasourceId) || '',
+                  datasourceName: newColumns[i].datasourceName || (table === null || table === void 0 ? void 0 : table.datasourceName) || '',
+                  tableId: newColumns[i].tableId || (table === null || table === void 0 ? void 0 : table.id) || '',
+                  tableUuid: newColumns[i].tableUuid || (table === null || table === void 0 ? void 0 : table.tableUuid) || '',
+                  table: (table === null || table === void 0 ? void 0 : table.name) || ''
+                });
+                newColumns = originList.map(function (item) {
+                  return isSameColumnByIdFirst(item, currentColumn) ? changedColumn : item;
+                });
+                newMetaList = changeFieldAlias(newMetaList, changedColumn);
+                targetMetaIndex = typeof metaIndex === 'number' ? metaIndex : newMetaList.findIndex(function (item) {
+                  return item.type === TypeEnum.data;
+                });
+                targetMeta = newMetaList[targetMetaIndex];
+                if ((targetMeta === null || targetMeta === void 0 ? void 0 : targetMeta.type) === TypeEnum.data) {
+                  targetMeta.columns = newColumns;
+                }
+                if ((targetMeta === null || targetMeta === void 0 ? void 0 : targetMeta.type) === TypeEnum.joinData) {
+                  targetMeta.columns = newColumns;
+                }
                 store.setMeta(newMetaList, groupIndex, {
-                  obj: newColumns[i],
+                  obj: changedColumn,
                   type: ChangeType.fieldAlias
                 });
                 onSelect(newColumns, newMetaList, true);

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

@@ -369,6 +369,8 @@ var JoinData = function JoinData(props) {
       node: e.currentTarget,
       content: _jsx(SelectColumn, {
         data: columns,
+        table: meta.table2,
+        metaIndex: index,
         groupIndex: groupIndex,
         onChange: function onChange(data, newMetaList) {
           var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();

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

@@ -119,6 +119,8 @@ var TableData = function TableData(props) {
       node: e.currentTarget || e.target,
       content: _jsx(SelectColumn, {
         groupIndex: groupIndex,
+        table: meta.table,
+        metaIndex: 0,
         data: columns,
         onChange: function onChange(data, newMetaList) {
           var _newMetaList = newMetaList || store.metaList[groupIndex].list.slice();

package/package.json

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