@gingkoo/pandora-metabase 1.0.17 → 1.0.18
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/hooks/patch.js +6 -4
- package/lib/es/hooks/patch.js +6 -4
- package/package.json +1 -1
package/lib/cjs/hooks/patch.js
CHANGED
|
@@ -17,9 +17,9 @@ var joinDataPatch = exports.joinDataPatch = function joinDataPatch(newMeta) {
|
|
|
17
17
|
var fields2 = newMeta.table2.fields || [];
|
|
18
18
|
// 处理老字段
|
|
19
19
|
var field1 = {
|
|
20
|
-
fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column,
|
|
20
|
+
fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column || newMeta.table1.name,
|
|
21
21
|
fieldUuid: newMeta.table1.fieldUuid || (0, _helper.uuidv4)('field'),
|
|
22
|
-
fieldId: newMeta.table1.
|
|
22
|
+
fieldId: newMeta.table1.fieldId,
|
|
23
23
|
fieldNameZh: newMeta.table1.name_zh,
|
|
24
24
|
fieldName: newMeta.table1.fieldName || newMeta.table1.name
|
|
25
25
|
// quotes: newMeta.table1.quotes || newMeta.table1.column,
|
|
@@ -28,9 +28,11 @@ var joinDataPatch = exports.joinDataPatch = function joinDataPatch(newMeta) {
|
|
|
28
28
|
// tableAlias: newMeta.table1.alias,
|
|
29
29
|
};
|
|
30
30
|
var field2 = {
|
|
31
|
-
fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column,
|
|
31
|
+
fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column || newMeta.table2.name,
|
|
32
32
|
fieldUuid: newMeta.table2.fieldUuid || (0, _helper.uuidv4)('field'),
|
|
33
|
-
fieldId: newMeta.table2.
|
|
33
|
+
fieldId: newMeta.table2.fieldId,
|
|
34
|
+
fieldNameZh: newMeta.table2.name_zh,
|
|
35
|
+
fieldName: newMeta.table2.fieldName || newMeta.table2.name
|
|
34
36
|
};
|
|
35
37
|
// 处理多选
|
|
36
38
|
if (field1.fieldAlias && ((_fields = fields1) === null || _fields === void 0 ? void 0 : _fields.length) < 1) {
|
package/lib/es/hooks/patch.js
CHANGED
|
@@ -10,9 +10,9 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
|
|
|
10
10
|
var fields2 = newMeta.table2.fields || [];
|
|
11
11
|
// 处理老字段
|
|
12
12
|
var field1 = {
|
|
13
|
-
fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column,
|
|
13
|
+
fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column || newMeta.table1.name,
|
|
14
14
|
fieldUuid: newMeta.table1.fieldUuid || uuidv4('field'),
|
|
15
|
-
fieldId: newMeta.table1.
|
|
15
|
+
fieldId: newMeta.table1.fieldId,
|
|
16
16
|
fieldNameZh: newMeta.table1.name_zh,
|
|
17
17
|
fieldName: newMeta.table1.fieldName || newMeta.table1.name
|
|
18
18
|
// quotes: newMeta.table1.quotes || newMeta.table1.column,
|
|
@@ -21,9 +21,11 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
|
|
|
21
21
|
// tableAlias: newMeta.table1.alias,
|
|
22
22
|
};
|
|
23
23
|
var field2 = {
|
|
24
|
-
fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column,
|
|
24
|
+
fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column || newMeta.table2.name,
|
|
25
25
|
fieldUuid: newMeta.table2.fieldUuid || uuidv4('field'),
|
|
26
|
-
fieldId: newMeta.table2.
|
|
26
|
+
fieldId: newMeta.table2.fieldId,
|
|
27
|
+
fieldNameZh: newMeta.table2.name_zh,
|
|
28
|
+
fieldName: newMeta.table2.fieldName || newMeta.table2.name
|
|
27
29
|
};
|
|
28
30
|
// 处理多选
|
|
29
31
|
if (field1.fieldAlias && ((_fields = fields1) === null || _fields === void 0 ? void 0 : _fields.length) < 1) {
|