@gingkoo/pandora-metabase 1.0.14 → 1.0.16

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

@@ -31,6 +31,7 @@ var PermissionTable = function PermissionTable(props) {
     if (ExistAboveGroupBy) {
       var _data = {
         name: prevGroupBy.alias,
+        name_zh: prevGroupBy.alias,
         id: prevGroupBy.alias,
         tableUuid: (0, _helper.uuidv4)('table'),
         alias: prevGroupBy.alias,
@@ -48,6 +49,7 @@ var PermissionTable = function PermissionTable(props) {
           return {
             alias: v.table2.alias,
             name: v.table2.name,
+            name_zh: v.table2.name_zh,
             tableUuid: v.table2.tableUuid,
             id: v.table2.id,
             datasourceId: v.table2.datasourceId,
@@ -61,6 +63,7 @@ var PermissionTable = function PermissionTable(props) {
           mo.push({
             alias: v.table.alias,
             name: v.table.name,
+            name_zh: v.table.name_zh,
             id: v.table.id,
             tableUuid: v.table.tableUuid,
             datasourceId: v.table.datasourceId,
@@ -70,6 +73,7 @@ var PermissionTable = function PermissionTable(props) {
           mo.push({
             alias: v.table2.alias,
             name: v.table2.name,
+            name_zh: v.table2.name_zh,
             id: v.table2.id,
             tableUuid: v.table2.tableUuid,
             datasourceId: v.table2.datasourceId,

package/lib/cjs/components/modules/sort.js

@@ -11,9 +11,9 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _locale = require("../../locale");
 var _utils = require("../../utils");
-var _helper = require("../../store/helper");
 var _enum = require("../../store/enum");
-var _helper2 = require("../../utils/helper");
+var _types = require("../../store/types");
+var _helper = require("../../utils/helper");
 var _icons = require("../icons");
 var _dialog = require("../dialog");
 var _Wrapper = _interopRequireDefault(require("./components/Wrapper"));
@@ -34,18 +34,20 @@ var Sort = function Sort(props) {
     if (ExistAboveGroupBy) {
       var _prevGroupBy$group, _prevGroupBy$by;
       var _data = {
-        table: prevGroupBy.alias,
-        tableId: prevGroupBy.alias,
-        tableUuid: prevGroupBy.tableUuid || (0, _helper2.uuidv4)('table'),
         alias: prevGroupBy.alias,
+        name_zh: prevGroupBy.alias,
+        name: prevGroupBy.alias,
+        id: prevGroupBy.alias,
+        tableUuid: prevGroupBy.tableUuid || (0, _helper.uuidv4)('table'),
+        // alias: (prevGroupBy as MetaSummarize).alias,
         columns: []
       };
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group = prevGroupBy.group) !== null && _prevGroupBy$group !== void 0 && _prevGroupBy$group.length) {
         _data.columns = _data.columns.concat(prevGroupBy.group.map(function (v) {
-          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({
-            name_zh: v.quotes
-          }, v), {}, {
-            name: v.quotes,
+          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+            name: v.name || v.quotes,
+            name_zh: v.name_zh || v.quotes,
+            id: v.id || v.fieldId,
             // name_zh: '',
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || _enum.SQL_COLUMN_TYPE.FLOAT,
             special_type: '',
@@ -56,11 +58,10 @@ var Sort = function Sort(props) {
       }
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$by = prevGroupBy.by) !== null && _prevGroupBy$by !== void 0 && _prevGroupBy$by.length) {
         _data.columns = _data.columns.concat(prevGroupBy.by.map(function (v) {
-          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({
-            name_zh: v.quotes
-          }, v), {}, {
-            name: v.quotes,
-            // name_zh: '',
+          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+            name: v.name || v.quotes,
+            name_zh: v.name_zh || v.quotes,
+            id: v.id || v.fieldId,
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || _enum.SQL_COLUMN_TYPE.FLOAT,
             special_type: '',
             sql: v.sql,
@@ -75,18 +76,22 @@ var Sort = function Sort(props) {
         if (v.type === _enum.TypeEnum.data) {
           return {
             alias: v.table.alias,
-            table: v.table.name,
+            name: v.table.name,
+            name_zh: v.table.name_zh,
             tableUuid: v.table.tableUuid,
-            tableId: v.table.id,
+            id: v.table.id,
             columns: v.columns
           };
         } else if (v.type === _enum.TypeEnum.joinData) {
           return {
             alias: v.table2.alias,
-            table: v.table2.name,
+            name: v.table2.name,
+            name_zh: v.table2.name_zh,
             tableUuid: v.table2.tableUuid,
-            tableId: v.table2.id,
-            columns: v.columns
+            id: v.table2.id,
+            columns: v.columns,
+            datasourceId: v.table2.datasourceId,
+            datasourceName: v.table2.datasourceName
           };
         } else {
           return {
@@ -94,7 +99,7 @@ var Sort = function Sort(props) {
           };
         }
       }).filter(function (v) {
-        return v.table;
+        return v.name;
       });
     }
     return data;
@@ -102,30 +107,20 @@ var Sort = function Sort(props) {
   function addSortColumn(e) {
     var node = e.currentTarget || e.target;
     var newMeta = store.metaList[groupIndex].list.slice();
-    var value = {
-      table: '',
-      tableId: '',
-      tableUuid: '',
-      fieldUuid: '',
-      fieldAlias: '',
-      alias: '',
-      name: '',
-      id: '',
-      database_type: '',
-      datasourceId: '',
-      // 数据源id
-      datasourceName: '' // 数据源名
-    };
     var data = getColumns();
     // ② 过滤掉已经选择的 排序参数
     var selectedSort = {}; // {tableAlias: [columnName, columnName]}
     //@ts-ignore
     newMeta[index].sort.forEach(function (v) {
-      if (selectedSort[v.alias]) {
-        selectedSort[v.alias].push(v.name);
-      } else {
-        selectedSort[v.alias] = [v.name];
-      }
+      v.expression.forEach(function (vv) {
+        if (vv.type === _types.AtomsTypeEnum.FIELD) {
+          if (selectedSort[vv.fieldName]) {
+            selectedSort[vv.tableAlias].push(vv.fieldName);
+          } else {
+            selectedSort[vv.tableAlias] = [vv.fieldName];
+          }
+        }
+      });
     });
     data = data.map(function (v) {
       if (v.alias in selectedSort) {
@@ -141,59 +136,69 @@ var Sort = function Sort(props) {
     store.setPopup({
       visible: true,
       node: node,
-      content: (0, _jsxRuntime.jsx)(_dialog.SelectJoinColumn, {
+      content: (0, _jsxRuntime.jsx)(_dialog.SelectColumnMultiple, {
         data: data,
-        value: value,
+        value: [],
+        multiple: false,
         theme: _enum.ColumnsPopupThemeEnum.greenGrass,
-        onSelect: function onSelect(record) {
-          var table = record.table,
-            name = record.name,
-            tableId = record.tableId,
-            tableUuid = record.tableUuid,
-            id = record.id,
-            alias = record.alias,
-            sql = record.sql;
-          if (alias === _helper.SummarizeAlias) {
-            var _sql$split;
-            var aliasColumns = (sql === null || sql === void 0 || (_sql$split = sql.split(' AS ')) === null || _sql$split === void 0 ? void 0 : _sql$split[1]) || '';
-            if (store.metaList[groupIndex].list[index - 1].type === _enum.TypeEnum.summarize) {
-              //@ts-ignore
-              newMeta[index].sort = [].concat((0, _toConsumableArray2["default"])(newMeta[index].sort), [{
-                table: table,
-                tableId: tableId,
-                tableUuid: tableUuid,
-                id: id,
-                alias: alias,
-                name: name,
-                sort: _enum.SortEnum.asc,
-                sql: aliasColumns
-              }]);
-            } else {
-              //@ts-ignore
-              newMeta[index].sort = [].concat((0, _toConsumableArray2["default"])(newMeta[index].sort), [{
-                table: table,
-                id: id,
-                tableId: tableId,
-                tableUuid: tableUuid,
-                alias: alias,
-                name: name,
-                sort: _enum.SortEnum.asc,
-                sql: "".concat(_helper.SummarizeAlias, ".").concat(aliasColumns)
-              }]);
-            }
-          } else {
-            //@ts-ignore
-            newMeta[index].sort = [].concat((0, _toConsumableArray2["default"])(newMeta[index].sort), [{
-              table: table,
-              tableId: tableId,
-              tableUuid: tableUuid,
-              id: id,
-              alias: alias,
-              name: name,
-              sort: _enum.SortEnum.asc,
-              sql: "".concat(alias, ".").concat(name)
-            }]);
-          }
+        onSelect: function onSelect(fields) {
+          newMeta[index].sort = [].concat((0, _toConsumableArray2["default"])(newMeta[index].sort), [{
+            expression: fields,
+            sort: _enum.SortEnum.asc
+          }]);
+          // let { table, name, tableId, tableUuid, id, alias, sql } = record;
+          // if (alias === SummarizeAlias) {
+          //   let aliasColumns = (sql as string)?.split(' AS ')?.[1] || '';
+          //   if (store.metaList[groupIndex].list[index - 1].type === TypeEnum.summarize) {
+          //     //@ts-ignore
+          //     newMeta[index].sort = [
+          //       //@ts-ignore
+          //       ...newMeta[index].sort,
+          //       {
+          //         table,
+          //         tableId,
+          //         tableUuid,
+          //         id,
+          //         alias,
+          //         name,
+          //         sort: SortEnum.asc,
+          //         sql: aliasColumns,
+          //       },
+          //     ];
+          //   } else {
+          //     //@ts-ignore
+          //     newMeta[index].sort = [
+          //       //@ts-ignore
+          //       ...newMeta[index].sort,
+          //       {
+          //         table,
+          //         id,
+          //         tableId,
+          //         tableUuid,
+          //         alias,
+          //         name,
+          //         sort: SortEnum.asc,
+          //         sql: `${SummarizeAlias}.${aliasColumns}`,
+          //       },
+          //     ];
+          //   }
+          // } else {
+          //   //@ts-ignore
+          //   newMeta[index].sort = [
+          //     //@ts-ignore
+          //     ...newMeta[index].sort,
+          //     {
+          //       table,
+          //       tableId,
+          //       tableUuid,
+          //       id,
+          //       alias,
+          //       name,
+          //       sort: SortEnum.asc,
+          //       sql: `${alias}.${name}`,
+          //     },
+          //   ];
+          // }
           store.setMeta(newMeta, groupIndex);
           store.setPopup({
             visible: false
@@ -224,6 +229,12 @@ var Sort = function Sort(props) {
     });
     store.setMeta(newMeta, groupIndex);
   }
+  var getName = function getName() {
+    var expression = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    return expression.map(function (v) {
+      return v.fieldName;
+    }).join(' || ');
+  };
   return (0, _jsxRuntime.jsx)(_Wrapper["default"], {
     className: (0, _classnames["default"])("Sqb-item"),
     children: (0, _jsxRuntime.jsxs)("div", {
@@ -244,7 +255,7 @@ var Sort = function Sort(props) {
               onClick: function onClick() {
                 return handleSort(i);
               },
-              children: [v.sort === _enum.SortEnum.asc ? (0, _jsxRuntime.jsx)(_icons.UpArrowIcon, {}) : (0, _jsxRuntime.jsx)(_icons.DownArrowIcon, {}), v.name, (0, _jsxRuntime.jsx)("span", {
+              children: [v.sort === _enum.SortEnum.asc ? (0, _jsxRuntime.jsx)(_icons.UpArrowIcon, {}) : (0, _jsxRuntime.jsx)(_icons.DownArrowIcon, {}), getName(v.expression), (0, _jsxRuntime.jsx)("span", {
                 style: {
                   fontSize: 0
                 },

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -42,10 +44,10 @@ var GroupBy = function GroupBy(props) {
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group = prevGroupBy.group) !== null && _prevGroupBy$group !== void 0 && _prevGroupBy$group.length) {
         _data.columns = _data.columns.concat(prevGroupBy.group.map(function (v) {
           var _v$sql;
-          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({
-            name_zh: v.quotes
-          }, v), {}, {
-            name: v.quotes,
+          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+            name: v.name || v.quotes,
+            name_zh: v.name_zh || v.quotes,
+            id: v.id || v.fieldId,
             realName: ((_v$sql = v.sql) === null || _v$sql === void 0 || (_v$sql = _v$sql.split(' AS ')) === null || _v$sql === void 0 ? void 0 : _v$sql[1]) || '',
             // name_zh: '',
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || _enum.SQL_COLUMN_TYPE.FLOAT,
@@ -57,10 +59,10 @@ var GroupBy = function GroupBy(props) {
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$by = prevGroupBy.by) !== null && _prevGroupBy$by !== void 0 && _prevGroupBy$by.length) {
         _data.columns = _data.columns.concat(prevGroupBy.by.map(function (v) {
           var _v$sql2;
-          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({
-            name_zh: v.quotes
-          }, v), {}, {
-            name: v.quotes,
+          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+            name: v.name || v.quotes,
+            name_zh: v.name_zh || v.quotes,
+            id: v.id || v.fieldId,
             realName: ((_v$sql2 = v.sql) === null || _v$sql2 === void 0 || (_v$sql2 = _v$sql2.split(' AS ')) === null || _v$sql2 === void 0 ? void 0 : _v$sql2[1]) || '',
             // name_zh: '',
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || _enum.SQL_COLUMN_TYPE.FLOAT,
@@ -165,6 +167,7 @@ var GroupBy = function GroupBy(props) {
       alias: '',
       fieldAlias: '',
       fieldUuid: '',
+      fieldId: '',
       name: '',
       id: '',
       sql: '',
@@ -234,14 +237,42 @@ var GroupBy = function GroupBy(props) {
           fieldAlias = val;
         }
       }),
-      onOk: function onOk() {
-        var newMeta = store.metaList[groupIndex].list.slice();
-        // @ts-ignore
-        newMeta[index].by[i].sql = newMeta[index].by[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
-        newMeta[index].by[i].fieldAlias = fieldAlias;
-        newMeta = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].by[i]);
-        store.setMeta(newMeta, groupIndex);
-      },
+      onOk: function () {
+        var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+          var newMeta;
+          return _regenerator["default"].wrap(function (_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                if (fieldAlias) {
+                  _context.next = 1;
+                  break;
+                }
+                _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasCannotEmpty'));
+                return _context.abrupt("return", false);
+              case 1:
+                if (!(fieldAlias.length > 30)) {
+                  _context.next = 2;
+                  break;
+                }
+                _pandora.Toast.warning('别名长度不能超过30');
+                return _context.abrupt("return", false);
+              case 2:
+                newMeta = store.metaList[groupIndex].list.slice(); // @ts-ignore
+                newMeta[index].by[i].sql = newMeta[index].by[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
+                newMeta[index].by[i].fieldAlias = fieldAlias;
+                newMeta = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].by[i]);
+                store.setMeta(newMeta, groupIndex);
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function onOk() {
+          return _onOk.apply(this, arguments);
+        }
+        return onOk;
+      }(),
       onCancel: function onCancel() {}
     });
   };

package/lib/cjs/components/modules/summarize/select-index.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -43,10 +45,10 @@ var SelectIndex = function SelectIndex(props) {
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group = prevGroupBy.group) !== null && _prevGroupBy$group !== void 0 && _prevGroupBy$group.length) {
         _data.columns = _data.columns.concat(prevGroupBy.group.map(function (v) {
           var _v$sql;
-          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({
-            name_zh: v.quotes
-          }, v), {}, {
-            name: v.quotes,
+          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+            name: v.name || v.quotes,
+            name_zh: v.name_zh || v.quotes,
+            id: v.id || v.fieldId,
             fieldUuid: (0, _helper2.uuidv4)('field'),
             fieldAlias: v.fieldAlias || '',
             realName: ((_v$sql = v.sql) === null || _v$sql === void 0 || (_v$sql = _v$sql.split(' AS ')) === null || _v$sql === void 0 ? void 0 : _v$sql[1]) || '',
@@ -60,10 +62,10 @@ var SelectIndex = function SelectIndex(props) {
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$by = prevGroupBy.by) !== null && _prevGroupBy$by !== void 0 && _prevGroupBy$by.length) {
         _data.columns = _data.columns.concat(prevGroupBy.by.map(function (v) {
           var _v$sql2;
-          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({
-            name_zh: v.quotes
-          }, v), {}, {
-            name: v.quotes,
+          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+            name: v.name || v.quotes,
+            name_zh: v.name_zh || v.quotes,
+            id: v.id || v.fieldId,
             realName: ((_v$sql2 = v.sql) === null || _v$sql2 === void 0 || (_v$sql2 = _v$sql2.split(' AS ')) === null || _v$sql2 === void 0 ? void 0 : _v$sql2[1]) || '',
             // name_zh: '',
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || _enum.SQL_COLUMN_TYPE.FLOAT,
@@ -145,6 +147,7 @@ var SelectIndex = function SelectIndex(props) {
               sql = _summarizeToSql.sql,
               fieldAlias = _summarizeToSql.fieldAlias;
             return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+              name: v.name || v.quotes,
               //@ts-ignore
               sql: sql,
               fieldAlias: fieldAlias
@@ -199,7 +202,7 @@ var SelectIndex = function SelectIndex(props) {
               sql = _summarizeToSql2.sql,
               fieldAlias = _summarizeToSql2.fieldAlias;
             return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
-              // @ts-ignore
+              name: v.name || v.quotes,
               sql: sql,
               fieldUuid: (0, _helper2.uuidv4)('field'),
               fieldAlias: fieldAlias,
@@ -242,14 +245,42 @@ var SelectIndex = function SelectIndex(props) {
         }
       }),
       icon: false,
-      onOk: function onOk() {
-        var newMeta = store.metaList[groupIndex].list.slice();
-        // @ts-ignore
-        newMeta[index].group[i].fieldAlias = fieldAlias;
-        newMeta[index].group[i].sql = newMeta[index].group[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
-        newMeta = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].group[i]);
-        store.setMeta(newMeta, groupIndex);
-      },
+      onOk: function () {
+        var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+          var newMeta;
+          return _regenerator["default"].wrap(function (_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                if (fieldAlias) {
+                  _context.next = 1;
+                  break;
+                }
+                _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasCannotEmpty'));
+                return _context.abrupt("return", false);
+              case 1:
+                if (!(fieldAlias.length > 30)) {
+                  _context.next = 2;
+                  break;
+                }
+                _pandora.Toast.warning('别名长度不能超过30');
+                return _context.abrupt("return", false);
+              case 2:
+                newMeta = store.metaList[groupIndex].list.slice(); // @ts-ignore
+                newMeta[index].group[i].fieldAlias = fieldAlias;
+                newMeta[index].group[i].sql = newMeta[index].group[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
+                newMeta = (0, _utils.changeFieldAlias)(newMeta, newMeta[index].group[i]);
+                store.setMeta(newMeta, groupIndex);
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function onOk() {
+          return _onOk.apply(this, arguments);
+        }
+        return onOk;
+      }(),
       onCancel: function onCancel() {}
     });
   };

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

@@ -91,21 +91,28 @@ var TableData = function TableData(props) {
       onOk: function () {
         var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
           var newMetaList;
-          return _regenerator["default"].wrap(function _callee$(_context) {
+          return _regenerator["default"].wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if (alias) {
-                  _context.next = 5;
+                  _context.next = 1;
                   break;
                 }
                 _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasCannotEmpty'));
                 return _context.abrupt("return", false);
-              case 5:
+              case 1:
+                if (!(alias.length > 30)) {
+                  _context.next = 2;
+                  break;
+                }
+                _pandora.Toast.warning('别名长度不能超过30');
+                return _context.abrupt("return", false);
+              case 2:
                 newMetaList = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMetaList[0].table.alias = alias;
                 newMetaList = (0, _utils.changeTableAlias)(newMetaList, newMetaList[0].table);
                 store.setMeta(newMetaList, groupIndex);
-              case 9:
+              case 3:
               case "end":
                 return _context.stop();
             }
@@ -182,6 +189,8 @@ var TableData = function TableData(props) {
     newMetaList.table = {
       name: '',
       // 表名
+      name_zh: '',
+      // 表名
       tableUuid: '',
       id: '',
       // 表名

package/lib/cjs/components/popup.js

@@ -19,8 +19,7 @@ var React = _interopRequireWildcard(require("react"));
 var _helperDom = require("../utils/helper-dom");
 var _event = require("../utils/event");
 var _Portal = _interopRequireDefault(require("../common/Portal"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, (0, _isNativeReflectConstruct2["default"])() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function returnDocument(element) {
   if (element) {

package/lib/cjs/hooks/patch.d.ts

@@ -0,0 +1,4 @@
+export declare const joinDataPatch: (newMeta: any) => any;
+export declare const filterPatch: (newMeta: any) => any;
+export declare const customColumnPatch: (newMeta: any) => any;
+export declare const sortPatch: (newMeta: any) => any;