@gingkoo/pandora-metabase 1.0.58 → 1.0.60

package/lib/cjs/components/metabase/index.less

@@ -261,6 +261,9 @@
           }
           &.isError {
             background-color: red;
+            &:hover {
+              background-color: red;
+            }
           }
         }
 

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

@@ -1150,6 +1150,7 @@ var JoinData = function JoinData(props) {
                 obj: newList,
                 type: _types.ChangeType.subQuery
               });
+              tableIsDel();
               o.close();
             } catch (e) {
               console.warn(e);

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -342,9 +343,9 @@ var GroupBy = function GroupBy(props) {
           },
           children: [v.quotes && (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
             children: store.fieldEnableAlias && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-              title: (0, _locale.__)('SqlQueryBuilder.alias'),
+              title: !(0, _utils.isValidSQLAlias)(v === null || v === void 0 ? void 0 : v.fieldAlias) ? (0, _locale.__)('SqlQueryBuilder.aliasForRules') : (0, _locale.__)('SqlQueryBuilder.alias'),
               children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-                className: ':Sqb-TableName-as :Sqb-TableName green-name',
+                className: (0, _classnames["default"])(':Sqb-TableName-as :Sqb-TableName green-name', (0, _defineProperty2["default"])({}, 'isError', !(0, _utils.isValidSQLAlias)(v === null || v === void 0 ? void 0 : v.fieldAlias))),
                 shape: 'circle',
                 iconOnly: true,
                 primary: true,

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -340,9 +341,9 @@ var SelectIndex = function SelectIndex(props) {
           },
           children: [v.quotes && (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
             children: store.fieldEnableAlias && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-              title: (0, _locale.__)('SqlQueryBuilder.alias'),
+              title: !(0, _utils.isValidSQLAlias)(v === null || v === void 0 ? void 0 : v.fieldAlias) ? (0, _locale.__)('SqlQueryBuilder.aliasForRules') : (0, _locale.__)('SqlQueryBuilder.alias'),
               children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-                className: ':Sqb-TableName-as :Sqb-TableName green-name',
+                className: (0, _classnames["default"])(':Sqb-TableName-as :Sqb-TableName green-name', (0, _defineProperty2["default"])({}, 'isError', !(0, _utils.isValidSQLAlias)(v === null || v === void 0 ? void 0 : v.fieldAlias))),
                 shape: 'circle',
                 iconOnly: true,
                 primary: true,

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

@@ -243,6 +243,7 @@ var TableData = function TableData(props) {
                 obj: newList,
                 type: _types.ChangeType.subQuery
               });
+              tableIsDel();
               o.close();
             } catch (e) {
               console.warn(e);

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

@@ -220,7 +220,9 @@ var useStore = function useStore() {
             return _context.abrupt("return", tables);
           case 1:
             _context.next = 2;
-            return fetchDatasetFn.current(datasourceId);
+            return fetchDatasetFn.current(datasourceId, {
+              isExit: isExit
+            });
           case 2:
             _tables = _context.sent;
             setDataset(datasourceId, _tables);
@@ -280,7 +282,9 @@ var useStore = function useStore() {
               break;
             }
             _context2.next = 1;
-            return fetchColumnsFn.current(extra, datasourceId);
+            return fetchColumnsFn.current(extra, datasourceId, {
+              isExit: isExit
+            });
           case 1:
             columns = _context2.sent;
             setColumns(tableName, columns);
@@ -330,9 +334,12 @@ var useStore = function useStore() {
             return _context3.abrupt("return");
           case 1:
             _context3.next = 2;
-            return fetchChangeFn.current((0, _utils.splitByUnion)(_metaList), changeObj);
+            return fetchChangeFn.current((0, _utils.splitByUnion)(_metaList), changeObj, {
+              isExit: isExit
+            });
           case 2:
             isChange = _context3.sent;
+            // 是否还原
             if (isChange === false) {
               _setMeta(_metaList);
             }

package/lib/cjs/types.d.ts

@@ -8,16 +8,19 @@ export interface MetaListProps {
     subquery?: MetaListType[];
     list: MetaListType[];
 }
+export interface FetchOptions {
+    isExit: boolean;
+}
 export interface MetabaseProps {
     loading?: boolean;
     btnText?: string;
     showFields?: boolean;
     readonly?: boolean;
-    getTables: (datasourceId: string) => Promise<any>;
+    getTables: (datasourceId: string, options: FetchOptions) => Promise<any>;
     getColumns: (table: {
         name: string;
         [key: string]: any;
-    }, datasourceId: string) => Promise<any>;
+    }, datasourceId: string, options: FetchOptions) => Promise<any>;
     toolbar?: ToolbarType[];
     subToolbar?: ToolbarType[];
     tableNameTpl?: string;
@@ -38,10 +41,10 @@ export interface MetabaseProps {
     tableEnableAlias?: boolean;
     fieldEnableAlias?: boolean;
     isSelectFields?: boolean;
-    onChange?: (newData: MetaListType[], curData?: {
+    onChange?: (newData: MetaListType[], curData: {
         data: any;
         type: ChangeType;
-    }) => Promise<void | Boolean>;
+    }, options: FetchOptions) => Promise<void | Boolean>;
 }
 export interface OptionItem {
     value?: string;

package/lib/es/components/metabase/index.less

@@ -261,6 +261,9 @@
           }
           &.isError {
             background-color: red;
+            &:hover {
+              background-color: red;
+            }
           }
         }
 

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

@@ -1145,6 +1145,7 @@ var JoinData = function JoinData(props) {
                 obj: newList,
                 type: ChangeType.subQuery
               });
+              tableIsDel();
               o.close();
             } catch (e) {
               console.warn(e);

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

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -336,9 +337,9 @@ var GroupBy = function GroupBy(props) {
           },
           children: [v.quotes && _jsx(_Fragment, {
             children: store.fieldEnableAlias && _jsx(Tooltip, {
-              title: __('SqlQueryBuilder.alias'),
+              title: !isValidSQLAlias(v === null || v === void 0 ? void 0 : v.fieldAlias) ? __('SqlQueryBuilder.aliasForRules') : __('SqlQueryBuilder.alias'),
               children: _jsx(Button, {
-                className: ':Sqb-TableName-as :Sqb-TableName green-name',
+                className: cx(':Sqb-TableName-as :Sqb-TableName green-name', _defineProperty({}, 'isError', !isValidSQLAlias(v === null || v === void 0 ? void 0 : v.fieldAlias))),
                 shape: 'circle',
                 iconOnly: true,
                 primary: true,

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

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -334,9 +335,9 @@ var SelectIndex = function SelectIndex(props) {
           },
           children: [v.quotes && _jsx(_Fragment, {
             children: store.fieldEnableAlias && _jsx(Tooltip, {
-              title: __('SqlQueryBuilder.alias'),
+              title: !isValidSQLAlias(v === null || v === void 0 ? void 0 : v.fieldAlias) ? __('SqlQueryBuilder.aliasForRules') : __('SqlQueryBuilder.alias'),
               children: _jsx(Button, {
-                className: ':Sqb-TableName-as :Sqb-TableName green-name',
+                className: cx(':Sqb-TableName-as :Sqb-TableName green-name', _defineProperty({}, 'isError', !isValidSQLAlias(v === null || v === void 0 ? void 0 : v.fieldAlias))),
                 shape: 'circle',
                 iconOnly: true,
                 primary: true,

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

@@ -237,6 +237,7 @@ var TableData = function TableData(props) {
                 obj: newList,
                 type: ChangeType.subQuery
               });
+              tableIsDel();
               o.close();
             } catch (e) {
               console.warn(e);

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

@@ -214,7 +214,9 @@ var useStore = function useStore() {
             return _context.abrupt("return", tables);
           case 1:
             _context.next = 2;
-            return fetchDatasetFn.current(datasourceId);
+            return fetchDatasetFn.current(datasourceId, {
+              isExit: isExit
+            });
           case 2:
             _tables = _context.sent;
             setDataset(datasourceId, _tables);
@@ -274,7 +276,9 @@ var useStore = function useStore() {
               break;
             }
             _context2.next = 1;
-            return fetchColumnsFn.current(extra, datasourceId);
+            return fetchColumnsFn.current(extra, datasourceId, {
+              isExit: isExit
+            });
           case 1:
             columns = _context2.sent;
             setColumns(tableName, columns);
@@ -324,9 +328,12 @@ var useStore = function useStore() {
             return _context3.abrupt("return");
           case 1:
             _context3.next = 2;
-            return fetchChangeFn.current(splitByUnion(_metaList), changeObj);
+            return fetchChangeFn.current(splitByUnion(_metaList), changeObj, {
+              isExit: isExit
+            });
           case 2:
             isChange = _context3.sent;
+            // 是否还原
             if (isChange === false) {
               _setMeta(_metaList);
             }

package/lib/es/types.d.ts

@@ -8,16 +8,19 @@ export interface MetaListProps {
     subquery?: MetaListType[];
     list: MetaListType[];
 }
+export interface FetchOptions {
+    isExit: boolean;
+}
 export interface MetabaseProps {
     loading?: boolean;
     btnText?: string;
     showFields?: boolean;
     readonly?: boolean;
-    getTables: (datasourceId: string) => Promise<any>;
+    getTables: (datasourceId: string, options: FetchOptions) => Promise<any>;
     getColumns: (table: {
         name: string;
         [key: string]: any;
-    }, datasourceId: string) => Promise<any>;
+    }, datasourceId: string, options: FetchOptions) => Promise<any>;
     toolbar?: ToolbarType[];
     subToolbar?: ToolbarType[];
     tableNameTpl?: string;
@@ -38,10 +41,10 @@ export interface MetabaseProps {
     tableEnableAlias?: boolean;
     fieldEnableAlias?: boolean;
     isSelectFields?: boolean;
-    onChange?: (newData: MetaListType[], curData?: {
+    onChange?: (newData: MetaListType[], curData: {
         data: any;
         type: ChangeType;
-    }) => Promise<void | Boolean>;
+    }, options: FetchOptions) => Promise<void | Boolean>;
 }
 export interface OptionItem {
     value?: string;

package/package.json

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