@gingkoo/pandora-metabase 1.0.28 → 1.0.30

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

@@ -84,9 +84,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
     tableList = _useState6[0],
     setTableList = _useState6[1];
-  // useEffect(() => {
-  //   setCurTable(tableInfo);
-  // }, [tableInfo]);
   (0, _react.useEffect)(function () {
     // setCurColumn(_value);
     setValue(_value);
@@ -97,8 +94,15 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     }).length) > 0;
   };
   (0, _react.useEffect)(function () {
+    var tableUuid = curTable;
+    var isHas = data.filter(function (v) {
+      return v.tableUuid === tableUuid;
+    });
+    if (isHas.length < 1 && tableUuid !== _helper.SummarizeAlias) {
+      tableUuid = data[0].tableUuid;
+    }
     setTableList(data.map(function (v, i) {
-      var open = !i && !curTable ? true : v.tableUuid === curTable; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+      var open = !i && !tableUuid ? true : v.tableUuid === tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
       return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
         open: open,
         searchText: '',

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

@@ -82,12 +82,19 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     setTableList = _useState8[1];
   (0, _react.useEffect)(function () {
     setValue(_value);
-    setCurTable(_value.tableUuid);
     setCurColumn(_value.name);
   }, [_value]);
   (0, _react.useEffect)(function () {
+    var tableUuid = _value === null || _value === void 0 ? void 0 : _value.tableUuid;
+    var isHas = data.filter(function (v) {
+      return v.tableUuid === tableUuid;
+    });
+    if (isHas.length < 1) {
+      tableUuid = data[0].tableUuid;
+    }
+    setCurTable(tableUuid);
     setTableList(data.map(function (v, i) {
-      var open = !i && !_value.tableUuid ? true : v.tableUuid === _value.tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+      var open = !i && !tableUuid ? true : v.tableUuid === tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
       return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
         open: open,
         searchText: '',

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

@@ -924,7 +924,15 @@ var JoinData = function JoinData(props) {
               var newColumns = items.flatMap(function (item) {
                 return item.columns;
               });
-              newMeta[index].columns = newColumns;
+              newMeta[index].columns = newColumns.map(function (newCol) {
+                // 查找旧列中是否有相同 name 的列
+                var existingCol = newMeta[index].columns.find(function (oldCol) {
+                  return oldCol.name === newCol.name;
+                });
+                // 如果存在，返回旧列；否则返回新列
+                return existingCol ? existingCol : newCol;
+              });
+              // (newMeta[index] as MetaJoin).columns = newColumns;
               initExpressions();
               // 关联表变了 下面模块全部删除
               // newMeta = newMeta.filter((v: MetaListType, i: number) => i <= index);

package/lib/cjs/locale/en.js

@@ -55,7 +55,7 @@ var _default = exports["default"] = (0, _index.register)('en', {
   'SqlQueryBuilder.visualize': 'visualize',
   'SqlQueryBuilder.selectColumnAll': 'select all',
   'SqlQueryBuilder.alias': 'alias',
-  'SqlQueryBuilder.aliasForRules': 'Please enter a combination of letters, underscores, and numbers, with a length not exceeding 30 bytes',
+  'SqlQueryBuilder.aliasForRules': 'The alias only supports a combination of letters, numbers, and underscores. It must start with a letter and cannot exceed 30 bytes',
   'customColumn.operator': 'operator',
   'customColumn.collection': 'collection',
   'customColumn.field': 'field',

package/lib/cjs/locale/zh.js

@@ -51,7 +51,7 @@ var _default = exports["default"] = (0, _index.register)('zh', {
   'SqlQueryBuilder.visualize': '可视化',
   'SqlQueryBuilder.selectColumnAll': '全选',
   'SqlQueryBuilder.alias': '别名',
-  'SqlQueryBuilder.aliasForRules': '请输入字母加下划线加数字，且长度不能超过30个字节',
+  'SqlQueryBuilder.aliasForRules': '别名只支持字母 + 数字 + 下划线组合，必须是字母开头，且不能超过30个字节',
   'customColumn.operator': '操作符',
   'customColumn.collection': '自定义组合',
   'customColumn.field': '字段',

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

@@ -78,9 +78,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     tableList = _useState6[0],
     setTableList = _useState6[1];
-  // useEffect(() => {
-  //   setCurTable(tableInfo);
-  // }, [tableInfo]);
   useEffect(function () {
     // setCurColumn(_value);
     setValue(_value);
@@ -91,8 +88,15 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     }).length) > 0;
   };
   useEffect(function () {
+    var tableUuid = curTable;
+    var isHas = data.filter(function (v) {
+      return v.tableUuid === tableUuid;
+    });
+    if (isHas.length < 1 && tableUuid !== SummarizeAlias) {
+      tableUuid = data[0].tableUuid;
+    }
     setTableList(data.map(function (v, i) {
-      var open = !i && !curTable ? true : v.tableUuid === curTable; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+      var open = !i && !tableUuid ? true : v.tableUuid === tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
       return _objectSpread(_objectSpread({}, v), {}, {
         open: open,
         searchText: '',

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

@@ -74,12 +74,19 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     setTableList = _useState8[1];
   useEffect(function () {
     setValue(_value);
-    setCurTable(_value.tableUuid);
     setCurColumn(_value.name);
   }, [_value]);
   useEffect(function () {
+    var tableUuid = _value === null || _value === void 0 ? void 0 : _value.tableUuid;
+    var isHas = data.filter(function (v) {
+      return v.tableUuid === tableUuid;
+    });
+    if (isHas.length < 1) {
+      tableUuid = data[0].tableUuid;
+    }
+    setCurTable(tableUuid);
     setTableList(data.map(function (v, i) {
-      var open = !i && !_value.tableUuid ? true : v.tableUuid === _value.tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+      var open = !i && !tableUuid ? true : v.tableUuid === tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
       return _objectSpread(_objectSpread({}, v), {}, {
         open: open,
         searchText: '',

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

@@ -918,7 +918,15 @@ var JoinData = function JoinData(props) {
               var newColumns = items.flatMap(function (item) {
                 return item.columns;
               });
-              newMeta[index].columns = newColumns;
+              newMeta[index].columns = newColumns.map(function (newCol) {
+                // 查找旧列中是否有相同 name 的列
+                var existingCol = newMeta[index].columns.find(function (oldCol) {
+                  return oldCol.name === newCol.name;
+                });
+                // 如果存在，返回旧列；否则返回新列
+                return existingCol ? existingCol : newCol;
+              });
+              // (newMeta[index] as MetaJoin).columns = newColumns;
               initExpressions();
               // 关联表变了 下面模块全部删除
               // newMeta = newMeta.filter((v: MetaListType, i: number) => i <= index);

package/lib/es/locale/en.js

@@ -49,7 +49,7 @@ export default register('en', {
   'SqlQueryBuilder.visualize': 'visualize',
   'SqlQueryBuilder.selectColumnAll': 'select all',
   'SqlQueryBuilder.alias': 'alias',
-  'SqlQueryBuilder.aliasForRules': 'Please enter a combination of letters, underscores, and numbers, with a length not exceeding 30 bytes',
+  'SqlQueryBuilder.aliasForRules': 'The alias only supports a combination of letters, numbers, and underscores. It must start with a letter and cannot exceed 30 bytes',
   'customColumn.operator': 'operator',
   'customColumn.collection': 'collection',
   'customColumn.field': 'field',

package/lib/es/locale/zh.js

@@ -45,7 +45,7 @@ export default register('zh', {
   'SqlQueryBuilder.visualize': '可视化',
   'SqlQueryBuilder.selectColumnAll': '全选',
   'SqlQueryBuilder.alias': '别名',
-  'SqlQueryBuilder.aliasForRules': '请输入字母加下划线加数字，且长度不能超过30个字节',
+  'SqlQueryBuilder.aliasForRules': '别名只支持字母 + 数字 + 下划线组合，必须是字母开头，且不能超过30个字节',
   'customColumn.operator': '操作符',
   'customColumn.collection': '自定义组合',
   'customColumn.field': '字段',

package/package.json

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