@gingkoo/pandora-metabase 1.0.0-alpha.5 → 1.0.0-alpha.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/es/index.js +23 -12
- package/lib/es/index.js.map +1 -1
- package/package.json +1 -1
package/lib/es/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @gingkoo/pandora-metabase v1.0.0-alpha.
|
|
2
|
+
* @gingkoo/pandora-metabase v1.0.0-alpha.6
|
|
3
3
|
*/
|
|
4
4
|
import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
|
|
5
5
|
import * as React from 'react';
|
|
@@ -735,8 +735,8 @@ const changeTableAlias = (list, curObj) => {
|
|
|
735
735
|
if (v.type === TypeEnum.customColumn) {
|
|
736
736
|
v.customColumn.map(item => {
|
|
737
737
|
item.formulaList?.map(formula => {
|
|
738
|
-
if (formula.tableUuid === tableUuid) {
|
|
739
|
-
formula.alias = alias;
|
|
738
|
+
if (formula.expression && formula.expression.tableUuid === tableUuid) {
|
|
739
|
+
formula.expression.alias = alias;
|
|
740
740
|
}
|
|
741
741
|
});
|
|
742
742
|
});
|
|
@@ -808,8 +808,8 @@ const changeFieldAlias = (list, curObj) => {
|
|
|
808
808
|
if (v.type === TypeEnum.customColumn) {
|
|
809
809
|
v.customColumn.map(item => {
|
|
810
810
|
item.formulaList?.map(formula => {
|
|
811
|
-
if (formula.fieldUuid === fieldUuid) {
|
|
812
|
-
formula.fieldAlias = fieldAlias;
|
|
811
|
+
if (formula.expression && formula.expression.fieldUuid === fieldUuid) {
|
|
812
|
+
formula.expression.fieldAlias = fieldAlias;
|
|
813
813
|
}
|
|
814
814
|
});
|
|
815
815
|
});
|
|
@@ -3711,7 +3711,7 @@ const SelectColumn = ({
|
|
|
3711
3711
|
});
|
|
3712
3712
|
};
|
|
3713
3713
|
|
|
3714
|
-
var css_248z$6 = ".Sqb-SelectColumns--box {\n box-sizing: border-box;\n min-width: 1em;\n max-width: 500px;\n background-color: #ffffff;\n overflow: hidden;\n}\n.Sqb-SelectColumns--box .Sqb-List-item {\n display: flex;\n border-radius: 4px;\n margin-top: 2px;\n margin-bottom: 2px;\n}\n.Sqb-SelectColumns--box .Sqb-List-item
|
|
3714
|
+
var css_248z$6 = ".Sqb-SelectColumns--box {\n box-sizing: border-box;\n min-width: 1em;\n max-width: 500px;\n background-color: #ffffff;\n overflow: hidden;\n}\n.Sqb-SelectColumns--box .Sqb-List-item {\n display: flex;\n border-radius: 4px;\n margin-top: 2px;\n margin-bottom: 2px;\n}\n.Sqb-SelectColumns--box .Sqb-List-item .List-item {\n flex: auto;\n cursor: pointer;\n display: flex;\n align-items: center;\n}\n.Sqb-SelectColumns--box .Sqb-List-item .List-item-icon {\n display: flex;\n align-items: center;\n color: #b8bbc3;\n}\n.Sqb-SelectColumns--box .Sqb-List-item .List-item-title {\n word-break: break-word;\n word-wrap: anywhere;\n color: #4c5773;\n margin-top: 0;\n margin-bottom: 0;\n font-size: 14px;\n}\n.Sqb-SelectColumns--box .Sqb-List-item .Field-extra {\n display: flex;\n align-items: center;\n padding: 0.5rem;\n cursor: pointer;\n border-left: 2px solid rgba(113, 114, 173, 0.1);\n color: rgba(255, 255, 255, 0.5);\n visibility: hidden;\n}\n.Sqb-SelectColumns--box .Sqb-List-item .Field-extra h4 {\n margin-bottom: 0;\n color: inherit;\n}\n.Sqb-SelectColumns--box .Sqb-List-item .Field-extra svg {\n color: #fff;\n margin-left: 0.5rem;\n}\n.Sqb-SelectColumns--box .Sqb-List-item .Field-extra:hover {\n color: #fff;\n}\n.Sqb-SelectColumns--box .Sqb-List-item:not(.disabled):hover,\n.Sqb-SelectColumns--box .Sqb-List-item.active {\n background-color: #509ee3;\n border-color: rgba(169, 137, 197, 0.2);\n}\n.Sqb-SelectColumns--box .Sqb-List-item:not(.disabled):hover .List-item-icon,\n.Sqb-SelectColumns--box .Sqb-List-item.active .List-item-icon {\n color: #fff !important;\n}\n.Sqb-SelectColumns--box .Sqb-List-item:not(.disabled):hover .List-item-title,\n.Sqb-SelectColumns--box .Sqb-List-item.active .List-item-title {\n color: #fff !important;\n}\n.Sqb-SelectColumns--box .Sqb-List-item:not(.disabled):hover .Field-extra,\n.Sqb-SelectColumns--box .Sqb-List-item.active .Field-extra {\n visibility: visible;\n}\n.Sqb-SelectColumns--box .Sqb-List-item.disabled .List-item-title {\n color: #949aab !important;\n}\n.Sqb-SelectColumns--box .Sqb-List-title {\n display: flex;\n border-radius: 4px;\n}\n.Sqb-SelectColumns--box .Sqb-List-title .List-item {\n flex: auto;\n cursor: pointer;\n display: flex;\n align-items: center;\n color: #4c5773;\n overflow: hidden;\n}\n.Sqb-SelectColumns--box .Sqb-List-title .List-item-icon {\n display: flex;\n align-items: center;\n}\n.Sqb-SelectColumns--box .Sqb-List-title .List-item-title {\n word-break: break-word;\n word-wrap: anywhere;\n margin-top: 0;\n margin-bottom: 0;\n font-size: 16px;\n font-weight: 600;\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n}\n.Sqb-SelectColumns--box .Sqb-List-title .List-title-arrow {\n margin-left: auto;\n}\n.Sqb-SelectColumns--box .Sqb-List-title.active .List-item-icon {\n color: #509ee3;\n}\n.Sqb-SelectColumns--box .Sqb-List-title.shrink {\n cursor: pointer;\n}\n.Sqb-SelectColumns--box .Sqb-List-title.shrink .List-item {\n cursor: pointer;\n}\n.Sqb-SelectColumns--box .Sqb-List-title.shrink:hover .List-item {\n color: #509ee3;\n}\n.Sqb-SelectColumns--box .Sqb-List-title.shrink:hover .List-item .List-item-title {\n color: #509ee3;\n}\n.Sqb-SelectColumns--box .Sqb-List-search {\n display: flex;\n align-items: center;\n flex: 1 0 auto;\n color: #b8bbc3;\n background-color: #fff;\n border: 1px solid #f0f0f0;\n font-size: 14px;\n}\n.Sqb-SelectColumns--box .Sqb-List-search span {\n line-height: 0;\n}\n.Sqb-SelectColumns--box .Sqb-List-search input {\n box-shadow: none;\n outline: 0;\n border: none !important;\n background: transparent;\n color: #4c5773;\n font-size: 1.12em;\n font-weight: 600;\n}\n.Sqb-SelectColumns--box .Sqb-List-search input::-webkit-input-placeholder {\n color: #b8bbc3;\n}\n.Sqb-SelectColumns--box .Sqb-List-search input::-ms-input-placeholder {\n color: #b8bbc3;\n}\n.Sqb-SelectColumns--box.greenGrass .Sqb-List-item:not(.disabled):hover,\n.Sqb-SelectColumns--box.greenGrass .Sqb-List-item.active {\n background-color: #88bf4d;\n}\n.Sqb-SelectColumns--box.greenGrass .Sqb-List-title.active .List-item-icon {\n color: #88bf4d;\n}\n.Sqb-SelectColumns--box.greenGrass .Sqb-List-title.shrink:hover a {\n color: #88bf4d;\n}\n.Sqb-SelectColumns--box.greenGrass .Sqb-List-title.shrink:hover a .List-item-title {\n color: #88bf4d;\n}\n.Sqb-SelectColumns--box.purple .Sqb-List-item:not(.disabled):hover,\n.Sqb-SelectColumns--box.purple .Sqb-List-item.active {\n background-color: #7172ad;\n}\n.Sqb-SelectColumns--box.purple .Sqb-List-title.active .List-item-icon {\n color: #7172ad;\n}\n.Sqb-SelectColumns--box.purple .Sqb-List-title.shrink:hover a {\n color: #7172ad;\n}\n.Sqb-SelectColumns--box.purple .Sqb-List-title.shrink:hover a .List-item-title {\n color: #7172ad;\n}\n.menu-list {\n border: none !important;\n}\n.menu-list .ant-menu-item:hover {\n color: #88bf4d !important;\n}\n.menu-list .ant-menu-item-selected {\n background-color: #88bf4d !important;\n color: #fff !important;\n border-radius: 4px !important;\n}\n";
|
|
3715
3715
|
styleInject(css_248z$6);
|
|
3716
3716
|
|
|
3717
3717
|
const NUMBER_GROUP = [SQL_COLUMN_TYPE.FLOAT, SQL_COLUMN_TYPE.LONG, SQL_COLUMN_TYPE.CURRENCY];
|
|
@@ -3829,7 +3829,8 @@ const SelectJoinColumn = ({
|
|
|
3829
3829
|
})));
|
|
3830
3830
|
}
|
|
3831
3831
|
},
|
|
3832
|
-
children: jsxs("
|
|
3832
|
+
children: jsxs("div", {
|
|
3833
|
+
className: 'List-item',
|
|
3833
3834
|
children: [jsx("span", {
|
|
3834
3835
|
className: 'List-item-icon',
|
|
3835
3836
|
children: jsx(TableIcon, {})
|
|
@@ -3848,7 +3849,7 @@ const SelectJoinColumn = ({
|
|
|
3848
3849
|
})]
|
|
3849
3850
|
})
|
|
3850
3851
|
})
|
|
3851
|
-
}), open && jsxs(Fragment, {
|
|
3852
|
+
}), (open || isSummarize) && jsxs(Fragment, {
|
|
3852
3853
|
children: [!isSummarize && jsx("div", {
|
|
3853
3854
|
className: cx(`Sqb-List-section`),
|
|
3854
3855
|
children: jsxs("div", {
|
|
@@ -3921,8 +3922,8 @@ const SelectJoinColumn = ({
|
|
|
3921
3922
|
realName
|
|
3922
3923
|
});
|
|
3923
3924
|
},
|
|
3924
|
-
children: [jsxs("
|
|
3925
|
-
className: 'p-2',
|
|
3925
|
+
children: [jsxs("div", {
|
|
3926
|
+
className: 'p-2 List-item',
|
|
3926
3927
|
children: [jsx("span", {
|
|
3927
3928
|
className: 'List-item-icon',
|
|
3928
3929
|
children: IconMap[special_type || database_type] || jsx(LetterAaIcon, {})
|
|
@@ -6581,8 +6582,13 @@ const CaseEditor = props => {
|
|
|
6581
6582
|
isGroup: true,
|
|
6582
6583
|
// @ts-ignore
|
|
6583
6584
|
onGroup: data => {
|
|
6585
|
+
let _data = cloneDeep(data);
|
|
6586
|
+
if (_data.alias != SummarizeAlias$1) {
|
|
6587
|
+
_data.fieldAlias = _data.name;
|
|
6588
|
+
_data.fieldUuid = uuidv4('field');
|
|
6589
|
+
}
|
|
6584
6590
|
const _caseList = caseList.slice();
|
|
6585
|
-
_caseList[i].expression =
|
|
6591
|
+
_caseList[i].expression = _data;
|
|
6586
6592
|
setCaseList(_caseList);
|
|
6587
6593
|
closePopup();
|
|
6588
6594
|
}
|
|
@@ -6606,8 +6612,13 @@ const CaseEditor = props => {
|
|
|
6606
6612
|
data: data,
|
|
6607
6613
|
value: val,
|
|
6608
6614
|
onChange: data => {
|
|
6615
|
+
let _data = cloneDeep(data);
|
|
6616
|
+
if (_data.alias != SummarizeAlias$1) {
|
|
6617
|
+
_data.fieldAlias = _data.name;
|
|
6618
|
+
_data.fieldUuid = uuidv4('field');
|
|
6619
|
+
}
|
|
6609
6620
|
const _caseList = caseList.slice();
|
|
6610
|
-
_caseList[i].expression =
|
|
6621
|
+
_caseList[i].expression = _data;
|
|
6611
6622
|
setCaseList(_caseList);
|
|
6612
6623
|
closePopup();
|
|
6613
6624
|
}
|