@gingkoo/pandora-metabase 1.0.63 → 1.0.65

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

@@ -342,7 +342,7 @@ var GroupBy = function GroupBy(props) {
             return handleUpdate(e, i);
           },
           children: [v.quotes && (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-            children: store.fieldEnableAlias && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+            children: store.groupByEnableAlias && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
               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: (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))),

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

@@ -209,7 +209,7 @@ var SelectIndex = function SelectIndex(props) {
               name: v.name || v.quotes,
               sql: sql,
               fieldUuid: (0, _helper2.uuidv4)('field'),
-              fieldAlias: fieldAlias,
+              fieldAlias: v.fieldAlias || fieldAlias,
               summarizeType: _types.MetaSummarize_Enum.GROUP
             });
           });
@@ -340,7 +340,7 @@ var SelectIndex = function SelectIndex(props) {
             return handleUpdate(e, i);
           },
           children: [v.quotes && (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-            children: store.fieldEnableAlias && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+            children: store.groupByEnableAlias && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
               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: (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))),

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

@@ -144,16 +144,20 @@ var useStore = function useStore() {
     setFieldEnableAlias = _useState42[1]; // 字段名是否开启别名
   var _useState43 = (0, _react.useState)(true),
     _useState44 = (0, _slicedToArray2["default"])(_useState43, 2),
-    isSelectFields = _useState44[0],
-    setIsSelectFields = _useState44[1]; // 是否默认勾选字段
-  var _useState45 = (0, _react.useState)(false),
+    groupByEnableAlias = _useState44[0],
+    setGroupByEnableAlias = _useState44[1]; // 聚合是否开启别名
+  var _useState45 = (0, _react.useState)(true),
     _useState46 = (0, _slicedToArray2["default"])(_useState45, 2),
-    tableFlat = _useState46[0],
-    setTableFlat = _useState46[1]; // 是否平铺数据表
-  var _useState47 = (0, _react.useState)([]),
+    isSelectFields = _useState46[0],
+    setIsSelectFields = _useState46[1]; // 是否默认勾选字段
+  var _useState47 = (0, _react.useState)(false),
     _useState48 = (0, _slicedToArray2["default"])(_useState47, 2),
-    sourceTable = _useState48[0],
-    setSourceTable = _useState48[1];
+    tableFlat = _useState48[0],
+    setTableFlat = _useState48[1]; // 是否平铺数据表
+  var _useState49 = (0, _react.useState)([]),
+    _useState50 = (0, _slicedToArray2["default"])(_useState49, 2),
+    sourceTable = _useState50[0],
+    setSourceTable = _useState50[1];
   // 外层ref
   var popupContainer = (0, _react.useRef)();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -732,6 +736,8 @@ var useStore = function useStore() {
     setTableEnableAlias: setTableEnableAlias,
     fieldEnableAlias: fieldEnableAlias,
     setFieldEnableAlias: setFieldEnableAlias,
+    groupByEnableAlias: groupByEnableAlias,
+    setGroupByEnableAlias: setGroupByEnableAlias,
     isSelectFields: isSelectFields,
     setIsSelectFields: setIsSelectFields,
     tableFlat: tableFlat,

package/lib/cjs/index.js

@@ -62,6 +62,8 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     tableEnableAlias = _props$tableEnableAli === void 0 ? true : _props$tableEnableAli,
     _props$fieldEnableAli = props.fieldEnableAlias,
     fieldEnableAlias = _props$fieldEnableAli === void 0 ? true : _props$fieldEnableAli,
+    _props$groupByEnableA = props.groupByEnableAlias,
+    groupByEnableAlias = _props$groupByEnableA === void 0 ? true : _props$groupByEnableA,
     _props$isSelectFields = props.isSelectFields,
     isSelectFields = _props$isSelectFields === void 0 ? true : _props$isSelectFields,
     _props$tableFlat = props.tableFlat,
@@ -96,9 +98,10 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     store.setIsExit(isExit);
     store.setTableEnableAlias(tableEnableAlias);
     store.setFieldEnableAlias(fieldEnableAlias);
+    store.setGroupByEnableAlias(groupByEnableAlias);
     store.setIsSelectFields(isSelectFields);
     store.setTableFlat(tableFlat);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, isSelectFields, tableFlat]);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat]);
   _react["default"].useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/cjs/types.d.ts

@@ -40,6 +40,7 @@ export interface MetabaseProps {
     isExit?: boolean;
     tableEnableAlias?: boolean;
     fieldEnableAlias?: boolean;
+    groupByEnableAlias?: boolean;
     isSelectFields?: boolean;
     tableFlat?: boolean;
     onChange?: (newData: MetaListType[], curData: {

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

@@ -336,7 +336,7 @@ var GroupBy = function GroupBy(props) {
             return handleUpdate(e, i);
           },
           children: [v.quotes && _jsx(_Fragment, {
-            children: store.fieldEnableAlias && _jsx(Tooltip, {
+            children: store.groupByEnableAlias && _jsx(Tooltip, {
               title: !isValidSQLAlias(v === null || v === void 0 ? void 0 : v.fieldAlias) ? __('SqlQueryBuilder.aliasForRules') : __('SqlQueryBuilder.alias'),
               children: _jsx(Button, {
                 className: cx(':Sqb-TableName-as :Sqb-TableName green-name', _defineProperty({}, 'isError', !isValidSQLAlias(v === null || v === void 0 ? void 0 : v.fieldAlias))),

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

@@ -203,7 +203,7 @@ var SelectIndex = function SelectIndex(props) {
               name: v.name || v.quotes,
               sql: sql,
               fieldUuid: uuidv4('field'),
-              fieldAlias: fieldAlias,
+              fieldAlias: v.fieldAlias || fieldAlias,
               summarizeType: MetaSummarize_Enum.GROUP
             });
           });
@@ -334,7 +334,7 @@ var SelectIndex = function SelectIndex(props) {
             return handleUpdate(e, i);
           },
           children: [v.quotes && _jsx(_Fragment, {
-            children: store.fieldEnableAlias && _jsx(Tooltip, {
+            children: store.groupByEnableAlias && _jsx(Tooltip, {
               title: !isValidSQLAlias(v === null || v === void 0 ? void 0 : v.fieldAlias) ? __('SqlQueryBuilder.aliasForRules') : __('SqlQueryBuilder.alias'),
               children: _jsx(Button, {
                 className: cx(':Sqb-TableName-as :Sqb-TableName green-name', _defineProperty({}, 'isError', !isValidSQLAlias(v === null || v === void 0 ? void 0 : v.fieldAlias))),

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

@@ -138,16 +138,20 @@ var useStore = function useStore() {
     setFieldEnableAlias = _useState42[1]; // 字段名是否开启别名
   var _useState43 = useState(true),
     _useState44 = _slicedToArray(_useState43, 2),
-    isSelectFields = _useState44[0],
-    setIsSelectFields = _useState44[1]; // 是否默认勾选字段
-  var _useState45 = useState(false),
+    groupByEnableAlias = _useState44[0],
+    setGroupByEnableAlias = _useState44[1]; // 聚合是否开启别名
+  var _useState45 = useState(true),
     _useState46 = _slicedToArray(_useState45, 2),
-    tableFlat = _useState46[0],
-    setTableFlat = _useState46[1]; // 是否平铺数据表
-  var _useState47 = useState([]),
+    isSelectFields = _useState46[0],
+    setIsSelectFields = _useState46[1]; // 是否默认勾选字段
+  var _useState47 = useState(false),
     _useState48 = _slicedToArray(_useState47, 2),
-    sourceTable = _useState48[0],
-    setSourceTable = _useState48[1];
+    tableFlat = _useState48[0],
+    setTableFlat = _useState48[1]; // 是否平铺数据表
+  var _useState49 = useState([]),
+    _useState50 = _slicedToArray(_useState49, 2),
+    sourceTable = _useState50[0],
+    setSourceTable = _useState50[1];
   // 外层ref
   var popupContainer = useRef();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -726,6 +730,8 @@ var useStore = function useStore() {
     setTableEnableAlias: setTableEnableAlias,
     fieldEnableAlias: fieldEnableAlias,
     setFieldEnableAlias: setFieldEnableAlias,
+    groupByEnableAlias: groupByEnableAlias,
+    setGroupByEnableAlias: setGroupByEnableAlias,
     isSelectFields: isSelectFields,
     setIsSelectFields: setIsSelectFields,
     tableFlat: tableFlat,

package/lib/es/index.js

@@ -52,6 +52,8 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     tableEnableAlias = _props$tableEnableAli === void 0 ? true : _props$tableEnableAli,
     _props$fieldEnableAli = props.fieldEnableAlias,
     fieldEnableAlias = _props$fieldEnableAli === void 0 ? true : _props$fieldEnableAli,
+    _props$groupByEnableA = props.groupByEnableAlias,
+    groupByEnableAlias = _props$groupByEnableA === void 0 ? true : _props$groupByEnableA,
     _props$isSelectFields = props.isSelectFields,
     isSelectFields = _props$isSelectFields === void 0 ? true : _props$isSelectFields,
     _props$tableFlat = props.tableFlat,
@@ -86,9 +88,10 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setIsExit(isExit);
     store.setTableEnableAlias(tableEnableAlias);
     store.setFieldEnableAlias(fieldEnableAlias);
+    store.setGroupByEnableAlias(groupByEnableAlias);
     store.setIsSelectFields(isSelectFields);
     store.setTableFlat(tableFlat);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, isSelectFields, tableFlat]);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat]);
   React.useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/es/types.d.ts

@@ -40,6 +40,7 @@ export interface MetabaseProps {
     isExit?: boolean;
     tableEnableAlias?: boolean;
     fieldEnableAlias?: boolean;
+    groupByEnableAlias?: boolean;
     isSelectFields?: boolean;
     tableFlat?: boolean;
     onChange?: (newData: MetaListType[], curData: {

package/package.json

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