@gingkoo/pandora-metabase 1.0.142 → 1.0.143-alpha.0

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

@@ -46,10 +46,12 @@ var SelectColumn = function SelectColumn(_ref) {
   (0, _react.useEffect)(function () {
     setOriginList(function (currentList) {
       return data.map(function (item) {
+        var _ref2, _existingItem$fieldAl;
         var existingItem = currentList.find(function (current) {
           return (0, _helper.isSameColumnByIdFirst)(current, item);
         });
         return (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, existingItem || {}), item), {}, {
+          fieldAlias: (_ref2 = (_existingItem$fieldAl = existingItem === null || existingItem === void 0 ? void 0 : existingItem.fieldAlias) !== null && _existingItem$fieldAl !== void 0 ? _existingItem$fieldAl : item.fieldAlias) !== null && _ref2 !== void 0 ? _ref2 : '',
           fieldUuid: item.fieldUuid || (existingItem === null || existingItem === void 0 ? void 0 : existingItem.fieldUuid) || (0, _helper.uuidv4)('field')
         });
       });
@@ -88,8 +90,9 @@ var SelectColumn = function SelectColumn(_ref) {
     }
   }, [isAllSelect]);
   function onSelect(columns, newMetaList) {
+    var useColumnsDirectly = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var originalData = (0, _cloneDeep["default"])(originList);
-    var mergedColumns = originalData.map(function (item) {
+    var mergedColumns = useColumnsDirectly ? (0, _cloneDeep["default"])(columns) : originalData.map(function (item) {
       var match = columns.find(function (col) {
         return (0, _helper.isSameColumnByIdFirst)(col, item);
       });
@@ -131,7 +134,7 @@ var SelectColumn = function SelectColumn(_ref) {
                   obj: newColumns[i],
                   type: _types.ChangeType.fieldAlias
                 });
-                onSelect(newColumns, newMetaList);
+                onSelect(newColumns, newMetaList, true);
                 setTimeout(function () {
                   store.setClosable(true);
                 }, 0);

package/lib/cjs/hooks/use-state.js

@@ -541,12 +541,14 @@ var useStore = function useStore() {
             setColumns(tableName, columns);
           case 2:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
+              var _ref9, _obj$fieldAlias;
               var obj = oldColumns.find(function (oldColumn) {
                 return (0, _helper.isSameColumnByIdFirst)(oldColumn, v);
               });
               var select = selectId.includes(v.id) || Boolean(obj === null || obj === void 0 ? void 0 : obj.select);
               return (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, obj), v), {}, {
                 select: isSelect || select,
+                fieldAlias: (_ref9 = (_obj$fieldAlias = obj === null || obj === void 0 ? void 0 : obj.fieldAlias) !== null && _obj$fieldAlias !== void 0 ? _obj$fieldAlias : v.fieldAlias) !== null && _ref9 !== void 0 ? _ref9 : '',
                 fieldUuid: (obj === null || obj === void 0 ? void 0 : obj.fieldUuid) || v.fieldUuid || (0, _helper.uuidv4)('field')
               });
             });
@@ -562,11 +564,13 @@ var useStore = function useStore() {
     };
   }();
   var setMeta = function () {
-    var _ref9 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee9(curData, groupInd) {
+    var _ref0 = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee9(curData, groupInd) {
       var changeObj,
         _metaList,
         prevMeta,
         newMeta,
+        oldData,
+        newData,
         isChange,
         _args9 = arguments;
       return _regenerator["default"].wrap(function (_context9) {
@@ -586,10 +590,12 @@ var useStore = function useStore() {
             }
             return _context9.abrupt("return");
           case 1:
+            oldData = (0, _utils.splitByUnion)(prevMeta);
+            newData = (0, _utils.splitByUnion)(newMeta);
             _context9.next = 2;
-            return fetchChangeFn.current((0, _utils.splitByUnion)(newMeta), changeObj, {
+            return fetchChangeFn.current(oldData, changeObj, {
               isExit: isExit
-            });
+            }, newData);
           case 2:
             isChange = _context9.sent;
             if (isChange === false) {
@@ -602,7 +608,7 @@ var useStore = function useStore() {
       }, _callee9);
     }));
     return function setMeta(_x0, _x1) {
-      return _ref9.apply(this, arguments);
+      return _ref0.apply(this, arguments);
     };
   }();
   var setPreData = function setPreData(data) {

package/lib/cjs/types.d.ts

@@ -59,10 +59,10 @@ export interface MetabaseProps {
     groupByEnableAlias?: boolean;
     isSelectFields?: boolean;
     tableFlat?: boolean;
-    onChange?: (newData: MetaListType[], curData: {
+    onChange?: (oldData: MetaListType[], curData: {
         data: any;
         type: ChangeType;
-    }, options: FetchOptions) => Promise<void | Boolean>;
+    }, options: FetchOptions, newData: MetaListType[]) => Promise<void | Boolean>;
     copyType?: (FormulaTypeEnum | string)[];
     metabaseCopy?: boolean;
     moduleDiff?: boolean;

package/lib/cjs/utils.js

@@ -1071,6 +1071,34 @@ var isAliasTargetSummarizeRecord = function isAliasTargetSummarizeRecord(record,
     type: _types.AtomsTypeEnum.FIELD
   }, target);
 };
+var isAliasTargetColumn = function isAliasTargetColumn(column, target, table) {
+  return isAliasTargetField({
+    fieldName: column.name || '',
+    fieldNameZh: column.name_zh || '',
+    fieldAlias: column.fieldAlias || '',
+    fieldUuid: column.fieldUuid || '',
+    fieldId: column.fieldId || column.id || '',
+    tableName: (table === null || table === void 0 ? void 0 : table.name) || column.tableName || '',
+    tableNameZh: (table === null || table === void 0 ? void 0 : table.name_zh) || column.tableNameZh || '',
+    tableId: (table === null || table === void 0 ? void 0 : table.id) || column.tableId || '',
+    tableAlias: (table === null || table === void 0 ? void 0 : table.alias) || column.tableAlias || '',
+    tableUuid: (table === null || table === void 0 ? void 0 : table.tableUuid) || column.tableUuid || '',
+    datasourceName: (table === null || table === void 0 ? void 0 : table.datasourceName) || column.datasourceName || '',
+    datasourceId: (table === null || table === void 0 ? void 0 : table.datasourceId) || column.datasourceId || '',
+    type: _types.AtomsTypeEnum.FIELD
+  }, target);
+};
+var changeColumnAlias = function changeColumnAlias() {
+  var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var target = arguments.length > 1 ? arguments[1] : undefined;
+  var table = arguments.length > 2 ? arguments[2] : undefined;
+  return columns.map(function (column) {
+    return isAliasTargetColumn(column, target, table) ? (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, column), {}, {
+      fieldAlias: target.alias,
+      fieldUuid: column.fieldUuid || target.uuid || ''
+    }) : column;
+  });
+};
 var _changeAlias = function changeAlias(items, val, type) {
   return items.map(function (v) {
     var nextItem;
@@ -1279,8 +1307,15 @@ var changeFieldAlias = exports.changeFieldAlias = function changeFieldAlias(list
   };
   var newList = (0, _cloneDeep3["default"])(list);
   return (newList === null || newList === void 0 ? void 0 : newList.map(function (v) {
-    if (v.type === _enum.TypeEnum.data) {}
+    if (v.type === _enum.TypeEnum.data) {
+      if (v.columns && v.columns.length > 0) {
+        v.columns = changeColumnAlias(v.columns, aliasTarget, v.table);
+      }
+    }
     if (v.type === _enum.TypeEnum.joinData) {
+      if (v.columns && v.columns.length > 0) {
+        v.columns = changeColumnAlias(v.columns, aliasTarget, v.table2);
+      }
       if (v.expressions && v.expressions.length > 0) {
         v.expressions = _changeAlias(v.expressions, aliasTarget, AliasType.field);
       }

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

@@ -40,10 +40,12 @@ var SelectColumn = function SelectColumn(_ref) {
   useEffect(function () {
     setOriginList(function (currentList) {
       return data.map(function (item) {
+        var _ref2, _existingItem$fieldAl;
         var existingItem = currentList.find(function (current) {
           return isSameColumnByIdFirst(current, item);
         });
         return _objectSpread(_objectSpread(_objectSpread({}, existingItem || {}), item), {}, {
+          fieldAlias: (_ref2 = (_existingItem$fieldAl = existingItem === null || existingItem === void 0 ? void 0 : existingItem.fieldAlias) !== null && _existingItem$fieldAl !== void 0 ? _existingItem$fieldAl : item.fieldAlias) !== null && _ref2 !== void 0 ? _ref2 : '',
           fieldUuid: item.fieldUuid || (existingItem === null || existingItem === void 0 ? void 0 : existingItem.fieldUuid) || uuidv4('field')
         });
       });
@@ -82,8 +84,9 @@ var SelectColumn = function SelectColumn(_ref) {
     }
   }, [isAllSelect]);
   function onSelect(columns, newMetaList) {
+    var useColumnsDirectly = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var originalData = cloneDeep(originList);
-    var mergedColumns = originalData.map(function (item) {
+    var mergedColumns = useColumnsDirectly ? cloneDeep(columns) : originalData.map(function (item) {
       var match = columns.find(function (col) {
         return isSameColumnByIdFirst(col, item);
       });
@@ -125,7 +128,7 @@ var SelectColumn = function SelectColumn(_ref) {
                   obj: newColumns[i],
                   type: ChangeType.fieldAlias
                 });
-                onSelect(newColumns, newMetaList);
+                onSelect(newColumns, newMetaList, true);
                 setTimeout(function () {
                   store.setClosable(true);
                 }, 0);

package/lib/es/hooks/use-state.js

@@ -535,12 +535,14 @@ var useStore = function useStore() {
             setColumns(tableName, columns);
           case 2:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
+              var _ref9, _obj$fieldAlias;
               var obj = oldColumns.find(function (oldColumn) {
                 return isSameColumnByIdFirst(oldColumn, v);
               });
               var select = selectId.includes(v.id) || Boolean(obj === null || obj === void 0 ? void 0 : obj.select);
               return _objectSpread(_objectSpread(_objectSpread({}, obj), v), {}, {
                 select: isSelect || select,
+                fieldAlias: (_ref9 = (_obj$fieldAlias = obj === null || obj === void 0 ? void 0 : obj.fieldAlias) !== null && _obj$fieldAlias !== void 0 ? _obj$fieldAlias : v.fieldAlias) !== null && _ref9 !== void 0 ? _ref9 : '',
                 fieldUuid: (obj === null || obj === void 0 ? void 0 : obj.fieldUuid) || v.fieldUuid || uuidv4('field')
               });
             });
@@ -556,11 +558,13 @@ var useStore = function useStore() {
     };
   }();
   var setMeta = function () {
-    var _ref9 = _asyncToGenerator(_regeneratorRuntime.mark(function _callee9(curData, groupInd) {
+    var _ref0 = _asyncToGenerator(_regeneratorRuntime.mark(function _callee9(curData, groupInd) {
       var changeObj,
         _metaList,
         prevMeta,
         newMeta,
+        oldData,
+        newData,
         isChange,
         _args9 = arguments;
       return _regeneratorRuntime.wrap(function (_context9) {
@@ -580,10 +584,12 @@ var useStore = function useStore() {
             }
             return _context9.abrupt("return");
           case 1:
+            oldData = splitByUnion(prevMeta);
+            newData = splitByUnion(newMeta);
             _context9.next = 2;
-            return fetchChangeFn.current(splitByUnion(newMeta), changeObj, {
+            return fetchChangeFn.current(oldData, changeObj, {
               isExit: isExit
-            });
+            }, newData);
           case 2:
             isChange = _context9.sent;
             if (isChange === false) {
@@ -596,7 +602,7 @@ var useStore = function useStore() {
       }, _callee9);
     }));
     return function setMeta(_x0, _x1) {
-      return _ref9.apply(this, arguments);
+      return _ref0.apply(this, arguments);
     };
   }();
   var setPreData = function setPreData(data) {

package/lib/es/types.d.ts

@@ -59,10 +59,10 @@ export interface MetabaseProps {
     groupByEnableAlias?: boolean;
     isSelectFields?: boolean;
     tableFlat?: boolean;
-    onChange?: (newData: MetaListType[], curData: {
+    onChange?: (oldData: MetaListType[], curData: {
         data: any;
         type: ChangeType;
-    }, options: FetchOptions) => Promise<void | Boolean>;
+    }, options: FetchOptions, newData: MetaListType[]) => Promise<void | Boolean>;
     copyType?: (FormulaTypeEnum | string)[];
     metabaseCopy?: boolean;
     moduleDiff?: boolean;

package/lib/es/utils.js

@@ -1057,6 +1057,34 @@ var isAliasTargetSummarizeRecord = function isAliasTargetSummarizeRecord(record,
     type: AtomsTypeEnum.FIELD
   }, target);
 };
+var isAliasTargetColumn = function isAliasTargetColumn(column, target, table) {
+  return isAliasTargetField({
+    fieldName: column.name || '',
+    fieldNameZh: column.name_zh || '',
+    fieldAlias: column.fieldAlias || '',
+    fieldUuid: column.fieldUuid || '',
+    fieldId: column.fieldId || column.id || '',
+    tableName: (table === null || table === void 0 ? void 0 : table.name) || column.tableName || '',
+    tableNameZh: (table === null || table === void 0 ? void 0 : table.name_zh) || column.tableNameZh || '',
+    tableId: (table === null || table === void 0 ? void 0 : table.id) || column.tableId || '',
+    tableAlias: (table === null || table === void 0 ? void 0 : table.alias) || column.tableAlias || '',
+    tableUuid: (table === null || table === void 0 ? void 0 : table.tableUuid) || column.tableUuid || '',
+    datasourceName: (table === null || table === void 0 ? void 0 : table.datasourceName) || column.datasourceName || '',
+    datasourceId: (table === null || table === void 0 ? void 0 : table.datasourceId) || column.datasourceId || '',
+    type: AtomsTypeEnum.FIELD
+  }, target);
+};
+var changeColumnAlias = function changeColumnAlias() {
+  var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var target = arguments.length > 1 ? arguments[1] : undefined;
+  var table = arguments.length > 2 ? arguments[2] : undefined;
+  return columns.map(function (column) {
+    return isAliasTargetColumn(column, target, table) ? _objectSpread(_objectSpread({}, column), {}, {
+      fieldAlias: target.alias,
+      fieldUuid: column.fieldUuid || target.uuid || ''
+    }) : column;
+  });
+};
 var _changeAlias = function changeAlias(items, val, type) {
   return items.map(function (v) {
     var nextItem;
@@ -1265,8 +1293,15 @@ export var changeFieldAlias = function changeFieldAlias(list, curObj) {
   };
   var newList = cloneDeep(list);
   return (newList === null || newList === void 0 ? void 0 : newList.map(function (v) {
-    if (v.type === TypeEnum.data) {}
+    if (v.type === TypeEnum.data) {
+      if (v.columns && v.columns.length > 0) {
+        v.columns = changeColumnAlias(v.columns, aliasTarget, v.table);
+      }
+    }
     if (v.type === TypeEnum.joinData) {
+      if (v.columns && v.columns.length > 0) {
+        v.columns = changeColumnAlias(v.columns, aliasTarget, v.table2);
+      }
       if (v.expressions && v.expressions.length > 0) {
         v.expressions = _changeAlias(v.expressions, aliasTarget, AliasType.field);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.142",
+  "version": "1.0.143-alpha.0",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",