@gingkoo/pandora-metabase 1.0.101 → 1.0.103
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/cjs/components/dialog/custom-editor/index.js +3 -2
- package/lib/cjs/components/dialog/select-column-multiple/index.js +1 -1
- package/lib/cjs/components/modules/custom-column.js +4 -1
- package/lib/es/components/dialog/custom-editor/index.js +3 -2
- package/lib/es/components/dialog/select-column-multiple/index.js +1 -1
- package/lib/es/components/modules/custom-column.js +4 -1
- package/package.json +1 -1
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports["default"] = void 0;
|
|
8
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
8
9
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
|
|
9
10
|
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/taggedTemplateLiteral"));
|
|
10
11
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
@@ -53,10 +54,10 @@ var CaseEditor = function CaseEditor(props) {
|
|
|
53
54
|
_pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.nameForRules'));
|
|
54
55
|
return false;
|
|
55
56
|
}
|
|
56
|
-
typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk({
|
|
57
|
+
typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, value), {}, {
|
|
57
58
|
name: name,
|
|
58
59
|
formulaList: caseList
|
|
59
|
-
}));
|
|
60
|
+
})));
|
|
60
61
|
};
|
|
61
62
|
return (0, _jsxRuntime.jsxs)("div", {
|
|
62
63
|
className: 'custom-box',
|
|
@@ -99,7 +99,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
|
|
|
99
99
|
}, [_value]);
|
|
100
100
|
var isActive = function isActive(id_alias) {
|
|
101
101
|
return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
|
|
102
|
-
return v.fieldId + v.fieldAlias === id_alias;
|
|
102
|
+
return v.fieldId + (v.fieldAlias || '') === id_alias;
|
|
103
103
|
}).length) > 0;
|
|
104
104
|
};
|
|
105
105
|
(0, _react.useEffect)(function () {
|
|
@@ -249,7 +249,10 @@ var CustomColumn = function CustomColumn(props) {
|
|
|
249
249
|
onCancel: function onCancel() {
|
|
250
250
|
o.close();
|
|
251
251
|
},
|
|
252
|
-
onOk: function onOk(
|
|
252
|
+
onOk: function onOk(_data) {
|
|
253
|
+
var data = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _data), {}, {
|
|
254
|
+
uuid: _data.uuid || (0, _helper.uuidv4)('custom')
|
|
255
|
+
});
|
|
253
256
|
if (i === -1) {
|
|
254
257
|
newMeta[index].customColumn.push(data);
|
|
255
258
|
} else {
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
1
2
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
2
3
|
import _taggedTemplateLiteral from "@babel/runtime/helpers/esm/taggedTemplateLiteral";
|
|
3
4
|
var _templateObject;
|
|
@@ -47,10 +48,10 @@ var CaseEditor = function CaseEditor(props) {
|
|
|
47
48
|
Toast.warning(__('SqlQueryBuilder.nameForRules'));
|
|
48
49
|
return false;
|
|
49
50
|
}
|
|
50
|
-
typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk({
|
|
51
|
+
typeof onOk === 'function' && (onOk === null || onOk === void 0 ? void 0 : onOk(_objectSpread(_objectSpread({}, value), {}, {
|
|
51
52
|
name: name,
|
|
52
53
|
formulaList: caseList
|
|
53
|
-
}));
|
|
54
|
+
})));
|
|
54
55
|
};
|
|
55
56
|
return _jsxs("div", {
|
|
56
57
|
className: 'custom-box',
|
|
@@ -94,7 +94,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
|
|
|
94
94
|
}, [_value]);
|
|
95
95
|
var isActive = function isActive(id_alias) {
|
|
96
96
|
return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
|
|
97
|
-
return v.fieldId + v.fieldAlias === id_alias;
|
|
97
|
+
return v.fieldId + (v.fieldAlias || '') === id_alias;
|
|
98
98
|
}).length) > 0;
|
|
99
99
|
};
|
|
100
100
|
useEffect(function () {
|
|
@@ -245,7 +245,10 @@ var CustomColumn = function CustomColumn(props) {
|
|
|
245
245
|
onCancel: function onCancel() {
|
|
246
246
|
o.close();
|
|
247
247
|
},
|
|
248
|
-
onOk: function onOk(
|
|
248
|
+
onOk: function onOk(_data) {
|
|
249
|
+
var data = _objectSpread(_objectSpread({}, _data), {}, {
|
|
250
|
+
uuid: _data.uuid || uuidv4('custom')
|
|
251
|
+
});
|
|
249
252
|
if (i === -1) {
|
|
250
253
|
newMeta[index].customColumn.push(data);
|
|
251
254
|
} else {
|